diff --git a/.gitignore b/.gitignore
index df5dab82..f3af2299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -238,3 +238,7 @@ Thumbs.db
 /src/java/JavaFileStorageTest/gen/com/google/android/gms/R.java
 /src/java/JavaFileStorageTest/gen/group/pals/android/lib/ui/filechooser/R.java
 /src/java/JavaFileStorageTest/gen/keepass2android/javafilestorage/R.java
+/src/java/PluginQR/bin
+/src/PluginHostTest/bin/Debug
+
+/src/java/Keepass2AndroidPluginSDK/bin
diff --git a/src/ArtTestApp/Activity1.cs b/src/ArtTestApp/Activity1.cs
index e6e66c74..53155b50 100644
--- a/src/ArtTestApp/Activity1.cs
+++ b/src/ArtTestApp/Activity1.cs
@@ -37,7 +37,8 @@ namespace ArtTestApp
 			FindViewById<Button>(Resource.Id.MyButton2).Click += (sender, args) => StartActivityForResult(typeof(Activity2),1);
 
 			FindViewById<Button>(Resource.Id.MyButton3).Click += (sender, args) => StartActivityForResult(typeof(PrefActivity), 1);
-
+			StartActivity(typeof(Activity2));
+			Finish();
 
 		}
 	}
diff --git a/src/KeePass.sln b/src/KeePass.sln
index 18929f4a..b7895179 100644
--- a/src/KeePass.sln
+++ b/src/KeePass.sln
@@ -17,14 +17,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwofishCipher", "TwofishCip
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaFileStorageBindings", "JavaFileStorageBindings\JavaFileStorageBindings.csproj", "{48574278-4779-4B3A-A9E4-9CF1BC285D0B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppCompatV7Binding", "AppCompatV7Binding\AppCompatV7Binding.csproj", "{23233A28-D74F-4BF8-B4D8-834060840BD7}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidFileChooserBinding", "AndroidFileChooserBinding\AndroidFileChooserBinding.csproj", "{3C0F7FE5-639F-4422-A087-8B26CF862D1B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KP2AKdbLibraryBinding", "KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj", "{70D3844A-D9FA-4A64-B205-A84C6A822196}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArtTestApp", "ArtTestApp\ArtTestApp.csproj", "{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginHostTest", "PluginHostTest\PluginHostTest.csproj", "{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginSdkBinding", "PluginSdkBinding\PluginSdkBinding.csproj", "{3DA3911E-36DE-465E-8F15-F1991B6437E5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -206,24 +208,6 @@ Global
 		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{48574278-4779-4B3A-A9E4-9CF1BC285D0B}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Release|Win32.ActiveCfg = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.Release|x64.ActiveCfg = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
-		{23233A28-D74F-4BF8-B4D8-834060840BD7}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3C0F7FE5-639F-4422-A087-8B26CF862D1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -284,6 +268,48 @@ Global
 		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
 		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{1FF6C335-A627-43C9-AAA7-CBAC2E74CD18}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Release|Win32.ActiveCfg = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|Win32.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.Release|x64.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{3DA3911E-36DE-465E-8F15-F1991B6437E5}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/KeePassLib2Android/KeePassLib2Android.csproj b/src/KeePassLib2Android/KeePassLib2Android.csproj
index 14846ef9..275418c0 100644
--- a/src/KeePassLib2Android/KeePassLib2Android.csproj
+++ b/src/KeePassLib2Android/KeePassLib2Android.csproj
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>False</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
+    <DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;EXCLUDE_KEYTRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
diff --git a/src/KeePassLib2Android/Resources/Resource.designer.cs b/src/KeePassLib2Android/Resources/Resource.designer.cs
index 8208d60e..316bfd06 100644
--- a/src/KeePassLib2Android/Resources/Resource.designer.cs
+++ b/src/KeePassLib2Android/Resources/Resource.designer.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.34011
+//     Laufzeitversion:4.0.30319.34014
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.
diff --git a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
index 486b049b..2c3a695b 100644
--- a/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
+++ b/src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;EXCLUDE_KEYTRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -57,6 +57,7 @@
     <Compile Include="database\edit\MoveElement.cs" />
     <Compile Include="database\KdbDatabaseLoader.cs" />
     <Compile Include="database\KdbxDatabaseLoader.cs" />
+    <Compile Include="database\PwEntryOutput.cs" />
     <Compile Include="database\SynchronizeCachedDatabase.cs" />
     <Compile Include="DataExchange\FileFormatProvider.cs" />
     <Compile Include="DataExchange\Formats\KeePassCsv1x.cs" />
diff --git a/src/Kp2aBusinessLogic/database/Database.cs b/src/Kp2aBusinessLogic/database/Database.cs
index a0e7e699..d91d98bc 100644
--- a/src/Kp2aBusinessLogic/database/Database.cs
+++ b/src/Kp2aBusinessLogic/database/Database.cs
@@ -45,6 +45,11 @@ namespace keepass2android
 			}
 		}
 
+		/// <summary>
+		/// Information about the last opened entry. Includes the entry but also transformed fields.
+		/// </summary>
+		public PwEntryOutput LastOpenedEntry { get; set; }
+
 		/// <summary>
 		/// if an OTP key was used, this property tells the location of the OTP auxiliary file.
 		/// Must be set after loading.
diff --git a/src/Kp2aBusinessLogic/database/PwEntryOutput.cs b/src/Kp2aBusinessLogic/database/PwEntryOutput.cs
new file mode 100644
index 00000000..8ab57d0b
--- /dev/null
+++ b/src/Kp2aBusinessLogic/database/PwEntryOutput.cs
@@ -0,0 +1,60 @@
+using System;
+using KeePass.Util.Spr;
+using KeePassLib;
+using KeePassLib.Collections;
+using KeePassLib.Security;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents the strings which are output from a PwEntry.
+	/// </summary>
+	/// In contrast to the original PwEntry, this means that placeholders are replaced. Also, plugins may modify
+	/// or add fields.
+	public class PwEntryOutput
+	{
+		private readonly PwEntry _entry;
+		private readonly PwDatabase _db;
+		private readonly ProtectedStringDictionary _outputStrings = new ProtectedStringDictionary();
+
+		/// <summary>
+		/// Constructs the PwEntryOutput by replacing the placeholders
+		/// </summary>
+		public PwEntryOutput(PwEntry entry, PwDatabase db)
+		{
+			_entry = entry;
+			_db = db;
+
+			foreach (var pair in entry.Strings)
+			{
+				_outputStrings.Set(pair.Key, new ProtectedString(entry.Strings.Get(pair.Key).IsProtected, GetStringAndReplacePlaceholders(pair.Key)));
+			}
+		}
+
+		string GetStringAndReplacePlaceholders(string key)
+		{
+			String value = Entry.Strings.ReadSafe(key);
+			value = SprEngine.Compile(value, new SprContext(Entry, _db, SprCompileFlags.All));
+			return value;
+		}
+
+
+		/// <summary>
+		/// Returns the ID of the entry
+		/// </summary>
+		public PwUuid Uuid 
+		{
+			get { return Entry.Uuid; }
+		}
+
+		/// <summary>
+		/// The output strings for the represented entry
+		/// </summary>
+		public ProtectedStringDictionary OutputStrings { get { return _outputStrings; } }
+
+		public PwEntry Entry
+		{
+			get { return _entry; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Kp2aUnitTests/Kp2aUnitTests.csproj b/src/Kp2aUnitTests/Kp2aUnitTests.csproj
index 8b55a936..90ff6b5d 100644
--- a/src/Kp2aUnitTests/Kp2aUnitTests.csproj
+++ b/src/Kp2aUnitTests/Kp2aUnitTests.csproj
@@ -67,6 +67,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="TestIntentsAndBundles.cs" />
     <Compile Include="ProgressDialogStub.cs" />
     <Compile Include="TestBase.cs" />
     <Compile Include="TestCacheSupervisor.cs" />
@@ -85,6 +86,7 @@
     <Compile Include="TestSynchronizeCachedDatabase.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
   </ItemGroup>
diff --git a/src/Kp2aUnitTests/MainActivity.cs b/src/Kp2aUnitTests/MainActivity.cs
index 5636946b..71c1c621 100644
--- a/src/Kp2aUnitTests/MainActivity.cs
+++ b/src/Kp2aUnitTests/MainActivity.cs
@@ -18,7 +18,8 @@ namespace Kp2aUnitTests
         {
             TestRunner runner = new TestRunner();
             // Run all tests from this assembly
-            runner.AddTests(Assembly.GetExecutingAssembly());
+            //runner.AddTests(Assembly.GetExecutingAssembly());
+			runner.AddTests(new List<Type> { typeof(TestIntentsAndBundles) });
 			//runner.AddTests(new List<Type> { typeof(TestSynchronizeCachedDatabase)});
 			//runner.AddTests(typeof(TestLoadDb).GetMethod("LoadErrorWithCertificateTrustFailure"));
 			//runner.AddTests(typeof(TestLoadDb).GetMethod("LoadWithAcceptedCertificateTrustFailure"));
diff --git a/src/Kp2aUnitTests/Resources/Resource.Designer.cs b/src/Kp2aUnitTests/Resources/Resource.Designer.cs
index c93b7129..9835cde1 100644
--- a/src/Kp2aUnitTests/Resources/Resource.Designer.cs
+++ b/src/Kp2aUnitTests/Resources/Resource.Designer.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.34011
+//     Laufzeitversion:4.0.30319.34014
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.
diff --git a/src/Kp2aUnitTests/TestIntentsAndBundles.cs b/src/Kp2aUnitTests/TestIntentsAndBundles.cs
new file mode 100644
index 00000000..64f4f766
--- /dev/null
+++ b/src/Kp2aUnitTests/TestIntentsAndBundles.cs
@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Java.IO;
+using KeePassLib;
+using KeePassLib.Interfaces;
+using KeePassLib.Keys;
+using KeePassLib.Serialization;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using keepass2android;
+
+namespace Kp2aUnitTests
+{
+	[TestClass]
+	internal class TestIntentsAndBundles
+	{
+		[TestMethod]
+		public void StringArray()
+		{
+			string[] dataIn = new string[] { "a","bcd"};
+			Intent i= new Intent();
+			i.PutExtra("key", dataIn);
+
+			Bundle extras = i.Extras;
+			var dataOut = extras.GetStringArray("key");
+			Assert.AreEqual(dataIn.Length, dataOut.Length);
+			Assert.AreEqual(dataIn[0], dataOut[0]);
+			Assert.AreEqual(dataIn[1], dataOut[1]);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/Activity1.cs b/src/PluginHostTest/Activity1.cs
new file mode 100644
index 00000000..b22ea02a
--- /dev/null
+++ b/src/PluginHostTest/Activity1.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using Android.App;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Android.OS;
+using Keepass2android.Pluginsdk;
+using keepass2android;
+
+namespace PluginHostTest
+{
+	[Activity(Label = "PluginHostTest", MainLauncher = true, Icon = "@drawable/icon")]
+	public class Activity1 : Activity
+	{
+		int count = 1;
+
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+
+			// Set our view from the "main" layout resource
+			SetContentView(Resource.Layout.Main);
+
+			// Get our button from the layout resource,
+			// and attach an event to it
+			Button button = FindViewById<Button>(Resource.Id.MyButton);
+
+			button.Click += delegate { PluginHost.TriggerRequests(this);  };
+
+			FindViewById<Button>(Resource.Id.managePluginsButton).Click += delegate(object sender, EventArgs args)
+				{
+					StartActivity(new Intent(this, typeof(PluginListActivity)));
+				};
+			FindViewById<Button>(Resource.Id.entryviewButton).Click += delegate
+			{
+					StartActivity(new Intent(this, typeof(EntryActivity)));
+			};
+
+			FindViewById<Button>(Resource.Id.testDbButton).Click += delegate
+				{
+					string message = "ok. ";
+					try
+					{
+						Stopwatch sw = new Stopwatch();
+						sw.Start();
+						PluginDatabase db = new PluginDatabase(this);
+						db.Clear();
+						
+
+						if (db.GetAllPluginPackages().Count() != 0)
+							throw new Exception("db not empty!");
+
+						const string testPackageA = "test.package.a";
+						const string testPackageB = "test.package.b";
+						db.ClearPlugin(testPackageA);
+						db.ClearPlugin(testPackageB);
+						EnsurePackageDataIsEmpty(db, testPackageA);
+						EnsurePackageDataIsEmpty(db, testPackageB);
+
+						string[] requestedScopes = {
+							Strings.ScopeDatabaseActions
+						};
+						db.StorePlugin(testPackageA, null, requestedScopes);
+						EnsurePackageDataIsEmpty(db, testPackageB);
+						EnsurePackageDataIsEmpty(new PluginDatabase(this), testPackageB);
+						db.StorePlugin(testPackageB, null, requestedScopes);
+						EnsurePackageHasUnacceptedScope(db, testPackageA, Strings.ScopeDatabaseActions);
+						EnsurePackageHasUnacceptedScope(db, testPackageB, Strings.ScopeDatabaseActions);
+						EnsurePackageHasUnacceptedScope(new PluginDatabase(this), testPackageA, Strings.ScopeDatabaseActions);
+						
+						if (db.GetAllPluginPackages().Count() != 2)
+							throw new Exception("wrong count of plugins");
+						if (db.GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Any())
+						{
+							throw new Exception("wrong count of accepted plugins");
+						}
+						if (new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Any())
+						{
+							throw new Exception("wrong count of accepted plugins");
+						}
+
+						db.SetEnabled(testPackageA, true);
+						if (db.GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Single() != testPackageA)
+						{
+							throw new Exception("wrong plugin");
+						}
+						if (new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Single() != testPackageA)
+						{
+							throw new Exception("wrong plugin");
+						}
+						if (db.GetPluginsWithAcceptedScope("somescope").Any())
+						{
+							throw new Exception("wrong count of accepted plugins");
+						}
+						var accessTokenA = db.GetAccessToken(testPackageA);
+						if (String.IsNullOrEmpty(accessTokenA))
+							throw new Exception("expected access token!");
+						if (!db.IsEnabled(testPackageA))
+							throw new Exception("plugin not enabled!");
+						if (db.IsEnabled(testPackageB))
+							throw new Exception("plugin enabled!");
+						if (!db.IsValidAccessToken(testPackageA, accessTokenA, Strings.ScopeDatabaseActions))
+							throw new Exception("invalid token!");
+						db.SetEnabled(testPackageA, false);
+						if (db.IsValidAccessToken(testPackageA, accessTokenA, Strings.ScopeDatabaseActions))
+							throw new Exception("valid token?!");
+						if (db.GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Any())
+							throw new Exception("unexpected!");
+
+
+						new PluginDatabase(this).SetEnabled(testPackageB, true);
+						if (!db.IsEnabled(testPackageB))
+							throw new Exception("plugin not enabled!");
+
+						db.SetEnabled(testPackageA, true);
+						accessTokenA = db.GetAccessToken(testPackageA);
+						
+						message += sw.ElapsedMilliseconds + "ms";
+
+						Stopwatch swQuery = new Stopwatch();
+						swQuery.Start();
+						int n = 3;
+						for (int i = 0; i < n; i++)
+						{
+							if (db.GetPluginsWithAcceptedScope(Strings.ScopeDatabaseActions).Count() != 2)
+							{
+								throw new Exception("wrong plugin");
+							}
+							if (!db.IsValidAccessToken(testPackageA, accessTokenA, Strings.ScopeDatabaseActions))
+								throw new Exception("invalid token");
+						}
+						message += "/ " + swQuery.ElapsedMilliseconds/(double)n/2.0 + "ms for query";
+
+
+					}
+					catch (Exception exception)
+					{
+						message = exception.ToString();
+					}
+					Toast.MakeText(this, message, ToastLength.Long).Show();
+
+				};
+
+			
+		}
+
+		private void EnsurePackageHasUnacceptedScope(PluginDatabase db, string plugin, string scope)
+		{
+			if (String.IsNullOrEmpty(db.GetRequestToken(plugin)))
+				throw new Exception("invalid request token");
+			if (db.GetAccessToken(plugin) != null)
+				throw new Exception("invalid access token!");
+			if (db.GetPluginScopes(plugin).Count != 1)
+				throw new Exception("Unexpected scopes!");
+			if (db.GetPluginScopes(plugin).First() != scope)
+				throw new Exception("Unexpected scope in db!");
+		}
+
+		private static void EnsurePackageDataIsEmpty(PluginDatabase db, string testPackageA)
+		{
+			if (String.IsNullOrEmpty(db.GetRequestToken(testPackageA)))
+				throw new Exception("invalid request token");
+			if (db.GetAccessToken(testPackageA) != null)
+				throw new Exception("invalid access token!");
+			if (db.GetPluginScopes(testPackageA).Count > 0)
+				throw new Exception("Unexpected scopes!");
+		}
+	}
+}
+
diff --git a/src/PluginHostTest/App.cs b/src/PluginHostTest/App.cs
new file mode 100644
index 00000000..cf760f2a
--- /dev/null
+++ b/src/PluginHostTest/App.cs
@@ -0,0 +1,40 @@
+using KeePassLib;
+using KeePassLib.Keys;
+using KeePassLib.Serialization;
+
+namespace keepass2android
+{
+	public class App
+	{
+
+		public class Kp2A
+		{
+			private static Db _mDb;
+
+			public  class Db
+			{
+				public PwEntryOutput LastOpenedEntry { get; set; }
+
+				public void SetEntry(PwEntry e)
+				{
+					KpDatabase = new PwDatabase();
+					KpDatabase.New(new IOConnectionInfo(), new CompositeKey());
+
+					KpDatabase.RootGroup.AddEntry(e, true);
+				}
+
+				public PwDatabase KpDatabase
+				{
+					get; set;
+				}
+			}
+
+			public static Db GetDb()
+			{
+				if (_mDb == null)
+					_mDb = new Db();
+				return _mDb;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/Assets/AboutAssets.txt b/src/PluginHostTest/Assets/AboutAssets.txt
new file mode 100644
index 00000000..ee398862
--- /dev/null
+++ b/src/PluginHostTest/Assets/AboutAssets.txt
@@ -0,0 +1,19 @@
+Any raw assets you want to be deployed with your application can be placed in
+this directory (and child directories) and given a Build Action of "AndroidAsset".
+
+These files will be deployed with you package and will be accessible using Android's
+AssetManager, like this:
+
+public class ReadAsset : Activity
+{
+	protected override void OnCreate (Bundle bundle)
+	{
+		base.OnCreate (bundle);
+
+		InputStream input = Assets.Open ("my_asset.txt");
+	}
+}
+
+Additionally, some Android functions will automatically load asset files:
+
+Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
\ No newline at end of file
diff --git a/src/PluginHostTest/Assets/DejaVuSansMono.ttf b/src/PluginHostTest/Assets/DejaVuSansMono.ttf
new file mode 100644
index 00000000..8b7bb2a4
Binary files /dev/null and b/src/PluginHostTest/Assets/DejaVuSansMono.ttf differ
diff --git a/src/PluginHostTest/Assets/fontawesome-webfont.ttf b/src/PluginHostTest/Assets/fontawesome-webfont.ttf
new file mode 100644
index 00000000..d3659246
Binary files /dev/null and b/src/PluginHostTest/Assets/fontawesome-webfont.ttf differ
diff --git a/src/PluginHostTest/ClickView.cs b/src/PluginHostTest/ClickView.cs
new file mode 100644
index 00000000..99b09399
--- /dev/null
+++ b/src/PluginHostTest/ClickView.cs
@@ -0,0 +1,44 @@
+/*
+This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android 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.
+
+  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+using System;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace keepass2android.view
+{
+	public abstract class ClickView : LinearLayout {
+		protected ClickView (IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			
+		}
+
+		protected ClickView(Context context) :base(context)
+		{
+		}
+		
+		abstract public void OnClick();
+		
+		abstract public void OnCreateMenu(IContextMenu menu, IContextMenuContextMenuInfo menuInfo);
+		
+		abstract public bool OnContextItemSelected(IMenuItem item);
+	}
+}
+
diff --git a/src/PluginHostTest/CopyToClipboardService.cs b/src/PluginHostTest/CopyToClipboardService.cs
new file mode 100644
index 00000000..f9a345ee
--- /dev/null
+++ b/src/PluginHostTest/CopyToClipboardService.cs
@@ -0,0 +1,35 @@
+using System;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Widget;
+using KeePassLib.Security;
+
+namespace keepass2android
+{
+	[Service]
+	public class CopyToClipboardService: Service
+	{
+		public CopyToClipboardService()
+		{
+			
+		}
+
+		public CopyToClipboardService(IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+		}
+
+
+		public static void CopyValueToClipboardWithTimeout(Context ctx, string text)
+		{
+			Toast.MakeText(ctx, text, ToastLength.Short).Show();
+		}
+
+		public override IBinder OnBind(Intent intent)
+		{
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivity.cs b/src/PluginHostTest/EntryActivity.cs
new file mode 100644
index 00000000..5cfd1c46
--- /dev/null
+++ b/src/PluginHostTest/EntryActivity.cs
@@ -0,0 +1,905 @@
+/*
+This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android 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.
+
+  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using System.Threading;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Text;
+using Android.Views;
+using Android.Widget;
+using Android.Preferences;
+using Android.Text.Method;
+using System.Globalization;
+using Android.Content.PM;
+using Android.Webkit;
+using Android.Graphics;
+using Java.IO;
+using KeePassLib;
+using KeePassLib.Security;
+using Keepass2android.Pluginsdk;
+using PluginHostTest;
+using Uri = Android.Net.Uri;
+
+namespace keepass2android
+{
+
+	[Activity(Label = "@string/app_name", ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden,
+		Theme = "@style/NoTitleBar")]
+	public class EntryActivity : Activity
+	{
+		public const String KeyEntry = "entry";
+		public const String KeyRefreshPos = "refresh_pos";
+		public const String KeyCloseAfterCreate = "close_after_create";
+
+		protected PwEntry Entry = new PwEntry(true, true);
+
+		private static Typeface _passwordFont;
+
+		internal bool _showPassword;
+		private int _pos;
+
+		private List<TextView> _protectedTextViews;
+
+		private readonly Dictionary<string, List<IPopupMenuItem>> _popupMenuItems =
+			new Dictionary<string, List<IPopupMenuItem>>();
+
+		private readonly Dictionary<string, IStringView> _stringViews = new Dictionary<string, IStringView>();
+		private readonly List<PluginMenuOption> _pendingMenuOptions = new List<PluginMenuOption>();
+		private IMenu _menu;
+
+		protected void SetEntryView()
+		{
+			SetContentView(Resource.Layout.entry_view);
+		}
+
+		protected void SetupEditButtons()
+		{
+			View edit = FindViewById(Resource.Id.entry_edit);
+			if (true)
+			{
+				edit.Visibility = ViewStates.Visible;
+				edit.Click += (sender, e) =>
+					{
+
+					};
+			}
+			else
+			{
+				edit.Visibility = ViewStates.Gone;
+			}
+
+		}
+
+		private class PluginActionReceiver : BroadcastReceiver
+		{
+			private readonly EntryActivity _activity;
+
+			public PluginActionReceiver(EntryActivity activity)
+			{
+				_activity = activity;
+			}
+
+			public override void OnReceive(Context context, Intent intent)
+			{
+				var pluginPackage = intent.GetStringExtra(Strings.ExtraSender);
+				if (new PluginDatabase(context).IsValidAccessToken(pluginPackage,
+				                                                   intent.GetStringExtra(Strings.ExtraAccessToken),
+				                                                   Strings.ScopeCurrentEntry))
+				{
+					if (intent.GetStringExtra(Strings.ExtraEntryId) != _activity.Entry.Uuid.ToHexString())
+					{
+						Kp2aLog.Log("received action for wrong entry " + intent.GetStringExtra(Strings.ExtraEntryId));
+						return;
+					}
+					_activity.AddPluginAction(pluginPackage,
+					                          intent.GetStringExtra(Strings.ExtraFieldId),
+											  intent.GetStringExtra(Strings.ExtraActionId),
+					                          intent.GetStringExtra(Strings.ExtraActionDisplayText),
+					                          intent.GetIntExtra(Strings.ExtraActionIconResId, -1),
+					                          intent.GetBundleExtra(Strings.ExtraActionData));
+				}
+				else
+				{
+					Kp2aLog.Log("received invalid request. Plugin not authorized.");
+				}
+			}
+		}
+
+		private class PluginFieldReceiver : BroadcastReceiver
+		{
+			private readonly EntryActivity _activity;
+
+			public PluginFieldReceiver(EntryActivity activity)
+			{
+				_activity = activity;
+			}
+
+			public override void OnReceive(Context context, Intent intent)
+			{
+				if (intent.GetStringExtra(Strings.ExtraEntryId) != _activity.Entry.Uuid.ToHexString())
+				{
+					Kp2aLog.Log("received field for wrong entry " + intent.GetStringExtra(Strings.ExtraEntryId));
+					return;
+				}
+				if (!new PluginDatabase(context).IsValidAccessToken(intent.GetStringExtra(Strings.ExtraSender),
+				                                                    intent.GetStringExtra(Strings.ExtraAccessToken),
+				                                                    Strings.ScopeCurrentEntry))
+				{
+					Kp2aLog.Log("received field with invalid access token from " + intent.GetStringExtra(Strings.ExtraSender));
+					return;
+				}
+				string key = intent.GetStringExtra(Strings.ExtraFieldId);
+				string value = intent.GetStringExtra(Strings.ExtraFieldValue);
+				bool isProtected = intent.GetBooleanExtra(Strings.ExtraFieldProtected, false);
+				_activity.SetPluginField(key, value, isProtected);
+			}
+		}
+
+		private void SetPluginField(string key, string value, bool isProtected)
+		{
+			//update or add the string view:
+			IStringView existingField;
+			if (_stringViews.TryGetValue(key, out existingField))
+			{
+				existingField.Text = value;
+			}
+			else
+			{
+				ViewGroup extraGroup = (ViewGroup) FindViewById(Resource.Id.extra_strings);
+				var view = CreateExtraSection(key, value, isProtected);
+				extraGroup.AddView(view.View);
+			}
+
+			//update the Entry output in the App database and notify the CopyToClipboard service
+			App.Kp2A.GetDb().LastOpenedEntry.OutputStrings.Set(key, new ProtectedString(isProtected, value));
+			Intent updateKeyboardIntent = new Intent(this, typeof(CopyToClipboardService));
+			Intent.SetAction(Intents.UpdateKeyboard);
+			updateKeyboardIntent.PutExtra(KeyEntry, Entry.Uuid.ToHexString());
+			StartService(updateKeyboardIntent);
+
+			//notify plugins
+			NotifyPluginsOnModification(Strings.PrefixString+key);
+		}
+
+		private void AddPluginAction(string pluginPackage, string fieldId, string popupItemId, string displayText, int iconId, Bundle bundleExtra)
+		{
+			if (fieldId != null)
+			{
+				try
+				{
+					//create a new popup item for the plugin action:
+					var newPopup = new PluginPopupMenuItem(this, pluginPackage, fieldId, popupItemId, displayText, iconId, bundleExtra);
+					//see if we already have a popup item for this field with the same item id
+					var popupsForField = _popupMenuItems[fieldId];
+					var popupItemPos = popupsForField.FindIndex(0,
+															item =>
+															(item is PluginPopupMenuItem) &&
+															((PluginPopupMenuItem)item).PopupItemId == popupItemId);
+
+					//replace existing or add
+					if (popupItemPos >= 0)
+					{
+						popupsForField[popupItemPos] = newPopup;
+					}
+					else
+					{
+						popupsForField.Add(newPopup);
+					}
+				}
+				catch (Exception e)
+				{
+					Kp2aLog.Log(e.ToString());
+				}
+				
+			}
+			else
+			{
+				//we need to add an option to the  menu.
+				//As it is not sure that OnCreateOptionsMenu was called yet, we cannot access _menu without a check:
+
+				Intent i = new Intent(Strings.ActionEntryActionSelected);
+				i.SetPackage(pluginPackage);
+				i.PutExtra(Strings.ExtraActionData, bundleExtra);
+				i.PutExtra(Strings.ExtraSender, PackageName);
+				PluginHost.AddEntryToIntent(i, App.Kp2A.GetDb().LastOpenedEntry);
+
+				var menuOption = new PluginMenuOption()
+					{
+						DisplayText = displayText,
+						Icon = PackageManager.GetResourcesForApplication(pluginPackage).GetDrawable(iconId),
+						Intent = i
+					};
+
+				if (_menu != null)
+				{
+					AddMenuOption(menuOption);
+				}
+				else
+				{
+					lock (_pendingMenuOptions)
+					{
+						_pendingMenuOptions.Add(menuOption);
+					}
+
+				}
+
+
+			}
+		}
+
+		private void AddMenuOption(PluginMenuOption menuOption)
+		{
+			var menuItem = _menu.Add(menuOption.DisplayText);
+			menuItem.SetIcon(menuOption.Icon);
+			menuItem.SetIntent(menuOption.Intent);
+		}
+
+		public override bool OnCreateOptionsMenu(IMenu menu)
+		{
+			_menu = menu;
+			base.OnCreateOptionsMenu(menu);
+
+			MenuInflater inflater = MenuInflater;
+			inflater.Inflate(Resource.Menu.entry, menu);
+
+			lock (_pendingMenuOptions)
+			{
+				foreach (var option in _pendingMenuOptions)
+					AddMenuOption(option);
+				_pendingMenuOptions.Clear();
+			}
+
+
+			UpdateTogglePasswordMenu();
+
+			IMenuItem gotoUrl = menu.FindItem(Resource.Id.menu_goto_url);
+			//Disabled IMenuItem copyUser = menu.FindItem(Resource.Id.menu_copy_user);
+			//Disabled IMenuItem copyPass = menu.FindItem(Resource.Id.menu_copy_pass);
+
+			// In API >= 11 onCreateOptionsMenu may be called before onCreate completes
+			// so _entry may not be set
+			if (Entry == null)
+			{
+				gotoUrl.SetVisible(false);
+				//Disabled copyUser.SetVisible(false);
+				//Disabled copyPass.SetVisible(false);
+			}
+			else
+			{
+				String url = Entry.Strings.ReadSafe(PwDefs.UrlField);
+				if (String.IsNullOrEmpty(url))
+				{
+					// disable button if url is not available
+					gotoUrl.SetVisible(false);
+				}
+				if (String.IsNullOrEmpty(Entry.Strings.ReadSafe(PwDefs.UserNameField)))
+				{
+					// disable button if username is not available
+					//Disabled copyUser.SetVisible(false);
+				}
+				if (String.IsNullOrEmpty(Entry.Strings.ReadSafe(PwDefs.PasswordField)))
+				{
+					// disable button if password is not available
+					//Disabled copyPass.SetVisible(false);
+				}
+			}
+			return true;
+		}
+
+		public override bool OnOptionsItemSelected(IMenuItem item)
+		{
+			//check if this is a plugin action
+			if ((item.Intent != null) && (item.Intent.Action == Strings.ActionEntryActionSelected))
+			{
+				//yes. let the plugin handle the click:
+				SendBroadcast(item.Intent);
+				return true;
+			}
+
+			switch (item.ItemId)
+			{
+				case Resource.Id.menu_donate:
+					try
+					{
+						//						Util.GotoDonateUrl(this);
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.error_failed_to_launch_link, ToastLength.Long).Show();
+						return false;
+					}
+
+					return true;
+				case Resource.Id.menu_toggle_pass:
+					if (_showPassword)
+					{
+						item.SetTitle(Resource.String.show_password);
+						_showPassword = false;
+					}
+					else
+					{
+						item.SetTitle(Resource.String.menu_hide_password);
+						_showPassword = true;
+					}
+					SetPasswordStyle();
+
+					return true;
+
+				case Resource.Id.menu_goto_url:
+					string url = _stringViews[PwDefs.UrlField].Text;
+					if (url == null) return false;
+
+					// Default http:// if no protocol specified
+					if (!url.Contains("://"))
+					{
+						url = "http://" + url;
+					}
+
+					try
+					{
+
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
+					}
+					return true;
+					/* TODO: required?
+			case Resource.Id.menu_copy_user:
+				timeoutCopyToClipboard(_entry.Strings.ReadSafe (PwDefs.UserNameField));
+				return true;
+				
+			case Resource.Id.menu_copy_pass:
+				timeoutCopyToClipboard(_entry.Strings.ReadSafe (PwDefs.UserNameField));
+				return true;
+				*/
+				case Resource.Id.menu_rate:
+					try
+					{
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
+					}
+					return true;
+				case Resource.Id.menu_suggest_improvements:
+					try
+					{
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
+					}
+					return true;
+				case Resource.Id.menu_lock:
+					return true;
+				case Resource.Id.menu_translate:
+					try
+					{
+
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
+					}
+					return true;
+				case Android.Resource.Id.Home:
+					//Currently the action bar only displays the home button when we come from a previous activity.
+					//So we can simply Finish. See this page for information on how to do this in more general (future?) cases:
+					//http://developer.android.com/training/implementing-navigation/ancestral.html
+					Finish();
+
+					return true;
+			}
+
+
+			return base.OnOptionsItemSelected(item);
+		}
+
+
+		protected override void OnCreate(Bundle savedInstanceState)
+		{
+
+			ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
+
+			long usageCount = prefs.GetLong(GetString(Resource.String.UsageCount_key), 0);
+
+			ISharedPreferencesEditor edit = prefs.Edit();
+			edit.PutLong(GetString(Resource.String.UsageCount_key), usageCount + 1);
+			edit.Commit();
+
+			_showPassword =
+				!prefs.GetBoolean(GetString(Resource.String.maskpass_key), Resources.GetBoolean(Resource.Boolean.maskpass_default));
+
+			Entry.Strings.Set(PwDefs.UserNameField, new ProtectedString(false, "philipp "));
+			Entry.Strings.Set(PwDefs.PasswordField, new ProtectedString(true, "password value"));
+			Entry.Strings.Set(PwDefs.UrlField, new ProtectedString(false, "https://www.google.com"));
+			Entry.Strings.Set("field header", new ProtectedString(true, "protected field value"));
+			Entry.Strings.Set("public field header", new ProtectedString(false, "public field value"));
+
+			base.OnCreate(savedInstanceState);
+			SetEntryView();
+
+			FillData();
+
+			SetupEditButtons();
+
+			App.Kp2A.GetDb().LastOpenedEntry = new PwEntryOutput(Entry, App.Kp2A.GetDb().KpDatabase);
+
+			RegisterReceiver(new PluginActionReceiver(this), new IntentFilter(Strings.ActionAddEntryAction));
+			RegisterReceiver(new PluginFieldReceiver(this), new IntentFilter(Strings.ActionSetEntryField));
+
+			new Thread(NotifyPluginsOnOpen).Start();
+		}
+
+		private void NotifyPluginsOnOpen()
+		{
+			App.Kp2A.GetDb().SetEntry(Entry);
+
+			Intent i = new Intent(Strings.ActionOpenEntry);
+			i.PutExtra(Strings.ExtraSender, PackageName);
+			AddEntryToIntent(i);
+
+
+			foreach (var plugin in new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeCurrentEntry))
+			{
+				i.SetPackage(plugin);
+				SendBroadcast(i);
+			}
+		}
+		private void NotifyPluginsOnModification(string fieldId)
+		{
+			Intent i = new Intent(Strings.ActionEntryOutputModified);
+			i.PutExtra(Strings.ExtraSender, PackageName);
+			i.PutExtra(Strings.ExtraFieldId, fieldId);
+			AddEntryToIntent(i);
+
+
+			foreach (var plugin in new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeCurrentEntry))
+			{
+				i.SetPackage(plugin);
+				SendBroadcast(i);
+			}
+		}
+
+		public void CompleteOnCreate()
+		{
+
+		}
+
+
+		private String getDateTime(DateTime dt)
+		{
+			return dt.ToString("g", CultureInfo.CurrentUICulture);
+		}
+
+		private String concatTags(List<string> tags)
+		{
+			StringBuilder sb = new StringBuilder();
+			foreach (string tag in tags)
+			{
+				sb.Append(tag);
+				sb.Append(", ");
+			}
+			if (tags.Count > 0)
+				sb.Remove(sb.Length - 2, 2);
+			return sb.ToString();
+		}
+
+		private void PopulateExtraStrings()
+		{
+			ViewGroup extraGroup = (ViewGroup) FindViewById(Resource.Id.extra_strings);
+			foreach (var pair in Entry.Strings.Where(pair => !PwDefs.IsStandardField(pair.Key)).OrderBy(pair => pair.Key))
+			{
+				var stringView = CreateExtraSection(pair.Key, pair.Value.ReadString(), pair.Value.IsProtected);
+				extraGroup.AddView(stringView.View);
+			}
+
+		}
+
+		private ExtraStringView CreateExtraSection(string key, string value, bool isProtected)
+		{
+			LinearLayout layout = new LinearLayout(this, null) {Orientation = Orientation.Vertical};
+			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent,
+			                                                                       ViewGroup.LayoutParams.WrapContent);
+
+			layout.LayoutParameters = layoutParams;
+			View viewInflated = LayoutInflater.Inflate(Resource.Layout.entry_extrastring_title, null);
+			TextView keyView = viewInflated.FindViewById<TextView>(Resource.Id.entry_title);
+			if (key != null)
+				keyView.Text = key;
+
+			layout.AddView(viewInflated);
+			RelativeLayout valueViewContainer =
+				(RelativeLayout) LayoutInflater.Inflate(Resource.Layout.entry_extrastring_value, null);
+			var valueView = valueViewContainer.FindViewById<TextView>(Resource.Id.entry_extra);
+			if (value != null)
+				valueView.Text = value;
+			SetPasswordTypeface(valueView);
+			if (isProtected)
+			{
+				RegisterProtectedTextView(valueView);
+				valueView.TransformationMethod = PasswordTransformationMethod.Instance;
+			}
+
+			layout.AddView(valueViewContainer);
+			var stringView = new ExtraStringView(layout, valueView, keyView);
+
+			_stringViews.Add(key, stringView);
+			RegisterTextPopup(valueViewContainer, valueViewContainer.FindViewById(Resource.Id.extra_vdots), key, isProtected);
+
+			return stringView;
+
+		}
+
+		private List<IPopupMenuItem> RegisterPopup(string popupKey, View clickView, View anchorView)
+		{
+			clickView.Click += (sender, args) =>
+				{
+					ShowPopup(anchorView, popupKey);
+				};
+			_popupMenuItems[popupKey] = new List<IPopupMenuItem>();
+			return _popupMenuItems[popupKey];
+		}
+
+
+		private void RegisterProtectedTextView(TextView protectedTextView)
+		{
+			_protectedTextViews.Add(protectedTextView);
+		}
+
+
+		private void PopulateBinaries()
+		{
+			ViewGroup binariesGroup = (ViewGroup) FindViewById(Resource.Id.binaries);
+			foreach (KeyValuePair<string, string> pair in new Dictionary<string, string>())
+			{
+				String key = pair.Key;
+
+
+				RelativeLayout valueViewContainer =
+					(RelativeLayout) LayoutInflater.Inflate(Resource.Layout.entry_extrastring_value, null);
+				var valueView = valueViewContainer.FindViewById<TextView>(Resource.Id.entry_extra);
+				if (key != null)
+					valueView.Text = key;
+
+				string popupKey = Strings.PrefixBinary + key;
+
+				var itemList = RegisterPopup(popupKey, valueViewContainer, valueViewContainer.FindViewById(Resource.Id.extra_vdots));
+				itemList.Add(new WriteBinaryToFilePopupItem(key, this));
+				itemList.Add(new OpenBinaryPopupItem(key, this));
+
+
+
+
+				binariesGroup.AddView(valueViewContainer);
+				/*
+				Button binaryButton = new Button(this);
+				RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent);
+				binaryButton.Text = key;
+				binaryButton.SetCompoundDrawablesWithIntrinsicBounds( Resources.GetDrawable(Android.Resource.Drawable.IcMenuSave),null, null, null);
+				binaryButton.Click += (sender, e) => 
+				{
+					Button btnSender = (Button)(sender);
+
+					AlertDialog.Builder builder = new AlertDialog.Builder(this);
+					builder.SetTitle(GetString(Resource.String.SaveAttachmentDialog_title));
+					
+					builder.SetMessage(GetString(Resource.String.SaveAttachmentDialog_text));
+					
+					builder.SetPositiveButton(GetString(Resource.String.SaveAttachmentDialog_save), (dlgSender, dlgEvt) => 
+					                                                                                                                    {
+							
+						});
+					
+					builder.SetNegativeButton(GetString(Resource.String.SaveAttachmentDialog_open), (dlgSender, dlgEvt) => 
+					                                                                                                                   {
+							
+						});
+
+					Dialog dialog = builder.Create();
+					dialog.Show();
+
+
+				};
+				binariesGroup.AddView(binaryButton,layoutParams);
+				*/
+
+			}
+			FindViewById(Resource.Id.entry_binaries_label).Visibility = true ? ViewStates.Visible : ViewStates.Gone;
+		}
+
+		// url = file path or whatever suitable URL you want.
+		public static String GetMimeType(String url)
+		{
+			String type = null;
+			String extension = MimeTypeMap.GetFileExtensionFromUrl(url);
+			if (extension != null)
+			{
+				MimeTypeMap mime = MimeTypeMap.Singleton;
+				type = mime.GetMimeTypeFromExtension(extension);
+			}
+			return type;
+		}
+
+		public override void OnBackPressed()
+		{
+			base.OnBackPressed();
+		}
+
+		protected void FillData()
+		{
+			_protectedTextViews = new List<TextView>();
+			ImageView iv = (ImageView) FindViewById(Resource.Id.entry_icon);
+			if (iv != null)
+			{
+				iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00));
+			}
+
+
+
+			ActionBar.Title = "Entry title";
+			ActionBar.SetDisplayHomeAsUpEnabled(true);
+
+
+
+			PopulateStandardText(Resource.Id.entry_user_name, Resource.Id.entryfield_container_username, PwDefs.UserNameField);
+			PopulateStandardText(Resource.Id.entry_url, Resource.Id.entryfield_container_url, PwDefs.UrlField);
+			PopulateStandardText(Resource.Id.entry_password, Resource.Id.entryfield_container_password, PwDefs.PasswordField);
+			RegisterProtectedTextView(FindViewById<TextView>(Resource.Id.entry_password));
+			SetPasswordTypeface(FindViewById<TextView>(Resource.Id.entry_password));
+
+			RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.username_container),
+			                  FindViewById(Resource.Id.username_vdots), PwDefs.UserNameField);
+			RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.url_container),
+			                  FindViewById(Resource.Id.url_vdots), PwDefs.UrlField)
+				.Add(new GotoUrlMenuItem(this));
+			RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.password_container),
+			                  FindViewById(Resource.Id.password_vdots), PwDefs.PasswordField);
+
+
+			PopulateText(Resource.Id.entry_created, Resource.Id.entryfield_container_created, getDateTime(Entry.CreationTime));
+			PopulateText(Resource.Id.entry_modified, Resource.Id.entryfield_container_modified, getDateTime(Entry.LastModificationTime));
+
+			if (Entry.Expires)
+			{
+				PopulateText(Resource.Id.entry_expires, Resource.Id.entryfield_container_expires, getDateTime(Entry.ExpiryTime));
+
+			}
+			else
+			{
+				PopulateText(Resource.Id.entry_expires, Resource.Id.entryfield_container_expires, null);
+			}
+			PopulateStandardText(Resource.Id.entry_comment, Resource.Id.entryfield_container_comment, PwDefs.NotesField);
+			PopulateText(Resource.Id.entry_tags, Resource.Id.entryfield_container_tags, concatTags(Entry.Tags));
+			PopulateText(Resource.Id.entry_override_url, Resource.Id.entryfield_container_overrideurl, Entry.OverrideUrl);
+
+			PopulateExtraStrings();
+
+			PopulateBinaries();
+
+			SetPasswordStyle();
+		}
+
+		protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
+		{
+			base.OnActivityResult(requestCode, resultCode, data);
+			if (resultCode == /*TODO*/ 0)
+			{
+				if (resultCode == /*TODO*/ 0)
+				{
+					RequiresRefresh();
+				}
+				Recreate();
+			}
+		}
+
+		protected override void OnDestroy()
+		{
+			NotifyPluginsOnClose();
+			base.OnDestroy();
+		}
+
+		private void NotifyPluginsOnClose()
+		{
+			Intent i = new Intent(Strings.ActionCloseEntryView);
+			i.PutExtra(Strings.ExtraSender, PackageName);
+			foreach (var plugin in new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeCurrentEntry))
+			{
+				i.SetPackage(plugin);
+				SendBroadcast(i);
+			}
+		}
+		private List<IPopupMenuItem> RegisterTextPopup(View container, View anchor, string fieldKey)
+		{
+			return RegisterTextPopup(container, anchor, fieldKey, Entry.Strings.GetSafe(fieldKey).IsProtected);
+		}
+
+		private List<IPopupMenuItem> RegisterTextPopup(View container, View anchor, string fieldKey, bool isProtected)
+		{
+			string popupKey = Strings.PrefixString + fieldKey;
+			var popupItems = RegisterPopup(
+				popupKey,
+				container,
+				anchor);
+			popupItems.Add(new CopyToClipboardPopupMenuIcon(this, _stringViews[fieldKey]));
+			if (isProtected)
+				popupItems.Add(new ToggleVisibilityPopupMenuItem(this));
+			return popupItems;
+		}
+
+
+
+		private void ShowPopup(View anchor, string popupKey)
+		{
+			//PopupMenu popupMenu = new PopupMenu(this, FindViewById(Resource.Id.entry_user_name));
+			PopupMenu popupMenu = new PopupMenu(this, anchor);
+
+			AccessManager.PreparePopup(popupMenu);
+			int itemId = 0;
+			foreach (IPopupMenuItem popupItem in _popupMenuItems[popupKey])
+			{
+				popupMenu.Menu.Add(0, itemId, 0, popupItem.Text)
+				         .SetIcon(popupItem.Icon);
+				itemId++;
+			}
+
+			popupMenu.MenuItemClick += delegate(object sender, PopupMenu.MenuItemClickEventArgs args)
+				{
+					_popupMenuItems[popupKey][args.Item.ItemId].HandleClick();
+				};
+			popupMenu.Show();
+		}
+
+		private void ShowPopup(int resAnchor, string popupKey)
+		{
+			ShowPopup(FindViewById(resAnchor), popupKey);
+		}
+
+		private void SetPasswordTypeface(TextView textView)
+		{
+
+		}
+
+		private void PopulateText(int viewId, int containerViewId, int resId)
+		{
+			View header = FindViewById(containerViewId);
+			TextView tv = (TextView) FindViewById(viewId);
+
+			header.Visibility = tv.Visibility = ViewStates.Visible;
+			tv.SetText(resId);
+		}
+
+		private void PopulateText(int viewId, int containerViewId, String text)
+		{
+			View container = FindViewById(containerViewId);
+			TextView tv = (TextView) FindViewById(viewId);
+			if (String.IsNullOrEmpty(text))
+			{
+				container.Visibility = tv.Visibility = ViewStates.Gone;
+			}
+			else
+			{
+				container.Visibility = tv.Visibility = ViewStates.Visible;
+				tv.Text = text;
+
+			}
+		}
+
+		private void PopulateStandardText(int viewId, int containerViewId, String key)
+		{
+			PopulateText(viewId, containerViewId, Entry.Strings.ReadSafe(key));
+			_stringViews.Add(key, new StandardStringView(viewId, containerViewId, this));
+		}
+
+		private void RequiresRefresh()
+		{
+			Intent ret = new Intent();
+			ret.PutExtra(KeyRefreshPos, _pos);
+
+		}
+
+
+
+		private void SetPasswordStyle()
+		{
+			foreach (TextView password in _protectedTextViews)
+			{
+
+				if (_showPassword)
+				{
+					password.TransformationMethod = null;
+				}
+				else
+				{
+					password.TransformationMethod = PasswordTransformationMethod.Instance;
+				}
+			}
+		}
+
+		protected override void OnResume()
+		{
+
+			base.OnResume();
+		}
+
+		/// <summary>
+		/// brings up a dialog asking the user whether he wants to add the given URL to the entry for automatic finding
+		/// </summary>
+		public void AskAddUrlThenCompleteCreate(string url)
+		{
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			builder.SetTitle(GetString(Resource.String.AddUrlToEntryDialog_title));
+
+			builder.SetMessage(GetString(Resource.String.AddUrlToEntryDialog_text, new Java.Lang.Object[] {url}));
+
+			builder.SetPositiveButton(GetString(Resource.String.yes), (dlgSender, dlgEvt) =>
+				{
+
+				});
+
+			builder.SetNegativeButton(GetString(Resource.String.no), (dlgSender, dlgEvt) =>
+				{
+					CompleteOnCreate();
+				});
+
+			Dialog dialog = builder.Create();
+			dialog.Show();
+
+		}
+
+		public void ToggleVisibility()
+		{
+			_showPassword = !_showPassword;
+			SetPasswordStyle();
+			UpdateTogglePasswordMenu();
+		}
+
+		public Android.Net.Uri WriteBinaryToFile(string key, bool writeToCacheDirectory)
+		{
+			return Android.Net.Uri.Empty;
+			//TODO
+		}
+
+		private void UpdateTogglePasswordMenu()
+		{
+			//todo use real method
+		}
+
+		public void GotoUrl()
+		{
+			//TODO
+			
+		}
+
+		public void OpenBinaryFile(Uri newUri)
+		{
+			Toast.MakeText(this, "opening file TODO", ToastLength.Short).Show();
+		}
+
+		public void AddEntryToIntent(Intent intent)
+		{
+			PluginHost.AddEntryToIntent(intent, App.Kp2A.GetDb().LastOpenedEntry);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs b/src/PluginHostTest/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
new file mode 100644
index 00000000..a1a4207d
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
@@ -0,0 +1,41 @@
+using Android.Content;
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Reperesents the popup menu item in EntryActivity to copy a string to clipboard
+	/// </summary>
+	class CopyToClipboardPopupMenuIcon : IPopupMenuItem
+	{
+		private readonly Context _context;
+		private readonly IStringView _stringView;
+
+		public CopyToClipboardPopupMenuIcon(Context context, IStringView stringView)
+		{
+			_context = context;
+			_stringView = stringView;
+			
+		}
+
+		public Drawable Icon 
+		{ 
+			get
+			{
+				return _context.Resources.GetDrawable(Resource.Drawable.ic_menu_copy_holo_light);
+			}
+		}
+		public string Text
+		{
+			//TODO localize
+			get { return "Copy to clipboard"; }
+		}
+
+		
+		public void HandleClick()
+		{
+			CopyToClipboardService.CopyValueToClipboardWithTimeout(_context, _stringView.Text);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/ExtraStringView.cs b/src/PluginHostTest/EntryActivityClasses/ExtraStringView.cs
new file mode 100644
index 00000000..65edfb48
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/ExtraStringView.cs
@@ -0,0 +1,44 @@
+using System;
+using Android.Views;
+using Android.Widget;
+
+namespace keepass2android
+{
+	internal class ExtraStringView : IStringView
+	{
+		private readonly View _container;
+		private readonly TextView _valueView;
+		private readonly TextView _keyView;
+
+		public ExtraStringView(LinearLayout container, TextView valueView, TextView keyView)
+		{
+			_container = container;
+			_valueView = valueView;
+			_keyView = keyView;
+		}
+
+		public View View
+		{
+			get { return _container; }
+		}
+
+		public string Text
+		{
+			get { return _valueView.Text; }
+			set
+			{
+				if (String.IsNullOrEmpty(value))
+				{
+					_valueView.Visibility = ViewStates.Gone;
+					_keyView.Visibility = ViewStates.Gone;
+				}
+				else
+				{
+					_valueView.Visibility = ViewStates.Visible;
+					_keyView.Visibility = ViewStates.Visible;
+					_valueView.Text = value;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/GotoUrlMenuItem.cs b/src/PluginHostTest/EntryActivityClasses/GotoUrlMenuItem.cs
new file mode 100644
index 00000000..deacae1e
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/GotoUrlMenuItem.cs
@@ -0,0 +1,34 @@
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Reperesents the popup menu item in EntryActivity to go to the URL in the field
+	/// </summary>
+	class GotoUrlMenuItem : IPopupMenuItem
+	{
+		private readonly EntryActivity _ctx;
+
+		public GotoUrlMenuItem(EntryActivity ctx)
+		{
+			_ctx = ctx;
+		}
+
+		public Drawable Icon
+		{
+			get { return _ctx.Resources.GetDrawable(Android.Resource.Drawable.IcMenuUpload); }
+		}
+
+		public string Text
+		{
+			get { return _ctx.Resources.GetString(Resource.String.menu_url); }
+		}
+
+		public void HandleClick()
+		{
+			//TODO
+			_ctx.GotoUrl();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/IPopupMenuItem.cs b/src/PluginHostTest/EntryActivityClasses/IPopupMenuItem.cs
new file mode 100644
index 00000000..9cb8c149
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/IPopupMenuItem.cs
@@ -0,0 +1,17 @@
+using System;
+using Android.Graphics.Drawables;
+using KeePassLib;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Interface for popup menu items in EntryActivity
+	/// </summary>
+	internal interface IPopupMenuItem	
+	{
+		Drawable Icon { get; }
+		String Text { get; }
+
+		void HandleClick();
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/IStringView.cs b/src/PluginHostTest/EntryActivityClasses/IStringView.cs
new file mode 100644
index 00000000..a5c5036c
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/IStringView.cs
@@ -0,0 +1,7 @@
+namespace keepass2android
+{
+	internal interface IStringView
+	{
+		string Text { set; get; }
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/OpenBinaryPopupItem.cs b/src/PluginHostTest/EntryActivityClasses/OpenBinaryPopupItem.cs
new file mode 100644
index 00000000..38c07867
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/OpenBinaryPopupItem.cs
@@ -0,0 +1,40 @@
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents the popup menu item in EntryActivity to open the associated attachment
+	/// </summary>
+	internal class OpenBinaryPopupItem : IPopupMenuItem
+	{
+		private readonly string _key;
+		private readonly EntryActivity _entryActivity;
+
+		public OpenBinaryPopupItem(string key, EntryActivity entryActivity)
+		{
+			_key = key;
+			_entryActivity = entryActivity;
+		}
+
+		public Drawable Icon
+		{
+			get { return _entryActivity.Resources.GetDrawable(Android.Resource.Drawable.IcMenuShare); }
+		}
+
+		public string Text
+		{
+			get { return _entryActivity.Resources.GetString(Resource.String.SaveAttachmentDialog_open); }
+		}
+
+		public void HandleClick()
+		{
+			Android.Net.Uri newUri = _entryActivity.WriteBinaryToFile(_key, true);
+			if (newUri != null)
+			{
+				_entryActivity.OpenBinaryFile(newUri);
+			}
+			
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/PluginMenuOption.cs b/src/PluginHostTest/EntryActivityClasses/PluginMenuOption.cs
new file mode 100644
index 00000000..d3e91ef4
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/PluginMenuOption.cs
@@ -0,0 +1,14 @@
+using Android.Content;
+using Android.Graphics.Drawables;
+
+namespace keepass2android
+{
+	class PluginMenuOption
+	{
+		public string DisplayText { get; set; }
+
+		public Drawable Icon { get; set; }
+
+		public Intent Intent { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/PluginPopupMenuItem.cs b/src/PluginHostTest/EntryActivityClasses/PluginPopupMenuItem.cs
new file mode 100644
index 00000000..779f02ad
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/PluginPopupMenuItem.cs
@@ -0,0 +1,59 @@
+using Android.Content;
+using Android.Graphics.Drawables;
+using Android.OS;
+using Keepass2android.Pluginsdk;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents a popup menu item in EntryActivity which was added by a plugin. The click will therefore broadcast to the plugin.
+	/// </summary>
+	class PluginPopupMenuItem : IPopupMenuItem
+	{
+		private readonly EntryActivity _activity;
+		private readonly string _pluginPackage;
+		private readonly string _fieldId;
+		private readonly string _popupItemId;
+		private readonly string _displayText;
+		private readonly int _iconId;
+		private readonly Bundle _bundleExtra;
+
+		public PluginPopupMenuItem(EntryActivity activity, string pluginPackage, string fieldId, string popupItemId, string displayText, int iconId, Bundle bundleExtra)
+		{
+			_activity = activity;
+			_pluginPackage = pluginPackage;
+			_fieldId = fieldId;
+			_popupItemId = popupItemId;
+			_displayText = displayText;
+			_iconId = iconId;
+			_bundleExtra = bundleExtra;
+		}
+
+		public Drawable Icon 
+		{ 
+			get { return _activity.PackageManager.GetResourcesForApplication(_pluginPackage).GetDrawable(_iconId); }
+		}
+		public string Text 
+		{ 
+			get { return _displayText; } 
+		}
+
+		public string PopupItemId
+		{
+			get { return _popupItemId; }
+		}
+
+		public void HandleClick()
+		{
+			Intent i = new Intent(Strings.ActionEntryActionSelected);
+			i.SetPackage(_pluginPackage);
+			i.PutExtra(Strings.ExtraActionData, _bundleExtra);
+			i.PutExtra(Strings.ExtraFieldId, _fieldId);
+			i.PutExtra(Strings.ExtraSender, _activity.PackageName);
+
+			_activity.AddEntryToIntent(i);
+
+			_activity.SendBroadcast(i);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/StandardStringView.cs b/src/PluginHostTest/EntryActivityClasses/StandardStringView.cs
new file mode 100644
index 00000000..bcbcb019
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/StandardStringView.cs
@@ -0,0 +1,44 @@
+using System;
+using Android.App;
+using Android.Views;
+using Android.Widget;
+
+namespace keepass2android
+{
+	internal class StandardStringView : IStringView
+	{
+		private readonly int _viewId;
+		private readonly int _containerViewId;
+		private readonly Activity _activity;
+
+		public StandardStringView(int viewId, int containerViewId, Activity activity)
+		{
+			_viewId = viewId;
+			_containerViewId = containerViewId;
+			_activity = activity;
+		}
+
+		public string Text
+		{
+			set
+			{
+				View container = _activity.FindViewById(_containerViewId);
+				TextView tv = (TextView) _activity.FindViewById(_viewId);
+				if (String.IsNullOrEmpty(value))
+				{
+					container.Visibility = tv.Visibility = ViewStates.Gone;
+				}
+				else
+				{
+					container.Visibility = tv.Visibility = ViewStates.Visible;
+					tv.Text = value;
+				}
+			}
+			get
+			{
+				TextView tv = (TextView) _activity.FindViewById(_viewId);
+				return tv.Text;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs b/src/PluginHostTest/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
new file mode 100644
index 00000000..54ff1890
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
@@ -0,0 +1,46 @@
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Reperesents the popup menu item in EntryActivity to toggle visibility of all protected strings (e.g. Password)
+	/// </summary>
+	class ToggleVisibilityPopupMenuItem : IPopupMenuItem
+	{
+		private readonly EntryActivity _activity;
+		
+
+		public ToggleVisibilityPopupMenuItem(EntryActivity activity)
+		{
+			_activity = activity;
+			
+		}
+
+		public Drawable Icon 
+		{ 
+			get
+			{
+				//return new TextDrawable("\uF06E", _activity);
+				return _activity.Resources.GetDrawable(Resource.Drawable.ic_action_eye_open);
+				
+			}
+		}
+		public string Text
+		{
+			get
+			{
+				return _activity.Resources.GetString(
+					_activity._showPassword ? 
+						Resource.String.menu_hide_password 
+						: Resource.String.show_password);
+			}
+		}
+
+		
+		public void HandleClick()
+		{
+			_activity.ToggleVisibility();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/EntryActivityClasses/WriteBinaryToFilePopupItem.cs b/src/PluginHostTest/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
new file mode 100644
index 00000000..a90fc61b
--- /dev/null
+++ b/src/PluginHostTest/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
@@ -0,0 +1,35 @@
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents the popup menu item in EntryActivity to store the binary attachment on SD card
+	/// </summary>
+	internal class WriteBinaryToFilePopupItem : IPopupMenuItem
+	{
+		private readonly string _key;
+		private readonly EntryActivity _activity;
+
+		public WriteBinaryToFilePopupItem(string key, EntryActivity activity)
+		{
+			_key = key;
+			_activity = activity;
+		}
+
+		public Drawable Icon
+		{
+			get { return _activity.Resources.GetDrawable(Android.Resource.Drawable.IcMenuSave); }
+		}
+
+		public string Text
+		{
+			get { return _activity.Resources.GetString(Resource.String.SaveAttachmentDialog_save); }
+		}
+
+		public void HandleClick()
+		{
+			_activity.WriteBinaryToFile(_key, false);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/views/GroupHeaderView.cs b/src/PluginHostTest/EntryContentsView.cs
similarity index 67%
rename from src/keepass2android/views/GroupHeaderView.cs
rename to src/PluginHostTest/EntryContentsView.cs
index aebf7fa6..2c2730f9 100644
--- a/src/keepass2android/views/GroupHeaderView.cs
+++ b/src/PluginHostTest/EntryContentsView.cs
@@ -15,41 +15,49 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
   */
 
-using System;
 using Android.Content;
-using Android.Runtime;
+using Android.Util;
 using Android.Views;
 using Android.Widget;
-using Android.Util;
+
+using System;
+using Android.Runtime;
+using PluginHostTest;
+
 
 namespace keepass2android.view
 {
 	
-	public class GroupHeaderView : RelativeLayout {
+	public class EntryContentsView : LinearLayout {
 
-		public GroupHeaderView (IntPtr javaReference, JniHandleOwnership transfer)
+		public EntryContentsView (IntPtr javaReference, JniHandleOwnership transfer)
 			: base(javaReference, transfer)
 		{
-			
-		}
 
-		public GroupHeaderView(Context context) :base(context) {
-			
+		}
+		
+		public EntryContentsView(Context context):base(context, null) {
 			InflateView();
 		}
 		
-		public GroupHeaderView(Context context, IAttributeSet attrs):base(context,attrs) {
-						
+		public EntryContentsView(Context context, IAttributeSet attrs): base(context, attrs) {
+			
 			InflateView();
 		}
 		
 		private void InflateView() {
 			LayoutInflater inflater = (LayoutInflater) Context.GetSystemService(Context.LayoutInflaterService);
-			inflater.Inflate(Resource.Layout.group_header, this);
-			
+			inflater.Inflate(Resource.Layout.entry_view_contents, this);
+
 		}
-		
-		
+
+		/*
+		 * doesn't compile with mono for android
+		 * 
+		protected override LayoutParams GenerateDefaultLayoutParams() {
+			return new LayoutParams(LayoutParams.FillParent, LayoutParams.WrapContent);
+		}
+		*/
 	}
 
 }
diff --git a/src/PluginHostTest/EntrySection.cs b/src/PluginHostTest/EntrySection.cs
new file mode 100644
index 00000000..988a475b
--- /dev/null
+++ b/src/PluginHostTest/EntrySection.cs
@@ -0,0 +1,75 @@
+/*
+This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android 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.
+
+  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+using System;
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+using Android.Util;
+using PluginHostTest;
+
+namespace keepass2android.view
+{
+	
+	public class EntrySection : LinearLayout {
+		
+		public EntrySection(Context context): base(context, null) {
+			InflateView (null, null);
+		}
+		
+		public EntrySection(Context context, IAttributeSet attrs): base(context, attrs) {
+			InflateView (null, null);
+		}
+		
+		public EntrySection(Context context, IAttributeSet attrs, String title, String value): base(context, attrs) {
+			
+			InflateView(title, value);
+		}
+
+		public EntrySection (IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			
+		}
+		
+		
+		private void InflateView(String title, String value) {
+			LayoutInflater inflater = (LayoutInflater) Context.GetSystemService(Context.LayoutInflaterService);
+			inflater.Inflate(Resource.Layout.entry_section, this);
+			
+			SetText(Resource.Id.title, title);
+
+			FindViewById<TextView>(Resource.Id.value).Invalidate();
+			SetText(Resource.Id.value, value);
+			//TODO: this seems to cause a bug when rotating the device (and the activity gets destroyed)
+			//After recreating the activity, the value fields all have the same content.
+			if ((int)Android.OS.Build.VERSION.SdkInt >= 11)
+				FindViewById<TextView>(Resource.Id.value).SetTextIsSelectable(true);
+		}
+		
+		private void SetText(int resId, String str) {
+			if (str != null) {
+				TextView tvTitle = (TextView) FindViewById(resId);
+				tvTitle.Text = str;
+			}
+			
+		}
+	}
+
+}
+
diff --git a/src/PluginHostTest/Kp2aShortHelpView.cs b/src/PluginHostTest/Kp2aShortHelpView.cs
new file mode 100644
index 00000000..e6323319
--- /dev/null
+++ b/src/PluginHostTest/Kp2aShortHelpView.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Content.Res;
+using Android.Graphics;
+using Android.OS;
+using Android.Runtime;
+using Android.Text;
+using Android.Text.Method;
+using Android.Text.Style;
+using Android.Text.Util;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+using PluginHostTest;
+
+namespace keepass2android.views
+{
+	public class Kp2aShortHelpView: TextView
+	{
+		private string _helpText;
+		private static Typeface _iconFont;
+
+		protected Kp2aShortHelpView(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+		{
+		}
+
+		public Kp2aShortHelpView(Context context) : base(context)
+		{
+		}
+
+		public Kp2aShortHelpView(Context context, IAttributeSet attrs) : base(context, attrs)
+		{
+			Initialize(attrs);
+		}
+
+		public Kp2aShortHelpView(Context context, IAttributeSet attrs, int defStyle) : base(context, attrs, defStyle)
+		{
+			Initialize(attrs);
+		}
+
+		public string HelpText
+		{
+			get { return _helpText; }
+			set { _helpText = value;
+				UpdateView();
+			}
+		}
+
+		private void UpdateView()
+		{
+			if (!String.IsNullOrEmpty(_helpText))
+			{
+				Text = "i";
+				Clickable = true;
+
+
+				MovementMethod = LinkMovementMethod.Instance;
+				Click += (sender, args) =>
+				{
+					new AlertDialog.Builder(Context)
+						.SetTitle("PluginHostTest")
+						.SetMessage(_helpText)
+						.SetPositiveButton(Android.Resource.String.Ok, (o, eventArgs) => { })
+					.Show();
+				};
+				Visibility = ViewStates.Visible;
+			}
+			else
+			{
+				Visibility = ViewStates.Gone;
+			}
+		}
+
+		void Initialize(IAttributeSet attrs)
+		{
+			TypedArray a = Context.ObtainStyledAttributes(
+		 attrs,
+		 Resource.Styleable.Kp2aShortHelpView);
+			HelpText = a.GetString(Resource.Styleable.Kp2aShortHelpView_help_text);
+		
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginArrayAdapter.cs b/src/PluginHostTest/PluginArrayAdapter.cs
new file mode 100644
index 00000000..953fa198
--- /dev/null
+++ b/src/PluginHostTest/PluginArrayAdapter.cs
@@ -0,0 +1,126 @@
+using Android.Content.PM;
+using Android.Content.Res;
+using Android.Graphics.Drawables;
+using Android.Widget;
+using Android.Content;
+using Android.Views;
+using System.Collections.Generic;
+using Android.App;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents information about a plugin for display in the plugin list activity
+	/// </summary>
+	public class PluginItem
+	{
+		private readonly string _package;
+		private readonly Context _ctx;
+		private readonly Resources _pluginRes;
+
+		public PluginItem(string package, string enabledStatus, Context ctx)
+		{
+			_package = package;
+			_ctx = ctx;
+			EnabledStatus = enabledStatus;
+			_pluginRes = _ctx.PackageManager.GetResourcesForApplication(_package);
+		}
+
+		public string Label
+		{
+			get
+			{
+				return PluginDetailsActivity.GetStringFromPlugin(_pluginRes, _package, "kp2aplugin_title");
+			}
+			
+		}
+
+		public string Version
+		{
+			get
+			{
+				return _ctx.PackageManager.GetPackageInfo(_package, 0).VersionName;
+			}
+		}
+
+		public string EnabledStatus
+		{
+			get;
+			set;
+		}
+
+		public Drawable Icon
+		{
+			get
+			{
+				return _ctx.PackageManager.GetApplicationIcon(_package);
+			}
+		}
+
+		public string Package
+		{
+			get { return _package; }
+		}
+	}
+
+
+	public class PluginArrayAdapter : ArrayAdapter<PluginItem>
+	{
+
+		class PluginViewHolder : Java.Lang.Object
+		{
+			public ImageView imgIcon;
+			public TextView txtTitle;
+			public TextView txtVersion;
+
+			public TextView txtEnabledStatus;
+		}
+
+		Context context;
+		int layoutResourceId;
+		IList<PluginItem> data = null;
+
+		public PluginArrayAdapter(Context context, int layoutResourceId, IList<PluginItem> data) :
+			base(context, layoutResourceId, data)
+		{
+
+			this.layoutResourceId = layoutResourceId;
+			this.context = context;
+			this.data = data;
+		}
+
+		public override View GetView(int position, View convertView, ViewGroup parent)
+		{
+			View row = convertView;
+			PluginViewHolder holder = null;
+
+			if (row == null)
+			{
+				LayoutInflater inflater = ((Activity)context).LayoutInflater;
+				row = inflater.Inflate(layoutResourceId, parent, false);
+
+				holder = new PluginViewHolder();
+				holder.imgIcon = (ImageView)row.FindViewById(Resource.Id.imgIcon);
+				holder.txtTitle = (TextView)row.FindViewById(Resource.Id.txtLabel);
+				holder.txtVersion = (TextView)row.FindViewById(Resource.Id.txtVersion);
+				holder.txtEnabledStatus = (TextView)row.FindViewById(Resource.Id.txtStatus);
+
+				row.Tag = holder;
+			}
+			else
+			{
+				holder = (PluginViewHolder)row.Tag;
+			}
+
+			var item = data[position];
+			holder.txtTitle.Text = item.Label;
+			holder.txtVersion.Text = item.Version;
+			holder.txtEnabledStatus.Text = item.EnabledStatus;
+			holder.imgIcon.SetImageDrawable(item.Icon);
+
+			return row;
+		}
+	}
+
+}
diff --git a/src/PluginHostTest/PluginDatabase.cs b/src/PluginHostTest/PluginDatabase.cs
new file mode 100644
index 00000000..2f5b015d
--- /dev/null
+++ b/src/PluginHostTest/PluginDatabase.cs
@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Android.Content;
+using Android.Content.PM;
+using Android.Util;
+using Keepass2android.Pluginsdk;
+
+namespace keepass2android
+{
+	public class PluginDatabase
+	{
+		private const string _tag = "KP2A_PluginDatabase";
+		private readonly Context _ctx;
+		private const string _accessToken = "accessToken";
+		private const string _scopes = "scopes";
+		private const string _requesttoken = "requestToken";
+		private const string _pluginlist = "pluginList";
+
+
+
+		public PluginDatabase(Context ctx)
+		{
+			_ctx = ctx;
+		}
+
+		private ISharedPreferences GetPreferencesForPlugin(string packageName)
+		{
+			var prefs = _ctx.GetSharedPreferences("KP2A.Plugin." + packageName, FileCreationMode.Private);
+			if (prefs.GetString(_requesttoken, null) == null)
+			{
+				var editor = prefs.Edit();
+				editor.PutString(_requesttoken, Guid.NewGuid().ToString());
+				editor.Commit();
+			}
+			var hostPrefs = GetHostPrefs();
+			var plugins = hostPrefs.GetStringSet(_pluginlist, new List<string>());
+			if (!plugins.Contains(packageName))
+			{
+				plugins.Add(packageName);
+				hostPrefs.Edit().PutStringSet(_pluginlist, plugins).Commit();
+			}
+
+			return prefs;
+		}
+
+		/// <summary>
+		/// Returns the request token for the plugin. Request token is created of not yet available.
+		/// </summary>
+		/// <returns>Request token. Never null or empty.</returns>
+		public string GetRequestToken(string pkgName)
+		{
+			return GetPreferencesForPlugin(pkgName).GetString(_requesttoken, null);
+		}
+
+		public IList<string> GetPluginScopes(string pluginPackage)
+		{
+			var prefs = GetPreferencesForPlugin(pluginPackage);
+			return AccessManager.StringToStringArray(prefs.GetString(_scopes, ""));
+		}
+
+		public IEnumerable<String> GetAllPluginPackages()
+		{
+			var hostPrefs = GetHostPrefs();
+			return hostPrefs.GetStringSet(_pluginlist, new List<string>()).Where(IsPackageInstalled);
+		}
+
+		public bool IsPackageInstalled(string targetPackage)
+		{
+			try
+			{
+				PackageInfo info = _ctx.PackageManager.GetPackageInfo(targetPackage, PackageInfoFlags.MetaData);
+			}
+			catch (PackageManager.NameNotFoundException e)
+			{
+				return false;
+			}
+			return true;
+		}
+
+		public bool IsEnabled(string pluginPackage)
+		{
+			return GetPreferencesForPlugin(pluginPackage).GetString(_accessToken, null) != null;
+		}
+
+
+		public void StorePlugin(string pluginPackage, string accessToken, IList<string> requestedScopes)
+		{
+			ISharedPreferences pluginPrefs = GetPreferencesForPlugin(pluginPackage);
+			
+			pluginPrefs.Edit()
+			           .PutString(_scopes, AccessManager.StringArrayToString(requestedScopes))
+			           .PutString(_accessToken, accessToken)
+			           .Commit();
+		}
+
+		private ISharedPreferences GetHostPrefs()
+		{
+			return _ctx.GetSharedPreferences("plugins", FileCreationMode.Private);
+		}
+
+		public void SetEnabled(string pluginPackage, bool enabled)
+		{
+			if (enabled)
+			{
+				string accessToken = Guid.NewGuid().ToString();
+
+				Intent i = new Intent(Strings.ActionReceiveAccess);
+				i.SetPackage(pluginPackage);
+
+				i.PutExtra(Strings.ExtraSender, _ctx.PackageName);
+				i.PutExtra(Strings.ExtraRequestToken, GetPreferencesForPlugin(pluginPackage).GetString(_requesttoken, null));
+				i.PutExtra(Strings.ExtraAccessToken, accessToken);
+				_ctx.SendBroadcast(i);
+
+				StorePlugin(pluginPackage, accessToken, GetPluginScopes( pluginPackage));
+			}
+			else
+			{
+				Intent i = new Intent(Strings.ActionRevokeAccess);
+				i.SetPackage(pluginPackage);
+				i.PutExtra(Strings.ExtraSender, _ctx.PackageName);
+				i.PutExtra(Strings.ExtraRequestToken, GetPreferencesForPlugin(pluginPackage).GetString(_requesttoken, null));
+				_ctx.SendBroadcast(i);
+				StorePlugin(pluginPackage, null, GetPluginScopes(pluginPackage));
+			}
+		}
+
+		public bool IsValidAccessToken(string pluginPackage, string accessToken, string scope)
+		{
+			if (pluginPackage == null)
+			{
+				Log.Warn(_tag, "No pluginPackage specified!");
+				return false;
+			}
+
+			if (accessToken == null)
+			{
+				Log.Warn(_tag, "No accessToken specified!");
+				return false;
+			} 
+
+			var prefs = GetPreferencesForPlugin(pluginPackage);
+			if (prefs.GetString(_accessToken, null) != accessToken)
+			{
+				Log.Warn(_tag, "Invalid access token for " + pluginPackage);
+				return false;
+			}
+			if (!AccessManager.StringToStringArray(prefs.GetString(_scopes, "")).Contains(scope))
+			{
+				Log.Warn(_tag, "Scope " + scope + " not granted for " + pluginPackage);
+				return false;
+			}
+			return true;
+		}
+
+		public string GetAccessToken(string pluginPackage)
+		{
+			return GetPreferencesForPlugin(pluginPackage).GetString(_accessToken, null);
+		}
+
+		public void Clear()
+		{
+			foreach (string plugin in GetAllPluginPackages())
+			{
+				GetPreferencesForPlugin(plugin).Edit().Clear().Commit();
+			}
+			GetHostPrefs().Edit().Clear().Commit();
+		}
+
+		
+		public IEnumerable<string> GetPluginsWithAcceptedScope(string scope)
+		{
+			return GetAllPluginPackages().Where(plugin =>
+				{
+					var prefs = GetPreferencesForPlugin(plugin);
+					return (prefs.GetString(_accessToken, null) != null)
+						 && AccessManager.StringToStringArray(prefs.GetString(_scopes, "")).Contains(scope);
+
+				});
+		}
+
+		public void ClearPlugin(string plugin)
+		{
+			var prefs = _ctx.GetSharedPreferences("KP2A.Plugin." + plugin, FileCreationMode.Private);
+			prefs.Edit().Clear().Commit();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginDetailsActivity.cs b/src/PluginHostTest/PluginDetailsActivity.cs
new file mode 100644
index 00000000..59502a12
--- /dev/null
+++ b/src/PluginHostTest/PluginDetailsActivity.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.Content.Res;
+using Android.Graphics.Drawables;
+using Android.OS;
+using Android.Runtime;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+using Java.Util;
+using Keepass2android.Pluginsdk;
+using keepass2android;
+using keepass2android.views;
+
+namespace PluginHostTest
+{
+	[Activity(Label = "TODO Details")]
+	[IntentFilter(new[] { Strings.ActionEditPluginSettings},
+		Label = AppNames.AppName,
+		Categories = new[] { Intent.CategoryDefault })]
+	public class PluginDetailsActivity : Activity
+	{
+		private CheckBox _checkbox;
+		private string _pluginPackageName;
+
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+
+			_pluginPackageName = Intent.GetStringExtra(Strings.ExtraPluginPackage);
+
+			var pluginRes = PackageManager.GetResourcesForApplication(_pluginPackageName);
+			var title = GetStringFromPlugin(pluginRes, _pluginPackageName, "kp2aplugin_title");
+			var author = GetStringFromPlugin(pluginRes, _pluginPackageName, "kp2aplugin_author");
+			var shortDesc = GetStringFromPlugin(pluginRes, _pluginPackageName, "kp2aplugin_shortdesc");
+			var version = PackageManager.GetPackageInfo(_pluginPackageName, 0).VersionName;
+			
+			SetContentView(Resource.Layout.plugin_details);
+			if (title != null)
+				FindViewById<TextView>(Resource.Id.txtLabel).Text = title;
+			FindViewById<TextView>(Resource.Id.txtVersion).Text = version;
+			SetTextOrHide(Resource.Id.txtAuthor, author);
+			SetTextOrHide(Resource.Id.txtShortDesc, shortDesc);
+
+			_checkbox = FindViewById<CheckBox>(Resource.Id.cb_enabled);
+			_checkbox.CheckedChange += delegate {
+					new PluginDatabase(this).SetEnabled(_pluginPackageName, _checkbox.Checked);
+				};
+			
+			Drawable d = PackageManager.GetApplicationIcon(_pluginPackageName);
+			FindViewById<ImageView>(Resource.Id.imgIcon).SetImageDrawable(d);
+			
+			FindViewById<TextView>(Resource.Id.txtVersion).Text = version;
+
+			//cannot be wrong to update the view when we received an update
+			PluginHost.OnReceivedRequest += OnPluginHostOnOnReceivedRequest;
+
+			if (Intent.Action == Strings.ActionEditPluginSettings)
+			{
+				//this action can be triggered by external apps so we don't know if anybody has ever triggered
+				//the plugin to request access. Do this now, don't set the view right now
+				PluginHost.TriggerRequest(this, _pluginPackageName, new PluginDatabase(this));
+				//show the buttons instead of the checkbox
+				_checkbox.Visibility = ViewStates.Invisible;
+				FindViewById(Resource.Id.accept_button).Visibility = ViewStates.Visible;
+				FindViewById(Resource.Id.deny_button).Visibility = ViewStates.Visible;
+
+				FindViewById(Resource.Id.accept_button).Click += delegate(object sender, EventArgs args)
+					{
+						new PluginDatabase(this).SetEnabled(_pluginPackageName, true);
+						SetResult(Result.Ok);
+						Finish();
+					};
+
+				FindViewById(Resource.Id.deny_button).Click += delegate(object sender, EventArgs args)
+				{
+					new PluginDatabase(this).SetEnabled(_pluginPackageName, false);
+					SetResult(Result.Canceled);
+					Finish();
+				};
+			}
+			else
+			{
+				UpdateView();
+				_checkbox.Visibility = ViewStates.Visible;
+				FindViewById(Resource.Id.accept_button).Visibility = ViewStates.Gone;
+				FindViewById(Resource.Id.deny_button).Visibility = ViewStates.Gone;
+			}
+		}
+
+		private void OnPluginHostOnOnReceivedRequest(object sender, PluginHost.PluginHostEventArgs args)
+		{
+			if (args.Package == _pluginPackageName)
+			{
+				UpdateView();
+			}
+		}
+
+		protected override void OnDestroy()
+		{
+			PluginHost.OnReceivedRequest -= OnPluginHostOnOnReceivedRequest;
+			base.OnDestroy();
+		}
+
+		private void UpdateView()
+		{
+			var scopesContainer = FindViewById<LinearLayout>(Resource.Id.scopes_list);
+			//scopesContainer.RemoveAllViews();
+
+			var pluginDb = new PluginDatabase(this);
+			_checkbox.Checked = pluginDb.IsEnabled(_pluginPackageName);
+			foreach (string scope in pluginDb.GetPluginScopes(_pluginPackageName))
+			{
+				string scopeId = scope.Substring("keepass2android.".Length);
+
+				TextWithHelp help = new TextWithHelp(this,
+				                                     GetString(Resources.GetIdentifier(scopeId + "_title", "string", PackageName)),
+				                                     GetString(Resources.GetIdentifier(scopeId + "_explanation", "string", PackageName)));
+				LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent,
+				                                                                       ViewGroup.LayoutParams.WrapContent);
+				help.LayoutParameters = layoutParams;
+				scopesContainer.AddView(help);
+			}
+		}
+
+		private void SetTextOrHide(int resourceId, string text)
+		{
+			if (text != null)
+			{
+				FindViewById<TextView>(resourceId).Text = text;
+				FindViewById<TextView>(resourceId).Visibility = ViewStates.Visible;
+			}
+			else
+				FindViewById<TextView>(resourceId).Visibility = ViewStates.Gone;
+		}
+
+		public static string GetStringFromPlugin(Resources pluginRes, string pluginPackage, string stringId)
+		{
+			int titleId = pluginRes.GetIdentifier(pluginPackage + ":string/"+stringId, null, null);
+			string title = null;
+			if (titleId != 0)
+				title = pluginRes.GetString(titleId);
+			return title;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginHost.cs b/src/PluginHostTest/PluginHost.cs
new file mode 100644
index 00000000..99a749f4
--- /dev/null
+++ b/src/PluginHostTest/PluginHost.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.Util;
+using KeePassLib.Utility;
+using Keepass2android.Pluginsdk;
+using Org.Json;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Class which manages plugins inside the app
+	/// </summary>
+	[BroadcastReceiver()]
+	[IntentFilter(new[] { Strings.ActionRequestAccess})]
+	public class PluginHost: BroadcastReceiver
+	{
+		
+		private const string _tag = "KP2A_PluginHost";
+		
+
+		private static readonly string[] _validScopes = { Strings.ScopeDatabaseActions, Strings.ScopeCurrentEntry };
+
+		/// <summary>
+		/// Sends a broadcast to all potential plugins prompting them to request access to our app.
+		/// </summary>
+		public static void TriggerRequests(Context ctx)
+		{
+			Intent accessIntent = new Intent(Strings.ActionTriggerRequestAccess);
+			PackageManager packageManager = ctx.PackageManager;
+			IList<ResolveInfo> dictPacks = packageManager.QueryBroadcastReceivers(
+				accessIntent, PackageInfoFlags.Receivers);
+			PluginDatabase pluginDatabase = new PluginDatabase(ctx);
+			foreach (ResolveInfo ri in dictPacks)
+			{
+				ApplicationInfo appInfo = ri.ActivityInfo.ApplicationInfo;
+				String pkgName = appInfo.PackageName;
+				
+				TriggerRequest(ctx, pkgName, pluginDatabase);
+			}
+
+		}
+
+		public static void TriggerRequest(Context ctx, string pkgName, PluginDatabase pluginDatabase)
+		{
+			try
+			{
+				Intent triggerIntent = new Intent(Strings.ActionTriggerRequestAccess);
+				triggerIntent.SetPackage(pkgName);
+				triggerIntent.PutExtra(Strings.ExtraSender, ctx.PackageName);
+
+				triggerIntent.PutExtra(Strings.ExtraRequestToken, pluginDatabase.GetRequestToken(pkgName));
+				ctx.SendBroadcast(triggerIntent);
+			}
+			catch (Exception e)
+			{
+			}
+		}
+
+
+		public override void OnReceive(Context context, Intent intent)
+		{
+			PluginDatabase pluginDb = new PluginDatabase(context);
+			if (intent.Action == Strings.ActionRequestAccess)
+			{
+				var senderPackage = intent.GetStringExtra(Strings.ExtraSender);
+				var requestToken = intent.GetStringExtra(Strings.ExtraRequestToken);
+
+			 	var requestedScopes = intent.GetStringArrayListExtra(Strings.ExtraScopes);
+
+				if (!AreScopesValid(requestedScopes))
+				{
+					return;
+				}
+
+				if (pluginDb.GetRequestToken(senderPackage) != requestToken)
+				{
+					Log.Warn(_tag, "Invalid requestToken!");
+					return;
+				}
+				string currentAccessToken = pluginDb.GetAccessToken(senderPackage);
+				if ((currentAccessToken != null) 
+					&& (AccessManager.IsSubset(requestedScopes,
+				                           pluginDb.GetPluginScopes(senderPackage))))
+				{
+					//permission already there.
+					var i = new Intent(Strings.ActionReceiveAccess);
+					i.PutExtra(Strings.ExtraSender, context.PackageName);
+					i.PutExtra(Strings.ExtraAccessToken, currentAccessToken);
+					//TODO: Plugin should verify requestToken to make sure it doesn't receive accessTokens from malicious apps
+					i.PutExtra(Strings.ExtraRequestToken, requestToken);
+					i.SetPackage(senderPackage);
+					context.SendBroadcast(i);
+
+					Log.Debug(_tag, "Plugin " + senderPackage + " enabled.");
+				}
+				else
+				{
+					//store that scope was requested but not yet approved (=> accessToken = null)
+					pluginDb.StorePlugin(senderPackage, null, requestedScopes);
+
+					Log.Debug(_tag, "Plugin " + senderPackage + " not enabled.");
+
+					//see if the plugin has an access token
+					string accessToken = intent.GetStringExtra(Strings.ExtraAccessToken);
+					if (accessToken != null)
+					{
+						//notify plugin that access token is no longer valid or sufficient
+						Intent i = new Intent(Strings.ActionRevokeAccess);
+						i.PutExtra(Strings.ExtraSender, context.PackageName);
+						i.PutExtra(Strings.ExtraAccessToken, accessToken);
+						i.SetPackage(senderPackage);
+						context.SendBroadcast(i);
+						Log.Warn(_tag, "Access token of plugin " + senderPackage + " not (or no more) valid.");
+					}
+					
+				}
+				if (OnReceivedRequest != null)
+					OnReceivedRequest(this, new PluginHostEventArgs() { Package = senderPackage});
+
+			}
+		}
+
+		private bool AreScopesValid(IList<string> requestedScopes)
+		{
+			foreach (string scope in requestedScopes)
+			{
+				if (!_validScopes.Contains(scope))
+				{
+					Log.Warn(_tag, "invalid scope: " + scope);
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// adds the entry output data to the intent to be sent to a plugin
+		/// </summary>
+		public static void AddEntryToIntent(Intent intent, PwEntryOutput entry)
+		{
+			/*//add the entry XML
+			not yet implemented. What to do with attachments?
+			MemoryStream memStream = new MemoryStream();
+			KdbxFile.WriteEntries(memStream, new[] {entry});
+			string entryData = StrUtil.Utf8.GetString(memStream.ToArray());
+			intent.PutExtra(Strings.ExtraEntryData, entryData);
+			*/
+			//add the output string array (placeholders replaced taking into account the db context)
+			Dictionary<string, string> outputFields = entry.OutputStrings.ToDictionary(pair => StrUtil.SafeXmlString(pair.Key), pair => pair.Value.ReadString());
+
+			//add field values as JSON ({ "key":"value", ... } form)
+			JSONObject json = new JSONObject(outputFields);
+			var jsonStr = json.ToString();
+			intent.PutExtra(Strings.ExtraEntryOutputData, jsonStr);
+
+			//add list of which fields are protected (StringArrayExtra)
+			string[] protectedFieldsList = entry.OutputStrings.Where(s=>s.Value.IsProtected).Select(s => s.Key).ToArray();
+			intent.PutExtra(Strings.ExtraProtectedFieldsList, protectedFieldsList);
+
+			intent.PutExtra(Strings.ExtraEntryId, entry.Uuid.ToHexString());
+
+		}
+
+		public class PluginHostEventArgs
+		{
+			public string Package { get; set; }
+		}
+		public static event EventHandler<PluginHostEventArgs> OnReceivedRequest;
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginHostTest.csproj b/src/PluginHostTest/PluginHostTest.csproj
new file mode 100644
index 00000000..8fb6ffcf
--- /dev/null
+++ b/src/PluginHostTest/PluginHostTest.csproj
@@ -0,0 +1,712 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C9F4AE81-0996-4E17-B3F2-D0F652F6AC50}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PluginHostTest</RootNamespace>
+    <AssemblyName>PluginHostTest</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <AndroidApplication>true</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <AndroidUseLatestPlatformSdk />
+    <TargetFrameworkVersion>v4.2</TargetFrameworkVersion>
+    <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
+    <AndroidStoreUncompressedFileExtensions />
+    <MandroidI18n />
+    <JavaMaximumHeapSize />
+    <JavaOptions />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
+    <AndroidLinkMode>None</AndroidLinkMode>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android.Support.v4" />
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Activity1.cs" />
+    <Compile Include="App.cs" />
+    <Compile Include="AppNames.cs" />
+    <Compile Include="ClickView.cs" />
+    <Compile Include="CopyToClipboardService.cs" />
+    <Compile Include="EntryActivity.cs" />
+    <Compile Include="EntryActivityClasses\CopyToClipboardPopupMenuIcon.cs" />
+    <Compile Include="EntryActivityClasses\GotoUrlMenuItem.cs" />
+    <Compile Include="EntryActivityClasses\ToggleVisibilityPopupMenuItem.cs" />
+    <Compile Include="EntryContentsView.cs" />
+    <Compile Include="EntrySection.cs" />
+    <Compile Include="EntryActivityClasses\ExtraStringView.cs" />
+    <Compile Include="EntryActivityClasses\IPopupMenuItem.cs" />
+    <Compile Include="EntryActivityClasses\IStringView.cs" />
+    <Compile Include="Intents.cs" />
+    <Compile Include="Kp2aShortHelpView.cs" />
+    <Compile Include="EntryActivityClasses\OpenBinaryPopupItem.cs" />
+    <Compile Include="PluginDatabase.cs" />
+    <Compile Include="PluginDetailsActivity.cs" />
+    <Compile Include="PluginArrayAdapter.cs" />
+    <Compile Include="PluginListActivity.cs" />
+    <Compile Include="PluginHost.cs" />
+    <Compile Include="EntryActivityClasses\PluginMenuOption.cs" />
+    <Compile Include="EntryActivityClasses\PluginPopupMenuItem.cs" />
+    <Compile Include="PwEntryOutput.cs" />
+    <Compile Include="Resources\Resource.Designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SprCompileFlags.cs" />
+    <Compile Include="SprContext.cs" />
+    <Compile Include="SprEngine.cs" />
+    <Compile Include="EntryActivityClasses\StandardStringView.cs" />
+    <Compile Include="TextDrawable.cs" />
+    <Compile Include="TextViewSelect.cs" />
+    <Compile Include="TextWithHelp.cs" />
+    <Compile Include="EntryActivityClasses\WriteBinaryToFilePopupItem.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\DejaVuSansMono.ttf" />
+    <AndroidAsset Include="Assets\fontawesome-webfont.ttf" />
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+    <AndroidResource Include="Resources\Layout\plugin_list.xml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\Layout\sftp_credentials.axml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\Main.axml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\Strings2.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj">
+      <Project>{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}</Project>
+      <Name>KeePassLib2Android</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PluginSdkBinding\PluginSdkBinding.csproj">
+      <Project>{3da3911e-36de-465e-8f15-f1991b6437e5}</Project>
+      <Name>PluginSdkBinding</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\ListViewPluginRow.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\plugin_details.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\text_with_help.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\config2.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\attrs.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\colors.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\config.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\dimens.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\styles.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\strings.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\BlueButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\btn_new_group.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\btn_new_group_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\btn_new_group_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\collections_collection.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\collections_new_label.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\device_access_new_account.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\device_access_new_account_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\device_access_not_secure.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\donate_cake.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\EntryFieldHeaderBackground.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\extra_string_header.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\GreenButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\HeaderButtonBackground.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_action_eye_open.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_action_search.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_action_search_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_keepass2android.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_keepass2android_nonet.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_folder_small.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_gray_bday.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_launcher_red.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_add_field_holo_light.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_add_field_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_remove_field_holo_light.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_remove_field_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_view.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_androidget.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_androidsend.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_dropbox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_dropboxKP2A.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_file.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_ftp.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_gdrive.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_http.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_https.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_sftp.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_storage_skydrive.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_unlocked_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic00.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic01.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic02.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic03.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic04.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic05.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic06.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic07.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic08.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic09.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic10.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic12.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic13.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic14.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic15.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic17.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic18.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic19.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic20.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic21.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic22.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic23.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic24.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic25.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic26.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic27.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic28.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic29.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic30.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic31.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic33.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic34.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic35.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic36.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic37.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic38.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic39.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic40.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic41.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic42.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic43.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic44.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic45.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic46.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic47.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic48.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic49.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic50.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic51.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic52.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic53.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic54.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic55.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic56.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic57.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic58.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic59.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic60.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic61.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic62.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic63.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic64.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic65.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic66.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic67.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic68.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic99_blank.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\location_web_site.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_accept.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_accept_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_cancel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_cancel_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_previous_item.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\navigation_previous_item_dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\notify.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\notify_keyboard.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\oktoberfest.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\RedButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\section_header.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\transparent.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\YellowButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\collections_collection_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\collections_new_label_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\device_access_new_account_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\location_web_site_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Resources\Layout\entry_edit.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_edit_section.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_extrastring_title.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_extrastring_value.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_list_entry.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_section.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_view_test.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_view_contents.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\entry_view.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\vdots_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\vdots.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\ic_menu_copy_holo_light.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Menu\entry.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\about.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\create_database.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\database_settings.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\donate.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\donate_bday.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\donate_bdaymissed.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\edit_extra_string_dialog.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\file_row.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\file_selection.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\file_selection_buttons.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\file_selection_filename.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\file_selection_no_recent.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\file_storage_setup.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\filestorage_selection.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\filestorage_selection_listitem.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\filestorage_selection_listitem_kp2a.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\generate_password.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\group_add_entry.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\group_edit.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\group_header.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\group_list_entry.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\icon.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\icon_picker.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\InViewButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\password.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\QuickUnlock.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\QuickUnlock_Unused.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\SaveButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\search.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\searchurlresults.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\searchurlresults_empty.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\set_password.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\sftpcredentials.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\StartScreenButtons.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\url_credentials.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\styles_dark.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\styles_light.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+     Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/PluginHostTest/PluginListActivity.cs b/src/PluginHostTest/PluginListActivity.cs
new file mode 100644
index 00000000..d557c11b
--- /dev/null
+++ b/src/PluginHostTest/PluginListActivity.cs
@@ -0,0 +1,58 @@
+using System.Collections.Generic;
+using System.Linq;
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.OS;
+using Android.Widget;
+using Keepass2android.Pluginsdk;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	//TODO theme?
+	[Activity (Label = "Plugins (TODO)", ConfigurationChanges=ConfigChanges.Orientation|ConfigChanges.KeyboardHidden )]		
+	public class PluginListActivity : ListActivity
+	{
+		private PluginArrayAdapter _pluginArrayAdapter;
+		private List<PluginItem> _items;
+
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+			
+			//TODO _design.ApplyTheme();
+
+			SetContentView(Resource.Layout.plugin_list);
+			
+			ListView listView = FindViewById<ListView>(Android.Resource.Id.List);
+			listView.ItemClick +=
+				(sender, args) =>
+					{
+						Intent i = new Intent(this, typeof(PluginDetailsActivity));
+						i.PutExtra(Strings.ExtraPluginPackage, _items[args.Position].Package);
+						StartActivity(i);
+					};
+			
+			// Create your application here
+		}
+		protected override void OnResume()
+		{
+			base.OnResume();
+			PluginDatabase pluginDb = new PluginDatabase(this);
+
+			_items = (from pluginPackage in pluginDb.GetAllPluginPackages()
+			          let version = PackageManager.GetPackageInfo(pluginPackage, 0).VersionName
+			          let enabledStatus = pluginDb.IsEnabled(pluginPackage) ? GetString(Resource.String.plugin_enabled) : GetString(Resource.String.plugin_disabled)
+			          select new PluginItem(pluginPackage, enabledStatus, this)).ToList();
+			/*
+				{
+					new PluginItem("PluginA", Resource.Drawable.Icon, "keepass2android.plugina", "connected"),
+					new PluginItem("KeepassNFC", Resource.Drawable.Icon, "com.bla.blubb.plugina", "disconnected")
+				};
+			 * */
+			_pluginArrayAdapter = new PluginArrayAdapter(this, Resource.Layout.ListViewPluginRow, _items);
+			ListAdapter = _pluginArrayAdapter;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/Properties/AndroidManifest.xml b/src/PluginHostTest/Properties/AndroidManifest.xml
new file mode 100644
index 00000000..1988eb66
--- /dev/null
+++ b/src/PluginHostTest/Properties/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+	<application></application>
+</manifest>
\ No newline at end of file
diff --git a/src/PluginHostTest/Properties/AssemblyInfo.cs b/src/PluginHostTest/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..6f316b87
--- /dev/null
+++ b/src/PluginHostTest/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Android.App;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PluginHostTest")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PluginHostTest")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+// Add some common permissions, these can be removed if not needed
+[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
+[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/src/PluginHostTest/Resources/AboutResources.txt b/src/PluginHostTest/Resources/AboutResources.txt
new file mode 100644
index 00000000..194ae28a
--- /dev/null
+++ b/src/PluginHostTest/Resources/AboutResources.txt
@@ -0,0 +1,50 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included 
+in your application as resource files.  Various Android APIs are designed to 
+operate on the resource IDs instead of dealing with images, strings or binary blobs 
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.xml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+    drawable-hdpi/
+        icon.png
+
+    drawable-ldpi/
+        icon.png
+
+    drawable-mdpi/
+        icon.png
+
+    layout/
+        main.xml
+
+    values/
+        strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
+instead operate on resource IDs.  When you compile an Android application that uses resources, 
+the build system will package the resources for distribution and generate a class called
+"Resource" that contains the tokens for each one of the resources included. For example, 
+for the above Resources layout, this is what the Resource class would expose:
+
+public class Resource {
+    public class drawable {
+        public const int icon = 0x123;
+    }
+
+    public class layout {
+        public const int main = 0x456;
+    }
+
+    public class strings {
+        public const int first_string = 0xabc;
+        public const int second_string = 0xbcd;
+    }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main 
+to reference the layout/main.xml file, or Resource.strings.first_string to reference the first 
+string in the dictionary file values/strings.xml.
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/2_action_about.png b/src/PluginHostTest/Resources/Drawable/2_action_about.png
new file mode 100644
index 00000000..8f39c428
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/2_action_about.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/BlueButton.xml b/src/PluginHostTest/Resources/Drawable/BlueButton.xml
new file mode 100644
index 00000000..de790c7f
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/BlueButton.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#449def" />
+            <stroke
+                android:width="1dp"
+                android:color="#2f6699" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#449def"
+                android:endColor="#2f6699"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#2f6699" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
+
diff --git a/src/PluginHostTest/Resources/Drawable/EntryFieldHeaderBackground.xml b/src/PluginHostTest/Resources/Drawable/EntryFieldHeaderBackground.xml
new file mode 100644
index 00000000..058b5119
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/EntryFieldHeaderBackground.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape>
+        <gradient
+            android:angle="45"
+            android:startColor="#FF000030"
+            android:endColor="#FF000000"
+            android:type="linear" />
+    </shape>
+</item>
+</selector>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/GreenButton.xml b/src/PluginHostTest/Resources/Drawable/GreenButton.xml
new file mode 100644
index 00000000..26143578
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/GreenButton.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#70c656" />
+            <stroke
+                android:width="1dp"
+                android:color="#53933f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#70c656"
+                android:endColor="#53933f"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#53933f" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
+
diff --git a/src/keepass2android/Resources/drawable/HeaderButtonBackground.xml b/src/PluginHostTest/Resources/Drawable/HeaderButtonBackground.xml
similarity index 100%
rename from src/keepass2android/Resources/drawable/HeaderButtonBackground.xml
rename to src/PluginHostTest/Resources/Drawable/HeaderButtonBackground.xml
diff --git a/src/PluginHostTest/Resources/Drawable/Icon.png b/src/PluginHostTest/Resources/Drawable/Icon.png
new file mode 100644
index 00000000..a07c69fa
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/Icon.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/RedButton.xml b/src/PluginHostTest/Resources/Drawable/RedButton.xml
new file mode 100644
index 00000000..216d100a
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/RedButton.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#ef4444" />
+            <stroke
+                android:width="1dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#ef4444"
+                android:endColor="#992f2f"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
diff --git a/src/PluginHostTest/Resources/Drawable/YellowButton.xml b/src/PluginHostTest/Resources/Drawable/YellowButton.xml
new file mode 100644
index 00000000..bad953c5
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/YellowButton.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_pressed="true">
+        <shape>
+            <solid
+                android:color="#f3ae1b" />
+            <stroke
+                android:width="1dp"
+                android:color="#bb6008" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#f3ae1b"
+                android:endColor="#bb6008"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#bb6008" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/btn_new_group.png b/src/PluginHostTest/Resources/Drawable/btn_new_group.png
new file mode 100644
index 00000000..468d1fc9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/btn_new_group.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/btn_new_group_dark.png b/src/PluginHostTest/Resources/Drawable/btn_new_group_dark.png
new file mode 100644
index 00000000..32ae9ebb
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/btn_new_group_dark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/btn_new_group_holodark.png b/src/PluginHostTest/Resources/Drawable/btn_new_group_holodark.png
new file mode 100644
index 00000000..0a5bd458
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/btn_new_group_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/collections_collection.png b/src/PluginHostTest/Resources/Drawable/collections_collection.png
new file mode 100644
index 00000000..d1324014
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/collections_collection.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/collections_collection_holodark.png b/src/PluginHostTest/Resources/Drawable/collections_collection_holodark.png
new file mode 100644
index 00000000..78500a93
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/collections_collection_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/collections_new_label.png b/src/PluginHostTest/Resources/Drawable/collections_new_label.png
new file mode 100644
index 00000000..70ad36c1
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/collections_new_label.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/collections_new_label_holodark.png b/src/PluginHostTest/Resources/Drawable/collections_new_label_holodark.png
new file mode 100644
index 00000000..2c996f2d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/collections_new_label_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/device_access_new_account.png b/src/PluginHostTest/Resources/Drawable/device_access_new_account.png
new file mode 100644
index 00000000..fe7f4665
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/device_access_new_account.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/device_access_new_account_dark.png b/src/PluginHostTest/Resources/Drawable/device_access_new_account_dark.png
new file mode 100644
index 00000000..27889219
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/device_access_new_account_dark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/device_access_new_account_holodark.png b/src/PluginHostTest/Resources/Drawable/device_access_new_account_holodark.png
new file mode 100644
index 00000000..e61a09f5
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/device_access_new_account_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/device_access_not_secure.png b/src/PluginHostTest/Resources/Drawable/device_access_not_secure.png
new file mode 100644
index 00000000..4a6463c3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/device_access_not_secure.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/donate_cake.png b/src/PluginHostTest/Resources/Drawable/donate_cake.png
new file mode 100644
index 00000000..6d3fc612
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/donate_cake.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/extra_string_header.xml b/src/PluginHostTest/Resources/Drawable/extra_string_header.xml
new file mode 100644
index 00000000..5b7ab453
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/extra_string_header.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:height="2px" />
+    <solid 
+        android:color="@color/emphasis2"/>
+</shape>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/ic00.png b/src/PluginHostTest/Resources/Drawable/ic00.png
new file mode 100644
index 00000000..b74e831f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic00.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic01.png b/src/PluginHostTest/Resources/Drawable/ic01.png
new file mode 100644
index 00000000..e164a9f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic01.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic02.png b/src/PluginHostTest/Resources/Drawable/ic02.png
new file mode 100644
index 00000000..d5f6551d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic02.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic03.png b/src/PluginHostTest/Resources/Drawable/ic03.png
new file mode 100644
index 00000000..b3781e45
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic03.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic04.png b/src/PluginHostTest/Resources/Drawable/ic04.png
new file mode 100644
index 00000000..def2ea10
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic04.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic05.png b/src/PluginHostTest/Resources/Drawable/ic05.png
new file mode 100644
index 00000000..67118111
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic05.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic06.png b/src/PluginHostTest/Resources/Drawable/ic06.png
new file mode 100644
index 00000000..57c1a1da
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic06.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic07.png b/src/PluginHostTest/Resources/Drawable/ic07.png
new file mode 100644
index 00000000..89ef01ba
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic07.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic08.png b/src/PluginHostTest/Resources/Drawable/ic08.png
new file mode 100644
index 00000000..cb5f8f0a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic08.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic09.png b/src/PluginHostTest/Resources/Drawable/ic09.png
new file mode 100644
index 00000000..b38168a2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic09.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic10.png b/src/PluginHostTest/Resources/Drawable/ic10.png
new file mode 100644
index 00000000..966610d9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic10.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic11.png b/src/PluginHostTest/Resources/Drawable/ic11.png
new file mode 100644
index 00000000..b41b44c3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic11.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic12.png b/src/PluginHostTest/Resources/Drawable/ic12.png
new file mode 100644
index 00000000..92ca07dc
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic12.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic13.png b/src/PluginHostTest/Resources/Drawable/ic13.png
new file mode 100644
index 00000000..42b6ec07
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic13.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic14.png b/src/PluginHostTest/Resources/Drawable/ic14.png
new file mode 100644
index 00000000..b7552c07
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic14.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic15.png b/src/PluginHostTest/Resources/Drawable/ic15.png
new file mode 100644
index 00000000..974635d9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic15.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic16.png b/src/PluginHostTest/Resources/Drawable/ic16.png
new file mode 100644
index 00000000..47d4b36f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic16.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic17.png b/src/PluginHostTest/Resources/Drawable/ic17.png
new file mode 100644
index 00000000..209af79d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic17.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic18.png b/src/PluginHostTest/Resources/Drawable/ic18.png
new file mode 100644
index 00000000..30f1dfa0
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic18.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic19.png b/src/PluginHostTest/Resources/Drawable/ic19.png
new file mode 100644
index 00000000..356a2e7b
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic19.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic20.png b/src/PluginHostTest/Resources/Drawable/ic20.png
new file mode 100644
index 00000000..135fd11b
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic20.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic21.png b/src/PluginHostTest/Resources/Drawable/ic21.png
new file mode 100644
index 00000000..d80fc95a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic21.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic22.png b/src/PluginHostTest/Resources/Drawable/ic22.png
new file mode 100644
index 00000000..788d0e7c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic22.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic23.png b/src/PluginHostTest/Resources/Drawable/ic23.png
new file mode 100644
index 00000000..6345beab
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic23.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic24.png b/src/PluginHostTest/Resources/Drawable/ic24.png
new file mode 100644
index 00000000..6b77a056
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic24.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic25.png b/src/PluginHostTest/Resources/Drawable/ic25.png
new file mode 100644
index 00000000..280423f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic25.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic26.png b/src/PluginHostTest/Resources/Drawable/ic26.png
new file mode 100644
index 00000000..9e278996
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic26.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic27.png b/src/PluginHostTest/Resources/Drawable/ic27.png
new file mode 100644
index 00000000..c71d9b7e
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic27.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic28.png b/src/PluginHostTest/Resources/Drawable/ic28.png
new file mode 100644
index 00000000..3bea4d71
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic28.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic29.png b/src/PluginHostTest/Resources/Drawable/ic29.png
new file mode 100644
index 00000000..a4ce18b9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic29.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic30.png b/src/PluginHostTest/Resources/Drawable/ic30.png
new file mode 100644
index 00000000..49dcd2ca
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic30.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic31.png b/src/PluginHostTest/Resources/Drawable/ic31.png
new file mode 100644
index 00000000..a510ec65
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic31.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic32.png b/src/PluginHostTest/Resources/Drawable/ic32.png
new file mode 100644
index 00000000..96b46fd2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic32.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic33.png b/src/PluginHostTest/Resources/Drawable/ic33.png
new file mode 100644
index 00000000..db5111a9
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic33.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic34.png b/src/PluginHostTest/Resources/Drawable/ic34.png
new file mode 100644
index 00000000..feebf2bd
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic34.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic35.png b/src/PluginHostTest/Resources/Drawable/ic35.png
new file mode 100644
index 00000000..629ad9aa
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic35.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic36.png b/src/PluginHostTest/Resources/Drawable/ic36.png
new file mode 100644
index 00000000..8dc08855
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic36.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic37.png b/src/PluginHostTest/Resources/Drawable/ic37.png
new file mode 100644
index 00000000..fef91068
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic37.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic38.png b/src/PluginHostTest/Resources/Drawable/ic38.png
new file mode 100644
index 00000000..9b141689
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic38.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic39.png b/src/PluginHostTest/Resources/Drawable/ic39.png
new file mode 100644
index 00000000..1f36acaa
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic39.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic40.png b/src/PluginHostTest/Resources/Drawable/ic40.png
new file mode 100644
index 00000000..81d60885
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic40.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic41.png b/src/PluginHostTest/Resources/Drawable/ic41.png
new file mode 100644
index 00000000..a02c56a4
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic41.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic42.png b/src/PluginHostTest/Resources/Drawable/ic42.png
new file mode 100644
index 00000000..e0a295d0
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic42.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic43.png b/src/PluginHostTest/Resources/Drawable/ic43.png
new file mode 100644
index 00000000..6170d86c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic43.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic44.png b/src/PluginHostTest/Resources/Drawable/ic44.png
new file mode 100644
index 00000000..0a9d2090
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic44.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic45.png b/src/PluginHostTest/Resources/Drawable/ic45.png
new file mode 100644
index 00000000..2d5e260a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic45.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic46.png b/src/PluginHostTest/Resources/Drawable/ic46.png
new file mode 100644
index 00000000..d8197d61
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic46.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic47.png b/src/PluginHostTest/Resources/Drawable/ic47.png
new file mode 100644
index 00000000..2aabd0a2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic47.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic48.png b/src/PluginHostTest/Resources/Drawable/ic48.png
new file mode 100644
index 00000000..bd433f4b
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic48.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic49.png b/src/PluginHostTest/Resources/Drawable/ic49.png
new file mode 100644
index 00000000..376aa6ec
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic49.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic50.png b/src/PluginHostTest/Resources/Drawable/ic50.png
new file mode 100644
index 00000000..174b86c3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic50.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic51.png b/src/PluginHostTest/Resources/Drawable/ic51.png
new file mode 100644
index 00000000..2b49969a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic51.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic52.png b/src/PluginHostTest/Resources/Drawable/ic52.png
new file mode 100644
index 00000000..36adbc8e
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic52.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic53.png b/src/PluginHostTest/Resources/Drawable/ic53.png
new file mode 100644
index 00000000..592ce6f4
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic53.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic54.png b/src/PluginHostTest/Resources/Drawable/ic54.png
new file mode 100644
index 00000000..2dfe90be
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic54.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic55.png b/src/PluginHostTest/Resources/Drawable/ic55.png
new file mode 100644
index 00000000..69e55a1d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic55.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic56.png b/src/PluginHostTest/Resources/Drawable/ic56.png
new file mode 100644
index 00000000..fbedb011
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic56.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic57.png b/src/PluginHostTest/Resources/Drawable/ic57.png
new file mode 100644
index 00000000..ed6d2e05
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic57.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic58.png b/src/PluginHostTest/Resources/Drawable/ic58.png
new file mode 100644
index 00000000..91d7c5f6
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic58.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic59.png b/src/PluginHostTest/Resources/Drawable/ic59.png
new file mode 100644
index 00000000..5cc4f6b5
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic59.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic60.png b/src/PluginHostTest/Resources/Drawable/ic60.png
new file mode 100644
index 00000000..0094f836
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic60.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic61.png b/src/PluginHostTest/Resources/Drawable/ic61.png
new file mode 100644
index 00000000..fcee6c9c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic61.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic62.png b/src/PluginHostTest/Resources/Drawable/ic62.png
new file mode 100644
index 00000000..8640421a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic62.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic63.png b/src/PluginHostTest/Resources/Drawable/ic63.png
new file mode 100644
index 00000000..e340fbea
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic63.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic64.png b/src/PluginHostTest/Resources/Drawable/ic64.png
new file mode 100644
index 00000000..5dd1edf2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic64.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic65.png b/src/PluginHostTest/Resources/Drawable/ic65.png
new file mode 100644
index 00000000..4721b68f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic65.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic66.png b/src/PluginHostTest/Resources/Drawable/ic66.png
new file mode 100644
index 00000000..e2a83b94
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic66.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic67.png b/src/PluginHostTest/Resources/Drawable/ic67.png
new file mode 100644
index 00000000..42691a0e
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic67.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic68.png b/src/PluginHostTest/Resources/Drawable/ic68.png
new file mode 100644
index 00000000..69060470
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic68.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic99_blank.png b/src/PluginHostTest/Resources/Drawable/ic99_blank.png
new file mode 100644
index 00000000..5dd1edf2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic99_blank.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_action_eye_open.png b/src/PluginHostTest/Resources/Drawable/ic_action_eye_open.png
new file mode 100644
index 00000000..aa461c84
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_action_eye_open.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_action_search.png b/src/PluginHostTest/Resources/Drawable/ic_action_search.png
new file mode 100644
index 00000000..3aa64404
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_action_search.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_action_search_holodark.png b/src/PluginHostTest/Resources/Drawable/ic_action_search_holodark.png
new file mode 100644
index 00000000..d37d6d25
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_action_search_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_keepass2android.png b/src/PluginHostTest/Resources/Drawable/ic_keepass2android.png
new file mode 100644
index 00000000..f0109f9c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_keepass2android.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_keepass2android_nonet.png b/src/PluginHostTest/Resources/Drawable/ic_keepass2android_nonet.png
new file mode 100644
index 00000000..0dd22310
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_keepass2android_nonet.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher.png b/src/PluginHostTest/Resources/Drawable/ic_launcher.png
new file mode 100644
index 00000000..189558d2
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_folder_small.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_folder_small.png
new file mode 100644
index 00000000..5df8d60f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_folder_small.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_gray.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_gray.png
new file mode 100644
index 00000000..710baa01
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_gray.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_gray_bday.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_gray_bday.png
new file mode 100644
index 00000000..a6ac3338
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_gray_bday.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_offline.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_offline.png
new file mode 100644
index 00000000..cac41265
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_offline.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_launcher_red.png b/src/PluginHostTest/Resources/Drawable/ic_launcher_red.png
new file mode 100644
index 00000000..d01a118a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_launcher_red.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holo_light.png b/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holo_light.png
new file mode 100644
index 00000000..4a4990c0
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holo_light.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holodark.png b/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holodark.png
new file mode 100644
index 00000000..099c1508
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_add_field_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_copy_holo_light.png b/src/PluginHostTest/Resources/Drawable/ic_menu_copy_holo_light.png
new file mode 100644
index 00000000..0dd8865f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_copy_holo_light.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holo_light.png b/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holo_light.png
new file mode 100644
index 00000000..b31359f7
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holo_light.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holodark.png b/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holodark.png
new file mode 100644
index 00000000..094eea58
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_remove_field_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_menu_view.png b/src/PluginHostTest/Resources/Drawable/ic_menu_view.png
new file mode 100644
index 00000000..f13e199e
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_menu_view.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_androidget.png b/src/PluginHostTest/Resources/Drawable/ic_storage_androidget.png
new file mode 100644
index 00000000..3c0b985c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_androidget.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_androidsend.png b/src/PluginHostTest/Resources/Drawable/ic_storage_androidsend.png
new file mode 100644
index 00000000..3c0b985c
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_androidsend.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_dropbox.png b/src/PluginHostTest/Resources/Drawable/ic_storage_dropbox.png
new file mode 100644
index 00000000..27b8fc40
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_dropbox.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_dropboxKP2A.png b/src/PluginHostTest/Resources/Drawable/ic_storage_dropboxKP2A.png
new file mode 100644
index 00000000..27b8fc40
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_dropboxKP2A.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_file.png b/src/PluginHostTest/Resources/Drawable/ic_storage_file.png
new file mode 100644
index 00000000..6462ac98
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_file.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_ftp.png b/src/PluginHostTest/Resources/Drawable/ic_storage_ftp.png
new file mode 100644
index 00000000..e164a9f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_ftp.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_gdrive.png b/src/PluginHostTest/Resources/Drawable/ic_storage_gdrive.png
new file mode 100644
index 00000000..1761d023
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_gdrive.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_http.png b/src/PluginHostTest/Resources/Drawable/ic_storage_http.png
new file mode 100644
index 00000000..e164a9f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_http.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_https.png b/src/PluginHostTest/Resources/Drawable/ic_storage_https.png
new file mode 100644
index 00000000..e164a9f3
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_https.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_sftp.png b/src/PluginHostTest/Resources/Drawable/ic_storage_sftp.png
new file mode 100644
index 00000000..2155f6cd
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_sftp.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_storage_skydrive.png b/src/PluginHostTest/Resources/Drawable/ic_storage_skydrive.png
new file mode 100644
index 00000000..fbe96d5f
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_storage_skydrive.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/ic_unlocked_gray.png b/src/PluginHostTest/Resources/Drawable/ic_unlocked_gray.png
new file mode 100644
index 00000000..3a0ca74b
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/ic_unlocked_gray.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/launcher.png b/src/PluginHostTest/Resources/Drawable/launcher.png
new file mode 100644
index 00000000..e52d5f33
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/launcher.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/location_web_site.png b/src/PluginHostTest/Resources/Drawable/location_web_site.png
new file mode 100644
index 00000000..bd6b8682
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/location_web_site.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/location_web_site_holodark.png b/src/PluginHostTest/Resources/Drawable/location_web_site_holodark.png
new file mode 100644
index 00000000..9b77be96
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/location_web_site_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_accept.png b/src/PluginHostTest/Resources/Drawable/navigation_accept.png
new file mode 100644
index 00000000..58bf9721
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_accept.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_accept_dark.png b/src/PluginHostTest/Resources/Drawable/navigation_accept_dark.png
new file mode 100644
index 00000000..53cf6877
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_accept_dark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_cancel.png b/src/PluginHostTest/Resources/Drawable/navigation_cancel.png
new file mode 100644
index 00000000..9f4c3d6a
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_cancel.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_cancel_holodark.png b/src/PluginHostTest/Resources/Drawable/navigation_cancel_holodark.png
new file mode 100644
index 00000000..3336760d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_cancel_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_previous_item.png b/src/PluginHostTest/Resources/Drawable/navigation_previous_item.png
new file mode 100644
index 00000000..8d19e391
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_previous_item.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/navigation_previous_item_dark.png b/src/PluginHostTest/Resources/Drawable/navigation_previous_item_dark.png
new file mode 100644
index 00000000..64538ce8
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/navigation_previous_item_dark.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/notify.png b/src/PluginHostTest/Resources/Drawable/notify.png
new file mode 100644
index 00000000..57439167
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/notify.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/notify_keyboard.png b/src/PluginHostTest/Resources/Drawable/notify_keyboard.png
new file mode 100644
index 00000000..0e9c1beb
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/notify_keyboard.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/oktoberfest.png b/src/PluginHostTest/Resources/Drawable/oktoberfest.png
new file mode 100644
index 00000000..8baf7af0
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/oktoberfest.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/section_header.xml b/src/PluginHostTest/Resources/Drawable/section_header.xml
new file mode 100644
index 00000000..fbe5fae4
--- /dev/null
+++ b/src/PluginHostTest/Resources/Drawable/section_header.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:width="1000dp" android:height="2px" />
+    <solid 
+        android:color="@color/light_gray"/>
+</shape>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Drawable/transparent.png b/src/PluginHostTest/Resources/Drawable/transparent.png
new file mode 100644
index 00000000..d401564d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/transparent.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/vdots.png b/src/PluginHostTest/Resources/Drawable/vdots.png
new file mode 100644
index 00000000..503e890d
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/vdots.png differ
diff --git a/src/PluginHostTest/Resources/Drawable/vdots_holodark.png b/src/PluginHostTest/Resources/Drawable/vdots_holodark.png
new file mode 100644
index 00000000..8178f1bd
Binary files /dev/null and b/src/PluginHostTest/Resources/Drawable/vdots_holodark.png differ
diff --git a/src/PluginHostTest/Resources/Layout/ListViewPluginRow.xml b/src/PluginHostTest/Resources/Layout/ListViewPluginRow.xml
new file mode 100644
index 00000000..159c425c
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/ListViewPluginRow.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp">
+    <ImageView
+        android:id="@+id/imgIcon"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp" />
+    <TextView
+        android:id="@+id/txtLabel"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/imgIcon"
+        android:textSize="22dp"
+         />
+    <TextView
+        android:id="@+id/txtVersion"
+        android:text="0.9.3"
+        android:textSize="14dp"
+        android:textColor="#888888"
+        android:layout_toRightOf="@id/imgIcon"
+        android:layout_below="@id/txtLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <TextView
+        android:id="@+id/txtStatus"
+        android:textSize="14dp"
+        android:textColor="#888888"
+        android:layout_toRightOf="@id/imgIcon"
+        android:gravity="right"
+        android:layout_below="@id/txtVersion"
+        android:layout_alignRight="@id/txtLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/Main.axml b/src/PluginHostTest/Resources/Layout/Main.axml
new file mode 100644
index 00000000..e359342b
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/Main.axml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    <Button
+        android:id="@+id/MyButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/Hello" />
+    <Button
+        android:id="@+id/managePluginsButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="manage plugins" />
+    <Button
+        android:id="@+id/entryviewButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="entry" />
+    <Button
+        android:id="@+id/testDbButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="test db" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/entry_edit.xml b/src/PluginHostTest/Resources/Layout/entry_edit.xml
similarity index 100%
rename from src/keepass2android/Resources/layout-v14/entry_edit.xml
rename to src/PluginHostTest/Resources/Layout/entry_edit.xml
diff --git a/src/PluginHostTest/Resources/Layout/entry_edit_section.xml b/src/PluginHostTest/Resources/Layout/entry_edit_section.xml
new file mode 100644
index 00000000..77deb9db
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_edit_section.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:paddingTop="1dip"
+    android:gravity="center_vertical"
+    android:layout_height="wrap_content">
+    <EditText
+        android:id="@+id/title"
+        android:singleLine="true"
+        android:inputType="text"
+        android:hint="@string/field_name"
+        style="@style/TextAppearance_EditEntry_Value"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:gravity="top|left"
+        android:layout_marginRight="0dip" />
+    <EditText
+        android:id="@+id/value"
+        android:hint="@string/field_value"
+        android:inputType="textMultiLine"
+        style="@style/TextAppearance_EditEntry_Value"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="3"
+        android:gravity="top|left"
+        android:layout_marginRight="0dip" />
+	<CheckBox
+        android:id="@+id/protection"
+        android:layout_width="0dip"
+        android:layout_height="0dip"
+		 android:visibility="gone"
+        android:text="@string/protection"/>
+    <Button
+        android:id="@+id/edit_extra"
+        android:text="…" 
+		android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+		android:layout_marginRight="8dip" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_extrastring_title.xml b/src/PluginHostTest/Resources/Layout/entry_extrastring_title.xml
new file mode 100644
index 00000000..a7e21d98
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_extrastring_title.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:id="@+id/extra_title_container"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content">
+	<TextView
+		android:id="@+id/entry_title"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="Title"
+		style="@style/EntryFieldHeader" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_extrastring_value.xml b/src/PluginHostTest/Resources/Layout/entry_extrastring_value.xml
new file mode 100644
index 00000000..7b9c5eeb
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_extrastring_value.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 
+			xmlns:android="http://schemas.android.com/apk/res/android"
+			android:id="@+id/extra_container"
+			android:layout_height="wrap_content"	
+			android:layout_width="fill_parent"
+			android:orientation="horizontal"
+			android:clickable="true"
+			android:background="?android:attr/selectableItemBackground">
+	<ImageView
+		android:id="@+id/extra_vdots"
+		android:layout_width="wrap_content"
+		android:layout_height="15dp"
+			   android:src="@drawable/vdots"
+			   android:gravity="right|bottom"
+			   android:layout_alignParentRight="true"
+			   android:layout_alignParentBottom="true"
+				   />
+	<TextView
+		android:id="@+id/entry_extra"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:typeface="monospace"
+		android:layout_toLeftOf="@id/extra_vdots"
+		style="@style/EntryItem" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_list_entry.xml b/src/PluginHostTest/Resources/Layout/entry_list_entry.xml
new file mode 100644
index 00000000..263958f8
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_list_entry.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:stretchColumns="1">
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
+        <ImageView
+            android:id="@+id/entry_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="5dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic99_blank" />
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/entry_text"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="abc"
+                style="@style/ElementTextLarge" />
+            <TextView
+                android:id="@+id/entry_text_detail"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="abcde"
+                style="@style/ElementTextSmall" />
+        </LinearLayout>
+        <View />
+    </TableRow>
+</TableLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_section.xml b/src/PluginHostTest/Resources/Layout/entry_section.xml
new file mode 100644
index 00000000..e8ca7241
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_section.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Title"
+        android:layout_marginLeft="10dp"
+        style="@style/ExtraFieldHeader" />
+    <TextView
+        android:id="@+id/value"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:typeface="monospace"
+        android:text="Value"
+        android:layout_marginLeft="30dp"
+        style="@style/EntryItem" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/entry_view.xml b/src/PluginHostTest/Resources/Layout/entry_view.xml
similarity index 86%
rename from src/keepass2android/Resources/layout-v14/entry_view.xml
rename to src/PluginHostTest/Resources/Layout/entry_view.xml
index c8065d13..06518d82 100644
--- a/src/keepass2android/Resources/layout-v14/entry_view.xml
+++ b/src/PluginHostTest/Resources/Layout/entry_view.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-        android:id="@+id/top"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:orientation="horizontal" />
-    <LinearLayout
-        android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:divider="?android:attr/dividerVertical"
-        android:layout_alignParentBottom="true"
-        android:dividerPadding="12dp">
-   
-        <FrameLayout
-            style="?android:attr/actionButtonStyle"
-            android:id="@+id/entry_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:drawableLeft="@android:drawable/ic_menu_edit"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:text="@string/menu_edit" />
-        </FrameLayout>
-        
-    </LinearLayout>
-    
-    <ImageView
-        android:id="@+id/entry_divider2"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/bottom_bar"
-        android:scaleType="fitXY"
-        android:tint="@color/blue_highlight"
-        android:src="@android:drawable/divider_horizontal_bright" />
-    <ScrollView
-        android:id="@+id/entry_scroll"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_above="@id/entry_divider2"
-        android:fillViewport="true"
-        android:scrollbarStyle="insideOverlay">
-        <keepass2android.view.EntryContentsView
-            android:id="@+id/entry_contents"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent" />
-    </ScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+	<LinearLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="horizontal" />
+	<LinearLayout
+        android:id="@+id/bottom_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:layout_alignParentBottom="true"
+        android:dividerPadding="12dp">
+
+		<FrameLayout
+            style="?android:attr/actionButtonStyle"
+            android:id="@+id/entry_edit"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="@android:drawable/ic_menu_edit"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/menu_edit" />
+		</FrameLayout>
+
+	</LinearLayout>
+
+	<ImageView
+        android:id="@+id/entry_divider2"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/bottom_bar"
+        android:scaleType="fitXY"
+        android:tint="@color/blue_highlight"
+        android:src="@android:drawable/divider_horizontal_bright" />
+	<ScrollView
+        android:id="@+id/entry_scroll"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@id/entry_divider2"
+        android:fillViewport="true"
+        android:scrollbarStyle="insideOverlay">
+		<keepass2android.view.EntryContentsView
+            android:id="@+id/entry_contents"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent" />
+	</ScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_view_contents.xml b/src/PluginHostTest/Resources/Layout/entry_view_contents.xml
new file mode 100644
index 00000000..146022f9
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_view_contents.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/entry_table"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical">
+
+
+	<LinearLayout android:id="@+id/entryfield_container_username"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/entry_user_name_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_user_name"
+			
+			style="@style/EntryFieldHeader"
+         />
+
+		<!-- Username -->
+		<RelativeLayout android:id="@+id/username_container"
+					  android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="horizontal"
+		android:clickable="true"
+		android:background="?android:attr/selectableItemBackground">
+
+
+			<ImageView
+				android:id="@+id/username_vdots"
+				android:layout_width="wrap_content"
+				android:layout_height="15dp"
+					   android:src="@drawable/vdots"
+					   android:gravity="right|bottom"
+					   android:layout_alignParentRight="true"
+					   android:layout_alignParentBottom="true"
+				   />
+			<TextView
+				android:id="@+id/entry_user_name"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_toLeftOf="@id/username_vdots"
+				style="@style/EntryItem" />
+		</RelativeLayout>
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/entryfield_container_url"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!--  URL -->
+		<TextView
+			android:id="@+id/entry_url_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_url"
+			style="@style/EntryFieldHeader"
+			/>
+		<RelativeLayout android:id="@+id/url_container"
+						  android:layout_height="wrap_content"
+				android:layout_width="fill_parent"
+				android:orientation="horizontal"
+				android:clickable="true"
+				android:background="?android:attr/selectableItemBackground">
+			<ImageView
+				android:id="@+id/url_vdots"
+				android:layout_width="wrap_content"
+				android:layout_height="15dp"
+					   android:src="@drawable/vdots"
+					   android:gravity="right|bottom"
+					   android:layout_alignParentRight="true"
+					   android:layout_alignParentBottom="true"
+				   />
+			<TextView
+				android:id="@+id/entry_url"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:autoLink="all"
+				android:layout_toLeftOf="@id/url_vdots"
+				style="@style/EntryItem" />
+		</RelativeLayout>
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_password"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!-- Password -->
+		<TextView
+			android:id="@+id/entry_password_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_password"
+			style="@style/EntryFieldHeader"
+         />
+		<RelativeLayout android:id="@+id/password_container"
+						  android:layout_height="wrap_content"
+				android:layout_width="fill_parent"
+				android:orientation="horizontal"
+				android:clickable="true"
+				android:background="?android:attr/selectableItemBackground">
+			<ImageView
+				android:id="@+id/password_vdots"
+				android:layout_width="wrap_content"
+				android:layout_height="15dp"
+					   android:src="@drawable/vdots"
+					   android:gravity="right|bottom"
+					   android:layout_alignParentRight="true"
+					   android:layout_alignParentBottom="true"
+				   />
+			<TextView
+				android:id="@+id/entry_password"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:password="true"
+				android:typeface="monospace"
+				android:layout_toLeftOf="@id/password_vdots"
+				style="@style/EntryItem" />
+		</RelativeLayout>
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_comment"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!-- Comment -->
+		<TextView
+			android:id="@+id/entry_comment_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_comment"
+			style="@style/EntryFieldHeader"
+         />
+		<TextView
+			android:id="@+id/entry_comment"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textIsSelectable="true"
+			style="@style/EntryItem" />
+	</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/extra_strings"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:orientation="vertical" />
+		<!-- file attachments -->
+		<TextView
+			android:id="@+id/entry_binaries_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_binaries"
+			style="@style/EntryFieldHeader"
+         />
+		<LinearLayout
+			android:id="@+id/binaries"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical" />
+		<!--Tags -->
+	<LinearLayout android:id="@+id/entryfield_container_tags"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/entry_tags_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_tags"
+			style="@style/EntryFieldHeader"
+         />
+		<TextView
+			android:id="@+id/entry_tags"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textIsSelectable="true"
+			style="@style/EntryItem" />
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_overrideurl"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!--Override URL-->
+		<TextView
+			android:id="@+id/entry_override_url_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_override_url"
+			style="@style/EntryFieldHeader"
+         />
+		<TextView
+			android:id="@+id/entry_override_url"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:autoLink="all"
+			android:textIsSelectable="true"
+			style="@style/EntryItem" />
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_created"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+
+		<!-- Created -->
+		<TextView
+			android:id="@+id/entry_created_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_created"
+			style="@style/EntryFieldHeader"
+         />
+		<TextView
+			android:id="@+id/entry_created"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			style="@style/EntryItem" />
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_modified"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!-- Modified -->
+		<TextView
+			android:id="@+id/entry_modified_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_modified"
+			style="@style/EntryFieldHeader"
+         />
+		<TextView
+			android:id="@+id/entry_modified"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			style="@style/EntryItem" />
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_expires"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!-- Expires -->
+		<TextView
+			android:id="@+id/entry_expires_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_expires"
+			style="@style/EntryFieldHeader"
+         />
+		<TextView
+			android:id="@+id/entry_expires"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			style="@style/EntryItem" />
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/entry_view_test.xml b/src/PluginHostTest/Resources/Layout/entry_view_test.xml
new file mode 100644
index 00000000..5ab5565c
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/entry_view_test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical">
+<!-- Extra strings -->
+    <LinearLayout
+        android:id="@+id/extra_strings"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/plugin_details.xml b/src/PluginHostTest/Resources/Layout/plugin_details.xml
new file mode 100644
index 00000000..13efc645
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/plugin_details.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+	<LinearLayout
+        android:id="@+id/bottom_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
+        android:layout_alignParentBottom="true"
+        android:dividerPadding="12dp"
+        android:baselineAligned="false">
+		<FrameLayout
+            android:id="@+id/accept_button"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/accept" />
+		</FrameLayout>
+		<FrameLayout
+            android:id="@+id/deny_button"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="?attr/CancelDrawable"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/deny" />
+		</FrameLayout>
+	</LinearLayout>
+	<ScrollView
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:app="http://schemas.android.com/apk/res-auto"
+			android:id="@+id/plugin_scroll"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:scrollbarStyle="insideOverlay">
+		<LinearLayout android:id="@+id/scopes_list"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:padding="4dp">
+				<ImageView
+					android:id="@+id/imgIcon"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:layout_alignParentTop="true"
+					android:layout_marginRight="15dp"
+					android:layout_marginTop="5dp"
+					android:layout_marginBottom="5dp" />
+				<TextView
+					android:id="@+id/txtLabel"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:layout_toRightOf="@id/imgIcon"
+					android:textSize="22dp"
+         />
+				<TextView
+					android:id="@+id/txtVersion"
+					android:text="0.9.3"
+					android:textSize="14dp"
+					android:textColor="#888888"
+					android:layout_toRightOf="@id/imgIcon"
+					android:layout_below="@id/txtLabel"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content" />
+				<TextView
+					android:id="@+id/txtAuthor"
+					android:text=""
+					android:textSize="14dp"
+					android:textColor="#888888"
+					android:layout_below="@id/txtVersion"
+					android:layout_toRightOf="@id/imgIcon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content" />
+			</RelativeLayout>
+
+			<TextView
+					android:id="@+id/txtShortDesc"
+					android:text=""
+					android:textSize="14dp"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content" />
+
+			<CheckBox
+					android:id="@+id/cb_enabled"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/plugin_enabled_checkbox"
+					android:checked="true"
+                 />
+
+			<TextView
+				android:id="@+id/scopes_title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="Scopes"
+				android:layout_marginLeft="10dp"
+				android:layout_marginTop="18dp"
+				style="@style/ExtraFieldHeader" />
+			<LinearLayout android:id="@+id/scopes_list"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical">
+			</LinearLayout>
+		</LinearLayout>
+	</ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Layout/plugin_list.xml b/src/PluginHostTest/Resources/Layout/plugin_list.xml
new file mode 100644
index 00000000..1bc0c799
--- /dev/null
+++ b/src/PluginHostTest/Resources/Layout/plugin_list.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="plugin text"
+            style="@style/PaddedElement"
+            android:id="@+id/textView"
+            android:layout_gravity="left|center_vertical" />
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:padding="8dp" />
+    </LinearLayout>
+</merge>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/text_with_help.xml b/src/PluginHostTest/Resources/Layout/text_with_help.xml
similarity index 100%
rename from src/keepass2android/Resources/layout-v14/text_with_help.xml
rename to src/PluginHostTest/Resources/Layout/text_with_help.xml
diff --git a/src/keepass2android/Resources/menu-v11/entry.xml b/src/PluginHostTest/Resources/Menu/entry.xml
similarity index 82%
rename from src/keepass2android/Resources/menu-v11/entry.xml
rename to src/PluginHostTest/Resources/Menu/entry.xml
index e061a0ab..85137873 100644
--- a/src/keepass2android/Resources/menu-v11/entry.xml
+++ b/src/PluginHostTest/Resources/Menu/entry.xml
@@ -16,44 +16,39 @@
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menu_donate"
+        android:icon="@android:drawable/ic_menu_share"
+        android:title="@string/menu_donate"
+    />
+    <item android:id="@+id/menu_toggle_pass"
+        android:icon="@android:drawable/ic_menu_view"
+        android:title="@string/show_password"
+    />
+    <item android:id="@+id/menu_goto_url"
+        android:icon="@android:drawable/ic_menu_upload"
+        android:title="@string/menu_url"
+    />
+    <!--<item android:id="@+id/menu_copy_user"
+        android:icon="@android:drawable/ic_menu_set_as"
+        android:title="@string/menu_copy_user"
+    />
+    <item android:id="@+id/menu_copy_pass"
+        android:icon="@android:drawable/ic_menu_agenda"
+        android:title="@string/menu_copy_pass"
+    />-->
     <item android:id="@+id/menu_lock"
         android:icon="@android:drawable/ic_lock_lock"
         android:title="@string/menu_lock"
-        android:showAsAction="ifRoom"
     />
-    <item android:id="@+id/menu_toggle_pass"
-        android:title="@string/show_password"
-        android:icon="@android:drawable/ic_menu_view"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/menu_donate"
-        android:title="@string/menu_donate"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/menu_goto_url"
-        android:title="@string/menu_url"
-        android:showAsAction="ifRoom"
-    />
-    <!--item android:id="@+id/menu_copy_user"
-        android:title="@string/menu_copy_user"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/menu_copy_pass"
-        android:title="@string/menu_copy_pass"
-        android:showAsAction="ifRoom"
-    /-->
     <item android:id="@+id/menu_suggest_improvements"
         android:icon="@android:drawable/ic_menu_directions"
         android:title="@string/suggest_improvements"
-        android:showAsAction="never"
     />
     <item android:id="@+id/menu_rate"
         android:icon="@android:drawable/star_off"
         android:title="@string/rate_app"
-        android:showAsAction="never"
     />
     <item android:id="@+id/menu_translate"
         android:title="@string/translate_app"
-        android:showAsAction="never"
-    />
+       />
 </menu>
diff --git a/src/PluginHostTest/Resources/Values/Strings2.xml b/src/PluginHostTest/Resources/Values/Strings2.xml
new file mode 100644
index 00000000..191a316b
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/Strings2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="Hello">Hello World, Click Me!</string>
+    <string name="ApplicationName">PluginHostTest</string>
+	<string name="plugin_enabled_checkbox">Enabled</string>
+
+	<string name="SCOPE_DATABASE_ACTIONS_title">Database action notifications</string>
+	<string name="SCOPE_DATABASE_ACTIONS_explanation">Plugin will be notified when a database is opened, closed or saved.</string>
+
+	<string name="SCOPE_CURRENT_ENTRY_title">Current entry data</string>
+	<string name="SCOPE_CURRENT_ENTRY_explanation">Plugin will receive all data about the current database entry and will be allowed to offer actions and modify the display of it.</string>
+
+</resources>
diff --git a/src/PluginHostTest/Resources/Values/attrs.xml b/src/PluginHostTest/Resources/Values/attrs.xml
new file mode 100644
index 00000000..fa131c5a
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/attrs.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="TextViewParentStyle" format="reference"/>
+    <attr name="ActionBarButtonParentStyle" format="reference" />
+    <attr name="TextColorGroup" format="reference"></attr>
+    <attr name="TextColorHeader" format="reference"></attr>
+    <attr name="TextColorItem" format="reference"></attr>
+    <attr name="CancelDrawable" format="reference"></attr>
+    <attr name="NewGroupDrawable" format="reference"></attr>
+    <attr name="AddFieldDrawable" format="reference"></attr>
+    <attr name="NewEntryDrawable" format="reference"></attr>
+    <attr name="OpenFileDrawable" format="reference"></attr>
+    <attr name="OpenUrlDrawable" format="reference"></attr>
+    <attr name="CreateDbDrawable" format="reference"></attr>
+	<attr name="ic_menu_add_field" format="reference"></attr>
+
+	<attr name="ic_launcher_folder_small" format="reference"></attr>
+	<attr name="ic_action_search_drawable" format="reference"></attr>
+	<attr name="NavigationAcceptDrawable" format="reference"></attr>
+    
+    
+</resources>
diff --git a/src/keepass2android/Resources/values-v14/colors.xml b/src/PluginHostTest/Resources/Values/colors.xml
similarity index 78%
rename from src/keepass2android/Resources/values-v14/colors.xml
rename to src/PluginHostTest/Resources/Values/colors.xml
index 377bb177..12c7c1d9 100644
--- a/src/keepass2android/Resources/values-v14/colors.xml
+++ b/src/PluginHostTest/Resources/Values/colors.xml
@@ -1,33 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
-     
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android 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 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
-	<color name="blue_highlight">#0000dd</color>
-	<color name="group">#333333</color>
-	<color name="icon_background">#00555555</color>
-	<color name="icon_text">#000000</color>
-	<color name="light_gray">#a8a8a8</color>
-	<color name="dark_gray">#303030</color>
-
-	<color name="element_being_moved">#a8a8a8</color>
-
-	<color name="emphasis">#31b6e7</color>
-	<color name="emphasis2">#4f7a8a</color>
-	
-</resources>    
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 
+     
+ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android 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 2 of the License, or
+  (at your option) any later version.
+
+  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<resources>
+	<color name="blue_highlight">#0000dd</color>
+	<color name="group">#ffffff</color>
+	<color name="icon_background">#555555</color>
+	<color name="icon_text">#000000</color>
+	<color name="group_header_button_pressed">#101080</color>
+	
+	<color name="emphasis">#31b6e7</color>
+    <color name="emphasis2">#4f7a8a</color>
+    <color name="bg_gray">#cecbce</color>
+    <color name="light_gray">#a8a8a8</color>
+
+	<color name="element_being_moved">#a8a8a8</color>
+    
+</resources>    
diff --git a/src/PluginHostTest/Resources/Values/config.xml b/src/PluginHostTest/Resources/Values/config.xml
new file mode 100644
index 00000000..24402e9d
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/config.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 
+     
+ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android 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 2 of the License, or
+  (at your option) any later version.
+
+  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<resources>
+
+	<attr name="help_text" format="string" />
+	<declare-styleable name="Kp2aShortHelpView">
+		<attr name="android:text"/>
+		<attr name="help_text" />
+	</declare-styleable>
+	<declare-styleable name="TextWithHelp">
+		<attr name="android:text"/>
+		<attr name="help_text" />
+	</declare-styleable>
+
+	<string name="icon_info">&#xf05a;</string>
+
+  <string name="library_name"></string>
+    <string name="default_file_path">/keepass/keepass.kdbx</string>
+    <string name="donate_url"><![CDATA[http://philipp.crocoll.net/donate.php?lang=%1$s&app=%2$s]]></string>
+    <string name="homepage">http://keepass2android.codeplex.com</string>
+    <string name="homepage_short">keepass2android.codeplex.com</string>
+	<string name="further_author_names">Alex Vallat</string>
+    <string name="issues">http://keepass2android.codeplex.com</string>
+    <string name="oi_filemanager_market">market://details?id=org.openintents.filemanager</string>
+    <string name="oi_filemanager_web">https://openintents.googlecode.com/files/FileManager-2.0.2.apk</string>
+	<string name="permission_desc">KP2A Internal File Browsing Permission</string>
+   
+    <!--  Preference settings -->
+    <string name="algorithm_key">algorithm</string>
+    <string name="app_key">app</string>
+    <string name="app_timeout_key">app_timeout_key</string>
+	<string name="show_kill_app_key">show_kill_app_key</string>
+    <string name="clipboard_timeout_key">clip_timeout_key</string>
+    <string name="db_key">db</string>
+    <string name="rounds_key">rounds</string>
+    <string name="keyfile_key">keyfile</string>
+    <string name="maskpass_key">maskpass</string>
+    <string name="omitbackup_key">omitbackup</string>    
+    <string name="list_size_key">list_size</string>
+	<string name="design_key">design_key</string>
+	<string name="sort_key">sort_key</string>
+	<string name="TanExpiresOnUse_key">TanExpiresOnUse_key</string>
+	<string name="ShowUsernameInList_key">ShowUsernameInList_key</string>
+	<string name="RememberRecentFiles_key">RememberRecentFiles_key</string>
+    <string name="default_username_key">defaultUsername</string>
+    <string name="database_name_key">databaseName</string>
+    <string name="BinaryDirectory_key">binaryDirectory</string>
+    <string name="BinaryDirectory_default">/mnt/sdcard/keepass2android/binaries/</string>
+    <bool name="maskpass_default">true</bool>
+    <bool name="keyfile_default">true</bool>
+    <bool name="sort_default">true</bool>
+    <bool name="omitbackup_default">true</bool>
+    <bool name="TanExpiresOnUse_default">true</bool>
+    <bool name="ShowUsernameInList_default">true</bool>
+
+	<bool name="RememberRecentFiles_default">true</bool>
+	
+	
+	<string name="password_access_prefs_key">password_access_prefs_key</string>
+	<string name="security_prefs_key">security_prefs_key</string>
+	<string name="display_prefs_key">display_prefs_key</string>
+	<string name="QuickUnlock_prefs_key">QuickUnlock_prefs_key</string>
+	<string name="FileHandling_prefs_key">FileHandling_prefs_key</string>
+
+	<string name="QuickUnlockDefaultEnabled_key">Enable_QuickUnlock_by_default</string>
+	<string name="QuickUnlockLength_key">QuickUnlockLength</string>
+	<string name="QuickUnlockLength_default">3</string>
+	<string name="QuickUnlockIconHidden_key">QuickUnlockIconHidden_key</string>
+	<string name="QuickUnlockIconHidden16_key">QuickUnlockIconHidden16_key</string>
+	
+	<string name="UsageCount_key">UsageCount</string>
+	<string name="LastInfoVersionCode_key">LastInfoVersion</string>
+	
+	<string name="UseFileTransactions_key">UseFileTransactions</string>
+	<string name="LockWhenScreenOff_key">LockWhenScreenOff</string>
+	<string name="UseOfflineCache_key">UseOfflineCache</string>
+	<string name="AcceptAllServerCertificates_key">AcceptAllServerCertificates</string>
+	<string name="CheckForFileChangesOnSave_key">CheckForFileChangesOnSave</string>
+
+	<string name="MarketURL">market://details?id=</string>
+	<string name="SuggestionsURL">https://keepass2android.codeplex.com/workitem/list/basic</string>
+	<string name="TranslationURL">http://crowdin.net/project/keepass2android</string>
+	
+	<string name="CopyToClipboardNotification_key">ShowCopyToClipboardNotification</string>
+	<bool name="CopyToClipboardNotification_default">true</bool>
+	
+	<string name="UseKp2aKeyboard_key">ShowKp2aKeyboardNotification</string>
+	<bool name="UseKp2aKeyboard_default">true</bool>
+	
+	<string name="OpenKp2aKeyboardAutomatically_key">OpenKp2aKeyboardAutomatically</string>
+	<bool name="OpenKp2aKeyboardAutomatically_default">true</bool>
+	
+    <string name="clipboard_timeout_default">300000</string>
+    <string-array name="clipboard_timeout_values">
+    	<item>30000</item>
+    	<item>60000</item>
+    	<item>300000</item>
+		<item>600000</item>
+		<item>900000</item>
+		<item>1800000</item>
+		<item>3600000</item>
+    	<item>-1</item>
+    </string-array>
+
+	<string name="list_size_default">20</string>
+    <string-array name="list_size_values">
+    	<item>15</item>
+    	<item>20</item>
+    	<item>28</item>
+    </string-array>
+
+	<string name="design_default">Light</string>
+	<string-array name="design_values">
+		<item>Light</item>
+		<item>Dark</item>
+	</string-array>
+	
+	<string name="AcceptAllServerCertificates_default">WARN</string>
+	<string-array name="AcceptAllServerCertificates_values">
+		<item>IGNORE</item>
+		<item>WARN</item>
+		<item>ERROR</item>
+	</string-array>
+
+	<string name="ShowUnlockedNotification_key">ShowUnlockedNotification</string>
+	<bool name="ShowUnlockedNotification_default">true</bool>
+
+	<string name="PreloadDatabaseEnabled_key">PreloadDatabaseEnabled</string>
+	<bool name="PreloadDatabaseEnabled_default">true</bool>
+
+</resources>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Values/config2.xml b/src/PluginHostTest/Resources/Values/config2.xml
new file mode 100644
index 00000000..22a5e94c
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/config2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+	<declare-styleable name="Kp2aShortHelpView">
+		<attr name="android:text"/>
+		<attr name="help_text" />
+	</declare-styleable>
+	<declare-styleable name="TextWithHelp">
+		<attr name="android:text"/>
+		<attr name="help_text" />
+	</declare-styleable>
+	
+</resources>
\ No newline at end of file
diff --git a/src/PluginHostTest/Resources/Values/dimens.xml b/src/PluginHostTest/Resources/Values/dimens.xml
new file mode 100644
index 00000000..55c1e590
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/dimens.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
diff --git a/src/PluginHostTest/Resources/Values/strings.xml b/src/PluginHostTest/Resources/Values/strings.xml
new file mode 100644
index 00000000..d4962d63
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/strings.xml
@@ -0,0 +1,587 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
+<resources>
+  <string name="about_feedback">Feedback</string>
+  <string name="about_homepage">Homepage</string>
+  <string name="AboutText">Keepass2Android is a password manager providing read/write access to KeePass 2.x databases on Android.</string>
+  <string name="CreditsText">The User Interface is based on a port of KeepassDroid developed by Brian Pellin. Code for database operations is based on KeePass by Dominik Reichl. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.</string>
+  <string name="CreditsTextSFTP">SFTP support is implemented using the JSch library under BSD licence, created by JCraft, Inc.</string>
+  <string name="accept">Accept</string>
+	<string name="deny">Deny</string>
+  <string name="add_entry">Add entry</string>
+  <string name="add_url_entry">Create entry for URL</string>
+  <string name="add_group">Add group</string>
+  <string name="add_group_title">Add Group</string>
+  <string name="edit_group_title">Edit Group</string>
+  <string name="algorithm">Algorithm</string>
+  <string name="algorithm_colon">Algorithm</string>
+  <string name="app_name">Keepass2Android</string>
+  <string name="short_app_name">KP2A</string>
+  <string name="app_name_nonet">Keepass2Android Offline</string>
+  <string name="short_app_name_nonet">KP2A Offline</string>
+  <string name="app_timeout">Application timeout</string>
+  <string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
+  <string name="kill_app_label">Kill application process</string>
+  <string name="show_kill_app">Close-Button</string>
+  <string name="show_kill_app_summary">Show a button in password screen to kill the application process (for paranoid users)</string>
+  <string name="application">Application</string>
+  <string name="application_settings">Application settings</string>
+	
+	<string name="security_prefs">Security</string>
+	<string name="display_prefs">Display</string>
+	<string name="password_access_prefs">Password entry access</string>
+	<string name="QuickUnlock_prefs">QuickUnlock</string>
+	<string name="FileHandling_prefs">File handling</string>
+	<string name="keyboard_prefs">Keyboard</string>
+	<string name="export_prefs">Export database...</string>
+	<string name="brackets">Brackets</string>
+  <string name="cancel">Cancel</string>
+  <string name="ClearClipboard">Clipboard cleared.</string>
+  <string name="clipboard_timeout">Clipboard timeout</string>
+  <string name="clipboard_timeout_summary">Time before clearing clipboard after copying username or password</string>
+  <string name="copy_username">Select to copy username to clipboard</string>
+  <string name="copy_password">Select to copy password to clipboard</string>
+  <string name="available_through_keyboard">Entry is available through KP2A Keyboard</string>
+  <string name="not_possible_im_picker">Could not open dialog to select input method. Please activate keyboard manually.</string>
+  <string name="please_activate_keyboard">Please enable the Keepass2Android keyboard in your system settings.</string>
+  <string name="creating_db_key">Creating database key…</string>
+  <string name="current_group">Current Group</string>
+  <string name="current_group_root">Current Group: Root</string>
+  <string name="database">Database</string>
+  <string name="digits">Digits</string>
+  <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="enter_filename">Enter database filename</string>
+  <string name="entry_accessed">Accessed</string>
+  <string name="entry_cancel">Cancel</string>
+  <string name="entry_comment">Comments</string>
+  <string name="entry_tags">Tags</string>
+  <string name="entry_override_url">Override URL</string>
+  <string name="entry_confpassword">Confirm password</string>
+  <string name="entry_created">Created</string>
+  <string name="entry_expires">Expires</string>
+  <string name="entry_keyfile">Key file (optional)</string>
+  <string name="entry_modified">Modified</string>
+  <string name="entry_password">Password</string>
+  <string name="entry_save">Save</string>
+  <string name="entry_title">Name</string>
+  <string name="entry_url">URL</string>
+  <string name="entry_user_name">User Name</string>
+  <string name="entry_extra_strings">Extra string fields</string>
+  <string name="entry_binaries">File attachments</string>
+  <string name="error_can_not_handle_uri">Keepass2Android cannot handle this uri.</string>
+  <string name="error_could_not_create_group">Error creating group.</string>
+  <string name="error_could_not_create_parent">Could not create parent directory.</string>
+  <string name="error_database_exists">This file already exists.</string>
+  <string name="error_database_settings">Failed to determine database settings.</string>
+  <string name="error_failed_to_launch_link">Failed to launch link.</string>
+  <string name="error_filename_required">A filename is required.</string>
+  <string name="error_file_not_create">Could not create file</string>
+  <string name="error_invalid_db">Invalid database.</string>
+  <string name="error_invalid_path">Invalid path.</string>
+  <string name="error_no_name">A name is required.</string>
+  <string name="error_nopass">A password or a keyfile is required.</string>
+  <string name="error_pass_gen_type">At least one password generation type must be selected</string>
+  <string name="error_pass_match">Passwords do not match.</string>
+  <string name="error_rounds_not_number">Rounds must be a number.</string>
+  <string name="error_title_required">A title is required.</string>
+  <string name="error_wrong_length">Enter a positive integer on length field</string>
+  <string name="FileNotFound">File not found.</string>
+  <string name="file_browser">File Browser</string>
+  <string name="generate_password">Generate Password</string>
+  <string name="group">Group</string>
+  <string name="hint_comment">comment</string>
+  <string name="hint_conf_pass">confirm password</string>
+  <string name="hint_generated_password">generated password</string>
+  <string name="hint_group_name">Group name</string>
+  <string name="hint_keyfile">key file</string>
+  <string name="hint_length">length</string>
+  <string name="hint_pass">password</string>
+  <string name="hint_login_pass">Password</string>
+  <string name="hint_title">name</string>
+  <string name="hint_url">url</string>
+  <string name="hint_override_url">override url</string>
+  <string name="hint_tags">tag1, tag2</string>
+  <string name="hint_username">username</string>
+  <string name="InvalidPassword">Invalid password or key file.</string>
+  <string name="invalid_algorithm">Invalid algorithm.</string>
+  <string name="invalid_db_sig">Database format not recognized.</string>
+  <string name="keyfile_does_not_exist">Key file does not exist.</string>
+  <string name="keyfile_is_empty">Key file is empty.</string>
+  <string name="length">Length</string>
+  <string name="list_size_title">Group list size</string>
+  <string name="list_size_summary">Text size in the group list</string>
+  <string name="loading_database">Loading database…</string>
+  <string name="lowercase">Lower-case</string>
+  <string name="MaskedPassword">*****</string>
+  <string name="maskpass_title">Mask password</string>
+  <string name="maskpass_summary">Hide passwords by default</string>
+  <string name="menu_about">About</string>
+  <string name="menu_change_key">Change Master Key</string>
+  <string name="menu_copy_pass">Copy Password</string>
+  <string name="menu_copy_user">Copy User</string>
+  <string name="menu_create">Create</string>
+  <string name="menu_app_settings">Settings</string>
+  <string name="menu_db_settings">Database settings</string>
+  <string name="menu_delete">Delete</string>
+  <string name="menu_move">Move to another group</string>
+  <string name="menu_donate">Donate a beer...</string>
+  <string name="menu_edit">Edit</string>
+  <string name="menu_hide_password">Hide Password</string>
+  <string name="menu_lock">Lock Database</string>
+  <string name="menu_open">Open</string>
+  <string name="menu_rename">Rename</string>
+  <string name="menu_search">Search</string>
+  <string name="menu_search_advanced">Advanced Search</string>
+  <string name="menu_url">Go to URL</string>
+	<string name="menu_change_db">Change database…</string>
+  <string name="minus">Minus</string>
+  <string name="never">Never</string>
+  <string name="yes">Yes</string>
+  <string name="no">No</string>
+  <string name="no_keys">No entries in the database or group.</string>
+  <string name="no_results">No search results</string>
+  <string name="no_url_handler">No handler for this url.</string>
+  <string name="open_recent">Open recent database (click to open)</string>
+  <string name="omitbackup_title">Don\'t search backup and recycle bin entries</string>
+  <string name="omitbackup_summary">Omit \'Backup\' and Recycle Bin group from search results</string>
+  <string name="pass_filename">KeePass database filename</string>
+  <string name="password_title">Enter database password</string>
+  <string name="master_key_type">Select master key type:</string>
+  <string name="progress_create">Creating new database…</string>
+  <string name="create_database">Create database</string>
+  <string name="progress_title">Working…</string>
+  <string name="remember_keyfile_summary">Remembers the location of keyfiles</string>
+  <string name="remember_keyfile_title">Save keyfile</string>
+  <string name="remove_from_filelist">Remove</string>
+  <string name="rijndael">Rijndael (AES)</string>
+  <string name="root">Root</string>
+  <string name="rounds">Encryption Rounds</string>
+  <string name="rounds_explaination">Higher encryption rounds provide additional protection against brute force attacks, but can really slow down loading and saving.</string>
+  <string name="rounds_hint">rounds</string>
+  <string name="database_name">Database name</string>
+  <string name="default_username">Default user name for new entries</string>
+  <string name="saving_database">Saving database…</string>
+	<string name="exporting_database">Exporting database…</string>
+	<string name="export_database_successful">Database exported successfully!</string>
+	
+	<string name="space">Space</string>
+  <string name="search_label">Search</string>
+  <string name="show_password">Show password</string>
+  <string name="sort_name">Sort by name</string>
+  <string name="sort_db">Sort by creation date</string>
+  <string name="special">Special</string>
+  <string name="search_hint">Find what</string>
+  <string name="search_results">Search results</string>
+  <string name="search_in">Search in</string>
+  <string name="select_other_entry">Select another entry</string>
+  <string name="select_group_then_add">Open the desired group, then press "%1$s"!</string>
+	<string name="insert_element_here">Insert here</string>
+  <string name="twofish">Twofish</string>
+  <string name="underline">Underline</string>
+  <string name="unsupported_db_version">Unsupported database version.</string>
+  <string name="uppercase">Upper-case</string>
+  <string name="warning_read_only">Your sd card is currently read-only. You may not be able to save changes to your database.</string>
+  <string name="warning_unmounted">Your sd card is not currently mounted on your device. You will not be able to load or create your database.</string>
+  <string name="version_label">Version</string>
+	<string name="version_history">Version history</string>
+	<string name="author">Keepass2Android is developed by Philipp Crocoll.</string>
+	<string name="further_authors">Thanks to code contributions by %1$s.</string>
+	<string name="credit_plugin1">The Twofish Cipher Plugin for Keepass was developed by Scott Greenberg and is included in KP2A.</string>
+	<string name="credit_android_filechooser">android-filechooser was developed by Hai Bison</string>
+	<string name="credit_keyboard">The KP2A keyboard is based on the Gingerbread keyboard by the Android Open Source Project and uses the Plugin Manager code from Hacker\'s Keyboard by Klaus Weidner.</string>
+	<string name="please_note">Please note</string>
+	<string name="contributors">Contributors</string>
+  <string name="regular_expression">Regular expression</string>
+  <string name="TanExpiresOnUse_title">Tan expires on use</string>
+  <string name="TanExpiresOnUse_summary">Mark TAN entries expired when using them</string>
+  <string name="ShowUsernameInList_title">Display username in list</string>
+  <string name="ShowUsernameInList_summary">Display usernames below entry titles. Useful for multiple accounts or TANs.</string>
+	<string name="RememberRecentFiles_title">Remember databases</string>
+	<string name="RememberRecentFiles_summary">Remember recently opened databases and show them in the Open database screen.</string>
+	
+	<string name="kp2a_findUrl">Keepass2Android: Find password</string>
+  <string name="excludeExpiredEntries">Exclude expired entries</string>
+  <string name="search_options">Options</string>
+  <string name="caseSensitive">Case sensitive</string>
+  <string name="start_open_file">Open file...</string>
+  <string name="start_create">Create new database...</string>
+  <string name="start_open_url">Open URL...</string>
+  <string name="start_create_import">Import file to new database...</string>
+  <string name="enter_filename_details_url">The complete URL must be specified including protocol like http://.</string>
+  <string name="enter_filename_details_create_import">File to import will be selected in the next step.</string>
+  <string name="enable_quickunlock">Enable QuickUnlock</string>
+  <string name="QuickUnlock_label">Enter last %1$d characters of your password:</string>
+  <string name="QuickUnlock_button">QuickUnlock!</string>
+  <string name="QuickUnlock_lockButton">Close database</string>
+  <string name="QuickUnlockDefaultEnabled_title">Enable QuickUnlock by default</string>
+  <string name="QuickUnlockDefaultEnabled_summary">Defines whether QuickUnlock is enabled by default or not.</string>
+  <string name="QuickUnlockIconHidden_title">Hide QuickUnlock icon</string>
+  <string name="QuickUnlockIconHidden_summary">QuickUnlock unfortunately does not work without displaying a notification icon. Select this option to use a transparent icon.</string>
+  <string name="QuickUnlockIconHidden16_title">Hide QuickUnlock icon</string>
+  <string name="QuickUnlockIconHidden16_summary">QuickUnlock requires a notification to work properly. Select this option to display a notification without an icon.</string>
+  <string name="QuickUnlockLength_title">Length of QuickUnlock key</string>
+  <string name="QuickUnlockLength_summary">Maximum number of characters used as QuickUnlock password.</string>
+  <string name="QuickUnlock_fail">QuickUnlock failed: incorrect password!</string>
+  <string name="BinaryDirectory_title">File attachments directory</string>
+  <string name="BinaryDirectory_summary">Directory where file attachments are saved to.</string>
+  <string name="SaveAttachmentDialog_title">Save attachment</string>
+  <string name="SaveAttachmentDialog_text">Please select where to save the attachment.</string>
+  <string name="SaveAttachmentDialog_save">Save to SD card</string>
+  <string name="SaveAttachmentDialog_open">Save to cache and open</string>
+  
+  <string name="SaveAttachment_doneMessage">Saved file to %1$s.</string>
+  <string name="SaveAttachment_Failed">Could not save attachment to %1$s.</string>
+
+	<string name="AddUrlToEntryDialog_title">Remember search text?</string>
+	<string name="AddUrlToEntryDialog_text">Would you like to store the search text "%1$s" in the selected entry in order to find it automatically next time?</string>
+
+	<string name="error_invalid_expiry_date">Invalid date/time format for expiry date!</string>
+  <string name="error_string_key">A field name is required for each string.</string>
+  <string name="field_name">Field Name</string>
+  <string name="field_value">Field value</string>
+  <string name="protection">Protected field</string>
+  <string name="add_binary">Add file attachment...</string>
+  <string name="add_extra_string">Add additional string</string>
+	<string name="delete_extra_string">Delete additional string</string>
+	<string name="database_loaded_quickunlock_enabled">%1$s: Locked. QuickUnlock enabled.</string>
+	<string name="database_loaded_unlocked">%1$s: Unlocked.</string>
+  <string name="credentials_dialog_title">Enter server credentials</string>
+  <string name="UseFileTransactions_title">File transactions</string>
+  <string name="UseFileTransactions_summary">Use file transactions for writing databases</string>
+	<string name="LockWhenScreenOff_title">Lock when screen off</string>
+  <string name="LockWhenScreenOff_summary">Lock the database when screen is switched off.</string>
+	<string name="UseOfflineCache_title">Database caching</string>
+	<string name="UseOfflineCache_summary">Keep a copy of remote database files in the application cache directory. This allows to use remote databases even when offline.</string>
+
+	<string name="AcceptAllServerCertificates_title">SSL certificates</string>
+	<string name="AcceptAllServerCertificates_summary">Define the behavior when certificate validation fails. Note: you can install certificates on your device if validation fails!</string>
+	
+	
+	<string name="ClearOfflineCache_title">Clear cache?</string>
+	<string name="ClearOfflineCache_question">This will delete all cached database files. Any changes you made while being offline which have not yet been synchronized will be lost! Continue?</string>
+  <string name="CheckForFileChangesOnSave_title">Check for modifications</string>
+  <string name="CheckForFileChangesOnSave_summary">Check whether the file was modified externally before saving changes.</string>
+	
+  <string name="ShowCopyToClipboardNotification_title">Clipboard notifications</string>
+  <string name="ShowCopyToClipboardNotification_summary">Make username and password accessible through the notification bar and clipboard. Beware of password sniffers!</string>
+  <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.</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>
+
+	<string name="ShowUnlockedNotification_title">Notification icon while unlocked</string>
+	<string name="ShowUnlockedNotification_summary">Show a notification icon while the database is unlocked.</string>
+
+	<string name="PreloadDatabaseEnabled_title">Pre-load database file</string>
+	<string name="PreloadDatabaseEnabled_summary">Start background loading or downloading of the database file during password entry.</string>
+
+	<string name="AskOverwriteBinary">Do you want to overwrite the existing binary with the same name?</string>
+  <string name="AskOverwriteBinary_title">Overwrite existing binary?</string>
+  <string name="AskOverwriteBinary_yes">Overwrite</string>
+  <string name="AskOverwriteBinary_no">Rename</string>
+  <string name="AttachFailed">Failed to add file attachment.</string>
+  <string name="RecycleBin">Recycle Bin</string>
+  <string name="AskDeletePermanentlyEntry">Do you want to delete this entry permanently? Press No to recycle.</string>
+  <string name="AskDeletePermanentlyGroup">Do you want to delete this group permanently? Press No to recycle.</string>
+  <string name="AskDeletePermanently_title">Delete permanently?</string>
+  <string name="AskReloadFile_title">Reload file?</string>
+  <string name="AskReloadFile">The file which is currently open was changed by another program. Do you want to reload it?</string>
+  <string name="AskDiscardChanges">Do you really want to discard the changes made? (The Save button is at the top of the form.)</string>
+  <string name="AskDiscardChanges_title">Discard changes?</string>
+  <string name="suggest_improvements">Suggest or vote for improvements</string>
+  <string name="rate_app">Rate this app</string>
+  <string name="translate_app">Translate KP2A</string>
+	<string name="AddingEntry">Adding entry…</string>
+	<string name="AddingGroup">Adding group…</string>
+	<string name="DeletingEntry">Deleting entry…</string>
+	<string name="DeletingGroup">Deleting group…</string>
+	<string name="SettingPassword">Setting password…</string>
+	<string name="UndoingChanges">Undoing changes…</string>
+	<string name="TransformingKey">Transforming master key…</string>
+	<string name="DecodingDatabase">Decoding database…</string>
+	<string name="ParsingDatabase">Parsing database…</string>
+	<string name="CheckingTargetFileForChanges">Checking target file for changes…</string>
+	<string name="TitleSyncQuestion">Merge changes?</string>
+	<string name="MessageSyncQuestion">The database file was modified externally. Do you want to load and merge the changes before saving? Select No if you want to overwrite the external changes.</string>
+	<string name="SynchronizingDatabase">Merging changes…</string>
+	<string name="YesSynchronize">Yes, merge</string>
+	<string name="NoOverwrite">No, overwrite</string>
+
+	<string name="SynchronizingCachedDatabase">Synchronizing cached database…</string>
+	<string name="DownloadingRemoteFile">Downloading remote file…</string>
+	<string name="UploadingFile">Uploading file…</string>
+	<string name="RestoringRemoteFile">Restoring remote file…</string>
+	<string name="FilesInSync">Files are in sync.</string>
+	<string name="SynchronizedDatabaseSuccessfully">Database synchronized successfully!</string>
+	<string name="CheckingDatabaseForChanges">Checking database for changes…</string>
+
+	<string name="CouldNotSaveToRemote">Could not save to remote: %1$s. Save again or use the Synchronize menu when remote connection is available again.</string>
+	<string name="CouldNotLoadFromRemote">Could not open from remote: %1$s. Loaded file from local cache. You can still make changes in the database and synchronize them later.</string>
+	<string name="UpdatedRemoteFileOnLoad">Updated remote file.</string>
+	<string name="NotifyOpenFromLocalDueToConflict">Opened local file due to conflict with changes in remote file. Use Synchronize menu to merge.</string>
+	<string name="LoadedFromRemoteInSync">Remote file and cache are synchronized.</string>
+	<string name="UpdatedCachedFileOnLoad">Updated local cache copy of %1$s.</string>
+	<string name="RemoteDatabaseUnchanged">No changes detected.</string>
+
+	<string name="ResolvedCacheConflictByUsingRemoteOtpAux">Updated cached OTP auxiliary file: Remote counter was higher.</string>
+	<string name="ResolvedCacheConflictByUsingLocalOtpAux">Updated remote OTP auxiliary file: Local counter was higher.</string>
+
+	<string name="SynchronizingOtpAuxFile">Synchronizing OTP auxiliary file…</string>
+	
+	<string name="database_file">database file</string>
+	<string name="otp_aux_file">OTP auxiliary file</string>
+
+	<string name="ErrorOcurred">An error occured:</string>
+
+	<string name="synchronize_database_menu">Synchronize database…</string>
+
+	<string name="CannotMoveGroupHere">Cannot move group to this group.</string>
+
+	<string name="donate_question">Today, it\'s Oktoberfest! If you like Keepass2Android: wouldn\'t today be a good day to buy me a beer?</string>
+	<string name="donate_bday_question">May 10th? It\'s my birthday! If you like this app, why not send me some birthday greetings along with a little birthday gift? This would really make me happy! :-)</string>
+	<string name="donate_missedbday_question">Oh, you missed my birthday on May 10th! If you like this app, why not send me some birthday greetings and a little birthday gift? It is not yet too late to make me happy! :-)</string>
+	<string name="ok_donate">Tell me more!</string>
+	<string name="no_thanks">No, I don\'t like it that much</string>
+
+	<string name="hint_sftp_host">host (ex: 192.168.0.1)</string>
+	<string name="hint_sftp_port">port</string>
+	<string name="initial_directory">Initial directory (optional):</string>
+	<string name="enter_sftp_login_title">Enter SFTP login data:</string>
+
+	<string name="select_storage_type">Select the storage type:</string>
+	
+
+	<string name="filestoragename_file">Local file</string>
+	<string name="filestoragename_androidget">Get from third-party app</string>
+	<string name="filestoragename_androidsend">Send to third-party app</string>
+	<string name="filestoragename_ftp">FTP</string>
+	<string name="filestoragename_http">HTTP (WebDav)</string>
+	<string name="filestoragename_https">HTTPS (WebDav)</string>
+	<string name="filestoragename_dropbox">Dropbox</string>
+	<string name="filestoragename_dropboxKP2A">Dropbox (KP2A folder)</string>
+	<string name="filestoragehelp_dropboxKP2A">If you do not want to give KP2A access to your full Dropbox, you may select this option. It will request only access to the folder Apps/Keepass2Android. This is especially suited when creating a new database. If you already have a database, click this option to create the folder, then place your file inside the folder (from your PC) and then select this option again for opening the file.</string>
+	<string name="filestoragename_gdrive">Google Drive</string>
+	<string name="filestoragename_skydrive">OneDrive</string>
+	<string name="filestoragename_sftp">SFTP (SSH File Transfer)</string>
+
+	<string name="filestorage_setup_title">File access initialization</string>
+
+	<string name="database_location">Database location</string>
+	<string name="help_database_location">You can store your database locally on your Android device or in the cloud (non-Offline version only). Keepass2Android makes the database available even if you are offline. As the database is securely encrypted with AES 256 bit encryption, nobody will be able to access your passwords except you. We recommend to select Dropbox: It\'s accessible on all your devices and even provides backups of previous file versions.</string>
+	<string name="hint_database_location">Select where you want to store the database:</string>
+	<string name="button_change_location">Change location</string>
+
+	<string name="master_password">Master password</string>
+	<string name="help_master_password">Your database is encrypted with the password you enter here. Choose a strong password in order to keep the database safe! Tip: Make up a sentence or two and use the first letters of the words as password. Include punctuation marks.</string>
+	<string name="hint_master_password">Select a master password to protect your database:</string>
+
+	<string name="key_file">Key file</string>
+	<string name="help_key_file">A key file is basically a password stored in a file. Key files are typically stronger than master passwords, because the key can be a lot more complicated; however it\'s also harder to keep them secret. If you store your database in the cloud, don\'t store the key file there as well! This would make it completely useless! Important: Do not change the contents of the key file after creating the database!</string>
+	<string name="hint_key_file">Choose if you want to use a key file in addition to your master password:</string>
+	<string name="use_key_file">Use key file</string>
+
+	<string name="error_adding_keyfile">Error while adding the keyfile!</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>
+	<string name="CouldntLoadOtpAuxFile">Could not load auxiliary OTP file!</string>
+	<string name="CouldntLoadOtpAuxFile_Hint">Please use the OtpKeyProv plugin in KeePass 2.x (PC) to configure your database for use with OTPs!</string>
+	<string name="otp_discarded_because_no_db">Please select database first. OTP is discarded for security reasons.</string>
+	<string name="otp_discarded_no_space">OTP discarded: All OTPs already entered!</string>
+	<string name="otp_discarded_because_db_open">Please close database first. OTP is discarded.</string>
+	<string name="otps_pending">(One or more OTPs already available)</string>
+	<string name="otpsecret_hint">OTP secret (e.g. 01 23 ab cd…)</string>
+	<string name="CouldntParseOtpSecret">Error parsing OTP secret!</string>
+	<string name="OtpKeyError">Failed to create OTP key! Make sure you have entered the correct OTPs.</string>
+	<string name="ErrorUpdatingOtpAuxFile">Error updating OTP auxiliary file!</string>
+	<string name="SavingOtpAuxFile">Saving auxiliary OTP file…</string>
+
+	<string name="loading">Loading…</string>
+	
+	<string name="enable_plugin_title">Enable plug-in?</string>
+	<string name="enable_plugin_question">Keepass2Android detected a plug-in with name: %1$s from package name: %2$s. Do you want to enable this plug-in? It will have access to the data stored in your Keepass databases.</string>
+	
+	<string name="plugins">Plug-ins</string>
+	<string name="plugin_packagename">Package name:</string>
+	<string name="plugin_description">Description (not verified):</string>
+	<string name="plugin_author">Author (not verified):</string>
+	<string name="plugin_enabled">enabled</string>
+	<string name="plugin_disabled">disabled</string>
+	<string name="plugins_text">Click plug-in to enable/disable</string>
+
+	<string name="get_regular_version">Get more storage types</string>
+
+	<string name="CertificateWarning">Warning: Server certificate validation failed: %1$s. Install appropriate root certificate on your device or see settings!</string>
+	<string name="CertificateFailure">Error: Server certificate validation failed! Install appropriate root certificate on your device or see settings!</string>
+
+	<string name="export_fileformats_title">Select file format</string>
+	
+	<string name="ChangeLog_title">Change log</string>
+	
+	<string name="ChangeLog_0_9_3_r5">
+		<b>Version 0.9.3 r5</b>\n
+		* Incorporated fixes from Xamarin: Keepass2Android now compatible with ART on Android 4.4.2. Finally!\n
+		* Bug fixes: bugs in synchronization (refresh display, correct check for changes on http), bugs on Android 2.x devices, bugs in Google Drive and OneDrive storage implementations, clear clipboard on close database, bug opening attachments, display problems with keyboard\n
+	</string>
+
+	<string name="ChangeLog_0_9_3">
+		<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>
+
+	<string name="ChangeLog_0_9_2">
+		<b>Version 0.9.2</b>\n
+		* Added OTP support (compatible with OtpKeyProv plugin)\n
+		* Integrated NFC support for OTPs from YubiKey NEO \n
+		* Several UI improvements\n
+		* Integrated Keepass 2.24 library\n
+		* Added option to kill the app process (see settings)\n
+		* Improved SSL certificate validation\n
+		* Bug fixes\n
+	</string>
+
+	<string name="ChangeLog_0_9_1">
+		<b>Version 0.9.1</b>\n
+		* Integrated SkyDrive support (Keepass2Android regular edition only)\n
+		* Fixed problems with Google Drive integration\n
+		* Added NTLM support
+	</string>
+
+
+		<string name="ChangeLog_0_9">
+		<b>Version 0.9</b>\n
+		* Integrated Dropbox and Google Drive support (read/write databases; Keepass2Android regular edition only)\n
+		* Integrated custom file browser (based on android-filechooser by HBA)\n
+		* Improved user interface for creating new databases\n
+		* Included custom font DejaVu Sans Mono for displaying passwords\n
+		* Bug fixes
+	</string>
+
+	
+	<string name="ChangeLog_0_8_6">
+		<b>Version 0.8.6</b>\n
+		* Support for Twofish cipher\n
+		* Allow editing of groups\n
+		* Allow moving of entries and groups\n
+		* QuickUnlock icon can be made transparent (see settings)\n
+		* Bug fixes
+	</string>
+
+	<string name="ChangeLog_0_8_5">
+		<b>Version 0.8.5</b>\n
+		* Remote files are stored in the local application cache to allow offline usage (including editing and later synchronization). See settings. \n
+		* Notification icon to visualize the lock-state of the database (see settings)\n
+		* Improved determination of lock-state in some situations\n
+		* Database files are loaded to memory while you are typing your password for increased loading speed (see settings)\n
+		* Entries can be added to root group\n
+		* Bug fixes (resolving reference fields, problems with keyboard on Italian an Chinese devices)
+	</string>
+		<string name="ChangeLog_0_8_4">
+		<b>Version 0.8.4</b>\n
+		* External database changes are detected and merged when saving\n
+		* Improved loading performance\n
+		* Improved search toolbar with suggestions\n
+		* New App logo!\n
+		* Added support for .kdbp format for faster loading/saving\n
+		* Improved editing of extra strings and hidden display when protected\n
+		Thanks to Alex Vallat for his code contributions!\n
+		Thanks to Niki Hüttner (www.close-cut.de) for the new logo!\n
+	</string>
+		<string name="ChangeLog_0_8_3"><b>Version 0.8.3</b>\n
+* Username/TAN index displayed in entry list (see settings)\n
+* Entries can be created if search from browser doesn\'t return results\n
+* KP2A keyboard provides possibility to search for credentials for current app\n
+* App automatically closes after selecting an entry for use in keyboard\n
+* Keyboard selection dialog automatically opens after search for URL (see settings)\n
+* Placeholders in entry fields are replaced before copying (most placeholders supported)\n
+* minor bug fixes
+  </string>
+  <string name="ChangeLog_0_8_2"><b>Version 0.8.2</b>\n
+* Support for Digest Authentication in WebDAV\n
+* Bugfixes (OI File manager, Open URL)
+</string>
+  <string name="ChangeLog_0_8_1"><b>Version 0.8.1</b>\n
+* KP2A Offline and "Online" can be installed both again\n
+* Added new translations (thanks to all contributors!)
+</string>
+  <string name="ChangeLog_0_8"><b>Version 0.8</b>\n
+* Improved user interface especially for Android 4.x devices\n
+* Allow using deliberate file managers for selecting existing files\n
+* Added safer way for opening attachments (through cache directory)\n
+* fixed bugs in Edit activity\n
+* probably introduced new bugs :-)
+</string>
+  <string name="ChangeLog_keptDonate">Extended possibility to donate a beer or something else</string>
+<string name="ChangeLog_0_7"><b>Version 0.7</b>\n
+* Increased loading speed: key transformations now 10x faster!\n
+* Added Keepass2Android soft-keyboard: Switch to this keyboard for entering credentials. Shields you from clipboard-based password sniffers (disable old clipboard notifications in the options)\n
+* Added option to donate a beer or something else (see menu)</string>
+  <string name="ChangeLog"><b>Version 0.6.2</b>\n
+* Google Drive/Dropbox/... integration: Use the official Google Drive or Dropbox App and open any .kdbx-file. This will now bring up KP2A.\n
+* Improved Search Dialog \n
+* Improved search results for Share URL with subdomains\n
+* Added options to give feedback, and rate and translate the app in the menu\n
+\n
+<b>Version 0.6.1</b>\n
+* Detect when database changes in the background (i.e. due to activity of a sync app)\n
+* Improved searching for URLs from the browser\n
+* Confirm dialog when discarding changes\n
+\n
+<b>Version 0.6</b>\n
+Initial public release
+  </string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>5 minutes</item>
+	<item>10 minutes</item>
+	<item>15 minutes</item>
+	<item>30 minutes</item>
+	<item>1 hour</item>
+    <item>Never</item>
+  </string-array>
+	<string-array name="export_fileformat_options">
+		<item>Keepass 2 database (.kdbx)</item>
+		<item>Keepass 2 XML (unencrypted) (.xml)</item>
+		<item>Keepass CSV (unencrypted) (.csv)</item>
+	</string-array>
+  <string-array name="list_size_options">
+    <item>Small</item>
+    <item>Medium</item>
+    <item>Large</item>
+  </string-array>
+
+	<string-array name="design_options">
+		<item>Holo Light</item>
+		<item>Holo Dark</item>
+	</string-array>
+
+	<string name="design_title">Design</string>
+
+	<string-array name="cred_remember_modes">
+    <item>Do not remember username and password</item>
+    <item>Remember username only</item>
+    <item>Remember username and password</item>
+  </string-array>
+	<string-array name="password_modes">
+		<item>Password only</item>
+		<item>Password + Key file</item>
+		<item>Password + OTP</item>
+		<item>Password + OTP secret (recovery mode)</item>
+	</string-array>
+	<string-array name="AcceptAllServerCertificates_options">
+		<item>Ignore certificate validation failures</item>
+		<item>Warn when validation fails</item>
+		<item>Do not accept invalid certificates</item>
+	</string-array>
+
+</resources>
diff --git a/src/PluginHostTest/Resources/Values/styles.xml b/src/PluginHostTest/Resources/Values/styles.xml
new file mode 100644
index 00000000..2de3172c
--- /dev/null
+++ b/src/PluginHostTest/Resources/Values/styles.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 
+     
+ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android 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 2 of the License, or
+  (at your option) any later version.
+
+  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<resources>
+	<style name="Base">
+	</style>
+	<style name="NoTitleBar"></style>
+	<style name="Dialog" parent="android:Theme.Dialog"></style>
+	<style name="GroupTextSmall" parent="android:Theme">
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
+		<item name="@android:textSize">15sp</item>
+	</style>
+	<style name="GroupText" parent="android:Theme">
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="GroupTextLarge" parent="android:Theme">
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
+		<item name="@android:textSize">28sp</item>
+	</style>
+	<style name="ElementTextSmall">
+		<item name="@android:textSize">15sp</item>
+	</style>
+	<style name="ElementText">
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="ElementTextLarge">
+		<item name="@android:textSize">28sp</item>
+	</style>
+	<style name="GroupLabel">
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="WhiteOnBlack">
+		<item name="@android:background">#666666</item>
+		<item name="@android:textColor">@android:color/primary_text_dark</item>
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="GroupAndEntryHeader">
+		<item name="@android:background">#202020</item>
+		<item name="@android:textColor">#ffffff</item>
+		<item name="@android:textSize">20sp</item>
+	</style>
+	<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
+		<item name="@android:textSize">12sp</item>
+	</style>
+	<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
+		<item name="@android:textSize">12sp</item>
+		<item name="@android:background">#222222</item>
+	</style>
+	<style name="ElementTextTitle" parent="WhiteOnBlack">
+		<item name="@android:textColor">@color/group</item>
+		<item name="@android:background">@android:color/transparent</item>
+	</style>
+	<style name="EntryItem">
+		<item name="android:layout_marginLeft">12dip</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="android:textColor">?android:attr/textColorSecondary</item>
+		<item name="android:textSize">18sp</item>
+	</style>
+	<style name="MinusButton">
+		<item name="android:src">@drawable/ic_menu_remove_field_holo_light</item>
+	</style>
+	<style name="EntryFieldHeader">
+		<item name="android:drawableBottom">@drawable/section_header</item>
+		<item name="android:drawablePadding">2dp</item>
+		<item name="android:layout_marginLeft">12dip</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginBottom">3dp</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:textSize">18sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
+	<style name="InfoHeader">
+		<item name="android:drawableBottom">@drawable/section_header</item>
+		<item name="android:drawablePadding">2dp</item>
+		<item name="android:layout_marginLeft">0dip</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginBottom">3dp</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:textSize">14sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
+
+	<style name="BottomBarActionButton">
+		<item name="android:background">?android:attr/selectableItemBackground</item>
+	</style>
+
+	<style name="TextAppearance_EditEntry_Small">
+		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+		<item name="android:textSize">14sp</item>
+		<item name="android:textColor">?android:attr/textColorSecondary</item>
+		<item name="android:textAllCaps">true</item>
+	</style>
+
+
+	<style name="TextAppearance_EditEntry_LabelSmall" parent="TextAppearance_EditEntry_Small">
+		<item name="android:minHeight">24dip</item>
+		<item name="android:layout_width">144dip</item>
+		<item name="android:layout_marginTop">12dip</item>
+		<item name="android:layout_marginLeft">16dip</item>
+		<item name="android:layout_marginRight">16dip</item>
+		<item name="android:paddingLeft">8dip</item>
+		<item name="android:paddingRight">8dip</item>
+		<item name="android:layout_marginBottom">-12dip</item>
+	</style>
+
+	<style name="TextAppearance_EditEntry">
+		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+		<item name="android:textSize">18sp</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+	</style>
+
+	<style name="TextAppearance_EditEntry_Value" parent="TextAppearance_EditEntry">
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginLeft">12dip</item>
+	</style>
+
+	<style name="TextAppearance_SmallHeading" parent="TextAppearance_EditEntry_Small">
+		<item name="android:minHeight">24dip</item>
+		<item name="android:layout_width">144dip</item>
+		<item name="android:layout_marginTop">12dip</item>
+		<item name="android:layout_marginRight">16dip</item>
+		<item name="android:paddingRight">8dip</item>
+		<item name="android:layout_marginBottom">-12dip</item>
+	</style>
+
+	<style name="TextAppearance_SubElement">
+		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+		<item name="android:textSize">18sp</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginLeft">12dip</item>
+	</style>
+
+	<style name="TextAppearance_Help">
+		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+		<item name="android:textSize">24sp</item>
+		<item name="android:paddingLeft">12sp</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginLeft">12dip</item>
+	</style>
+
+
+	<style name="EditEntryButton">
+		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+		<item name="android:layout_marginTop">12dip</item>
+		<item name="android:layout_marginLeft">24dip</item>
+		<item name="android:layout_marginRight">24dip</item>
+		<item name="android:paddingLeft">8dip</item>
+		<item name="android:paddingRight">8dip</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:background">?android:attr/selectableItemBackground</item>
+	</style>
+
+	<style name="AdditionalStringLayout">
+		<item name="android:layout_marginLeft">24dip</item>
+		<item name="android:layout_marginRight">24dip</item>
+	</style>
+
+
+	<style name="MinusButton">
+		<item name="android:background">?android:attr/selectableItemBackground</item>
+		<item name="android:src">@drawable/ic_menu_remove_field_holo_light</item>
+	</style>
+
+	<style name="ExtraFieldHeader" parent="android:Widget.Holo.Light.TextView">
+		<item name="android:layout_marginLeft">16dip</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginBottom">3dp</item>
+		<item name="android:layout_marginTop">4dp</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:textSize">14sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
+
+	<style name="PaddedContainer">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:padding">16dp</item>
+	</style>
+
+	<style name="PaddedElement">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:padding">8dp</item>
+	</style>
+
+</resources>
\ No newline at end of file
diff --git a/src/PluginHostTest/SprCompileFlags.cs b/src/PluginHostTest/SprCompileFlags.cs
new file mode 100644
index 00000000..f7888cd5
--- /dev/null
+++ b/src/PluginHostTest/SprCompileFlags.cs
@@ -0,0 +1,7 @@
+namespace keepass2android
+{
+	public enum SprCompileFlags
+	{
+		All
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/SprContext.cs b/src/PluginHostTest/SprContext.cs
new file mode 100644
index 00000000..ce644bff
--- /dev/null
+++ b/src/PluginHostTest/SprContext.cs
@@ -0,0 +1,13 @@
+using System;
+using KeePassLib;
+
+namespace keepass2android
+{
+	public class SprContext
+	{
+		public SprContext(PwEntry entry, PwDatabase kpDatabase, object all)
+		{
+			
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/SprEngine.cs b/src/PluginHostTest/SprEngine.cs
new file mode 100644
index 00000000..e5503d7e
--- /dev/null
+++ b/src/PluginHostTest/SprEngine.cs
@@ -0,0 +1,11 @@
+namespace keepass2android
+{
+	public class SprEngine
+
+	{
+		public static string Compile(string value, SprContext sprContext)
+		{
+			return value;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/TextDrawable.cs b/src/PluginHostTest/TextDrawable.cs
new file mode 100644
index 00000000..26bc242e
--- /dev/null
+++ b/src/PluginHostTest/TextDrawable.cs
@@ -0,0 +1,56 @@
+using System;
+using Android.Content;
+using Android.Graphics;
+using Android.Graphics.Drawables;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Shows text as a drawable.
+	/// </summary>
+	/// Based on http://stackoverflow.com/questions/3972445/how-to-put-text-in-a-drawable
+	public class TextDrawable: Drawable {
+
+		private readonly String _text;
+		private readonly Paint _paint;
+		private static Typeface _iconFont;
+
+		public TextDrawable(String text, Context ctx) {
+
+			_text = text;
+
+
+			if (_iconFont == null)
+				_iconFont = Typeface.CreateFromAsset(ctx.Assets, "fontawesome-webfont.ttf");
+
+			_paint = new Paint {Color = (Color.White), TextSize = 22f, AntiAlias = true};
+			//_paint.SetTypeface(_iconFont);
+			_paint.SetShadowLayer(6f, 0, 0, Color.Black);
+			_paint.SetStyle(Paint.Style.Fill);
+			_paint.TextAlign = Paint.Align.Left;
+		}
+
+		
+		public override void Draw(Canvas canvas) {
+			canvas.DrawText("x"+_text, 0, 0, _paint);
+		}
+
+		
+		public override void SetAlpha(int alpha) {
+			_paint.Alpha = alpha;
+		}
+
+
+		public override void SetColorFilter(ColorFilter cf)
+		{
+			_paint.SetColorFilter(cf);
+		}
+
+		public override int Opacity
+		{
+			get { return -3; /*translucent*/ }
+		}
+
+		
+	}
+}
\ No newline at end of file
diff --git a/src/PluginHostTest/TextViewSelect.cs b/src/PluginHostTest/TextViewSelect.cs
new file mode 100644
index 00000000..73fa8aed
--- /dev/null
+++ b/src/PluginHostTest/TextViewSelect.cs
@@ -0,0 +1,84 @@
+/*
+This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android 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.
+
+  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+  */
+using System;
+using Android.Content;
+using Android.Runtime;
+using Android.Widget;
+using Android.Text.Method;
+using Android.Util;
+using Java.Lang;
+
+namespace keepass2android.view
+{
+	
+	public class TextViewSelect : TextView {
+
+		public TextViewSelect (IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			Initialize();
+		}
+
+
+		public TextViewSelect(Context context): base(context, null, Android.Resource.Attribute.TextViewStyle) {
+			Initialize();
+		}
+		
+		public TextViewSelect(Context context, IAttributeSet attrs): base(context, attrs, Android.Resource.Attribute.TextViewStyle) {
+			Initialize();
+		}
+
+		void Initialize ()
+		{
+			Focusable = true;
+			FocusableInTouchMode = true;
+		}
+		
+		public TextViewSelect(Context context, IAttributeSet attrs, int defStyle): base(context, attrs, defStyle) {
+
+			Initialize ();
+		}
+		
+		
+		
+		protected override IMovementMethod DefaultMovementMethod
+		{
+			get
+			{
+				return ArrowKeyMovementMethod.Instance;
+			}
+		}
+		
+		
+		protected override bool DefaultEditable
+		{
+			get
+			{
+				return false;
+			}
+		}
+		
+		
+		public override void SetText(ICharSequence text, BufferType type) {
+			base.SetText (text, BufferType.Editable);
+
+		}
+		
+	}
+
+}
+
diff --git a/src/PluginHostTest/TextWithHelp.cs b/src/PluginHostTest/TextWithHelp.cs
new file mode 100644
index 00000000..3d27b56c
--- /dev/null
+++ b/src/PluginHostTest/TextWithHelp.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Content.Res;
+using Android.OS;
+using Android.Runtime;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+using PluginHostTest;
+
+namespace keepass2android.views
+{
+	public class TextWithHelp : RelativeLayout
+	{
+		private Kp2aShortHelpView _kp2AShortHelpView;
+
+		public TextWithHelp(Context context, IAttributeSet attrs) :
+			base(context, attrs)
+		{
+			Initialize(attrs);
+		}
+
+		public TextWithHelp(Context context, string text, string helpText) :
+			base(context, null)
+		{
+			Initialize(text, helpText);
+		}
+
+
+		public TextWithHelp(Context context, IAttributeSet attrs, int defStyle) :
+			base(context, attrs, defStyle)
+		{
+			Initialize(attrs);
+		}
+
+		private void Initialize(IAttributeSet attrs)
+		{
+
+			TypedArray a = Context.ObtainStyledAttributes(attrs, Resource.Styleable.TextWithHelp);
+			
+			string helpText = a.GetString(Resource.Styleable.TextWithHelp_help_text);
+
+			const string xmlns = "http://schemas.android.com/apk/res/android";
+			string text = Context.GetString(attrs.GetAttributeResourceValue(xmlns, "text",Resource.String.ApplicationName /*TODO*/));
+			Initialize(text, helpText);
+		}
+
+		private void Initialize(string text, string helpText)
+		{
+			LayoutInflater inflater = (LayoutInflater)Context.GetSystemService(Context.LayoutInflaterService);
+			inflater.Inflate(Resource.Layout.text_with_help, this);
+
+			_kp2AShortHelpView = ((Kp2aShortHelpView)FindViewById(Resource.Id.help));
+			_kp2AShortHelpView.HelpText = helpText;
+
+			((TextView) FindViewById(Resource.Id.text)).Text = text;
+		}
+
+		public string HelpText
+		{
+			get { return _kp2AShortHelpView.HelpText; }
+			set { _kp2AShortHelpView.HelpText = value; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Additions/AboutAdditions.txt b/src/PluginSdkBinding/Additions/AboutAdditions.txt
new file mode 100644
index 00000000..08caee33
--- /dev/null
+++ b/src/PluginSdkBinding/Additions/AboutAdditions.txt
@@ -0,0 +1,48 @@
+Additions allow you to add arbitrary C# to the generated classes
+before they are compiled.  This can be helpful for providing convenience
+methods or adding pure C# classes.
+
+== Adding Methods to Generated Classes ==
+
+Let's say the library being bound has a Rectangle class with a constructor
+that takes an x and y position, and a width and length size.  It will look like
+this:
+
+public partial class Rectangle
+{
+    public Rectangle (int x, int y, int width, int height)
+	{
+	    // JNI bindings
+	}
+}
+
+Imagine we want to add a constructor to this class that takes a Point and
+Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
+with a partial class containing our new method:
+
+public partial class Rectangle
+{
+    public Rectangle (Point location, Size size) :
+	    this (location.X, location.Y, size.Width, size.Height)
+	{
+	}
+}
+
+At compile time, the additions class will be added to the generated class
+and the final assembly will a Rectangle class with both constructors.
+
+
+== Adding C# Classes ==
+
+Another thing that can be done is adding fully C# managed classes to the
+generated library.  In the above example, let's assume that there isn't a
+Point class available in Java or our library.  The one we create doesn't need
+to interact with Java, so we'll create it like a normal class in C#.
+
+By adding a Point.cs file with this class, it will end up in the binding library:
+
+public class Point
+{
+    public int X { get; set; }
+	public int Y { get; set; }
+}
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Jars/AboutJars.txt b/src/PluginSdkBinding/Jars/AboutJars.txt
new file mode 100644
index 00000000..c359b62f
--- /dev/null
+++ b/src/PluginSdkBinding/Jars/AboutJars.txt
@@ -0,0 +1,24 @@
+This directory is for Android .jars.
+
+There are 2 types of jars that are supported:
+
+== Input Jar ==
+
+This is the jar that bindings should be generated for.
+
+For example, if you were binding the Google Maps library, this would
+be Google's "maps.jar".
+
+Set the build action for these jars in the properties page to "InputJar".
+
+
+== Reference Jars ==
+
+These are jars that are referenced by the input jar.  C# bindings will
+not be created for these jars.  These jars will be used to resolve
+types used by the input jar.
+
+NOTE: Do not add "android.jar" as a reference jar.  It will be added automatically
+based on the Target Framework selected.
+
+Set the build action for these jars in the properties page to "ReferenceJar".
\ No newline at end of file
diff --git a/src/PluginSdkBinding/PluginSdkBinding.csproj b/src/PluginSdkBinding/PluginSdkBinding.csproj
new file mode 100644
index 00000000..02729bd4
--- /dev/null
+++ b/src/PluginSdkBinding/PluginSdkBinding.csproj
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{3DA3911E-36DE-465E-8F15-F1991B6437E5}</ProjectGuid>
+    <ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PluginSdkBinding</RootNamespace>
+    <AssemblyName>PluginSdkBinding</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Jars\AboutJars.txt" />
+    <None Include="Additions\AboutAdditions.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <TransformFile Include="Transforms\Metadata.xml" />
+    <TransformFile Include="Transforms\EnumFields.xml" />
+    <TransformFile Include="Transforms\EnumMethods.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedJar Include="..\java\Keepass2AndroidPluginSDK\bin\keepass2androidpluginsdk.jar">
+      <Link>Jars\keepass2androidpluginsdk.jar</Link>
+    </EmbeddedJar>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Properties/AssemblyInfo.cs b/src/PluginSdkBinding/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..3d0cc069
--- /dev/null
+++ b/src/PluginSdkBinding/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Android.App;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PluginSdkBinding")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PluginSdkBinding")]
+[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+// Add some common permissions, these can be removed if not needed
+[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
+[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/src/PluginSdkBinding/Transforms/EnumFields.xml b/src/PluginSdkBinding/Transforms/EnumFields.xml
new file mode 100644
index 00000000..22959957
--- /dev/null
+++ b/src/PluginSdkBinding/Transforms/EnumFields.xml
@@ -0,0 +1,14 @@
+<enum-field-mappings>
+  <!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
+    <field jni-name="Fragment_name" clr-name="Name" value="0" />
+    <field jni-name="Fragment_id" clr-name="Id" value="1" />
+    <field jni-name="Fragment_tag" clr-name="Tag" value="2" />
+  </mapping>
+  -->
+</enum-field-mappings>
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Transforms/EnumMethods.xml b/src/PluginSdkBinding/Transforms/EnumMethods.xml
new file mode 100644
index 00000000..49216c61
--- /dev/null
+++ b/src/PluginSdkBinding/Transforms/EnumMethods.xml
@@ -0,0 +1,13 @@
+<enum-method-mappings>
+  <!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+  
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+  -->
+</enum-method-mappings>
\ No newline at end of file
diff --git a/src/PluginSdkBinding/Transforms/Metadata.xml b/src/PluginSdkBinding/Transforms/Metadata.xml
new file mode 100644
index 00000000..2587ddc4
--- /dev/null
+++ b/src/PluginSdkBinding/Transforms/Metadata.xml
@@ -0,0 +1,9 @@
+<metadata>
+  <!--
+  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
+  
+  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
+  -->
+</metadata>
diff --git a/src/java/Keepass2AndroidPluginSDK/.classpath b/src/java/Keepass2AndroidPluginSDK/.classpath
new file mode 100644
index 00000000..7bc01d9a
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/src/java/Keepass2AndroidPluginSDK/.project b/src/java/Keepass2AndroidPluginSDK/.project
new file mode 100644
index 00000000..ee51db99
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Keepass2AndroidPluginSDK</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.jdt.core.prefs b/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..b080d2dd
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.ltk.core.refactoring.prefs b/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 00000000..b196c64a
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/src/java/Keepass2AndroidPluginSDK/AndroidManifest.xml b/src/java/Keepass2AndroidPluginSDK/AndroidManifest.xml
new file mode 100644
index 00000000..91aef12e
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="keepass2android.pluginsdk"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+    </application>
+
+</manifest>
diff --git a/src/java/Keepass2AndroidPluginSDK/lint.xml b/src/java/Keepass2AndroidPluginSDK/lint.xml
new file mode 100644
index 00000000..ee0eead5
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>
\ No newline at end of file
diff --git a/src/java/Keepass2AndroidPluginSDK/proguard-project.txt b/src/java/Keepass2AndroidPluginSDK/proguard-project.txt
new file mode 100644
index 00000000..f2fe1559
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/src/java/Keepass2AndroidPluginSDK/project.properties b/src/java/Keepass2AndroidPluginSDK/project.properties
new file mode 100644
index 00000000..91d2b024
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19
+android.library=true
diff --git a/src/java/Keepass2AndroidPluginSDK/res/drawable-hdpi/ic_launcher.png b/src/java/Keepass2AndroidPluginSDK/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000..96a442e5
Binary files /dev/null and b/src/java/Keepass2AndroidPluginSDK/res/drawable-hdpi/ic_launcher.png differ
diff --git a/src/java/Keepass2AndroidPluginSDK/res/drawable-mdpi/ic_launcher.png b/src/java/Keepass2AndroidPluginSDK/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000..359047df
Binary files /dev/null and b/src/java/Keepass2AndroidPluginSDK/res/drawable-mdpi/ic_launcher.png differ
diff --git a/src/java/Keepass2AndroidPluginSDK/res/drawable-xhdpi/ic_launcher.png b/src/java/Keepass2AndroidPluginSDK/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..71c6d760
Binary files /dev/null and b/src/java/Keepass2AndroidPluginSDK/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values-v11/styles.xml b/src/java/Keepass2AndroidPluginSDK/res/values-v11/styles.xml
new file mode 100644
index 00000000..3c02242a
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values-v11/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!--
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
+        <!-- API 11 theme customizations can go here. -->
+    </style>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values-v14/styles.xml b/src/java/Keepass2AndroidPluginSDK/res/values-v14/styles.xml
new file mode 100644
index 00000000..a91fd037
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values-v14/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+
+    <!--
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- API 14 theme customizations can go here. -->
+    </style>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values-w820dp/dimens.xml b/src/java/Keepass2AndroidPluginSDK/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..f3e70203
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values-w820dp/dimens.xml
@@ -0,0 +1,10 @@
+<resources>
+
+    <!--
+         Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+    -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values/dimens.xml b/src/java/Keepass2AndroidPluginSDK/res/values/dimens.xml
new file mode 100644
index 00000000..55c1e590
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values/dimens.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values/strings.xml b/src/java/Keepass2AndroidPluginSDK/res/values/strings.xml
new file mode 100644
index 00000000..5f5b7531
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">Keepass2Android Plugin SDK</string>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/res/values/styles.xml b/src/java/Keepass2AndroidPluginSDK/res/values/styles.xml
new file mode 100644
index 00000000..6ce89c7b
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+</resources>
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/AccessManager.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/AccessManager.java
new file mode 100644
index 00000000..2aaab407
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/AccessManager.java
@@ -0,0 +1,199 @@
+package keepass2android.pluginsdk;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.PopupMenu;
+
+
+public class AccessManager 
+{
+	
+	private static final String _tag = "Kp2aPluginSDK";
+	private static final String PREF_KEY_SCOPE = "scope";
+	private static final String PREF_KEY_TOKEN = "token";
+
+	public static String stringArrayToString(ArrayList<String> values) {
+	    JSONArray a = new JSONArray();
+	    for (int i = 0; i < values.size(); i++) {
+	        a.put(values.get(i));
+	    }
+	    if (!values.isEmpty()) {
+	        return a.toString();
+	    } else {
+	        return null;
+	    }
+	    
+	}
+
+	public static ArrayList<String> stringToStringArray(String s) {
+	    ArrayList<String> strings = new ArrayList<String>();
+	    if ((s != null) && (s != "")) {
+	        try {
+	            JSONArray a = new JSONArray(s);
+	            for (int i = 0; i < a.length(); i++) {
+	                String url = a.optString(i);
+	                strings.add(url);
+	            }
+	        } catch (JSONException e) {
+	            e.printStackTrace();
+	        }
+	    }
+	    return strings;
+	}
+	
+	public static void storeAccessToken(Context ctx, String hostPackage, String accessToken, ArrayList<String> scopes)
+	{
+		 SharedPreferences prefs = getPrefsForHost(ctx, hostPackage);
+		  
+		 Editor edit = prefs.edit();
+		 edit.putString(PREF_KEY_TOKEN, accessToken);
+		 String scopesString = stringArrayToString(scopes);
+		 edit.putString(PREF_KEY_SCOPE, scopesString);
+		 edit.commit();
+		 Log.d(_tag, "stored access token " + accessToken.substring(0, 4)+"... for "+scopes.size()+" scopes ("+scopesString+").");
+		 
+		 SharedPreferences hostPrefs = ctx.getSharedPreferences("KP2A.PluginAccess.hosts", Context.MODE_PRIVATE);
+		 if (!hostPrefs.contains(hostPackage))
+		 {
+			 hostPrefs.edit().putString(hostPackage, "").commit();
+		 }
+		 
+		 
+	}
+	
+	public static void preparePopup(Object popupMenu)
+	{
+		try
+		{
+			Field[] fields = popupMenu.getClass().getDeclaredFields();
+			for (Field field : fields) {
+				if ("mPopup".equals(field.getName())) {
+					field.setAccessible(true);
+					Object menuPopupHelper = field.get(popupMenu);
+					Class<?> classPopupHelper = Class.forName(menuPopupHelper
+							.getClass().getName());
+					Method setForceIcons = classPopupHelper.getMethod(
+							"setForceShowIcon", boolean.class);
+					setForceIcons.invoke(menuPopupHelper, true);
+					break;
+				}
+			}
+			
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+	}
+
+	private static SharedPreferences getPrefsForHost(Context ctx,
+			String hostPackage) {
+		SharedPreferences prefs = ctx.getSharedPreferences("KP2A.PluginAccess."+hostPackage, Context.MODE_PRIVATE);
+		return prefs;
+	}
+
+	public static String tryGetAccessToken(Context ctx, String hostPackage, ArrayList<String> scopes) {
+		
+		if (TextUtils.isEmpty(hostPackage))
+		{
+			Log.d(_tag, "hostPackage is empty!");
+			return null;
+		}
+		SharedPreferences prefs = getPrefsForHost(ctx, hostPackage);
+		String scopesString = prefs.getString(PREF_KEY_SCOPE, "");
+		Log.d(_tag, "scopes: "+ scopesString);
+		ArrayList<String> currentScope = stringToStringArray(scopesString);
+		if (isSubset(scopes, currentScope))
+		{
+			return prefs.getString(PREF_KEY_TOKEN, null);
+		}
+		else
+		{
+			Log.d(_tag, "looks like scope changed. Access token invalid.");
+			return null;
+		}
+	}
+
+	public static boolean isSubset(ArrayList<String> requiredScopes,
+			ArrayList<String> availableScopes) {
+		for (String r: requiredScopes){
+			if (availableScopes.indexOf(r)<0)
+			{
+				Log.d(_tag, "Scope "+r+" not available. "+availableScopes.size());
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public static void removeAccessToken(Context ctx, String hostPackage,
+			String accessToken) {
+		SharedPreferences prefs = getPrefsForHost(ctx, hostPackage);
+
+		if (prefs.getString(PREF_KEY_TOKEN, "").equals(accessToken))
+		{
+			Editor edit = prefs.edit();
+			edit.clear();
+			edit.commit();
+
+		}
+		
+		SharedPreferences hostPrefs = ctx.getSharedPreferences("KP2A.PluginAccess.hosts", Context.MODE_PRIVATE);
+		if (hostPrefs.contains(hostPackage))
+		{
+			hostPrefs.edit().remove(hostPackage).commit();
+		}
+	 
+	}
+	
+	public static Set<String> getAllHostPackages(Context ctx)
+	{
+		SharedPreferences prefs = ctx.getSharedPreferences("KP2A.PluginAccess.hosts", Context.MODE_PRIVATE);
+		Set<String> result = new HashSet<String>();
+		for (String host: prefs.getAll().keySet())
+		{
+			try
+			{
+				PackageInfo info = ctx.getPackageManager().getPackageInfo(host, PackageManager.GET_META_DATA);
+				//if we get here, the package is still there
+				result.add(host);
+			}
+			catch (PackageManager.NameNotFoundException e)
+			{
+				//host gone. ignore.
+			}
+		}
+		return result;
+		
+	}
+	
+	
+
+	/**
+	 * Returns a valid access token or throws PluginAccessException
+	 */
+	public static String getAccessToken(Context context, String hostPackage,
+			ArrayList<String> scopes) throws PluginAccessException {
+		String accessToken = tryGetAccessToken(context, hostPackage, scopes);
+		if (accessToken == null)
+			throw new PluginAccessException(hostPackage, scopes);
+		return accessToken;
+	}
+}
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/KeepassDefs.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/KeepassDefs.java
new file mode 100644
index 00000000..7dd2e706
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/KeepassDefs.java
@@ -0,0 +1,48 @@
+package keepass2android.pluginsdk;
+
+public class KeepassDefs {
+
+	/// <summary>
+	/// Default identifier string for the title field. Should not contain
+	/// spaces, tabs or other whitespace.
+	/// </summary>
+	public static String TitleField = "Title";
+
+	/// <summary>
+	/// Default identifier string for the user name field. Should not contain
+	/// spaces, tabs or other whitespace.
+	/// </summary>
+	public static String UserNameField = "UserName";
+
+	/// <summary>
+	/// Default identifier string for the password field. Should not contain
+	/// spaces, tabs or other whitespace.
+	/// </summary>
+	public static String PasswordField = "Password";
+
+	/// <summary>
+	/// Default identifier string for the URL field. Should not contain
+	/// spaces, tabs or other whitespace.
+	/// </summary>
+	public static String UrlField = "URL";
+
+	/// <summary>
+	/// Default identifier string for the notes field. Should not contain
+	/// spaces, tabs or other whitespace.
+	/// </summary>
+	public static String NotesField = "Notes";
+
+	
+	public static boolean IsStandardField(String strFieldName)
+	{
+		if(strFieldName == null)
+			return false;
+		if(strFieldName.equals(TitleField)) return true;
+		if(strFieldName.equals(UserNameField)) return true;
+		if(strFieldName.equals(PasswordField)) return true;
+		if(strFieldName.equals(UrlField)) return true;
+		if(strFieldName.equals(NotesField)) return true;
+
+		return false;
+	}
+}
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessBroadcastReceiver.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessBroadcastReceiver.java
new file mode 100644
index 00000000..ca8d0123
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessBroadcastReceiver.java
@@ -0,0 +1,97 @@
+package keepass2android.pluginsdk;
+
+import java.util.ArrayList;
+
+import android.R.anim;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Broadcast flow between Host and Plugin
+ * ======================================
+ * 
+ * The host is responsible for deciding when to initiate the session. It 
+ * should initiate the session as soon as plugins are required or when a plugin 
+ * has been updated through the OS.
+ * It will then send a broadcast to request the currently required scope.
+ * The plugin then sends a broadcast to the app which scope is required. If an 
+ * access token is already available, it's sent along with the requset.
+ * 
+ * If a previous permission has been revoked (or the app settings cleared or the 
+ * permissions have been extended or the token is invalid for any other reason) 
+ * the host will answer with a Revoked-Permission broadcast (i.e. the plugin is 
+ * unconnected.)
+ * 
+ *  Unconnected plugins must be permitted by the user (requiring user action). 
+ *  When the user grants access, the plugin will receive an access token for 
+ *  the host. This access token is valid for the requested scope. If the scope
+ *  changes (e.g after an update of the plugin), the access token becomes invalid.
+ *
+ */
+public abstract class PluginAccessBroadcastReceiver extends BroadcastReceiver {
+	@Override
+	public void onReceive(Context ctx, Intent intent) {
+		String action = intent.getAction();
+		android.util.Log.d("KP2A.pluginsdk", "received broadcast with action="+action);
+		if (action == null)
+			return;
+		if (action.equals(Strings.ACTION_TRIGGER_REQUEST_ACCESS))
+		{
+			requestAccess(ctx, intent);	
+		} else if (action.equals(Strings.ACTION_RECEIVE_ACCESS))
+		{
+			receiveAccess(ctx, intent);
+		} else if (action.equals(Strings.ACTION_REVOKE_ACCESS))
+		{
+			revokeAccess(ctx, intent);
+		} else
+		{
+			//TODO handle unexpected action
+		}		
+	}
+	
+	
+
+	private void revokeAccess(Context ctx, Intent intent) {
+		String senderPackage = intent.getStringExtra(Strings.EXTRA_SENDER);
+		String accessToken = intent.getStringExtra(Strings.EXTRA_ACCESS_TOKEN);
+		//this intent must send the invalid(ated) token to prevent malicious apps
+		//from revoking access of all plugins.
+		AccessManager.removeAccessToken(ctx, senderPackage, accessToken);
+	}
+
+
+
+	private void receiveAccess(Context ctx, Intent intent) {
+		String senderPackage = intent.getStringExtra(Strings.EXTRA_SENDER);
+		String accessToken = intent.getStringExtra(Strings.EXTRA_ACCESS_TOKEN);
+		AccessManager.storeAccessToken(ctx, senderPackage, accessToken, getScopes());
+	}
+
+	public void requestAccess(Context ctx, Intent intent) {
+		String senderPackage = intent.getStringExtra(Strings.EXTRA_SENDER);
+		String requestToken = intent.getStringExtra(Strings.EXTRA_REQUEST_TOKEN);
+		Intent rpi = new Intent(Strings.ACTION_REQUEST_ACCESS);
+		rpi.setPackage(senderPackage);
+		rpi.putExtra(Strings.EXTRA_SENDER, ctx.getPackageName());
+		rpi.putExtra(Strings.EXTRA_REQUEST_TOKEN, requestToken);
+		
+		String token = AccessManager.tryGetAccessToken(ctx, senderPackage, getScopes());
+		if (token != null)
+		{
+			rpi.putExtra(Strings.EXTRA_ACCESS_TOKEN, token);
+		}
+		
+		rpi.putStringArrayListExtra(Strings.EXTRA_SCOPES, getScopes());
+		
+		ctx.sendBroadcast(rpi);
+	}
+
+	/** 
+	 * 
+	 * @return the list of required scopes for this plugin. 
+	 */
+	abstract public ArrayList<String> getScopes();
+
+}
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessException.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessException.java
new file mode 100644
index 00000000..5f2a73ad
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginAccessException.java
@@ -0,0 +1,21 @@
+package keepass2android.pluginsdk;
+
+import java.util.ArrayList;
+
+public class PluginAccessException extends Exception {
+	
+	public PluginAccessException(String what)
+	{
+		super(what);
+	}
+
+	public PluginAccessException(String hostPackage, ArrayList<String> scopes) {
+		
+	}
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginActionBroadcastReceiver.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginActionBroadcastReceiver.java
new file mode 100644
index 00000000..8631ad97
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/PluginActionBroadcastReceiver.java
@@ -0,0 +1,252 @@
+package keepass2android.pluginsdk;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+public abstract class PluginActionBroadcastReceiver extends BroadcastReceiver {
+	
+	protected abstract class PluginActionBase
+	{
+		protected Context _context;
+		protected Intent _intent;
+		
+		public PluginActionBase(Context context, Intent intent)
+		{
+			_context = context;
+			_intent = intent;
+		}
+		
+		public String getHostPackage() {
+			return _intent.getStringExtra(Strings.EXTRA_SENDER);
+		}
+		
+		public Context getContext()
+		{
+			return _context;
+		}
+
+		protected HashMap<String, String> getEntryFieldsFromIntent()  
+		{
+			HashMap<String, String> res = new HashMap<String, String>();
+			try {
+				JSONObject json = new JSONObject(_intent.getStringExtra(Strings.EXTRA_ENTRY_OUTPUT_DATA));
+				for(Iterator<String> iter = json.keys();iter.hasNext();) {
+				    String key = iter.next();
+				    String value = json.get(key).toString();
+				    Log.d("KP2APluginSDK", "received " + key+"/"+value);
+				    res.put(key, value);
+				}
+				
+			} catch (JSONException e) {
+				e.printStackTrace();
+			} 
+			return res;
+		}
+		
+		protected String[] getProtectedFieldsListFromIntent()
+		{
+			return _intent.getStringArrayExtra(Strings.EXTRA_PROTECTED_FIELDS_LIST);
+		}
+	
+	}
+	
+	protected class ActionSelected extends PluginActionBase
+	{
+		public ActionSelected(Context ctx, Intent intent) {
+			super(ctx, intent);
+
+		}
+		
+		/**
+		 * 
+		 * @return the Bundle associated with the action. This bundle can be set in OpenEntry.add(Entry)FieldAction
+		 */
+		public Bundle getActionData()
+		{
+			return _intent.getBundleExtra(Strings.EXTRA_ACTION_DATA);
+		}
+
+		/**
+		 * 
+		 * @return the field id which was selected. null if an entry action (in the options menu) was selected.
+		 */
+		public String getFieldId()
+		{
+			return _intent.getStringExtra(Strings.EXTRA_FIELD_ID);
+		}
+		
+		/**
+		 * 
+		 * @return true if an entry action, i.e. an option from the options menu, was selected. False if an option
+		 * in a popup menu for a certain field was selected. 
+		 */
+		public boolean isEntryAction()
+		{
+			return getFieldId() == null;
+		}
+
+		/**
+		 * 
+		 * @return a hashmap containing the entry fields in key/value form
+		 */
+		public HashMap<String, String> getEntryFields() 
+		{
+			return getEntryFieldsFromIntent();
+		}
+		
+		/**
+		 * 
+		 * @return an array with the keys of all protected fields in the entry
+		 */
+		public String[] getProtectedFieldsList()
+		{
+			return getProtectedFieldsListFromIntent();
+		}
+	}
+	
+	protected class CloseEntryView extends PluginActionBase
+	{
+		public CloseEntryView(Context context, Intent intent) {
+			super(context, intent);
+		}
+
+		public String getEntryId()
+		{
+			return _intent.getStringExtra(Strings.EXTRA_ENTRY_ID);
+		}
+	}
+
+	protected class OpenEntry extends PluginActionBase
+	{
+	
+		public OpenEntry(Context context, Intent intent)
+		{
+			super(context, intent);
+		}
+		
+		public String getEntryId()
+		{
+			return _intent.getStringExtra(Strings.EXTRA_ENTRY_ID);
+		}
+		
+		public HashMap<String, String> getEntryFields() 
+		{
+			return getEntryFieldsFromIntent();
+		}
+		
+		/**
+		 * 
+		 * @return an array with the keys of all protected fields in the entry
+		 */
+		public String[] getProtectedFieldsList()
+		{
+			return getProtectedFieldsListFromIntent();
+		}
+		
+		public void addEntryAction(String actionDisplayText, int actionIconResourceId, Bundle actionData) throws PluginAccessException
+		{
+			addEntryFieldAction(null, null, actionDisplayText, actionIconResourceId, actionData);
+		}
+
+		public void addEntryFieldAction(String actionId, String fieldId, String actionDisplayText, int actionIconResourceId, Bundle actionData) throws PluginAccessException
+		{
+			Intent i = new Intent(Strings.ACTION_ADD_ENTRY_ACTION);
+			ArrayList<String> scope = new ArrayList<String>();
+			scope.add(Strings.SCOPE_CURRENT_ENTRY);
+			i.putExtra(Strings.EXTRA_ACCESS_TOKEN, AccessManager.getAccessToken(_context, getHostPackage(), scope));
+			i.setPackage(getHostPackage());
+			i.putExtra(Strings.EXTRA_SENDER, _context.getPackageName());
+			i.putExtra(Strings.EXTRA_ACTION_DATA, actionData);
+			i.putExtra(Strings.EXTRA_ACTION_DISPLAY_TEXT, actionDisplayText);
+			i.putExtra(Strings.EXTRA_ACTION_ICON_RES_ID, actionIconResourceId);
+			i.putExtra(Strings.EXTRA_ENTRY_ID, getEntryId());
+			i.putExtra(Strings.EXTRA_FIELD_ID, fieldId);
+			i.putExtra(Strings.EXTRA_ACTION_ID, actionId);
+			
+			_context.sendBroadcast(i);
+		}
+
+		public void setEntryField(String fieldId, String fieldValue, boolean isProtected) throws PluginAccessException
+		{
+			Intent i = new Intent(Strings.ACTION_SET_ENTRY_FIELD);
+			ArrayList<String> scope = new ArrayList<String>();
+			scope.add(Strings.SCOPE_CURRENT_ENTRY);
+			i.putExtra(Strings.EXTRA_ACCESS_TOKEN, AccessManager.getAccessToken(_context, getHostPackage(), scope));
+			i.setPackage(getHostPackage());
+			i.putExtra(Strings.EXTRA_SENDER, _context.getPackageName());
+			i.putExtra(Strings.EXTRA_FIELD_VALUE, fieldValue);
+			i.putExtra(Strings.EXTRA_ENTRY_ID, getEntryId());
+			i.putExtra(Strings.EXTRA_FIELD_ID, fieldId);
+			i.putExtra(Strings.EXTRA_FIELD_PROTECTED, isProtected);
+			
+			_context.sendBroadcast(i);
+		}
+		
+		
+	}
+	
+	//EntryOutputModified is very similar to OpenEntry because it receives the same 
+	//data (+ the field id which was modified)
+	protected class EntryOutputModified extends OpenEntry
+	{
+	
+		public EntryOutputModified(Context context, Intent intent)
+		{
+			super(context, intent);
+		}
+		
+		public String getModifiedFieldId()
+		{
+			return _intent.getStringExtra(Strings.EXTRA_FIELD_ID);
+		}
+	}
+
+	@Override
+	public void onReceive(Context ctx, Intent intent) {
+		String action = intent.getAction();
+		android.util.Log.d("KP2A.pluginsdk", "received broadcast in PluginActionBroadcastReceiver with action="+action);
+		if (action == null)
+			return;
+		if (action.equals(Strings.ACTION_OPEN_ENTRY))
+		{
+			openEntry(new OpenEntry(ctx, intent));	
+		}
+		else if (action.equals(Strings.ACTION_CLOSE_ENTRY_VIEW))
+		{
+			closeEntryView(new CloseEntryView(ctx, intent));	
+		}		
+		else if (action.equals(Strings.ACTION_ENTRY_ACTION_SELECTED))
+		{
+			actionSelected(new ActionSelected(ctx, intent));
+		}
+		else if (action.equals(Strings.ACTION_ENTRY_OUTPUT_MODIFIED))
+		{
+			entryOutputModified(new EntryOutputModified(ctx, intent));
+		}
+		else
+		{
+			//TODO handle unexpected action
+		}		
+
+		
+	}
+
+	protected void closeEntryView(CloseEntryView closeEntryView) {}
+
+	protected void actionSelected(ActionSelected actionSelected) {}
+
+	protected void openEntry(OpenEntry oe) {}
+	
+	protected void entryOutputModified(EntryOutputModified eom) {}
+
+}
diff --git a/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/Strings.java b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/Strings.java
new file mode 100644
index 00000000..ffacf590
--- /dev/null
+++ b/src/java/Keepass2AndroidPluginSDK/src/keepass2android/pluginsdk/Strings.java
@@ -0,0 +1,142 @@
+package keepass2android.pluginsdk;
+
+public class Strings {
+	/**
+	 * Plugin is notified about actions like open/close/update a database.
+	 */
+	public static final String SCOPE_DATABASE_ACTIONS = "keepass2android.SCOPE_DATABASE_ACTIONS";
+	/**
+	 * Plugin is notified when an entry is opened. 
+	 */
+	public static final String SCOPE_CURRENT_ENTRY = "keepass2android.SCOPE_CURRENT_ENTRY";
+	
+	/**
+	 * Extra key to transfer a (json serialized) list of scopes
+	 */
+	public static final String EXTRA_SCOPES = "keepass2android.EXTRA_SCOPES";
+
+	
+	public static final String EXTRA_PLUGIN_PACKAGE = "keepass2android.EXTRA_PLUGIN_PACKAGE";
+	
+	/**
+	 * Extra key for sending the package name of the sender of a broadcast.
+	 * Should be set in every broadcast. 
+	 */
+	public static final String EXTRA_SENDER = "keepass2android.EXTRA_SENDER";
+	
+	/**
+	 * Extra key for sending a request token. The request token is passed from 
+	 * KP2A to the plugin. It's used in the authorization process. 
+	 */
+	public static final String EXTRA_REQUEST_TOKEN = "keepass2android.EXTRA_REQUEST_TOKEN";
+
+	/**
+	 * Action sent from KP2A to the plugin to indicate that the plugin should request
+	 * access (sending it's scopes)
+	 */
+	public static final String ACTION_TRIGGER_REQUEST_ACCESS = "keepass2android.ACTION_TRIGGER_REQUEST_ACCESS";
+	/** 
+	 * Action sent from the plugin to KP2A including the scopes.
+	 */
+	public static final String ACTION_REQUEST_ACCESS = "keepass2android.ACTION_REQUEST_ACCESS";
+	/**
+	 * Action sent from the KP2A to the plugin when the user grants access.
+	 * Will contain an access token.
+	 */
+	public static final String ACTION_RECEIVE_ACCESS = "keepass2android.ACTION_RECEIVE_ACCESS";
+	/**
+	 * Action sent from KP2A to the plugin to indicate that access is not or no longer valid.
+	 */
+	public static final String ACTION_REVOKE_ACCESS = "keepass2android.ACTION_REVOKE_ACCESS";
+	
+	
+	/**
+	 * Action for startActivity(). Opens an activity in the Plugin Host to edit the plugin settings (i.e. enable it)
+	 */
+	public static final String ACTION_EDIT_PLUGIN_SETTINGS = "keepass2android.ACTION_EDIT_PLUGIN_SETTINGS";
+	
+	/**
+	 * Action sent from KP2A to the plugin to indicate that an entry was opened.
+	 * The Intent contains the full entry data.
+	 */
+	public static final String ACTION_OPEN_ENTRY= "keepass2android.ACTION_OPEN_ENTRY";
+	
+	/**
+	 * Action sent from KP2A to the plugin to indicate that an entry output field was modified/added.
+	 * The Intent contains the full new entry data.
+	 */
+	public static final String ACTION_ENTRY_OUTPUT_MODIFIED= "keepass2android.ACTION_ENTRY_OUTPUT_MODIFIED";
+	
+	/**
+	 * Action sent from KP2A to the plugin to indicate that an entry activity was closed.
+	 */
+	public static final String ACTION_CLOSE_ENTRY_VIEW= "keepass2android.ACTION_CLOSE_ENTRY_VIEW";
+	
+	/**
+	 * Extra key for a string containing the GUID of the entry. 
+	 */
+	public static final String EXTRA_ENTRY_ID= "keepass2android.EXTRA_ENTRY_DATA";
+	
+	/** 
+	 * Json serialized data of the PwEntry (C# class) representing the opened entry.
+	 * currently not implemented.
+	 */
+	//public static final String EXTRA_ENTRY_DATA = "keepass2android.EXTRA_ENTRY_DATA";
+	
+	/**
+	 * Json serialized list of fields, transformed using the database context (i.e. placeholders are replaced already)
+	 */
+	public static final String EXTRA_ENTRY_OUTPUT_DATA = "keepass2android.EXTRA_ENTRY_OUTPUT_DATA";
+
+	/**
+	 * Json serialized lisf of field keys, specifying which field of the EXTRA_ENTRY_OUTPUT_DATA is protected.  
+	 */
+	public static final String EXTRA_PROTECTED_FIELDS_LIST = "keepass2android.EXTRA_PROTECTED_FIELDS_LIST";
+
+
+	/**
+	 * Extra key for passing the access token (both ways)
+	 */
+	public static final String EXTRA_ACCESS_TOKEN = "keepass2android.EXTRA_ACCESS_TOKEN";
+	
+	/**
+	 * Action for an intent from the plugin to KP2A to add menu options regarding the currently open entry.
+	 * Requires SCOPE_CURRENT_ENTRY. 
+	 */
+	public static final String ACTION_ADD_ENTRY_ACTION = "keepass2android.ACTION_ADD_ENTRY_ACTION";
+	
+	public static final String EXTRA_ACTION_DISPLAY_TEXT = "keepass2android.EXTRA_ACTION_DISPLAY_TEXT";
+	public static final String EXTRA_ACTION_ICON_RES_ID = "keepass2android.EXTRA_ACTION_ICON_RES_ID";
+
+	public static final String EXTRA_FIELD_ID = "keepass2android.EXTRA_FIELD_ID";
+	
+	/** 
+	 * Used to pass an id for the action. Each actionId may occur only once per field, otherwise the previous
+	 * action with same id is replaced by the new action.
+	 */
+	public static final String EXTRA_ACTION_ID = "keepass2android.EXTRA_ACTION_ID";
+
+	/** Extra for ACTION_ADD_ENTRY_ACTION and ACTION_ENTRY_ACTION_SELECTED to pass data specifying the action parameters.*/
+	public static final String EXTRA_ACTION_DATA = "keepass2android.EXTRA_ACTION_DATA";
+	
+	/**
+	 * Action for an intent from KP2A to the plugin when an action added with ACTION_ADD_ENTRY_ACTION was selected by the user.
+	 * 
+	 */
+	public static final String ACTION_ENTRY_ACTION_SELECTED = "keepass2android.ACTION_ENTRY_ACTION_SELECTED";
+	
+	/**
+	 * Action for an intent from the plugin to KP2A to set (i.e. add or update) a field in the entry.
+	 * May be used to update existing or add new fields at any time while the entry is opened.
+	 */
+	public static final String ACTION_SET_ENTRY_FIELD = "keepass2android.ACTION_SET_ENTRY_FIELD";
+	
+	public static final String EXTRA_FIELD_VALUE = "keepass2android.EXTRA_FIELD_VALUE";
+	public static final String EXTRA_FIELD_PROTECTED = "keepass2android.EXTRA_FIELD_PROTECTED";
+	
+	public static final String PREFIX_STRING = "STRING_";
+	public static final String PREFIX_BINARY = "BINARY_";
+	
+	
+
+}
diff --git a/src/java/PluginQR/.classpath b/src/java/PluginQR/.classpath
new file mode 100644
index 00000000..7bc01d9a
--- /dev/null
+++ b/src/java/PluginQR/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/src/java/PluginQR/.project b/src/java/PluginQR/.project
new file mode 100644
index 00000000..c47434d1
--- /dev/null
+++ b/src/java/PluginQR/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>PluginQR</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/src/java/PluginQR/.settings/org.eclipse.jdt.core.prefs b/src/java/PluginQR/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..b080d2dd
--- /dev/null
+++ b/src/java/PluginQR/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/src/java/PluginQR/AndroidManifest.xml b/src/java/PluginQR/AndroidManifest.xml
new file mode 100644
index 00000000..233d97bf
--- /dev/null
+++ b/src/java/PluginQR/AndroidManifest.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="keepass2android.plugin.qr"
+    android:versionCode="1"
+    android:versionName="1.0" >
+    
+    <uses-permission android:name="android.permission.CAMERA"/>
+     <uses-permission
+	    android:name="android.permission.FLASHLIGHT"
+	    android:permissionGroup="android.permission-group.HARDWARE_CONTROLS"
+	    android:protectionLevel="normal" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+	<uses-feature android:name="android.hardware.camera"/>
+	<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+	
+	<uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
+
+    <uses-sdk
+        android:minSdkVersion="14"
+        android:targetSdkVersion="19" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/qrcode"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="keepass2android.plugin.qr.QRActivity"
+            android:label="@string/title_activity_qr" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <receiver
+            android:name="keepass2android.plugin.qr.AccessReceiver"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="keepass2android.ACTION_TRIGGER_REQUEST_ACCESS" />
+                <action android:name="keepass2android.ACTION_RECEIVE_ACCESS" />
+                <action android:name="keepass2android.ACTION_REVOKE_ACCESS" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="keepass2android.plugin.qr.ActionReceiver"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="keepass2android.ACTION_OPEN_ENTRY" />
+                <action android:name="keepass2android.ACTION_ENTRY_OUTPUT_MODIFIED" />
+                <action android:name="keepass2android.ACTION_ENTRY_ACTION_SELECTED" />
+            </intent-filter>
+        </receiver>
+
+        <activity
+            android:name="keepass2android.plugin.qr.MainActivity"
+            android:label="@string/title_activity_main" 
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.google.zxing.client.android.CaptureActivity" 
+            android:label="Capture"
+            android:screenOrientation="portrait"
+           android:configChanges="orientation|keyboardHidden"
+           android:windowSoftInputMode="stateAlwaysHidden">
+            
+        </activity>
+        <activity android:name="com.google.zxing.client.android.PreferencesActivity"
+            android:label="Settings" />
+        
+        
+    </application>
+
+</manifest>
diff --git a/src/java/PluginQR/gen/keepass2android/plugin/qr/BuildConfig.java b/src/java/PluginQR/gen/keepass2android/plugin/qr/BuildConfig.java
new file mode 100644
index 00000000..71caf12e
--- /dev/null
+++ b/src/java/PluginQR/gen/keepass2android/plugin/qr/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package keepass2android.plugin.qr;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/src/java/PluginQR/gen/keepass2android/plugin/qr/R.java b/src/java/PluginQR/gen/keepass2android/plugin/qr/R.java
new file mode 100644
index 00000000..a1bd4985
--- /dev/null
+++ b/src/java/PluginQR/gen/keepass2android/plugin/qr/R.java
@@ -0,0 +1,326 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package keepass2android.plugin.qr;
+
+public final class R {
+    public static final class array {
+        public static final int country_codes=0x7f090000;
+        public static final int preferences_front_light_options=0x7f090002;
+        public static final int preferences_front_light_values=0x7f090001;
+    }
+    public static final class attr {
+    }
+    public static final class color {
+        public static final int contents_text=0x7f0a0000;
+        public static final int encode_view=0x7f0a0001;
+        public static final int possible_result_points=0x7f0a0002;
+        /**  Android standard ICS color 
+         */
+        public static final int result_minor_text=0x7f0a0003;
+        public static final int result_points=0x7f0a0004;
+        /**  Android standard ICS color 
+         */
+        public static final int result_text=0x7f0a0005;
+        public static final int result_view=0x7f0a0006;
+        public static final int status_text=0x7f0a0007;
+        public static final int transparent=0x7f0a0008;
+        public static final int viewfinder_laser=0x7f0a0009;
+        /**  Android standard ICS color 
+         */
+        public static final int viewfinder_mask=0x7f0a000a;
+    }
+    public static final class dimen {
+        /**  Default screen margins, per the Android Design guidelines. 
+
+         Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+    
+
+         Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+    
+ Default screen margins, per the Android Design guidelines. 
+         */
+        public static final int activity_horizontal_margin=0x7f060000;
+        public static final int activity_vertical_margin=0x7f060001;
+        public static final int half_padding=0x7f060003;
+        public static final int standard_padding=0x7f060002;
+    }
+    public static final class drawable {
+        public static final int ic_launcher=0x7f020000;
+        public static final int launcher_icon=0x7f020001;
+        public static final int qrcode=0x7f020002;
+        public static final int share_via_barcode=0x7f020003;
+    }
+    public static final class id {
+        public static final int action_settings=0x7f0b0036;
+        public static final int app_picker_list_item_icon=0x7f0b0008;
+        public static final int app_picker_list_item_label=0x7f0b0009;
+        public static final int barcode_image_view=0x7f0b000f;
+        public static final int bookmark_title=0x7f0b000a;
+        public static final int bookmark_url=0x7f0b000b;
+        public static final int btnConfigPlugins=0x7f0b001a;
+        public static final int btnScanQRCode=0x7f0b001c;
+        public static final int btnShowQR=0x7f0b001b;
+        public static final int cbIncludeLabel=0x7f0b0021;
+        public static final int container=0x7f0b0007;
+        public static final int contents_supplement_text_view=0x7f0b0016;
+        public static final int contents_text_view=0x7f0b0015;
+        public static final int decode=0x7f0b0000;
+        public static final int decode_failed=0x7f0b0001;
+        public static final int decode_succeeded=0x7f0b0002;
+        public static final int expanded_image=0x7f0b0023;
+        public static final int format_text_view=0x7f0b0010;
+        public static final int help_contents=0x7f0b0024;
+        public static final int history_detail=0x7f0b0026;
+        public static final int history_title=0x7f0b0025;
+        public static final int image_view=0x7f0b0019;
+        public static final int launch_product_query=0x7f0b0003;
+        public static final int menu_encode=0x7f0b0033;
+        public static final int menu_history_clear_text=0x7f0b0035;
+        public static final int menu_history_send=0x7f0b0034;
+        public static final int menu_settings=0x7f0b0031;
+        public static final int menu_share=0x7f0b0032;
+        public static final int meta_text_view=0x7f0b0014;
+        public static final int meta_text_view_label=0x7f0b0013;
+        public static final int page_number_view=0x7f0b002a;
+        public static final int preview_view=0x7f0b000c;
+        public static final int progressBar1=0x7f0b001e;
+        public static final int qrView=0x7f0b0020;
+        public static final int query_button=0x7f0b0028;
+        public static final int query_text_view=0x7f0b0027;
+        public static final int quit=0x7f0b0004;
+        public static final int restart_preview=0x7f0b0005;
+        public static final int result_button_view=0x7f0b0017;
+        public static final int result_list_view=0x7f0b0029;
+        public static final int result_view=0x7f0b000e;
+        public static final int return_scan_result=0x7f0b0006;
+        public static final int share_app_button=0x7f0b002c;
+        public static final int share_bookmark_button=0x7f0b002d;
+        public static final int share_clipboard_button=0x7f0b002f;
+        public static final int share_contact_button=0x7f0b002e;
+        public static final int share_text_view=0x7f0b0030;
+        public static final int snippet_view=0x7f0b002b;
+        public static final int spinner=0x7f0b001f;
+        public static final int status_view=0x7f0b0018;
+        public static final int time_text_view=0x7f0b0012;
+        public static final int tvError=0x7f0b0022;
+        public static final int tvHostStatus=0x7f0b001d;
+        public static final int type_text_view=0x7f0b0011;
+        public static final int viewfinder_view=0x7f0b000d;
+    }
+    public static final class layout {
+        public static final int activity_main=0x7f030000;
+        public static final int activity_qr=0x7f030001;
+        public static final int app_picker_list_item=0x7f030002;
+        public static final int bookmark_picker_list_item=0x7f030003;
+        public static final int capture=0x7f030004;
+        public static final int encode=0x7f030005;
+        public static final int fragment_main=0x7f030006;
+        public static final int fragment_qr=0x7f030007;
+        public static final int help=0x7f030008;
+        public static final int history_list_item=0x7f030009;
+        public static final int search_book_contents=0x7f03000a;
+        public static final int search_book_contents_header=0x7f03000b;
+        public static final int search_book_contents_list_item=0x7f03000c;
+        public static final int share=0x7f03000d;
+    }
+    public static final class menu {
+        public static final int capture=0x7f0c0000;
+        public static final int encode=0x7f0c0001;
+        public static final int history=0x7f0c0002;
+        public static final int main=0x7f0c0003;
+        public static final int qr=0x7f0c0004;
+    }
+    public static final class raw {
+        public static final int beep=0x7f050000;
+    }
+    public static final class string {
+        public static final int action_settings=0x7f070077;
+        public static final int action_show_qr=0x7f070078;
+        public static final int all_fields=0x7f07007a;
+        public static final int app_name=0x7f070000;
+        public static final int app_picker_name=0x7f070001;
+        public static final int bookmark_picker_name=0x7f070002;
+        public static final int button_add_calendar=0x7f070003;
+        public static final int button_add_contact=0x7f070004;
+        public static final int button_book_search=0x7f070005;
+        public static final int button_cancel=0x7f070006;
+        public static final int button_custom_product_search=0x7f070007;
+        public static final int button_dial=0x7f070008;
+        public static final int button_email=0x7f070009;
+        public static final int button_get_directions=0x7f07000a;
+        public static final int button_mms=0x7f07000b;
+        public static final int button_ok=0x7f07000c;
+        public static final int button_open_browser=0x7f07000d;
+        public static final int button_product_search=0x7f07000e;
+        public static final int button_search_book_contents=0x7f07000f;
+        public static final int button_share_app=0x7f070010;
+        public static final int button_share_bookmark=0x7f070011;
+        public static final int button_share_by_email=0x7f070012;
+        public static final int button_share_by_sms=0x7f070013;
+        public static final int button_share_clipboard=0x7f070014;
+        public static final int button_share_contact=0x7f070015;
+        public static final int button_show_map=0x7f070016;
+        public static final int button_sms=0x7f070017;
+        public static final int button_web_search=0x7f070018;
+        public static final int button_wifi=0x7f070019;
+        public static final int contents_contact=0x7f07001a;
+        public static final int contents_email=0x7f07001b;
+        public static final int contents_location=0x7f07001c;
+        public static final int contents_phone=0x7f07001d;
+        public static final int contents_sms=0x7f07001e;
+        public static final int contents_text=0x7f07001f;
+        public static final int enable_as_plugin=0x7f070085;
+        public static final int enabled_as_plugin=0x7f070084;
+        public static final int hello_world=0x7f07007f;
+        public static final int history_clear_one_history_text=0x7f070021;
+        public static final int history_clear_text=0x7f070020;
+        public static final int history_email_title=0x7f070022;
+        public static final int history_empty=0x7f070023;
+        public static final int history_empty_detail=0x7f070024;
+        public static final int history_send=0x7f070025;
+        public static final int history_title=0x7f070026;
+        public static final int include_label=0x7f070079;
+        public static final int kp2aplugin_author=0x7f07007d;
+        public static final int kp2aplugin_shortdesc=0x7f07007c;
+        public static final int kp2aplugin_title=0x7f07007b;
+        public static final int menu_encode_mecard=0x7f070027;
+        public static final int menu_encode_vcard=0x7f070028;
+        public static final int menu_help=0x7f070029;
+        public static final int menu_history=0x7f07002a;
+        public static final int menu_settings=0x7f07002b;
+        public static final int menu_share=0x7f07002c;
+        public static final int msg_bulk_mode_scanned=0x7f07002d;
+        public static final int msg_camera_framework_bug=0x7f07002e;
+        public static final int msg_default_format=0x7f07002f;
+        public static final int msg_default_meta=0x7f070030;
+        public static final int msg_default_mms_subject=0x7f070031;
+        public static final int msg_default_status=0x7f070032;
+        public static final int msg_default_time=0x7f070033;
+        public static final int msg_default_type=0x7f070034;
+        public static final int msg_encode_contents_failed=0x7f070035;
+        public static final int msg_google_books=0x7f070036;
+        public static final int msg_google_product=0x7f070037;
+        public static final int msg_intent_failed=0x7f070038;
+        public static final int msg_redirect=0x7f070039;
+        public static final int msg_sbc_book_not_searchable=0x7f07003a;
+        public static final int msg_sbc_failed=0x7f07003b;
+        public static final int msg_sbc_no_page_returned=0x7f07003c;
+        public static final int msg_sbc_page=0x7f07003d;
+        public static final int msg_sbc_results=0x7f07003e;
+        public static final int msg_sbc_searching_book=0x7f07003f;
+        public static final int msg_sbc_snippet_unavailable=0x7f070040;
+        public static final int msg_share_explanation=0x7f070041;
+        public static final int msg_share_text=0x7f070042;
+        public static final int msg_sure=0x7f070043;
+        public static final int msg_unmount_usb=0x7f070044;
+        public static final int no_host_app=0x7f070082;
+        public static final int not_enabled_as_plugin=0x7f070083;
+        public static final int preferences_actions_title=0x7f070045;
+        public static final int preferences_auto_focus_title=0x7f070046;
+        public static final int preferences_bulk_mode_summary=0x7f070047;
+        public static final int preferences_bulk_mode_title=0x7f070048;
+        public static final int preferences_copy_to_clipboard_title=0x7f070049;
+        public static final int preferences_custom_product_search_summary=0x7f07004a;
+        public static final int preferences_custom_product_search_title=0x7f07004b;
+        public static final int preferences_decode_1D_title=0x7f07004c;
+        public static final int preferences_decode_Data_Matrix_title=0x7f07004d;
+        public static final int preferences_decode_QR_title=0x7f07004e;
+        public static final int preferences_device_bug_workarounds_title=0x7f07004f;
+        public static final int preferences_disable_continuous_focus_summary=0x7f070050;
+        public static final int preferences_disable_continuous_focus_title=0x7f070051;
+        public static final int preferences_disable_exposure_title=0x7f070052;
+        public static final int preferences_front_light_auto=0x7f070055;
+        public static final int preferences_front_light_off=0x7f070056;
+        public static final int preferences_front_light_on=0x7f070057;
+        public static final int preferences_front_light_summary=0x7f070053;
+        public static final int preferences_front_light_title=0x7f070054;
+        public static final int preferences_general_title=0x7f070058;
+        public static final int preferences_invert_scan_summary=0x7f07005a;
+        public static final int preferences_invert_scan_title=0x7f070059;
+        public static final int preferences_name=0x7f07005b;
+        public static final int preferences_play_beep_title=0x7f07005c;
+        public static final int preferences_remember_duplicates_summary=0x7f07005d;
+        public static final int preferences_remember_duplicates_title=0x7f07005e;
+        public static final int preferences_result_title=0x7f07005f;
+        public static final int preferences_scanning_title=0x7f070060;
+        public static final int preferences_search_country=0x7f070061;
+        public static final int preferences_supplemental_summary=0x7f070062;
+        public static final int preferences_supplemental_title=0x7f070063;
+        public static final int preferences_try_bsplus=0x7f070074;
+        public static final int preferences_try_bsplus_summary=0x7f070075;
+        public static final int preferences_vibrate_title=0x7f070064;
+        public static final int result_address_book=0x7f070065;
+        public static final int result_calendar=0x7f070066;
+        public static final int result_email_address=0x7f070067;
+        public static final int result_geo=0x7f070068;
+        public static final int result_isbn=0x7f070069;
+        public static final int result_product=0x7f07006a;
+        public static final int result_sms=0x7f07006b;
+        public static final int result_tel=0x7f07006c;
+        public static final int result_text=0x7f07006d;
+        public static final int result_uri=0x7f07006e;
+        public static final int result_wifi=0x7f07006f;
+        public static final int sbc_name=0x7f070070;
+        public static final int scan_qr=0x7f070080;
+        public static final int show_qr=0x7f070081;
+        public static final int title_activity_main=0x7f07007e;
+        public static final int title_activity_qr=0x7f070076;
+        public static final int wifi_changing_network=0x7f070071;
+        public static final int wifi_ssid_label=0x7f070072;
+        public static final int wifi_type_label=0x7f070073;
+    }
+    public static final class style {
+        /** 
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    
+
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        
+
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    
+ API 11 theme customizations can go here. 
+
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    
+ API 14 theme customizations can go here. 
+
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    
+
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        
+         */
+        public static final int AppBaseTheme=0x7f080000;
+        /**  Application theme. 
+ All customizations that are NOT specific to a particular API-level can go here. 
+ Application theme. 
+ All customizations that are NOT specific to a particular API-level can go here. 
+         */
+        public static final int AppTheme=0x7f080001;
+        public static final int CaptureTheme=0x7f080004;
+        public static final int ResultButton=0x7f080002;
+        public static final int ShareButton=0x7f080003;
+    }
+    public static final class xml {
+        public static final int preferences=0x7f040000;
+    }
+}
diff --git a/src/java/PluginQR/gen/keepass2android/pluginsdk/R.java b/src/java/PluginQR/gen/keepass2android/pluginsdk/R.java
new file mode 100644
index 00000000..5f78512c
--- /dev/null
+++ b/src/java/PluginQR/gen/keepass2android/pluginsdk/R.java
@@ -0,0 +1,24 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+package keepass2android.pluginsdk;
+
+public final class R {
+	public static final class dimen {
+		public static final int activity_horizontal_margin = 0x7f060000;
+		public static final int activity_vertical_margin = 0x7f060001;
+	}
+	public static final class drawable {
+		public static final int ic_launcher = 0x7f020000;
+	}
+	public static final class string {
+		public static final int app_name = 0x7f070000;
+	}
+	public static final class style {
+		public static final int AppBaseTheme = 0x7f080000;
+		public static final int AppTheme = 0x7f080001;
+	}
+}
diff --git a/src/java/PluginQR/libs/core-2.3.0.jar b/src/java/PluginQR/libs/core-2.3.0.jar
new file mode 100644
index 00000000..990adcbf
Binary files /dev/null and b/src/java/PluginQR/libs/core-2.3.0.jar differ
diff --git a/src/java/PluginQR/proguard-project.txt b/src/java/PluginQR/proguard-project.txt
new file mode 100644
index 00000000..f2fe1559
--- /dev/null
+++ b/src/java/PluginQR/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/src/java/PluginQR/project.properties b/src/java/PluginQR/project.properties
new file mode 100644
index 00000000..b983a093
--- /dev/null
+++ b/src/java/PluginQR/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-19
+android.library.reference.1=../Keepass2AndroidPluginSDK
diff --git a/src/java/PluginQR/res/drawable-hdpi/launcher_icon.png b/src/java/PluginQR/res/drawable-hdpi/launcher_icon.png
new file mode 100644
index 00000000..5932aade
Binary files /dev/null and b/src/java/PluginQR/res/drawable-hdpi/launcher_icon.png differ
diff --git a/src/java/PluginQR/res/drawable-hdpi/qrcode.png b/src/java/PluginQR/res/drawable-hdpi/qrcode.png
new file mode 100644
index 00000000..86da774f
Binary files /dev/null and b/src/java/PluginQR/res/drawable-hdpi/qrcode.png differ
diff --git a/src/java/PluginQR/res/drawable-xhdpi/launcher_icon.png b/src/java/PluginQR/res/drawable-xhdpi/launcher_icon.png
new file mode 100644
index 00000000..330dc2f9
Binary files /dev/null and b/src/java/PluginQR/res/drawable-xhdpi/launcher_icon.png differ
diff --git a/src/java/PluginQR/res/drawable-xhdpi/qrcode.png b/src/java/PluginQR/res/drawable-xhdpi/qrcode.png
new file mode 100644
index 00000000..d871b5be
Binary files /dev/null and b/src/java/PluginQR/res/drawable-xhdpi/qrcode.png differ
diff --git a/src/java/PluginQR/res/drawable-xxhdpi/launcher_icon.png b/src/java/PluginQR/res/drawable-xxhdpi/launcher_icon.png
new file mode 100644
index 00000000..d535fdae
Binary files /dev/null and b/src/java/PluginQR/res/drawable-xxhdpi/launcher_icon.png differ
diff --git a/src/java/PluginQR/res/drawable/launcher_icon.png b/src/java/PluginQR/res/drawable/launcher_icon.png
new file mode 100644
index 00000000..fc5fafcf
Binary files /dev/null and b/src/java/PluginQR/res/drawable/launcher_icon.png differ
diff --git a/src/java/PluginQR/res/drawable/share_via_barcode.png b/src/java/PluginQR/res/drawable/share_via_barcode.png
new file mode 100644
index 00000000..56c34492
Binary files /dev/null and b/src/java/PluginQR/res/drawable/share_via_barcode.png differ
diff --git a/src/java/PluginQR/res/layout-land/encode.xml b/src/java/PluginQR/res/layout-land/encode.xml
new file mode 100644
index 00000000..947f9701
--- /dev/null
+++ b/src/java/PluginQR/res/layout-land/encode.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:fillViewport="true"
+              android:background="@color/encode_view"
+              android:orientation="horizontal"
+              android:gravity="center">
+
+  <ImageView android:id="@+id/image_view"
+             android:layout_width="wrap_content"
+             android:layout_height="fill_parent"
+             android:layout_gravity="center_vertical"
+             android:scaleType="center"/>
+
+  <ScrollView android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:layout_gravity="center_vertical"
+            android:gravity="center">
+
+    <TextView android:id="@+id/contents_text_view"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center_vertical"
+              android:gravity="center"
+              android:textColor="@color/contents_text"
+              android:paddingRight="8dip"
+              android:paddingTop="8dip"
+              android:paddingBottom="8dip"/>
+
+  </ScrollView>
+
+</LinearLayout>
diff --git a/src/java/PluginQR/res/layout-land/share.xml b/src/java/PluginQR/res/layout-land/share.xml
new file mode 100644
index 00000000..91383526
--- /dev/null
+++ b/src/java/PluginQR/res/layout-land/share.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center"
+              android:gravity="center"
+              android:orientation="vertical"
+              android:padding="8dip">
+
+  <TextView
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:text="@string/msg_share_explanation"
+      android:paddingBottom="12dip"/>
+
+  <LinearLayout
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      android:paddingBottom="12dip">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:scaleType="center"
+        android:src="@drawable/share_via_barcode"
+        android:paddingRight="24dip"/>
+
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+      <Button android:id="@+id/share_app_button"
+              style="@style/ShareButton"
+              android:text="@string/button_share_app"/>
+
+      <Button android:id="@+id/share_contact_button"
+              style="@style/ShareButton"
+              android:text="@string/button_share_contact"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+      <Button android:id="@+id/share_bookmark_button"
+              style="@style/ShareButton"
+              android:text="@string/button_share_bookmark"/>
+
+      <Button android:id="@+id/share_clipboard_button"
+              style="@style/ShareButton"
+              android:text="@string/button_share_clipboard"/>
+
+    </LinearLayout>
+
+  </LinearLayout>
+
+  <EditText android:id="@+id/share_text_view"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/msg_share_text"
+            android:singleLine="true"
+            android:selectAllOnFocus="true"/>
+
+</LinearLayout>
diff --git a/src/java/PluginQR/res/layout-ldpi/capture.xml b/src/java/PluginQR/res/layout-ldpi/capture.xml
new file mode 100644
index 00000000..da00412a
--- /dev/null
+++ b/src/java/PluginQR/res/layout-ldpi/capture.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <SurfaceView android:id="@+id/preview_view"
+               android:layout_width="fill_parent"
+               android:layout_height="fill_parent"/>
+
+  <com.google.zxing.client.android.ViewfinderView
+      android:id="@+id/viewfinder_view"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"/>
+
+  <LinearLayout android:id="@+id/result_view"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:background="@color/result_view"
+                android:visibility="gone"
+                android:baselineAligned="false">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="top"
+        android:padding="@dimen/standard_padding">
+
+      <LinearLayout
+          android:orientation="vertical"
+          android:layout_width="wrap_content"
+          android:layout_height="fill_parent"
+          android:gravity="right">
+
+        <ImageView android:id="@+id/barcode_image_view"
+                   android:layout_width="150dip"
+                   android:layout_height="wrap_content"
+                   android:maxWidth="150dip"
+                   android:maxHeight="150dip"
+                   android:layout_marginBottom="@dimen/half_padding"
+                   android:adjustViewBounds="true"
+                   android:scaleType="centerInside"/>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_format"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:paddingRight="@dimen/half_padding"/>
+
+          <TextView android:id="@+id/format_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_type"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:paddingRight="@dimen/half_padding"/>
+
+          <TextView android:id="@+id/type_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_time"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:paddingRight="@dimen/half_padding"/>
+
+          <TextView android:id="@+id/time_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:id="@+id/meta_text_view_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_meta"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:paddingRight="@dimen/half_padding"/>
+
+          <TextView android:id="@+id/meta_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"/>
+
+        </LinearLayout>
+
+      </LinearLayout>
+
+      <ScrollView
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content">
+
+        <LinearLayout
+          android:orientation="vertical"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:id="@+id/contents_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_text"
+                    android:textColorLink="@color/result_text"
+                    android:textSize="22sp"
+                    android:paddingLeft="12dip"
+                    android:autoLink="web"/>
+
+          <TextView android:id="@+id/contents_supplement_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_text"
+                    android:textColorLink="@color/result_text"
+                    android:paddingLeft="12dip"
+                    android:autoLink="web"
+                    android:clickable="true"/>
+
+        </LinearLayout>
+
+      </ScrollView>
+
+    </LinearLayout>
+
+    <LinearLayout android:id="@+id/result_button_view"
+                  android:orientation="horizontal"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:gravity="center">
+
+      <Button style="@style/ResultButton"
+              android:visibility="gone"/>
+
+      <Button style="@style/ResultButton"
+              android:visibility="gone"/>
+
+      <Button style="@style/ResultButton"
+              android:visibility="gone"/>
+
+      <Button style="@style/ResultButton"
+              android:visibility="gone"/>
+
+    </LinearLayout>
+
+  </LinearLayout>
+
+  <TextView android:id="@+id/status_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center_horizontal"
+            android:background="@color/transparent"
+            android:text="@string/msg_default_status"
+            android:textColor="@color/status_text"/>
+
+</merge>
diff --git a/src/java/PluginQR/res/layout/activity_main.xml b/src/java/PluginQR/res/layout/activity_main.xml
new file mode 100644
index 00000000..f9151ecf
--- /dev/null
+++ b/src/java/PluginQR/res/layout/activity_main.xml
@@ -0,0 +1,8 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="keepass2android.plugin.qr.MainActivity"
+    tools:ignore="MergeRootFrame" />
+
diff --git a/src/java/PluginQR/res/layout/activity_qr.xml b/src/java/PluginQR/res/layout/activity_qr.xml
new file mode 100644
index 00000000..24ee86c8
--- /dev/null
+++ b/src/java/PluginQR/res/layout/activity_qr.xml
@@ -0,0 +1,8 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="keepass2android.plugin.qr.QRActivity"
+    tools:ignore="MergeRootFrame" />
+
diff --git a/src/java/PluginQR/res/layout/app_picker_list_item.xml b/src/java/PluginQR/res/layout/app_picker_list_item.xml
new file mode 100644
index 00000000..3b7927cb
--- /dev/null
+++ b/src/java/PluginQR/res/layout/app_picker_list_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content">
+  
+  <ImageView android:id="@+id/app_picker_list_item_icon"
+             android:layout_width="64dip"
+             android:layout_height="64dip"
+             android:scaleType="centerInside"
+             android:padding="@dimen/half_padding"/>
+  
+  <TextView android:id="@+id/app_picker_list_item_label" 
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
+            android:gravity="center_vertical"
+            android:textAppearance="?android:attr/textAppearanceLarge"            
+            android:singleLine="true"
+            android:padding="@dimen/half_padding"/>
+  
+</LinearLayout>
diff --git a/src/java/PluginQR/res/layout/bookmark_picker_list_item.xml b/src/java/PluginQR/res/layout/bookmark_picker_list_item.xml
new file mode 100644
index 00000000..5122461c
--- /dev/null
+++ b/src/java/PluginQR/res/layout/bookmark_picker_list_item.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/half_padding">
+
+  <TextView android:id="@+id/bookmark_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"            
+            android:singleLine="true"/>
+
+  <TextView android:id="@+id/bookmark_url"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"                
+            android:singleLine="false"/>
+
+</LinearLayout>
diff --git a/src/java/PluginQR/res/layout/capture.xml b/src/java/PluginQR/res/layout/capture.xml
new file mode 100644
index 00000000..9578b398
--- /dev/null
+++ b/src/java/PluginQR/res/layout/capture.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <SurfaceView android:id="@+id/preview_view"
+               android:layout_width="fill_parent"
+               android:layout_height="fill_parent"/>
+
+  <com.google.zxing.client.android.ViewfinderView
+      android:id="@+id/viewfinder_view"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"/>
+
+  <LinearLayout android:id="@+id/result_view"
+                android:orientation="vertical"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
+                android:background="@color/result_view"
+                android:visibility="gone"
+                android:baselineAligned="false">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:padding="@dimen/standard_padding">
+
+      <LinearLayout
+          android:orientation="vertical"
+          android:layout_width="wrap_content"
+          android:layout_height="fill_parent"
+          android:gravity="right|center_vertical">
+
+        <ImageView android:id="@+id/barcode_image_view"
+                   android:layout_width="160dip"
+                   android:layout_height="wrap_content"
+                   android:maxWidth="160dip"
+                   android:maxHeight="160dip"
+                   android:layout_marginBottom="@dimen/half_padding"
+                   android:adjustViewBounds="true"
+                   android:scaleType="centerInside"/>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_format"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:paddingRight="@dimen/half_padding"/>
+
+          <TextView android:id="@+id/format_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_type"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:paddingRight="@dimen/half_padding"/>
+
+          <TextView android:id="@+id/type_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_time"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:paddingRight="@dimen/half_padding"/>
+
+          <TextView android:id="@+id/time_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+          android:orientation="horizontal"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+          <TextView android:id="@+id/meta_text_view_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/msg_default_meta"
+                    android:textColor="@color/result_minor_text"
+                    android:textStyle="bold"
+                    android:paddingRight="@dimen/half_padding"/>
+
+          <TextView android:id="@+id/meta_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_minor_text"/>
+
+        </LinearLayout>
+
+      </LinearLayout>
+
+      <ScrollView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content">
+
+        <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:orientation="vertical">
+
+          <TextView android:id="@+id/contents_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_text"
+                    android:textColorLink="@color/result_text"
+                    android:textSize="22sp"
+                    android:paddingLeft="12dip"
+                    android:autoLink="web"/>
+
+          <TextView android:id="@+id/contents_supplement_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/result_text"
+                    android:textColorLink="@color/result_text"
+                    android:paddingLeft="12dip"
+                    android:autoLink="web"/>
+
+        </LinearLayout>
+
+      </ScrollView>
+
+    </LinearLayout>
+
+    <LinearLayout android:id="@+id/result_button_view"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="horizontal"
+                  android:gravity="center">
+
+      <Button style="@style/ResultButton"
+              android:visibility="gone"/>
+
+      <Button style="@style/ResultButton"
+              android:visibility="gone"/>
+
+      <Button style="@style/ResultButton"
+              android:visibility="gone"/>
+
+      <Button style="@style/ResultButton"
+              android:visibility="gone"/>
+
+    </LinearLayout>
+
+  </LinearLayout>
+
+  <TextView android:id="@+id/status_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center_horizontal"
+            android:background="@color/transparent"
+            android:text="@string/msg_default_status"
+            android:textColor="@color/status_text"/>
+
+</merge>
diff --git a/src/java/PluginQR/res/layout/encode.xml b/src/java/PluginQR/res/layout/encode.xml
new file mode 100644
index 00000000..0dfcbc53
--- /dev/null
+++ b/src/java/PluginQR/res/layout/encode.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:fillViewport="true"
+              android:background="@color/encode_view"
+              android:orientation="vertical"
+              android:gravity="center">
+
+  <ImageView android:id="@+id/image_view"
+             android:layout_width="fill_parent"
+             android:layout_height="wrap_content"
+             android:layout_gravity="center_horizontal"
+             android:scaleType="center"/>
+
+  <ScrollView android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center_horizontal"
+              android:gravity="center">
+
+    <TextView android:id="@+id/contents_text_view"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:layout_gravity="center_horizontal"
+              android:gravity="center"
+              android:textColor="@color/contents_text"
+              android:paddingBottom="@dimen/standard_padding"
+              android:paddingLeft="@dimen/standard_padding"
+              android:paddingRight="@dimen/standard_padding"/>
+
+  </ScrollView>
+
+</LinearLayout>
diff --git a/src/java/PluginQR/res/layout/fragment_main.xml b/src/java/PluginQR/res/layout/fragment_main.xml
new file mode 100644
index 00000000..1fe90b04
--- /dev/null
+++ b/src/java/PluginQR/res/layout/fragment_main.xml
@@ -0,0 +1,59 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+     android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="keepass2android.plugin.qr.MainActivity$PlaceholderFragment" >
+
+    <Button
+        android:id="@+id/btnConfigPlugins"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:minHeight="45dp"
+        android:text="@string/enable_as_plugin" />
+
+    <Button
+        android:id="@+id/btnShowQR"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="15dp"
+        android:drawableTop="@drawable/qrcode"
+        android:minHeight="45dp"
+        android:text="@string/show_qr" />
+    
+    <Button
+        android:id="@+id/btnScanQRCode"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/btnConfigPlugins"
+        android:layout_below="@+id/btnShowQR"
+        android:drawableTop="@android:drawable/ic_menu_camera"
+        android:minHeight="45dp"
+        android:text="@string/scan_qr" />
+
+    <TextView
+        android:id="@+id/tvHostStatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/btnConfigPlugins"
+        android:layout_alignLeft="@+id/btnConfigPlugins"
+        android:text="" />
+
+    <ProgressBar
+        android:id="@+id/progressBar1"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/btnScanQRCode"
+        android:layout_centerHorizontal="true" 
+        android:indeterminate="true"
+        />
+
+</RelativeLayout>
diff --git a/src/java/PluginQR/res/layout/fragment_qr.xml b/src/java/PluginQR/res/layout/fragment_qr.xml
new file mode 100644
index 00000000..4e9b5fe4
--- /dev/null
+++ b/src/java/PluginQR/res/layout/fragment_qr.xml
@@ -0,0 +1,56 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ScrollView 
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+	<RelativeLayout 
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="keepass2android.plugin.qr.QRActivity$PlaceholderFragment" >
+    
+    <Spinner
+        android:id="@+id/spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true" />
+
+    <ImageView
+        android:layout_below="@+id/spinner"
+        android:id="@+id/qrView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        android:layout_centerHorizontal="true"
+        android:src="@drawable/qrcode"
+        />
+
+    <CheckBox
+        android:id="@+id/cbIncludeLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/qrView"
+        android:text="@string/include_label" />
+    <TextView android:id="@+id/tvError" 
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/cbIncludeLabel"
+        />
+
+
+</RelativeLayout>
+</ScrollView>
+ <ImageView
+        android:id="@+id/expanded_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="invisible"/>
+
+  </FrameLayout>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/layout/help.xml b/src/java/PluginQR/res/layout/help.xml
new file mode 100644
index 00000000..e02480a9
--- /dev/null
+++ b/src/java/PluginQR/res/layout/help.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<WebView xmlns:android="http://schemas.android.com/apk/res/android"
+         android:id="@+id/help_contents"
+         android:layout_width="fill_parent"
+         android:layout_height="fill_parent"
+         android:layout_weight="1"/>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/layout/history_list_item.xml b/src/java/PluginQR/res/layout/history_list_item.xml
new file mode 100644
index 00000000..1e20d8cf
--- /dev/null
+++ b/src/java/PluginQR/res/layout/history_list_item.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/standard_padding">
+
+  <TextView android:id="@+id/history_title"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:singleLine="true"/>
+
+  <TextView android:id="@+id/history_detail"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:singleLine="false"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/layout/search_book_contents.xml b/src/java/PluginQR/res/layout/search_book_contents.xml
new file mode 100644
index 00000000..29124372
--- /dev/null
+++ b/src/java/PluginQR/res/layout/search_book_contents.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+
+  <LinearLayout
+      android:orientation="horizontal"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="0">
+
+    <EditText android:id="@+id/query_text_view"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_gravity="left|center_vertical"
+              android:layout_weight="1"
+              android:singleLine="true"
+              android:selectAllOnFocus="true"
+              android:inputType="text"/>
+
+    <Button android:id="@+id/query_button"
+            style="@android:style/Widget.Holo.Button.Borderless.Small"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:text="@string/button_search_book_contents"/>
+
+  </LinearLayout>
+
+
+  <ListView android:id="@+id/result_list_view"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+</LinearLayout>
diff --git a/src/java/PluginQR/res/layout/search_book_contents_header.xml b/src/java/PluginQR/res/layout/search_book_contents_header.xml
new file mode 100644
index 00000000..0548eea8
--- /dev/null
+++ b/src/java/PluginQR/res/layout/search_book_contents_header.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:paddingLeft="@dimen/standard_padding"
+          android:paddingBottom="@dimen/half_padding"
+          android:enabled="false"
+          android:singleLine="true"/>
diff --git a/src/java/PluginQR/res/layout/search_book_contents_list_item.xml b/src/java/PluginQR/res/layout/search_book_contents_list_item.xml
new file mode 100644
index 00000000..229e24e2
--- /dev/null
+++ b/src/java/PluginQR/res/layout/search_book_contents_list_item.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<com.google.zxing.client.android.book.SearchBookContentsListItem
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/standard_padding">
+
+  <TextView android:id="@+id/page_number_view"
+            android:layout_width="75dip"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|top"
+            android:layout_marginRight="@dimen/standard_padding"
+            android:singleLine="false"
+            android:textStyle="bold"/>
+
+  <TextView android:id="@+id/snippet_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|top"
+            android:singleLine="false"/>
+
+</com.google.zxing.client.android.book.SearchBookContentsListItem>
diff --git a/src/java/PluginQR/res/layout/share.xml b/src/java/PluginQR/res/layout/share.xml
new file mode 100644
index 00000000..2dc9a8fb
--- /dev/null
+++ b/src/java/PluginQR/res/layout/share.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!-- ScrollView wrapper is to accommodate small screens. -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center">
+
+  <!-- Must wrap the rest in one layout -->
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:orientation="vertical"
+      android:padding="@dimen/standard_padding">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/msg_share_explanation"
+        android:paddingBottom="@dimen/standard_padding"/>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="center"
+        android:src="@drawable/share_via_barcode"
+        android:paddingBottom="@dimen/standard_padding"/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/standard_padding">
+
+      <Button android:id="@+id/share_app_button"
+              style="@style/ShareButton"
+              android:layout_weight="1"
+              android:text="@string/button_share_app"/>
+
+      <Button android:id="@+id/share_bookmark_button"
+              style="@style/ShareButton"
+              android:layout_weight="1"
+              android:text="@string/button_share_bookmark"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/standard_padding">
+
+      <Button android:id="@+id/share_contact_button"
+              style="@style/ShareButton"
+              android:layout_weight="1"
+              android:text="@string/button_share_contact"/>
+
+      <Button android:id="@+id/share_clipboard_button"
+              style="@style/ShareButton"
+              android:layout_weight="1"
+              android:text="@string/button_share_clipboard"/>
+
+    </LinearLayout>
+
+    <EditText android:id="@+id/share_text_view"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:hint="@string/msg_share_text"
+              android:singleLine="true"
+              android:selectAllOnFocus="true"/>
+
+  </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/menu/capture.xml b/src/java/PluginQR/res/menu/capture.xml
new file mode 100644
index 00000000..0e065c73
--- /dev/null
+++ b/src/java/PluginQR/res/menu/capture.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/menu_settings"
+        android:title="@string/menu_settings"
+        android:icon="@android:drawable/ic_menu_preferences"
+        android:orderInCategory="3"
+        android:showAsAction="withText"/>
+</menu>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/menu/encode.xml b/src/java/PluginQR/res/menu/encode.xml
new file mode 100644
index 00000000..eb0175b0
--- /dev/null
+++ b/src/java/PluginQR/res/menu/encode.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/menu_share"
+        android:title="@string/menu_share"
+        android:icon="@android:drawable/ic_menu_share"
+        android:orderInCategory="1"
+        android:showAsAction="withText|ifRoom"/>
+  <item android:id="@+id/menu_encode"
+        android:title="@string/menu_encode_vcard"
+        android:icon="@android:drawable/ic_menu_sort_alphabetically"
+        android:orderInCategory="2"
+        android:showAsAction="withText|ifRoom"/>
+</menu>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/menu/history.xml b/src/java/PluginQR/res/menu/history.xml
new file mode 100644
index 00000000..273802b7
--- /dev/null
+++ b/src/java/PluginQR/res/menu/history.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/menu_history_send"
+        android:title="@string/history_send"
+        android:icon="@android:drawable/ic_menu_share"
+        android:orderInCategory="1"
+        android:showAsAction="withText|ifRoom"/>
+  <item android:id="@+id/menu_history_clear_text"
+        android:title="@string/history_clear_text"
+        android:icon="@android:drawable/ic_menu_delete"
+        android:orderInCategory="2"
+        android:showAsAction="withText|ifRoom"/>
+</menu>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/menu/main.xml b/src/java/PluginQR/res/menu/main.xml
new file mode 100644
index 00000000..76814975
--- /dev/null
+++ b/src/java/PluginQR/res/menu/main.xml
@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="keepass2android.plugin.qr.MainActivity" >
+
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
diff --git a/src/java/PluginQR/res/menu/qr.xml b/src/java/PluginQR/res/menu/qr.xml
new file mode 100644
index 00000000..30a0acf3
--- /dev/null
+++ b/src/java/PluginQR/res/menu/qr.xml
@@ -0,0 +1,7 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="keepass2android.plugin.qr.QRActivity" >
+
+    
+
+</menu>
diff --git a/src/java/PluginQR/res/raw/beep.ogg b/src/java/PluginQR/res/raw/beep.ogg
new file mode 100644
index 00000000..14199476
Binary files /dev/null and b/src/java/PluginQR/res/raw/beep.ogg differ
diff --git a/src/java/PluginQR/res/values-ar/strings.xml b/src/java/PluginQR/res/values-ar/strings.xml
new file mode 100644
index 00000000..2aef9ebf
--- /dev/null
+++ b/src/java/PluginQR/res/values-ar/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">ماسح الرمز الشريطي</string>
+  <string name="app_picker_name">تطبيقات</string>
+  <string name="bookmark_picker_name">إشارات مرجعية</string>
+  <string name="button_add_calendar">إضافة إلى التقويم</string>
+  <string name="button_add_contact">إضافة جهة اتصال</string>
+  <string name="button_book_search">بحث في الكتب</string>
+  <string name="button_cancel">إلغاء</string>
+  <string name="button_custom_product_search">بحث مخصص</string>
+  <string name="button_dial">طلب رقم</string>
+  <string name="button_email">إرسال بريد</string>
+  <string name="button_get_directions">معرفة الاتجاهات</string>
+  <string name="button_mms">إرسال MMS</string>
+  <string name="button_ok">موافق</string>
+  <string name="button_open_browser">فتح المتصفح</string>
+  <string name="button_product_search">بحث عن منتجات</string>
+  <string name="button_search_book_contents">بحث في المحتويات</string>
+  <string name="button_share_app">التطبيق</string>
+  <string name="button_share_bookmark">إشارة مرجعية</string>
+  <string name="button_share_by_email">مشاركة عبر البريد</string>
+  <string name="button_share_by_sms">مشاركة عبر SMS</string>
+  <string name="button_share_clipboard">حافظة</string>
+  <string name="button_share_contact">جهة اتصال</string>
+  <string name="button_show_map">عرض الخريطة</string>
+  <string name="button_sms">إرسال SMS</string>
+  <string name="button_web_search">بحث في الويب</string>
+  <string name="button_wifi">الاتصال بشبك</string>
+  <string name="contents_contact">معلومات جهة اتصال</string>
+  <string name="contents_email">عنوان البريد</string>
+  <string name="contents_location">إحداثيات جغرافية</string>
+  <string name="contents_phone">رقم الهاتف</string>
+  <string name="contents_sms">عنوان SMS</string>
+  <string name="contents_text">نص عادي</string>
+  <string name="history_clear_one_history_text">حذف</string>
+  <string name="history_clear_text">مسح السجل</string>
+  <string name="history_email_title">سجل ماسح الرموز الشريطية</string>
+  <string name="history_empty">فارغ</string>
+  <string name="history_empty_detail">لم تسجل حتى الآن بمسح الباركود</string>
+  <string name="history_send">إرسال السجل</string>
+  <string name="history_title">سجل</string>
+  <string name="menu_encode_mecard">استخدام MECARD</string>
+  <string name="menu_encode_vcard">استخدام vCard</string>
+  <string name="menu_help">تعليمات</string>
+  <string name="menu_history">سجل</string>
+  <string name="menu_settings">إعدادات</string>
+  <string name="menu_share">مشاركة</string>
+  <string name="msg_bulk_mode_scanned">معظم الدراسي : الباركود الممسوحة ضوئيا وحفظها</string>
+  <string name="msg_camera_framework_bug">عفوا، حدثت مشكلة في كاميرا جهاز Android. قد تحتاج إلى إعادة تشغيل الجهاز.</string>
+  <string name="msg_default_format">التنسيق</string>
+  <string name="msg_default_meta">البيانات الوصفية</string>
+  <string name="msg_default_mms_subject">أهلا</string>
+  <string name="msg_default_status">قم بوضع الرمز الشريطي داخل حدود صورة الكاميرا ليتم مسحه.</string>
+  <string name="msg_default_time">الوقت</string>
+  <string name="msg_default_type">النوع</string>
+  <string name="msg_encode_contents_failed">تعذر ترميز رمز شريطي من البيانات المتوفرة.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">عفوا، تعذر تشغيل التطبيق المطلوب. قد تكون محتويات الرمز الشريطي غير صحيحة.</string>
+  <string name="msg_redirect">إعادة توجيه</string>
+  <string name="msg_sbc_book_not_searchable">عفوا، لا يمكن البحث في هذا الكتاب.</string>
+  <string name="msg_sbc_failed">عفوا، حدثت مشكلة في عملية البحث.</string>
+  <string name="msg_sbc_no_page_returned">لم يتم إرجاع أية صفحة</string>
+  <string name="msg_sbc_page">الصفحة</string>
+  <string name="msg_sbc_results">النتائج</string>
+  <string name="msg_sbc_searching_book">البحث في الكتاب</string>
+  <string name="msg_sbc_snippet_unavailable">الأجزاء غير متاحة</string>
+  <string name="msg_share_explanation">يمكنك مشاركة البيانات عن طريق عرض رمز شريطي على الشاشة ومسحه من خلال هاتف آخر.</string>
+  <string name="msg_share_text">أو اكتب بعض النص</string>
+  <string name="msg_sure">هل أنت متأكد؟</string>
+  <string name="msg_unmount_usb">رجاء إيقاف التخزين على USB للمتابعة.</string>
+  <string name="preferences_actions_title">عند العثور على رمز شريطي</string>
+  <string name="preferences_auto_focus_title">استخدام التركيز التلقائي</string>
+  <string name="preferences_bulk_mode_summary">المسح الضوئي وحفظها بشكل مستمر العديد من الرموز الشريطية</string>
+  <string name="preferences_bulk_mode_title">جل وضع المسح الضوئي</string>
+  <string name="preferences_copy_to_clipboard_title">نسخ إلى الحافظة</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">التبديلات : s٪ = المحتويات ،  f٪ = الشكل ، اكتب t٪ =</string>
+  <string name="preferences_custom_product_search_title">عنوان بحث مخصص</string>
+  <string name="preferences_decode_1D_title">فك الرموز الشريطية 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">فك رموز البيانات ماتريكس</string>
+  <string name="preferences_decode_QR_title">فك رموز QR</string>
+  <string name="preferences_device_bug_workarounds_title">الحلول جهاز علة</string>
+  <string name="preferences_disable_continuous_focus_summary">استخدام وضع معيار التركيز فقط</string>
+  <string name="preferences_disable_continuous_focus_title">لا التركيز المستمر</string>
+  <string name="preferences_disable_exposure_title">لا تعرض</string>
+  <string name="preferences_front_light_auto">أوتوماتيكي</string>
+  <string name="preferences_front_light_off">غير فعال</string>
+  <string name="preferences_front_light_on">نشط</string>
+  <string name="preferences_front_light_summary">تقوم بتحسين عملية المسح في إضاءة ضعيفة في بعض الهواتف، ولكن يمكن أن يتسبب في حدوث سطوع</string>
+  <string name="preferences_front_light_title">استخدم إضاءة أمامية</string>
+  <string name="preferences_general_title">إعدادات عامة</string>
+  <string name="preferences_invert_scan_summary">مسح الباركود لأبيض على خلفية سوداء. لا تتوفر على بعض الأجهزة.</string>
+  <string name="preferences_invert_scan_title">عكس المسح الضوئي</string>
+  <string name="preferences_name">إعدادات</string>
+  <string name="preferences_play_beep_title">صوت تنبيه</string>
+  <string name="preferences_remember_duplicates_summary">بفحص مخزن متعددة من نفس الباركود في التاريخ</string>
+  <string name="preferences_remember_duplicates_title">تذكر التكرارات</string>
+  <string name="preferences_result_title">إعدادات النتائج</string>
+  <string name="preferences_scanning_title">عندما لمسح الباركود</string>
+  <string name="preferences_search_country">ابحث عن بلد</string>
+  <string name="preferences_supplemental_summary">محاولة لاسترداد مزيد من المعلومات حول محتويات الباركود</string>
+  <string name="preferences_supplemental_title">استرداد مزيد من المعلومات</string>
+  <string name="preferences_try_bsplus">محاولة الباركود +</string>
+  <string name="preferences_try_bsplus_summary">معززة مع الميزات الجديدة واجهة</string>
+  <string name="preferences_vibrate_title">اهتزاز</string>
+  <string name="result_address_book">تم العثور على معلومات جهة الاتصال</string>
+  <string name="result_calendar">تم العثور على حدث التقويم</string>
+  <string name="result_email_address">تم العثور على عنوان البريد</string>
+  <string name="result_geo">تم العثور على الإحداثيات الجغرافية</string>
+  <string name="result_isbn">تم العثور على الكتاب</string>
+  <string name="result_product">تم العثور على المنتج</string>
+  <string name="result_sms">تم العثور على عنوان SMS</string>
+  <string name="result_tel">تم العثور على رقم الهاتف</string>
+  <string name="result_text">تم العثور على نص عادي</string>
+  <string name="result_uri">تم العثور على العنوان</string>
+  <string name="result_wifi">العثور على التكوين اللاسلك</string>
+  <string name="sbc_name">البحث في Google Book</string>
+  <string name="wifi_changing_network">طلب الاتصال بالشبكة\u2026</string>
+  <string name="wifi_ssid_label">اسم الشبكة</string>
+  <string name="wifi_type_label">نوع</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-bg/strings.xml b/src/java/PluginQR/res/values-bg/strings.xml
new file mode 100644
index 00000000..37e0174b
--- /dev/null
+++ b/src/java/PluginQR/res/values-bg/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">Баркод Скенер</string>
+  <string name="app_picker_name">Приложения</string>
+  <string name="bookmark_picker_name">Отметки</string>
+  <string name="button_add_calendar">Добави в календар</string>
+  <string name="button_add_contact">Добави контакт</string>
+  <string name="button_book_search">Търси Книга</string>
+  <string name="button_cancel">Отказ</string>
+  <string name="button_custom_product_search">Потребителско търсене</string>
+  <string name="button_dial">Набери телефон</string>
+  <string name="button_email">Изпрати поща</string>
+  <string name="button_get_directions">Навигация</string>
+  <string name="button_mms">Изпрати MMS</string>
+  <string name="button_ok">ОК</string>
+  <string name="button_open_browser">Отвори браузър</string>
+  <string name="button_product_search">Търсене на продукт</string>
+  <string name="button_search_book_contents">Търси в книга</string>
+  <string name="button_share_app">Приложение</string>
+  <string name="button_share_bookmark">Отметка</string>
+  <string name="button_share_by_email">Сподели по поща</string>
+  <string name="button_share_by_sms">Сподели чрез SMS</string>
+  <string name="button_share_clipboard">Клипборд</string>
+  <string name="button_share_contact">Контакт</string>
+  <string name="button_show_map">Покажи карта</string>
+  <string name="button_sms">Изпрати SMS</string>
+  <string name="button_web_search">Интернет търсене</string>
+  <string name="button_wifi">Свържи се в мрежата</string>
+  <string name="contents_contact">Информация за контакт</string>
+  <string name="contents_email">Електронна поща</string>
+  <string name="contents_location">Географски координати</string>
+  <string name="contents_phone">Телефон</string>
+  <string name="contents_sms">SMS адрес</string>
+  <string name="contents_text">Чист текст</string>
+  <string name="history_clear_one_history_text">Изчисти</string>
+  <string name="history_clear_text">Изчисти историята</string>
+  <string name="history_email_title">История на Баркод Скенера</string>
+  <string name="history_empty">Празно</string>
+  <string name="history_empty_detail">Няма сканирани и записани бар-кодове все още</string>
+  <string name="history_send">Изпрати историята</string>
+  <string name="history_title">История</string>
+  <string name="menu_encode_mecard">Използвай MECARD формат</string>
+  <string name="menu_encode_vcard">Използвай vCard формат</string>
+  <string name="menu_help">Помощ</string>
+  <string name="menu_history">История</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="menu_share">Сподели</string>
+  <string name="msg_bulk_mode_scanned">Масов режим: баркодът е сканиран и записан</string>
+  <string name="msg_camera_framework_bug">Съжаляваме, срещнахме проблем с камерата. Може да се наложи да рестартирате устройството си.</string>
+  <string name="msg_default_format">Формат</string>
+  <string name="msg_default_meta">Допълнение</string>
+  <string name="msg_default_mms_subject">Здравейте</string>
+  <string name="msg_default_status">Сложете баркода вътре в правоъгълника за да го сканирате.</string>
+  <string name="msg_default_time">Време</string>
+  <string name="msg_default_type">Тип</string>
+  <string name="msg_encode_contents_failed">Неуспешно кодиране на подадените данни.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Съжаляваме, но нужното приложение не успя да се стартира. Възможно е баркода или съдържанието му да са невалидни.</string>
+  <string name="msg_redirect">Пренасочване</string>
+  <string name="msg_sbc_book_not_searchable">Съжаляваме, тази книга не може да се претърсва.</string>
+  <string name="msg_sbc_failed">Съжаляваме, срещнахме проблем при търсенето.</string>
+  <string name="msg_sbc_no_page_returned">Няма страница</string>
+  <string name="msg_sbc_page">Страница</string>
+  <string name="msg_sbc_results">Резултати</string>
+  <string name="msg_sbc_searching_book">Търсене на книга\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Изрезката не е достъпна</string>
+  <string name="msg_share_explanation">Можете да споделяте информация като покажете баркод на екрана, и го сканирате от друг телефон.</string>
+  <string name="msg_share_text">Или въведете някакъв текст</string>
+  <string name="msg_sure">Сигурни ли сте?</string>
+  <string name="msg_unmount_usb">Съжаляваме, но SD картата не е достъпна.</string>
+  <string name="preferences_actions_title">При прочитане на баркод\u2026</string>
+  <string name="preferences_auto_focus_title">Използване на автоматично фокусиране</string>
+  <string name="preferences_bulk_mode_summary">Сканирай и запомняй множество баркодове без прекъсване</string>
+  <string name="preferences_bulk_mode_title">Масово сканиране</string>
+  <string name="preferences_copy_to_clipboard_title">Копиране в клипборда</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Използвайте: %s за съдържанието,%f за форматa, %t за типа</string>
+  <string name="preferences_custom_product_search_title">Потребителски адрес за търсене</string>
+  <string name="preferences_decode_1D_title">1D Баркодове</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR Баркодове</string>
+  <string name="preferences_device_bug_workarounds_title">Заобикаляне на проблеми</string>
+  <string name="preferences_disable_continuous_focus_summary">Използване само на стандартен режим за фокусиране</string>
+  <string name="preferences_disable_continuous_focus_title">Без непрекъснат фокус</string>
+  <string name="preferences_disable_exposure_title">Никоя експозиция</string>
+  <string name="preferences_front_light_auto">Автоматичен</string>
+  <string name="preferences_front_light_off">Неактивен</string>
+  <string name="preferences_front_light_on">Активен</string>
+  <string name="preferences_front_light_summary">Подобрява четенето при лошо осветление, но предизвиква отблясъци. Само за някои модели.</string>
+  <string name="preferences_front_light_title">Използвай фенерче</string>
+  <string name="preferences_general_title">Общи настройки</string>
+  <string name="preferences_invert_scan_summary">Сканиране за бели баркодове на черен фон. Не е на разположение на някои устройства.</string>
+  <string name="preferences_invert_scan_title">Обръщане на сканиране</string>
+  <string name="preferences_name">Настройки</string>
+  <string name="preferences_play_beep_title">Издаване на звук</string>
+  <string name="preferences_remember_duplicates_summary">Записвай множество сканирания на един и същи баркод в историята</string>
+  <string name="preferences_remember_duplicates_title">Запомняне на повторенията</string>
+  <string name="preferences_result_title">Настройки за резултата</string>
+  <string name="preferences_scanning_title">При сканиране да се декодират\u2026</string>
+  <string name="preferences_search_country">Държава при търсене</string>
+  <string name="preferences_supplemental_summary">Опитай да получиш повече информация за баркода</string>
+  <string name="preferences_supplemental_title">Търсене на разширения</string>
+  <string name="preferences_try_bsplus">Опитайте Баркод Скенер+</string>
+  <string name="preferences_try_bsplus_summary">Обогатен с нови характеристики и интерфейс</string>
+  <string name="preferences_vibrate_title">Вибрация</string>
+  <string name="result_address_book">Намерих информация за контакт</string>
+  <string name="result_calendar">Намерих календарно събитие</string>
+  <string name="result_email_address">Намерих адрес на електронна поща</string>
+  <string name="result_geo">Намерих географски координати</string>
+  <string name="result_isbn">Намерих книга</string>
+  <string name="result_product">Намерих продукт</string>
+  <string name="result_sms">Намерих адрес за SMS</string>
+  <string name="result_tel">Намерих телефонен номер</string>
+  <string name="result_text">Намерих чист текст</string>
+  <string name="result_uri">Намерих Интернет Адрес</string>
+  <string name="result_wifi">Намерих настройки за безжична мрежа</string>
+  <string name="sbc_name">Гугъл търсене на книга</string>
+  <string name="wifi_changing_network">Запитване свързване към мрежата\u2026</string>
+  <string name="wifi_ssid_label">Име на мрежата</string>
+  <string name="wifi_type_label">Тип</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-ca/strings.xml b/src/java/PluginQR/res/values-ca/strings.xml
new file mode 100644
index 00000000..463610d4
--- /dev/null
+++ b/src/java/PluginQR/res/values-ca/strings.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_picker_name">Aplicacions</string>
+  <string name="bookmark_picker_name">Adreces d\'interès</string>
+  <string name="button_add_calendar">Afegeix a l\'agenda</string>
+  <string name="button_add_contact">Afegeix el contact</string>
+  <string name="button_book_search">Cerca el llibre</string>
+  <string name="button_cancel">Cancel·la</string>
+  <string name="button_custom_product_search">Cerca personalitzada</string>
+  <string name="button_dial">Marca el número</string>
+  <string name="button_email">Envia un correu electrònic</string>
+  <string name="button_get_directions">Obté direccions</string>
+  <string name="button_mms">Envia MMS</string>
+  <string name="button_ok">D\'acord</string>
+  <string name="button_open_browser">Obre el navegador</string>
+  <string name="button_product_search">Cerca un producte</string>
+  <string name="button_search_book_contents">Cerca continguts</string>
+  <string name="button_share_app">Aplicació</string>
+  <string name="button_share_bookmark">Adreça d\'interès</string>
+  <string name="button_share_by_email">Comparteix per correu-e</string>
+  <string name="button_share_by_sms">Comparteix per SMS</string>
+  <string name="button_share_clipboard">Porta-retalls</string>
+  <string name="button_share_contact">Contacte</string>
+  <string name="button_show_map">Mostra el mapa</string>
+  <string name="button_sms">Envia SMS</string>
+  <string name="button_web_search">Cerca al web</string>
+  <string name="button_wifi">Connecta a la xarxa</string>
+  <string name="contents_contact">Informació de contacte</string>
+  <string name="contents_email">Adreça electrònica</string>
+  <string name="contents_location">Coordenades geogràfiques</string>
+  <string name="contents_phone">Número de telèfon</string>
+  <string name="contents_sms">Adreça SMS</string>
+  <string name="contents_text">Text pla</string>
+  <string name="history_clear_one_history_text">Neteja</string>
+  <string name="history_clear_text">Neteja l\'historial</string>
+  <string name="history_email_title">Historial del Barcode Scanner</string>
+  <string name="history_empty">Buit</string>
+  <string name="history_empty_detail">No escaneja codis de barres s\'han registrat encara</string>
+  <string name="history_send">Envia l\'historial</string>
+  <string name="history_title">Historial</string>
+  <string name="menu_encode_mecard">Utilitza MECARD</string>
+  <string name="menu_encode_vcard">Utilitza vCard</string>
+  <string name="menu_help">Ajuda</string>
+  <string name="menu_history">Historial</string>
+  <string name="menu_settings">Configuració</string>
+  <string name="menu_share">Comparteix</string>
+  <string name="msg_bulk_mode_scanned">Mode en bloc: codi de barres escanejat i desat</string>
+  <string name="msg_camera_framework_bug">S\'ha produït un problema amb la càmera de l\'Android. Potser haureu de reiniciar el dispositiu.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metadadades</string>
+  <string name="msg_default_mms_subject">Hola</string>
+  <string name="msg_default_status">Poseu un codi de barres dins el rectable per escanejar-lo.</string>
+  <string name="msg_default_time">Hora</string>
+  <string name="msg_default_type">Tipus</string>
+  <string name="msg_encode_contents_failed">No es pot codificar un codi de barres amb les dades proporcionades.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">No es pot executar l\'aplicació sol·licitada. És possible que el contingut del codi de barres no sigui vàlid.</string>
+  <string name="msg_redirect">Redirecciona</string>
+  <string name="msg_sbc_book_not_searchable">No es pot cercar en aquest llibre.</string>
+  <string name="msg_sbc_failed">Hi ha hagut un problema en fer la cerca.</string>
+  <string name="msg_sbc_no_page_returned">No s\'ha retornat cap pàgina</string>
+  <string name="msg_sbc_page">Pàgina</string>
+  <string name="msg_sbc_results">Resultats</string>
+  <string name="msg_sbc_searching_book">S\'està cercant el llibre\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Fragment no disponible</string>
+  <string name="msg_share_explanation">Podeu compartir dades mostrant un codi de barres a la pantalla i escanejant-lo amb un altre dispositiu.</string>
+  <string name="msg_share_text">O escriviu un text i pitgeu Retorn</string>
+  <string name="msg_sure">N\'esteu segur?</string>
+  <string name="msg_unmount_usb">La targeta SD no es troba disponible.</string>
+  <string name="preferences_actions_title">En trobar un codi de barres\u2026</string>
+  <string name="preferences_auto_focus_title">Utilitzeu l\'enfocament automàtic</string>
+  <string name="preferences_bulk_mode_summary">Escaneja i desa molts codis de barres de forma contínua</string>
+  <string name="preferences_bulk_mode_title">Mode d\'escaneig en bloc</string>
+  <string name="preferences_copy_to_clipboard_title">Copia al porta-retalls</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Substitucions: %s = contingut, %f = format, %t = tipus</string>
+  <string name="preferences_custom_product_search_title">URL de cerca personalitzat</string>
+  <string name="preferences_decode_1D_title">Codis de barres 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Matriu de dades</string>
+  <string name="preferences_decode_QR_title">Codis QR</string>
+  <string name="preferences_device_bug_workarounds_title">Solucions provisionals de dispositius d\'errors</string>
+  <string name="preferences_disable_continuous_focus_summary">Utilitzeu només la manera d\'enfocament estàndard</string>
+  <string name="preferences_disable_continuous_focus_title">No enfocament continu</string>
+  <string name="preferences_disable_exposure_title">No hi ha exposició</string>
+  <string name="preferences_front_light_auto">Automàtic</string>
+  <string name="preferences_front_light_off">Inactiu</string>
+  <string name="preferences_front_light_on">Actiu</string>
+  <string name="preferences_front_light_summary">Millora l\'escaneig amb poca llum en alguns dispositius, però pot produir enlluernament. No funciona en tots els dispositius.</string>
+  <string name="preferences_front_light_title">Usa el llum frontal</string>
+  <string name="preferences_general_title">Configuració general</string>
+  <string name="preferences_invert_scan_summary">Escanejar codis de barres blanques sobre fons negre. No disponible en alguns dispositius.</string>
+  <string name="preferences_invert_scan_title">Invertir exploració</string>
+  <string name="preferences_name">Configuració</string>
+  <string name="preferences_play_beep_title">Beep</string>
+  <string name="preferences_remember_duplicates_summary">Desa diversos escanejos del mateix codi de barres a l\'historial</string>
+  <string name="preferences_remember_duplicates_title">Recorda els duplicats</string>
+  <string name="preferences_result_title">Configuració dels resultats</string>
+  <string name="preferences_scanning_title">En escanejar codis de barres, descodifica\u2026</string>
+  <string name="preferences_search_country">Cerca per país</string>
+  <string name="preferences_supplemental_summary">Intenta obtenir més informació sobre els continguts del codi de barres</string>
+  <string name="preferences_supplemental_title">Aconsegueix més informació</string>
+  <string name="preferences_try_bsplus">Intenta Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Millorat amb noves característiques i la interfície de</string>
+  <string name="preferences_vibrate_title">Vibració</string>
+  <string name="result_address_book">S\'ha trobat informació de contacte</string>
+  <string name="result_calendar">S\'ha trobat un esdeveniment</string>
+  <string name="result_email_address">S\'ha trobat una adreça electrònica</string>
+  <string name="result_geo">S\'han trobat coordenades geogràfiques</string>
+  <string name="result_isbn">S\'ha trobat un llibre</string>
+  <string name="result_product">S\'ha trobat un producte</string>
+  <string name="result_sms">S\'ha trobat una adreça SMS</string>
+  <string name="result_tel">S\'ha trobat un número de telèfon</string>
+  <string name="result_text">S\'ha trobat text pla</string>
+  <string name="result_uri">S\'ha trobat un URL</string>
+  <string name="result_wifi">S\'ha trobat configuració WLAN</string>
+  <string name="sbc_name">Cerca a Google Llibres</string>
+  <string name="wifi_changing_network">Sollicitant connexió a la xarxa\u2026</string>
+  <string name="wifi_ssid_label">Nom de la xarxa</string>
+  <string name="wifi_type_label">Tipus</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-cs/strings.xml b/src/java/PluginQR/res/values-cs/strings.xml
new file mode 100644
index 00000000..537a2031
--- /dev/null
+++ b/src/java/PluginQR/res/values-cs/strings.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_picker_name">Aplikace</string>
+  <string name="bookmark_picker_name">Záložky</string>
+  <string name="button_add_calendar">Přidat do kalendáře</string>
+  <string name="button_add_contact">Přidat kontakt</string>
+  <string name="button_book_search">Hledat knihu</string>
+  <string name="button_cancel">Zrušit</string>
+  <string name="button_custom_product_search">Vlastní vyhledávání</string>
+  <string name="button_dial">Číselník</string>
+  <string name="button_email">Poslat emailem</string>
+  <string name="button_get_directions">Získat nastavení</string>
+  <string name="button_mms">Poslat přes MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Otevřít prohlížeč</string>
+  <string name="button_product_search">Vyhledat produkt</string>
+  <string name="button_search_book_contents">Hledat obsah knihy</string>
+  <string name="button_share_app">Aplikace</string>
+  <string name="button_share_bookmark">Záložky</string>
+  <string name="button_share_by_email">Sdílet pomocí Email</string>
+  <string name="button_share_by_sms">Sdílet pomocí SMS</string>
+  <string name="button_share_clipboard">Schránka</string>
+  <string name="button_share_contact">Kontakty</string>
+  <string name="button_show_map">Ukázat na mapě</string>
+  <string name="button_sms">Poslat SMS</string>
+  <string name="button_web_search">Hledat na webu</string>
+  <string name="button_wifi">Připojení k síti</string>
+  <string name="contents_contact">Info kontaktu</string>
+  <string name="contents_email">Emailová adresa</string>
+  <string name="contents_location">Zeměpisné údaje</string>
+  <string name="contents_phone">Telefonní číslo</string>
+  <string name="contents_sms">SMS číslo</string>
+  <string name="contents_text">Ostatní</string>
+  <string name="history_clear_one_history_text">Vyčistit</string>
+  <string name="history_clear_text">Vyčistit historii</string>
+  <string name="history_email_title">Barcode Scanner historie</string>
+  <string name="history_empty">Prázdný</string>
+  <string name="history_empty_detail">Žádný čárový kód vyšetření byly zaznamenány ještě</string>
+  <string name="history_send">Poslat historii</string>
+  <string name="history_title">Historie</string>
+  <string name="menu_encode_mecard">Použití MECARD</string>
+  <string name="menu_encode_vcard">Použití vCard</string>
+  <string name="menu_help">Pomoc!</string>
+  <string name="menu_history">Historie</string>
+  <string name="menu_settings">Nastavení</string>
+  <string name="menu_share">Sdílet</string>
+  <string name="msg_bulk_mode_scanned">Bulk režimu: čárový kód naskenované a uložené</string>
+  <string name="msg_camera_framework_bug">Omlouváme se, fotoaparát má problém. Možná bude nutné restartovat zařízení</string>
+  <string name="msg_default_format">Formát</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Ahoj</string>
+  <string name="msg_default_status">Strefte se čtverečkem na čárový kód</string>
+  <string name="msg_default_time">Čas</string>
+  <string name="msg_default_type">Typ</string>
+  <string name="msg_encode_contents_failed">Nepodařilo se rozkódovat čárový kód z poskytnutých údajů.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Litujeme, požadovanou aplikaci nelze spustit. Čárový kód je nefunkční.</string>
+  <string name="msg_redirect">Přesměrování</string>
+  <string name="msg_sbc_book_not_searchable">Omlouváme se, tato kniha nelze nalézt.</string>
+  <string name="msg_sbc_failed">Omlouváme se, narazili jsme na problém.</string>
+  <string name="msg_sbc_no_page_returned">Stránka nenalezena.</string>
+  <string name="msg_sbc_page">Stránka</string>
+  <string name="msg_sbc_results">Výsledky</string>
+  <string name="msg_sbc_searching_book">Hledání knihy\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Snippet není k dispozici</string>
+  <string name="msg_share_explanation">Můžete sdílet čárový kód na vaší obrazovce a skenování, s jiným telefonem.</string>
+  <string name="msg_share_text">Nebo zadejte nějaký text</string>
+  <string name="msg_sure">Jste si jisti?</string>
+  <string name="msg_unmount_usb">Omlouváme se, karta SD není přístupná.</string>
+  <string name="preferences_actions_title">Byl nalezen čárový kód.\u2026</string>
+  <string name="preferences_auto_focus_title">Automatické zaostření</string>
+  <string name="preferences_bulk_mode_summary">Skenování více čárových kódú bez přerušení, vhodné na dávkové zpracování velkého množství čárových kódú</string>
+  <string name="preferences_bulk_mode_title">Dávkový režim skenování</string>
+  <string name="preferences_copy_to_clipboard_title">Kopírovat do schránky.</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Použijte: %s = obsah, %f = formát, %t = typ</string>
+  <string name="preferences_custom_product_search_title">Vlastní vyhledávání URL</string>
+  <string name="preferences_decode_1D_title">1D kódy</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR kódy</string>
+  <string name="preferences_device_bug_workarounds_title">Možná zástupná řešení chyb zařízení</string>
+  <string name="preferences_disable_continuous_focus_summary">Používejte pouze standardní zaostřování</string>
+  <string name="preferences_disable_continuous_focus_title">Soustavné zaměření</string>
+  <string name="preferences_disable_exposure_title">No expozice</string>
+  <string name="preferences_front_light_auto">Automatický</string>
+  <string name="preferences_front_light_off">Neaktivní</string>
+  <string name="preferences_front_light_on">Aktivní</string>
+  <string name="preferences_front_light_summary">Zlepšuje skenování při slabém osvětlení na některých telefonech, ale může způsobit oslnění. Nefunguje na všech telefonech.</string>
+  <string name="preferences_front_light_title">Použít světlo</string>
+  <string name="preferences_general_title">Hlavní nastavení</string>
+  <string name="preferences_invert_scan_summary">Skenování čárových kódů pro bílé na černém pozadí. Není k dispozici v některých zařízeních.</string>
+  <string name="preferences_invert_scan_title">Obrátit skenování</string>
+  <string name="preferences_name">Nastavení</string>
+  <string name="preferences_play_beep_title">Zvuky</string>
+  <string name="preferences_remember_duplicates_summary">Duplikáty čárových kódú v historii ukládat samostatně, nebo jako jeden čárový kód</string>
+  <string name="preferences_remember_duplicates_title">Pamatovat všechny duplikáty</string>
+  <string name="preferences_result_title">Výsledek nastavení</string>
+  <string name="preferences_scanning_title">Při skenování čárových kódů pro, dekódovat\u2026</string>
+  <string name="preferences_search_country">Hledání země</string>
+  <string name="preferences_supplemental_summary">Získat více informací o obsahu čárového kódu</string>
+  <string name="preferences_supplemental_title">Získat více informací</string>
+  <string name="preferences_try_bsplus">Zkuste Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Obohacen o nové funkce a rozhraní</string>
+  <string name="preferences_vibrate_title">Vibrace</string>
+  <string name="result_address_book">Našel jsem kontakt</string>
+  <string name="result_calendar">Našel jsem kalendář</string>
+  <string name="result_email_address">Našel jsem Email</string>
+  <string name="result_geo">Našel jsem Zeměpisné informace</string>
+  <string name="result_isbn">Našel jsem knihu</string>
+  <string name="result_product">Našel jsem produkt</string>
+  <string name="result_sms">Našel jsem SMS</string>
+  <string name="result_tel">Našel jsem telefoní číslo</string>
+  <string name="result_text">Našel jsem nějaký text</string>
+  <string name="result_uri">Našel jsem URL</string>
+  <string name="result_wifi">Nalezeno bezdrátová konfigurace</string>
+  <string name="sbc_name">Google Knihy hledání</string>
+  <string name="wifi_changing_network">Požadující připojení k síti\u2026</string>
+  <string name="wifi_ssid_label">Jméno sítě</string>
+  <string name="wifi_type_label">Typ</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-da/strings.xml b/src/java/PluginQR/res/values-da/strings.xml
new file mode 100644
index 00000000..cc2c3ff5
--- /dev/null
+++ b/src/java/PluginQR/res/values-da/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Applikationer</string>
+  <string name="bookmark_picker_name">Bogmærker</string>
+  <string name="button_add_calendar">Tilføj til kalendar</string>
+  <string name="button_add_contact">Tilføj kontaktperson</string>
+  <string name="button_book_search">Bogsøgning</string>
+  <string name="button_cancel">Annullér</string>
+  <string name="button_custom_product_search">Brugerdefineret søgning</string>
+  <string name="button_dial">Ring til nummeret</string>
+  <string name="button_email">Send e-mail</string>
+  <string name="button_get_directions">Få kørselsanvisninger</string>
+  <string name="button_mms">Send MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Åben browser</string>
+  <string name="button_product_search">Produktsøgning</string>
+  <string name="button_search_book_contents">Søg efter indhold</string>
+  <string name="button_share_app">Applikationer</string>
+  <string name="button_share_bookmark">Bogmærker</string>
+  <string name="button_share_by_email">Del via e-mail</string>
+  <string name="button_share_by_sms">Del via SMS</string>
+  <string name="button_share_clipboard">Udklipsholder</string>
+  <string name="button_share_contact">Kontakter</string>
+  <string name="button_show_map">Vis kort</string>
+  <string name="button_sms">Send SMS</string>
+  <string name="button_web_search">Internetsøgning</string>
+  <string name="button_wifi">Forbind til netværk</string>
+  <string name="contents_contact">Kontaktinfo</string>
+  <string name="contents_email">E-mailadresse</string>
+  <string name="contents_location">Geografiske koordinater</string>
+  <string name="contents_phone">Telefonnummer</string>
+  <string name="contents_sms">SMS-adresse</string>
+  <string name="contents_text">Almindelig tekst</string>
+  <string name="history_clear_one_history_text">Ryd</string>
+  <string name="history_clear_text">Ryd historik</string>
+  <string name="history_email_title">Barcode Scanner-historik</string>
+  <string name="history_empty">Tom</string>
+  <string name="history_empty_detail">Ingen stregkodescanninger er blevet registreret endnu</string>
+  <string name="history_send">Send historik</string>
+  <string name="history_title">Historik</string>
+  <string name="menu_encode_mecard">Brug MECARD</string>
+  <string name="menu_encode_vcard">Brug vCard</string>
+  <string name="menu_help">Hjælp</string>
+  <string name="menu_history">Historik</string>
+  <string name="menu_settings">Indstillinger</string>
+  <string name="menu_share">Del</string>
+  <string name="msg_bulk_mode_scanned">Massetilstand: stregkode scannet og gemt</string>
+  <string name="msg_camera_framework_bug">Beklager, Android-kameraet er stødt på et problem. Du skal muligvis genstarte enheden.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Hej</string>
+  <string name="msg_default_status">Placér en stregkode inden i firkanten for at aflæse den.</string>
+  <string name="msg_default_time">Tid</string>
+  <string name="msg_default_type">Type</string>
+  <string name="msg_encode_contents_failed">Kunne ikke indkode en stregkode fra oplysningerne givet.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Beklager, den ønskede applikation kunne ikke blive startet. Stregkodeindholdet er måsket ugyldigt.</string>
+  <string name="msg_redirect">Omdirigér</string>
+  <string name="msg_sbc_book_not_searchable">Beklager, denne bog er ikke søgbar.</string>
+  <string name="msg_sbc_failed">Beklager, søgningen er stødt på et problem.</string>
+  <string name="msg_sbc_no_page_returned">Ingen side returnerede</string>
+  <string name="msg_sbc_page">Side</string>
+  <string name="msg_sbc_results">Resultater</string>
+  <string name="msg_sbc_searching_book">Søger bog\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Uddragsvisning ikke tilgængelig</string>
+  <string name="msg_share_explanation">Du kan dele data ved at vise en stregkode på denne skærm, og derefter scanne den med en anden telefon.</string>
+  <string name="msg_share_text">Eller skriv noget tekst</string>
+  <string name="msg_sure">Er du sikker?</string>
+  <string name="msg_unmount_usb">Beklager, SD-kortet er ikke tilgængelig.</string>
+  <string name="preferences_actions_title">Når en stregkode er fundet\u2026</string>
+  <string name="preferences_auto_focus_title">Brug autofokus</string>
+  <string name="preferences_bulk_mode_summary">Scan og gem mange stregkoder uden afbrydelser</string>
+  <string name="preferences_bulk_mode_title">Massescanningstilstand</string>
+  <string name="preferences_copy_to_clipboard_title">Kopiér til udklipsholder</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Udskiftninger: %s = indhold, %f = format, %t = type</string>
+  <string name="preferences_custom_product_search_title">Brugerdefineret søge-URL</string>
+  <string name="preferences_decode_1D_title">Afkod 1D-stregkoder</string>
+  <string name="preferences_decode_Data_Matrix_title">Afkod Data Matrix</string>
+  <string name="preferences_decode_QR_title">Afkod QR-koder</string>
+  <string name="preferences_device_bug_workarounds_title">Device Bug Løsninger</string>
+  <string name="preferences_disable_continuous_focus_summary">Brug kun standard fokusindstilling</string>
+  <string name="preferences_disable_continuous_focus_title">Ingen løbende fokus</string>
+  <string name="preferences_disable_exposure_title">Ingen eksponering</string>
+  <string name="preferences_front_light_auto">Automatisk</string>
+  <string name="preferences_front_light_off">Inaktiv</string>
+  <string name="preferences_front_light_on">Aktiv</string>
+  <string name="preferences_front_light_summary">Forbedrer aflæsning i svagt lys på nogle telefoner, men kan medføre genskær. Virker ikke på alle telefoner.</string>
+  <string name="preferences_front_light_title">Brug frontlys</string>
+  <string name="preferences_general_title">Generelle indstillinger</string>
+  <string name="preferences_invert_scan_summary">Scan for hvide stregkoder på sort baggrund. Ikke tilgængelig på nogle enheder.</string>
+  <string name="preferences_invert_scan_title">Inverter scanning</string>
+  <string name="preferences_name">Indstillinger</string>
+  <string name="preferences_play_beep_title">Bip</string>
+  <string name="preferences_remember_duplicates_summary">Gem flere scanninger af de samme stregkoder i Historik</string>
+  <string name="preferences_remember_duplicates_title">Husk dubletter</string>
+  <string name="preferences_result_title">Resultatindstillinger</string>
+  <string name="preferences_scanning_title">Når der scannes efter stregkoder\u2026</string>
+  <string name="preferences_search_country">Søg efter land</string>
+  <string name="preferences_supplemental_summary">Prøv at få flere oplysninger om stregkodens indhold</string>
+  <string name="preferences_supplemental_title">Hent mere info</string>
+  <string name="preferences_try_bsplus">Prøv Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Forbedret med nye funktioner og grænseflade</string>
+  <string name="preferences_vibrate_title">Vibrér</string>
+  <string name="result_address_book">Kontaktinfo fundet</string>
+  <string name="result_calendar">Kalendarbegivenhed fundet</string>
+  <string name="result_email_address">E-mailadresse fundet</string>
+  <string name="result_geo">Geografiske koordinater fundet</string>
+  <string name="result_isbn">Bog fundet</string>
+  <string name="result_product">Produkt fundet</string>
+  <string name="result_sms">SMS-adresse fundet</string>
+  <string name="result_tel">Telefonnummer fundet</string>
+  <string name="result_text">Almindelig tekst fundet</string>
+  <string name="result_uri">URL fundet</string>
+  <string name="result_wifi">WLAN-forbindelse fundet</string>
+  <string name="sbc_name">Google Bøger-søgning</string>
+  <string name="wifi_changing_network">Anmoder om tilslutning til netværk\u2026</string>
+  <string name="wifi_ssid_label">Netværksnavn</string>
+  <string name="wifi_type_label">Type</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-de/strings.xml b/src/java/PluginQR/res/values-de/strings.xml
new file mode 100644
index 00000000..ef186162
--- /dev/null
+++ b/src/java/PluginQR/res/values-de/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Anwendungen</string>
+  <string name="bookmark_picker_name">Lesezeichen</string>
+  <string name="button_add_calendar">Termin hinzufügen</string>
+  <string name="button_add_contact">Kontakt hinzufügen</string>
+  <string name="button_book_search">Büchersuche</string>
+  <string name="button_cancel">Abbruch</string>
+  <string name="button_custom_product_search">Benutzersuche</string>
+  <string name="button_dial">Nummer wählen</string>
+  <string name="button_email">E-Mail senden</string>
+  <string name="button_get_directions">Route berechnen</string>
+  <string name="button_mms">MMS senden</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Browser öffnen</string>
+  <string name="button_product_search">Produktsuche</string>
+  <string name="button_search_book_contents">Buchinhalt durchsuchen</string>
+  <string name="button_share_app">Anwendung</string>
+  <string name="button_share_bookmark">Lesezeichen</string>
+  <string name="button_share_by_email">Als E-Mail weitergeben</string>
+  <string name="button_share_by_sms">Als SMS weitergeben</string>
+  <string name="button_share_clipboard">Zwischenablage</string>
+  <string name="button_share_contact">Kontakt</string>
+  <string name="button_show_map">Karte anzeigen</string>
+  <string name="button_sms">SMS senden</string>
+  <string name="button_web_search">Im Web suchen</string>
+  <string name="button_wifi">Mit diesem WLAN verbinden</string>
+  <string name="contents_contact">Kontaktinfo</string>
+  <string name="contents_email">E-Mail Adresse</string>
+  <string name="contents_location">Koordinaten</string>
+  <string name="contents_phone">Telefonnummer</string>
+  <string name="contents_sms">SMS Adresse</string>
+  <string name="contents_text">Text</string>
+  <string name="history_clear_one_history_text">Löschen</string>
+  <string name="history_clear_text">Verlauf löschen</string>
+  <string name="history_email_title">Barcode Scanner Verlauf</string>
+  <string name="history_empty">Leer</string>
+  <string name="history_empty_detail">Es wurden keine Barcodes aufgezeichnet.</string>
+  <string name="history_send">Verlauf senden</string>
+  <string name="history_title">Verlauf</string>
+  <string name="menu_encode_mecard">MECARD verwenden</string>
+  <string name="menu_encode_vcard">vCard verwenden</string>
+  <string name="menu_help">Hilfe</string>
+  <string name="menu_history">Verlauf</string>
+  <string name="menu_settings">Einstellungen</string>
+  <string name="menu_share">Senden</string>
+  <string name="msg_bulk_mode_scanned">Bulk-Modus: Barcode gescannt und gespeichert</string>
+  <string name="msg_camera_framework_bug">Mit der Android-Kamera ist leider ein Fehler aufgetreten. Es könnte sein, dass Sie das Gerät neu starten müssen.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metadaten</string>
+  <string name="msg_default_mms_subject">Hi</string>
+  <string name="msg_default_status">Positionieren Sie den Barcode innerhalb des Rechteckes.</string>
+  <string name="msg_default_time">Zeit</string>
+  <string name="msg_default_type">Typ</string>
+  <string name="msg_encode_contents_failed">Aus den Daten kann kein Barcode erzeugt werden.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Die gewünschte Applikation kann nicht geöffnet werden. Der Barcode könnte ungültig sein.</string>
+  <string name="msg_redirect">Umleiten</string>
+  <string name="msg_sbc_book_not_searchable">Dieses Buch kann nicht durchsucht werden.</string>
+  <string name="msg_sbc_failed">Bei der Suche ist ein Fehler aufgetreten.</string>
+  <string name="msg_sbc_no_page_returned">Keine Seite zurückgeliefert.</string>
+  <string name="msg_sbc_page">Seite</string>
+  <string name="msg_sbc_results">Ergebnisse</string>
+  <string name="msg_sbc_searching_book">Durchsuche Buch\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Textschnipsel nicht verfügbar.</string>
+  <string name="msg_share_explanation">Sie können Daten weitergeben, indem Sie einen Barcode auf Ihrem Bildschirm erzeugen und mit einem anderen Handy einscannen.</string>
+  <string name="msg_share_text">Oder geben Sie hier einen Text ein</string>
+  <string name="msg_sure">Sind Sie sicher?</string>
+  <string name="msg_unmount_usb">Leider kann nicht auf die SD-Karte zugegriffen werden.</string>
+  <string name="preferences_actions_title">Wenn ein Barcode erkannt wurde\u2026</string>
+  <string name="preferences_auto_focus_title">Autofokus verwenden</string>
+  <string name="preferences_bulk_mode_summary">Scannt und speichert mehrere Barcodes nacheinander</string>
+  <string name="preferences_bulk_mode_title">Massenscan</string>
+  <string name="preferences_copy_to_clipboard_title">In die Zwischenablage kopieren</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Platzhalter: %s = Inhalt, %f = Format, %t = Typ</string>
+  <string name="preferences_custom_product_search_title">Eigene Such-URL</string>
+  <string name="preferences_decode_1D_title">1D Barcodes</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR Codes</string>
+  <string name="preferences_device_bug_workarounds_title">Geräteabhängige Problemumgehung</string>
+  <string name="preferences_disable_continuous_focus_summary">Nur Standard-Fokus-Modus verwenden</string>
+  <string name="preferences_disable_continuous_focus_title">Kein kontinuierlicher Fokus</string>
+  <string name="preferences_disable_exposure_title">Keine Belichtungsmessung </string>
+  <string name="preferences_front_light_auto">Automatisch</string>
+  <string name="preferences_front_light_off">Aus</string>
+  <string name="preferences_front_light_on">Ein</string>
+  <string name="preferences_front_light_summary">Verbessert bei einigen Mobiltelefonen das Scannen bei schwachem Licht, kann aber Überbelichtung verursachen. Funktioniert nicht mit allen Handys.</string>
+  <string name="preferences_front_light_title">Foto LED einschalten</string>
+  <string name="preferences_general_title">Allgemeine Einstellungen</string>
+  <string name="preferences_invert_scan_summary">Für weiße Barcodes auf schwarzem Hintergrund. Nicht bei allen Geräten verfügbar.</string>
+  <string name="preferences_invert_scan_title">Negativ-Scan</string>
+  <string name="preferences_name">Einstellungen</string>
+  <string name="preferences_play_beep_title">Piepsen</string>
+  <string name="preferences_remember_duplicates_summary">Speichern mehrerer Scans des gleichen Barcodes im Verlauf</string>
+  <string name="preferences_remember_duplicates_title">Duplikate speichern</string>
+  <string name="preferences_result_title">Ergebnis-Einstellungen</string>
+  <string name="preferences_scanning_title">Beim Scannen von Barcodes, dekodieren\u2026</string>
+  <string name="preferences_search_country">Land für die Suche</string>
+  <string name="preferences_supplemental_summary">Erfahren Sie mehr über den Barcode</string>
+  <string name="preferences_supplemental_title">Weitere Informationen abrufen</string>
+  <string name="preferences_try_bsplus">Barcode Scanner+ testen</string>
+  <string name="preferences_try_bsplus_summary">Mit mehr Funktionen und neuer Oberfläche.</string>
+  <string name="preferences_vibrate_title">Vibrieren</string>
+  <string name="result_address_book">Kontakt gefunden</string>
+  <string name="result_calendar">Termin gefunden</string>
+  <string name="result_email_address">E-Mail-Adresse gefunden</string>
+  <string name="result_geo">Koordinaten gefunden</string>
+  <string name="result_isbn">Buch gefunden</string>
+  <string name="result_product">Produkt gefunden</string>
+  <string name="result_sms">SMS-Adresse gefunden</string>
+  <string name="result_tel">Telefonnummer gefunden</string>
+  <string name="result_text">Text gefunden</string>
+  <string name="result_uri">URL gefunden</string>
+  <string name="result_wifi">WLAN-Konfiguration gefunden</string>
+  <string name="sbc_name">Google Book Search</string>
+  <string name="wifi_changing_network">Verbindung zum Netzwerk anfordern\u2026</string>
+  <string name="wifi_ssid_label">WLAN-Name:</string>
+  <string name="wifi_type_label">Verschlüsselung:</string>
+</resources>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/values-el/strings.xml b/src/java/PluginQR/res/values-el/strings.xml
new file mode 100644
index 00000000..2cdc0c35
--- /dev/null
+++ b/src/java/PluginQR/res/values-el/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Εφαρμογές</string>
+  <string name="bookmark_picker_name">Σελιδοδείκτες</string>
+  <string name="button_add_calendar">Προσθήκη στο ημερολόγιο</string>
+  <string name="button_add_contact">Προσθήκη στις επαφές</string>
+  <string name="button_book_search">Αναζήτηση βιβλίων</string>
+  <string name="button_cancel">Ακύρωση</string>
+  <string name="button_custom_product_search">Σύνθετη αναζήτηση</string>
+  <string name="button_dial">Κλήση αριθμού</string>
+  <string name="button_email">Αποστολή email</string>
+  <string name="button_get_directions">Λάβετε κατευθύνσεις</string>
+  <string name="button_mms">Αποστολή MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Άνοιγμα browser</string>
+  <string name="button_product_search">Αναζήτηση προϊόντων</string>
+  <string name="button_search_book_contents">Αναζήτηση περιεχομένων</string>
+  <string name="button_share_app">Εφαρμογή</string>
+  <string name="button_share_bookmark">Σελιδοδείκτης</string>
+  <string name="button_share_by_email">Μοιράσου με email</string>
+  <string name="button_share_by_sms">Μοιράσου με SMS</string>
+  <string name="button_share_clipboard">Πρόχειρο</string>
+  <string name="button_share_contact">Επαφή</string>
+  <string name="button_show_map">Δείξε χάρτη</string>
+  <string name="button_sms">Στείλε SMS</string>
+  <string name="button_web_search">Αναζήτηση ιστού</string>
+  <string name="button_wifi">Σύνδεση σε Δίκτυο</string>
+  <string name="contents_contact">Πληροφορίες επαφής</string>
+  <string name="contents_email">Διεύθυνση email</string>
+  <string name="contents_location">Γεωγραφικές συντεταγμένες</string>
+  <string name="contents_phone">Τηλέφωνο</string>
+  <string name="contents_sms">Διεύθνση SMS</string>
+  <string name="contents_text">Απλό κείμενο</string>
+  <string name="history_clear_one_history_text">Διαγραφή</string>
+  <string name="history_clear_text">Διαγραφή ιστορικού</string>
+  <string name="history_email_title">Ιστορικό Barcode Scanner</string>
+  <string name="history_empty">Κενό</string>
+  <string name="history_empty_detail">Δεν έχουν καταγραφεί σαρώσεις barcode</string>
+  <string name="history_send">Αποστολή ιστορικού</string>
+  <string name="history_title">Ιστορικό</string>
+  <string name="menu_encode_mecard">Χρησιμοποιήστε MECARD</string>
+  <string name="menu_encode_vcard">Χρησιμοποιήστε vCard</string>
+  <string name="menu_help">Βοήθεια</string>
+  <string name="menu_history">Ιστορικό</string>
+  <string name="menu_settings">Ρυθμίσεις</string>
+  <string name="menu_share">Κοινή χρήση</string>
+  <string name="msg_bulk_mode_scanned">Μαζική λειτουργία: barcode σκαναρίστηκε και αποθηκεύτηκε</string>
+  <string name="msg_camera_framework_bug">Συγνώμη, προέκυψε ένα πρόβλημα με την κάμερα. Ίσως χρειαστεί να επανεκιννήσετε τη συσκευή.</string>
+  <string name="msg_default_format">Διαμόρφωση</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Γεια</string>
+  <string name="msg_default_status">Τοποθετήστε ένα barcode μέσα στο πλαίσιο για να το σκανάρετε.</string>
+  <string name="msg_default_time">Ωρα</string>
+  <string name="msg_default_type">Τύπος</string>
+  <string name="msg_encode_contents_failed">Δεν γίνεται να παραχθεί barcode από αυτά τα δεδομένα.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Συγνώμη, η ζητούμενη εφαρμογή δεν μπορεί να εκιννηθεί. Τα δεδομληνα του barcode ίσως δεν είναι έγκυρα.</string>
+  <string name="msg_redirect">Ανακατεύθυνση</string>
+  <string name="msg_sbc_book_not_searchable">Συγνώμη, αυτό το βιβλίο δεν βρέθηκε.</string>
+  <string name="msg_sbc_failed">Συγνώμη, η αναζήτηση παρουσίασε πρόβλημα.</string>
+  <string name="msg_sbc_no_page_returned">Δεν βρέθηκε σελίδα</string>
+  <string name="msg_sbc_page">Σελίδα</string>
+  <string name="msg_sbc_results">Αποτελέσματα</string>
+  <string name="msg_sbc_searching_book">Άναζήτηση βιβλίου\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Απόσπασμα μη διαθέσιμο</string>
+  <string name="msg_share_explanation">Μπορείς να μοιραστείς δεδομένα εμφανίζοντας ένα barcode στην οθόνη σου και σκανάροντάς το με ένα άλλο κινητό.</string>
+  <string name="msg_share_text">Ή πληκτολογήστε εδώ κείμενο και πατήστε Enter</string>
+  <string name="msg_sure">Είσαι σίγουρος;</string>
+  <string name="msg_unmount_usb">Συγνώμη, η κάρτα SD δεν είναι προσβάσιμη.</string>
+  <string name="preferences_actions_title">Όταν ένα barcode ανιχνεύεται\u2026</string>
+  <string name="preferences_auto_focus_title">Χρησιμοποιήστε την αυτόματη εστίαση</string>
+  <string name="preferences_bulk_mode_summary">Σκανάρετε και αποθηκεύστε συνεχόμενα πολλά barcodes</string>
+  <string name="preferences_bulk_mode_title">Λειτουργία μαζικού σκαναρίσματος</string>
+  <string name="preferences_copy_to_clipboard_title">Αντιγραφή στο πρόχειρο</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Αντικαταστάσεις: %s = περιεχόμενο, %f = μορφή, %t = τύπος</string>
+  <string name="preferences_custom_product_search_title">Σύνθετη αναζήτηση</string>
+  <string name="preferences_decode_1D_title">1D barcodes</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR Codes</string>
+  <string name="preferences_device_bug_workarounds_title">Λύσεις Bug συσκευής</string>
+  <string name="preferences_disable_continuous_focus_summary">Χρησιμοποιείτε μόνο τυπική λειτουργία εστίασης</string>
+  <string name="preferences_disable_continuous_focus_title">Δεν συνεχής εστίαση</string>
+  <string name="preferences_disable_exposure_title">Δεν έκθεση</string>
+  <string name="preferences_front_light_auto">Αυτόματο</string>
+  <string name="preferences_front_light_off">Αδρανής</string>
+  <string name="preferences_front_light_on">Ενεργός</string>
+  <string name="preferences_front_light_summary">Βελτιώνει το σκανάρισμα με χαμηλο φωτισμό σε μερικά κινητά, ίσως όμως προκαλέσει λάμψη. Δουλεύει σε μερικά κινητά.</string>
+  <string name="preferences_front_light_title">Χρήση μπροστινού φακού</string>
+  <string name="preferences_general_title">Γενικές ρυθμίσεις</string>
+  <string name="preferences_invert_scan_summary">Σάρωση για τη λευκή barcodes σε μαύρο φόντο. Δεν διατίθεται σε ορισμένες συσκευές.</string>
+  <string name="preferences_invert_scan_title">Αντιστροφή της σάρωσης</string>
+  <string name="preferences_name">Ρυθμίσεις</string>
+  <string name="preferences_play_beep_title">Μπιπ</string>
+  <string name="preferences_remember_duplicates_summary">Αποθήκευση πολλαπλών σκαναρισμάτων του ίδιου barcode στο ιστορικό</string>
+  <string name="preferences_remember_duplicates_title">Απομνημόνευση διπλότυπων</string>
+  <string name="preferences_result_title">Ρυθμίσεις αποτελεσμάτων</string>
+  <string name="preferences_scanning_title">Όταν σκανάρεις barcodes, ψάχνε για\u2026</string>
+  <string name="preferences_search_country">Χώρα Αναζήτησης</string>
+  <string name="preferences_supplemental_summary">Προσπάθησε να βρείς περισσότερες πληροφορίες για τα περιεχόμενα του barcode</string>
+  <string name="preferences_supplemental_title">Αναζήτηση για επιπλέον πληροφορίες</string>
+  <string name="preferences_try_bsplus">Δοκιμάστε Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Ενισχυμένη με νέα χαρακτηριστικά και διασύνδεση</string>
+  <string name="preferences_vibrate_title">Δόνηση</string>
+  <string name="result_address_book">Βρέθηκαν πληροφορίες επαφής</string>
+  <string name="result_calendar">Βρέθηκε συμβάν ημερολογίου</string>
+  <string name="result_email_address">Βρέθηκε email</string>
+  <string name="result_geo">Βρέθηκαν γεωγραφικές συντεταγμένες</string>
+  <string name="result_isbn">Βρέθηκε βιβλίο</string>
+  <string name="result_product">Βρέθηκε προϊόν</string>
+  <string name="result_sms">Βρέθηκε διεύθυνση SMS</string>
+  <string name="result_tel">Βρέθηκε τηλέφωνο</string>
+  <string name="result_text">Βρέθηκε κείμενο</string>
+  <string name="result_uri">Βρέθηκε ηλ. διεύθυνση</string>
+  <string name="result_wifi">Βρέθηκαν ρυθμίσεις Wi-Fi</string>
+  <string name="sbc_name">Αναζήτηση βιβλίων Google</string>
+  <string name="wifi_changing_network">Αίτηση σύνδεσης με το δίκτυο\u2026</string>
+  <string name="wifi_ssid_label">Όνομα Δικτύου</string>
+  <string name="wifi_type_label">Τύπος</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-es/strings.xml b/src/java/PluginQR/res/values-es/strings.xml
new file mode 100644
index 00000000..9ed5ee62
--- /dev/null
+++ b/src/java/PluginQR/res/values-es/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Aplicaciones</string>
+  <string name="bookmark_picker_name">Marcadores</string>
+  <string name="button_add_calendar">Añadir al calendario</string>
+  <string name="button_add_contact">Añadir contacto</string>
+  <string name="button_book_search">Búsqueda de libros</string>
+  <string name="button_cancel">Cancelar</string>
+  <string name="button_custom_product_search">Búsqueda personalizada</string>
+  <string name="button_dial">Marcar número</string>
+  <string name="button_email">Enviar correo electrónico</string>
+  <string name="button_get_directions">Obtener direcciones</string>
+  <string name="button_mms">Enviar MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Abrir navegador</string>
+  <string name="button_product_search">Búsqueda de productos</string>
+  <string name="button_search_book_contents">Buscar contenido del libro</string>
+  <string name="button_share_app">Aplicación</string>
+  <string name="button_share_bookmark">Marcador</string>
+  <string name="button_share_by_email">Compartir por correo electrónico</string>
+  <string name="button_share_by_sms">Compartir por SMS</string>
+  <string name="button_share_clipboard">Portapapeles</string>
+  <string name="button_share_contact">Contacto</string>
+  <string name="button_show_map">Mostrar mapa</string>
+  <string name="button_sms">Enviar SMS</string>
+  <string name="button_web_search">Búsqueda Web</string>
+  <string name="button_wifi">Conectarse a la red</string>
+  <string name="contents_contact">Información de contacto</string>
+  <string name="contents_email">Dirección de correo electrónico</string>
+  <string name="contents_location">Coordenadas geográficas</string>
+  <string name="contents_phone">Número de teléfono</string>
+  <string name="contents_sms">Dirección SMS</string>
+  <string name="contents_text">Texto</string>
+  <string name="history_clear_one_history_text">Borrar</string>
+  <string name="history_clear_text">Borrar historial</string>
+  <string name="history_email_title">Historial de Escáner de código de barras</string>
+  <string name="history_empty">Vacío</string>
+  <string name="history_empty_detail">Ningún escanea de códigos de barras se han registrado aún</string>
+  <string name="history_send">Enviar historial</string>
+  <string name="history_title">Historial</string>
+  <string name="menu_encode_mecard">Usar MECARD</string>
+  <string name="menu_encode_vcard">Usar vCard</string>
+  <string name="menu_help">Ayuda</string>
+  <string name="menu_history">Historial</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_share">Compartir</string>
+  <string name="msg_bulk_mode_scanned">Modo Masivo: código de barras escaneado y guardado</string>
+  <string name="msg_camera_framework_bug">Lo sentimos, la cámara de Android ha encontrado un problema. Es posible que necesite reiniciar el dispositivo.</string>
+  <string name="msg_default_format">Formato</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Hola</string>
+  <string name="msg_default_status">Coloque un código de barras en el interior del rectángulo del visor para escanear.</string>
+  <string name="msg_default_time">Tiempo</string>
+  <string name="msg_default_type">Tipo</string>
+  <string name="msg_encode_contents_failed">No se pudo codificar un código de barras a partir de los datos facilitados.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Lo sentimos, la aplicación solicitada no pudo ser lanzada. El contenido de código de barras puede ser inválida.</string>
+  <string name="msg_redirect">Redirigir</string>
+  <string name="msg_sbc_book_not_searchable">Lo sentimos, no se puede buscar en este libro.</string>
+  <string name="msg_sbc_failed">Lo sentimos, la búsqueda ha detectado un problema.</string>
+  <string name="msg_sbc_no_page_returned">Página no encontrada</string>
+  <string name="msg_sbc_page">Página</string>
+  <string name="msg_sbc_results">Resultados</string>
+  <string name="msg_sbc_searching_book">Buscando libro\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Fragmentos no están disponibles</string>
+  <string name="msg_share_explanation">Usted puede compartir los datos mostrando un código de barras en su pantalla y escanearlo con otro teléfono.</string>
+  <string name="msg_share_text">O escriba algún texto y presione Enter</string>
+  <string name="msg_sure">¿Está seguro?</string>
+  <string name="msg_unmount_usb">Lo sentimos, la tarjeta SD no está accesible.</string>
+  <string name="preferences_actions_title">Cuando encuentra un código de barras\u2026</string>
+  <string name="preferences_auto_focus_title">Utilizar el enfoque automático</string>
+  <string name="preferences_bulk_mode_summary">Escanear y guardar muchos códigos de barras de forma continua</string>
+  <string name="preferences_bulk_mode_title">Modo masivo de escaneo</string>
+  <string name="preferences_copy_to_clipboard_title">Copiar al portapapeles</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Sustituciones: %s = contenido, %f = formato, %t = tipo</string>
+  <string name="preferences_custom_product_search_title">Búsqueda de productos con URL personalizada</string>
+  <string name="preferences_decode_1D_title">Códigos de barras 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">Códigos QR</string>
+  <string name="preferences_device_bug_workarounds_title">Soluciones provisionales para dispositivos con errores</string>
+  <string name="preferences_disable_continuous_focus_summary">Utilice sólo el modo de enfoque estándar</string>
+  <string name="preferences_disable_continuous_focus_title">No enfoque continuo</string>
+  <string name="preferences_disable_exposure_title">No exposición</string>
+  <string name="preferences_front_light_auto">Automático</string>
+  <string name="preferences_front_light_off">Inactivo</string>
+  <string name="preferences_front_light_on">Activo</string>
+  <string name="preferences_front_light_summary">Mejora la exploración en condiciones de poca luz en algunos teléfonos, pero puede causar deslumbramiento. No funciona en todos los teléfonos.</string>
+  <string name="preferences_front_light_title">Utilizar luz delantera</string>
+  <string name="preferences_general_title">Configuración general</string>
+  <string name="preferences_invert_scan_summary">Escanear códigos de barras blancas sobre fondo negro. No disponible en algunos dispositivos.</string>
+  <string name="preferences_invert_scan_title">Invertir exploración</string>
+  <string name="preferences_name">Configuración</string>
+  <string name="preferences_play_beep_title">Bip</string>
+  <string name="preferences_remember_duplicates_summary">Almacenar múltiples escáneres del mismo código de barras en el Historial.</string>
+  <string name="preferences_remember_duplicates_title">Recuerde duplicados</string>
+  <string name="preferences_result_title">Configuración de resultados</string>
+  <string name="preferences_scanning_title">Al escanear códigos de barras, descodificar\u2026</string>
+  <string name="preferences_search_country">Buscar país</string>
+  <string name="preferences_supplemental_summary">Trata de recuperar más información sobre el contenido del código de barras.</string>
+  <string name="preferences_supplemental_title">Recuperar más información</string>
+  <string name="preferences_try_bsplus">Trate Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Mejorado con nuevas características y la interfaz de</string>
+  <string name="preferences_vibrate_title">Vibrar</string>
+  <string name="result_address_book">Información de contacto encontrada</string>
+  <string name="result_calendar">Evento de calendario encontrado</string>
+  <string name="result_email_address">Dirección de correo electrónico encontrado</string>
+  <string name="result_geo">Coordenadas geográficas encontradas</string>
+  <string name="result_isbn">Libro encontrado</string>
+  <string name="result_product">Producto encontrado</string>
+  <string name="result_sms">Dirección de SMS encontrado</string>
+  <string name="result_tel">Número de teléfono encontrado</string>
+  <string name="result_text">Texto encontrado</string>
+  <string name="result_uri">URL encontrada</string>
+  <string name="result_wifi">Configuración de WLAN encontrada</string>
+  <string name="sbc_name">Búsqueda de libros de Google</string>
+  <string name="wifi_changing_network">Solicitando conexión a la red\u2026</string>
+  <string name="wifi_ssid_label">Nombre de red</string>
+  <string name="wifi_type_label">Tipo</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-eu/strings.xml b/src/java/PluginQR/res/values-eu/strings.xml
new file mode 100644
index 00000000..16b5d06a
--- /dev/null
+++ b/src/java/PluginQR/res/values-eu/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">Barra-kode Eskanerra</string>
+  <string name="app_picker_name">Aplikazioak</string>
+  <string name="bookmark_picker_name">Laster-markak</string>
+  <string name="button_add_calendar">Gehitu egutegian</string>
+  <string name="button_add_contact">Gehitu kontaktua</string>
+  <string name="button_book_search">Bilatu liburua</string>
+  <string name="button_cancel">Utzi</string>
+  <string name="button_custom_product_search">Bilaketa pertsonalizatua</string>
+  <string name="button_dial">Markatu zenbakia</string>
+  <string name="button_email">Bidali e-posta</string>
+  <string name="button_get_directions">Lortu jarraibideak</string>
+  <string name="button_mms">Bidali MMS-a</string>
+  <string name="button_ok">Ados</string>
+  <string name="button_open_browser">Ireki arakatzailea</string>
+  <string name="button_product_search">Produktu bilaketa</string>
+  <string name="button_search_book_contents">Bilatu edukiak</string>
+  <string name="button_share_app">Aplikazioa</string>
+  <string name="button_share_bookmark">Laster-marka</string>
+  <string name="button_share_by_email">Partekatu e-posta bidez</string>
+  <string name="button_share_by_sms">Partekatu SMS bidez</string>
+  <string name="button_share_clipboard">Arbela</string>
+  <string name="button_share_contact">Kontaktua</string>
+  <string name="button_show_map">Erakutsi mapa</string>
+  <string name="button_sms">Bidali SMS-a</string>
+  <string name="button_web_search">Web bilaketa</string>
+  <string name="button_wifi">Konektatu sarera</string>
+  <string name="contents_contact">Kontaktuaren informazioa</string>
+  <string name="contents_email">E-posta helbidea</string>
+  <string name="contents_location">Koordenatu geografikoak</string>
+  <string name="contents_phone">Telefono zenbakia</string>
+  <string name="contents_sms">SMS helbidea</string>
+  <string name="contents_text">Testu laua</string>
+  <string name="history_clear_one_history_text">Garbitu</string>
+  <string name="history_clear_text">Garbitu historia</string>
+  <string name="history_email_title">Barra-kode Eskanerraren historia</string>
+  <string name="history_empty">Hutsik</string>
+  <string name="history_empty_detail">Ez da inoiz barra-koderik gorde</string>
+  <string name="history_send">Bidali historia</string>
+  <string name="history_title">Historia</string>
+  <string name="menu_encode_mecard">Erabili MECARD</string>
+  <string name="menu_encode_vcard">Erabili vCard</string>
+  <string name="menu_help">Laguntza</string>
+  <string name="menu_history">Historia</string>
+  <string name="menu_settings">Ezarpenak</string>
+  <string name="menu_share">Partekatu</string>
+  <string name="msg_bulk_mode_scanned">Handizkako modua: barra-kodea eskaneatuta eta gordeta</string>
+  <string name="msg_camera_framework_bug">Barkatu, Android kamerak arazo bat izan du. Behar bada gailua berrabiarazi beharko duzu.</string>
+  <string name="msg_default_format">Formatua</string>
+  <string name="msg_default_meta">Metadatuak</string>
+  <string name="msg_default_mms_subject">Kaixo</string>
+  <string name="msg_default_status">Kokatu barra-kode bat laukizuzenaren barruan eskaneatzeko.</string>
+  <string name="msg_default_time">Denbora</string>
+  <string name="msg_default_type">Mota</string>
+  <string name="msg_encode_contents_failed">Ezin izan da barra-kode bat kodetu emandako datuetatik.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Barkatu, eskatutako aplikazioa ezin izan da abiarazi. Behar bada barra-kodearen edukiak baliogabeak dira.</string>
+  <string name="msg_redirect">Berbideratu</string>
+  <string name="msg_sbc_book_not_searchable">Barkatu, liburu honetan ezin da bilaketarik egin.</string>
+  <string name="msg_sbc_failed">Barkatu, bilaketak arazo bat izan du.</string>
+  <string name="msg_sbc_no_page_returned">Ez da orririk itzuli</string>
+  <string name="msg_sbc_page">Orria</string>
+  <string name="msg_sbc_results">Emaitzak</string>
+  <string name="msg_sbc_searching_book">Liburua arakatzen\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Lagina ez dago eskuragarri</string>
+  <string name="msg_share_explanation">Datuak parteka ditzakezu zure pantailan barra-kode bat bistaratu eta beste telefono batekin eskaneatuz.</string>
+  <string name="msg_share_text">Edo idatzi zerbait eta sakatu Enter</string>
+  <string name="msg_sure">Ziur zaude?</string>
+  <string name="msg_unmount_usb">Barkatu, SD txartela ez dago eskuragarri.</string>
+  <string name="preferences_actions_title">Barra kode bat aurkitzean\u2026</string>
+  <string name="preferences_auto_focus_title">Erabili auto foku</string>
+  <string name="preferences_bulk_mode_summary">Eskaneatu eta gorde hainbat barra-kode jarraian</string>
+  <string name="preferences_bulk_mode_title">Handizkako eskaneatze modua</string>
+  <string name="preferences_copy_to_clipboard_title">Kopiatu arbelera</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Ordezkapenak: %s = edukiak, %f = formatua, %t = mota</string>
+  <string name="preferences_custom_product_search_title">Bilaketa URL pertsonalizatua</string>
+  <string name="preferences_decode_1D_title">1D barra-kodeak</string>
+  <string name="preferences_decode_Data_Matrix_title">Datu Matrizeak</string>
+  <string name="preferences_decode_QR_title">QR Kodeak</string>
+  <string name="preferences_device_bug_workarounds_title">Gailuak Bug konponbidea</string>
+  <string name="preferences_disable_continuous_focus_summary">Erabili estandarrean soilik fokuaren modua</string>
+  <string name="preferences_disable_continuous_focus_title">Etengabeko foku No</string>
+  <string name="preferences_disable_exposure_title">Esposizio No</string>
+  <string name="preferences_front_light_auto">Automatikoa</string>
+  <string name="preferences_front_light_off">Ezgaitutako</string>
+  <string name="preferences_front_light_on">Aktiboak</string>
+  <string name="preferences_front_light_summary">Eskaneatzea hobetzen du zenbait telefonotan argiztapena txikia denean, baina distirak eragin ditzake. Ez du telefono guztietan funtzionatzen.</string>
+  <string name="preferences_front_light_title">Erabili aurreko argia</string>
+  <string name="preferences_general_title">Ezarpen orokorrak</string>
+  <string name="preferences_invert_scan_summary">Atzeko plano beltzean kodeak zuri eskaneatzeko. Zenbait gailuk ez dago eskuragarri.</string>
+  <string name="preferences_invert_scan_title">Alderantzikatu eskaneatzeko</string>
+  <string name="preferences_name">Ezarpenak</string>
+  <string name="preferences_play_beep_title">Soinu-seinalea</string>
+  <string name="preferences_remember_duplicates_summary">Gorde barra-kode beraren hainbat eskaneatze Historian</string>
+  <string name="preferences_remember_duplicates_title">Gogoratu errepikatuak</string>
+  <string name="preferences_result_title">Emaitzen ezarpenak</string>
+  <string name="preferences_scanning_title">Barra-kodeak eskaneatzean, deskodetu\u2026</string>
+  <string name="preferences_search_country">Bilatu herrialdea</string>
+  <string name="preferences_supplemental_summary">Saiatu barra-kodearen edukiei buruzko informazio gehiago eskuratzen</string>
+  <string name="preferences_supplemental_title">Eskuratu informazio gehiago</string>
+  <string name="preferences_try_bsplus">Saiatu Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Ezaugarri berri eta interfaze indartu</string>
+  <string name="preferences_vibrate_title">Bibratu</string>
+  <string name="result_address_book">Kontaktu-informazioa aurkitu da</string>
+  <string name="result_calendar">Egutegiko gertaera aurkitu da</string>
+  <string name="result_email_address">E-posta helbidea aurkitu da</string>
+  <string name="result_geo">Koordenatu geografikoak aurkitu dira</string>
+  <string name="result_isbn">Liburua aurkitu da</string>
+  <string name="result_product">Produktua aurkitu da</string>
+  <string name="result_sms">SMS helbidea aurkitu da</string>
+  <string name="result_tel">Telefono zenbakia aurkitu da</string>
+  <string name="result_text">Testu laua aurkitu da</string>
+  <string name="result_uri">URL-a aurkitu da</string>
+  <string name="result_wifi">WLAN Konfigurazioa aurkitu da</string>
+  <string name="sbc_name">Google Book Bilaketa</string>
+  <string name="wifi_changing_network">Sarerako konexioa eskatzen\u2026</string>
+  <string name="wifi_ssid_label">Sarearen Izena</string>
+  <string name="wifi_type_label">Mota</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-fi/strings.xml b/src/java/PluginQR/res/values-fi/strings.xml
new file mode 100644
index 00000000..4d29746f
--- /dev/null
+++ b/src/java/PluginQR/res/values-fi/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Ohjelmat</string>
+  <string name="bookmark_picker_name">Kirjanmerkit</string>
+  <string name="button_add_calendar">Lisää kalenteriin</string>
+  <string name="button_add_contact">Lisää yhteystieto</string>
+  <string name="button_book_search">Kirjahaku</string>
+  <string name="button_cancel">Peruuta</string>
+  <string name="button_custom_product_search">Mukautettu haku</string>
+  <string name="button_dial">Soita numeroon</string>
+  <string name="button_email">Lähetä sähköpostia</string>
+  <string name="button_get_directions">Hae ajo-ohjeet</string>
+  <string name="button_mms">Lähetä multimediaviesti</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Avaa selain</string>
+  <string name="button_product_search">Tuotehaku</string>
+  <string name="button_search_book_contents">Hae kirjan sisältö</string>
+  <string name="button_share_app">Ohjelma</string>
+  <string name="button_share_bookmark">Kirjanmerkki</string>
+  <string name="button_share_by_email">Jaa sähköpostilla</string>
+  <string name="button_share_by_sms">Jaa tekstiviestillä</string>
+  <string name="button_share_clipboard">Leikepöytä</string>
+  <string name="button_share_contact">Kontakti</string>
+  <string name="button_show_map">Näytä kartta</string>
+  <string name="button_sms">Lähetä tekstiviesti</string>
+  <string name="button_web_search">Haku netistä</string>
+  <string name="button_wifi">Yhdistä verkkoon</string>
+  <string name="contents_contact">Yhteystiedot</string>
+  <string name="contents_email">Sähköpostiosoite</string>
+  <string name="contents_location">Karttakoordinaatit</string>
+  <string name="contents_phone">Puhelinnumero</string>
+  <string name="contents_sms">Tekstiviestin osoite</string>
+  <string name="contents_text">Teksti</string>
+  <string name="history_clear_one_history_text">Tyhjennä</string>
+  <string name="history_clear_text">Tyhjennä historia</string>
+  <string name="history_email_title">Viivakoodien historia</string>
+  <string name="history_empty">Tyhjä</string>
+  <string name="history_empty_detail">Ei tallennettuja viivakoodeja</string>
+  <string name="history_send">Lähetä historia</string>
+  <string name="history_title">Historia</string>
+  <string name="menu_encode_mecard">Käytä MECARD:ia</string>
+  <string name="menu_encode_vcard">Käytä vCard:ia</string>
+  <string name="menu_help">Ohje</string>
+  <string name="menu_history">Historia</string>
+  <string name="menu_settings">Asetukset</string>
+  <string name="menu_share">Jaa</string>
+  <string name="msg_bulk_mode_scanned">Toistotila: viivakoodi luettu ja tallennetttu</string>
+  <string name="msg_camera_framework_bug">Valitettavasti Androidin kameran toimiinta häiriintyi. Joudut ehkä käynnistämään laitteen uudelleen.</string>
+  <string name="msg_default_format">Muoto</string>
+  <string name="msg_default_meta">Metatiedot</string>
+  <string name="msg_default_mms_subject">Hei</string>
+  <string name="msg_default_status">Aseta viivakoodi neliön sisälle skannataksesi sen.</string>
+  <string name="msg_default_time">Aika</string>
+  <string name="msg_default_type">Tyyppi</string>
+  <string name="msg_encode_contents_failed">Viivakoodia ei voitu muodostaa annetusta datasta.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Valitettavasti pyydettyä sovellusta ei voitu käynnistää. Viivakoodin sisältö voi olla virheellinen.</string>
+  <string name="msg_redirect">Uudelleenohjaus</string>
+  <string name="msg_sbc_book_not_searchable">Valitettavasti tämä kirja ei ole haettavissa.</string>
+  <string name="msg_sbc_failed">Valitettavasti haussa tapahtui virhe.</string>
+  <string name="msg_sbc_no_page_returned">Sivua ei löydy/ei vastausta</string>
+  <string name="msg_sbc_page">Sivu</string>
+  <string name="msg_sbc_results">Tulokset</string>
+  <string name="msg_sbc_searching_book">Haetaan kirjaa\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Kappaletta ei saatavilla</string>
+  <string name="msg_share_explanation">Voit jakaa dataa näyttämällä viivakoodin laitteesi näytöllä ja lukemalla sen toisella laitteella.</string>
+  <string name="msg_share_text">Tai kirjoita tekstiä ja lopeta Enterillä</string>
+  <string name="msg_sure">Oletko varma?</string>
+  <string name="msg_unmount_usb">SD-kortti ei ole käytettävissä.</string>
+  <string name="preferences_actions_title">Kun viivakoodi löytyy\u2026</string>
+  <string name="preferences_auto_focus_title">Käytä automaattista tarkennusta</string>
+  <string name="preferences_bulk_mode_summary">Skannaa ja tallenna viivakoodeja jatkuvasti</string>
+  <string name="preferences_bulk_mode_title">Jatkuva skannaus</string>
+  <string name="preferences_copy_to_clipboard_title">Kopioi leikepöydälle</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Seuraavat korvataan: %s = sisältö, %f = formaatti, %t = tyyppi</string>
+  <string name="preferences_custom_product_search_title">Mukautettu hakukone</string>
+  <string name="preferences_decode_1D_title">1D-viivakoodit</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR-koodit</string>
+  <string name="preferences_device_bug_workarounds_title">Laitteen vikojen kiertäminen</string>
+  <string name="preferences_disable_continuous_focus_summary">Käytä vain vakiotarkennusta</string>
+  <string name="preferences_disable_continuous_focus_title">Ei jatkuvaa tarkennusta</string>
+  <string name="preferences_disable_exposure_title">Ei valotusta</string>
+  <string name="preferences_front_light_auto">Automaattinen</string>
+  <string name="preferences_front_light_off">Pois</string>
+  <string name="preferences_front_light_on">Päällä</string>
+  <string name="preferences_front_light_summary">Parantaa joissain laitteissa hämärässä skannaamista, mutta voi aiheuttaa häikäisyongelmia. Ei toimi kaikissa puhelimissa.</string>
+  <string name="preferences_front_light_title">Käytä etuosan valoa</string>
+  <string name="preferences_general_title">Yleiset asetukset</string>
+  <string name="preferences_invert_scan_summary">Etsi valkoisia viivakoodeja mustalla taustalla. Ei toimi kaikilla laitteilla.</string>
+  <string name="preferences_invert_scan_title">Käänteinen (negatiivin) skannaus</string>
+  <string name="preferences_name">Asetukset</string>
+  <string name="preferences_play_beep_title">Piippaus</string>
+  <string name="preferences_remember_duplicates_summary">Jos sama viivakoodi skannetaan useasti, tallenna jokainen skannauskerta historiaan</string>
+  <string name="preferences_remember_duplicates_title">Muista kaksoiskappaleet</string>
+  <string name="preferences_result_title">Tuloksien asetukset</string>
+  <string name="preferences_scanning_title">Kun skannataan viivakoodeja, dekoodaa\u2026</string>
+  <string name="preferences_search_country">Etsi maasta</string>
+  <string name="preferences_supplemental_summary">Yritä hakea lisätietoja viivakoodin sisällöstä</string>
+  <string name="preferences_supplemental_title">Hae lisää tietoa</string>
+  <string name="preferences_try_bsplus">Kokeile Barcode Scanner+ -ohjelmaa</string>
+  <string name="preferences_try_bsplus_summary">Parannettu uusilla ominaisuuksilla ja käyttöliittymällä</string>
+  <string name="preferences_vibrate_title">Värinä</string>
+  <string name="result_address_book">Löydettiin yhteystietoja</string>
+  <string name="result_calendar">Löydettiin kalenteritapahtuma</string>
+  <string name="result_email_address">Löydettiin sähköpostiosoite</string>
+  <string name="result_geo">Löydettiin koordinaatteja</string>
+  <string name="result_isbn">Löydettiin kirja</string>
+  <string name="result_product">Löydettiin tuote</string>
+  <string name="result_sms">Löydettiin tekstiviestinumero</string>
+  <string name="result_tel">Löydettiin puhelinnumero</string>
+  <string name="result_text">Löydettiin teksti</string>
+  <string name="result_uri">Löydettin URL-osoite</string>
+  <string name="result_wifi">Löydettiin asetukset langattomalle yhteydelle</string>
+  <string name="sbc_name">Googlen kirjahaku</string>
+  <string name="wifi_changing_network">Pyydetään yhteyttä verkkoon\u2026</string>
+  <string name="wifi_ssid_label">Verkon nimi</string>
+  <string name="wifi_type_label">Tyyppi</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-fr/strings.xml b/src/java/PluginQR/res/values-fr/strings.xml
new file mode 100644
index 00000000..dcd5ca4a
--- /dev/null
+++ b/src/java/PluginQR/res/values-fr/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Applications</string>
+  <string name="bookmark_picker_name">Marque-pages</string>
+  <string name="button_add_calendar">Ajouter à l\'agenda</string>
+  <string name="button_add_contact">Ajouter un contact</string>
+  <string name="button_book_search">Recherche de livres</string>
+  <string name="button_cancel">Annuler</string>
+  <string name="button_custom_product_search">Recherche personnalisée</string>
+  <string name="button_dial">Composer numéro</string>
+  <string name="button_email">Envoyer email</string>
+  <string name="button_get_directions">Itinéraire</string>
+  <string name="button_mms">Envoyer MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Ouvrir le navigateur</string>
+  <string name="button_product_search">Recherche de produits</string>
+  <string name="button_search_book_contents">Rechercher dans le contenu</string>
+  <string name="button_share_app">Application</string>
+  <string name="button_share_bookmark">Marque-page</string>
+  <string name="button_share_by_email">Partager par email</string>
+  <string name="button_share_by_sms">Partager par SMS</string>
+  <string name="button_share_clipboard">Presse-papier</string>
+  <string name="button_share_contact">Contact</string>
+  <string name="button_show_map">Afficher la carte</string>
+  <string name="button_sms">Envoyer SMS</string>
+  <string name="button_web_search">Recherche Web</string>
+  <string name="button_wifi">Se connecter au réseau</string>
+  <string name="contents_contact">Informations de contact</string>
+  <string name="contents_email">Adresse email</string>
+  <string name="contents_location">Coordonnées géographiques</string>
+  <string name="contents_phone">Numéro de téléphone</string>
+  <string name="contents_sms">Adresse SMS</string>
+  <string name="contents_text">Texte</string>
+  <string name="history_clear_one_history_text">Effacer</string>
+  <string name="history_clear_text">Effacer l\'historique</string>
+  <string name="history_email_title">Historique de Barcode Scanner</string>
+  <string name="history_empty">Vide</string>
+  <string name="history_empty_detail">Aucun code-barre scanné n\'a encore été enregistré</string>
+  <string name="history_send">Envoyer historique</string>
+  <string name="history_title">Historique</string>
+  <string name="menu_encode_mecard">Format MECARD</string>
+  <string name="menu_encode_vcard">Format vCard</string>
+  <string name="menu_help">Aide</string>
+  <string name="menu_history">Historique</string>
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_share">Partager</string>
+  <string name="msg_bulk_mode_scanned">Mode lecture en rafale : code-barres scanné et enregistré</string>
+  <string name="msg_camera_framework_bug">Désolé, la caméra Android a rencontré un problème. Un redémarrage de l\'appareil est peut-être nécessaire.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Métadonnées</string>
+  <string name="msg_default_mms_subject">Salut</string>
+  <string name="msg_default_status">Placer un code-barres à l\'intérieur du rectangle pour le scanner.</string>
+  <string name="msg_default_time">Temps</string>
+  <string name="msg_default_type">Type</string>
+  <string name="msg_encode_contents_failed">Impossible de créer le code-barres à partir des données fournies.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Désolé, l\'application demandée n\'a pas pu être lancée. Le contenu du code-barres n\'est peut-être pas valable.</string>
+  <string name="msg_redirect">Redirection</string>
+  <string name="msg_sbc_book_not_searchable">Désolé, ce livre est introuvable.</string>
+  <string name="msg_sbc_failed">Désolé, la recherche a rencontré un problème.</string>
+  <string name="msg_sbc_no_page_returned">Page non trouvée</string>
+  <string name="msg_sbc_page">Page</string>
+  <string name="msg_sbc_results">Résultats</string>
+  <string name="msg_sbc_searching_book">Recherche du livre\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Extrait non disponible</string>
+  <string name="msg_share_explanation">Vous pouvez partager des données en affichant un code-barres sur votre écran et en le scannant avec un autre téléphone.</string>
+  <string name="msg_share_text">Ou tapez du texte</string>
+  <string name="msg_sure">Êtes-vous sûr ?</string>
+  <string name="msg_unmount_usb">Désolé, la carte SD n\'est pas accessible.</string>
+  <string name="preferences_actions_title">Quand un code-barres est trouvé\u2026</string>
+  <string name="preferences_auto_focus_title">Utiliser l\'autofocus</string>
+  <string name="preferences_bulk_mode_summary">Scanner et enregistrer plusieurs codes-barres d\'affilée</string>
+  <string name="preferences_bulk_mode_title">Mode de lecture en rafale</string>
+  <string name="preferences_copy_to_clipboard_title">Copier dans le presse-papier</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Remplacements : %s = contenu, %f = format, %t = type</string>
+  <string name="preferences_custom_product_search_title">URL de recherche personnalisée</string>
+  <string name="preferences_decode_1D_title">Codes-barres 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">Codes QR</string>
+  <string name="preferences_device_bug_workarounds_title">Solutions de contournement des bugs de l\'appareil</string>
+  <string name="preferences_disable_continuous_focus_summary">Utiliser uniquement le mode de mise au point standard</string>
+  <string name="preferences_disable_continuous_focus_title">Pas de mise au point continue</string>
+  <string name="preferences_disable_exposure_title">Pas d\'exposition</string>
+  <string name="preferences_front_light_auto">Automatique</string>
+  <string name="preferences_front_light_off">Inactif</string>
+  <string name="preferences_front_light_on">Actif</string>
+  <string name="preferences_front_light_summary">Allumer la lampe derrière le téléphone quand la lumière ambiante est faible. Peut provoquer des reflets et ne fonctionne pas sur tous les téléphones.</string>
+  <string name="preferences_front_light_title">Flash</string>
+  <string name="preferences_general_title">Paramètres généraux</string>
+  <string name="preferences_invert_scan_summary">Scanner des codes-barres blancs sur fond noir. Pas disponible sur certains appareils.</string>
+  <string name="preferences_invert_scan_title">Scan négatif</string>
+  <string name="preferences_name">Paramètres</string>
+  <string name="preferences_play_beep_title">Bip</string>
+  <string name="preferences_remember_duplicates_summary">Enregistrer dans l\'historique les lectures multiples d\'un même code-barres</string>
+  <string name="preferences_remember_duplicates_title">Enregistrer les doublons</string>
+  <string name="preferences_result_title">Paramètres d\'un résultat</string>
+  <string name="preferences_scanning_title">Pendant le scan de codes-barres, décoder\u2026</string>
+  <string name="preferences_search_country">Pays de recherche</string>
+  <string name="preferences_supplemental_summary">Essayer d\'obtenir plus d\'informations sur le contenu du code-barres</string>
+  <string name="preferences_supplemental_title">Obtenir plus d\'informations</string>
+  <string name="preferences_try_bsplus">Essayez Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Amélioré avec des fonctionnalités et une interface nouvelles</string>
+  <string name="preferences_vibrate_title">Vibreur</string>
+  <string name="result_address_book">Informations de contact trouvées</string>
+  <string name="result_calendar">Événement pour l\'agenda trouvé</string>
+  <string name="result_email_address">Adresse email trouvée</string>
+  <string name="result_geo">Coordonnées géographiques trouvées</string>
+  <string name="result_isbn">Livre trouvé</string>
+  <string name="result_product">Produit trouvé</string>
+  <string name="result_sms">Adresse SMS trouvée</string>
+  <string name="result_tel">Numéro de téléphone trouvé</string>
+  <string name="result_text">Texte seul trouvé</string>
+  <string name="result_uri">URL trouvée</string>
+  <string name="result_wifi">Configuration de réseau Wi-Fi trouvée</string>
+  <string name="sbc_name">Recherche Google Livres</string>
+  <string name="wifi_changing_network">Demande de connexion au réseau\u2026</string>
+  <string name="wifi_ssid_label">Nom du réseau Wi-Fi</string>
+  <string name="wifi_type_label">Type</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-he/strings.xml b/src/java/PluginQR/res/values-he/strings.xml
new file mode 100644
index 00000000..1577e7f0
--- /dev/null
+++ b/src/java/PluginQR/res/values-he/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">סורק ברקודים</string>
+  <string name="app_picker_name">יישומים</string>
+  <string name="bookmark_picker_name">סימניות</string>
+  <string name="button_add_calendar">הוסף ללוח שנה</string>
+  <string name="button_add_contact">הוספת איש קשר</string>
+  <string name="button_book_search">חיפוש ספר</string>
+  <string name="button_cancel">ביטול</string>
+  <string name="button_custom_product_search">חיפוש מותאם אישית</string>
+  <string name="button_dial">חייג מספר</string>
+  <string name="button_email">שלח דואר אלקטרוני</string>
+  <string name="button_get_directions">קבל הוראות הגעה</string>
+  <string name="button_mms">שלח הודעת מולטימדיה</string>
+  <string name="button_ok">אישור</string>
+  <string name="button_open_browser">פתח את הדפדפן</string>
+  <string name="button_product_search">חיפוש מוצר</string>
+  <string name="button_search_book_contents">חיפוש בתוכן</string>
+  <string name="button_share_app">יישום</string>
+  <string name="button_share_bookmark">סימניה</string>
+  <string name="button_share_by_email">שתף בדואר אלקטרוני</string>
+  <string name="button_share_by_sms">שתף בהודעה</string>
+  <string name="button_share_clipboard">לוח עריכה</string>
+  <string name="button_share_contact">איש קשר</string>
+  <string name="button_show_map">הצג מפה</string>
+  <string name="button_sms">שלח הודעה</string>
+  <string name="button_web_search">חיפוש באינטרנט</string>
+  <string name="button_wifi">התחבר לרשת</string>
+  <string name="contents_contact">פרטי איש קשר</string>
+  <string name="contents_email">כתובת דואר אלקטרוני</string>
+  <string name="contents_location">קואורדינטות גאוגרפיות</string>
+  <string name="contents_phone">מספר טלפון</string>
+  <string name="contents_sms">כתובת SMS</string>
+  <string name="contents_text">טקסט רגיל</string>
+  <string name="history_clear_one_history_text">נקה</string>
+  <string name="history_clear_text">נקה היסטוריה</string>
+  <string name="history_email_title">היסטוריית סורק הברקודים</string>
+  <string name="history_empty">ריק</string>
+  <string name="history_empty_detail">ברקודים לא נרשמו</string>
+  <string name="history_send">שלח היסטוריה</string>
+  <string name="history_title">היסטוריה</string>
+  <string name="menu_encode_mecard">השתמש MECARD</string>
+  <string name="menu_encode_vcard">השתמש vCard</string>
+  <string name="menu_help">עזרה</string>
+  <string name="menu_history">היסטוריה</string>
+  <string name="menu_settings">הגדרות</string>
+  <string name="menu_share">שתף</string>
+  <string name="msg_bulk_mode_scanned">מצב קבוצה: ברקוד נסרק ונשמר</string>
+  <string name="msg_camera_framework_bug">סליחה, מצלמת האנדרואיד נתקלה בבעיה. ייתכן שיהיה עליך להפעיל מחדש את המכשיר.</string>
+  <string name="msg_default_format">פורמט</string>
+  <string name="msg_default_meta">מטה-נתונים</string>
+  <string name="msg_default_mms_subject">היי</string>
+  <string name="msg_default_status">הצב ברקוד בתוך המלבן כדי לסרוק אותו.</string>
+  <string name="msg_default_time">זמן</string>
+  <string name="msg_default_type">סוג</string>
+  <string name="msg_encode_contents_failed">לא היתה אפשרות לקודד ברקוד מהנתונים שסופקו.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">סליחה, לא ניתן להפעיל את היישום המבוקש. ייתכן שתוכן הברקוד לא תקין.</string>
+  <string name="msg_redirect">נתב מחדש</string>
+  <string name="msg_sbc_book_not_searchable">סליחה, ספר זה אינו ניתן לחיפוש.</string>
+  <string name="msg_sbc_failed">סליחה, החיפוש נתקל בבעיה.</string>
+  <string name="msg_sbc_no_page_returned">לא הוחזר דף</string>
+  <string name="msg_sbc_page">דף</string>
+  <string name="msg_sbc_results">תוצאות</string>
+  <string name="msg_sbc_searching_book">מחפש ספר\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">גזיר לא זמין</string>
+  <string name="msg_share_explanation">באפשרותך לשתף נתונים על-ידי הצגת ברקוד על המסך וסריקתו עם טלפון אחר.</string>
+  <string name="msg_share_text">או הקלד טקסט כלשהו</string>
+  <string name="msg_sure">האם אתה בטוח?</string>
+  <string name="msg_unmount_usb">סליחה, כרטיס הזכרון אינו נגיש.</string>
+  <string name="preferences_actions_title">כאשר ברקוד נמצא\u2026</string>
+  <string name="preferences_auto_focus_title">להשתמש במיקוד האוטומטי</string>
+  <string name="preferences_bulk_mode_summary">סורק ושומר ברקודים באופן רציף</string>
+  <string name="preferences_bulk_mode_title">מצב סריקה מרובה</string>
+  <string name="preferences_copy_to_clipboard_title">העתק ללוח</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">החלפות: s% = התוכן, f% = הפורמט, t% = סוג</string>
+  <string name="preferences_custom_product_search_title">כתובת לחיפוש מותאם אישית</string>
+  <string name="preferences_decode_1D_title">ברקודים חד מימדיים</string>
+  <string name="preferences_decode_Data_Matrix_title">מטריצת נתונים</string>
+  <string name="preferences_decode_QR_title">קודי QR</string>
+  <string name="preferences_device_bug_workarounds_title">באג במכשיר דרכים לעקיפת הבעיה</string>
+  <string name="preferences_disable_continuous_focus_summary">השתמש רק במצב רגיל פוקוס</string>
+  <string name="preferences_disable_continuous_focus_title">המיקוד לא רציפה</string>
+  <string name="preferences_disable_exposure_title">אין חשיפה</string>
+  <string name="preferences_front_light_auto">אוטומטי</string>
+  <string name="preferences_front_light_off">לא פעיל</string>
+  <string name="preferences_front_light_on">פעיל</string>
+  <string name="preferences_front_light_summary">משפר את הסריקה בתאורה נמוכה בטלפונים מסוימים, אך עשוי לגרום לסנוור. לא עובד בכל הטלפונים.</string>
+  <string name="preferences_front_light_title">השתמש באור הקדמי</string>
+  <string name="preferences_general_title">הגדרות כלליות</string>
+  <string name="preferences_invert_scan_summary">סרוק ברקודים לבן על רקע שחור. לא זמין על התקנים מסוימים.</string>
+  <string name="preferences_invert_scan_title">היפוך לסרוק</string>
+  <string name="preferences_name">הגדרות</string>
+  <string name="preferences_play_beep_title">צפצוף</string>
+  <string name="preferences_remember_duplicates_summary">אחסן מספר סריקות של אותו הברקוד בהיסטוריה</string>
+  <string name="preferences_remember_duplicates_title">זכור כפילויות</string>
+  <string name="preferences_result_title">הגדרות תוצאה</string>
+  <string name="preferences_scanning_title">בעת סריקת ברקודים, קודד\u2026</string>
+  <string name="preferences_search_country">חיפוש הארץ</string>
+  <string name="preferences_supplemental_summary">נסה למצא מידע נוסף על תוכן הברקוד</string>
+  <string name="preferences_supplemental_title">מצא מידע נוסף</string>
+  <string name="preferences_try_bsplus">נסה סורק ברקודים+</string>
+  <string name="preferences_try_bsplus_summary">משופר עם תכונות וממשק חדשים</string>
+  <string name="preferences_vibrate_title">רטט</string>
+  <string name="result_address_book">נמצא מידע של איש קשר</string>
+  <string name="result_calendar">נמצא אירוע</string>
+  <string name="result_email_address">נמצאה כתובת דוא"ל</string>
+  <string name="result_geo">נמצאו קואורדינטות גיאוגרפיות</string>
+  <string name="result_isbn">נמצא ספר</string>
+  <string name="result_product">נמצא מוצר</string>
+  <string name="result_sms">נמצאה כתובת הודעה</string>
+  <string name="result_tel">נמצא מספר טלפון</string>
+  <string name="result_text">נמצא טקסט</string>
+  <string name="result_uri">נמצאה כתובת אינטרנט</string>
+  <string name="result_wifi">נמצאו הגדרות רשת אל חוטית</string>
+  <string name="sbc_name">Google חיפוש ספרים</string>
+  <string name="wifi_changing_network">בקשת חיבור לרשת \u2026</string>
+  <string name="wifi_ssid_label">שם רשת</string>
+  <string name="wifi_type_label">סוג</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-hi/strings.xml b/src/java/PluginQR/res/values-hi/strings.xml
new file mode 100644
index 00000000..329819b3
--- /dev/null
+++ b/src/java/PluginQR/res/values-hi/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">बारकोड स्कैनर</string>
+  <string name="app_picker_name">अनुप्रयोगों</string>
+  <string name="bookmark_picker_name">बुकमार्क्स</string>
+  <string name="button_add_calendar">कैलेंडर के लिए जोड़ें</string>
+  <string name="button_add_contact">संपर्क जोड़ें</string>
+  <string name="button_book_search">पुस्तक खोज</string>
+  <string name="button_cancel">रद्द करना</string>
+  <string name="button_custom_product_search">कस्टम खोज</string>
+  <string name="button_dial">डायल नंबर</string>
+  <string name="button_email">ईमेल भेजें</string>
+  <string name="button_get_directions">निर्देश प्राप्त करें</string>
+  <string name="button_mms">एमएमएस भेजें</string>
+  <string name="button_ok">ठीक है</string>
+  <string name="button_open_browser">ओपन ब्राउज़र</string>
+  <string name="button_product_search">उत्पाद खोज</string>
+  <string name="button_search_book_contents">खोज सामग्री</string>
+  <string name="button_share_app">आवेदन</string>
+  <string name="button_share_bookmark">बुकमार्क</string>
+  <string name="button_share_by_email">ईमेल के माध्यम से साझा करें</string>
+  <string name="button_share_by_sms">एसएमएस के जरिए शेयर</string>
+  <string name="button_share_clipboard">क्लिपबोर्ड</string>
+  <string name="button_share_contact">संपर्क</string>
+  <string name="button_show_map">नक्शा दिखाएँ</string>
+  <string name="button_sms">एसएमएस भेजें</string>
+  <string name="button_web_search">वेब खोज</string>
+  <string name="button_wifi">नेटवर्क कनेक्ट करें</string>
+  <string name="contents_contact">संपर्क जानकारी</string>
+  <string name="contents_email">ईमेल पता</string>
+  <string name="contents_location">भौगोलिक निर्देशांक</string>
+  <string name="contents_phone">फ़ोन नंबर</string>
+  <string name="contents_sms">एसएमएस पता</string>
+  <string name="contents_text">सादा पाठ</string>
+  <string name="history_clear_one_history_text">हटाएँ</string>
+  <string name="history_clear_text">इतिहास हटाएँ</string>
+  <string name="history_email_title">बारकोड स्कैनर इतिहास</string>
+  <string name="history_empty">खाली</string>
+  <string name="history_empty_detail">अभी तक कोई बारकोड स्कैन दर्ज किया गया है</string>
+  <string name="history_send">इतिहास भेजें</string>
+  <string name="history_title">इतिहास</string>
+  <string name="menu_encode_mecard">MECARD का प्रयोग करें</string>
+  <string name="menu_encode_vcard">vCard का प्रयोग करें</string>
+  <string name="menu_help">मदद</string>
+  <string name="menu_history">इतिहास</string>
+  <string name="menu_settings">सेटिंग्स</string>
+  <string name="menu_share">शेयर</string>
+  <string name="msg_bulk_mode_scanned">थोक मोड: बारकोड स्कैन और बचाया</string>
+  <string name="msg_camera_framework_bug">क्षमा करें, Android कैमरा एक समस्या का सामना करना पड़ा. आप डिवाइस को पुनरारंभ करने की आवश्यकता हो सकती है.</string>
+  <string name="msg_default_format">प्रारूप</string>
+  <string name="msg_default_meta">मेटाडाटा</string>
+  <string name="msg_default_mms_subject">हाय</string>
+  <string name="msg_default_status">दृश्यदर्शी आयत के अंदर एक बारकोड प्लेस इसे स्कैन.</string>
+  <string name="msg_default_time">समय</string>
+  <string name="msg_default_type">टाइप</string>
+  <string name="msg_encode_contents_failed">उपलब्ध कराए गए आंकड़ों से एक बारकोड सांकेतिक शब्दों में बदलना नहीं कर सका.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">क्षमा करें, अनुरोध आवेदन शुरू नहीं किया जा सका. बारकोड सामग्री अमान्य हो सकता है.</string>
+  <string name="msg_redirect">पुनर्निर्देशन</string>
+  <string name="msg_sbc_book_not_searchable">क्षमा करें, इस किताब को खोजा नहीं है.</string>
+  <string name="msg_sbc_failed">क्षमा करें, खोज एक समस्या का सामना करना पड़ा.</string>
+  <string name="msg_sbc_no_page_returned">कोई पृष्ठ लौटे</string>
+  <string name="msg_sbc_page">पेज</string>
+  <string name="msg_sbc_results">परिणाम</string>
+  <string name="msg_sbc_searching_book">खोज पुस्तक\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">उपलब्ध स्निपेट नहीं</string>
+  <string name="msg_share_explanation">आप अपनी स्क्रीन पर प्रदर्शित बारकोड और यह अन्य फोन के साथ स्कैनिंग द्वारा डेटा साझा कर सकते हैं.</string>
+  <string name="msg_share_text">या कुछ पाठ टाइप करें और प्रेस दर्ज करें</string>
+  <string name="msg_sure">तुम्हें यकीन है?</string>
+  <string name="msg_unmount_usb">क्षमा करें, एसडी कार्ड सुलभ नहीं है.</string>
+  <string name="preferences_actions_title">जब एक बारकोड पाया जाता है\u2026</string>
+  <string name="preferences_auto_focus_title">ऑटो फोकस का उपयोग करें</string>
+  <string name="preferences_bulk_mode_summary">स्कैन और कई बारकोड लगातार बचाने के</string>
+  <string name="preferences_bulk_mode_title">थोक स्कैन मोड</string>
+  <string name="preferences_copy_to_clipboard_title">क्लिपबोर्ड पर कॉपी</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">स्थानापन्न: %s = सामग्री, %f = प्रारूप, %t = टाइप</string>
+  <string name="preferences_custom_product_search_title">कस्टम खोज यूआरएल</string>
+  <string name="preferences_decode_1D_title">1D बारकोड</string>
+  <string name="preferences_decode_Data_Matrix_title">डाटा मैट्रिक्स</string>
+  <string name="preferences_decode_QR_title">QR कोड</string>
+  <string name="preferences_device_bug_workarounds_title">युक्ति बग वर्कअराउन्ड</string>
+  <string name="preferences_disable_continuous_focus_summary">केवल मानक फोकस मोड का उपयोग करें</string>
+  <string name="preferences_disable_continuous_focus_title">कोई निरंतर ध्यान</string>
+  <string name="preferences_disable_exposure_title">कोई जोखिम</string>
+  <string name="preferences_front_light_auto">स्वचालित</string>
+  <string name="preferences_front_light_off">निष्क्रिय</string>
+  <string name="preferences_front_light_on">सक्रिय</string>
+  <string name="preferences_front_light_summary">कुछ फोन पर कम रोशनी में स्कैनिंग बढ़ाता है, लेकिन चमक का कारण हो सकता है. सभी फोन पर काम नहीं करता.</string>
+  <string name="preferences_front_light_title">सामने प्रकाश का उपयोग करें</string>
+  <string name="preferences_general_title">सामान्य सेटिंग्स</string>
+  <string name="preferences_invert_scan_summary">काली पृष्ठभूमि पर सफेद बारकोड के लिए स्कैन करें. कुछ उपकरणों पर उपलब्ध नहीं है.</string>
+  <string name="preferences_invert_scan_title">स्कैन उलटें</string>
+  <string name="preferences_name">सेटिंग्स</string>
+  <string name="preferences_play_beep_title">भोंपू</string>
+  <string name="preferences_remember_duplicates_summary">इतिहास में एक ही बारकोड के स्टोर एकाधिक स्कैन</string>
+  <string name="preferences_remember_duplicates_title">डुप्लिकेट याद रखें</string>
+  <string name="preferences_result_title">नतीजे सेटिंग्स</string>
+  <string name="preferences_scanning_title">जब बारकोड स्कैनिंग के लिए व्याख्या करना\u2026</string>
+  <string name="preferences_search_country">खोज देश</string>
+  <string name="preferences_supplemental_summary">बारकोड सामग्री के बारे में में अधिक जानकारी पुनः प्राप्त करने की कोशिश करो</string>
+  <string name="preferences_supplemental_title">अधिक जानकारी पुनर्प्राप्त</string>
+  <string name="preferences_try_bsplus">बारकोड स्कैनर की कोशिश +</string>
+  <string name="preferences_try_bsplus_summary">नई सुविधाओं और इंटरफेस के साथ बढ़ाया</string>
+  <string name="preferences_vibrate_title">कांपना</string>
+  <string name="result_address_book">मिला संपर्क जानकारी</string>
+  <string name="result_calendar">मिला कैलेंडर घटना</string>
+  <string name="result_email_address">मिला ईमेल पते</string>
+  <string name="result_geo">मिला भौगोलिक निर्देशांक</string>
+  <string name="result_isbn">मिला किताब</string>
+  <string name="result_product">मिला उत्पाद</string>
+  <string name="result_sms">मिला एसएमएस पता</string>
+  <string name="result_tel">मिला फोन नंबर</string>
+  <string name="result_text">मिला सादा पाठ</string>
+  <string name="result_uri">मिला यूआरएल</string>
+  <string name="result_wifi">मिला WLAN विन्यास</string>
+  <string name="sbc_name">Google पुस्तक खोज</string>
+  <string name="wifi_changing_network">नेटवर्क के लिए कनेक्शन का अनुरोध कर रहा है \u2026</string>
+  <string name="wifi_ssid_label">नेटवर्क नाम</string>
+  <string name="wifi_type_label">टाइप</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-hu/strings.xml b/src/java/PluginQR/res/values-hu/strings.xml
new file mode 100644
index 00000000..7e93df27
--- /dev/null
+++ b/src/java/PluginQR/res/values-hu/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Alkalmazások</string>
+  <string name="bookmark_picker_name">Könyvjelzők</string>
+  <string name="button_add_calendar">Hozzáadás a naptárhoz</string>
+  <string name="button_add_contact">Névjegy hozzáadása</string>
+  <string name="button_book_search">Könyv keresése</string>
+  <string name="button_cancel">Mégse</string>
+  <string name="button_custom_product_search">Egyedi keresés</string>
+  <string name="button_dial">Telefonszám tárcsázása</string>
+  <string name="button_email">E-mail küldése</string>
+  <string name="button_get_directions">Útvonaltervezés</string>
+  <string name="button_mms">MMS küldése</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Böngésző megnyitása</string>
+  <string name="button_product_search">Termék keresése</string>
+  <string name="button_search_book_contents">Tartalom keresése</string>
+  <string name="button_share_app">Alkalmazás</string>
+  <string name="button_share_bookmark">Könyvjelző</string>
+  <string name="button_share_by_email">Megosztás e-mailben</string>
+  <string name="button_share_by_sms">Megosztás SMS-ben</string>
+  <string name="button_share_clipboard">Vágólap</string>
+  <string name="button_share_contact">Névjegy</string>
+  <string name="button_show_map">Térkép mutatása</string>
+  <string name="button_sms">SMS küldése</string>
+  <string name="button_web_search">Keresés a weben</string>
+  <string name="button_wifi">Kapcsolódás hálózathoz</string>
+  <string name="contents_contact">Névjegy információ</string>
+  <string name="contents_email">E-mail cím</string>
+  <string name="contents_location">Földrajzi koordináták</string>
+  <string name="contents_phone">Telefonszám</string>
+  <string name="contents_sms">SMS szám</string>
+  <string name="contents_text">Egyszerű szöveg</string>
+  <string name="history_clear_one_history_text">Törlése</string>
+  <string name="history_clear_text">Előzmények törlése</string>
+  <string name="history_email_title">Barcode Scanner előzmények</string>
+  <string name="history_empty">Üres</string>
+  <string name="history_empty_detail">Nem vonalkód szkennelés lett felvéve még</string>
+  <string name="history_send">Előzmények küldése</string>
+  <string name="history_title">Előzmények</string>
+  <string name="menu_encode_mecard">Használja MECARD</string>
+  <string name="menu_encode_vcard">Használja vCard</string>
+  <string name="menu_help">Súgó</string>
+  <string name="menu_history">Előzmények</string>
+  <string name="menu_settings">Beállítások</string>
+  <string name="menu_share">Megosztás</string>
+  <string name="msg_bulk_mode_scanned">Tömeges beolvasás: vonalkód beszkennelve és mentve</string>
+  <string name="msg_camera_framework_bug">Android kamera hiba. Lehet, hogy újra kell indítania a készüléket.</string>
+  <string name="msg_default_format">Formátum</string>
+  <string name="msg_default_meta">Metaadatok</string>
+  <string name="msg_default_mms_subject">Szia</string>
+  <string name="msg_default_status">Pozícionálja a vonalkódot a kereső téglalapba a szkenneléshez.</string>
+  <string name="msg_default_time">Idő</string>
+  <string name="msg_default_type">Típus</string>
+  <string name="msg_encode_contents_failed">Nem sikerült létrehozni a vonalkódot a megadott adatokból.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">A kért alkalmazást nem lehet elindítani. A vonalkód tartalma lehet, hogy érvénytelen.</string>
+  <string name="msg_redirect">Átirányítás</string>
+  <string name="msg_sbc_book_not_searchable">Ez a könyv nem kereshető.</string>
+  <string name="msg_sbc_failed">A keresés problémába ütközött.</string>
+  <string name="msg_sbc_no_page_returned">Nincs visszakapott oldal</string>
+  <string name="msg_sbc_page">Oldal</string>
+  <string name="msg_sbc_results">Eredmények</string>
+  <string name="msg_sbc_searching_book">Könyv keresése\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Kódrészlet nem elérhető</string>
+  <string name="msg_share_explanation">Meg tud osztani adatot úgy, hogy egy vonalkódot jelenít meg a képernyőjén, melyet egy másik telefon beszkennel.</string>
+  <string name="msg_share_text">Vagy írja be a szöveget és nyomjon Enter-t</string>
+  <string name="msg_sure">Biztos benne?</string>
+  <string name="msg_unmount_usb">Az SD kártya nem elérhető.</string>
+  <string name="preferences_actions_title">Amikor a vonalkód megvan\u2026</string>
+  <string name="preferences_auto_focus_title">Használja autofókusz</string>
+  <string name="preferences_bulk_mode_summary">Több vonalkód folyamatos szkennelése és mentése</string>
+  <string name="preferences_bulk_mode_title">Tömeges beolvasás</string>
+  <string name="preferences_copy_to_clipboard_title">Másolás a vágólapra</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Használjon: %s = tartalom, %f = formátum, %t = típus</string>
+  <string name="preferences_custom_product_search_title">Egyedi kereső URL</string>
+  <string name="preferences_decode_1D_title">1D vonalkódok</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR kódok</string>
+  <string name="preferences_device_bug_workarounds_title">Eszköz Bug Lehetséges megoldások</string>
+  <string name="preferences_disable_continuous_focus_summary">Csak a normál élességállítási mód</string>
+  <string name="preferences_disable_continuous_focus_title">Nincs folyamatos fókusz</string>
+  <string name="preferences_disable_exposure_title">No expozíció</string>
+  <string name="preferences_front_light_auto">Automatikus</string>
+  <string name="preferences_front_light_off">Tétlen</string>
+  <string name="preferences_front_light_on">Aktív</string>
+  <string name="preferences_front_light_summary">Javítja a szkennelést kevés fény mellett néhány telefonon, de csillogást okozhat. Nem minden telefonon működik.</string>
+  <string name="preferences_front_light_title">Kamera LED használata</string>
+  <string name="preferences_general_title">Általános beállítások</string>
+  <string name="preferences_invert_scan_summary">Scan fehér vonalkódok a fekete háttér. Nem csak egyes eszközöket.</string>
+  <string name="preferences_invert_scan_title">Invert szkennelés</string>
+  <string name="preferences_name">Beállítások</string>
+  <string name="preferences_play_beep_title">Sípolás</string>
+  <string name="preferences_remember_duplicates_summary">Ugyanannak a vonalkódnak több szkennelt képét is tárolja az Előzményekben</string>
+  <string name="preferences_remember_duplicates_title">Duplikációk megjegyzése</string>
+  <string name="preferences_result_title">Találati beállítások</string>
+  <string name="preferences_scanning_title">Vonalkód szkennelésekor, dekódoláskor\u2026</string>
+  <string name="preferences_search_country">Ország keresése</string>
+  <string name="preferences_supplemental_summary">A vonalkóddal jelzett tartalomról megpróbál több információt letölteni.</string>
+  <string name="preferences_supplemental_title">További információk letöltése</string>
+  <string name="preferences_try_bsplus">Próbálja Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Továbbfejlesztett új jellemzők és interfész</string>
+  <string name="preferences_vibrate_title">Rezgés</string>
+  <string name="result_address_book">Névjegy találat</string>
+  <string name="result_calendar">Naptár esemény találat</string>
+  <string name="result_email_address">E-mail cím találat</string>
+  <string name="result_geo">Földrajzi koordináták találat</string>
+  <string name="result_isbn">Könyv találat</string>
+  <string name="result_product">Termék találat</string>
+  <string name="result_sms">SMS szám találat</string>
+  <string name="result_tel">Telefonszám találat</string>
+  <string name="result_text">Egyszerű szöveg találat</string>
+  <string name="result_uri">URL találat</string>
+  <string name="result_wifi">WLAN konfiguráció találat</string>
+  <string name="sbc_name">Google Könyvek keresés</string>
+  <string name="wifi_changing_network">Kérése kapcsolat hálózati\u2026</string>
+  <string name="wifi_ssid_label">Hálózat neve</string>
+  <string name="wifi_type_label">Típus</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-id/strings.xml b/src/java/PluginQR/res/values-id/strings.xml
new file mode 100644
index 00000000..7865b2bf
--- /dev/null
+++ b/src/java/PluginQR/res/values-id/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Aplikasi</string>
+  <string name="bookmark_picker_name">Bookmarks</string>
+  <string name="button_add_calendar">Tambah ke kalendar</string>
+  <string name="button_add_contact">Tambah kontak</string>
+  <string name="button_book_search">Cari Buku</string>
+  <string name="button_cancel">Batal</string>
+  <string name="button_custom_product_search">Pencarian kustom</string>
+  <string name="button_dial">Panggil nomor</string>
+  <string name="button_email">Kirim surel</string>
+  <string name="button_get_directions">Dapatkan petunjuk arah</string>
+  <string name="button_mms">Kirim MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Buka browser</string>
+  <string name="button_product_search">Cari Produk</string>
+  <string name="button_search_book_contents">Cari isi</string>
+  <string name="button_share_app">Aplikasi</string>
+  <string name="button_share_bookmark">Bookmark</string>
+  <string name="button_share_by_email">Bagikan melalui surel</string>
+  <string name="button_share_by_sms">Bagikan melalui SMS</string>
+  <string name="button_share_clipboard">Clipboard</string>
+  <string name="button_share_contact">Kontak</string>
+  <string name="button_show_map">Lihat peta</string>
+  <string name="button_sms">Kirim SMS</string>
+  <string name="button_web_search">Pencarian web</string>
+  <string name="button_wifi">Hubungkan ke Jaringan</string>
+  <string name="contents_contact">Informasi kontak</string>
+  <string name="contents_email">Alamat surel</string>
+  <string name="contents_location">Koordinat geografis</string>
+  <string name="contents_phone">Nomor telepon</string>
+  <string name="contents_sms">Alamat SMS</string>
+  <string name="contents_text">Teks biasa</string>
+  <string name="history_clear_one_history_text">Hapus</string>
+  <string name="history_clear_text">Hapus riwayat</string>
+  <string name="history_email_title">Riwayat Barcode Scanner</string>
+  <string name="history_empty">Kosong</string>
+  <string name="history_empty_detail">Tidak ada scan barcode telah dicatat belum</string>
+  <string name="history_send">Kirim riwayat</string>
+  <string name="history_title">Riwayat</string>
+  <string name="menu_encode_mecard">Gunakan MECARD</string>
+  <string name="menu_encode_vcard">Gunakan vCard</string>
+  <string name="menu_help">Bantuan</string>
+  <string name="menu_history">Riwayat</string>
+  <string name="menu_settings">Pengaturan</string>
+  <string name="menu_share">Bagikan</string>
+  <string name="msg_bulk_mode_scanned">Bulk mode: barcode sudah dipindai dan disimpan</string>
+  <string name="msg_camera_framework_bug">Maaf, kamera pada Android mengalami masalah. Anda mungkin perlu me-restart perangkat.</string>
+  <string name="msg_default_format">Bentuk</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Hai</string>
+  <string name="msg_default_status">Letakkan barcode di dalam kotak jendela untuk memindai.</string>
+  <string name="msg_default_time">Waktu</string>
+  <string name="msg_default_type">Tipe</string>
+  <string name="msg_encode_contents_failed">Tidak dapat meng-encode barcode dari data yang diberikan.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Maaf, aplikasi yang diminta tidak dapat dijalankan. Mungkin ada kesalahan isi barcode.</string>
+  <string name="msg_redirect">Pengalihan</string>
+  <string name="msg_sbc_book_not_searchable">Maaf, buku ini tidak dapat dicari.</string>
+  <string name="msg_sbc_failed">Maaf, pencarian mengalami masalah.</string>
+  <string name="msg_sbc_no_page_returned">Tidak ada halaman kembali</string>
+  <string name="msg_sbc_page">Halaman</string>
+  <string name="msg_sbc_results">Hasil</string>
+  <string name="msg_sbc_searching_book">Mencari buku\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Snippet tidak tersedia</string>
+  <string name="msg_share_explanation">Anda dapat berbagi data dengan menampilkan barcode di layar Anda dan dapat dipindai oleh phone lain.</string>
+  <string name="msg_share_text">Atau masukkan beberapa kata dan tekan Enter</string>
+  <string name="msg_sure">Apakah Anda yakin?</string>
+  <string name="msg_unmount_usb">Maaf, SD card tidak dapat diakses.</string>
+  <string name="preferences_actions_title">Ketika barcode sudah ditemukan\u2026</string>
+  <string name="preferences_auto_focus_title">Menggunakan fokus otomatis</string>
+  <string name="preferences_bulk_mode_summary">Pindai dan simpan beberapa barcode terus-menerus</string>
+  <string name="preferences_bulk_mode_title">Mode pemindaian bulk</string>
+  <string name="preferences_copy_to_clipboard_title">Salin ke clipboard</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Substitusi: %s = isi, %f = format, %t = jenis</string>
+  <string name="preferences_custom_product_search_title">Pencarian URL kustom</string>
+  <string name="preferences_decode_1D_title">1D barcode</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matriks</string>
+  <string name="preferences_decode_QR_title">QR Codes</string>
+  <string name="preferences_device_bug_workarounds_title">Perangkat Bug Workarounds</string>
+  <string name="preferences_disable_continuous_focus_summary">Gunakan hanya modus fokus standar</string>
+  <string name="preferences_disable_continuous_focus_title">Tidak ada fokus terus menerus</string>
+  <string name="preferences_disable_exposure_title">Eksposur ada</string>
+  <string name="preferences_front_light_auto">Otomatis</string>
+  <string name="preferences_front_light_off">Non-aktif</string>
+  <string name="preferences_front_light_on">Aktif</string>
+  <string name="preferences_front_light_summary">Meningkatkan scanning dalam cahaya rendah pada beberapa ponsel, namun dapat menyebabkan silau. Tidak bekerja pada semua ponsel.</string>
+  <string name="preferences_front_light_title">Gunakan lampu depan</string>
+  <string name="preferences_general_title">Pengaturan umum</string>
+  <string name="preferences_invert_scan_summary">Memindai barcode putih pada latar belakang hitam. Tidak tersedia pada beberapa perangkat.</string>
+  <string name="preferences_invert_scan_title">Balikkan memindai</string>
+  <string name="preferences_name">Pengaturan</string>
+  <string name="preferences_play_beep_title">Beep</string>
+  <string name="preferences_remember_duplicates_summary">Simpan beberapa pindaian dari barcode yang sama di dalam Riwayat</string>
+  <string name="preferences_remember_duplicates_title">Ingat duplikasi</string>
+  <string name="preferences_result_title">Hasil pengaturan</string>
+  <string name="preferences_scanning_title">Ketika memindai barcode, decode\u2026</string>
+  <string name="preferences_search_country">Pencarian negara</string>
+  <string name="preferences_supplemental_summary">Mencoba mendapatkan beberapa informasi mengenai isi barcode</string>
+  <string name="preferences_supplemental_title">Ambil informasi lebih lanjut</string>
+  <string name="preferences_try_bsplus">Cobalah Scanner Barcode+</string>
+  <string name="preferences_try_bsplus_summary">Ditingkatkan dengan fitur baru dan antarmuka</string>
+  <string name="preferences_vibrate_title">Bergetar</string>
+  <string name="result_address_book">Informasi kontak ditemukan</string>
+  <string name="result_calendar">Kalendar acara ditemukan</string>
+  <string name="result_email_address">Alamat surel ditemukan</string>
+  <string name="result_geo">Koordinat geografis ditemukan</string>
+  <string name="result_isbn">Buku ditemukan</string>
+  <string name="result_product">Produk ditemukan</string>
+  <string name="result_sms">Alamat SMS ditemukan</string>
+  <string name="result_tel">Nomor telepon ditemukan</string>
+  <string name="result_text">Teks biasa ditemukan</string>
+  <string name="result_uri">URL ditemukan</string>
+  <string name="result_wifi">Konfigurasi WLAN ditemukan</string>
+  <string name="sbc_name">Pencarian Google Book</string>
+  <string name="wifi_changing_network">Meminta koneksi ke jaringan\u2026</string>
+  <string name="wifi_ssid_label">Nama Jaringan</string>
+  <string name="wifi_type_label">Tipe</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-it/strings.xml b/src/java/PluginQR/res/values-it/strings.xml
new file mode 100644
index 00000000..93ff5b74
--- /dev/null
+++ b/src/java/PluginQR/res/values-it/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Applicazioni</string>
+  <string name="bookmark_picker_name">Segnalibri</string>
+  <string name="button_add_calendar">Aggiungi al calendario</string>
+  <string name="button_add_contact">Aggiungi ai contatti</string>
+  <string name="button_book_search">Cerca libro</string>
+  <string name="button_cancel">Annulla</string>
+  <string name="button_custom_product_search">Ricerca personalizzata</string>
+  <string name="button_dial">Componi numero</string>
+  <string name="button_email">Invia email</string>
+  <string name="button_get_directions">Ottieni indirizzi</string>
+  <string name="button_mms">Invia MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Apri browser</string>
+  <string name="button_product_search">Cerca prodotto</string>
+  <string name="button_search_book_contents">Cerca contenuti</string>
+  <string name="button_share_app">Applicazione</string>
+  <string name="button_share_bookmark">Segnalibro</string>
+  <string name="button_share_by_email">Condividi tramite email</string>
+  <string name="button_share_by_sms">Condividi tramite SMS</string>
+  <string name="button_share_clipboard">Appunti</string>
+  <string name="button_share_contact">Contatti</string>
+  <string name="button_show_map">Mostra mappa</string>
+  <string name="button_sms">Invia SMS</string>
+  <string name="button_web_search">Ricerca web</string>
+  <string name="button_wifi">Connessione a rete</string>
+  <string name="contents_contact">Info contatto</string>
+  <string name="contents_email">Indirizzo email</string>
+  <string name="contents_location">Coordinate geografiche</string>
+  <string name="contents_phone">Numero di telefono</string>
+  <string name="contents_sms">Numero SMS</string>
+  <string name="contents_text">Testo puro</string>
+  <string name="history_clear_one_history_text">Cancella</string>
+  <string name="history_clear_text">Cancella cronologia</string>
+  <string name="history_email_title">Cronologia scansioni codici a barre</string>
+  <string name="history_empty">Vuoto</string>
+  <string name="history_empty_detail">Nessuna scansione di codici a barre è stata registrata</string>
+  <string name="history_send">Invia cronologia</string>
+  <string name="history_title">Cronologia</string>
+  <string name="menu_encode_mecard">Usa MECARD</string>
+  <string name="menu_encode_vcard">Usa vCard</string>
+  <string name="menu_help">Aiuto</string>
+  <string name="menu_history">Cronologia</string>
+  <string name="menu_settings">Impostazioni</string>
+  <string name="menu_share">Condividi</string>
+  <string name="msg_bulk_mode_scanned">Modalità di gruppo: codici a barre scansionati e salvati</string>
+  <string name="msg_camera_framework_bug">Spiacenti, la fotocamera Android ha riscontrato un problema. Potrebbe essere necessario riavviare il dispositivo.</string>
+  <string name="msg_default_format">Formato</string>
+  <string name="msg_default_meta">Metadati</string>
+  <string name="msg_default_mms_subject">Ciao</string>
+  <string name="msg_default_status">Posiziona un codice a barre dentro il mirino rettangolare per la scansione.</string>
+  <string name="msg_default_time">Tempo</string>
+  <string name="msg_default_type">Tipo</string>
+  <string name="msg_encode_contents_failed">Impossibile codificare un codice a barre dai dati forniti.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Spiacenti, l\'applicazione richiesta non può essere avviata. Il contenuto del codice a barre può essere non valido.</string>
+  <string name="msg_redirect">Inoltra</string>
+  <string name="msg_sbc_book_not_searchable">Spiacenti, questo libro non è ricercabile.</string>
+  <string name="msg_sbc_failed">Spiacenti, la ricerca ha avuto un problema.</string>
+  <string name="msg_sbc_no_page_returned">Nessuna pagina restitiuta</string>
+  <string name="msg_sbc_page">Pagina</string>
+  <string name="msg_sbc_results">Risultati</string>
+  <string name="msg_sbc_searching_book">Ricerca libro\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Ritaglio non disponibile</string>
+  <string name="msg_share_explanation">Puoi condividere i dati mostrando un codice a barre sullo schermo e facendo la scansione con un altro telefono.</string>
+  <string name="msg_share_text">O digitare un testo</string>
+  <string name="msg_sure">Sei sicuro?</string>
+  <string name="msg_unmount_usb">Spiacenti, la scheda SD non è accessibile.</string>
+  <string name="preferences_actions_title">Quando viene trovato un codice a barre\u2026</string>
+  <string name="preferences_auto_focus_title">Utilizzare messa a fuoco automatica</string>
+  <string name="preferences_bulk_mode_summary">Scansiona e salva diversi codici a barre in sequenza</string>
+  <string name="preferences_bulk_mode_title">Modalità scansione di gruppo</string>
+  <string name="preferences_copy_to_clipboard_title">Copia negli appunti</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Sostituzioni: %s = contenuti, %f = formato, %t = tipo</string>
+  <string name="preferences_custom_product_search_title">URL ricerca personalizzata</string>
+  <string name="preferences_decode_1D_title">Codice a barre 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Matrice dati</string>
+  <string name="preferences_decode_QR_title">Codici QR</string>
+  <string name="preferences_device_bug_workarounds_title">Soluzioni alternative dispositivo Bug</string>
+  <string name="preferences_disable_continuous_focus_summary">Utilizzare solo modalità standard messa a fuoco</string>
+  <string name="preferences_disable_continuous_focus_title">No messa a fuoco continua</string>
+  <string name="preferences_disable_exposure_title">Nessuna esposizione</string>
+  <string name="preferences_front_light_auto">Automatico</string>
+  <string name="preferences_front_light_off">Inattivo</string>
+  <string name="preferences_front_light_on">Attivo</string>
+  <string name="preferences_front_light_summary">Migliora la scansione con poca luminosità su alcuni telefoni, ma può provocare abbagliamento. Non funziona su tutti i telefoni.</string>
+  <string name="preferences_front_light_title">Usa luce frontale</string>
+  <string name="preferences_general_title">Impostazioni generali</string>
+  <string name="preferences_invert_scan_summary">Scansione dei codici a barre bianche su sfondo nero. Non disponibile su alcuni dispositivi.</string>
+  <string name="preferences_invert_scan_title">Invertire la scansione</string>
+  <string name="preferences_name">Impostazioni</string>
+  <string name="preferences_play_beep_title">Suona</string>
+  <string name="preferences_remember_duplicates_summary">Mantieni scansioni multiple del codice a barre nella stessa Cronologia</string>
+  <string name="preferences_remember_duplicates_title">Ricorda duplicati</string>
+  <string name="preferences_result_title">Impostazioni risultato</string>
+  <string name="preferences_scanning_title">Durante la scansione di codici a barre, decodifica\u2026</string>
+  <string name="preferences_search_country">Cerca paese</string>
+  <string name="preferences_supplemental_summary">Prova a cercare ulteriori informazioni sul contenuto del codice a barre</string>
+  <string name="preferences_supplemental_title">Recupera altre informazioni</string>
+  <string name="preferences_try_bsplus">Prova Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Arricchito con nuove funzionalità e interfaccia</string>
+  <string name="preferences_vibrate_title">Vibra</string>
+  <string name="result_address_book">Info contatto trovata</string>
+  <string name="result_calendar">Evento calendario trovato</string>
+  <string name="result_email_address">Indirizzo email trovato</string>
+  <string name="result_geo">Coordinate geografiche trovate</string>
+  <string name="result_isbn">Libro trovato</string>
+  <string name="result_product">Prodotto trovato</string>
+  <string name="result_sms">Numero SMS trovato</string>
+  <string name="result_tel">Numero di telefono trovato</string>
+  <string name="result_text">Testo puro trovato</string>
+  <string name="result_uri">URL trovato</string>
+  <string name="result_wifi">Configurazione WLAN trovata</string>
+  <string name="sbc_name">Ricerca Google Book</string>
+  <string name="wifi_changing_network">Richiesta di connessione alla rete\u2026</string>
+  <string name="wifi_ssid_label">Nome rete</string>
+  <string name="wifi_type_label">Tipo</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-iw/strings.xml b/src/java/PluginQR/res/values-iw/strings.xml
new file mode 100644
index 00000000..1577e7f0
--- /dev/null
+++ b/src/java/PluginQR/res/values-iw/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">סורק ברקודים</string>
+  <string name="app_picker_name">יישומים</string>
+  <string name="bookmark_picker_name">סימניות</string>
+  <string name="button_add_calendar">הוסף ללוח שנה</string>
+  <string name="button_add_contact">הוספת איש קשר</string>
+  <string name="button_book_search">חיפוש ספר</string>
+  <string name="button_cancel">ביטול</string>
+  <string name="button_custom_product_search">חיפוש מותאם אישית</string>
+  <string name="button_dial">חייג מספר</string>
+  <string name="button_email">שלח דואר אלקטרוני</string>
+  <string name="button_get_directions">קבל הוראות הגעה</string>
+  <string name="button_mms">שלח הודעת מולטימדיה</string>
+  <string name="button_ok">אישור</string>
+  <string name="button_open_browser">פתח את הדפדפן</string>
+  <string name="button_product_search">חיפוש מוצר</string>
+  <string name="button_search_book_contents">חיפוש בתוכן</string>
+  <string name="button_share_app">יישום</string>
+  <string name="button_share_bookmark">סימניה</string>
+  <string name="button_share_by_email">שתף בדואר אלקטרוני</string>
+  <string name="button_share_by_sms">שתף בהודעה</string>
+  <string name="button_share_clipboard">לוח עריכה</string>
+  <string name="button_share_contact">איש קשר</string>
+  <string name="button_show_map">הצג מפה</string>
+  <string name="button_sms">שלח הודעה</string>
+  <string name="button_web_search">חיפוש באינטרנט</string>
+  <string name="button_wifi">התחבר לרשת</string>
+  <string name="contents_contact">פרטי איש קשר</string>
+  <string name="contents_email">כתובת דואר אלקטרוני</string>
+  <string name="contents_location">קואורדינטות גאוגרפיות</string>
+  <string name="contents_phone">מספר טלפון</string>
+  <string name="contents_sms">כתובת SMS</string>
+  <string name="contents_text">טקסט רגיל</string>
+  <string name="history_clear_one_history_text">נקה</string>
+  <string name="history_clear_text">נקה היסטוריה</string>
+  <string name="history_email_title">היסטוריית סורק הברקודים</string>
+  <string name="history_empty">ריק</string>
+  <string name="history_empty_detail">ברקודים לא נרשמו</string>
+  <string name="history_send">שלח היסטוריה</string>
+  <string name="history_title">היסטוריה</string>
+  <string name="menu_encode_mecard">השתמש MECARD</string>
+  <string name="menu_encode_vcard">השתמש vCard</string>
+  <string name="menu_help">עזרה</string>
+  <string name="menu_history">היסטוריה</string>
+  <string name="menu_settings">הגדרות</string>
+  <string name="menu_share">שתף</string>
+  <string name="msg_bulk_mode_scanned">מצב קבוצה: ברקוד נסרק ונשמר</string>
+  <string name="msg_camera_framework_bug">סליחה, מצלמת האנדרואיד נתקלה בבעיה. ייתכן שיהיה עליך להפעיל מחדש את המכשיר.</string>
+  <string name="msg_default_format">פורמט</string>
+  <string name="msg_default_meta">מטה-נתונים</string>
+  <string name="msg_default_mms_subject">היי</string>
+  <string name="msg_default_status">הצב ברקוד בתוך המלבן כדי לסרוק אותו.</string>
+  <string name="msg_default_time">זמן</string>
+  <string name="msg_default_type">סוג</string>
+  <string name="msg_encode_contents_failed">לא היתה אפשרות לקודד ברקוד מהנתונים שסופקו.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">סליחה, לא ניתן להפעיל את היישום המבוקש. ייתכן שתוכן הברקוד לא תקין.</string>
+  <string name="msg_redirect">נתב מחדש</string>
+  <string name="msg_sbc_book_not_searchable">סליחה, ספר זה אינו ניתן לחיפוש.</string>
+  <string name="msg_sbc_failed">סליחה, החיפוש נתקל בבעיה.</string>
+  <string name="msg_sbc_no_page_returned">לא הוחזר דף</string>
+  <string name="msg_sbc_page">דף</string>
+  <string name="msg_sbc_results">תוצאות</string>
+  <string name="msg_sbc_searching_book">מחפש ספר\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">גזיר לא זמין</string>
+  <string name="msg_share_explanation">באפשרותך לשתף נתונים על-ידי הצגת ברקוד על המסך וסריקתו עם טלפון אחר.</string>
+  <string name="msg_share_text">או הקלד טקסט כלשהו</string>
+  <string name="msg_sure">האם אתה בטוח?</string>
+  <string name="msg_unmount_usb">סליחה, כרטיס הזכרון אינו נגיש.</string>
+  <string name="preferences_actions_title">כאשר ברקוד נמצא\u2026</string>
+  <string name="preferences_auto_focus_title">להשתמש במיקוד האוטומטי</string>
+  <string name="preferences_bulk_mode_summary">סורק ושומר ברקודים באופן רציף</string>
+  <string name="preferences_bulk_mode_title">מצב סריקה מרובה</string>
+  <string name="preferences_copy_to_clipboard_title">העתק ללוח</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">החלפות: s% = התוכן, f% = הפורמט, t% = סוג</string>
+  <string name="preferences_custom_product_search_title">כתובת לחיפוש מותאם אישית</string>
+  <string name="preferences_decode_1D_title">ברקודים חד מימדיים</string>
+  <string name="preferences_decode_Data_Matrix_title">מטריצת נתונים</string>
+  <string name="preferences_decode_QR_title">קודי QR</string>
+  <string name="preferences_device_bug_workarounds_title">באג במכשיר דרכים לעקיפת הבעיה</string>
+  <string name="preferences_disable_continuous_focus_summary">השתמש רק במצב רגיל פוקוס</string>
+  <string name="preferences_disable_continuous_focus_title">המיקוד לא רציפה</string>
+  <string name="preferences_disable_exposure_title">אין חשיפה</string>
+  <string name="preferences_front_light_auto">אוטומטי</string>
+  <string name="preferences_front_light_off">לא פעיל</string>
+  <string name="preferences_front_light_on">פעיל</string>
+  <string name="preferences_front_light_summary">משפר את הסריקה בתאורה נמוכה בטלפונים מסוימים, אך עשוי לגרום לסנוור. לא עובד בכל הטלפונים.</string>
+  <string name="preferences_front_light_title">השתמש באור הקדמי</string>
+  <string name="preferences_general_title">הגדרות כלליות</string>
+  <string name="preferences_invert_scan_summary">סרוק ברקודים לבן על רקע שחור. לא זמין על התקנים מסוימים.</string>
+  <string name="preferences_invert_scan_title">היפוך לסרוק</string>
+  <string name="preferences_name">הגדרות</string>
+  <string name="preferences_play_beep_title">צפצוף</string>
+  <string name="preferences_remember_duplicates_summary">אחסן מספר סריקות של אותו הברקוד בהיסטוריה</string>
+  <string name="preferences_remember_duplicates_title">זכור כפילויות</string>
+  <string name="preferences_result_title">הגדרות תוצאה</string>
+  <string name="preferences_scanning_title">בעת סריקת ברקודים, קודד\u2026</string>
+  <string name="preferences_search_country">חיפוש הארץ</string>
+  <string name="preferences_supplemental_summary">נסה למצא מידע נוסף על תוכן הברקוד</string>
+  <string name="preferences_supplemental_title">מצא מידע נוסף</string>
+  <string name="preferences_try_bsplus">נסה סורק ברקודים+</string>
+  <string name="preferences_try_bsplus_summary">משופר עם תכונות וממשק חדשים</string>
+  <string name="preferences_vibrate_title">רטט</string>
+  <string name="result_address_book">נמצא מידע של איש קשר</string>
+  <string name="result_calendar">נמצא אירוע</string>
+  <string name="result_email_address">נמצאה כתובת דוא"ל</string>
+  <string name="result_geo">נמצאו קואורדינטות גיאוגרפיות</string>
+  <string name="result_isbn">נמצא ספר</string>
+  <string name="result_product">נמצא מוצר</string>
+  <string name="result_sms">נמצאה כתובת הודעה</string>
+  <string name="result_tel">נמצא מספר טלפון</string>
+  <string name="result_text">נמצא טקסט</string>
+  <string name="result_uri">נמצאה כתובת אינטרנט</string>
+  <string name="result_wifi">נמצאו הגדרות רשת אל חוטית</string>
+  <string name="sbc_name">Google חיפוש ספרים</string>
+  <string name="wifi_changing_network">בקשת חיבור לרשת \u2026</string>
+  <string name="wifi_ssid_label">שם רשת</string>
+  <string name="wifi_type_label">סוג</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-ja/strings.xml b/src/java/PluginQR/res/values-ja/strings.xml
new file mode 100644
index 00000000..662e4c9b
--- /dev/null
+++ b/src/java/PluginQR/res/values-ja/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">QRコードスキャナー</string>
+  <string name="app_picker_name">アプリケーション</string>
+  <string name="bookmark_picker_name">ブックマーク</string>
+  <string name="button_add_calendar">予定を追加</string>
+  <string name="button_add_contact">連絡先を追加</string>
+  <string name="button_book_search">書籍を検索</string>
+  <string name="button_cancel">キャンセル</string>
+  <string name="button_custom_product_search">カスタムサーチ</string>
+  <string name="button_dial">電話をかける</string>
+  <string name="button_email">メールの送信</string>
+  <string name="button_get_directions">経路を検索</string>
+  <string name="button_mms">MMSの送信</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">ブラウザで表示</string>
+  <string name="button_product_search">商品検索</string>
+  <string name="button_search_book_contents">書籍の中身を検索</string>
+  <string name="button_share_app">アプリを共有</string>
+  <string name="button_share_bookmark">ブックマーク</string>
+  <string name="button_share_by_email">メールで共有</string>
+  <string name="button_share_by_sms">SMSで共有</string>
+  <string name="button_share_clipboard">クリップボードを共有</string>
+  <string name="button_share_contact">連絡先を共有</string>
+  <string name="button_show_map">地図を表示</string>
+  <string name="button_sms">SMSの送信</string>
+  <string name="button_web_search">インターネット検索</string>
+  <string name="button_wifi">ネットワークに接続</string>
+  <string name="contents_contact">連絡先</string>
+  <string name="contents_email">メールアドレス</string>
+  <string name="contents_location">位置情報</string>
+  <string name="contents_phone">電話番号</string>
+  <string name="contents_sms">SMSアドレス</string>
+  <string name="contents_text">テキストデータ</string>
+  <string name="history_clear_one_history_text">削除</string>
+  <string name="history_clear_text">履歴の削除</string>
+  <string name="history_email_title">QRコードスキャナーの履歴</string>
+  <string name="history_empty">履歴なし</string>
+  <string name="history_empty_detail">スキャン履歴がありません</string>
+  <string name="history_send">履歴を送信</string>
+  <string name="history_title">履歴</string>
+  <string name="menu_encode_mecard">MECARDを使用</string>
+  <string name="menu_encode_vcard">vCardを使用</string>
+  <string name="menu_help">ヘルプ</string>
+  <string name="menu_history">履歴</string>
+  <string name="menu_settings">設定</string>
+  <string name="menu_share">共有</string>
+  <string name="msg_bulk_mode_scanned">連続スキャン:スキャン結果を保存しました</string>
+  <string name="msg_camera_framework_bug">Androidのカメラに問題が発生しました。デバイスを再起動する必要があります。</string>
+  <string name="msg_default_format">フォーマット</string>
+  <string name="msg_default_meta">メタデータ</string>
+  <string name="msg_default_mms_subject">こんにちは</string>
+  <string name="msg_default_status">QRコードを画面の読み取り範囲内に写すとスキャンします。</string>
+  <string name="msg_default_time">時間</string>
+  <string name="msg_default_type">タイプ</string>
+  <string name="msg_encode_contents_failed">このデータからQRコードを作成できませんでした</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">指定されたアプリケーションを起動できませんでした。QRコードの内容が無効である可能性があります。</string>
+  <string name="msg_redirect">リダイレクト</string>
+  <string name="msg_sbc_book_not_searchable">この書籍は検索できません</string>
+  <string name="msg_sbc_failed">検索中に問題が発生しました</string>
+  <string name="msg_sbc_no_page_returned">検索結果はありません</string>
+  <string name="msg_sbc_page">ページ</string>
+  <string name="msg_sbc_results">結果</string>
+  <string name="msg_sbc_searching_book">書籍を検索中</string>
+  <string name="msg_sbc_snippet_unavailable">要約文はありません</string>
+  <string name="msg_share_explanation">画面にQRコードを表示させて別の端末でスキャンすれば、データを共有することができます。</string>
+  <string name="msg_share_text">またはテキストを入力してください</string>
+  <string name="msg_sure">よろしいですか？</string>
+  <string name="msg_unmount_usb">SDカードにアクセスできません</string>
+  <string name="preferences_actions_title">スキャン時の動作</string>
+  <string name="preferences_auto_focus_title">ｵｰﾄﾌｫｰｶｽを使用</string>
+  <string name="preferences_bulk_mode_summary">QRコードを連続スキャンして保存します</string>
+  <string name="preferences_bulk_mode_title">連続スキャンモード</string>
+  <string name="preferences_copy_to_clipboard_title">ｸﾘｯﾌﾟﾎﾞｰﾄﾞにｺﾋﾟｰ</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">引数：％s=コンテンツ、％f=フォーマット、％t=タイプ</string>
+  <string name="preferences_custom_product_search_title">カスタムサーチ URL</string>
+  <string name="preferences_decode_1D_title">1次元バーコード</string>
+  <string name="preferences_decode_Data_Matrix_title">データマトリクスコード</string>
+  <string name="preferences_decode_QR_title">QRコード</string>
+  <string name="preferences_device_bug_workarounds_title">不具合対策</string>
+  <string name="preferences_disable_continuous_focus_summary">標準フォーカスモードのみ使用します</string>
+  <string name="preferences_disable_continuous_focus_title">追従フォーカスしない</string>
+  <string name="preferences_disable_exposure_title">露出しない</string>
+  <string name="preferences_front_light_auto">自動</string>
+  <string name="preferences_front_light_off">ライトOFF</string>
+  <string name="preferences_front_light_on">ライトON</string>
+  <string name="preferences_front_light_summary">スキャン時のライトを制御します</string>
+  <string name="preferences_front_light_title">ライトの制御</string>
+  <string name="preferences_general_title">一般設定</string>
+  <string name="preferences_invert_scan_summary">黒地に白のバーコードをスキャン。一部のデバイスでは使用できません。</string>  
+  <string name="preferences_invert_scan_title">スキャンを反転</string>
+  <string name="preferences_name">設定</string>
+  <string name="preferences_play_beep_title">通知音</string>
+  <string name="preferences_remember_duplicates_summary">同じ内容でも重複して履歴に記録します</string>
+  <string name="preferences_remember_duplicates_title">重複するスキャン結果の記録</string>
+  <string name="preferences_result_title">検索結果の設定</string>
+  <string name="preferences_scanning_title">QRコードスキャン時</string>
+  <string name="preferences_search_country">検索国コード</string>
+  <string name="preferences_supplemental_summary">QRコード内容の詳細情報を取得します</string>
+  <string name="preferences_supplemental_title">詳細情報を取得</string>
+  <string name="preferences_try_bsplus">QRコード+を試す</string>
+  <string name="preferences_try_bsplus_summary">新機能と強化されたインターフェース</string>
+  <string name="preferences_vibrate_title">バイブレーション</string>
+  <string name="result_address_book">連絡先がヒットしました</string>
+  <string name="result_calendar">カレンダーの予定がヒットしました</string>
+  <string name="result_email_address">メールアドレスがヒットしました</string>
+  <string name="result_geo">地理座標がヒットしました</string>
+  <string name="result_isbn">書籍がヒットしました</string>
+  <string name="result_product">商品がヒットしました</string>
+  <string name="result_sms">SMS 連絡先がヒットしました</string>
+  <string name="result_tel">電話番号がヒットしました</string>
+  <string name="result_text">テキストデータがヒットしました</string>
+  <string name="result_uri">URL がヒットしました</string>
+  <string name="result_wifi">ネットワーク設定がヒットしました</string>
+  <string name="sbc_name">Googleブックス</string>
+  <string name="wifi_changing_network">ネットワークへ接続しています…</string>
+  <string name="wifi_ssid_label">ネットワーク名</string>
+  <string name="wifi_type_label">タイプ</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-ko/strings.xml b/src/java/PluginQR/res/values-ko/strings.xml
new file mode 100644
index 00000000..f4bcc09e
--- /dev/null
+++ b/src/java/PluginQR/res/values-ko/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">바코드 스캐너</string>
+  <string name="app_picker_name">어플리케이션</string>
+  <string name="bookmark_picker_name">즐겨찾기</string>
+  <string name="button_add_calendar">일정에 추가하기</string>
+  <string name="button_add_contact">연락처에 추가하기</string>
+  <string name="button_book_search">책 검색</string>
+  <string name="button_cancel">취소</string>
+  <string name="button_custom_product_search">사용자 지정 검색</string>
+  <string name="button_dial">전화 걸기</string>
+  <string name="button_email">이메일 보내기</string>
+  <string name="button_get_directions">방향을 찾기</string>
+  <string name="button_mms">MMS 보내기</string>
+  <string name="button_ok">확인</string>
+  <string name="button_open_browser">웹브라우저로 열기</string>
+  <string name="button_product_search">제품 검색</string>
+  <string name="button_search_book_contents">책 내용 검색</string>
+  <string name="button_share_app">어플리케이션</string>
+  <string name="button_share_bookmark">즐겨찾기</string>
+  <string name="button_share_by_email">이메일로 공유</string>
+  <string name="button_share_by_sms">SMS로 공유</string>
+  <string name="button_share_clipboard">복사된 항목</string>
+  <string name="button_share_contact">연락처</string>
+  <string name="button_show_map">지도 보기</string>
+  <string name="button_sms">SMS 보내기</string>
+  <string name="button_web_search">인터넷 검색</string>
+  <string name="button_wifi">네트워크에 연결</string>
+  <string name="contents_contact">연락처 정보</string>
+  <string name="contents_email">이메일 주소</string>
+  <string name="contents_location">GPS 좌표</string>
+  <string name="contents_phone">전화번호</string>
+  <string name="contents_sms">전화번호</string>
+  <string name="contents_text">단문</string>
+  <string name="history_clear_one_history_text">삭제</string>
+  <string name="history_clear_text">기록 삭제</string>
+  <string name="history_email_title">바코드 스캐너 기록</string>
+  <string name="history_empty">빈</string>
+  <string name="history_empty_detail">아무 바코드 스캔이 기록되지 않았습니다</string>
+  <string name="history_send">기록 보내기</string>
+  <string name="history_title">기록</string>
+  <string name="menu_encode_mecard">MECARD를 사용하여</string>
+  <string name="menu_encode_vcard">vCard를 사용하여</string>
+  <string name="menu_help">도움말</string>
+  <string name="menu_history">기록</string>
+  <string name="menu_settings">설정</string>
+  <string name="menu_share">공유</string>
+  <string name="msg_bulk_mode_scanned">일괄 스캔 모드: 바코드가 읽히고 저장됩니다.</string>
+  <string name="msg_camera_framework_bug">죄송합니다. 기기의 카메라에 오류가 생겼습니다. 기기를 재시작 해야될 수도 있습니다.</string>
+  <string name="msg_default_format">포맷</string>
+  <string name="msg_default_meta">메타데이터</string>
+  <string name="msg_default_mms_subject">안녕하세요</string>
+  <string name="msg_default_status">바코드를 사각형 안에 비춰주세요.</string>
+  <string name="msg_default_time">시간</string>
+  <string name="msg_default_type">종류</string>
+  <string name="msg_encode_contents_failed">주어진 데이터로 바코드를 만들지 못하였습니다.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">죄송합니다. 어플리케이션이 실행되지 않습니다. 바코드 내용이 잘못 되었을 수도 있습니다.</string>
+  <string name="msg_redirect">리디렉션</string>
+  <string name="msg_sbc_book_not_searchable">죄송합니다. 이 책은 검색이 되지 않습니다.</string>
+  <string name="msg_sbc_failed">죄송합니다. 검색 도중 문제가 발생했습니다.</string>
+  <string name="msg_sbc_no_page_returned">수신받은 페이지가 없습니다.</string>
+  <string name="msg_sbc_page">페이지</string>
+  <string name="msg_sbc_results">결과</string>
+  <string name="msg_sbc_searching_book">책 검색중\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">내용이 열람되지 않습니다.</string>
+  <string name="msg_share_explanation">해당 기기의 바코드를 다른 기기로 스캔해서 데이터를 공유할 수 있습니다.</string>
+  <string name="msg_share_text">입력하거나 텍스트</string>
+  <string name="msg_sure">계속하시겠습니까?</string>
+  <string name="msg_unmount_usb">죄송합니다. SD카드를 사용할 수 없습니다.</string>
+  <string name="preferences_actions_title">바코드를 스캔했을때\u2026</string>
+  <string name="preferences_auto_focus_title">자동 초점을 사용하여</string>
+  <string name="preferences_bulk_mode_summary">다수의 바코드를 스캔하고 저장합니다.</string>
+  <string name="preferences_bulk_mode_title">일괄 스캔 모드</string>
+  <string name="preferences_copy_to_clipboard_title">복사하기</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">자리 표시자: %s = 내용, %f = 포맷, %t = 유형</string>
+  <string name="preferences_custom_product_search_title">사용자 지정 검색 주소</string>
+  <string name="preferences_decode_1D_title">1차원 바코드를 읽기</string>
+  <string name="preferences_decode_Data_Matrix_title">데이터 행렬(Data Matrix)을 해석하기</string>
+  <string name="preferences_decode_QR_title">QR 코드를 읽기</string>
+  <string name="preferences_device_bug_workarounds_title">장치 버그 해결</string>
+  <string name="preferences_disable_continuous_focus_summary">전용 표준 초점 모드를 사용</string>
+  <string name="preferences_disable_continuous_focus_title">아무 연속 초점 없음</string>
+  <string name="preferences_disable_exposure_title">더 노출하지</string>
+  <string name="preferences_front_light_auto">자동적 인</string>
+  <string name="preferences_front_light_off">비활성</string>
+  <string name="preferences_front_light_on">활동적인</string>
+  <string name="preferences_front_light_summary">특정 기기에서는 어두운 환경에서의 스캐닝 기능을 향상 시키지만 너무 밝을 수도 있습니다. 모든 기기에서 작동되지 않습니다.</string>
+  <string name="preferences_front_light_title">플래시 사용하기</string>
+  <string name="preferences_general_title">일반 설정</string>
+  <string name="preferences_invert_scan_summary">검정 바탕에 흰색 바코드에 대한 스캔. 일부 장치에서 사용할 수 없습니다.</string>
+  <string name="preferences_invert_scan_title">스캔 반전</string>
+  <string name="preferences_name">설정</string>
+  <string name="preferences_play_beep_title">전자음</string>
+  <string name="preferences_remember_duplicates_summary">복수의 같은 바코드를 기록에 저장</string>
+  <string name="preferences_remember_duplicates_title">중복된 바코드 저장</string>
+  <string name="preferences_result_title">결과 설정</string>
+  <string name="preferences_scanning_title">바코드 스캐닝 시\u2026</string>
+  <string name="preferences_search_country">국가별 검색</string>
+  <string name="preferences_supplemental_summary">바코드 내용에 대한 자세한 정보를 검색하려고</string>
+  <string name="preferences_supplemental_title">검색 상세 정보</string>
+  <string name="preferences_try_bsplus">바코드 스캐너를 사용해보십시오 +</string>
+  <string name="preferences_try_bsplus_summary">새로운 기능 및 인터페이스 개선</string>
+  <string name="preferences_vibrate_title">진동</string>
+  <string name="result_address_book">연락처 정보를 찾았습니다</string>
+  <string name="result_calendar">일정 이벤트를 찾았습니다</string>
+  <string name="result_email_address">이메일 주소를 찾았습니다</string>
+  <string name="result_geo">GPS 좌표를 찾았습니다</string>
+  <string name="result_isbn">책을 찾았습니다</string>
+  <string name="result_product">제품을 찾았습니</string>
+  <string name="result_sms">전화번호를 찾았습니다</string>
+  <string name="result_tel">전화번호를 찾았습니다</string>
+  <string name="result_text">단문을 찾았습니다</string>
+  <string name="result_uri">인터넷 주소를 찾았습니다</string>
+  <string name="result_wifi">WiFi 설정을 찾았습니다</string>
+  <string name="sbc_name">구글 책 검색</string>
+  <string name="wifi_changing_network">네트워크에 연결을 요청\u2026</string>
+  <string name="wifi_ssid_label">네트워크 이름</string>
+  <string name="wifi_type_label">종류</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-nl/strings.xml b/src/java/PluginQR/res/values-nl/strings.xml
new file mode 100644
index 00000000..8bb210bf
--- /dev/null
+++ b/src/java/PluginQR/res/values-nl/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Applicaties</string>
+  <string name="bookmark_picker_name">Bladwijzers</string>
+  <string name="button_add_calendar">Toevoegen aan agenda</string>
+  <string name="button_add_contact">Toevoegen aan contactpersonen</string>
+  <string name="button_book_search">Boeken zoeken</string>
+  <string name="button_cancel">Annuleren</string>
+  <string name="button_custom_product_search">Aangepast zoeken</string>
+  <string name="button_dial">Nummer bellen</string>
+  <string name="button_email">E-mail versturen</string>
+  <string name="button_get_directions">Routebeschrijving opvragen</string>
+  <string name="button_mms">MMS versturen</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Browser openen</string>
+  <string name="button_product_search">Producten zoeken</string>
+  <string name="button_search_book_contents">Boekinhoud zoeken</string>
+  <string name="button_share_app">Applicatie</string>
+  <string name="button_share_bookmark">Bladwijzer</string>
+  <string name="button_share_by_email">Delen via e-mail</string>
+  <string name="button_share_by_sms">Delen via sms</string>
+  <string name="button_share_clipboard">Klembord</string>
+  <string name="button_share_contact">Contactpersoon</string>
+  <string name="button_show_map">Kaart weergeven</string>
+  <string name="button_sms">Sms versturen</string>
+  <string name="button_web_search">Zoeken op internet</string>
+  <string name="button_wifi">Verbinden met netwerk</string>
+  <string name="contents_contact">Contactpersooninformatie</string>
+  <string name="contents_email">E-mailadres</string>
+  <string name="contents_location">Geografische coördinaten</string>
+  <string name="contents_phone">Telefoonnummer</string>
+  <string name="contents_sms">Sms-adres</string>
+  <string name="contents_text">Platte tekst</string>
+  <string name="history_clear_one_history_text">Wissen</string>
+  <string name="history_clear_text">Geschiedenis wissen</string>
+  <string name="history_email_title">Barcode Scanner-geschiedenis</string>
+  <string name="history_empty">Leeg</string>
+  <string name="history_empty_detail">Er zijn geen barcodes gescand</string>
+  <string name="history_send">Geschiedenis versturen</string>
+  <string name="history_title">Geschiedenis</string>
+  <string name="menu_encode_mecard">MECARD gebruiken</string>
+  <string name="menu_encode_vcard">vCard gebruiken</string>
+  <string name="menu_help">Help</string>
+  <string name="menu_history">Geschiedenis</string>
+  <string name="menu_settings">Instellingen</string>
+  <string name="menu_share">Delen</string>
+  <string name="msg_bulk_mode_scanned">Bulkmodus: barcode gescand en opgeslagen</string>
+  <string name="msg_camera_framework_bug">Sorry, er is een probleem met de Android-camera. Probeer je telefoon opnieuw op te starten.</string>
+  <string name="msg_default_format">Formaat</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Hallo</string>
+  <string name="msg_default_status">Plaats een barcode binnen de rechthoek om deze te scannen.</string>
+  <string name="msg_default_time">Tijd</string>
+  <string name="msg_default_type">Type</string>
+  <string name="msg_encode_contents_failed">Kan geen barcode genereren op basis van de opgegeven gegevens.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Sorry, de opgevraagde applicatie kan niet worden gestart. De barcode is mogelijk ongeldig.</string>
+  <string name="msg_redirect">Doorverwijzing</string>
+  <string name="msg_sbc_book_not_searchable">Sorry, dit boek kan niet worden doorzocht.</string>
+  <string name="msg_sbc_failed">Sorry, er is een fout opgetreden bij het zoeken.</string>
+  <string name="msg_sbc_no_page_returned">Geen pagina ontvangen</string>
+  <string name="msg_sbc_page">Pagina</string>
+  <string name="msg_sbc_results">Resultaten</string>
+  <string name="msg_sbc_searching_book">Boek doorzoeken\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Fragment niet beschikbaar</string>
+  <string name="msg_share_explanation">Je kunt gegevens delen door een barcode op je scherm te laten zien en deze met een andere telefoon te scannen.</string>
+  <string name="msg_share_text">Of typ wat tekst en druk op Enter</string>
+  <string name="msg_sure">Weet je het zeker?</string>
+  <string name="msg_unmount_usb">Sorry, de SD-kaart is niet toegankelijk.</string>
+  <string name="preferences_actions_title">Wanneer een barcode is gevonden\u2026</string>
+  <string name="preferences_auto_focus_title">Autofocus gebruiken</string>
+  <string name="preferences_bulk_mode_summary">Continu barcodes scannen en opslaan</string>
+  <string name="preferences_bulk_mode_title">Bulkmodus</string>
+  <string name="preferences_copy_to_clipboard_title">Kopiëren naar klembord</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Vervanginen: %s = inhoud, %f = formaat, %t = type</string>
+  <string name="preferences_custom_product_search_title">Aangepaste zoek-URL</string>
+  <string name="preferences_decode_1D_title">1D-barcodes</string>
+  <string name="preferences_decode_Data_Matrix_title">Datamatrix</string>
+  <string name="preferences_decode_QR_title">QR-codes</string>
+  <string name="preferences_device_bug_workarounds_title">Apparaat Bug Tijdelijke oplossingen</string>
+  <string name="preferences_disable_continuous_focus_summary">Gebruik alleen standaard focus modus</string>
+  <string name="preferences_disable_continuous_focus_title">Geen continue focus</string>
+  <string name="preferences_disable_exposure_title">Geen blootstelling</string>
+  <string name="preferences_front_light_auto">Automatisch</string>
+  <string name="preferences_front_light_off">Inactieve</string>
+  <string name="preferences_front_light_on">Actief</string>
+  <string name="preferences_front_light_summary">Verbetert het scannen bij weinig licht bij sommige telefoons, maar kan schittering veroorzaken. Werkt niet op alle telefoons.</string>
+  <string name="preferences_front_light_title">Flitser gebruiken</string>
+  <string name="preferences_general_title">Algemene instellingen</string>
+  <string name="preferences_invert_scan_summary">Scan naar witte barcodes op een zwarte achtergrond. Niet beschikbaar op sommige apparaten.</string>
+  <string name="preferences_invert_scan_title">Scan omkeren</string>
+  <string name="preferences_name">Instellingen</string>
+  <string name="preferences_play_beep_title">Piepen</string>
+  <string name="preferences_remember_duplicates_summary">Meerdere scans van dezelfde barcode opslaan in de geschiedenis</string>
+  <string name="preferences_remember_duplicates_title">Dubbele onthouden</string>
+  <string name="preferences_result_title">Instellingen voor resultaten</string>
+  <string name="preferences_scanning_title">Bij het scannen van barcodes, decodeer\u2026</string>
+  <string name="preferences_search_country">Zoeken op land</string>
+  <string name="preferences_supplemental_summary">Meer informatie over de inhoud van de barcode proberen op te halen</string>
+  <string name="preferences_supplemental_title">Meer informatie ophalen</string>
+  <string name="preferences_try_bsplus">Probeer Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Uitgebreid met nieuwe functies en interface</string>
+  <string name="preferences_vibrate_title">Trillen</string>
+  <string name="result_address_book">Contactpersooninformatie gevonden</string>
+  <string name="result_calendar">Agendagebeurtenis gevonden</string>
+  <string name="result_email_address">E-mailadres gevonden</string>
+  <string name="result_geo">Geografische coördinaten gevonden</string>
+  <string name="result_isbn">Boek gevonden</string>
+  <string name="result_product">Product gevonden</string>
+  <string name="result_sms">Sms-adres gevonden</string>
+  <string name="result_tel">Telefoonnummer gevonden</string>
+  <string name="result_text">Platte tekst gevonden</string>
+  <string name="result_uri">URL gevonden</string>
+  <string name="result_wifi">WLAN-configuratie gevonden</string>
+  <string name="sbc_name">Zoeken op Google Boeken</string>
+  <string name="wifi_changing_network">Verbinding met netwerk opvragen\u2026</string>
+  <string name="wifi_ssid_label">Netwerknaam</string>
+  <string name="wifi_type_label">Type</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-pl/strings.xml b/src/java/PluginQR/res/values-pl/strings.xml
new file mode 100644
index 00000000..2bfabbf3
--- /dev/null
+++ b/src/java/PluginQR/res/values-pl/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Aplikacje</string>
+  <string name="bookmark_picker_name">Zakładki</string>
+  <string name="button_add_calendar">Dodaj do kalendarza</string>
+  <string name="button_add_contact">Dodaj kontakt</string>
+  <string name="button_book_search">Szukaj książek</string>
+  <string name="button_cancel">Anuluj</string>
+  <string name="button_custom_product_search">Wyszukiwanie indywidualne</string>
+  <string name="button_dial">Zadzwoń</string>
+  <string name="button_email">Wyślij email</string>
+  <string name="button_get_directions">Wskazówki</string>
+  <string name="button_mms">Wyślij MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Otwórz przeglądarkę</string>
+  <string name="button_product_search">Szukaj produktów</string>
+  <string name="button_search_book_contents">Przeszukaj zawartość</string>
+  <string name="button_share_app">Aplikacja</string>
+  <string name="button_share_bookmark">Zakładka</string>
+  <string name="button_share_by_email">Udostępnij przez email</string>
+  <string name="button_share_by_sms">Udostępnij przez SMS</string>
+  <string name="button_share_clipboard">Schowek</string>
+  <string name="button_share_contact">Kontakt</string>
+  <string name="button_show_map">Pokaż mapę</string>
+  <string name="button_sms">Wyślij SMS</string>
+  <string name="button_web_search">Szukaj w sieci</string>
+  <string name="button_wifi">Podłącz do sieci</string>
+  <string name="contents_contact">Informacje o kontakcie</string>
+  <string name="contents_email">Adres email</string>
+  <string name="contents_location">Współrzędne geograficzne</string>
+  <string name="contents_phone">Numer telefonu</string>
+  <string name="contents_sms">Adres SMS</string>
+  <string name="contents_text">Zwykły tekst</string>
+  <string name="history_clear_one_history_text">Wyczyść</string>
+  <string name="history_clear_text">Wyczyść historię</string>
+  <string name="history_email_title">Historia Skanera Kodów Paskowych</string>
+  <string name="history_empty">Pusty</string>
+  <string name="history_empty_detail">Brak zeskanowanych kodów</string>
+  <string name="history_send">Wyślij historię</string>
+  <string name="history_title">Historia</string>
+  <string name="menu_encode_mecard">Użyj MECARD</string>
+  <string name="menu_encode_vcard">Użyj vCard</string>
+  <string name="menu_help">Pomoc</string>
+  <string name="menu_history">Historia</string>
+  <string name="menu_settings">Ustawienia</string>
+  <string name="menu_share">Udostępnij</string>
+  <string name="msg_bulk_mode_scanned">Tryb zbiorczy: skanowanie i zapisywanie kodów kreskowych w trybie ciągłym</string>
+  <string name="msg_camera_framework_bug">Przepraszamy, aparat Android napotkał problem. Może wystąpić potrzeba ponownego uruchomienia urządzenia.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metadanych</string>
+  <string name="msg_default_mms_subject">Cześć</string>
+  <string name="msg_default_status">Umieść kod paskowy w prostokącie wizjera aby zeskanować.</string>
+  <string name="msg_default_time">Czas</string>
+  <string name="msg_default_type">Typ</string>
+  <string name="msg_encode_contents_failed">Nie można zakodować kodu paskowego z dostarczonych danych.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Przepraszamy, żadana aplikacja nie może zostać uruchomiona. Zawartość kodu paskowego może być nieprawidłowa.</string>
+  <string name="msg_redirect">Przekierowanie</string>
+  <string name="msg_sbc_book_not_searchable">Przepraszamy, ta książka nie jest przeszukiwalna.</string>
+  <string name="msg_sbc_failed">Przepraszamy, wyszukiwania napotkało problem.</string>
+  <string name="msg_sbc_no_page_returned">Nie zwrócono żadnej strony</string>
+  <string name="msg_sbc_page">Strona</string>
+  <string name="msg_sbc_results">Wyniki</string>
+  <string name="msg_sbc_searching_book">Przeszukiwanie książki\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Wycinek niedostępny</string>
+  <string name="msg_share_explanation">Możesz udostępniać dane wyświetlając kod paskowy na swoim ekranie i skanując go innym telefonem.</string>
+  <string name="msg_share_text">Albo wpisz tekst</string>
+  <string name="msg_sure">Czy na pewno?</string>
+  <string name="msg_unmount_usb">Niestety, karta SD nie jest dostępna.</string>
+  <string name="preferences_actions_title">Akcja po odnalezieniu kodu\u2026</string>
+  <string name="preferences_auto_focus_title">Ustaw ostrość</string>
+  <string name="preferences_bulk_mode_summary">Skanowanie i zapisywanie wielu kodów kreskowych jeden po drugim w trybie ciągłym</string>
+  <string name="preferences_bulk_mode_title">Tryb ciągłego skanowania</string>
+  <string name="preferences_copy_to_clipboard_title">Kopiuj do schowka</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Zastępstwa: %s = zawartość, %f = format, %t = typ</string>
+  <string name="preferences_custom_product_search_title">Własny URL wyszukiwania</string>
+  <string name="preferences_decode_1D_title">Dekoduj kody 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Dekoduj Decode Matrix</string>
+  <string name="preferences_decode_QR_title">Dekoduj kody QR</string>
+  <string name="preferences_device_bug_workarounds_title">Obejścia błędów urządzeń</string>
+  <string name="preferences_disable_continuous_focus_summary">Używaj tylko standardowego trybu ostrości</string>
+  <string name="preferences_disable_continuous_focus_title">Ostrość</string>
+  <string name="preferences_disable_exposure_title">Bez ekspozycji</string>
+  <string name="preferences_front_light_auto">Automatyczny</string>
+  <string name="preferences_front_light_off">Nieaktywny</string>
+  <string name="preferences_front_light_on">Aktywny</string>
+  <string name="preferences_front_light_summary">Polepsza skanowanie przy małej ilości światła w niektórych telefonach, ale może powodować odbłysk. Nie działa na wszystkich telefonach.</string>
+  <string name="preferences_front_light_title">Używaj lampy frontowej</string>
+  <string name="preferences_general_title">Ustawienia ogólne</string>
+  <string name="preferences_invert_scan_summary">Skanowanie białych kodów kreskowych na czarnym tle. Nie dostępne w niektórych urządzeniach.</string>
+  <string name="preferences_invert_scan_title">Odwróć skanowania</string>
+  <string name="preferences_name">Ustawienia</string>
+  <string name="preferences_play_beep_title">Piszcz</string>
+  <string name="preferences_remember_duplicates_summary">Przechowuj zaskanowane kody w tej samej historii</string>
+  <string name="preferences_remember_duplicates_title">Pamiętaj, duplikaty</string>
+  <string name="preferences_result_title">Ustawienia wyników</string>
+  <string name="preferences_scanning_title">Podczas skanowania kodów kreskowych\u2026</string>
+  <string name="preferences_search_country">Szukaj kraju</string>
+  <string name="preferences_supplemental_summary">Spróbuj wyszukać więcej informacji na temat kodów kreskowych</string>
+  <string name="preferences_supplemental_title">Pobierz więcej informacji</string>
+  <string name="preferences_try_bsplus">Wypróbuj Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Wzbogacony o nowe funkcje i interfejs</string>
+  <string name="preferences_vibrate_title">Wibruj</string>
+  <string name="result_address_book">Znaleziono dane kontaktu</string>
+  <string name="result_calendar">Znaleziono wydarzenie z kalendarza</string>
+  <string name="result_email_address">Znaleziono adres email</string>
+  <string name="result_geo">Znaleziono współrzędne geograficzne</string>
+  <string name="result_isbn">Znaleziono książkę</string>
+  <string name="result_product">Znaleziono produkt</string>
+  <string name="result_sms">Znaleziono adres SMS</string>
+  <string name="result_tel">Znaleziono numer telefonu</string>
+  <string name="result_text">Znaleziono zwykły tekst</string>
+  <string name="result_uri">Znaleziono URL</string>
+  <string name="result_wifi">Znaleziono konfiguracje sieci</string>
+  <string name="sbc_name">Wyszukiwanie książek Google</string>
+  <string name="wifi_changing_network">Ubiegającymi się o przyłączenie do sieci\u2026</string>
+  <string name="wifi_ssid_label">Nazwa sieci</string>
+  <string name="wifi_type_label">Typ</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-pt/strings.xml b/src/java/PluginQR/res/values-pt/strings.xml
new file mode 100644
index 00000000..99829412
--- /dev/null
+++ b/src/java/PluginQR/res/values-pt/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Aplicações</string>
+  <string name="bookmark_picker_name">Favoritos</string>
+  <string name="button_add_calendar">Adicionar ao calendário</string>
+  <string name="button_add_contact">Adicionar contacto</string>
+  <string name="button_book_search">Procurar livro</string>
+  <string name="button_cancel">Cancelar</string>
+  <string name="button_custom_product_search">Pesquisa Personalizada</string>
+  <string name="button_dial">Marcar número</string>
+  <string name="button_email">Enviar e-mail</string>
+  <string name="button_get_directions">Obter direcções</string>
+  <string name="button_mms">Enviar MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Abrir navegador</string>
+  <string name="button_product_search">Procurar produto</string>
+  <string name="button_search_book_contents">Pesquisar conteúdos</string>
+  <string name="button_share_app">Aplicação</string>
+  <string name="button_share_bookmark">Favorito</string>
+  <string name="button_share_by_email">Partilhar via e-mail</string>
+  <string name="button_share_by_sms">Partilhar via SMS</string>
+  <string name="button_share_clipboard">Área de transferência</string>
+  <string name="button_share_contact">Contacto</string>
+  <string name="button_show_map">Visualizar mapa</string>
+  <string name="button_sms">Enviar SMS</string>
+  <string name="button_web_search">Pesquisa na Web</string>
+  <string name="button_wifi">Conectar à rede</string>
+  <string name="contents_contact">Informação de contacto</string>
+  <string name="contents_email">Endereço de e-mail</string>
+  <string name="contents_location">Coordenadas geográficas</string>
+  <string name="contents_phone">Número de telefone</string>
+  <string name="contents_sms">Endereço SMS</string>
+  <string name="contents_text">Texto simples</string>
+  <string name="history_clear_one_history_text">Limpar</string>
+  <string name="history_clear_text">Limpar histórico</string>
+  <string name="history_email_title">Histórico do Barcode Scanner</string>
+  <string name="history_empty">Vazio</string>
+  <string name="history_empty_detail">Não código de barras foram registrados</string>
+  <string name="history_send">Enviar histórico</string>
+  <string name="history_title">Histórico</string>
+  <string name="menu_encode_mecard">Usar MECARD</string>
+  <string name="menu_encode_vcard">Usar vCard</string>
+  <string name="menu_help">Ajuda</string>
+  <string name="menu_history">Histórico</string>
+  <string name="menu_settings">Definições</string>
+  <string name="menu_share">Partilhar</string>
+  <string name="msg_bulk_mode_scanned">Modo em massa: código de barras lido e guardado</string>
+  <string name="msg_camera_framework_bug">Desculpe, a câmera do Android encontrou um problema. Poderá precisar de reiniciar o dispositivo.</string>
+  <string name="msg_default_format">Formato</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Olá</string>
+  <string name="msg_default_status">Alinhar código de barras com o exemplo para ser lido.</string>
+  <string name="msg_default_time">Tempo</string>
+  <string name="msg_default_type">Tipo</string>
+  <string name="msg_encode_contents_failed">Não foi possível codificar o código de barradas apartir dos dados fornecidos.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Desculpe, a aplicação solicitada não pode ser iniciada. O conteúdo do código de barras poderá ser inválido.</string>
+  <string name="msg_redirect">Redirecionar</string>
+  <string name="msg_sbc_book_not_searchable">Desculpe, este livro não é pesquisável.</string>
+  <string name="msg_sbc_failed">Desculpe, foi encontrado um erro na pesquisa.</string>
+  <string name="msg_sbc_no_page_returned">Nenhuma página obtida</string>
+  <string name="msg_sbc_page">Página</string>
+  <string name="msg_sbc_results">Resultados</string>
+  <string name="msg_sbc_searching_book">A procurar livro\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Trecho não disponível</string>
+  <string name="msg_share_explanation">Pode partilhar dados exibindo um código de barras no seu ecrã e lendo-o com outro telemóvel</string>
+  <string name="msg_share_text">Ou introduza algum texto e pressione Enter</string>
+  <string name="msg_sure">Tem a certeza?</string>
+  <string name="msg_unmount_usb">Desculpe, o cartão SD não está disponível.</string>
+  <string name="preferences_actions_title">Quando o código de barras é encontrado\u2026</string>
+  <string name="preferences_auto_focus_title">Usar foco automático</string>
+  <string name="preferences_bulk_mode_summary">Ler e guardar códigos de barras continuamente</string>
+  <string name="preferences_bulk_mode_title">Modo em massa</string>
+  <string name="preferences_copy_to_clipboard_title">Copiar para a área de transferência</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Substituições: %s = conteúdos, %f = formato, %t = tipo</string>
+  <string name="preferences_custom_product_search_title">Pesquisa personalizada de URL</string>
+  <string name="preferences_decode_1D_title">Código de barras 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR Codes</string>
+  <string name="preferences_device_bug_workarounds_title">Soluções alternativas de dispositivos com erros</string>
+  <string name="preferences_disable_continuous_focus_summary">Use apenas o modo de focagem padrão</string>
+  <string name="preferences_disable_continuous_focus_title">No foco contínuo</string>
+  <string name="preferences_disable_exposure_title">Nenhuma exposição</string>
+  <string name="preferences_front_light_auto">Automático</string>
+  <string name="preferences_front_light_off">Inativo</string>
+  <string name="preferences_front_light_on">Ativo</string>
+  <string name="preferences_front_light_summary">Melhora a leitura em luz fraca em alguns telefones, mas pode causar clarões. Não disponível em certos dispositivos.</string>
+  <string name="preferences_front_light_title">Usar luz da frente</string>
+  <string name="preferences_general_title">Definições Gerais</string>
+  <string name="preferences_invert_scan_summary">Procurar por códigos de barras brancos em fundo preto. Não disponível em certos dispositivos.</string>
+  <string name="preferences_invert_scan_title">Inverter leitura</string>
+  <string name="preferences_name">Definições</string>
+  <string name="preferences_play_beep_title">Apitar</string>
+  <string name="preferences_remember_duplicates_summary">Guardar pesquisas múltiplas do mesmo código de barras no histórico</string>
+  <string name="preferences_remember_duplicates_title">Lembrar duplicados</string>
+  <string name="preferences_result_title">Definições do resultado</string>
+  <string name="preferences_scanning_title">Quando procurar por códigos de barras, descodificar\u2026</string>
+  <string name="preferences_search_country">País busca</string>
+  <string name="preferences_supplemental_summary">Tentar recuperar mais informação sobre os conteúdos dos códigos de barras</string>
+  <string name="preferences_supplemental_title">Recuperar mais informação</string>
+  <string name="preferences_try_bsplus">Tente Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Aprimorado com novos recursos e interface</string>
+  <string name="preferences_vibrate_title">Vibrar</string>
+  <string name="result_address_book">Info de contacto encontrada</string>
+  <string name="result_calendar">Evento de calendário encontrado</string>
+  <string name="result_email_address">Endereço de e-mail encontrado</string>
+  <string name="result_geo">Coordenadas geográficas encontradas</string>
+  <string name="result_isbn">Livro encontrado</string>
+  <string name="result_product">Produto encontrado</string>
+  <string name="result_sms">Endereço SMS encontrado</string>
+  <string name="result_tel">Número de telefone encontrado</string>
+  <string name="result_text">Texto simples encontrado</string>
+  <string name="result_uri">URL encontrado</string>
+  <string name="result_wifi">Configuração WLAN encontrados</string>
+  <string name="sbc_name">Pesquisa Google Book</string>
+  <string name="wifi_changing_network">Solicitando ligação à rede\u2026</string>
+  <string name="wifi_ssid_label">Nome da Rede</string>
+  <string name="wifi_type_label">Tipo</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-ro/strings.xml b/src/java/PluginQR/res/values-ro/strings.xml
new file mode 100644
index 00000000..25d66881
--- /dev/null
+++ b/src/java/PluginQR/res/values-ro/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2013 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Aplicații</string>
+  <string name="bookmark_picker_name">Nume însemnare</string>
+  <string name="button_add_calendar">Adaugă în calendar</string>
+  <string name="button_add_contact">Adaugă contact</string>
+  <string name="button_book_search">Caută carte</string>
+  <string name="button_cancel">Renunță</string>
+  <string name="button_custom_product_search">Căutare personalizată</string>
+  <string name="button_dial">Telefonează la numărul</string>
+  <string name="button_email">Trimite e-mail</string>
+  <string name="button_get_directions">Descarcă indicații</string>
+  <string name="button_mms">Trimite MMS</string>
+  <string name="button_ok">Acceptă</string>
+  <string name="button_open_browser">Deschide navigator</string>
+  <string name="button_product_search">Caută produs</string>
+  <string name="button_search_book_contents">Caută conținut</string>
+  <string name="button_share_app">Aplicație</string>
+  <string name="button_share_bookmark">Semn de carte</string>
+  <string name="button_share_by_email">Distribuie prin e-mail</string>
+  <string name="button_share_by_sms">Distribuie prin SMS</string>
+  <string name="button_share_clipboard">Clipboard</string>
+  <string name="button_share_contact">Contact</string>
+  <string name="button_show_map">Arată harta</string>
+  <string name="button_sms">Trimite SMS</string>
+  <string name="button_web_search">Caută pe web</string>
+  <string name="button_wifi">Conectează la rețea</string>
+  <string name="contents_contact">Informații de contact</string>
+  <string name="contents_email">Adresă de e-mail</string>
+  <string name="contents_location">Coordonate geografice</string>
+  <string name="contents_phone">Telefon</string>
+  <string name="contents_sms">Număr de SMS</string>
+  <string name="contents_text">Text</string>
+  <string name="history_clear_text">Șterge istoricul</string>
+  <string name="history_clear_one_history_text">Șterge</string>
+  <string name="history_email_title">Istoric Barcode Scanner</string>
+  <string name="history_empty">Nicio înregistare</string>
+  <string name="history_empty_detail">Nicio scanare de coduri de bară nu a fost înregistrată</string>
+  <string name="history_send">Trimite istoric</string>
+  <string name="history_title">Istoric</string>
+  <string name="menu_encode_mecard">Folosește MECARD</string>
+  <string name="menu_encode_vcard">Folosește vCard</string>
+  <string name="menu_help">Ajutor</string>
+  <string name="menu_history">Istoric</string>
+  <string name="menu_settings">Configurări</string>
+  <string name="menu_share">Distribuie</string>
+  <string name="msg_bulk_mode_scanned">Scanare continuă: cod de bare scanat și salvat</string>
+  <string name="msg_camera_framework_bug">Probleme cu camera foto. Repornește dispozitivul.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metadate</string>
+  <string name="msg_default_mms_subject">Servus</string>
+  <string name="msg_default_status">Plasează codul de bare în interiorul vizorului pentru a-l scana</string>
+  <string name="msg_default_time">Ora</string>
+  <string name="msg_default_type">Tip</string>
+  <string name="msg_encode_contents_failed">Codificare eșuată a codului de bare, din datele furnizate</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Aplicația solicitată nu a putut fi lansată. Codul de bare poate fi incorect.</string>
+  <string name="msg_redirect">Redirecționare</string>
+  <string name="msg_sbc_book_not_searchable">Cartea nu poate fi căutată</string>
+  <string name="msg_sbc_failed">Căutarea a întâmpinat probleme</string>
+  <string name="msg_sbc_no_page_returned">Nicio pagină găsită</string>
+  <string name="msg_sbc_page">Pagina</string>
+  <string name="msg_sbc_results">Rezultate</string>
+  <string name="msg_sbc_searching_book">Caută cartea\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Fragment indisponibil</string>
+  <string name="msg_share_explanation">Poți distribui datele afișând codul pe ecran și scanându-l cu alt aparat</string>
+  <string name="msg_share_text">Sau introdu textul și tastează Enter</string>
+  <string name="msg_sure">Confirmă</string>
+  <string name="msg_unmount_usb">Card SD inaccesibil</string>
+  <string name="preferences_actions_title">Când un cod de bare este găsit\u2026</string>
+  <string name="preferences_auto_focus_title">Folosește focalizare automată</string>
+  <string name="preferences_bulk_mode_summary">Scanează continuu și salvează codurile de bară</string>
+  <string name="preferences_bulk_mode_title">Scanare continuă</string>
+  <string name="preferences_copy_to_clipboard_title">Copiază în clipboard</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Înlocuiri: %s = conținut, %f = format, %t = tip</string>
+  <string name="preferences_custom_product_search_title">Căutare URL personalizată</string>
+  <string name="preferences_decode_1D_title">Coduri de bară 1D</string>
+  <string name="preferences_decode_Data_Matrix_title">Coduri Data Matrix</string>
+  <string name="preferences_decode_QR_title">Coduri QR</string>
+  <string name="preferences_device_bug_workarounds_title">Rezolvări rapide ale defectelor la aparat</string>
+  <string name="preferences_disable_continuous_focus_summary">Folosește focalizarea standard</string>
+  <string name="preferences_disable_continuous_focus_title">Dezactivează focalizarea continuă</string>
+  <string name="preferences_disable_exposure_title">Nicio expunere</string>
+  <string name="preferences_front_light_summary">Îmbunătățește scanarea în lumină redusă, dar poate cauza strălucire excesivă. Nu funcționează la toate aparatele.</string>
+  <string name="preferences_front_light_title">Folosește lumina frontală</string>
+  <string name="preferences_front_light_auto">Iluminare automată</string>
+  <string name="preferences_front_light_off">Oprește</string>
+  <string name="preferences_front_light_on">Pornește</string>
+  <string name="preferences_general_title">Configurări generale</string>
+  <string name="preferences_invert_scan_title">Scanare în negativ</string>
+  <string name="preferences_invert_scan_summary">Scanează coduri de bară albe pe fundal negru. Indisponibil pe unele aparate.</string>  
+  <string name="preferences_name">Configurări</string>
+  <string name="preferences_play_beep_title">Sună</string>
+  <string name="preferences_remember_duplicates_summary">Înregistrează în Istoric, scanări multiple ale aceluiași cod de bare</string>
+  <string name="preferences_remember_duplicates_title">Reține scanările duplicat</string>
+  <string name="preferences_result_title">Configurări rezultate</string>
+  <string name="preferences_scanning_title">Când scanează coduri de bară, decodifică\u2026</string>
+  <string name="preferences_search_country">Caută țara</string>
+  <string name="preferences_try_bsplus">Încearcă Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Îmbogățit cu noi funcționalități și o nouă interfață</string>
+  <string name="preferences_supplemental_summary">Încearcă preluarea mai multor informații din conținutul codurilor de bară</string>
+  <string name="preferences_supplemental_title">Preia mai multe informații</string>
+  <string name="preferences_vibrate_title">Vibrează</string>
+  <string name="result_address_book">Găsit informații de contact</string>
+  <string name="result_calendar">Găsit eveniment în calendar</string>
+  <string name="result_email_address">Găsit adresa de e-mail</string>
+  <string name="result_geo">Găsit coordonatele geografice</string>
+  <string name="result_isbn">Găsit cartea</string>
+  <string name="result_product">Găsit produs</string>
+  <string name="result_sms">Găsit număr de SMS</string>
+  <string name="result_tel">Găsit număr de telefon</string>
+  <string name="result_text">Găsit text</string>
+  <string name="result_uri">Găsit URL</string>
+  <string name="result_wifi">Găsit configurarea WLAN</string>
+  <string name="sbc_name">Căutare Google Cărți</string>
+  <string name="wifi_changing_network">Solicită conexiune la rețea\u2026</string>
+  <string name="wifi_ssid_label">Nume rețea</string>
+  <string name="wifi_type_label">Tip</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-ru/strings.xml b/src/java/PluginQR/res/values-ru/strings.xml
new file mode 100644
index 00000000..7e7eb4b4
--- /dev/null
+++ b/src/java/PluginQR/res/values-ru/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">Сканер штрих-кодов</string>
+  <string name="app_picker_name">Программы</string>
+  <string name="bookmark_picker_name">Закладки</string>
+  <string name="button_add_calendar">Добавить в календарь</string>
+  <string name="button_add_contact">Добавить контакт</string>
+  <string name="button_book_search">Поиск книги</string>
+  <string name="button_cancel">Отмена</string>
+  <string name="button_custom_product_search">Пользовательский поиск</string>
+  <string name="button_dial">Набрать номер</string>
+  <string name="button_email">Отправить e-mail</string>
+  <string name="button_get_directions">Проложить маршрут</string>
+  <string name="button_mms">Послать MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Открыть браузер</string>
+  <string name="button_product_search">Поиск товара</string>
+  <string name="button_search_book_contents">Поиск содержания книги</string>
+  <string name="button_share_app">Программа</string>
+  <string name="button_share_bookmark">Закладка</string>
+  <string name="button_share_by_email">Поделиться через эл. почту</string>
+  <string name="button_share_by_sms">Поделиться через SMS</string>
+  <string name="button_share_clipboard">Буфер обмена</string>
+  <string name="button_share_contact">Контакт</string>
+  <string name="button_show_map">Показать карту</string>
+  <string name="button_sms">Отправить SMS</string>
+  <string name="button_web_search">Поиск в интернете</string>
+  <string name="button_wifi">Подключиться к сети</string>
+  <string name="contents_contact">Контактная информация</string>
+  <string name="contents_email">Адрес эл. почты</string>
+  <string name="contents_location">Географические координаты</string>
+  <string name="contents_phone">Номер телефона</string>
+  <string name="contents_sms">Адрес для SMS</string>
+  <string name="contents_text">Текст</string>
+  <string name="history_clear_one_history_text">Удалить</string>
+  <string name="history_clear_text">Удалить историю</string>
+  <string name="history_email_title">История сканирования</string>
+  <string name="history_empty">Пусто</string>
+  <string name="history_empty_detail">Нет сохраненных штрих-кодов</string>
+  <string name="history_send">Отправить историю</string>
+  <string name="history_title">История</string>
+  <string name="menu_encode_mecard">Используйте MECARD</string>
+  <string name="menu_encode_vcard">Используйте vCard</string>
+  <string name="menu_help">Помощь</string>
+  <string name="menu_history">История</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="menu_share">Поделиться</string>
+  <string name="msg_bulk_mode_scanned">Массовый режим: сохранять историю сканирования</string>
+  <string name="msg_camera_framework_bug">К сожалению, возникла ошибка камеры. Вам может потребоваться перезагрузка устройства.</string>
+  <string name="msg_default_format">Формат</string>
+  <string name="msg_default_meta">Метаданные</string>
+  <string name="msg_default_mms_subject">Привет</string>
+  <string name="msg_default_status">Чтобы сканировать штрих-код, поместите его в прямоугольник видоискателя.</string>
+  <string name="msg_default_time">Время</string>
+  <string name="msg_default_type">Тип</string>
+  <string name="msg_encode_contents_failed">Невозможно создать штрих-код из текущих данных.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">К сожалению, запрошенное приложение не может быть запущенно. Возможно, содержимое штрих-кода повреждено.</string>
+  <string name="msg_redirect">Переслать</string>
+  <string name="msg_sbc_book_not_searchable">К сожалению, поиск книги не удался.</string>
+  <string name="msg_sbc_failed">К сожалению, возникла ошибка поиска.</string>
+  <string name="msg_sbc_no_page_returned">Ни одна страница не возвращена.</string>
+  <string name="msg_sbc_page">Страница</string>
+  <string name="msg_sbc_results">Результаты</string>
+  <string name="msg_sbc_searching_book">Поиск книги\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Фрагмент недоступен</string>
+  <string name="msg_share_explanation">Вы можете поделиться данными, сканируя штрих-код с вашего экрана другим телефоном.</string>
+  <string name="msg_share_text">Или введите текст</string>
+  <string name="msg_sure">Вы уверены?</string>
+  <string name="msg_unmount_usb">К сожалению, SD-карта не доступна.</string>
+  <string name="preferences_actions_title">Когда штрих-код найден\u2026</string>
+  <string name="preferences_auto_focus_title">Использовать автофокус</string>
+  <string name="preferences_bulk_mode_summary">Постоянно сканировать и сохранять штрих-коды</string>
+  <string name="preferences_bulk_mode_title">Массовое сканирование</string>
+  <string name="preferences_copy_to_clipboard_title">Копировать в буфер обмена</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Замены: %s = содержание, %f = формат, %t = тип</string>
+  <string name="preferences_custom_product_search_title">URL пользовательского поиска</string>
+  <string name="preferences_decode_1D_title">Распознавать линейные штрих-коды</string>
+  <string name="preferences_decode_Data_Matrix_title">Распознавать Data Matrix</string>
+  <string name="preferences_decode_QR_title">Распознавать QR-коды</string>
+  <string name="preferences_device_bug_workarounds_title">Исправление ошибок устройства</string>
+  <string name="preferences_disable_continuous_focus_summary">Стандартный режим фокусировки</string>
+  <string name="preferences_disable_continuous_focus_title">Отключить продолжительную фокусировку</string>
+  <string name="preferences_disable_exposure_title">Отключить экспозицию</string>
+  <string name="preferences_front_light_auto">Автоматически</string>
+  <string name="preferences_front_light_off">Выключен</string>
+  <string name="preferences_front_light_on">Включен</string>
+  <string name="preferences_front_light_summary">Улучшает распознавание в условиях низкой освещенности, но может вызвать блики. Работает не на всех устройствах.</string>
+  <string name="preferences_front_light_title">Фонарик</string>
+  <string name="preferences_general_title">Общие настройки</string>
+  <string name="preferences_invert_scan_summary">Сканирование белых штрих-кодов на черном фоне. Не работает на некоторых устройствах.</string>
+  <string name="preferences_invert_scan_title">Инвертировать</string>
+  <string name="preferences_name">Настройки</string>
+  <string name="preferences_play_beep_title">Пищать</string>
+  <string name="preferences_remember_duplicates_summary">Сохранять в истории результат сканирования одного и того же штрих-кода</string>
+  <string name="preferences_remember_duplicates_title">Запоминать дубликаты</string>
+  <string name="preferences_result_title">Настройки результатов</string>
+  <string name="preferences_scanning_title">При сканировании штрих-кодов\u2026</string>
+  <string name="preferences_search_country">Поиск страны</string>
+  <string name="preferences_supplemental_summary">Показывать подробную информацию о штрих-коде</string>
+  <string name="preferences_supplemental_title">Подробности</string>
+  <string name="preferences_try_bsplus">Попробуйте Сканер штрих-кодов+</string>
+  <string name="preferences_try_bsplus_summary">Расширение с новыми функциями и интерфейсом</string>
+  <string name="preferences_vibrate_title">Вибрировать</string>
+  <string name="result_address_book">Найдены контактные данные</string>
+  <string name="result_calendar">Найдено событие для календаря</string>
+  <string name="result_email_address">Найден адрес эл. почты</string>
+  <string name="result_geo">Найдены географические координаты</string>
+  <string name="result_isbn">Найдена книга</string>
+  <string name="result_product">Найден товар</string>
+  <string name="result_sms">Найден адрес для SMS</string>
+  <string name="result_tel">Найден номер телефона</string>
+  <string name="result_text">Найден текст</string>
+  <string name="result_uri">Найден URL</string>
+  <string name="result_wifi">Найдена конфигурация сети</string>
+  <string name="sbc_name">Поиск книг Google</string>
+  <string name="wifi_changing_network">Запрос подключения к сети\u2026</string>
+  <string name="wifi_ssid_label">Имя сети</string>
+  <string name="wifi_type_label">Тип</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-sk/strings.xml b/src/java/PluginQR/res/values-sk/strings.xml
new file mode 100644
index 00000000..f158de26
--- /dev/null
+++ b/src/java/PluginQR/res/values-sk/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Aplikácie</string>
+  <string name="bookmark_picker_name">Záložky</string>
+  <string name="button_add_calendar">Pridať do kalendára</string>
+  <string name="button_add_contact">Pridať kontakt</string>
+  <string name="button_book_search">Hľadať knihu</string>
+  <string name="button_cancel">Zrušiť</string>
+  <string name="button_custom_product_search">Vlastné vyhľadávanie</string>
+  <string name="button_dial">Vytočiť číslo</string>
+  <string name="button_email">Poslať e-mail</string>
+  <string name="button_get_directions">Získať pokyny</string>
+  <string name="button_mms">Poslať MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Otvoriť prehliadač</string>
+  <string name="button_product_search">Vyhľadať produkt</string>
+  <string name="button_search_book_contents">Vyhľadať obsah</string>
+  <string name="button_share_app">Aplikácia</string>
+  <string name="button_share_bookmark">Záložka</string>
+  <string name="button_share_by_email">Zdieľať cez e-mail</string>
+  <string name="button_share_by_sms">Zdieľať cez SMS</string>
+  <string name="button_share_clipboard">Schránka</string>
+  <string name="button_share_contact">Kontakt</string>
+  <string name="button_show_map">Zobraziť mapu</string>
+  <string name="button_sms">Poslať SMS</string>
+  <string name="button_web_search">Hľadať na webe</string>
+  <string name="button_wifi">Pripojiť sa sieti</string>
+  <string name="contents_contact">Informácie o kontakte</string>
+  <string name="contents_email">E-mailová adresa</string>
+  <string name="contents_location">Geografické súradnice</string>
+  <string name="contents_phone">Telefónne číslo</string>
+  <string name="contents_sms">SMS adresa</string>
+  <string name="contents_text">Obyčajný text</string>
+  <string name="history_clear_one_history_text">Vymazať</string>
+  <string name="history_clear_text">Vymazať históriu</string>
+  <string name="history_email_title">História Barcode Scanneru</string>
+  <string name="history_empty">Prázdna</string>
+  <string name="history_empty_detail">Žiadne čiarové kódy neboli zaznamenané</string>
+  <string name="history_send">Poslať históriu</string>
+  <string name="history_title">História</string>
+  <string name="menu_encode_mecard">Použiť MECARD</string>
+  <string name="menu_encode_vcard">Použiť vCard</string>
+  <string name="menu_help">Nápoveda</string>
+  <string name="menu_history">História</string>
+  <string name="menu_settings">Nastavenia</string>
+  <string name="menu_share">Zdieľať</string>
+  <string name="msg_bulk_mode_scanned">Hromadný režim: skenovanie a ukladanie čiarových kódov</string>
+  <string name="msg_camera_framework_bug">Ospravedlňujeme sa, fotoaparát narazil na problém. Možno bude potrebné reštartovať zariadenie.</string>
+  <string name="msg_default_format">Formát</string>
+  <string name="msg_default_meta">Metadáta</string>
+  <string name="msg_default_mms_subject">Ahoj</string>
+  <string name="msg_default_status">Umiestnite čiarový kód do vnútra obdĺžnika hľadáčiku pre skenovanie.</string>
+  <string name="msg_default_time">Čas</string>
+  <string name="msg_default_type">Typ</string>
+  <string name="msg_encode_contents_failed">Nie je možné zakódovať čiarový kód z poskytnutých údajov.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Ospravedlňujeme sa, požadovaná aplikácia nemohla byť spustená. Obsah čiarového kódu je možno neplatný.</string>
+  <string name="msg_redirect">Presmerovať</string>
+  <string name="msg_sbc_book_not_searchable">Ospravedlňujeme sa, táto kniha nie je prehliadateľná.</string>
+  <string name="msg_sbc_failed">Ospravedlňujeme sa, vyhľadávanie narazilo na problém.</string>
+  <string name="msg_sbc_no_page_returned">Nenašla sa žiadna stránka</string>
+  <string name="msg_sbc_page">Stránka</string>
+  <string name="msg_sbc_results">Výsledky</string>
+  <string name="msg_sbc_searching_book">Vyhľadáva sa kniha\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Úryvok nie je k dispozícii</string>
+  <string name="msg_share_explanation">Môžete zdieľať dáta zobrazením čiarového kódu na displeji vášho zariadenia a jeho zoskenovaním iným zariadením</string>
+  <string name="msg_share_text">Alebo zadajte nejaký text</string>
+  <string name="msg_sure">Ste si istí?</string>
+  <string name="msg_unmount_usb">Ospravedlňujeme sa, SD karta nie je prístupná.</string>
+  <string name="preferences_actions_title">Pri zistení čiarového kódu</string>
+  <string name="preferences_auto_focus_title">Použiť automatické zaostrenie</string>
+  <string name="preferences_bulk_mode_summary">Skenovať a ukladať veľa čiarových kódov bez prerušenia</string>
+  <string name="preferences_bulk_mode_title">Hromadný režim skenovania</string>
+  <string name="preferences_copy_to_clipboard_title">Kopírovať do schránky</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Nahradiť: %s = obsah, %f = formát, %t = typ</string>
+  <string name="preferences_custom_product_search_title">Vlastné vyhľadávanie URL</string>
+  <string name="preferences_decode_1D_title">1D čiarové kódy</string>
+  <string name="preferences_decode_Data_Matrix_title">Dáta Matrix</string>
+  <string name="preferences_decode_QR_title">QR kódy</string>
+  <string name="preferences_device_bug_workarounds_title">Možné chyby zariadenia</string>
+  <string name="preferences_disable_continuous_focus_summary">Použiť iba štandardné zaostrenie</string>
+  <string name="preferences_disable_continuous_focus_title">Nezaostrovať nepretržite</string>
+  <string name="preferences_disable_exposure_title">Bez expozície</string>
+  <string name="preferences_front_light_auto">Automatický</string>
+  <string name="preferences_front_light_off">Neaktívne</string>
+  <string name="preferences_front_light_on">Aktívne</string>
+  <string name="preferences_front_light_summary">Použiť prisvetlenie</string>
+  <string name="preferences_front_light_title">Použiť predné svetlo</string>
+  <string name="preferences_general_title">Všeobecné nastavenia</string>
+  <string name="preferences_invert_scan_summary">Skenovať biele čiarové kódy na čiernom pozadí. Nie je k dispozícii na všetkých zariadeniach.</string>
+  <string name="preferences_invert_scan_title">Invertované skenovanie</string>
+  <string name="preferences_name">Nastavenia</string>
+  <string name="preferences_play_beep_title">Zvuková signalizácia</string>
+  <string name="preferences_remember_duplicates_summary">Uložiť viacnásobné skenovanie do jednej histórie čiarového kódu</string>
+  <string name="preferences_remember_duplicates_title">Zapamätať si duplikáty</string>
+  <string name="preferences_result_title">Nastavenia výsledku</string>
+  <string name="preferences_scanning_title">Dekódovať čiarové kódy</string>
+  <string name="preferences_search_country">Vyhľadávať v krajine</string>
+  <string name="preferences_supplemental_summary">Skúsiť získať viac informácií o obsahu čiarového kódu</string>
+  <string name="preferences_supplemental_title">Získať viac informácií</string>
+  <string name="preferences_try_bsplus">Vyskúšajte Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Rozšírený o nové funkcie a prostredie</string>
+  <string name="preferences_vibrate_title">Vibrovať</string>
+  <string name="result_address_book">Nájdená informácia o kontakte</string>
+  <string name="result_calendar">Nájdená udalosť kalendára</string>
+  <string name="result_email_address">Nájdená e-mailová adresa</string>
+  <string name="result_geo">Nájdená zemepisná súradnica</string>
+  <string name="result_isbn">Nájdená kniha</string>
+  <string name="result_product">Nájdený tovar</string>
+  <string name="result_sms">Nájdená SMS adresa</string>
+  <string name="result_tel">Nájdené telefónne číslo</string>
+  <string name="result_text">Nájdený obyčajný text</string>
+  <string name="result_uri">Nájdená URL</string>
+  <string name="result_wifi">Nájdená konfigurácia WLAN</string>
+  <string name="sbc_name">Vyhľadať v Google Knihy</string>
+  <string name="wifi_changing_network">Požiadavka na pripojenie k sieti\u2026</string>
+  <string name="wifi_ssid_label">Názov sieťového pripojenia</string>
+  <string name="wifi_type_label">Typ</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-sl/strings.xml b/src/java/PluginQR/res/values-sl/strings.xml
new file mode 100644
index 00000000..59bf6ff0
--- /dev/null
+++ b/src/java/PluginQR/res/values-sl/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Aplikacije</string>
+  <string name="bookmark_picker_name">Zaznamki</string>
+  <string name="button_add_calendar">Dodaj v koledar</string>
+  <string name="button_add_contact">Dodaj kontakt</string>
+  <string name="button_book_search">Išči knjigo</string>
+  <string name="button_cancel">Prekliči</string>
+  <string name="button_custom_product_search">Iskanje po meri</string>
+  <string name="button_dial">Pokliči številko</string>
+  <string name="button_email">Pošlji e-mail</string>
+  <string name="button_get_directions">Dobi smer</string>
+  <string name="button_mms">Pošlji MMS</string>
+  <string name="button_ok">V redu</string>
+  <string name="button_open_browser">Odpri brskalnik</string>
+  <string name="button_product_search">Iskanje po izdelkih</string>
+  <string name="button_search_book_contents">Išči vsebino</string>
+  <string name="button_share_app">Aplikacija</string>
+  <string name="button_share_bookmark">Zaznamek</string>
+  <string name="button_share_by_email">Deli preko e-maila</string>
+  <string name="button_share_by_sms">Deli preko SMS</string>
+  <string name="button_share_clipboard">Odložišče</string>
+  <string name="button_share_contact">Kontakt</string>
+  <string name="button_show_map">Pokaži zemljevid</string>
+  <string name="button_sms">Pošlji SMS</string>
+  <string name="button_web_search">Spletno iskanje</string>
+  <string name="button_wifi">Poveži se na omrežje</string>
+  <string name="contents_contact">Informacije o kontaktu</string>
+  <string name="contents_email">E-naslov</string>
+  <string name="contents_location">Geografske koordinate</string>
+  <string name="contents_phone">Telefonska številka</string>
+  <string name="contents_sms">SMS naslov</string>
+  <string name="contents_text">Tekst</string>
+  <string name="history_clear_one_history_text">Pobriši</string>
+  <string name="history_clear_text">Pobriši zgodovino</string>
+  <string name="history_email_title">Barcode Scanner zgodovina</string>
+  <string name="history_empty">Prazne</string>
+  <string name="history_empty_detail">Št črtne kode scans so bile zabeležene</string>
+  <string name="history_send">Pošlji zgodovino</string>
+  <string name="history_title">Zgodovina</string>
+  <string name="menu_encode_mecard">Uporaba MECARD</string>
+  <string name="menu_encode_vcard">Uporaba vCard</string>
+  <string name="menu_help">Pomoč</string>
+  <string name="menu_history">Zgodovina</string>
+  <string name="menu_settings">Nastavitve</string>
+  <string name="menu_share">Deli</string>
+  <string name="msg_bulk_mode_scanned">Slikanje na debelo: črtna koda prebrana in shranjena</string>
+  <string name="msg_camera_framework_bug">Oprostite, Android kamera je naletela na težave. Mogoče boste morali ponovno zagnati napravo.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metapodatki</string>
+  <string name="msg_default_mms_subject">Živjo</string>
+  <string name="msg_default_status">Za branje postavite črtno kodo znotraj iskala.</string>
+  <string name="msg_default_time">Čas</string>
+  <string name="msg_default_type">Tip</string>
+  <string name="msg_encode_contents_failed">Ni bilo mogoče narediti črtne kode iz podanih podatkov</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Oprostite, zahtevana aplikacija se ne more zagnati. Lahko da gre za napačno vsebino črtne kode.</string>
+  <string name="msg_redirect">Preusmeritev</string>
+  <string name="msg_sbc_book_not_searchable">Oprostite, po tej knjigi se ne da iskati.</string>
+  <string name="msg_sbc_failed">Oprostite, iskanje je naletelo na napako.</string>
+  <string name="msg_sbc_no_page_returned">Brez vrnjene strani.</string>
+  <string name="msg_sbc_page">Stran</string>
+  <string name="msg_sbc_results">Rezultati</string>
+  <string name="msg_sbc_searching_book">Iščem knjigo\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Košček ni na voljo</string>
+  <string name="msg_share_explanation">Lahko delite podatke s prikazom črtne kode na vašem zaslonu in branju le-te z drugim mobilnim telefonom.</string>
+  <string name="msg_share_text">Ali vnesite nekaj besedila</string>
+  <string name="msg_sure">Ali ste prepričani?</string>
+  <string name="msg_unmount_usb">Oprostite, do SD kartice ni možno dostopati</string>
+  <string name="preferences_actions_title">Ko je črtna koda najdena\u2026</string>
+  <string name="preferences_auto_focus_title">Uporabite samodejno ostrenje</string>
+  <string name="preferences_bulk_mode_summary">Beri in shrani več črtnih kod zaporedoma</string>
+  <string name="preferences_bulk_mode_title">Branje črtnih kod na debelo</string>
+  <string name="preferences_copy_to_clipboard_title">Kopiraj v beležnico</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Zamenjave: %s = vsebin, %f = format, %t = vrsta</string>
+  <string name="preferences_custom_product_search_title">URL za iskanje po meri</string>
+  <string name="preferences_decode_1D_title">1D črtno kodo</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR kodo</string>
+  <string name="preferences_device_bug_workarounds_title">Naprava Bug Rešitve</string>
+  <string name="preferences_disable_continuous_focus_summary">Uporabljajte samo standardni način ostrenja</string>
+  <string name="preferences_disable_continuous_focus_title">Št stalna osredotočenost</string>
+  <string name="preferences_disable_exposure_title">Nobena izpostavljenost</string>
+  <string name="preferences_front_light_auto">Samodejno</string>
+  <string name="preferences_front_light_off">Neaktivno</string>
+  <string name="preferences_front_light_on">Aktivna</string>
+  <string name="preferences_front_light_summary">Izboljša branje pri slabi svetlobi na nekaterih telefonih, a lahko povzroči blesk. Ne deluje na vseh telefonih.</string>
+  <string name="preferences_front_light_title">Uporabite sprednjo luč</string>
+  <string name="preferences_general_title">Splošne nastavitve</string>
+  <string name="preferences_invert_scan_summary">Scan za beli črtne kode na črni podlagi. Ni na voljo na nekaterih napravah.</string>
+  <string name="preferences_invert_scan_title">Obrni skeniranje</string>
+  <string name="preferences_name">Nastavitve</string>
+  <string name="preferences_play_beep_title">Pisk</string>
+  <string name="preferences_remember_duplicates_summary">Shranjevanje več skandiranje iste črtne kode v zgodovini</string>
+  <string name="preferences_remember_duplicates_title">Zapomni si dvojnikov</string>
+  <string name="preferences_result_title">Nastavitve rezultatov branja</string>
+  <string name="preferences_scanning_title">Ko berete črtne kode, preberi\u2026</string>
+  <string name="preferences_search_country">Išči po državi</string>
+  <string name="preferences_supplemental_summary">Poskusite pridobiti več informacij o vsebini črtne kode</string>
+  <string name="preferences_supplemental_title">Naloži Več info</string>
+  <string name="preferences_try_bsplus">Poskusite Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Izboljšan z novimi funkcijami in vmesnikom</string>
+  <string name="preferences_vibrate_title">Vibriraj</string>
+  <string name="result_address_book">Najdene informacije o kontaktu</string>
+  <string name="result_calendar">Najden koledarski dogodek</string>
+  <string name="result_email_address">Najden e-naslov</string>
+  <string name="result_geo">Najdene geografske koordinate</string>
+  <string name="result_isbn">Najdena knjiga</string>
+  <string name="result_product">Najden produkt</string>
+  <string name="result_sms">Najden SMS naslov</string>
+  <string name="result_tel">Najdena telefonska številka</string>
+  <string name="result_text">Najden tekst</string>
+  <string name="result_uri">Najden URL</string>
+  <string name="result_wifi">Najdene WLAN nastavitve</string>
+  <string name="sbc_name">Iskanje z Google Book Search</string>
+  <string name="wifi_changing_network">Zahteva priključitev na omrežje\u2026</string>
+  <string name="wifi_ssid_label">Ime omrežja</string>
+  <string name="wifi_type_label">Tip</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-sv/strings.xml b/src/java/PluginQR/res/values-sv/strings.xml
new file mode 100644
index 00000000..51054239
--- /dev/null
+++ b/src/java/PluginQR/res/values-sv/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  
+  <string name="app_picker_name">Applikationer</string>
+  <string name="bookmark_picker_name">Bokmärken</string>
+  <string name="button_add_calendar">Lägg till i kalender</string>
+  <string name="button_add_contact">Lägg till kontakt</string>
+  <string name="button_book_search">Boksökning</string>
+  <string name="button_cancel">Avbryt</string>
+  <string name="button_custom_product_search">Anpassad sökning</string>
+  <string name="button_dial">Slå nummer</string>
+  <string name="button_email">Skicka e-post</string>
+  <string name="button_get_directions">Få anvisningar</string>
+  <string name="button_mms">Skicka MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Öppna webbläsare</string>
+  <string name="button_product_search">Produktsök</string>
+  <string name="button_search_book_contents">Sökinnehåll</string>
+  <string name="button_share_app">Applikation</string>
+  <string name="button_share_bookmark">Bokmärke</string>
+  <string name="button_share_by_email">Dela via e-post</string>
+  <string name="button_share_by_sms">Dela via SMS</string>
+  <string name="button_share_clipboard">Klippbord</string>
+  <string name="button_share_contact">Kontakt</string>
+  <string name="button_show_map">Visa karta</string>
+  <string name="button_sms">Skicka SMS</string>
+  <string name="button_web_search">Webbsök</string>
+  <string name="button_wifi">Anslut till nätverk</string>
+  <string name="contents_contact">Kontaktinfo</string>
+  <string name="contents_email">E-postadress</string>
+  <string name="contents_location">Geografiska koordinater</string>
+  <string name="contents_phone">Telefonnummer</string>
+  <string name="contents_sms">SMS-adress</string>
+  <string name="contents_text">Vanlig text</string>
+  <string name="history_clear_one_history_text">Rensa</string>
+  <string name="history_clear_text">Rensa historik</string>
+  <string name="history_email_title">Historik inskannade streckkoder</string>
+  <string name="history_empty">Tom</string>
+  <string name="history_empty_detail">Inga inskannade streckkoder har registrerats</string>
+  <string name="history_send">Skicka historik</string>
+  <string name="history_title">Historik</string>
+  <string name="menu_encode_mecard">Använd MECARD</string>
+  <string name="menu_encode_vcard">Använd vCard</string>
+  <string name="menu_help">Hjälp</string>
+  <string name="menu_history">Historik</string>
+  <string name="menu_settings">Inställningar</string>
+  <string name="menu_share">Dela</string>
+  <string name="msg_bulk_mode_scanned">Bulk-läge: streckkod har inskannats och sparats</string>
+  <string name="msg_camera_framework_bug">Det uppstod tyvärr ett fel med Androidkameran.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Hej</string>
+  <string name="msg_default_status">Placera steckkoden inom sökarens rektangel för att läsa den.</string>
+  <string name="msg_default_time">Tid</string>
+  <string name="msg_default_type">Typ</string>
+  <string name="msg_encode_contents_failed">Det gick inte att avkoda en streckkod från den erhållna informationen.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Den begärda applikationen kunde tyvärr inte startas. Streckkodens innehåll kan vara ogiltigt.</string>
+  <string name="msg_redirect">Omdirigering</string>
+  <string name="msg_sbc_book_not_searchable">Den här boken är tyvärr inte sökbar.</string>
+  <string name="msg_sbc_failed">Det uppstod tyvärr ett fel vid sökning. </string>
+  <string name="msg_sbc_no_page_returned">Ingen sida funnen</string>
+  <string name="msg_sbc_page">Sida</string>
+  <string name="msg_sbc_results">Resultat</string>
+  <string name="msg_sbc_searching_book">Söker bok\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Utdrag ej tillgängligt</string>
+  <string name="msg_share_explanation">Du kan dela information genom att visa en streckkod på din skärm och sedan skanna in den med en annan telefon.</string>
+  <string name="msg_share_text">Eller skriv in text och tryck Enter</string>
+  <string name="msg_sure">Är du säker?</string>
+  <string name="msg_unmount_usb">SD-kortet är tyvärr inte tillgängligt.</string>
+  <string name="preferences_actions_title">När en streckkod hittas\u2026</string>
+  <string name="preferences_auto_focus_title">Använd autofokus</string>
+  <string name="preferences_bulk_mode_summary">Skanna och spara flera streckkoder samtidigt</string>
+  <string name="preferences_bulk_mode_title">Bulk-inskanningläge</string>
+  <string name="preferences_copy_to_clipboard_title">Kopiera till urklipp</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Ersättningar: %s = innehåll, %f = format, %t = typ</string>
+  <string name="preferences_custom_product_search_title">Anpassad sökning URL</string>
+  <string name="preferences_decode_1D_title">1D steckkod</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR Code</string>
+  <string name="preferences_device_bug_workarounds_title">Bugglösningar för enhet</string>
+  <string name="preferences_disable_continuous_focus_summary">Använd endast standardfokusläge</string>
+  <string name="preferences_disable_continuous_focus_title">Ingen kontinuerlig fokus</string>
+  <string name="preferences_disable_exposure_title">Ingen exponering</string>
+  <string name="preferences_front_light_auto">Automatisk</string>
+  <string name="preferences_front_light_off">Inaktiv</string>
+  <string name="preferences_front_light_on">Aktiv</string>
+  <string name="preferences_front_light_summary">Förbättrar inskanning i svag belysing på vissa telefoner, men kan orsaka bländning. Ej tillgängligt på vissa enheter.</string>
+  <string name="preferences_front_light_title">Använd frontljus</string>
+  <string name="preferences_general_title">Grundläggande inställningar</string>
+  <string name="preferences_invert_scan_summary">Skanna in vita streckkoder mot svart bakgrund. Ej tillgängligt på vissa enheter. </string>
+  <string name="preferences_invert_scan_title">Invertera inskanning</string>
+  <string name="preferences_name">Inställningar</string>
+  <string name="preferences_play_beep_title">Ton</string>
+  <string name="preferences_remember_duplicates_summary">Lagra flera inskanningar av samma streckkod i historik</string>
+  <string name="preferences_remember_duplicates_title">Kom ihåg dubletter</string>
+  <string name="preferences_result_title">Resultatinställningar</string>
+  <string name="preferences_scanning_title">När du skannar in streckkoder, avkoda\u2026</string>
+  <string name="preferences_search_country">Sök land</string>
+  <string name="preferences_supplemental_summary">Försök hämta mer information om streckkodens innehåll</string>
+  <string name="preferences_supplemental_title">Hämta mer info</string>
+  <string name="preferences_try_bsplus">Prova Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Förstärkt med nya funktioner och gränssnitt</string>
+  <string name="preferences_vibrate_title">Vibrera</string>
+  <string name="result_address_book">Hittade kontaktinformation</string>
+  <string name="result_calendar">Hittade kalenderhändelser</string>
+  <string name="result_email_address">Hittade e-postadress</string>
+  <string name="result_geo">Hittade geografiska koordinater</string>
+  <string name="result_isbn">Hittade bok</string>
+  <string name="result_product">Hittade produkt</string>
+  <string name="result_sms">Hittade SMS-adress</string>
+  <string name="result_tel">Hittade telefonnummer</string>
+  <string name="result_text">Hittade vanlig text</string>
+  <string name="result_uri">Hittade URL</string>
+  <string name="result_wifi">Hittade WLAN-konfiguration</string>
+  <string name="sbc_name">Google Book Search</string>
+  <string name="wifi_changing_network">Begär anslutning till nätverk\u2026</string>
+  <string name="wifi_ssid_label">Nätverksnamn</string>
+  <string name="wifi_type_label">Typ</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-tr/strings.xml b/src/java/PluginQR/res/values-tr/strings.xml
new file mode 100644
index 00000000..e17c2493
--- /dev/null
+++ b/src/java/PluginQR/res/values-tr/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">Barkod Tarayıcısı</string>
+  <string name="app_picker_name">Uygulamalar</string>
+  <string name="bookmark_picker_name">Yer imleri</string>
+  <string name="button_add_calendar">Takvime ekle</string>
+  <string name="button_add_contact">Kişi ekle</string>
+  <string name="button_book_search">Kitap Arama</string>
+  <string name="button_cancel">İptal</string>
+  <string name="button_custom_product_search">Özel arama</string>
+  <string name="button_dial">Numaraya çağrı</string>
+  <string name="button_email">Email gönder</string>
+  <string name="button_get_directions">Yön bilgisi al</string>
+  <string name="button_mms">MMS gönder</string>
+  <string name="button_ok">Tamam</string>
+  <string name="button_open_browser">Tarayıcıyı aç</string>
+  <string name="button_product_search">Ürün arama</string>
+  <string name="button_search_book_contents">İçerik arama</string>
+  <string name="button_share_app">Uygulama paylaş</string>
+  <string name="button_share_bookmark">Yer imi paylaş</string>
+  <string name="button_share_by_email">Email ile paylaş</string>
+  <string name="button_share_by_sms">SMS ile paylaş</string>
+  <string name="button_share_clipboard">Pano</string>
+  <string name="button_share_contact">Kişi</string>
+  <string name="button_show_map">Haritayı göster</string>
+  <string name="button_sms">SMS gönder</string>
+  <string name="button_web_search">Webde ara</string>
+  <string name="button_wifi">Ağa bağlan</string>
+  <string name="contents_contact">Kişi bilgisi</string>
+  <string name="contents_email">Email adresi</string>
+  <string name="contents_location">Coğrafi koordinatlar</string>
+  <string name="contents_phone">Telefon numarası</string>
+  <string name="contents_sms">SMS adresi</string>
+  <string name="contents_text">Düz metin</string>
+  <string name="history_clear_one_history_text">Temizle</string>
+  <string name="history_clear_text">Geçmişi temizle</string>
+  <string name="history_email_title">Barkod Tarayıcı geçmişi</string>
+  <string name="history_empty">Boş</string>
+  <string name="history_empty_detail">Yok barkod taramaları kaydedildi</string>
+  <string name="history_send">Geçmişi gönder</string>
+  <string name="history_title">Geçmiş</string>
+  <string name="menu_encode_mecard">MECARD kullanın</string>
+  <string name="menu_encode_vcard">VCard kullanın</string>
+  <string name="menu_help">Yardım</string>
+  <string name="menu_history">Geçmiş</string>
+  <string name="menu_settings">Ayarlar</string>
+  <string name="menu_share">Paylaş</string>
+  <string name="msg_bulk_mode_scanned">Toplu modu: taranan ve kaydedilen barkodlar</string>
+  <string name="msg_camera_framework_bug">Üzgünüz, Android kamera bir sorunla karşılaştı. Cihazı yeniden başlatmanız gerekebilir.</string>
+  <string name="msg_default_format">Biçim</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Merhaba</string>
+  <string name="msg_default_status">Barkodu taramak için vizördeki dikdörtgenin içerisine yerleştirin.</string>
+  <string name="msg_default_time">Süre</string>
+  <string name="msg_default_type">Tür</string>
+  <string name="msg_encode_contents_failed">Sağlanan verilerden bir barkod kodlanamadı.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Üzgünüz, istenen uygulama başlatılamadı. Barkod içeriği geçersiz olabilir.</string>
+  <string name="msg_redirect">Yönlendirme</string>
+  <string name="msg_sbc_book_not_searchable">Üzgünüz, bu kitapla ilgili arama yapılamıyor.</string>
+  <string name="msg_sbc_failed">Üzgünüz, arama esnasında bir sorun oluştu.</string>
+  <string name="msg_sbc_no_page_returned">Dönen sayfa yok</string>
+  <string name="msg_sbc_page">Sayfa</string>
+  <string name="msg_sbc_results">Sonuçlar</string>
+  <string name="msg_sbc_searching_book">Kitap aranıyor\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Parçacık yok</string>
+  <string name="msg_share_explanation">Ekranınızda görüntülediğiniz barkodu başka bir telefonla tarayarak veri paylaşabilirsiniz.</string>
+  <string name="msg_share_text">Veya yazın bazı metin</string>
+  <string name="msg_sure">Emin misin?</string>
+  <string name="msg_unmount_usb">Lütfen USB depolamayı devre dışı bırakın.</string>
+  <string name="preferences_actions_title">Bir barkod bulunduğu zaman\u2026</string>
+  <string name="preferences_auto_focus_title">Otomatik odaklama kullanın</string>
+  <string name="preferences_bulk_mode_summary">Birden fazla barkodu toplu olarak taramak ve kaydetmek için</string>
+  <string name="preferences_bulk_mode_title">Toplu tarama modu</string>
+  <string name="preferences_copy_to_clipboard_title">Panoya kopyala</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Yerine Koyma: %s = içeriği, %f = biçim, %t = tip</string>
+  <string name="preferences_custom_product_search_title">Özel arama adresi</string>
+  <string name="preferences_decode_1D_title">1D barkodları</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR barkodları</string>
+  <string name="preferences_device_bug_workarounds_title">Cihaz Hata Geçici Çözümler</string>
+  <string name="preferences_disable_continuous_focus_summary">Sadece standart odaklama modunu kullanın</string>
+  <string name="preferences_disable_continuous_focus_title">Hayır sürekli odak</string>
+  <string name="preferences_disable_exposure_title">Maruziyet</string>
+  <string name="preferences_front_light_auto">Otomatik</string>
+  <string name="preferences_front_light_off">Atıl</string>
+  <string name="preferences_front_light_on">Aktif</string>
+  <string name="preferences_front_light_summary">Bazı telefonlarda düşük ışıkta taramayı iyileştirir, ancak parlamaya neden olabilir. Tüm telefonlarda sonuç vermez.</string>
+  <string name="preferences_front_light_title">Ön ışığı kullan</string>
+  <string name="preferences_general_title">Genel ayarlar</string>
+  <string name="preferences_invert_scan_summary">Siyah zemin üzerine beyaz barkod tarama. Bazı cihazlar mevcut değildir.</string>
+  <string name="preferences_invert_scan_title">Tarama haricindekileri</string>
+  <string name="preferences_name">Ayarlar</string>
+  <string name="preferences_play_beep_title">Bip</string>
+  <string name="preferences_remember_duplicates_summary">Aynı barkoda ait farklı taramaları kayıtlarda depola</string>
+  <string name="preferences_remember_duplicates_title">Aynı barkodları hatırla</string>
+  <string name="preferences_result_title">Sonuç ayarları</string>
+  <string name="preferences_scanning_title">Barkodlar taraması \u2026</string>
+  <string name="preferences_search_country">Arama Ülke</string>
+  <string name="preferences_supplemental_summary">Barkod içeriği hakkında daha fazla bilgi almayı dene</string>
+  <string name="preferences_supplemental_title">Daha fazla bilgi </string>
+  <string name="preferences_try_bsplus">Barkod Tarayıcısı+ deneyin</string>
+  <string name="preferences_try_bsplus_summary">Yeni özellikler ve arayüz ile gelişmiş</string>
+  <string name="preferences_vibrate_title">Titreşim </string>
+  <string name="result_address_book">Bulunan kişi bilgisi</string>
+  <string name="result_calendar">Bulunan takvim etkinliği</string>
+  <string name="result_email_address">Bulunan Email adresi</string>
+  <string name="result_geo">Bulunan coğrafi koordinatlar</string>
+  <string name="result_isbn">Bulunan kitap</string>
+  <string name="result_product">Bulunan ürün</string>
+  <string name="result_sms">Bulunan SMS adresi</string>
+  <string name="result_tel">Bulunan telefon numarası</string>
+  <string name="result_text">Bulunan düz metin</string>
+  <string name="result_uri">Bulunan URL</string>
+  <string name="result_wifi">Bulunan Wi-Fi konfigürasyonu</string>
+  <string name="sbc_name">Google Kitap Arama</string>
+  <string name="wifi_changing_network">Ağa bir bağlantı isteğinde\u2026</string>
+  <string name="wifi_ssid_label">Ağ adı</string>
+  <string name="wifi_type_label">Tip</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-uk/strings.xml b/src/java/PluginQR/res/values-uk/strings.xml
new file mode 100644
index 00000000..b50a463b
--- /dev/null
+++ b/src/java/PluginQR/res/values-uk/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2013 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">Сканер штрих-кодів</string>
+  <string name="app_picker_name">Програми</string>
+  <string name="bookmark_picker_name">Закладки</string>
+  <string name="button_add_calendar">Додати в календар</string>
+  <string name="button_add_contact">Додати контакт</string>
+  <string name="button_book_search">Пошук книги</string>
+  <string name="button_cancel">Відміна</string>
+  <string name="button_custom_product_search">Користувацький пошук</string>
+  <string name="button_dial">Набрати номер</string>
+  <string name="button_email">Відправити e-mail</string>
+  <string name="button_get_directions">Прокласти маршрут</string>
+  <string name="button_mms">Відправити MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Відкрити браузер</string>
+  <string name="button_product_search">Пошук товара</string>
+  <string name="button_search_book_contents">Пошук вмісту книги</string>
+  <string name="button_share_app">Програма</string>
+  <string name="button_share_bookmark">Закладка</string>
+  <string name="button_share_by_email">Поділитись через e-mail</string>
+  <string name="button_share_by_sms">Поділитись через SMS</string>
+  <string name="button_share_clipboard">Буфер обміну</string>
+  <string name="button_share_contact">Контакт</string>
+  <string name="button_show_map">Показати карту</string>
+  <string name="button_sms">Відправити SMS</string>
+  <string name="button_web_search">Пошук в інтернеті</string>
+  <string name="button_wifi">Підключитись до мережі</string>
+  <string name="contents_contact">Контактна інформація</string>
+  <string name="contents_email">Адреса e-mail</string>
+  <string name="contents_location">Географічні координати</string>
+  <string name="contents_phone">Номер телефону</string>
+  <string name="contents_sms">Адреса для SMS</string>
+  <string name="contents_text">Текст</string>
+  <string name="history_clear_one_history_text">Видалити</string>
+  <string name="history_clear_text">Видалити історію</string>
+  <string name="history_email_title">Історія сканування</string>
+  <string name="history_empty">Пусто</string>
+  <string name="history_empty_detail">Нема збережених штрих-кодів</string>
+  <string name="history_send">Відправити історію</string>
+  <string name="history_title">Історія</string>
+  <string name="menu_encode_mecard">Використовуйте MECARD</string>
+  <string name="menu_encode_vcard">Використовуйте vCard</string>
+  <string name="menu_help">Допомога</string>
+  <string name="menu_history">Історія</string>
+  <string name="menu_settings">Налаштування</string>
+  <string name="menu_share">Поділитись</string>
+  <string name="msg_bulk_mode_scanned">Масовий режим: зберігати історію сканування</string>
+  <string name="msg_camera_framework_bug">Нажаль, виникла помилка камери. Можливо, вам знадобиться перезавантажити пристрій.</string>
+  <string name="msg_default_format">Формат</string>
+  <string name="msg_default_meta">Метадані</string>
+  <string name="msg_default_mms_subject">Привіт</string>
+  <string name="msg_default_status">Щоб відсканувати штрих-код, помістіть його в прямокутник видошукача.</string>
+  <string name="msg_default_time">Час</string>
+  <string name="msg_default_type">Тип</string>
+  <string name="msg_encode_contents_failed">Неможливо створити штрих-код з наданих даних.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Нажаль, неможливо запустити дану програму. Можливо, вміст штрих-коду пошкоджено.</string>
+  <string name="msg_redirect">Переслати</string>
+  <string name="msg_sbc_book_not_searchable">Нажаль, пошук книги був невдалим.</string>
+  <string name="msg_sbc_failed">Нажаль, виникла помилка пошуку.</string>
+  <string name="msg_sbc_no_page_returned">Не знайдено жодної сторінки.</string>
+  <string name="msg_sbc_page">Сторінка</string>
+  <string name="msg_sbc_results">Результати</string>
+  <string name="msg_sbc_searching_book">Пошук книги\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Фрагмент недоступний</string>
+  <string name="msg_share_explanation">Ви можете ділитись даними, скануючи штрих-код з вашого екрану іншим телефоном.</string>
+  <string name="msg_share_text">Або введіть текст</string>
+  <string name="msg_sure">Ви впевнені?</string>
+  <string name="msg_unmount_usb">Нажаль, SD-карта недоступна.</string>
+  <string name="preferences_actions_title">Коли штрих-код знайдено\u2026</string>
+  <string name="preferences_auto_focus_title">Використовувати автофокус</string>
+  <string name="preferences_bulk_mode_summary">Постійно сканувати та зберігати штрих-коди</string>
+  <string name="preferences_bulk_mode_title">Масове сканування</string>
+  <string name="preferences_copy_to_clipboard_title">Скопіювати до буферу обміну</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Заміни: %s = вміст, %f = формат, %t = тип</string>
+  <string name="preferences_custom_product_search_title">URL користувацького пошуку</string>
+  <string name="preferences_decode_1D_title">Розпізнавати лінійні штрих-коди</string>
+  <string name="preferences_decode_Data_Matrix_title">Розпізнавати Data Matrix</string>
+  <string name="preferences_decode_QR_title">Розпізнавати QR-коди</string>
+  <string name="preferences_device_bug_workarounds_title">Виправлення помилок пристрою</string>
+  <string name="preferences_disable_continuous_focus_summary">Стандартний режим фокусування</string>
+  <string name="preferences_disable_continuous_focus_title">Відклюти безперервне фокусування</string>
+  <string name="preferences_disable_exposure_title">Відключити експозицію</string>
+  <string name="preferences_front_light_auto">Автоматично</string>
+  <string name="preferences_front_light_off">Вимкнено</string>
+  <string name="preferences_front_light_on">Увімкнено</string>
+  <string name="preferences_front_light_summary">Покращує розпізнавання при поганому освітлення, але може викликати відблиски. Працює не на всіх пристроях.</string>
+  <string name="preferences_front_light_title">Ліхтарик</string>
+  <string name="preferences_general_title">Загальні налаштування</string>
+  <string name="preferences_invert_scan_summary">Сканування білих штрих-кодів на чорному фоні. Не працює на деяких пристроях.</string>
+  <string name="preferences_invert_scan_title">Інвертувати</string>
+  <string name="preferences_name">Налаштування</string>
+  <string name="preferences_play_beep_title">Пищати</string>
+  <string name="preferences_remember_duplicates_summary">Зберігати результати сканування однакових штрих-кодів</string>
+  <string name="preferences_remember_duplicates_title">Запом\'ятовувати дублікати</string>
+  <string name="preferences_result_title">Налаштування результатів</string>
+  <string name="preferences_scanning_title">Під час сканування штрих-кодів\u2026</string>
+  <string name="preferences_search_country">Пошук країни</string>
+  <string name="preferences_supplemental_summary">Показати детальну інформацію про штрих-код</string>
+  <string name="preferences_supplemental_title">Подробиці</string>
+  <string name="preferences_try_bsplus">Спробуйте Barcode Scanner+</string>
+  <string name="preferences_try_bsplus_summary">Доступні нові функції та інтерфейс</string>
+  <string name="preferences_vibrate_title">Вібрувати</string>
+  <string name="result_address_book">Знайдені контактні дані</string>
+  <string name="result_calendar">Знайдено подію для календаря</string>
+  <string name="result_email_address">Знайдено e-mail адресу</string>
+  <string name="result_geo">Знайдено географічні координати</string>
+  <string name="result_isbn">Знайдено книгу</string>
+  <string name="result_product">Знайдено товар</string>
+  <string name="result_sms">Знайдено адресу для SMS</string>
+  <string name="result_tel">Знайдено номер телефона</string>
+  <string name="result_text">Знайдено текст</string>
+  <string name="result_uri">Знайдено URL</string>
+  <string name="result_wifi">Знайдено конфігурацію мережі</string>
+  <string name="sbc_name">Пошук книг Google</string>
+  <string name="wifi_changing_network">Запит підключення до мережі\u2026</string>
+  <string name="wifi_ssid_label">Ім\'я мережі</string>
+  <string name="wifi_type_label">Тип</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-w820dp/dimens.xml b/src/java/PluginQR/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..f3e70203
--- /dev/null
+++ b/src/java/PluginQR/res/values-w820dp/dimens.xml
@@ -0,0 +1,10 @@
+<resources>
+
+    <!--
+         Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively).
+    -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+
+</resources>
diff --git a/src/java/PluginQR/res/values-zh-rCN/strings.xml b/src/java/PluginQR/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..15414671
--- /dev/null
+++ b/src/java/PluginQR/res/values-zh-rCN/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">条码扫描器</string>
+  <string name="app_picker_name">应用</string>
+  <string name="bookmark_picker_name">书签</string>
+  <string name="button_add_calendar">添加事件至日历</string>
+  <string name="button_add_contact">添加联系人</string>
+  <string name="button_book_search">打开图书搜索</string>
+  <string name="button_cancel">取消</string>
+  <string name="button_custom_product_search">自定义搜索</string>
+  <string name="button_dial">拨号</string>
+  <string name="button_email">发送email</string>
+  <string name="button_get_directions">获取地址</string>
+  <string name="button_mms">发送彩信</string>
+  <string name="button_ok">确定</string>
+  <string name="button_open_browser">打开浏览器</string>
+  <string name="button_product_search">打开产品搜索</string>
+  <string name="button_search_book_contents">搜索图书内容</string>
+  <string name="button_share_app">共享应用</string>
+  <string name="button_share_bookmark">分享书签</string>
+  <string name="button_share_by_email">通过email分享</string>
+  <string name="button_share_by_sms">通过短信分享</string>
+  <string name="button_share_clipboard">分享剪切板</string>
+  <string name="button_share_contact">分享联系人</string>
+  <string name="button_show_map">显示地图</string>
+  <string name="button_sms">发送短信</string>
+  <string name="button_web_search">网页搜索</string>
+  <string name="button_wifi">连接到网络</string>
+  <string name="contents_contact">联系人信息</string>
+  <string name="contents_email">Email地址</string>
+  <string name="contents_location">地理坐标</string>
+  <string name="contents_phone">电话号码</string>
+  <string name="contents_sms">短信地址</string>
+  <string name="contents_text">纯文本</string>
+  <string name="history_clear_one_history_text">删除</string>
+  <string name="history_clear_text">删除历史</string>
+  <string name="history_email_title">条码扫描器历史</string>
+  <string name="history_empty">空的</string>
+  <string name="history_empty_detail">没有条码扫描已记录</string>
+  <string name="history_send">发送历史</string>
+  <string name="history_title">历史</string>
+  <string name="menu_encode_mecard">使用MECARD</string>
+  <string name="menu_encode_vcard">使用vCard</string>
+  <string name="menu_help">帮助</string>
+  <string name="menu_history">历史</string>
+  <string name="menu_settings">设置</string>
+  <string name="menu_share">分享</string>
+  <string name="msg_bulk_mode_scanned">批量扫描：找到条码，已保存</string>
+  <string name="msg_camera_framework_bug">抱歉，Android相机出现问题。您可能需要重启设备。</string>
+  <string name="msg_default_format">格式</string>
+  <string name="msg_default_meta">元数据</string>
+  <string name="msg_default_mms_subject">Hi</string>
+  <string name="msg_default_status">请将条码置于取景框内扫描。  </string>
+  <string name="msg_default_time">时间</string>
+  <string name="msg_default_type">类型</string>
+  <string name="msg_encode_contents_failed">无法根据已有数据生成条码。   </string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">抱歉，无法打开所需软件。 条码内容可能无效。</string>
+  <string name="msg_redirect">重定向</string>
+  <string name="msg_sbc_book_not_searchable">抱歉，无法找到此图书。</string>
+  <string name="msg_sbc_failed">抱歉，搜索时遇到错误。</string>
+  <string name="msg_sbc_no_page_returned">无页面返回</string>
+  <string name="msg_sbc_page">页面</string>
+  <string name="msg_sbc_results">结果</string>
+  <string name="msg_sbc_searching_book">搜索图书…</string>
+  <string name="msg_sbc_snippet_unavailable">摘录不可用</string>
+  <string name="msg_share_explanation">您可以通过在自己的手机上显示条码，并使用其它手机扫描此条码的方式进行分享</string>
+  <string name="msg_share_text">或键入一些文字</string>
+  <string name="msg_sure">你肯定吗？</string>
+  <string name="msg_unmount_usb">抱歉，SD卡不可访问。</string>
+  <string name="preferences_actions_title">找到条码时</string>
+  <string name="preferences_auto_focus_title">使用自动对焦</string>
+  <string name="preferences_bulk_mode_summary">连续扫描并保存多个条形码</string>
+  <string name="preferences_bulk_mode_title">批量扫描模式</string>
+  <string name="preferences_copy_to_clipboard_title">复制到剪切板</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">替换：％s=内容，％f=格式，％t=类型</string>
+  <string name="preferences_custom_product_search_title">自定义搜索网址</string>
+  <string name="preferences_decode_1D_title">扫描 一维条码</string>
+  <string name="preferences_decode_Data_Matrix_title">扫描 DM码</string>
+  <string name="preferences_decode_QR_title">扫描 QR码</string>
+  <string name="preferences_device_bug_workarounds_title">设备问题解决办法</string>
+  <string name="preferences_disable_continuous_focus_summary">只使用标准对焦模式</string>
+  <string name="preferences_disable_continuous_focus_title">没有持续关注</string>
+  <string name="preferences_disable_exposure_title">无曝光</string>
+  <string name="preferences_front_light_auto">自动</string>
+  <string name="preferences_front_light_off">待用</string>
+  <string name="preferences_front_light_on">活跃</string>
+  <string name="preferences_front_light_summary">前灯可用时，打开前灯</string>
+  <string name="preferences_front_light_title">前灯</string>
+  <string name="preferences_general_title">一般设置</string>
+  <string name="preferences_invert_scan_summary">黑色背景上的白色条形码扫描。在某些设备上。</string>
+  <string name="preferences_invert_scan_title">反向扫描</string>
+  <string name="preferences_name">设置</string>
+  <string name="preferences_play_beep_title">提示音</string>
+  <string name="preferences_remember_duplicates_summary">在历史记录中保存重复记录</string>
+  <string name="preferences_remember_duplicates_title">记住重复</string>
+  <string name="preferences_result_title">结果设置</string>
+  <string name="preferences_scanning_title">条码类型选择</string>
+  <string name="preferences_search_country">搜索国家</string>
+  <string name="preferences_supplemental_summary">尝试检索关于条码内容的更多信息</string>
+  <string name="preferences_supplemental_title">检索更多信息</string>
+  <string name="preferences_try_bsplus">尝试条码扫描器+</string>
+  <string name="preferences_try_bsplus_summary">增强新的功能和接口</string>
+  <string name="preferences_vibrate_title">振动</string>
+  <string name="result_address_book">找到联系人信息</string>
+  <string name="result_calendar">找到日历事件</string>
+  <string name="result_email_address">找到email地址</string>
+  <string name="result_geo">找到地理坐标</string>
+  <string name="result_isbn">找到图书</string>
+  <string name="result_product">找到产品</string>
+  <string name="result_sms">找到短信地址</string>
+  <string name="result_tel">找到电话号码</string>
+  <string name="result_text">找到纯文本</string>
+  <string name="result_uri">找到URL</string>
+  <string name="result_wifi">发现网络配置</string>
+  <string name="sbc_name">Google图书搜索</string>
+  <string name="wifi_changing_network">请求连接到网络\u2026</string>
+  <string name="wifi_ssid_label">网络SSID</string>
+  <string name="wifi_type_label">类型</string>
+</resources>
diff --git a/src/java/PluginQR/res/values-zh-rTW/strings.xml b/src/java/PluginQR/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..783be77f
--- /dev/null
+++ b/src/java/PluginQR/res/values-zh-rTW/strings.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_name">條碼掃描器</string>
+  <string name="app_picker_name">應用程式</string>
+  <string name="bookmark_picker_name">書籤</string>
+  <string name="button_add_calendar">加入事件至日曆</string>
+  <string name="button_add_contact">加入聯絡人</string>
+  <string name="button_book_search">打開圖書搜索</string>
+  <string name="button_cancel">取消</string>
+  <string name="button_custom_product_search">自定義搜索</string>
+  <string name="button_dial">撥號</string>
+  <string name="button_email">發送電子郵件</string>
+  <string name="button_get_directions">路線規劃</string>
+  <string name="button_mms">發送 MMS</string>
+  <string name="button_ok">確定</string>
+  <string name="button_open_browser">打開瀏覽器</string>
+  <string name="button_product_search">打開產品搜索</string>
+  <string name="button_search_book_contents">搜索圖書內容</string>
+  <string name="button_share_app">分享應用程式</string>
+  <string name="button_share_bookmark">分享書籤</string>
+  <string name="button_share_by_email">透過電子郵件分享</string>
+  <string name="button_share_by_sms">透過簡訊分享</string>
+  <string name="button_share_clipboard">分享剪貼簿</string>
+  <string name="button_share_contact">分享聯絡人</string>
+  <string name="button_show_map">顯示地圖</string>
+  <string name="button_sms">發送簡訊</string>
+  <string name="button_web_search">網頁搜索</string>
+  <string name="button_wifi">連接到網路</string>
+  <string name="contents_contact">聯絡人資訊</string>
+  <string name="contents_email">電子郵件地址</string>
+  <string name="contents_location">地理座標</string>
+  <string name="contents_phone">電話號碼</string>
+  <string name="contents_sms">簡訊地址</string>
+  <string name="contents_text">純文字</string>
+  <string name="history_clear_one_history_text">刪除</string>
+  <string name="history_clear_text">刪除紀錄</string>
+  <string name="history_email_title">條碼掃描器紀錄</string>
+  <string name="history_empty">空的</string>
+  <string name="history_empty_detail">沒有條碼掃描記錄</string>
+  <string name="history_send">發送紀錄</string>
+  <string name="history_title">紀錄</string>
+  <string name="menu_encode_mecard">使用MECARD</string>
+  <string name="menu_encode_vcard">使用vCard</string>
+  <string name="menu_help">說明</string>
+  <string name="menu_history">紀錄</string>
+  <string name="menu_settings">設定</string>
+  <string name="menu_share">分享</string>
+  <string name="msg_bulk_mode_scanned">大量掃描模式：條碼掃描並儲存</string>
+  <string name="msg_camera_framework_bug">很抱歉，相機出現問題。您可能需要重新啟動設備。</string>
+  <string name="msg_default_format">格式</string>
+  <string name="msg_default_meta">後設資料</string>
+  <string name="msg_default_mms_subject">哈囉</string>
+  <string name="msg_default_status">將條碼置於鏡頭範圍內以進行掃描。</string>
+  <string name="msg_default_time">時間</string>
+  <string name="msg_default_type">類型</string>
+  <string name="msg_encode_contents_failed">無法讀取條碼。</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">抱歉，無法打開所需軟體。條碼內容可能無效。</string>
+  <string name="msg_redirect">重定向</string>
+  <string name="msg_sbc_book_not_searchable">無法找到此圖書。</string>
+  <string name="msg_sbc_failed">搜尋時發生錯誤。</string>
+  <string name="msg_sbc_no_page_returned">沒有取得頁面</string>
+  <string name="msg_sbc_page">頁面</string>
+  <string name="msg_sbc_results">結果</string>
+  <string name="msg_sbc_searching_book">搜尋圖書中\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">無法取得摘要</string>
+  <string name="msg_share_explanation">你可以在你的手機螢幕上顯示條碼，並使用其他手機掃描此條碼藉此分享給朋友</string>
+  <string name="msg_share_text">或輸入一些文字並按 Enter</string>
+  <string name="msg_sure">你確定嗎？</string>
+  <string name="msg_unmount_usb">無法讀取 SD 卡。</string>
+  <string name="preferences_actions_title">找到條碼時</string>
+  <string name="preferences_auto_focus_title">使用自動對焦</string>
+  <string name="preferences_bulk_mode_summary">連續掃描並儲存多個條碼</string>
+  <string name="preferences_bulk_mode_title">大量掃描模式</string>
+  <string name="preferences_copy_to_clipboard_title">複製到剪貼簿</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">替換：％s=內容，％f=格式，％t=類型</string>
+  <string name="preferences_custom_product_search_title">自訂搜尋網址</string>
+  <string name="preferences_decode_1D_title">解碼一維條碼</string>
+  <string name="preferences_decode_Data_Matrix_title">解碼 Data Matrix 條碼</string>
+  <string name="preferences_decode_QR_title">解碼 QR Code</string>
+  <string name="preferences_device_bug_workarounds_title">設備問題解決辦法</string>
+  <string name="preferences_disable_continuous_focus_summary">只使用標準對焦模式</string>
+  <string name="preferences_disable_continuous_focus_title">無連續對焦</string>
+  <string name="preferences_disable_exposure_title">無曝光</string>
+  <string name="preferences_front_light_auto">自動</string>
+  <string name="preferences_front_light_off">待用</string>
+  <string name="preferences_front_light_on">活躍</string>
+  <string name="preferences_front_light_summary">改善在低光源的環境下掃描的成功率，但有可能造成過度曝光的現象</string>
+  <string name="preferences_front_light_title">使用前光源</string>
+  <string name="preferences_general_title">一般設定</string>
+  <string name="preferences_invert_scan_summary">條碼掃描白色背景上的黑色。某些設備上無法使用。</string>
+  <string name="preferences_invert_scan_title">反向掃描</string>
+  <string name="preferences_name">設定</string>
+  <string name="preferences_play_beep_title">提示音</string>
+  <string name="preferences_remember_duplicates_summary">在紀錄中重複儲存相同的條碼</string>
+  <string name="preferences_remember_duplicates_title">記錄重複的條碼</string>
+  <string name="preferences_result_title">結果設定</string>
+  <string name="preferences_scanning_title">當掃描條碼時</string>
+  <string name="preferences_search_country">搜索國家</string>
+  <string name="preferences_supplemental_summary">嘗試透過條碼搜尋更多的資訊</string>
+  <string name="preferences_supplemental_title">搜尋更多資訊</string>
+  <string name="preferences_try_bsplus">嘗試條碼掃描器+</string>
+  <string name="preferences_try_bsplus_summary">增強新的功能和接口</string>
+  <string name="preferences_vibrate_title">震動</string>
+  <string name="result_address_book">找到聯絡人</string>
+  <string name="result_calendar">找到日曆事件</string>
+  <string name="result_email_address">找到電子郵件地址</string>
+  <string name="result_geo">找到座標</string>
+  <string name="result_isbn">找到圖書</string>
+  <string name="result_product">找到產品</string>
+  <string name="result_sms">找到簡訊</string>
+  <string name="result_tel">找到電話號碼</string>
+  <string name="result_text">找到純文字</string>
+  <string name="result_uri">找到 URL</string>
+  <string name="result_wifi">找到網路設定</string>
+  <string name="sbc_name">Google 圖書搜尋</string>
+  <string name="wifi_changing_network">請求連接到網絡\u2026</string>
+  <string name="wifi_ssid_label">網路名稱</string>
+  <string name="wifi_type_label">類型</string>
+</resources>
diff --git a/src/java/PluginQR/res/values/arrays.xml b/src/java/PluginQR/res/values/arrays.xml
new file mode 100644
index 00000000..9c803da7
--- /dev/null
+++ b/src/java/PluginQR/res/values/arrays.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+  <string-array name="country_codes">
+    <item>-</item>
+    <item>AR</item>
+    <item>AU</item>
+    <item>BR</item>
+    <item>BG</item>
+    <item>CA</item>
+    <item>CH</item>
+    <item>CN</item>
+    <item>CZ</item>
+    <item>DE</item>
+    <item>DK</item>
+    <item>ES</item>
+    <item>FI</item>
+    <item>FR</item>
+    <item>GB</item>
+    <item>GR</item>
+    <item>HU</item>
+    <item>ID</item>
+    <item>IT</item>
+    <item>JP</item>
+    <item>KR</item>
+    <item>NL</item>
+    <item>PL</item>
+    <item>PT</item>
+    <item>RO</item>    
+    <item>RU</item>
+    <item>SE</item>
+    <item>SK</item>
+    <item>SI</item>
+    <item>TR</item>
+    <item>TW</item>
+    <item>US</item>
+  </string-array>
+  <string-array name="preferences_front_light_values">
+    <item>ON</item>
+    <item>AUTO</item>
+    <item>OFF</item>
+  </string-array>
+  <string-array name="preferences_front_light_options">
+    <item>@string/preferences_front_light_on</item>
+    <item>@string/preferences_front_light_auto</item>
+    <item>@string/preferences_front_light_off</item>
+  </string-array>
+</resources>
diff --git a/src/java/PluginQR/res/values/colors.xml b/src/java/PluginQR/res/values/colors.xml
new file mode 100644
index 00000000..07b0f96d
--- /dev/null
+++ b/src/java/PluginQR/res/values/colors.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <color name="contents_text">#ff000000</color>
+  <color name="encode_view">#ffffffff</color>
+  <color name="possible_result_points">#c0ffbd21</color> <!-- Android standard ICS color -->
+  <color name="result_minor_text">#ffc0c0c0</color>
+  <color name="result_points">#c099cc00</color> <!-- Android standard ICS color -->
+  <color name="result_text">#ffffffff</color>
+  <color name="result_view">#b0000000</color>
+  <color name="status_text">#ffffffff</color>
+  <color name="transparent">#00000000</color>
+  <color name="viewfinder_laser">#ffcc0000</color> <!-- Android standard ICS color -->
+  <color name="viewfinder_mask">#60000000</color>
+</resources>
diff --git a/src/java/PluginQR/res/values/dimens.xml b/src/java/PluginQR/res/values/dimens.xml
new file mode 100644
index 00000000..e0310092
--- /dev/null
+++ b/src/java/PluginQR/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+  <dimen name="standard_padding">8dip</dimen>
+  <dimen name="half_padding">4dip</dimen>
+</resources>
\ No newline at end of file
diff --git a/src/java/PluginQR/res/values/dimensqr.xml b/src/java/PluginQR/res/values/dimensqr.xml
new file mode 100644
index 00000000..55c1e590
--- /dev/null
+++ b/src/java/PluginQR/res/values/dimensqr.xml
@@ -0,0 +1,7 @@
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+</resources>
diff --git a/src/java/PluginQR/res/values/ids.xml b/src/java/PluginQR/res/values/ids.xml
new file mode 100644
index 00000000..4c0ccb42
--- /dev/null
+++ b/src/java/PluginQR/res/values/ids.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <item type="id" name="decode"/>
+  <item type="id" name="decode_failed"/>
+  <item type="id" name="decode_succeeded"/>
+  <item type="id" name="launch_product_query"/>
+  <item type="id" name="quit"/>
+  <item type="id" name="restart_preview"/>
+  <item type="id" name="return_scan_result"/>
+</resources>
diff --git a/src/java/PluginQR/res/values/strings.xml b/src/java/PluginQR/res/values/strings.xml
new file mode 100644
index 00000000..3085480f
--- /dev/null
+++ b/src/java/PluginQR/res/values/strings.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2010 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <string name="app_picker_name">Applications</string>
+  <string name="bookmark_picker_name">Bookmarks</string>
+  <string name="button_add_calendar">Add to calendar</string>
+  <string name="button_add_contact">Add contact</string>
+  <string name="button_book_search">Book Search</string>
+  <string name="button_cancel">Cancel</string>
+  <string name="button_custom_product_search">Custom search</string>
+  <string name="button_dial">Dial number</string>
+  <string name="button_email">Send email</string>
+  <string name="button_get_directions">Get directions</string>
+  <string name="button_mms">Send MMS</string>
+  <string name="button_ok">OK</string>
+  <string name="button_open_browser">Open browser</string>
+  <string name="button_product_search">Product search</string>
+  <string name="button_search_book_contents">Search contents</string>
+  <string name="button_share_app">Application</string>
+  <string name="button_share_bookmark">Bookmark</string>
+  <string name="button_share_by_email">Share via email</string>
+  <string name="button_share_by_sms">Share via SMS</string>
+  <string name="button_share_clipboard">Clipboard</string>
+  <string name="button_share_contact">Contact</string>
+  <string name="button_show_map">Show map</string>
+  <string name="button_sms">Send SMS</string>
+  <string name="button_web_search">Web search</string>
+  <string name="button_wifi">Connect to Network</string>
+  <string name="contents_contact">Contact info</string>
+  <string name="contents_email">Email address</string>
+  <string name="contents_location">Geographic coordinates</string>
+  <string name="contents_phone">Phone number</string>
+  <string name="contents_sms">SMS address</string>
+  <string name="contents_text">Plain text</string>
+  <string name="history_clear_text">Clear history</string>
+  <string name="history_clear_one_history_text">Clear</string>
+  <string name="history_email_title">Barcode Scanner history</string>
+  <string name="history_empty">Empty</string>
+  <string name="history_empty_detail">No barcode scans have been recorded</string>
+  <string name="history_send">Send history</string>
+  <string name="history_title">History</string>
+  <string name="menu_encode_mecard">Use MECARD</string>
+  <string name="menu_encode_vcard">Use vCard</string>
+  <string name="menu_help">Help</string>
+  <string name="menu_history">History</string>
+  <string name="menu_settings">Settings</string>
+  <string name="menu_share">Share</string>
+  <string name="msg_bulk_mode_scanned">Bulk mode: barcode scanned and saved</string>
+  <string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>
+  <string name="msg_default_format">Format</string>
+  <string name="msg_default_meta">Metadata</string>
+  <string name="msg_default_mms_subject">Hi</string>
+  <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
+  <string name="msg_default_time">Time</string>
+  <string name="msg_default_type">Type</string>
+  <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.</string>
+  <string name="msg_google_books">Google</string>
+  <string name="msg_google_product">Google</string>
+  <string name="msg_intent_failed">Sorry, the requested application could not be launched. The barcode contents may be invalid.</string>
+  <string name="msg_redirect">Redirect</string>
+  <string name="msg_sbc_book_not_searchable">Sorry, this book is not searchable.</string>
+  <string name="msg_sbc_failed">Sorry, the search encountered a problem.</string>
+  <string name="msg_sbc_no_page_returned">No page returned</string>
+  <string name="msg_sbc_page">Page</string>
+  <string name="msg_sbc_results">Results</string>
+  <string name="msg_sbc_searching_book">Searching book\u2026</string>
+  <string name="msg_sbc_snippet_unavailable">Snippet not available</string>
+  <string name="msg_share_explanation">You can share data by displaying a barcode on your screen and scanning it with another phone.</string>
+  <string name="msg_share_text">Or type some text and press Enter</string>
+  <string name="msg_sure">Are you sure?</string>
+  <string name="msg_unmount_usb">Sorry, the SD card is not accessible.</string>
+  <string name="preferences_actions_title">When a barcode is found\u2026</string>
+  <string name="preferences_auto_focus_title">Use auto focus</string>
+  <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
+  <string name="preferences_bulk_mode_title">Bulk scan mode</string>
+  <string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Substitutions: %s = contents, %f = format, %t = type</string>
+  <string name="preferences_custom_product_search_title">Custom search URL</string>
+  <string name="preferences_decode_1D_title">1D barcodes</string>
+  <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
+  <string name="preferences_decode_QR_title">QR Codes</string>
+  <string name="preferences_device_bug_workarounds_title">Device Bug Workarounds</string>
+  <string name="preferences_disable_continuous_focus_summary">Use only standard focus mode</string>
+  <string name="preferences_disable_continuous_focus_title">No continuous focus</string>
+  <string name="preferences_disable_exposure_title">No exposure</string>
+  <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
+  <string name="preferences_front_light_title">Use front light</string>
+  <string name="preferences_front_light_auto">Automatic</string>
+  <string name="preferences_front_light_off">Off</string>
+  <string name="preferences_front_light_on">On</string>
+  <string name="preferences_general_title">General settings</string>
+  <string name="preferences_invert_scan_title">Invert scan</string>
+  <string name="preferences_invert_scan_summary">Scan for white barcodes on black background. Not available on some devices.</string>  
+  <string name="preferences_name">Settings</string>
+  <string name="preferences_play_beep_title">Beep</string>
+  <string name="preferences_remember_duplicates_summary">Store multiple scans of the same barcode in History</string>
+  <string name="preferences_remember_duplicates_title">Remember duplicates</string>
+  <string name="preferences_result_title">Result settings</string>
+  <string name="preferences_scanning_title">When scanning for barcodes, decode\u2026</string>
+  <string name="preferences_search_country">Search country</string>
+  <string name="preferences_supplemental_summary">Try to retrieve more information about the barcode contents</string>
+  <string name="preferences_supplemental_title">Retrieve more info</string>
+  <string name="preferences_vibrate_title">Vibrate</string>
+  <string name="result_address_book">Found contact info</string>
+  <string name="result_calendar">Found calendar event</string>
+  <string name="result_email_address">Found email address</string>
+  <string name="result_geo">Found geographic coordinates</string>
+  <string name="result_isbn">Found book</string>
+  <string name="result_product">Found product</string>
+  <string name="result_sms">Found SMS address</string>
+  <string name="result_tel">Found phone number</string>
+  <string name="result_text">Found plain text</string>
+  <string name="result_uri">Found URL</string>
+  <string name="result_wifi">Found WLAN Configuration</string>
+  <string name="sbc_name">Google Book Search</string>
+  <string name="wifi_changing_network">Requesting connection to network\u2026</string>
+  <string name="wifi_ssid_label">Network Name</string>
+  <string name="wifi_type_label">Type</string>
+</resources>
diff --git a/src/java/PluginQR/res/values/stringsqr.xml b/src/java/PluginQR/res/values/stringsqr.xml
new file mode 100644
index 00000000..f7d15d3a
--- /dev/null
+++ b/src/java/PluginQR/res/values/stringsqr.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">QR Plugin for KP2A</string>
+    <string name="title_activity_qr">QRActivity</string>
+    <string name="action_settings">Settings</string>
+    <string name="action_show_qr">Show QR Code</string>
+    <string name="include_label">Include field label</string>
+    <string name="all_fields">All fields</string>
+    <string name="kp2aplugin_title">QR Plugin</string>
+    <string name="kp2aplugin_shortdesc">Displays password entries as QR code</string>
+    <string name="kp2aplugin_author">Philipp Crocoll</string>
+    <string name="title_activity_main">MainActivity</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="scan_qr">Scan QR code from other device</string>
+    <string name="show_qr">Select entry to show as QR code</string>
+    <string name="no_host_app">No host app detected! Please install Keepass2Android from Google Play!</string>
+    <string name="not_enabled_as_plugin">Not enabled as plugin in host app!</string>
+    <string name="enabled_as_plugin">Enabled as plugin!</string>
+    <string name="enable_as_plugin">Enable as plugin</string>
+
+</resources>
diff --git a/src/java/PluginQR/res/values/styles.xml b/src/java/PluginQR/res/values/styles.xml
new file mode 100644
index 00000000..77576abb
--- /dev/null
+++ b/src/java/PluginQR/res/values/styles.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+
+  <style name="ResultButton" parent="@android:style/Widget.Holo.Button.Borderless.Small">
+    <item name="android:layout_width">0dip</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">1</item>
+  </style>
+  <style name="ShareButton" parent="@android:style/Widget.Holo.Button.Borderless.Small">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+  </style>
+
+</resources>
diff --git a/src/java/PluginQR/res/values/stylesqr.xml b/src/java/PluginQR/res/values/stylesqr.xml
new file mode 100644
index 00000000..6ce89c7b
--- /dev/null
+++ b/src/java/PluginQR/res/values/stylesqr.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+</resources>
diff --git a/src/java/PluginQR/res/values/themes.xml b/src/java/PluginQR/res/values/themes.xml
new file mode 100644
index 00000000..4b8e2be8
--- /dev/null
+++ b/src/java/PluginQR/res/values/themes.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2012 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+  <style name="CaptureTheme" parent="android:Theme.Holo">
+    <item name="android:windowFullscreen">true</item>
+    <item name="android:windowContentOverlay">@null</item>
+    <item name="android:windowActionBarOverlay">true</item>
+    <item name="android:windowActionModeOverlay">true</item>
+  </style>
+</resources>
diff --git a/src/java/PluginQR/res/xml/preferences.xml b/src/java/PluginQR/res/xml/preferences.xml
new file mode 100644
index 00000000..9d398f3e
--- /dev/null
+++ b/src/java/PluginQR/res/xml/preferences.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2008 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+  <PreferenceCategory android:title="@string/preferences_scanning_title">
+    <CheckBoxPreference
+        android:key="preferences_decode_1D"
+        android:defaultValue="true"
+        android:title="@string/preferences_decode_1D_title"/>
+    <CheckBoxPreference
+        android:key="preferences_decode_QR"
+        android:defaultValue="true"
+        android:title="@string/preferences_decode_QR_title"/>
+    <CheckBoxPreference
+        android:key="preferences_decode_Data_Matrix"
+        android:defaultValue="true"
+        android:title="@string/preferences_decode_Data_Matrix_title"/>
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/preferences_actions_title">
+    <CheckBoxPreference
+        android:key="preferences_play_beep"
+        android:defaultValue="true"
+        android:title="@string/preferences_play_beep_title"/>
+    <CheckBoxPreference
+        android:key="preferences_vibrate"
+        android:defaultValue="false"
+        android:title="@string/preferences_vibrate_title"/>
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/preferences_general_title">
+    <ListPreference
+        android:entries="@array/preferences_front_light_options"
+        android:entryValues="@array/preferences_front_light_values"
+        android:key="preferences_front_light_mode"
+        android:defaultValue="OFF"
+        android:title="@string/preferences_front_light_title"
+        android:summary="@string/preferences_front_light_summary"/>
+    <CheckBoxPreference
+        android:key="preferences_auto_focus"
+        android:defaultValue="true"
+        android:title="@string/preferences_auto_focus_title"/>
+    <CheckBoxPreference
+        android:key="preferences_invert_scan"
+        android:defaultValue="false"
+        android:title="@string/preferences_invert_scan_title"
+        android:summary="@string/preferences_invert_scan_summary"/>
+    
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/preferences_device_bug_workarounds_title">
+    <CheckBoxPreference
+        android:key="preferences_disable_continuous_focus"
+        android:defaultValue="true"
+        android:title="@string/preferences_disable_continuous_focus_title"
+        android:summary="@string/preferences_disable_continuous_focus_summary"/>
+    <!--
+    <CheckBoxPreference
+        android:key="preferences_disable_exposure"
+        android:defaultValue="false"
+        android:title="@string/preferences_disable_exposure_title"/>
+     -->
+  </PreferenceCategory>
+</PreferenceScreen>
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/AmbientLightManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/AmbientLightManager.java
new file mode 100644
index 00000000..20742658
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/AmbientLightManager.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2012 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.preference.PreferenceManager;
+import com.google.zxing.client.android.camera.CameraManager;
+import com.google.zxing.client.android.camera.FrontLightMode;
+
+/**
+ * Detects ambient light and switches on the front light when very dark, and off again when sufficiently light.
+ *
+ * @author Sean Owen
+ * @author Nikolaus Huber
+ */
+final class AmbientLightManager implements SensorEventListener {
+
+  private static final float TOO_DARK_LUX = 45.0f;
+  private static final float BRIGHT_ENOUGH_LUX = 450.0f;
+
+  private final Context context;
+  private CameraManager cameraManager;
+  private Sensor lightSensor;
+
+  AmbientLightManager(Context context) {
+    this.context = context;
+  }
+
+  void start(CameraManager cameraManager) {
+    this.cameraManager = cameraManager;
+    SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+    if (FrontLightMode.readPref(sharedPrefs) == FrontLightMode.AUTO) {
+      SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+      lightSensor = sensorManager.getDefaultSensor(Sensor.TYPE_LIGHT);
+      if (lightSensor != null) {
+        sensorManager.registerListener(this, lightSensor, SensorManager.SENSOR_DELAY_NORMAL);
+      }
+    }
+  }
+
+  void stop() {
+    if (lightSensor != null) {
+      SensorManager sensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+      sensorManager.unregisterListener(this);
+      cameraManager = null;
+      lightSensor = null;
+    }
+  }
+
+  @Override
+  public void onSensorChanged(SensorEvent sensorEvent) {
+    float ambientLightLux = sensorEvent.values[0];
+    if (cameraManager != null) {
+      if (ambientLightLux <= TOO_DARK_LUX) {
+        cameraManager.setTorch(true);
+      } else if (ambientLightLux >= BRIGHT_ENOUGH_LUX) {
+        cameraManager.setTorch(false);
+      }
+    }
+  }
+
+  @Override
+  public void onAccuracyChanged(Sensor sensor, int accuracy) {
+    // do nothing
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/BeepManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/BeepManager.java
new file mode 100644
index 00000000..fb123113
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/BeepManager.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.R;
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.AssetFileDescriptor;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.os.Vibrator;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import java.io.IOException;
+
+/**
+ * Manages beeps and vibrations for {@link CaptureActivity}.
+ */
+final class BeepManager implements MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener {
+
+  private static final String TAG = BeepManager.class.getSimpleName();
+
+  private static final float BEEP_VOLUME = 0.10f;
+  private static final long VIBRATE_DURATION = 200L;
+
+  private final Activity activity;
+  private MediaPlayer mediaPlayer;
+  private boolean playBeep;
+  private boolean vibrate;
+
+  BeepManager(Activity activity) {
+    this.activity = activity;
+    this.mediaPlayer = null;
+    updatePrefs();
+  }
+
+  synchronized void updatePrefs() {
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+    playBeep = shouldBeep(prefs, activity);
+    vibrate = prefs.getBoolean(PreferencesActivity.KEY_VIBRATE, false);
+    if (playBeep && mediaPlayer == null) {
+      // The volume on STREAM_SYSTEM is not adjustable, and users found it too loud,
+      // so we now play on the music stream.
+      activity.setVolumeControlStream(AudioManager.STREAM_MUSIC);
+      mediaPlayer = buildMediaPlayer(activity);
+    }
+  }
+
+  synchronized void playBeepSoundAndVibrate() {
+    if (playBeep && mediaPlayer != null) {
+      mediaPlayer.start();
+    }
+    if (vibrate) {
+      Vibrator vibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_SERVICE);
+      vibrator.vibrate(VIBRATE_DURATION);
+    }
+  }
+
+  private static boolean shouldBeep(SharedPreferences prefs, Context activity) {
+    boolean shouldPlayBeep = prefs.getBoolean(PreferencesActivity.KEY_PLAY_BEEP, true);
+    if (shouldPlayBeep) {
+      // See if sound settings overrides this
+      AudioManager audioService = (AudioManager) activity.getSystemService(Context.AUDIO_SERVICE);
+      if (audioService.getRingerMode() != AudioManager.RINGER_MODE_NORMAL) {
+        shouldPlayBeep = false;
+      }
+    }
+    return shouldPlayBeep;
+  }
+
+  private MediaPlayer buildMediaPlayer(Context activity) {
+    MediaPlayer mediaPlayer = new MediaPlayer();
+    mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+    mediaPlayer.setOnCompletionListener(this);
+    mediaPlayer.setOnErrorListener(this);
+
+    AssetFileDescriptor file = activity.getResources().openRawResourceFd(keepass2android.plugin.qr.R.raw.beep);
+    try {
+      mediaPlayer.setDataSource(file.getFileDescriptor(), file.getStartOffset(), file.getLength());
+      file.close();
+      mediaPlayer.setVolume(BEEP_VOLUME, BEEP_VOLUME);
+      mediaPlayer.prepare();
+    } catch (IOException ioe) {
+      Log.w(TAG, ioe);
+      mediaPlayer = null;
+    }
+    return mediaPlayer;
+  }
+
+  @Override
+  public void onCompletion(MediaPlayer mp) {
+    // When the beep has finished playing, rewind to queue up another one.      
+    mp.seekTo(0);
+  }
+
+  @Override
+  public synchronized boolean onError(MediaPlayer mp, int what, int extra) {
+    if (what == MediaPlayer.MEDIA_ERROR_SERVER_DIED) {
+      // we are finished, so put up an appropriate error toast if required and finish
+      activity.finish();
+    } else {
+      // possibly media player error, so release and recreate
+      mp.release();
+      mediaPlayer = null;
+      updatePrefs();
+    }
+    return true;
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/CaptureActivity.java b/src/java/PluginQR/src/com/google/zxing/client/android/CaptureActivity.java
new file mode 100644
index 00000000..542f3779
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/CaptureActivity.java
@@ -0,0 +1,666 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.Result;
+import com.google.zxing.ResultMetadataType;
+import com.google.zxing.ResultPoint;
+import com.google.zxing.client.android.camera.CameraManager;
+import com.google.zxing.client.android.result.ResultButtonListener;
+import com.google.zxing.client.android.result.ResultHandler;
+import com.google.zxing.client.android.result.ResultHandlerFactory;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.io.IOException;
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.Map;
+
+import keepass2android.plugin.qr.R;
+
+/**
+ * This activity opens the camera and does the actual scanning on a background thread. It draws a
+ * viewfinder to help the user place the barcode correctly, shows feedback as the image processing
+ * is happening, and then overlays the results when a scan is successful.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ * @author Sean Owen
+ */
+public final class CaptureActivity extends Activity implements SurfaceHolder.Callback {
+
+  private static final String TAG = CaptureActivity.class.getSimpleName();
+
+  private static final long DEFAULT_INTENT_RESULT_DURATION_MS = 1500L;
+  private static final long BULK_MODE_SCAN_DELAY_MS = 1000L;
+
+  private static final String[] ZXING_URLS = { "http://zxing.appspot.com/scan", "zxing://scan/" };
+
+  public static final int HISTORY_REQUEST_CODE = 0x0000bacc;
+
+  private static final Collection<ResultMetadataType> DISPLAYABLE_METADATA_TYPES =
+      EnumSet.of(ResultMetadataType.ISSUE_NUMBER,
+                 ResultMetadataType.SUGGESTED_PRICE,
+                 ResultMetadataType.ERROR_CORRECTION_LEVEL,
+                 ResultMetadataType.POSSIBLE_COUNTRY);
+
+  private CameraManager cameraManager;
+  private CaptureActivityHandler handler;
+  private Result savedResultToShow;
+  private ViewfinderView viewfinderView;
+  private TextView statusView;
+  private View resultView;
+  private Result lastResult;
+  private boolean hasSurface;
+  private boolean copyToClipboard;
+  private IntentSource source;
+  private String sourceUrl;
+  private ScanFromWebPageManager scanFromWebPageManager;
+  private Collection<BarcodeFormat> decodeFormats;
+  private Map<DecodeHintType,?> decodeHints;
+  private String characterSet;
+  private InactivityTimer inactivityTimer;
+  private BeepManager beepManager;
+  private AmbientLightManager ambientLightManager;
+
+  ViewfinderView getViewfinderView() {
+    return viewfinderView;
+  }
+
+  public Handler getHandler() {
+    return handler;
+  }
+
+  CameraManager getCameraManager() {
+    return cameraManager;
+  }
+
+  @Override
+  public void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+
+    Window window = getWindow();
+    window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    setContentView(R.layout.capture);
+
+    hasSurface = false;
+    inactivityTimer = new InactivityTimer(this);
+    beepManager = new BeepManager(this);
+    ambientLightManager = new AmbientLightManager(this);
+
+    PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+
+    // CameraManager must be initialized here, not in onCreate(). This is necessary because we don't
+    // want to open the camera driver and measure the screen size if we're going to show the help on
+    // first launch. That led to bugs where the scanning rectangle was the wrong size and partially
+    // off screen.
+    cameraManager = new CameraManager(getApplication());
+
+    viewfinderView = (ViewfinderView) findViewById(R.id.viewfinder_view);
+    viewfinderView.setCameraManager(cameraManager);
+
+    resultView = findViewById(R.id.result_view);
+    statusView = (TextView) findViewById(R.id.status_view);
+
+    handler = null;
+    lastResult = null;
+
+    resetStatusView();
+
+    SurfaceView surfaceView = (SurfaceView) findViewById(R.id.preview_view);
+    SurfaceHolder surfaceHolder = surfaceView.getHolder();
+    if (hasSurface) {
+      // The activity was paused but not stopped, so the surface still exists. Therefore
+      // surfaceCreated() won't be called, so init the camera here.
+      initCamera(surfaceHolder);
+    } else {
+      // Install the callback and wait for surfaceCreated() to init the camera.
+      surfaceHolder.addCallback(this);
+    }
+
+    beepManager.updatePrefs();
+    ambientLightManager.start(cameraManager);
+
+    inactivityTimer.onResume();
+
+    Intent intent = getIntent();
+
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+    
+    source = IntentSource.NONE;
+    decodeFormats = null;
+    characterSet = null;
+
+    if (intent != null) {
+
+      String action = intent.getAction();
+      String dataString = intent.getDataString();
+
+      if (Intents.Scan.ACTION.equals(action)) {
+
+        // Scan the formats the intent requested, and return the result to the calling activity.
+        source = IntentSource.NATIVE_APP_INTENT;
+        decodeFormats = DecodeFormatManager.parseDecodeFormats(intent);
+        decodeHints = DecodeHintManager.parseDecodeHints(intent);
+
+        if (intent.hasExtra(Intents.Scan.WIDTH) && intent.hasExtra(Intents.Scan.HEIGHT)) {
+          int width = intent.getIntExtra(Intents.Scan.WIDTH, 0);
+          int height = intent.getIntExtra(Intents.Scan.HEIGHT, 0);
+          if (width > 0 && height > 0) {
+            cameraManager.setManualFramingRect(width, height);
+          }
+        }
+        
+        String customPromptMessage = intent.getStringExtra(Intents.Scan.PROMPT_MESSAGE);
+        if (customPromptMessage != null) {
+          statusView.setText(customPromptMessage);
+        }
+
+      } else if (dataString != null &&
+                 dataString.contains("http://www.google") &&
+                 dataString.contains("/m/products/scan")) {
+
+        // Scan only products and send the result to mobile Product Search.
+        source = IntentSource.PRODUCT_SEARCH_LINK;
+        sourceUrl = dataString;
+        decodeFormats = DecodeFormatManager.PRODUCT_FORMATS;
+
+      } else if (isZXingURL(dataString)) {
+
+        // Scan formats requested in query string (all formats if none specified).
+        // If a return URL is specified, send the results there. Otherwise, handle it ourselves.
+        source = IntentSource.ZXING_LINK;
+        sourceUrl = dataString;
+        Uri inputUri = Uri.parse(dataString);
+        scanFromWebPageManager = new ScanFromWebPageManager(inputUri);
+        decodeFormats = DecodeFormatManager.parseDecodeFormats(inputUri);
+        // Allow a sub-set of the hints to be specified by the caller.
+        decodeHints = DecodeHintManager.parseDecodeHints(inputUri);
+
+      }
+
+      characterSet = intent.getStringExtra(Intents.Scan.CHARACTER_SET);
+
+    }
+  }
+  
+  private static boolean isZXingURL(String dataString) {
+    if (dataString == null) {
+      return false;
+    }
+    for (String url : ZXING_URLS) {
+      if (dataString.startsWith(url)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  protected void onPause() {
+    if (handler != null) {
+      handler.quitSynchronously();
+      handler = null;
+    }
+    inactivityTimer.onPause();
+    ambientLightManager.stop();
+    cameraManager.closeDriver();
+    if (!hasSurface) {
+      SurfaceView surfaceView = (SurfaceView) findViewById(R.id.preview_view);
+      SurfaceHolder surfaceHolder = surfaceView.getHolder();
+      surfaceHolder.removeCallback(this);
+    }
+    super.onPause();
+  }
+
+  @Override
+  protected void onDestroy() {
+    inactivityTimer.shutdown();
+    super.onDestroy();
+  }
+
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    switch (keyCode) {
+      case KeyEvent.KEYCODE_BACK:
+        if (source == IntentSource.NATIVE_APP_INTENT) {
+          setResult(RESULT_CANCELED);
+          finish();
+          return true;
+        }
+        if ((source == IntentSource.NONE || source == IntentSource.ZXING_LINK) && lastResult != null) {
+          restartPreviewAfterDelay(0L);
+          return true;
+        }
+        break;
+      case KeyEvent.KEYCODE_FOCUS:
+      case KeyEvent.KEYCODE_CAMERA:
+        // Handle these events so they don't launch the Camera app
+        return true;
+      // Use volume up/down to turn on light
+      case KeyEvent.KEYCODE_VOLUME_DOWN:
+        cameraManager.setTorch(false);
+        return true;
+      case KeyEvent.KEYCODE_VOLUME_UP:
+        cameraManager.setTorch(true);
+        return true;
+    }
+    return super.onKeyDown(keyCode, event);
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    MenuInflater menuInflater = getMenuInflater();
+    menuInflater.inflate(R.menu.capture, menu);
+    return super.onCreateOptionsMenu(menu);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    Intent intent = new Intent(Intent.ACTION_VIEW);
+    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+    switch (item.getItemId()) {
+      case R.id.menu_settings:
+        intent.setClassName(this, PreferencesActivity.class.getName());
+        startActivity(intent);
+        break;
+      default:
+        return super.onOptionsItemSelected(item);
+    }
+    return true;
+  }
+
+  private void decodeOrStoreSavedBitmap(Bitmap bitmap, Result result) {
+    // Bitmap isn't used yet -- will be used soon
+    if (handler == null) {
+      savedResultToShow = result;
+    } else {
+      if (result != null) {
+        savedResultToShow = result;
+      }
+      if (savedResultToShow != null) {
+        Message message = Message.obtain(handler, R.id.decode_succeeded, savedResultToShow);
+        handler.sendMessage(message);
+      }
+      savedResultToShow = null;
+    }
+  }
+
+  @Override
+  public void surfaceCreated(SurfaceHolder holder) {
+    if (holder == null) {
+      Log.e(TAG, "*** WARNING *** surfaceCreated() gave us a null surface!");
+    }
+    if (!hasSurface) {
+      hasSurface = true;
+      initCamera(holder);
+    }
+  }
+
+  @Override
+  public void surfaceDestroyed(SurfaceHolder holder) {
+    hasSurface = false;
+  }
+
+  @Override
+  public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+
+  }
+
+  /**
+   * A valid barcode has been found, so give an indication of success and show the results.
+   *
+   * @param rawResult The contents of the barcode.
+   * @param scaleFactor amount by which thumbnail was scaled
+   * @param barcode   A greyscale bitmap of the camera data which was decoded.
+   */
+  public void handleDecode(Result rawResult, Bitmap barcode, float scaleFactor) {
+    inactivityTimer.onActivity();
+    lastResult = rawResult;
+    ResultHandler resultHandler = ResultHandlerFactory.makeResultHandler(this, rawResult);
+
+    boolean fromLiveScan = barcode != null;
+    if (fromLiveScan) {
+      // Then not from history, so beep/vibrate and we have an image to draw on
+      beepManager.playBeepSoundAndVibrate();
+      drawResultPoints(barcode, scaleFactor, rawResult);
+    }
+
+    switch (source) {
+      case NATIVE_APP_INTENT:
+      case PRODUCT_SEARCH_LINK:
+        handleDecodeExternally(rawResult, resultHandler, barcode);
+        break;
+      case ZXING_LINK:
+        if (scanFromWebPageManager == null || !scanFromWebPageManager.isScanFromWebPage()) {
+          handleDecodeInternally(rawResult, resultHandler, barcode);
+        } else {
+          handleDecodeExternally(rawResult, resultHandler, barcode);
+        }
+        break;
+      case NONE:
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        if (fromLiveScan && prefs.getBoolean(PreferencesActivity.KEY_BULK_MODE, false)) {
+          Toast.makeText(getApplicationContext(),
+                         getResources().getString(R.string.msg_bulk_mode_scanned) + " (" + rawResult.getText() + ')',
+                         Toast.LENGTH_SHORT).show();
+          // Wait a moment or else it will scan the same barcode continuously about 3 times
+          restartPreviewAfterDelay(BULK_MODE_SCAN_DELAY_MS);
+        } else {
+          handleDecodeInternally(rawResult, resultHandler, barcode);
+        }
+        break;
+    }
+  }
+
+  /**
+   * Superimpose a line for 1D or dots for 2D to highlight the key features of the barcode.
+   *
+   * @param barcode   A bitmap of the captured image.
+   * @param scaleFactor amount by which thumbnail was scaled
+   * @param rawResult The decoded results which contains the points to draw.
+   */
+  private void drawResultPoints(Bitmap barcode, float scaleFactor, Result rawResult) {
+    ResultPoint[] points = rawResult.getResultPoints();
+    if (points != null && points.length > 0) {
+      Canvas canvas = new Canvas(barcode);
+      Paint paint = new Paint();
+      paint.setColor(getResources().getColor(R.color.result_points));
+      if (points.length == 2) {
+        paint.setStrokeWidth(4.0f);
+        drawLine(canvas, paint, points[0], points[1], scaleFactor);
+      } else if (points.length == 4 &&
+                 (rawResult.getBarcodeFormat() == BarcodeFormat.UPC_A ||
+                  rawResult.getBarcodeFormat() == BarcodeFormat.EAN_13)) {
+        // Hacky special case -- draw two lines, for the barcode and metadata
+        drawLine(canvas, paint, points[0], points[1], scaleFactor);
+        drawLine(canvas, paint, points[2], points[3], scaleFactor);
+      } else {
+        paint.setStrokeWidth(10.0f);
+        for (ResultPoint point : points) {
+          if (point != null) {
+            canvas.drawPoint(scaleFactor * point.getX(), scaleFactor * point.getY(), paint);
+          }
+        }
+      }
+    }
+  }
+
+  private static void drawLine(Canvas canvas, Paint paint, ResultPoint a, ResultPoint b, float scaleFactor) {
+    if (a != null && b != null) {
+      canvas.drawLine(scaleFactor * a.getX(), 
+                      scaleFactor * a.getY(), 
+                      scaleFactor * b.getX(), 
+                      scaleFactor * b.getY(), 
+                      paint);
+    }
+  }
+
+  // Put up our own UI for how to handle the decoded contents.
+  private void handleDecodeInternally(Result rawResult, ResultHandler resultHandler, Bitmap barcode) {
+    statusView.setVisibility(View.GONE);
+    viewfinderView.setVisibility(View.GONE);
+    resultView.setVisibility(View.VISIBLE);
+
+    ImageView barcodeImageView = (ImageView) findViewById(R.id.barcode_image_view);
+    if (barcode == null) {
+      barcodeImageView.setImageBitmap(BitmapFactory.decodeResource(getResources(),
+          R.drawable.launcher_icon));
+    } else {
+      barcodeImageView.setImageBitmap(barcode);
+    }
+
+    TextView formatTextView = (TextView) findViewById(R.id.format_text_view);
+    formatTextView.setText(rawResult.getBarcodeFormat().toString());
+
+    TextView typeTextView = (TextView) findViewById(R.id.type_text_view);
+    typeTextView.setText(resultHandler.getType().toString());
+
+    DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+    TextView timeTextView = (TextView) findViewById(R.id.time_text_view);
+    timeTextView.setText(formatter.format(new Date(rawResult.getTimestamp())));
+
+
+    TextView metaTextView = (TextView) findViewById(R.id.meta_text_view);
+    View metaTextViewLabel = findViewById(R.id.meta_text_view_label);
+    metaTextView.setVisibility(View.GONE);
+    metaTextViewLabel.setVisibility(View.GONE);
+    Map<ResultMetadataType,Object> metadata = rawResult.getResultMetadata();
+    if (metadata != null) {
+      StringBuilder metadataText = new StringBuilder(20);
+      for (Map.Entry<ResultMetadataType,Object> entry : metadata.entrySet()) {
+        if (DISPLAYABLE_METADATA_TYPES.contains(entry.getKey())) {
+          metadataText.append(entry.getValue()).append('\n');
+        }
+      }
+      if (metadataText.length() > 0) {
+        metadataText.setLength(metadataText.length() - 1);
+        metaTextView.setText(metadataText);
+        metaTextView.setVisibility(View.VISIBLE);
+        metaTextViewLabel.setVisibility(View.VISIBLE);
+      }
+    }
+
+    TextView contentsTextView = (TextView) findViewById(R.id.contents_text_view);
+    CharSequence displayContents = resultHandler.getDisplayContents();
+    contentsTextView.setText(displayContents);
+    // Crudely scale betweeen 22 and 32 -- bigger font for shorter text
+    int scaledSize = Math.max(22, 32 - displayContents.length() / 4);
+    contentsTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, scaledSize);
+
+    TextView supplementTextView = (TextView) findViewById(R.id.contents_supplement_text_view);
+    supplementTextView.setText("");
+    supplementTextView.setOnClickListener(null);
+    
+
+    int buttonCount = resultHandler.getButtonCount();
+    ViewGroup buttonView = (ViewGroup) findViewById(R.id.result_button_view);
+    buttonView.requestFocus();
+    for (int x = 0; x < ResultHandler.MAX_BUTTON_COUNT; x++) {
+      TextView button = (TextView) buttonView.getChildAt(x);
+      if (x < buttonCount) {
+        button.setVisibility(View.VISIBLE);
+        button.setText(resultHandler.getButtonText(x));
+        button.setOnClickListener(new ResultButtonListener(resultHandler, x));
+      } else {
+        button.setVisibility(View.GONE);
+      }
+    }
+
+    
+  }
+
+  // Briefly show the contents of the barcode, then handle the result outside Barcode Scanner.
+  private void handleDecodeExternally(Result rawResult, ResultHandler resultHandler, Bitmap barcode) {
+
+    if (barcode != null) {
+      viewfinderView.drawResultBitmap(barcode);
+    }
+
+    long resultDurationMS;
+    if (getIntent() == null) {
+      resultDurationMS = DEFAULT_INTENT_RESULT_DURATION_MS;
+    } else {
+      resultDurationMS = getIntent().getLongExtra(Intents.Scan.RESULT_DISPLAY_DURATION_MS,
+                                                  DEFAULT_INTENT_RESULT_DURATION_MS);
+    }
+
+    if (resultDurationMS > 0) {
+      String rawResultString = String.valueOf(rawResult);
+      if (rawResultString.length() > 32) {
+        rawResultString = rawResultString.substring(0, 32) + " ...";
+      }
+      statusView.setText(getString(resultHandler.getDisplayTitle()) + " : " + rawResultString);
+    }
+
+    if (source == IntentSource.NATIVE_APP_INTENT) {
+      
+      // Hand back whatever action they requested - this can be changed to Intents.Scan.ACTION when
+      // the deprecated intent is retired.
+      Intent intent = new Intent(getIntent().getAction());
+      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+      intent.putExtra(Intents.Scan.RESULT, rawResult.toString());
+      intent.putExtra(Intents.Scan.RESULT_FORMAT, rawResult.getBarcodeFormat().toString());
+      byte[] rawBytes = rawResult.getRawBytes();
+      if (rawBytes != null && rawBytes.length > 0) {
+        intent.putExtra(Intents.Scan.RESULT_BYTES, rawBytes);
+      }
+      Map<ResultMetadataType,?> metadata = rawResult.getResultMetadata();
+      if (metadata != null) {
+        if (metadata.containsKey(ResultMetadataType.UPC_EAN_EXTENSION)) {
+          intent.putExtra(Intents.Scan.RESULT_UPC_EAN_EXTENSION,
+                          metadata.get(ResultMetadataType.UPC_EAN_EXTENSION).toString());
+        }
+        Number orientation = (Number) metadata.get(ResultMetadataType.ORIENTATION);
+        if (orientation != null) {
+          intent.putExtra(Intents.Scan.RESULT_ORIENTATION, orientation.intValue());
+        }
+        String ecLevel = (String) metadata.get(ResultMetadataType.ERROR_CORRECTION_LEVEL);
+        if (ecLevel != null) {
+          intent.putExtra(Intents.Scan.RESULT_ERROR_CORRECTION_LEVEL, ecLevel);
+        }
+        @SuppressWarnings("unchecked")
+        Iterable<byte[]> byteSegments = (Iterable<byte[]>) metadata.get(ResultMetadataType.BYTE_SEGMENTS);
+        if (byteSegments != null) {
+          int i = 0;
+          for (byte[] byteSegment : byteSegments) {
+            intent.putExtra(Intents.Scan.RESULT_BYTE_SEGMENTS_PREFIX + i, byteSegment);
+            i++;
+          }
+        }
+      }
+      sendReplyMessage(R.id.return_scan_result, intent, resultDurationMS);
+      
+    } else if (source == IntentSource.PRODUCT_SEARCH_LINK) {
+      
+      // Reformulate the URL which triggered us into a query, so that the request goes to the same
+      // TLD as the scan URL.
+      int end = sourceUrl.lastIndexOf("/scan");
+      String replyURL = sourceUrl.substring(0, end) + "?q=" + resultHandler.getDisplayContents() + "&source=zxing";      
+      sendReplyMessage(R.id.launch_product_query, replyURL, resultDurationMS);
+      
+    } else if (source == IntentSource.ZXING_LINK) {
+
+      if (scanFromWebPageManager != null && scanFromWebPageManager.isScanFromWebPage()) {
+        String replyURL = scanFromWebPageManager.buildReplyURL(rawResult, resultHandler);
+        sendReplyMessage(R.id.launch_product_query, replyURL, resultDurationMS);
+      }
+      
+    }
+  }
+  
+  private void sendReplyMessage(int id, Object arg, long delayMS) {
+    if (handler != null) {
+      Message message = Message.obtain(handler, id, arg);
+      if (delayMS > 0L) {
+        handler.sendMessageDelayed(message, delayMS);
+      } else {
+        handler.sendMessage(message);
+      }
+    }
+  }
+
+  private void initCamera(SurfaceHolder surfaceHolder) {
+    if (surfaceHolder == null) {
+      throw new IllegalStateException("No SurfaceHolder provided");
+    }
+    if (cameraManager.isOpen()) {
+      Log.w(TAG, "initCamera() while already open -- late SurfaceView callback?");
+      return;
+    }
+    try {
+      cameraManager.openDriver(surfaceHolder);
+      // Creating the handler starts the preview, which can also throw a RuntimeException.
+      if (handler == null) {
+        handler = new CaptureActivityHandler(this, decodeFormats, decodeHints, characterSet, cameraManager);
+      }
+      decodeOrStoreSavedBitmap(null, null);
+    } catch (IOException ioe) {
+      Log.w(TAG, ioe);
+      displayFrameworkBugMessageAndExit();
+    } catch (RuntimeException e) {
+      // Barcode Scanner has seen crashes in the wild of this variety:
+      // java.?lang.?RuntimeException: Fail to connect to camera service
+      Log.w(TAG, "Unexpected error initializing camera", e);
+      displayFrameworkBugMessageAndExit();
+    }
+  }
+
+  private void displayFrameworkBugMessageAndExit() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setTitle(getString(R.string.app_name));
+    builder.setMessage(getString(R.string.msg_camera_framework_bug));
+    builder.setPositiveButton(R.string.button_ok, new FinishListener(this));
+    builder.setOnCancelListener(new FinishListener(this));
+    builder.show();
+  }
+
+  public void restartPreviewAfterDelay(long delayMS) {
+    if (handler != null) {
+      handler.sendEmptyMessageDelayed(R.id.restart_preview, delayMS);
+    }
+    resetStatusView();
+  }
+
+  private void resetStatusView() {
+    resultView.setVisibility(View.GONE);
+    statusView.setText(R.string.msg_default_status);
+    statusView.setVisibility(View.VISIBLE);
+    viewfinderView.setVisibility(View.VISIBLE);
+    lastResult = null;
+  }
+
+  public void drawViewfinder() {
+    viewfinderView.drawViewfinder();
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/CaptureActivityHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/CaptureActivityHandler.java
new file mode 100644
index 00000000..df760a14
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/CaptureActivityHandler.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.content.ActivityNotFoundException;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.BitmapFactory;
+import android.provider.Browser;
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.Result;
+import com.google.zxing.client.android.camera.CameraManager;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+import java.util.Collection;
+import java.util.Map;
+
+import keepass2android.plugin.qr.R;
+
+/**
+ * This class handles all the messaging which comprises the state machine for capture.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class CaptureActivityHandler extends Handler {
+
+  private static final String TAG = CaptureActivityHandler.class.getSimpleName();
+
+  private final CaptureActivity activity;
+  private final DecodeThread decodeThread;
+  private State state;
+  private final CameraManager cameraManager;
+
+  private enum State {
+    PREVIEW,
+    SUCCESS,
+    DONE
+  }
+
+  CaptureActivityHandler(CaptureActivity activity,
+                         Collection<BarcodeFormat> decodeFormats,
+                         Map<DecodeHintType,?> baseHints,
+                         String characterSet,
+                         CameraManager cameraManager) {
+    this.activity = activity;
+    decodeThread = new DecodeThread(activity, decodeFormats, baseHints, characterSet,
+        new ViewfinderResultPointCallback(activity.getViewfinderView()));
+    decodeThread.start();
+    state = State.SUCCESS;
+
+    // Start ourselves capturing previews and decoding.
+    this.cameraManager = cameraManager;
+    cameraManager.startPreview();
+    restartPreviewAndDecode();
+  }
+
+  @Override
+  public void handleMessage(Message message) {
+    switch (message.what) {
+      case R.id.restart_preview:
+        Log.d(TAG, "Got restart preview message");
+        restartPreviewAndDecode();
+        break;
+      case R.id.decode_succeeded:
+        Log.d(TAG, "Got decode succeeded message");
+        state = State.SUCCESS;
+        Bundle bundle = message.getData();
+        Bitmap barcode = null;
+        float scaleFactor = 1.0f;
+        if (bundle != null) {
+          byte[] compressedBitmap = bundle.getByteArray(DecodeThread.BARCODE_BITMAP);
+          if (compressedBitmap != null) {
+            barcode = BitmapFactory.decodeByteArray(compressedBitmap, 0, compressedBitmap.length, null);
+            // Mutable copy:
+            barcode = barcode.copy(Bitmap.Config.ARGB_8888, true);
+          }
+          scaleFactor = bundle.getFloat(DecodeThread.BARCODE_SCALED_FACTOR);          
+        }
+        activity.handleDecode((Result) message.obj, barcode, scaleFactor);
+        break;
+      case R.id.decode_failed:
+        // We're decoding as fast as possible, so when one decode fails, start another.
+        state = State.PREVIEW;
+        cameraManager.requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
+        break;
+      case R.id.return_scan_result:
+        Log.d(TAG, "Got return scan result message");
+        activity.setResult(Activity.RESULT_OK, (Intent) message.obj);
+        activity.finish();
+        break;
+      case R.id.launch_product_query:
+        Log.d(TAG, "Got product query message");
+        String url = (String) message.obj;
+
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+        intent.setData(Uri.parse(url));
+
+        ResolveInfo resolveInfo =
+            activity.getPackageManager().resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+        String browserPackageName = null;
+        if (resolveInfo != null && resolveInfo.activityInfo != null) {
+          browserPackageName = resolveInfo.activityInfo.packageName;
+          Log.d(TAG, "Using browser in package " + browserPackageName);
+        }
+
+        // Needed for default Android browser / Chrome only apparently
+        if ("com.android.browser".equals(browserPackageName) || "com.android.chrome".equals(browserPackageName)) {
+          intent.setPackage(browserPackageName);
+          intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+          intent.putExtra(Browser.EXTRA_APPLICATION_ID, browserPackageName);
+        }
+
+        try {
+          activity.startActivity(intent);
+        } catch (ActivityNotFoundException ignored) {
+          Log.w(TAG, "Can't find anything to handle VIEW of URI " + url);
+        }
+        break;
+    }
+  }
+
+  public void quitSynchronously() {
+    state = State.DONE;
+    cameraManager.stopPreview();
+    Message quit = Message.obtain(decodeThread.getHandler(), R.id.quit);
+    quit.sendToTarget();
+    try {
+      // Wait at most half a second; should be enough time, and onPause() will timeout quickly
+      decodeThread.join(500L);
+    } catch (InterruptedException e) {
+      // continue
+    }
+
+    // Be absolutely sure we don't send any queued up messages
+    removeMessages(R.id.decode_succeeded);
+    removeMessages(R.id.decode_failed);
+  }
+
+  private void restartPreviewAndDecode() {
+    if (state == State.SUCCESS) {
+      state = State.PREVIEW;
+      cameraManager.requestPreviewFrame(decodeThread.getHandler(), R.id.decode);
+      activity.drawViewfinder();
+    }
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/Contents.java b/src/java/PluginQR/src/com/google/zxing/client/android/Contents.java
new file mode 100644
index 00000000..9e5a86dc
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/Contents.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.provider.ContactsContract;
+
+/**
+ * The set of constants to use when sending Barcode Scanner an Intent which requests a barcode
+ * to be encoded.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class Contents {
+  private Contents() {
+  }
+
+  public static final class Type {
+    /**
+     * Plain text. Use Intent.putExtra(DATA, string). This can be used for URLs too, but string
+     * must include "http://" or "https://".
+     */
+    public static final String TEXT = "TEXT_TYPE";
+
+    /**
+     * An email type. Use Intent.putExtra(DATA, string) where string is the email address.
+     */
+    public static final String EMAIL = "EMAIL_TYPE";
+
+    /**
+     * Use Intent.putExtra(DATA, string) where string is the phone number to call.
+     */
+    public static final String PHONE = "PHONE_TYPE";
+
+    /**
+     * An SMS type. Use Intent.putExtra(DATA, string) where string is the number to SMS.
+     */
+    public static final String SMS = "SMS_TYPE";
+
+    /**
+     * A contact. Send a request to encode it as follows:
+     * <p/>
+     * import android.provider.Contacts;
+     * <p/>
+     * Intent intent = new Intent(Intents.Encode.ACTION);
+     * intent.putExtra(Intents.Encode.TYPE, CONTACT);
+     * Bundle bundle = new Bundle();
+     * bundle.putString(Contacts.Intents.Insert.NAME, "Jenny");
+     * bundle.putString(Contacts.Intents.Insert.PHONE, "8675309");
+     * bundle.putString(Contacts.Intents.Insert.EMAIL, "jenny@the80s.com");
+     * bundle.putString(Contacts.Intents.Insert.POSTAL, "123 Fake St. San Francisco, CA 94102");
+     * intent.putExtra(Intents.Encode.DATA, bundle);
+     */
+    public static final String CONTACT = "CONTACT_TYPE";
+
+    /**
+     * A geographic location. Use as follows:
+     * Bundle bundle = new Bundle();
+     * bundle.putFloat("LAT", latitude);
+     * bundle.putFloat("LONG", longitude);
+     * intent.putExtra(Intents.Encode.DATA, bundle);
+     */
+    public static final String LOCATION = "LOCATION_TYPE";
+
+    private Type() {
+    }
+  }
+
+  public static final String URL_KEY = "URL_KEY";
+
+  public static final String NOTE_KEY = "NOTE_KEY";
+
+  /**
+   * When using Type.CONTACT, these arrays provide the keys for adding or retrieving multiple
+   * phone numbers and addresses.
+   */
+  public static final String[] PHONE_KEYS = {
+      ContactsContract.Intents.Insert.PHONE,
+      ContactsContract.Intents.Insert.SECONDARY_PHONE,
+      ContactsContract.Intents.Insert.TERTIARY_PHONE
+  };
+
+  public static final String[] PHONE_TYPE_KEYS = {
+      ContactsContract.Intents.Insert.PHONE_TYPE,
+      ContactsContract.Intents.Insert.SECONDARY_PHONE_TYPE,
+      ContactsContract.Intents.Insert.TERTIARY_PHONE_TYPE
+  };
+
+  public static final String[] EMAIL_KEYS = {
+      ContactsContract.Intents.Insert.EMAIL,
+      ContactsContract.Intents.Insert.SECONDARY_EMAIL,
+      ContactsContract.Intents.Insert.TERTIARY_EMAIL
+  };
+
+  public static final String[] EMAIL_TYPE_KEYS = {
+      ContactsContract.Intents.Insert.EMAIL_TYPE,
+      ContactsContract.Intents.Insert.SECONDARY_EMAIL_TYPE,
+      ContactsContract.Intents.Insert.TERTIARY_EMAIL_TYPE
+  };
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/DecodeFormatManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/DecodeFormatManager.java
new file mode 100644
index 00000000..353e1310
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/DecodeFormatManager.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import android.content.Intent;
+import android.net.Uri;
+import com.google.zxing.BarcodeFormat;
+
+final class DecodeFormatManager {
+
+  private static final Pattern COMMA_PATTERN = Pattern.compile(",");
+
+  static final Collection<BarcodeFormat> PRODUCT_FORMATS;
+  static final Collection<BarcodeFormat> ONE_D_FORMATS;
+  static final Collection<BarcodeFormat> QR_CODE_FORMATS = EnumSet.of(BarcodeFormat.QR_CODE);
+  static final Collection<BarcodeFormat> DATA_MATRIX_FORMATS = EnumSet.of(BarcodeFormat.DATA_MATRIX);
+  static {
+    PRODUCT_FORMATS = EnumSet.of(BarcodeFormat.UPC_A,
+                                 BarcodeFormat.UPC_E,
+                                 BarcodeFormat.EAN_13,
+                                 BarcodeFormat.EAN_8,
+                                 BarcodeFormat.RSS_14,
+                                 BarcodeFormat.RSS_EXPANDED);
+    ONE_D_FORMATS = EnumSet.of(BarcodeFormat.CODE_39,
+                               BarcodeFormat.CODE_93,
+                               BarcodeFormat.CODE_128,
+                               BarcodeFormat.ITF,
+                               BarcodeFormat.CODABAR);
+    ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
+  }
+
+  private DecodeFormatManager() {}
+
+  static Collection<BarcodeFormat> parseDecodeFormats(Intent intent) {
+    Iterable<String> scanFormats = null;
+    CharSequence scanFormatsString = intent.getStringExtra(Intents.Scan.FORMATS);
+    if (scanFormatsString != null) {
+      scanFormats = Arrays.asList(COMMA_PATTERN.split(scanFormatsString));
+    }
+    return parseDecodeFormats(scanFormats, intent.getStringExtra(Intents.Scan.MODE));
+  }
+
+  static Collection<BarcodeFormat> parseDecodeFormats(Uri inputUri) {
+    List<String> formats = inputUri.getQueryParameters(Intents.Scan.FORMATS);
+    if (formats != null && formats.size() == 1 && formats.get(0) != null){
+      formats = Arrays.asList(COMMA_PATTERN.split(formats.get(0)));
+    }
+    return parseDecodeFormats(formats, inputUri.getQueryParameter(Intents.Scan.MODE));
+  }
+
+  private static Collection<BarcodeFormat> parseDecodeFormats(Iterable<String> scanFormats,
+                                                              String decodeMode) {
+    if (scanFormats != null) {
+      Collection<BarcodeFormat> formats = EnumSet.noneOf(BarcodeFormat.class);
+      try {
+        for (String format : scanFormats) {
+          formats.add(BarcodeFormat.valueOf(format));
+        }
+        return formats;
+      } catch (IllegalArgumentException iae) {
+        // ignore it then
+      }
+    }
+    if (decodeMode != null) {
+      if (Intents.Scan.PRODUCT_MODE.equals(decodeMode)) {
+        return PRODUCT_FORMATS;
+      }
+      if (Intents.Scan.QR_CODE_MODE.equals(decodeMode)) {
+        return QR_CODE_FORMATS;
+      }
+      if (Intents.Scan.DATA_MATRIX_MODE.equals(decodeMode)) {
+        return DATA_MATRIX_FORMATS;
+      }
+      if (Intents.Scan.ONE_D_MODE.equals(decodeMode)) {
+        return ONE_D_FORMATS;
+      }
+    }
+    return null;
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/DecodeHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/DecodeHandler.java
new file mode 100644
index 00000000..2ead3085
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/DecodeHandler.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.graphics.Bitmap;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.MultiFormatReader;
+import com.google.zxing.PlanarYUVLuminanceSource;
+import com.google.zxing.ReaderException;
+import com.google.zxing.Result;
+import com.google.zxing.common.HybridBinarizer;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.util.Map;
+
+import keepass2android.plugin.qr.R;
+
+final class DecodeHandler extends Handler {
+
+  private static final String TAG = DecodeHandler.class.getSimpleName();
+
+  private final CaptureActivity activity;
+  private final MultiFormatReader multiFormatReader;
+  private boolean running = true;
+
+  DecodeHandler(CaptureActivity activity, Map<DecodeHintType,Object> hints) {
+    multiFormatReader = new MultiFormatReader();
+    multiFormatReader.setHints(hints);
+    this.activity = activity;
+  }
+
+  @Override
+  public void handleMessage(Message message) {
+    if (!running) {
+      return;
+    }
+    switch (message.what) {
+      case R.id.decode:
+        decode((byte[]) message.obj, message.arg1, message.arg2);
+        break;
+      case R.id.quit:
+        running = false;
+        Looper.myLooper().quit();
+        break;
+    }
+  }
+
+  /**
+   * Decode the data within the viewfinder rectangle, and time how long it took. For efficiency,
+   * reuse the same reader objects from one decode to the next.
+   *
+   * @param data   The YUV preview frame.
+   * @param width  The width of the preview frame.
+   * @param height The height of the preview frame.
+   */
+  private void decode(byte[] data, int width, int height) {
+	  
+	  byte[] rotatedData = new byte[data.length];
+	    for (int y = 0; y < height; y++) {
+	        for (int x = 0; x < width; x++)
+	             rotatedData[x * height + height - y - 1] = data[x + y * width];
+	     }
+	int tmp = width;         
+	width = height;
+	height = tmp;
+	data = rotatedData;
+	  
+    long start = System.currentTimeMillis();
+    Result rawResult = null;
+    PlanarYUVLuminanceSource source = activity.getCameraManager().buildLuminanceSource(data, width, height);
+    if (source != null) {
+      BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
+      try {
+        rawResult = multiFormatReader.decodeWithState(bitmap);
+      } catch (ReaderException re) {
+        // continue
+      } finally {
+        multiFormatReader.reset();
+      }
+    }
+    
+
+    Handler handler = activity.getHandler();
+    if (rawResult != null) {
+      // Don't log the barcode contents for security.
+      long end = System.currentTimeMillis();
+      Log.d(TAG, "Found barcode in " + (end - start) + " ms");
+      if (handler != null) {
+        Message message = Message.obtain(handler, R.id.decode_succeeded, rawResult);
+        Bundle bundle = new Bundle();
+        bundleThumbnail(source, bundle);        
+        message.setData(bundle);
+        message.sendToTarget();
+      }
+    } else {
+      if (handler != null) {
+        Message message = Message.obtain(handler, R.id.decode_failed);
+        message.sendToTarget();
+      }
+    }
+  }
+
+  private static void bundleThumbnail(PlanarYUVLuminanceSource source, Bundle bundle) {
+    int[] pixels = source.renderThumbnail();
+    int width = source.getThumbnailWidth();
+    int height = source.getThumbnailHeight();
+    Bitmap bitmap = Bitmap.createBitmap(pixels, 0, width, width, height, Bitmap.Config.ARGB_8888);
+    ByteArrayOutputStream out = new ByteArrayOutputStream();    
+    bitmap.compress(Bitmap.CompressFormat.JPEG, 50, out);
+    bundle.putByteArray(DecodeThread.BARCODE_BITMAP, out.toByteArray());
+    bundle.putFloat(DecodeThread.BARCODE_SCALED_FACTOR, (float) width / source.getWidth());
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/DecodeHintManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/DecodeHintManager.java
new file mode 100644
index 00000000..fa215b5a
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/DecodeHintManager.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2013 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.google.zxing.DecodeHintType;
+
+/**
+ * @author Lachezar Dobrev
+ */
+final class DecodeHintManager {
+  
+  private static final String TAG = DecodeHintManager.class.getSimpleName();
+
+  // This pattern is used in decoding integer arrays.
+  private static final Pattern COMMA = Pattern.compile(",");
+
+  private DecodeHintManager() {}
+
+  /**
+   * <p>Split a query string into a list of name-value pairs.</p>
+   * 
+   * <p>This is an alternative to the {@link Uri#getQueryParameterNames()} and
+   * {@link Uri#getQueryParameters(String)}, which are quirky and not suitable
+   * for exist-only Uri parameters.</p>
+   * 
+   * <p>This method ignores multiple parameters with the same name and returns the
+   * first one only. This is technically incorrect, but should be acceptable due
+   * to the method of processing Hints: no multiple values for a hint.</p>
+   * 
+   * @param query query to split
+   * @return name-value pairs
+   */
+  private static Map<String,String> splitQuery(String query) {
+    Map<String,String> map = new HashMap<String,String>();
+    int pos = 0;
+    while (pos < query.length()) {
+      if (query.charAt(pos) == '&') {
+        // Skip consecutive ampersand separators.
+        pos ++;
+        continue;
+      }
+      int amp = query.indexOf('&', pos);
+      int equ = query.indexOf('=', pos);
+      if (amp < 0) {
+        // This is the last element in the query, no more ampersand elements.
+        String name;
+        String text;
+        if (equ < 0) {
+          // No equal sign
+          name = query.substring(pos);
+          name = name.replace('+', ' '); // Preemptively decode +
+          name = Uri.decode(name);
+          text = "";
+        } else {
+          // Split name and text.
+          name = query.substring(pos, equ);
+          name = name.replace('+', ' '); // Preemptively decode +
+          name = Uri.decode(name);
+          text = query.substring(equ + 1);
+          text = text.replace('+', ' '); // Preemptively decode +
+          text = Uri.decode(text);
+        }
+        if (!map.containsKey(name)) {
+          map.put(name, text);
+        }
+        break;
+      }
+      if (equ < 0 || equ > amp) {
+        // No equal sign until the &: this is a simple parameter with no value.
+        String name = query.substring(pos, amp);
+        name = name.replace('+', ' '); // Preemptively decode +
+        name = Uri.decode(name);
+        if (!map.containsKey(name)) {
+          map.put(name, "");
+        }
+        pos = amp + 1;
+        continue;
+      }
+      String name = query.substring(pos, equ);
+      name = name.replace('+', ' '); // Preemptively decode +
+      name = Uri.decode(name);
+      String text = query.substring(equ+1, amp);
+      text = text.replace('+', ' '); // Preemptively decode +
+      text = Uri.decode(text);
+      if (!map.containsKey(name)) {
+        map.put(name, text);
+      }
+      pos = amp + 1;
+    }
+    return map;
+  }
+
+  static Map<DecodeHintType,?> parseDecodeHints(Uri inputUri) {
+    String query = inputUri.getEncodedQuery();
+    if (query == null || query.isEmpty()) {
+      return null;
+    }
+
+    // Extract parameters
+    Map<String, String> parameters = splitQuery(query);
+
+    Map<DecodeHintType, Object> hints = new EnumMap<DecodeHintType, Object>(DecodeHintType.class);
+
+    for (DecodeHintType hintType: DecodeHintType.values()) {
+
+      if (hintType == DecodeHintType.CHARACTER_SET ||
+          hintType == DecodeHintType.NEED_RESULT_POINT_CALLBACK ||
+          hintType == DecodeHintType.POSSIBLE_FORMATS) {
+        continue; // This hint is specified in another way
+      }
+
+      String parameterName = hintType.name();
+      String parameterText = parameters.get(parameterName);
+      if (parameterText == null) {
+        continue;
+      }
+      if (hintType.getValueType().equals(Object.class)) {
+        // This is an unspecified type of hint content. Use the value as is.
+        // TODO: Can we make a different assumption on this?
+        hints.put(hintType, parameterText);
+        continue;
+      }
+      if (hintType.getValueType().equals(Void.class)) {
+        // Void hints are just flags: use the constant specified by DecodeHintType
+        hints.put(hintType, Boolean.TRUE);
+        continue;
+      }
+      if (hintType.getValueType().equals(String.class)) {
+        // A string hint: use the decoded value.
+        hints.put(hintType, parameterText);
+        continue;
+      }
+      if (hintType.getValueType().equals(Boolean.class)) {
+        // A boolean hint: a few values for false, everything else is true.
+        // An empty parameter is simply a flag-style parameter, assuming true
+        if (parameterText.isEmpty()) {
+          hints.put(hintType, Boolean.TRUE);
+        } else if ("0".equals(parameterText) || 
+                   "false".equalsIgnoreCase(parameterText) || 
+                   "no".equalsIgnoreCase(parameterText)) {
+          hints.put(hintType, Boolean.FALSE);
+        } else {
+          hints.put(hintType, Boolean.TRUE);
+        }
+
+        continue;
+      }
+      if (hintType.getValueType().equals(int[].class)) {
+        // An integer array. Used to specify valid lengths.
+        // Strip a trailing comma as in Java style array initialisers.
+        if (!parameterText.isEmpty() && parameterText.charAt(parameterText.length() - 1) == ',') {
+          parameterText = parameterText.substring(0, parameterText.length() - 1);
+        }
+        String[] values = COMMA.split(parameterText);
+        int[] array = new int[values.length];
+        for (int i = 0; i < values.length; i++) {
+          try {
+            array[i] = Integer.parseInt(values[i]);
+          } catch (NumberFormatException ignored) {
+            Log.w(TAG, "Skipping array of integers hint " + hintType + " due to invalid numeric value: '" + values[i] + '\'');
+            array = null;
+            break;
+          }
+        }
+        if (array != null) {
+          hints.put(hintType, array);
+        }
+        continue;
+      } 
+      Log.w(TAG, "Unsupported hint type '" + hintType + "' of type " + hintType.getValueType());
+    }
+
+    Log.i(TAG, "Hints from the URI: " + hints);
+    return hints;
+  }
+
+  static Map<DecodeHintType, Object> parseDecodeHints(Intent intent) {
+    Bundle extras = intent.getExtras();
+    if (extras == null || extras.isEmpty()) {
+      return null;
+    }
+    Map<DecodeHintType,Object> hints = new EnumMap<DecodeHintType,Object>(DecodeHintType.class);
+
+    for (DecodeHintType hintType: DecodeHintType.values()) {
+
+      if (hintType == DecodeHintType.CHARACTER_SET ||
+          hintType == DecodeHintType.NEED_RESULT_POINT_CALLBACK ||
+          hintType == DecodeHintType.POSSIBLE_FORMATS) {
+        continue; // This hint is specified in another way
+      }
+
+      String hintName = hintType.name();
+      if (extras.containsKey(hintName)) {
+        if (hintType.getValueType().equals(Void.class)) {
+          // Void hints are just flags: use the constant specified by the DecodeHintType
+          hints.put(hintType, Boolean.TRUE);
+        } else {
+          Object hintData = extras.get(hintName);
+          if (hintType.getValueType().isInstance(hintData)) {
+            hints.put(hintType, hintData);
+          } else {
+            Log.w(TAG, "Ignoring hint " + hintType + " because it is not assignable from " + hintData);
+          }
+        }
+      }
+    }
+
+    Log.i(TAG, "Hints from the Intent: " + hints);
+    return hints;
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/DecodeThread.java b/src/java/PluginQR/src/com/google/zxing/client/android/DecodeThread.java
new file mode 100644
index 00000000..99f3eff3
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/DecodeThread.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.DecodeHintType;
+import com.google.zxing.ResultPointCallback;
+
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * This thread does all the heavy lifting of decoding the images.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+final class DecodeThread extends Thread {
+
+  public static final String BARCODE_BITMAP = "barcode_bitmap";
+  public static final String BARCODE_SCALED_FACTOR = "barcode_scaled_factor";
+
+  private final CaptureActivity activity;
+  private final Map<DecodeHintType,Object> hints;
+  private Handler handler;
+  private final CountDownLatch handlerInitLatch;
+
+  DecodeThread(CaptureActivity activity,
+               Collection<BarcodeFormat> decodeFormats,
+               Map<DecodeHintType,?> baseHints,
+               String characterSet,
+               ResultPointCallback resultPointCallback) {
+
+    this.activity = activity;
+    handlerInitLatch = new CountDownLatch(1);
+
+    hints = new EnumMap<DecodeHintType,Object>(DecodeHintType.class);
+    if (baseHints != null) {
+      hints.putAll(baseHints);
+    }
+
+    // The prefs can't change while the thread is running, so pick them up once here.
+    if (decodeFormats == null || decodeFormats.isEmpty()) {
+      SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+      decodeFormats = EnumSet.noneOf(BarcodeFormat.class);
+      if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_1D, false)) {
+        decodeFormats.addAll(DecodeFormatManager.ONE_D_FORMATS);
+      }
+      if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_QR, false)) {
+        decodeFormats.addAll(DecodeFormatManager.QR_CODE_FORMATS);
+      }
+      if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_DATA_MATRIX, false)) {
+        decodeFormats.addAll(DecodeFormatManager.DATA_MATRIX_FORMATS);
+      }
+    }
+    hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);
+
+    if (characterSet != null) {
+      hints.put(DecodeHintType.CHARACTER_SET, characterSet);
+    }
+    hints.put(DecodeHintType.NEED_RESULT_POINT_CALLBACK, resultPointCallback);
+    Log.i("DecodeThread", "Hints: " + hints);
+  }
+
+  Handler getHandler() {
+    try {
+      handlerInitLatch.await();
+    } catch (InterruptedException ie) {
+      // continue?
+    }
+    return handler;
+  }
+
+  @Override
+  public void run() {
+    Looper.prepare();
+    handler = new DecodeHandler(activity, hints);
+    handlerInitLatch.countDown();
+    Looper.loop();
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/FinishListener.java b/src/java/PluginQR/src/com/google/zxing/client/android/FinishListener.java
new file mode 100644
index 00000000..5d598861
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/FinishListener.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+
+/**
+ * Simple listener used to exit the app in a few cases.
+ *
+ * @author Sean Owen
+ */
+public final class FinishListener implements DialogInterface.OnClickListener, DialogInterface.OnCancelListener {
+
+  private final Activity activityToFinish;
+
+  public FinishListener(Activity activityToFinish) {
+    this.activityToFinish = activityToFinish;
+  }
+
+  @Override
+  public void onCancel(DialogInterface dialogInterface) {
+    run();
+  }
+
+  @Override
+  public void onClick(DialogInterface dialogInterface, int i) {
+    run();
+  }
+
+  private void run() {
+    activityToFinish.finish();
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/HttpHelper.java b/src/java/PluginQR/src/com/google/zxing/client/android/HttpHelper.java
new file mode 100644
index 00000000..f0d9b07f
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/HttpHelper.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Utility methods for retrieving content over HTTP using the more-supported {@code java.net} classes
+ * in Android.
+ */
+public final class HttpHelper {
+
+  private static final String TAG = HttpHelper.class.getSimpleName();
+
+  private static final Collection<String> REDIRECTOR_DOMAINS = new HashSet<String>(Arrays.asList(
+    "amzn.to", "bit.ly", "bitly.com", "fb.me", "goo.gl", "is.gd", "j.mp", "lnkd.in", "ow.ly",
+    "R.BEETAGG.COM", "r.beetagg.com", "SCN.BY", "su.pr", "t.co", "tinyurl.com", "tr.im"
+  ));
+
+  private HttpHelper() {
+  }
+  
+  public enum ContentType {
+    /** HTML-like content type, including HTML, XHTML, etc. */
+    HTML,
+    /** JSON content */
+    JSON,
+    /** XML */
+    XML,
+    /** Plain text content */
+    TEXT,
+  }
+
+  /**
+   * Downloads the entire resource instead of part.
+   *
+   * @see #downloadViaHttp(String, HttpHelper.ContentType, int)
+   */
+  public static CharSequence downloadViaHttp(String uri, ContentType type) throws IOException {
+    return downloadViaHttp(uri, type, Integer.MAX_VALUE);
+  }
+
+  /**
+   * @param uri URI to retrieve
+   * @param type expected text-like MIME type of that content
+   * @param maxChars approximate maximum characters to read from the source
+   * @return content as a {@code String}
+   * @throws IOException if the content can't be retrieved because of a bad URI, network problem, etc.
+   */
+  public static CharSequence downloadViaHttp(String uri, ContentType type, int maxChars) throws IOException {
+    String contentTypes;
+    switch (type) {
+      case HTML:
+        contentTypes = "application/xhtml+xml,text/html,text/*,*/*";
+        break;
+      case JSON:
+        contentTypes = "application/json,text/*,*/*";
+        break;
+      case XML:
+        contentTypes = "application/xml,text/*,*/*";
+        break;
+      case TEXT:
+      default:
+        contentTypes = "text/*,*/*";
+    }
+    return downloadViaHttp(uri, contentTypes, maxChars);
+  }
+
+  private static CharSequence downloadViaHttp(String uri, String contentTypes, int maxChars) throws IOException {
+    int redirects = 0;
+    while (redirects < 5) {
+      URL url = new URL(uri);
+      HttpURLConnection connection = safelyOpenConnection(url);
+      connection.setInstanceFollowRedirects(true); // Won't work HTTP -> HTTPS or vice versa
+      connection.setRequestProperty("Accept", contentTypes);
+      connection.setRequestProperty("Accept-Charset", "utf-8,*");
+      connection.setRequestProperty("User-Agent", "ZXing (Android)");
+      try {
+        int responseCode = safelyConnect(uri, connection);
+        switch (responseCode) {
+          case HttpURLConnection.HTTP_OK:
+            return consume(connection, maxChars);
+          case HttpURLConnection.HTTP_MOVED_TEMP:
+            String location = connection.getHeaderField("Location");
+            if (location != null) {
+              uri = location;
+              redirects++;
+              continue;
+            }
+            throw new IOException("No Location");
+          default:
+            throw new IOException("Bad HTTP response: " + responseCode);
+        }
+      } finally {
+        connection.disconnect();
+      }
+    }
+    throw new IOException("Too many redirects");
+  }
+
+  private static String getEncoding(URLConnection connection) {
+    String contentTypeHeader = connection.getHeaderField("Content-Type");
+    if (contentTypeHeader != null) {
+      int charsetStart = contentTypeHeader.indexOf("charset=");
+      if (charsetStart >= 0) {
+        return contentTypeHeader.substring(charsetStart + "charset=".length());
+      }
+    }
+    return "UTF-8";
+  }
+
+  private static CharSequence consume(URLConnection connection, int maxChars) throws IOException {
+    String encoding = getEncoding(connection);
+    StringBuilder out = new StringBuilder();
+    Reader in = null;
+    try {
+      in = new InputStreamReader(connection.getInputStream(), encoding);
+      char[] buffer = new char[1024];
+      int charsRead;
+      while (out.length() < maxChars && (charsRead = in.read(buffer)) > 0) {
+        out.append(buffer, 0, charsRead);
+      }
+    } finally {
+      if (in != null) {
+        try {
+          in.close();
+        } catch (IOException ioe) {
+          // continue
+        } catch (NullPointerException npe) {
+          // another apparent Android / Harmony bug; continue
+        }
+      }
+    }
+    return out;
+  }
+
+  public static URI unredirect(URI uri) throws IOException {
+    if (!REDIRECTOR_DOMAINS.contains(uri.getHost())) {
+      return uri;
+    }
+    URL url = uri.toURL();
+    HttpURLConnection connection = safelyOpenConnection(url);
+    connection.setInstanceFollowRedirects(false);
+    connection.setDoInput(false);
+    connection.setRequestMethod("HEAD");
+    connection.setRequestProperty("User-Agent", "ZXing (Android)");
+    try {
+      int responseCode = safelyConnect(uri.toString(), connection);
+      switch (responseCode) {
+        case HttpURLConnection.HTTP_MULT_CHOICE:
+        case HttpURLConnection.HTTP_MOVED_PERM:
+        case HttpURLConnection.HTTP_MOVED_TEMP:
+        case HttpURLConnection.HTTP_SEE_OTHER:
+        case 307: // No constant for 307 Temporary Redirect ?
+          String location = connection.getHeaderField("Location");
+          if (location != null) {
+            try {
+              return new URI(location);
+            } catch (URISyntaxException e) {
+              // nevermind
+            }
+          }
+      }
+      return uri;
+    } finally {
+      connection.disconnect();
+    }
+  }
+  
+  private static HttpURLConnection safelyOpenConnection(URL url) throws IOException {
+    URLConnection conn;
+    try {
+      conn = url.openConnection();
+    } catch (NullPointerException npe) {
+      // Another strange bug in Android?
+      Log.w(TAG, "Bad URI? " + url);
+      throw new IOException(npe);
+    }
+    if (!(conn instanceof HttpURLConnection)) {
+      throw new IOException();
+    }
+    return (HttpURLConnection) conn;
+  }
+
+  private static int safelyConnect(String uri, HttpURLConnection connection) throws IOException {
+    try {
+      connection.connect();
+    } catch (NullPointerException npe) {
+      // this is an Android bug: http://code.google.com/p/android/issues/detail?id=16895
+      throw new IOException(npe);
+    } catch (IllegalArgumentException iae) {
+      // Also seen this in the wild, not sure what to make of it. Probably a bad URL
+      throw new IOException(iae);
+    } catch (SecurityException se) {
+      // due to bad VPN settings?
+      Log.w(TAG, "Restricted URI? " + uri);
+      throw new IOException(se);
+    } catch (IndexOutOfBoundsException ioobe) {
+      // Another Android problem? https://groups.google.com/forum/?fromgroups#!topic/google-admob-ads-sdk/U-WfmYa9or0
+      throw new IOException(ioobe);
+    }
+    try {
+      return connection.getResponseCode();
+    } catch (NullPointerException npe) {
+      // this is maybe this Android bug: http://code.google.com/p/android/issues/detail?id=15554
+      throw new IOException(npe);
+    } catch (IllegalArgumentException iae) {
+      // Again seen this in the wild for bad header fields in the server response! or bad reads
+      Log.w(TAG, "Bad server status? " + uri);
+      throw new IOException(iae);
+    } catch (StringIndexOutOfBoundsException sioobe) {
+      // Another Android bug: https://code.google.com/p/android/issues/detail?id=18856
+      throw new IOException(sioobe);
+    }
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/InactivityTimer.java b/src/java/PluginQR/src/com/google/zxing/client/android/InactivityTimer.java
new file mode 100644
index 00000000..67479848
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/InactivityTimer.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.AsyncTask;
+import android.os.BatteryManager;
+import android.util.Log;
+
+/**
+ * Finishes an activity after a period of inactivity if the device is on battery power.
+ */
+final class InactivityTimer {
+
+  private static final String TAG = InactivityTimer.class.getSimpleName();
+
+  private static final long INACTIVITY_DELAY_MS = 5 * 60 * 1000L;
+
+  private final Activity activity;
+  private final BroadcastReceiver powerStatusReceiver;
+  private boolean registered;
+  private AsyncTask<?,?,?> inactivityTask;
+
+  InactivityTimer(Activity activity) {
+    this.activity = activity;
+    powerStatusReceiver = new PowerStatusReceiver();
+    registered = false;
+    onActivity();
+  }
+
+  synchronized void onActivity() {
+    cancel();
+    inactivityTask = new InactivityAsyncTask();
+    inactivityTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+  }
+
+  public synchronized void onPause() {
+    cancel();
+    if (registered) {
+      activity.unregisterReceiver(powerStatusReceiver);
+      registered = false;
+    } else {
+      Log.w(TAG, "PowerStatusReceiver was never registered?");
+    }
+  }
+
+  public synchronized void onResume() {
+    if (registered) {
+      Log.w(TAG, "PowerStatusReceiver was already registered?");
+    } else {
+      activity.registerReceiver(powerStatusReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+      registered = true;
+    }
+    onActivity();
+  }
+
+  private synchronized void cancel() {
+    AsyncTask<?,?,?> task = inactivityTask;
+    if (task != null) {
+      task.cancel(true);
+      inactivityTask = null;
+    }
+  }
+
+  void shutdown() {
+    cancel();
+  }
+
+  private final class PowerStatusReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent){
+      if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) {
+        // 0 indicates that we're on battery
+        boolean onBatteryNow = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) <= 0;
+        if (onBatteryNow) {
+          InactivityTimer.this.onActivity();
+        } else {
+          InactivityTimer.this.cancel();
+        }
+      }
+    }
+  }
+
+  private final class InactivityAsyncTask extends AsyncTask<Object,Object,Object> {
+    @Override
+    protected Object doInBackground(Object... objects) {
+      try {
+        Thread.sleep(INACTIVITY_DELAY_MS);
+        Log.i(TAG, "Finishing activity due to inactivity");
+        activity.finish();
+      } catch (InterruptedException e) {
+        // continue without killing
+      }
+      return null;
+    }
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/IntentSource.java b/src/java/PluginQR/src/com/google/zxing/client/android/IntentSource.java
new file mode 100644
index 00000000..3222db6b
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/IntentSource.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+enum IntentSource {
+
+  NATIVE_APP_INTENT,
+  PRODUCT_SEARCH_LINK,
+  ZXING_LINK,
+  NONE
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/Intents.java b/src/java/PluginQR/src/com/google/zxing/client/android/Intents.java
new file mode 100644
index 00000000..b2d53f6a
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/Intents.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+/**
+ * This class provides the constants to use when sending an Intent to Barcode Scanner.
+ * These strings are effectively API and cannot be changed.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class Intents {
+  private Intents() {
+  }
+
+  public static final class Scan {
+    /**
+     * Send this intent to open the Barcodes app in scanning mode, find a barcode, and return
+     * the results.
+     */
+    public static final String ACTION = "com.google.zxing.client.android.SCAN";
+
+    /**
+     * By default, sending this will decode all barcodes that we understand. However it
+     * may be useful to limit scanning to certain formats. Use
+     * {@link android.content.Intent#putExtra(String, String)} with one of the values below.
+     *
+     * Setting this is effectively shorthand for setting explicit formats with {@link #FORMATS}.
+     * It is overridden by that setting.
+     */
+    public static final String MODE = "SCAN_MODE";
+
+    /**
+     * Decode only UPC and EAN barcodes. This is the right choice for shopping apps which get
+     * prices, reviews, etc. for products.
+     */
+    public static final String PRODUCT_MODE = "PRODUCT_MODE";
+
+    /**
+     * Decode only 1D barcodes.
+     */
+    public static final String ONE_D_MODE = "ONE_D_MODE";
+
+    /**
+     * Decode only QR codes.
+     */
+    public static final String QR_CODE_MODE = "QR_CODE_MODE";
+
+    /**
+     * Decode only Data Matrix codes.
+     */
+    public static final String DATA_MATRIX_MODE = "DATA_MATRIX_MODE";
+
+    /**
+     * Comma-separated list of formats to scan for. The values must match the names of
+     * {@link com.google.zxing.BarcodeFormat}s, e.g. {@link com.google.zxing.BarcodeFormat#EAN_13}.
+     * Example: "EAN_13,EAN_8,QR_CODE". This overrides {@link #MODE}.
+     */
+    public static final String FORMATS = "SCAN_FORMATS";
+
+    /**
+     * @see com.google.zxing.DecodeHintType#CHARACTER_SET
+     */
+    public static final String CHARACTER_SET = "CHARACTER_SET";
+
+    /**
+     * Optional parameters to specify the width and height of the scanning rectangle in pixels.
+     * The app will try to honor these, but will clamp them to the size of the preview frame.
+     * You should specify both or neither, and pass the size as an int.
+     */
+    public static final String WIDTH = "SCAN_WIDTH";
+    public static final String HEIGHT = "SCAN_HEIGHT";
+
+    /**
+     * Desired duration in milliseconds for which to pause after a successful scan before
+     * returning to the calling intent. Specified as a long, not an integer!
+     * For example: 1000L, not 1000.
+     */
+    public static final String RESULT_DISPLAY_DURATION_MS = "RESULT_DISPLAY_DURATION_MS";
+
+    /**
+     * Prompt to show on-screen when scanning by intent. Specified as a {@link String}.
+     */
+    public static final String PROMPT_MESSAGE = "PROMPT_MESSAGE";
+
+    /**
+     * If a barcode is found, Barcodes returns {@link android.app.Activity#RESULT_OK} to
+     * {@link android.app.Activity#onActivityResult(int, int, android.content.Intent)}
+     * of the app which requested the scan via
+     * {@link android.app.Activity#startActivityForResult(android.content.Intent, int)}
+     * The barcodes contents can be retrieved with
+     * {@link android.content.Intent#getStringExtra(String)}. 
+     * If the user presses Back, the result code will be {@link android.app.Activity#RESULT_CANCELED}.
+     */
+    public static final String RESULT = "SCAN_RESULT";
+
+    /**
+     * Call {@link android.content.Intent#getStringExtra(String)} with {@link #RESULT_FORMAT}
+     * to determine which barcode format was found.
+     * See {@link com.google.zxing.BarcodeFormat} for possible values.
+     */
+    public static final String RESULT_FORMAT = "SCAN_RESULT_FORMAT";
+
+    /**
+     * Call {@link android.content.Intent#getStringExtra(String)} with {@link #RESULT_UPC_EAN_EXTENSION}
+     * to return the content of any UPC extension barcode that was also found. Only applicable
+     * to {@link com.google.zxing.BarcodeFormat#UPC_A} and {@link com.google.zxing.BarcodeFormat#EAN_13}
+     * formats.
+     */
+    public static final String RESULT_UPC_EAN_EXTENSION = "SCAN_RESULT_UPC_EAN_EXTENSION";
+
+    /**
+     * Call {@link android.content.Intent#getByteArrayExtra(String)} with {@link #RESULT_BYTES}
+     * to get a {@code byte[]} of raw bytes in the barcode, if available.
+     */
+    public static final String RESULT_BYTES = "SCAN_RESULT_BYTES";
+
+    /**
+     * Key for the value of {@link com.google.zxing.ResultMetadataType#ORIENTATION}, if available.
+     * Call {@link android.content.Intent#getIntArrayExtra(String)} with {@link #RESULT_ORIENTATION}.
+     */
+    public static final String RESULT_ORIENTATION = "SCAN_RESULT_ORIENTATION";
+
+    /**
+     * Key for the value of {@link com.google.zxing.ResultMetadataType#ERROR_CORRECTION_LEVEL}, if available.
+     * Call {@link android.content.Intent#getStringExtra(String)} with {@link #RESULT_ERROR_CORRECTION_LEVEL}.
+     */
+    public static final String RESULT_ERROR_CORRECTION_LEVEL = "SCAN_RESULT_ERROR_CORRECTION_LEVEL";
+
+    /**
+     * Prefix for keys that map to the values of {@link com.google.zxing.ResultMetadataType#BYTE_SEGMENTS},
+     * if available. The actual values will be set under a series of keys formed by adding 0, 1, 2, ...
+     * to this prefix. So the first byte segment is under key "SCAN_RESULT_BYTE_SEGMENTS_0" for example.
+     * Call {@link android.content.Intent#getByteArrayExtra(String)} with these keys.
+     */
+    public static final String RESULT_BYTE_SEGMENTS_PREFIX = "SCAN_RESULT_BYTE_SEGMENTS_";
+
+    /**
+     * Setting this to false will not save scanned codes in the history. Specified as a {@code boolean}.
+     */
+    public static final String SAVE_HISTORY = "SAVE_HISTORY";
+
+    private Scan() {
+    }
+  }
+
+  public static final class History {
+
+    public static final String ITEM_NUMBER = "ITEM_NUMBER";
+
+    private History() {
+    }
+  }
+
+  public static final class Encode {
+    /**
+     * Send this intent to encode a piece of data as a QR code and display it full screen, so
+     * that another person can scan the barcode from your screen.
+     */
+    public static final String ACTION = "com.google.zxing.client.android.ENCODE";
+
+    /**
+     * The data to encode. Use {@link android.content.Intent#putExtra(String, String)} or
+     * {@link android.content.Intent#putExtra(String, android.os.Bundle)}, 
+     * depending on the type and format specified. Non-QR Code formats should
+     * just use a String here. For QR Code, see Contents for details.
+     */
+    public static final String DATA = "ENCODE_DATA";
+
+    /**
+     * The type of data being supplied if the format is QR Code. Use
+     * {@link android.content.Intent#putExtra(String, String)} with one of {@link Contents.Type}.
+     */
+    public static final String TYPE = "ENCODE_TYPE";
+
+    /**
+     * The barcode format to be displayed. If this isn't specified or is blank,
+     * it defaults to QR Code. Use {@link android.content.Intent#putExtra(String, String)}, where
+     * format is one of {@link com.google.zxing.BarcodeFormat}.
+     */
+    public static final String FORMAT = "ENCODE_FORMAT";
+
+    /**
+     * Normally the contents of the barcode are displayed to the user in a TextView. Setting this
+     * boolean to false will hide that TextView, showing only the encode barcode.
+     */
+    public static final String SHOW_CONTENTS = "ENCODE_SHOW_CONTENTS";
+
+    private Encode() {
+    }
+  }
+
+  public static final class SearchBookContents {
+    /**
+     * Use Google Book Search to search the contents of the book provided.
+     */
+    public static final String ACTION = "com.google.zxing.client.android.SEARCH_BOOK_CONTENTS";
+
+    /**
+     * The book to search, identified by ISBN number.
+     */
+    public static final String ISBN = "ISBN";
+
+    /**
+     * An optional field which is the text to search for.
+     */
+    public static final String QUERY = "QUERY";
+
+    private SearchBookContents() {
+    }
+  }
+
+  public static final class WifiConnect {
+    /**
+     * Internal intent used to trigger connection to a wi-fi network.
+     */
+    public static final String ACTION = "com.google.zxing.client.android.WIFI_CONNECT";
+
+    /**
+     * The network to connect to, all the configuration provided here.
+     */
+    public static final String SSID = "SSID";
+
+    /**
+     * The network to connect to, all the configuration provided here.
+     */
+    public static final String TYPE = "TYPE";
+
+    /**
+     * The network to connect to, all the configuration provided here.
+     */
+    public static final String PASSWORD = "PASSWORD";
+
+    private WifiConnect() {
+    }
+  }
+
+  public static final class Share {
+    /**
+     * Give the user a choice of items to encode as a barcode, then render it as a QR Code and
+     * display onscreen for a friend to scan with their phone.
+     */
+    public static final String ACTION = "com.google.zxing.client.android.SHARE";
+
+    private Share() {
+    }
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/LocaleManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/LocaleManager.java
new file mode 100644
index 00000000..0a7365f9
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/LocaleManager.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Handles any locale-specific logic for the client.
+ *
+ * @author Sean Owen
+ */
+public final class LocaleManager {
+
+  private static final String DEFAULT_TLD = "com";
+  private static final String DEFAULT_COUNTRY = "US";
+  private static final String DEFAULT_LANGUAGE = "en";
+
+  /**
+   * Locales (well, countries) where Google web search is available.
+   * These should be kept in sync with our translations.
+   */
+  private static final Map<String,String> GOOGLE_COUNTRY_TLD;
+  static {
+    GOOGLE_COUNTRY_TLD = new HashMap<String,String>();
+    GOOGLE_COUNTRY_TLD.put("AR", "com.ar"); // ARGENTINA
+    GOOGLE_COUNTRY_TLD.put("AU", "com.au"); // AUSTRALIA
+    GOOGLE_COUNTRY_TLD.put("BR", "com.br"); // BRAZIL
+    GOOGLE_COUNTRY_TLD.put("BG", "bg"); // BULGARIA
+    GOOGLE_COUNTRY_TLD.put(Locale.CANADA.getCountry(), "ca");
+    GOOGLE_COUNTRY_TLD.put(Locale.CHINA.getCountry(), "cn");
+    GOOGLE_COUNTRY_TLD.put("CZ", "cz"); // CZECH REPUBLIC
+    GOOGLE_COUNTRY_TLD.put("DK", "dk"); // DENMARK
+    GOOGLE_COUNTRY_TLD.put("FI", "fi"); // FINLAND
+    GOOGLE_COUNTRY_TLD.put(Locale.FRANCE.getCountry(), "fr");
+    GOOGLE_COUNTRY_TLD.put(Locale.GERMANY.getCountry(), "de");
+    GOOGLE_COUNTRY_TLD.put("GR", "gr"); // GREECE
+    GOOGLE_COUNTRY_TLD.put("HU", "hu"); // HUNGARY
+    GOOGLE_COUNTRY_TLD.put("ID", "co.id"); // INDONESIA
+    GOOGLE_COUNTRY_TLD.put("IL", "co.il"); // ISRAEL
+    GOOGLE_COUNTRY_TLD.put(Locale.ITALY.getCountry(), "it");
+    GOOGLE_COUNTRY_TLD.put(Locale.JAPAN.getCountry(), "co.jp");
+    GOOGLE_COUNTRY_TLD.put(Locale.KOREA.getCountry(), "co.kr");
+    GOOGLE_COUNTRY_TLD.put("NL", "nl"); // NETHERLANDS
+    GOOGLE_COUNTRY_TLD.put("PL", "pl"); // POLAND
+    GOOGLE_COUNTRY_TLD.put("PT", "pt"); // PORTUGAL
+    GOOGLE_COUNTRY_TLD.put("RO", "ro"); // ROMANIA    
+    GOOGLE_COUNTRY_TLD.put("RU", "ru"); // RUSSIA
+    GOOGLE_COUNTRY_TLD.put("SK", "sk"); // SLOVAK REPUBLIC
+    GOOGLE_COUNTRY_TLD.put("SI", "si"); // SLOVENIA
+    GOOGLE_COUNTRY_TLD.put("ES", "es"); // SPAIN
+    GOOGLE_COUNTRY_TLD.put("SE", "se"); // SWEDEN
+    GOOGLE_COUNTRY_TLD.put("CH", "ch"); // SWITZERLAND    
+    GOOGLE_COUNTRY_TLD.put(Locale.TAIWAN.getCountry(), "tw");
+    GOOGLE_COUNTRY_TLD.put("TR", "com.tr"); // TURKEY
+    GOOGLE_COUNTRY_TLD.put(Locale.UK.getCountry(), "co.uk");
+    GOOGLE_COUNTRY_TLD.put(Locale.US.getCountry(), "com");
+  }
+
+  /**
+   * Google Product Search for mobile is available in fewer countries than web search. See here:
+   * http://support.google.com/merchants/bin/answer.py?hl=en-GB&answer=160619
+   */
+  private static final Map<String,String> GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD;
+  static {
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD = new HashMap<String,String>();
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put("AU", "com.au"); // AUSTRALIA
+    //GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.CHINA.getCountry(), "cn");
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.FRANCE.getCountry(), "fr");
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.GERMANY.getCountry(), "de");
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.ITALY.getCountry(), "it");
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.JAPAN.getCountry(), "co.jp");
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put("NL", "nl"); // NETHERLANDS
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put("ES", "es"); // SPAIN
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put("CH", "ch"); // SWITZERLAND
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.UK.getCountry(), "co.uk");
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.US.getCountry(), "com");
+  }
+
+  /**
+   * Book search is offered everywhere that web search is available.
+   */
+  private static final Map<String,String> GOOGLE_BOOK_SEARCH_COUNTRY_TLD = GOOGLE_COUNTRY_TLD;
+
+  private static final Collection<String> TRANSLATED_HELP_ASSET_LANGUAGES =
+      Arrays.asList("de", "en", "es", "fr", "it", "ja", "ko", "nl", "pt", "ru", "zh-rCN", "zh-rTW");
+
+  private LocaleManager() {}
+
+  /**
+   * @return country-specific TLD suffix appropriate for the current default locale
+   *  (e.g. "co.uk" for the United Kingdom)
+   */
+  public static String getCountryTLD(Context context) {
+    return doGetTLD(GOOGLE_COUNTRY_TLD, context);
+  }
+
+  /**
+   * The same as above, but specifically for Google Product Search.
+   * @return The top-level domain to use.
+   */
+  public static String getProductSearchCountryTLD(Context context) {
+    return doGetTLD(GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD, context);
+  }
+
+  /**
+   * The same as above, but specifically for Google Book Search.
+   * @return The top-level domain to use.
+   */
+  public static String getBookSearchCountryTLD(Context context) {
+    return doGetTLD(GOOGLE_BOOK_SEARCH_COUNTRY_TLD, context);
+  }
+
+  /**
+   * Does a given URL point to Google Book Search, regardless of domain.
+   *
+   * @param url The address to check.
+   * @return True if this is a Book Search URL.
+   */
+  public static boolean isBookSearchUrl(String url) {
+    return url.startsWith("http://google.com/books") || url.startsWith("http://books.google.");
+  }
+
+  private static String getSystemCountry() {
+    Locale locale = Locale.getDefault();
+    return locale == null ? DEFAULT_COUNTRY : locale.getCountry();
+  }
+
+  private static String getSystemLanguage() {
+    Locale locale = Locale.getDefault();
+    if (locale == null) {
+      return DEFAULT_LANGUAGE;
+    }
+    String language = locale.getLanguage();
+    // Special case Chinese
+    if (Locale.SIMPLIFIED_CHINESE.getLanguage().equals(language)) {
+      return language + "-r" + getSystemCountry();
+    }
+    return language;
+  }
+
+  public static String getTranslatedAssetLanguage() {
+    String language = getSystemLanguage();
+    return TRANSLATED_HELP_ASSET_LANGUAGES.contains(language) ? language : DEFAULT_LANGUAGE;
+  }
+
+  private static String doGetTLD(Map<String,String> map, Context context) {
+    String tld = map.get(getCountry(context));
+    return tld == null ? DEFAULT_TLD : tld;
+  }
+
+  public static String getCountry(Context context) {
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+    String countryOverride = prefs.getString(PreferencesActivity.KEY_SEARCH_COUNTRY, null);
+    if (countryOverride != null && !countryOverride.isEmpty() && !"-".equals(countryOverride)) {
+      return countryOverride;
+    }
+    return getSystemCountry();
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/PreferencesActivity.java b/src/java/PluginQR/src/com/google/zxing/client/android/PreferencesActivity.java
new file mode 100644
index 00000000..680a48a6
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/PreferencesActivity.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * The main settings activity.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ * @author Sean Owen
+ */
+public final class PreferencesActivity extends Activity {
+
+  public static final String KEY_DECODE_1D = "preferences_decode_1D";
+  public static final String KEY_DECODE_QR = "preferences_decode_QR";
+  public static final String KEY_DECODE_DATA_MATRIX = "preferences_decode_Data_Matrix";
+  public static final String KEY_CUSTOM_PRODUCT_SEARCH = "preferences_custom_product_search";
+
+  public static final String KEY_PLAY_BEEP = "preferences_play_beep";
+  public static final String KEY_VIBRATE = "preferences_vibrate";
+  public static final String KEY_COPY_TO_CLIPBOARD = "preferences_copy_to_clipboard";
+  public static final String KEY_FRONT_LIGHT_MODE = "preferences_front_light_mode";
+  public static final String KEY_BULK_MODE = "preferences_bulk_mode";
+  public static final String KEY_REMEMBER_DUPLICATES = "preferences_remember_duplicates";
+  public static final String KEY_SUPPLEMENTAL = "preferences_supplemental";
+  public static final String KEY_AUTO_FOCUS = "preferences_auto_focus";
+  public static final String KEY_INVERT_SCAN = "preferences_invert_scan";  
+  public static final String KEY_SEARCH_COUNTRY = "preferences_search_country";
+
+  public static final String KEY_DISABLE_CONTINUOUS_FOCUS = "preferences_disable_continuous_focus";
+  //public static final String KEY_DISABLE_EXPOSURE = "preferences_disable_exposure";
+
+  @Override
+  protected void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+    getFragmentManager().beginTransaction().replace(android.R.id.content, new PreferencesFragment()).commit();
+
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/PreferencesFragment.java b/src/java/PluginQR/src/com/google/zxing/client/android/PreferencesFragment.java
new file mode 100644
index 00000000..32675815
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/PreferencesFragment.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2013 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import keepass2android.plugin.qr.R;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceScreen;
+
+public final class PreferencesFragment 
+    extends PreferenceFragment 
+    implements SharedPreferences.OnSharedPreferenceChangeListener {
+  
+  private CheckBoxPreference decode1D;
+  private CheckBoxPreference decodeQR;
+  private CheckBoxPreference decodeDataMatrix;
+  
+  @Override
+  public void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+    addPreferencesFromResource(R.xml.preferences);
+    
+    PreferenceScreen preferences = getPreferenceScreen();
+    preferences.getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+    decode1D = (CheckBoxPreference) preferences.findPreference(PreferencesActivity.KEY_DECODE_1D);
+    decodeQR = (CheckBoxPreference) preferences.findPreference(PreferencesActivity.KEY_DECODE_QR);
+    decodeDataMatrix = (CheckBoxPreference) preferences.findPreference(PreferencesActivity.KEY_DECODE_DATA_MATRIX);
+    disableLastCheckedPref();
+  }
+  
+  @Override
+  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+    disableLastCheckedPref();
+  }
+
+  private void disableLastCheckedPref() {
+    Collection<CheckBoxPreference> checked = new ArrayList<CheckBoxPreference>(3);
+    if (decode1D.isChecked()) {
+      checked.add(decode1D);
+    }
+    if (decodeQR.isChecked()) {
+      checked.add(decodeQR);
+    }
+    if (decodeDataMatrix.isChecked()) {
+      checked.add(decodeDataMatrix);
+    }
+    boolean disable = checked.size() < 2;
+    CheckBoxPreference[] checkBoxPreferences = {decode1D, decodeQR, decodeDataMatrix};
+    for (CheckBoxPreference pref : checkBoxPreferences) {
+      pref.setEnabled(!(disable && checked.contains(pref)));
+    }
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/ScanFromWebPageManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/ScanFromWebPageManager.java
new file mode 100644
index 00000000..d8fb537b
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/ScanFromWebPageManager.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2012 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import android.net.Uri;
+import com.google.zxing.Result;
+import com.google.zxing.client.android.result.ResultHandler;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * Manages functionality related to responding to requests to scan from an HTTP link in a web page.
+ * See <a href="http://code.google.com/p/zxing/wiki/ScanningFromWebPages">ScanningFromWebPages</a>.
+ *
+ * @author Sean Owen
+ */
+final class ScanFromWebPageManager {
+
+  private static final CharSequence CODE_PLACEHOLDER = "{CODE}";
+  private static final CharSequence RAW_CODE_PLACEHOLDER = "{RAWCODE}";
+  private static final CharSequence META_PLACEHOLDER = "{META}";
+  private static final CharSequence FORMAT_PLACEHOLDER = "{FORMAT}";
+  private static final CharSequence TYPE_PLACEHOLDER = "{TYPE}";
+
+  private static final String RETURN_URL_PARAM = "ret";
+  private static final String RAW_PARAM = "raw";
+
+  private final String returnUrlTemplate;
+  private final boolean returnRaw;
+
+  ScanFromWebPageManager(Uri inputUri) {
+    returnUrlTemplate = inputUri.getQueryParameter(RETURN_URL_PARAM);
+    returnRaw = inputUri.getQueryParameter(RAW_PARAM) != null;
+  }
+
+  boolean isScanFromWebPage() {
+    return returnUrlTemplate != null;
+  }
+
+  String buildReplyURL(Result rawResult, ResultHandler resultHandler) {
+    String result = returnUrlTemplate;
+    result = replace(CODE_PLACEHOLDER,
+                     returnRaw ? rawResult.getText() : resultHandler.getDisplayContents(), result);
+    result = replace(RAW_CODE_PLACEHOLDER, rawResult.getText(), result);
+    result = replace(FORMAT_PLACEHOLDER, rawResult.getBarcodeFormat().toString(), result);
+    result = replace(TYPE_PLACEHOLDER, resultHandler.getType().toString(), result);
+    result = replace(META_PLACEHOLDER, String.valueOf(rawResult.getResultMetadata()), result);
+    return result;
+  }
+
+  private static String replace(CharSequence placeholder, CharSequence with, String pattern) {
+    CharSequence escapedWith = with == null ? "" : with;
+    try {
+      escapedWith = URLEncoder.encode(escapedWith.toString(), "UTF-8");
+    } catch (UnsupportedEncodingException e) {
+      // can't happen; UTF-8 is always supported. Continue, I guess, without encoding
+    }
+    return pattern.replace(placeholder, escapedWith);
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/ViewfinderResultPointCallback.java b/src/java/PluginQR/src/com/google/zxing/client/android/ViewfinderResultPointCallback.java
new file mode 100644
index 00000000..48009a90
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/ViewfinderResultPointCallback.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import com.google.zxing.ResultPoint;
+import com.google.zxing.ResultPointCallback;
+
+final class ViewfinderResultPointCallback implements ResultPointCallback {
+
+  private final ViewfinderView viewfinderView;
+
+  ViewfinderResultPointCallback(ViewfinderView viewfinderView) {
+    this.viewfinderView = viewfinderView;
+  }
+
+  @Override
+  public void foundPossibleResultPoint(ResultPoint point) {
+    viewfinderView.addPossibleResultPoint(point);
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/ViewfinderView.java b/src/java/PluginQR/src/com/google/zxing/client/android/ViewfinderView.java
new file mode 100644
index 00000000..e22fae57
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/ViewfinderView.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android;
+
+import com.google.zxing.ResultPoint;
+import com.google.zxing.client.android.camera.CameraManager;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import keepass2android.plugin.qr.R;
+
+/**
+ * This view is overlaid on top of the camera preview. It adds the viewfinder rectangle and partial
+ * transparency outside it, as well as the laser scanner animation and result points.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class ViewfinderView extends View {
+
+  private static final int[] SCANNER_ALPHA = {0, 64, 128, 192, 255, 192, 128, 64};
+  private static final long ANIMATION_DELAY = 80L;
+  private static final int CURRENT_POINT_OPACITY = 0xA0;
+  private static final int MAX_RESULT_POINTS = 20;
+  private static final int POINT_SIZE = 6;
+
+  private CameraManager cameraManager;
+  private final Paint paint;
+  private Bitmap resultBitmap;
+  private final int maskColor;
+  private final int resultColor;
+  private final int laserColor;
+  private final int resultPointColor;
+  private int scannerAlpha;
+  private List<ResultPoint> possibleResultPoints;
+  private List<ResultPoint> lastPossibleResultPoints;
+
+  // This constructor is used when the class is built from an XML resource.
+  public ViewfinderView(Context context, AttributeSet attrs) {
+    super(context, attrs);
+
+    // Initialize these once for performance rather than calling them every time in onDraw().
+    paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    Resources resources = getResources();
+    maskColor = resources.getColor(R.color.viewfinder_mask);
+    resultColor = resources.getColor(R.color.result_view);
+    laserColor = resources.getColor(R.color.viewfinder_laser);
+    resultPointColor = resources.getColor(R.color.possible_result_points);
+    scannerAlpha = 0;
+    possibleResultPoints = new ArrayList<ResultPoint>(5);
+    lastPossibleResultPoints = null;
+  }
+
+  public void setCameraManager(CameraManager cameraManager) {
+    this.cameraManager = cameraManager;
+  }
+
+  @Override
+  public void onDraw(Canvas canvas) {
+    if (cameraManager == null) {
+      return; // not ready yet, early draw before done configuring
+    }
+    Rect frame = cameraManager.getFramingRect();
+    Rect previewFrame = cameraManager.getFramingRectInPreview();    
+    if (frame == null || previewFrame == null) {
+      return;
+    }
+    int width = canvas.getWidth();
+    int height = canvas.getHeight();
+
+    // Draw the exterior (i.e. outside the framing rect) darkened
+    paint.setColor(resultBitmap != null ? resultColor : maskColor);
+    canvas.drawRect(0, 0, width, frame.top, paint);
+    canvas.drawRect(0, frame.top, frame.left, frame.bottom + 1, paint);
+    canvas.drawRect(frame.right + 1, frame.top, width, frame.bottom + 1, paint);
+    canvas.drawRect(0, frame.bottom + 1, width, height, paint);
+
+    if (resultBitmap != null) {
+      // Draw the opaque result bitmap over the scanning rectangle
+      paint.setAlpha(CURRENT_POINT_OPACITY);
+      canvas.drawBitmap(resultBitmap, null, frame, paint);
+    } else {
+
+      // Draw a red "laser scanner" line through the middle to show decoding is active
+      paint.setColor(laserColor);
+      paint.setAlpha(SCANNER_ALPHA[scannerAlpha]);
+      scannerAlpha = (scannerAlpha + 1) % SCANNER_ALPHA.length;
+      int middle = frame.height() / 2 + frame.top;
+      canvas.drawRect(frame.left + 2, middle - 1, frame.right - 1, middle + 2, paint);
+      
+      float scaleX = frame.width() / (float) previewFrame.width();
+      float scaleY = frame.height() / (float) previewFrame.height();
+
+      List<ResultPoint> currentPossible = possibleResultPoints;
+      List<ResultPoint> currentLast = lastPossibleResultPoints;
+      int frameLeft = frame.left;
+      int frameTop = frame.top;
+      if (currentPossible.isEmpty()) {
+        lastPossibleResultPoints = null;
+      } else {
+        possibleResultPoints = new ArrayList<ResultPoint>(5);
+        lastPossibleResultPoints = currentPossible;
+        paint.setAlpha(CURRENT_POINT_OPACITY);
+        paint.setColor(resultPointColor);
+        synchronized (currentPossible) {
+          for (ResultPoint point : currentPossible) {
+            canvas.drawCircle(frameLeft + (int) (point.getX() * scaleX),
+                              frameTop + (int) (point.getY() * scaleY),
+                              POINT_SIZE, paint);
+          }
+        }
+      }
+      if (currentLast != null) {
+        paint.setAlpha(CURRENT_POINT_OPACITY / 2);
+        paint.setColor(resultPointColor);
+        synchronized (currentLast) {
+          float radius = POINT_SIZE / 2.0f;
+          for (ResultPoint point : currentLast) {
+            canvas.drawCircle(frameLeft + (int) (point.getX() * scaleX),
+                              frameTop + (int) (point.getY() * scaleY),
+                              radius, paint);
+          }
+        }
+      }
+
+      // Request another update at the animation interval, but only repaint the laser line,
+      // not the entire viewfinder mask.
+      postInvalidateDelayed(ANIMATION_DELAY,
+                            frame.left - POINT_SIZE,
+                            frame.top - POINT_SIZE,
+                            frame.right + POINT_SIZE,
+                            frame.bottom + POINT_SIZE);
+    }
+  }
+
+  public void drawViewfinder() {
+    Bitmap resultBitmap = this.resultBitmap;
+    this.resultBitmap = null;
+    if (resultBitmap != null) {
+      resultBitmap.recycle();
+    }
+    invalidate();
+  }
+
+  /**
+   * Draw a bitmap with the result points highlighted instead of the live scanning display.
+   *
+   * @param barcode An image of the decoded barcode.
+   */
+  public void drawResultBitmap(Bitmap barcode) {
+    resultBitmap = barcode;
+    invalidate();
+  }
+
+  public void addPossibleResultPoint(ResultPoint point) {
+    List<ResultPoint> points = possibleResultPoints;
+    synchronized (points) {
+      points.add(point);
+      int size = points.size();
+      if (size > MAX_RESULT_POINTS) {
+        // trim it
+        points.subList(0, size - MAX_RESULT_POINTS / 2).clear();
+      }
+    }
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/book/BrowseBookListener.java b/src/java/PluginQR/src/com/google/zxing/client/android/book/BrowseBookListener.java
new file mode 100644
index 00000000..c00bd6e9
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/book/BrowseBookListener.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.book;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.widget.AdapterView;
+import com.google.zxing.client.android.LocaleManager;
+
+import java.util.List;
+
+final class BrowseBookListener implements AdapterView.OnItemClickListener {
+
+  private final SearchBookContentsActivity activity;
+  private final List<SearchBookContentsResult> items;
+
+  BrowseBookListener(SearchBookContentsActivity activity, List<SearchBookContentsResult> items) {
+    this.activity = activity;
+    this.items = items;
+  }
+
+  @Override
+  public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
+    if (position < 1) {
+      // Clicked header, ignore it
+      return;
+    }
+    int itemOffset = position - 1;
+    if (itemOffset >= items.size()) {
+      return;
+    }
+    String pageId = items.get(itemOffset).getPageId();
+    String query = SearchBookContentsResult.getQuery();
+    if (LocaleManager.isBookSearchUrl(activity.getISBN()) && !pageId.isEmpty()) {
+      String uri = activity.getISBN();
+      int equals = uri.indexOf('=');
+      String volumeId = uri.substring(equals + 1);
+      String readBookURI = "http://books.google." +
+          LocaleManager.getBookSearchCountryTLD(activity) +
+          "/books?id=" + volumeId + "&pg=" + pageId + "&vq=" + query;
+      Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(readBookURI));
+      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);                    
+      activity.startActivity(intent);
+    }
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java b/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
new file mode 100644
index 00000000..52d83e4e
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.book;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.webkit.CookieManager;
+import android.webkit.CookieSyncManager;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import com.google.zxing.client.android.Intents;
+import com.google.zxing.client.android.HttpHelper;
+import com.google.zxing.client.android.LocaleManager;
+import keepass2android.plugin.qr.R;
+
+/**
+ * Uses Google Book Search to find a word or phrase in the requested book.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class SearchBookContentsActivity extends Activity {
+
+  private static final String TAG = SearchBookContentsActivity.class.getSimpleName();
+
+  private static final Pattern TAG_PATTERN = Pattern.compile("\\<.*?\\>");
+  private static final Pattern LT_ENTITY_PATTERN = Pattern.compile("&lt;");
+  private static final Pattern GT_ENTITY_PATTERN = Pattern.compile("&gt;");
+  private static final Pattern QUOTE_ENTITY_PATTERN = Pattern.compile("&#39;");
+  private static final Pattern QUOT_ENTITY_PATTERN = Pattern.compile("&quot;");
+
+  private String isbn;
+  private EditText queryTextView;
+  private View queryButton;
+  private ListView resultListView;
+  private TextView headerView;
+  private AsyncTask<String,?,?> networkTask;
+
+  private final Button.OnClickListener buttonListener = new Button.OnClickListener() {
+    @Override
+    public void onClick(View view) {
+      launchSearch();
+    }
+  };
+
+  private final View.OnKeyListener keyListener = new View.OnKeyListener() {
+    @Override
+    public boolean onKey(View view, int keyCode, KeyEvent event) {
+      if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_DOWN) {
+        launchSearch();
+        return true;
+      }
+      return false;
+    }
+  };
+
+  String getISBN() {
+    return isbn;
+  }
+
+  @Override
+  public void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+
+    // Make sure that expired cookies are removed on launch.
+    CookieSyncManager.createInstance(this);
+    CookieManager.getInstance().removeExpiredCookie();
+
+    Intent intent = getIntent();
+    if (intent == null || !intent.getAction().equals(Intents.SearchBookContents.ACTION)) {
+      finish();
+      return;
+    }
+
+    isbn = intent.getStringExtra(Intents.SearchBookContents.ISBN);
+    if (LocaleManager.isBookSearchUrl(isbn)) {
+      setTitle(getString(R.string.sbc_name));
+    } else {
+      setTitle(getString(R.string.sbc_name) + ": ISBN " + isbn);
+    }
+
+    setContentView(R.layout.search_book_contents);
+    queryTextView = (EditText) findViewById(R.id.query_text_view);
+
+    String initialQuery = intent.getStringExtra(Intents.SearchBookContents.QUERY);
+    if (initialQuery != null && !initialQuery.isEmpty()) {
+      // Populate the search box but don't trigger the search
+      queryTextView.setText(initialQuery);
+    }
+    queryTextView.setOnKeyListener(keyListener);
+
+    queryButton = findViewById(R.id.query_button);
+    queryButton.setOnClickListener(buttonListener);
+
+    resultListView = (ListView) findViewById(R.id.result_list_view);
+    LayoutInflater factory = LayoutInflater.from(this);
+    headerView = (TextView) factory.inflate(R.layout.search_book_contents_header,
+        resultListView, false);
+    resultListView.addHeaderView(headerView);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    queryTextView.selectAll();
+  }
+
+  @Override
+  protected void onPause() {
+    AsyncTask<?,?,?> oldTask = networkTask;
+    if (oldTask != null) {
+      oldTask.cancel(true);
+      networkTask = null;
+    }
+    super.onPause();
+  }
+
+  private void launchSearch() {
+    String query = queryTextView.getText().toString();
+    if (query != null && !query.isEmpty()) {
+      AsyncTask<?,?,?> oldTask = networkTask;
+      if (oldTask != null) {
+        oldTask.cancel(true);
+      }
+      networkTask = new NetworkTask();
+      networkTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, query, isbn);
+      headerView.setText(R.string.msg_sbc_searching_book);
+      resultListView.setAdapter(null);
+      queryTextView.setEnabled(false);
+      queryButton.setEnabled(false);
+    }
+  }
+
+  private final class NetworkTask extends AsyncTask<String,Object,JSONObject> {
+
+    @Override
+    protected JSONObject doInBackground(String... args) {
+      try {
+        // These return a JSON result which describes if and where the query was found. This API may
+        // break or disappear at any time in the future. Since this is an API call rather than a
+        // website, we don't use LocaleManager to change the TLD.
+        String theQuery = args[0];
+        String theIsbn = args[1];
+        String uri;
+        if (LocaleManager.isBookSearchUrl(theIsbn)) {
+          int equals = theIsbn.indexOf('=');
+          String volumeId = theIsbn.substring(equals + 1);
+          uri = "http://www.google.com/books?id=" + volumeId + "&jscmd=SearchWithinVolume2&q=" + theQuery;
+        } else {
+          uri = "http://www.google.com/books?vid=isbn" + theIsbn + "&jscmd=SearchWithinVolume2&q=" + theQuery;
+        }
+        CharSequence content = HttpHelper.downloadViaHttp(uri, HttpHelper.ContentType.JSON);
+        return new JSONObject(content.toString());
+      } catch (IOException ioe) {
+        Log.w(TAG, "Error accessing book search", ioe);
+        return null;
+      } catch (JSONException je) {
+        Log.w(TAG, "Error accessing book search", je);
+        return null;
+      }
+    }
+
+    @Override
+    protected void onPostExecute(JSONObject result) {
+      if (result == null) {
+        headerView.setText(R.string.msg_sbc_failed);
+      } else {
+        handleSearchResults(result);
+      }
+      queryTextView.setEnabled(true);
+      queryTextView.selectAll();
+      queryButton.setEnabled(true);
+    }
+
+    // Currently there is no way to distinguish between a query which had no results and a book
+    // which is not searchable - both return zero results.
+    private void handleSearchResults(JSONObject json) {
+      try {
+        int count = json.getInt("number_of_results");
+        headerView.setText(getString(R.string.msg_sbc_results) + " : " + count);
+        if (count > 0) {
+          JSONArray results = json.getJSONArray("search_results");
+          SearchBookContentsResult.setQuery(queryTextView.getText().toString());
+          List<SearchBookContentsResult> items = new ArrayList<SearchBookContentsResult>(count);
+          for (int x = 0; x < count; x++) {
+            items.add(parseResult(results.getJSONObject(x)));
+          }
+          resultListView.setOnItemClickListener(new BrowseBookListener(SearchBookContentsActivity.this, items));
+          resultListView.setAdapter(new SearchBookContentsAdapter(SearchBookContentsActivity.this, items));
+        } else {
+          String searchable = json.optString("searchable");
+          if ("false".equals(searchable)) {
+            headerView.setText(R.string.msg_sbc_book_not_searchable);
+          }
+          resultListView.setAdapter(null);
+        }
+      } catch (JSONException e) {
+        Log.w(TAG, "Bad JSON from book search", e);
+        resultListView.setAdapter(null);
+        headerView.setText(R.string.msg_sbc_failed);
+      }
+    }
+
+    // Available fields: page_id, page_number, snippet_text
+    private SearchBookContentsResult parseResult(JSONObject json) {
+
+      String pageId;
+      String pageNumber;
+      String snippet;
+      try {
+        pageId = json.getString("page_id");
+        pageNumber = json.optString("page_number");
+        snippet = json.optString("snippet_text");        
+      } catch (JSONException e) {
+        Log.w(TAG, e);
+        // Never seen in the wild, just being complete.
+        return new SearchBookContentsResult(getString(R.string.msg_sbc_no_page_returned), "", "", false);
+      }
+      
+      if (pageNumber == null || pageNumber.isEmpty()) {
+        // This can happen for text on the jacket, and possibly other reasons.
+        pageNumber = "";
+      } else {
+        pageNumber = getString(R.string.msg_sbc_page) + ' ' + pageNumber;
+      }
+      
+      boolean valid = snippet != null && !snippet.isEmpty();
+      if (valid) {
+        // Remove all HTML tags and encoded characters.          
+        snippet = TAG_PATTERN.matcher(snippet).replaceAll("");
+        snippet = LT_ENTITY_PATTERN.matcher(snippet).replaceAll("<");
+        snippet = GT_ENTITY_PATTERN.matcher(snippet).replaceAll(">");
+        snippet = QUOTE_ENTITY_PATTERN.matcher(snippet).replaceAll("'");
+        snippet = QUOT_ENTITY_PATTERN.matcher(snippet).replaceAll("\"");
+      } else {
+        snippet = '(' + getString(R.string.msg_sbc_snippet_unavailable) + ')';        
+      }
+
+      return new SearchBookContentsResult(pageId, pageNumber, snippet, valid);
+    }
+
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsAdapter.java b/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsAdapter.java
new file mode 100644
index 00000000..0337a1c6
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsAdapter.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.book;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+
+import java.util.List;
+
+import keepass2android.plugin.qr.R;
+
+/**
+ * Manufactures list items which represent SBC results.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+final class SearchBookContentsAdapter extends ArrayAdapter<SearchBookContentsResult> {
+
+  SearchBookContentsAdapter(Context context, List<SearchBookContentsResult> items) {
+    super(context, R.layout.search_book_contents_list_item, 0, items);
+  }
+
+  @Override
+  public View getView(int position, View view, ViewGroup viewGroup) {
+    SearchBookContentsListItem listItem;
+
+    if (view == null) {
+      LayoutInflater factory = LayoutInflater.from(getContext());
+      listItem = (SearchBookContentsListItem) factory.inflate(
+          R.layout.search_book_contents_list_item, viewGroup, false);
+    } else {
+      if (view instanceof SearchBookContentsListItem) {
+        listItem = (SearchBookContentsListItem) view;
+      } else {
+        return view;
+      }
+    }
+
+    SearchBookContentsResult result = getItem(position);
+    listItem.set(result);
+    return listItem;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java b/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java
new file mode 100644
index 00000000..ebf1f148
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsListItem.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.book;
+
+import keepass2android.plugin.qr.R;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.StyleSpan;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import java.util.Locale;
+
+/**
+ * A list item which displays the page number and snippet of this search result.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class SearchBookContentsListItem extends LinearLayout {
+  private TextView pageNumberView;
+  private TextView snippetView;
+
+  SearchBookContentsListItem(Context context) {
+    super(context);
+  }
+
+  public SearchBookContentsListItem(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @Override
+  protected void onFinishInflate() {
+    super.onFinishInflate();
+    pageNumberView = (TextView) findViewById(R.id.page_number_view);
+    snippetView = (TextView) findViewById(R.id.snippet_view);
+  }
+
+  public void set(SearchBookContentsResult result) {
+    pageNumberView.setText(result.getPageNumber());
+    String snippet = result.getSnippet();
+    if (snippet.isEmpty()) {
+      snippetView.setText("");
+    } else {
+      if (result.getValidSnippet()) {
+        String lowerQuery = SearchBookContentsResult.getQuery().toLowerCase(Locale.getDefault());
+        String lowerSnippet = snippet.toLowerCase(Locale.getDefault());
+        Spannable styledSnippet = new SpannableString(snippet);
+        StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
+        int queryLength = lowerQuery.length();
+        int offset = 0;
+        while (true) {
+          int pos = lowerSnippet.indexOf(lowerQuery, offset);
+          if (pos < 0) {
+            break;
+          }
+          styledSnippet.setSpan(boldSpan, pos, pos + queryLength, 0);
+          offset = pos + queryLength;
+        }
+        snippetView.setText(styledSnippet);
+      } else {
+        // This may be an error message, so don't try to bold the query terms within it
+        snippetView.setText(snippet);
+      }
+    }
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsResult.java b/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsResult.java
new file mode 100644
index 00000000..ffaafb33
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/book/SearchBookContentsResult.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.book;
+
+/**
+ * The underlying data for a SBC result.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+final class SearchBookContentsResult {
+
+  private static String query = null;
+
+  private final String pageId;
+  private final String pageNumber;
+  private final String snippet;
+  private final boolean validSnippet;
+
+    SearchBookContentsResult(String pageId,
+                             String pageNumber,
+                             String snippet,
+                             boolean validSnippet) {
+    this.pageId = pageId;
+    this.pageNumber = pageNumber;
+    this.snippet = snippet;
+    this.validSnippet = validSnippet;
+  }
+
+  public static void setQuery(String query) {
+    SearchBookContentsResult.query = query;
+  }
+
+  public String getPageId() {
+    return pageId;
+  }
+
+  public String getPageNumber() {
+    return pageNumber;
+  }
+
+  public String getSnippet() {
+    return snippet;
+  }
+
+  public boolean getValidSnippet() {
+    return validSnippet;
+  }
+
+  public static String getQuery() {
+    return query;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/camera/AutoFocusManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/camera/AutoFocusManager.java
new file mode 100644
index 00000000..ea9db91b
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/camera/AutoFocusManager.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2012 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.camera;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.hardware.Camera;
+import android.os.AsyncTask;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import com.google.zxing.client.android.PreferencesActivity;
+
+final class AutoFocusManager implements Camera.AutoFocusCallback {
+
+  private static final String TAG = AutoFocusManager.class.getSimpleName();
+
+  private static final long AUTO_FOCUS_INTERVAL_MS = 2000L;
+  private static final Collection<String> FOCUS_MODES_CALLING_AF;
+  static {
+    FOCUS_MODES_CALLING_AF = new ArrayList<String>(2);
+    FOCUS_MODES_CALLING_AF.add(Camera.Parameters.FOCUS_MODE_AUTO);
+    FOCUS_MODES_CALLING_AF.add(Camera.Parameters.FOCUS_MODE_MACRO);
+  }
+
+  private boolean active;
+  private final boolean useAutoFocus;
+  private final Camera camera;
+  private AsyncTask<?,?,?> outstandingTask;
+
+  AutoFocusManager(Context context, Camera camera) {
+    this.camera = camera;
+    SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+    String currentFocusMode = camera.getParameters().getFocusMode();
+    useAutoFocus =
+        sharedPrefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true) &&
+        FOCUS_MODES_CALLING_AF.contains(currentFocusMode);
+    Log.i(TAG, "Current focus mode '" + currentFocusMode + "'; use auto focus? " + useAutoFocus);
+    start();
+  }
+
+  @Override
+  public synchronized void onAutoFocus(boolean success, Camera theCamera) {
+    if (active) {
+      outstandingTask = new AutoFocusTask();
+      outstandingTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+  }
+
+  synchronized void start() {
+    if (useAutoFocus) {
+      active = true;
+      try {
+        camera.autoFocus(this);
+      } catch (RuntimeException re) {
+        // Have heard RuntimeException reported in Android 4.0.x+; continue?
+        Log.w(TAG, "Unexpected exception while focusing", re);
+      }
+    }
+  }
+
+  synchronized void stop() {
+    if (useAutoFocus) {
+      try {
+        camera.cancelAutoFocus();
+      } catch (RuntimeException re) {
+        // Have heard RuntimeException reported in Android 4.0.x+; continue?
+        Log.w(TAG, "Unexpected exception while cancelling focusing", re);
+      }
+    }
+    if (outstandingTask != null) {
+      outstandingTask.cancel(true);
+      outstandingTask = null;
+    }
+    active = false;
+  }
+
+  private final class AutoFocusTask extends AsyncTask<Object,Object,Object> {
+    @Override
+    protected Object doInBackground(Object... voids) {
+      try {
+        Thread.sleep(AUTO_FOCUS_INTERVAL_MS);
+      } catch (InterruptedException e) {
+        // continue
+      }
+      synchronized (AutoFocusManager.this) {
+        if (active) {
+          start();
+        }
+      }
+      return null;
+    }
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
new file mode 100644
index 00000000..1d8a3ce5
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java
@@ -0,0 +1,308 @@
+/*
+ * Copyright (C) 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.camera;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Point;
+import android.hardware.Camera;
+import android.preference.PreferenceManager;
+import android.util.Log;
+import android.view.Display;
+import android.view.WindowManager;
+
+import com.google.zxing.client.android.PreferencesActivity;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * A class which deals with reading, parsing, and setting the camera parameters which are used to
+ * configure the camera hardware.
+ */
+final class CameraConfigurationManager {
+
+  private static final String TAG = "CameraConfiguration";
+
+  // This is bigger than the size of a small screen, which is still supported. The routine
+  // below will still select the default (presumably 320x240) size for these. This prevents
+  // accidental selection of very low resolution on some devices.
+  private static final int MIN_PREVIEW_PIXELS = 480 * 320; // normal screen
+  //private static final float MAX_EXPOSURE_COMPENSATION = 1.5f;
+  //private static final float MIN_EXPOSURE_COMPENSATION = 0.0f;
+  private static final double MAX_ASPECT_DISTORTION = 0.15;
+
+  private final Context context;
+  private Point screenResolution;
+  private Point cameraResolution;
+
+  CameraConfigurationManager(Context context) {
+    this.context = context;
+  }
+
+  /**
+   * Reads, one time, values from the camera that are needed by the app.
+   */
+  void initFromCameraParameters(Camera camera) {
+    Camera.Parameters parameters = camera.getParameters();
+    WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+    Display display = manager.getDefaultDisplay();
+    Point theScreenResolution = new Point();
+    display.getSize(theScreenResolution);
+    screenResolution = theScreenResolution;
+    Log.i(TAG, "Screen resolution: " + screenResolution);
+    cameraResolution = findBestPreviewSizeValue(parameters, screenResolution);
+    Log.i(TAG, "Camera resolution: " + cameraResolution);
+  }
+
+  void setDesiredCameraParameters(Camera camera, boolean safeMode) {
+    Camera.Parameters parameters = camera.getParameters();
+
+    if (parameters == null) {
+      Log.w(TAG, "Device error: no camera parameters are available. Proceeding without configuration.");
+      return;
+    }
+
+    Log.i(TAG, "Initial camera parameters: " + parameters.flatten());
+
+    if (safeMode) {
+      Log.w(TAG, "In camera config safe mode -- most settings will not be honored");
+    }
+
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+    initializeTorch(parameters, prefs, safeMode);
+
+    String focusMode = null;
+    if (prefs.getBoolean(PreferencesActivity.KEY_AUTO_FOCUS, true)) {
+      if (safeMode || prefs.getBoolean(PreferencesActivity.KEY_DISABLE_CONTINUOUS_FOCUS, false)) {
+        focusMode = findSettableValue(parameters.getSupportedFocusModes(),
+                                      Camera.Parameters.FOCUS_MODE_AUTO);
+      } else {
+        focusMode = findSettableValue(parameters.getSupportedFocusModes(),
+                                      Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE,
+                                      Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO,
+                                      Camera.Parameters.FOCUS_MODE_AUTO);
+      }
+    }
+    // Maybe selected auto-focus but not available, so fall through here:
+    if (!safeMode && focusMode == null) {
+      focusMode = findSettableValue(parameters.getSupportedFocusModes(),
+                                    Camera.Parameters.FOCUS_MODE_MACRO,
+                                    Camera.Parameters.FOCUS_MODE_EDOF);
+    }
+    if (focusMode != null) {
+      parameters.setFocusMode(focusMode);
+    }
+
+    if (prefs.getBoolean(PreferencesActivity.KEY_INVERT_SCAN, false)) {
+      String colorMode = findSettableValue(parameters.getSupportedColorEffects(),
+                                           Camera.Parameters.EFFECT_NEGATIVE);
+      if (colorMode != null) {
+        parameters.setColorEffect(colorMode);
+      }
+    }
+
+    parameters.setPreviewSize(cameraResolution.x, cameraResolution.y);
+    camera.setParameters(parameters);
+    camera.setDisplayOrientation(90);
+
+    Camera.Parameters afterParameters = camera.getParameters();
+    Camera.Size afterSize = afterParameters.getPreviewSize();
+    if (afterSize!= null && (cameraResolution.x != afterSize.width || cameraResolution.y != afterSize.height)) {
+      Log.w(TAG, "Camera said it supported preview size " + cameraResolution.x + 'x' + cameraResolution.y +
+                 ", but after setting it, preview size is " + afterSize.width + 'x' + afterSize.height);
+      cameraResolution.x = afterSize.width;
+      cameraResolution.y = afterSize.height;
+    }
+  }
+
+  Point getCameraResolution() {
+    return cameraResolution;
+  }
+
+  Point getScreenResolution() {
+    return screenResolution;
+  }
+
+  boolean getTorchState(Camera camera) {
+    if (camera != null) {
+      Camera.Parameters parameters = camera.getParameters();
+      if (parameters != null) {
+        String flashMode = camera.getParameters().getFlashMode();
+        return flashMode != null &&
+            (Camera.Parameters.FLASH_MODE_ON.equals(flashMode) ||
+             Camera.Parameters.FLASH_MODE_TORCH.equals(flashMode));
+      }
+    }
+    return false;
+  }
+
+  void setTorch(Camera camera, boolean newSetting) {
+    Camera.Parameters parameters = camera.getParameters();
+    doSetTorch(parameters, newSetting, false);
+    camera.setParameters(parameters);
+  }
+
+  private void initializeTorch(Camera.Parameters parameters, SharedPreferences prefs, boolean safeMode) {
+    boolean currentSetting = FrontLightMode.readPref(prefs) == FrontLightMode.ON;
+    doSetTorch(parameters, currentSetting, safeMode);
+  }
+
+  private void doSetTorch(Camera.Parameters parameters, boolean newSetting, boolean safeMode) {
+    String flashMode;
+    if (newSetting) {
+      flashMode = findSettableValue(parameters.getSupportedFlashModes(),
+                                    Camera.Parameters.FLASH_MODE_TORCH,
+                                    Camera.Parameters.FLASH_MODE_ON);
+    } else {
+      flashMode = findSettableValue(parameters.getSupportedFlashModes(),
+                                    Camera.Parameters.FLASH_MODE_OFF);
+    }
+    if (flashMode != null) {
+      parameters.setFlashMode(flashMode);
+    }
+
+    /*
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+    if (!prefs.getBoolean(PreferencesActivity.KEY_DISABLE_EXPOSURE, false)) {
+      if (!safeMode) {
+        int minExposure = parameters.getMinExposureCompensation();
+        int maxExposure = parameters.getMaxExposureCompensation();
+        if (minExposure != 0 || maxExposure != 0) {
+          float step = parameters.getExposureCompensationStep();
+          int desiredCompensation;
+          if (newSetting) {
+            // Light on; set low exposue compensation
+            desiredCompensation = Math.max((int) (MIN_EXPOSURE_COMPENSATION / step), minExposure);
+          } else {
+            // Light off; set high compensation
+            desiredCompensation = Math.min((int) (MAX_EXPOSURE_COMPENSATION / step), maxExposure);
+          }
+          Log.i(TAG, "Setting exposure compensation to " + desiredCompensation + " / " + (step * desiredCompensation));
+          parameters.setExposureCompensation(desiredCompensation);
+        } else {
+          Log.i(TAG, "Camera does not support exposure compensation");
+        }
+      }
+    }
+     */
+  }
+
+  private Point findBestPreviewSizeValue(Camera.Parameters parameters, Point screenResolution) {
+
+    List<Camera.Size> rawSupportedSizes = parameters.getSupportedPreviewSizes();
+    if (rawSupportedSizes == null) {
+      Log.w(TAG, "Device returned no supported preview sizes; using default");
+      Camera.Size defaultSize = parameters.getPreviewSize();
+      return new Point(defaultSize.width, defaultSize.height);
+    }
+
+    // Sort by size, descending
+    List<Camera.Size> supportedPreviewSizes = new ArrayList<Camera.Size>(rawSupportedSizes);
+    Collections.sort(supportedPreviewSizes, new Comparator<Camera.Size>() {
+      @Override
+      public int compare(Camera.Size a, Camera.Size b) {
+        int aPixels = a.height * a.width;
+        int bPixels = b.height * b.width;
+        if (bPixels < aPixels) {
+          return -1;
+        }
+        if (bPixels > aPixels) {
+          return 1;
+        }
+        return 0;
+      }
+    });
+
+    if (Log.isLoggable(TAG, Log.INFO)) {
+      StringBuilder previewSizesString = new StringBuilder();
+      for (Camera.Size supportedPreviewSize : supportedPreviewSizes) {
+        previewSizesString.append(supportedPreviewSize.width).append('x')
+            .append(supportedPreviewSize.height).append(' ');
+      }
+      Log.i(TAG, "Supported preview sizes: " + previewSizesString);
+    }
+
+    double screenAspectRatio = (double) screenResolution.x / (double) screenResolution.y;
+
+    // Remove sizes that are unsuitable
+    Iterator<Camera.Size> it = supportedPreviewSizes.iterator();
+    while (it.hasNext()) {
+      Camera.Size supportedPreviewSize = it.next();
+      int realWidth = supportedPreviewSize.width;
+      int realHeight = supportedPreviewSize.height;
+      if (realWidth * realHeight < MIN_PREVIEW_PIXELS) {
+        it.remove();
+        continue;
+      }
+
+      boolean isCandidatePortrait = realWidth < realHeight;
+      int maybeFlippedWidth = isCandidatePortrait ? realHeight : realWidth;
+      int maybeFlippedHeight = isCandidatePortrait ? realWidth : realHeight;
+      double aspectRatio = (double) maybeFlippedWidth / (double) maybeFlippedHeight;
+      double distortion = Math.abs(aspectRatio - screenAspectRatio);
+      if (distortion > MAX_ASPECT_DISTORTION) {
+        it.remove(); 
+        continue;
+      }
+
+      if (maybeFlippedWidth == screenResolution.x && maybeFlippedHeight == screenResolution.y) {
+        Point exactPoint = new Point(realWidth, realHeight);
+        Log.i(TAG, "Found preview size exactly matching screen size: " + exactPoint);
+        return exactPoint;
+      }
+    }
+
+    // If no exact match, use largest preview size. This was not a great idea on older devices because
+    // of the additional computation needed. We're likely to get here on newer Android 4+ devices, where
+    // the CPU is much more powerful.
+    if (!supportedPreviewSizes.isEmpty()) {
+      Camera.Size largestPreview = supportedPreviewSizes.get(0);
+      Point largestSize = new Point(largestPreview.width, largestPreview.height);
+      Log.i(TAG, "Using largest suitable preview size: " + largestSize);
+      return largestSize;
+    }
+
+    // If there is nothing at all suitable, return current preview size
+    Camera.Size defaultPreview = parameters.getPreviewSize();
+    Point defaultSize = new Point(defaultPreview.width, defaultPreview.height);
+    Log.i(TAG, "No suitable preview sizes, using default: " + defaultSize);
+    return defaultSize;
+  }
+
+  private static String findSettableValue(Collection<String> supportedValues,
+                                          String... desiredValues) {
+    Log.i(TAG, "Supported values: " + supportedValues);
+    String result = null;
+    if (supportedValues != null) {
+      for (String desiredValue : desiredValues) {
+        if (supportedValues.contains(desiredValue)) {
+          result = desiredValue;
+          break;
+        }
+      }
+    }
+    Log.i(TAG, "Settable value: " + result);
+    return result;
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/camera/CameraManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/camera/CameraManager.java
new file mode 100644
index 00000000..07ca44f7
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.camera;
+
+import android.content.Context;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.hardware.Camera;
+import android.os.Handler;
+import android.util.Log;
+import android.view.SurfaceHolder;
+import com.google.zxing.PlanarYUVLuminanceSource;
+import com.google.zxing.client.android.camera.open.OpenCameraInterface;
+
+import java.io.IOException;
+
+/**
+ * This object wraps the Camera service object and expects to be the only one talking to it. The
+ * implementation encapsulates the steps needed to take preview-sized images, which are used for
+ * both preview and decoding.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class CameraManager {
+
+  private static final String TAG = CameraManager.class.getSimpleName();
+
+  private static final int MIN_FRAME_WIDTH = 240;
+  private static final int MIN_FRAME_HEIGHT = 240;
+  private static final int MAX_FRAME_WIDTH = 1200; // = 5/8 * 1920
+  private static final int MAX_FRAME_HEIGHT = 675; // = 5/8 * 1080
+
+  private final Context context;
+  private final CameraConfigurationManager configManager;
+  private Camera camera;
+  private AutoFocusManager autoFocusManager;
+  private Rect framingRect;
+  private Rect framingRectInPreview;
+  private boolean initialized;
+  private boolean previewing;
+  private int requestedFramingRectWidth;
+  private int requestedFramingRectHeight;
+  /**
+   * Preview frames are delivered here, which we pass on to the registered handler. Make sure to
+   * clear the handler so it will only receive one message.
+   */
+  private final PreviewCallback previewCallback;
+
+  public CameraManager(Context context) {
+    this.context = context;
+    this.configManager = new CameraConfigurationManager(context);
+    previewCallback = new PreviewCallback(configManager);
+  }
+
+  /**
+   * Opens the camera driver and initializes the hardware parameters.
+   *
+   * @param holder The surface object which the camera will draw preview frames into.
+   * @throws IOException Indicates the camera driver failed to open.
+   */
+  public synchronized void openDriver(SurfaceHolder holder) throws IOException {
+    Camera theCamera = camera;
+    if (theCamera == null) {
+      theCamera = OpenCameraInterface.open();
+      if (theCamera == null) {
+        throw new IOException();
+      }
+      camera = theCamera;
+    }
+    theCamera.setPreviewDisplay(holder);
+
+    if (!initialized) {
+      initialized = true;
+      configManager.initFromCameraParameters(theCamera);
+      if (requestedFramingRectWidth > 0 && requestedFramingRectHeight > 0) {
+        setManualFramingRect(requestedFramingRectWidth, requestedFramingRectHeight);
+        requestedFramingRectWidth = 0;
+        requestedFramingRectHeight = 0;
+      }
+    }
+
+    Camera.Parameters parameters = theCamera.getParameters();
+    String parametersFlattened = parameters == null ? null : parameters.flatten(); // Save these, temporarily
+    try {
+      configManager.setDesiredCameraParameters(theCamera, false);
+    } catch (RuntimeException re) {
+      // Driver failed
+      Log.w(TAG, "Camera rejected parameters. Setting only minimal safe-mode parameters");
+      Log.i(TAG, "Resetting to saved camera params: " + parametersFlattened);
+      // Reset:
+      if (parametersFlattened != null) {
+        parameters = theCamera.getParameters();
+        parameters.unflatten(parametersFlattened);
+        try {
+          theCamera.setParameters(parameters);
+          configManager.setDesiredCameraParameters(theCamera, true);
+        } catch (RuntimeException re2) {
+          // Well, darn. Give up
+          Log.w(TAG, "Camera rejected even safe-mode parameters! No configuration");
+        }
+      }
+    }
+
+  }
+
+  public synchronized boolean isOpen() {
+    return camera != null;
+  }
+
+  /**
+   * Closes the camera driver if still in use.
+   */
+  public synchronized void closeDriver() {
+    if (camera != null) {
+      camera.release();
+      camera = null;
+      // Make sure to clear these each time we close the camera, so that any scanning rect
+      // requested by intent is forgotten.
+      framingRect = null;
+      framingRectInPreview = null;
+    }
+  }
+
+  /**
+   * Asks the camera hardware to begin drawing preview frames to the screen.
+   */
+  public synchronized void startPreview() {
+    Camera theCamera = camera;
+    if (theCamera != null && !previewing) {
+      theCamera.startPreview();
+      previewing = true;
+      autoFocusManager = new AutoFocusManager(context, camera);
+    }
+  }
+
+  /**
+   * Tells the camera to stop drawing preview frames.
+   */
+  public synchronized void stopPreview() {
+    if (autoFocusManager != null) {
+      autoFocusManager.stop();
+      autoFocusManager = null;
+    }
+    if (camera != null && previewing) {
+      camera.stopPreview();
+      previewCallback.setHandler(null, 0);
+      previewing = false;
+    }
+  }
+
+  /**
+   * Convenience method for {@link com.google.zxing.client.android.CaptureActivity}
+   */
+  public synchronized void setTorch(boolean newSetting) {
+    if (newSetting != configManager.getTorchState(camera)) {
+      if (camera != null) {
+        if (autoFocusManager != null) {
+          autoFocusManager.stop();
+        }
+        configManager.setTorch(camera, newSetting);
+        if (autoFocusManager != null) {
+          autoFocusManager.start();
+        }
+      }
+    }
+  }
+
+  /**
+   * A single preview frame will be returned to the handler supplied. The data will arrive as byte[]
+   * in the message.obj field, with width and height encoded as message.arg1 and message.arg2,
+   * respectively.
+   *
+   * @param handler The handler to send the message to.
+   * @param message The what field of the message to be sent.
+   */
+  public synchronized void requestPreviewFrame(Handler handler, int message) {
+    Camera theCamera = camera;
+    if (theCamera != null && previewing) {
+      previewCallback.setHandler(handler, message);
+      theCamera.setOneShotPreviewCallback(previewCallback);
+    }
+  }
+
+  /**
+   * Calculates the framing rect which the UI should draw to show the user where to place the
+   * barcode. This target helps with alignment as well as forces the user to hold the device
+   * far enough away to ensure the image will be in focus.
+   *
+   * @return The rectangle to draw on screen in window coordinates.
+   */
+  public synchronized Rect getFramingRect() {
+    if (framingRect == null) {
+      if (camera == null) {
+        return null;
+      }
+      Point screenResolution = configManager.getScreenResolution();
+      if (screenResolution == null) {
+        // Called early, before init even finished
+        return null;
+      }
+
+      int width = findDesiredDimensionInRange(screenResolution.x, MIN_FRAME_WIDTH, MAX_FRAME_WIDTH);
+      int height = findDesiredDimensionInRange(screenResolution.y, MIN_FRAME_HEIGHT, MAX_FRAME_HEIGHT);
+
+      int leftOffset = (screenResolution.x - width) / 2;
+      int topOffset = (screenResolution.y - height) / 2;
+      framingRect = new Rect(leftOffset, topOffset, leftOffset + width, topOffset + height);
+      Log.d(TAG, "Calculated framing rect: " + framingRect);
+    }
+    return framingRect;
+  }
+  
+  private static int findDesiredDimensionInRange(int resolution, int hardMin, int hardMax) {
+    int dim = 5 * resolution / 8; // Target 5/8 of each dimension
+    if (dim < hardMin) {
+      return hardMin;
+    }
+    if (dim > hardMax) {
+      return hardMax;
+    }
+    return dim;
+  }
+
+  /**
+   * Like {@link #getFramingRect} but coordinates are in terms of the preview frame,
+   * not UI / screen.
+   */
+  public synchronized Rect getFramingRectInPreview() {
+    if (framingRectInPreview == null) {
+      Rect framingRect = getFramingRect();
+      if (framingRect == null) {
+        return null;
+      }
+      Rect rect = new Rect(framingRect);
+      Point cameraResolution = configManager.getCameraResolution();
+      Point screenResolution = configManager.getScreenResolution();
+      if (cameraResolution == null || screenResolution == null) {
+        // Called early, before init even finished
+        return null;
+      }
+      rect.left = rect.left * cameraResolution.y / screenResolution.x;
+      rect.right = rect.right * cameraResolution.y / screenResolution.x;
+      rect.top = rect.top * cameraResolution.x / screenResolution.y;
+      rect.bottom = rect.bottom * cameraResolution.x / screenResolution.y;
+      
+      framingRectInPreview = rect;
+    }
+    return framingRectInPreview;
+  }
+
+  /**
+   * Allows third party apps to specify the scanning rectangle dimensions, rather than determine
+   * them automatically based on screen resolution.
+   *
+   * @param width The width in pixels to scan.
+   * @param height The height in pixels to scan.
+   */
+  public synchronized void setManualFramingRect(int width, int height) {
+    if (initialized) {
+      Point screenResolution = configManager.getScreenResolution();
+      if (width > screenResolution.x) {
+        width = screenResolution.x;
+      }
+      if (height > screenResolution.y) {
+        height = screenResolution.y;
+      }
+      int leftOffset = (screenResolution.x - width) / 2;
+      int topOffset = (screenResolution.y - height) / 2;
+      framingRect = new Rect(leftOffset, topOffset, leftOffset + width, topOffset + height);
+      Log.d(TAG, "Calculated manual framing rect: " + framingRect);
+      framingRectInPreview = null;
+    } else {
+      requestedFramingRectWidth = width;
+      requestedFramingRectHeight = height;
+    }
+  }
+
+  /**
+   * A factory method to build the appropriate LuminanceSource object based on the format
+   * of the preview buffers, as described by Camera.Parameters.
+   *
+   * @param data A preview frame.
+   * @param width The width of the image.
+   * @param height The height of the image.
+   * @return A PlanarYUVLuminanceSource instance.
+   */
+  public PlanarYUVLuminanceSource buildLuminanceSource(byte[] data, int width, int height) {
+    Rect rect = getFramingRectInPreview();
+    if (rect == null) {
+      return null;
+    }
+    // Go ahead and assume it's YUV rather than die.
+    return new PlanarYUVLuminanceSource(data, width, height, rect.left, rect.top,
+                                        rect.width(), rect.height(), false);
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/camera/FrontLightMode.java b/src/java/PluginQR/src/com/google/zxing/client/android/camera/FrontLightMode.java
new file mode 100644
index 00000000..6d8f3d77
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/camera/FrontLightMode.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2012 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.camera;
+
+import android.content.SharedPreferences;
+import com.google.zxing.client.android.PreferencesActivity;
+
+/**
+ * Enumerates settings of the prefernce controlling the front light.
+ */
+public enum FrontLightMode {
+
+  /** Always on. */
+  ON,
+  /** On only when ambient light is low. */
+  AUTO,
+  /** Always off. */
+  OFF;
+
+  private static FrontLightMode parse(String modeString) {
+    return modeString == null ? OFF : valueOf(modeString);
+  }
+
+  public static FrontLightMode readPref(SharedPreferences sharedPrefs) {
+    return parse(sharedPrefs.getString(PreferencesActivity.KEY_FRONT_LIGHT_MODE, null));
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/camera/PreviewCallback.java b/src/java/PluginQR/src/com/google/zxing/client/android/camera/PreviewCallback.java
new file mode 100644
index 00000000..7dc70357
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/camera/PreviewCallback.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.camera;
+
+import android.graphics.Point;
+import android.hardware.Camera;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+final class PreviewCallback implements Camera.PreviewCallback {
+
+  private static final String TAG = PreviewCallback.class.getSimpleName();
+
+  private final CameraConfigurationManager configManager;
+  private Handler previewHandler;
+  private int previewMessage;
+
+  PreviewCallback(CameraConfigurationManager configManager) {
+    this.configManager = configManager;
+  }
+
+  void setHandler(Handler previewHandler, int previewMessage) {
+    this.previewHandler = previewHandler;
+    this.previewMessage = previewMessage;
+  }
+
+  @Override
+  public void onPreviewFrame(byte[] data, Camera camera) {
+    Point cameraResolution = configManager.getCameraResolution();
+    Handler thePreviewHandler = previewHandler;
+    if (cameraResolution != null && thePreviewHandler != null) {
+      Message message = thePreviewHandler.obtainMessage(previewMessage, cameraResolution.x,
+          cameraResolution.y, data);
+      message.sendToTarget();
+      previewHandler = null;
+    } else {
+      Log.d(TAG, "Got preview callback, but no handler or resolution available");
+    }
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java b/src/java/PluginQR/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
new file mode 100644
index 00000000..49524bbf
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.camera.open;
+
+import android.hardware.Camera;
+import android.util.Log;
+
+public final class OpenCameraInterface {
+
+  private static final String TAG = OpenCameraInterface.class.getName();
+
+  private OpenCameraInterface() {
+  }
+
+  /**
+   * Opens a rear-facing camera with {@link Camera#open(int)}, if one exists, or opens camera 0.
+   */
+  public static Camera open() {
+    
+    int numCameras = Camera.getNumberOfCameras();
+    if (numCameras == 0) {
+      Log.w(TAG, "No cameras!");
+      return null;
+    }
+
+    int index = 0;
+    while (index < numCameras) {
+      Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+      Camera.getCameraInfo(index, cameraInfo);
+      if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_BACK) {
+        break;
+      }
+      index++;
+    }
+    
+    Camera camera;
+    if (index < numCameras) {
+      Log.i(TAG, "Opening camera #" + index);
+      camera = Camera.open(index);
+    } else {
+      Log.i(TAG, "No camera facing back; returning camera #0");
+      camera = Camera.open(0);
+    }
+
+    return camera;
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/encode/ContactEncoder.java b/src/java/PluginQR/src/com/google/zxing/client/android/encode/ContactEncoder.java
new file mode 100644
index 00000000..079fdfb8
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/encode/ContactEncoder.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.encode;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Implementations encode according to some scheme for encoding contact information, like VCard or
+ * MECARD.
+ *
+ * @author Sean Owen
+ */
+abstract class ContactEncoder {
+
+  /**
+   * @return first, the best effort encoding of all data in the appropriate format; second, a
+   *   display-appropriate version of the contact information
+   */
+  abstract String[] encode(Iterable<String> names,
+                           String organization,
+                           Iterable<String> addresses,
+                           Iterable<String> phones,
+                           Iterable<String> emails,
+                           Iterable<String> urls,
+                           String note);
+
+  /**
+   * @return null if s is null or empty, or result of s.trim() otherwise
+   */
+  static String trim(String s) {
+    if (s == null) {
+      return null;
+    }
+    String result = s.trim();
+    return result.isEmpty() ? null : result;
+  }
+
+  static void doAppend(StringBuilder newContents,
+                             StringBuilder newDisplayContents,
+                             String prefix,
+                             String value,
+                             Formatter fieldFormatter,
+                             char terminator) {
+    String trimmed = trim(value);
+    if (trimmed != null) {
+      newContents.append(prefix).append(':').append(fieldFormatter.format(trimmed)).append(terminator);
+      newDisplayContents.append(trimmed).append('\n');
+    }
+  }
+
+  static void doAppendUpToUnique(StringBuilder newContents,
+                                 StringBuilder newDisplayContents,
+                                 String prefix,
+                                 Iterable<String> values,
+                                 int max,
+                                 Formatter formatter,
+                                 Formatter fieldFormatter,
+                                 char terminator) {
+    if (values == null) {
+      return;
+    }
+    int count = 0;
+    Collection<String> uniques = new HashSet<String>(2);
+    for (String value : values) {
+      String trimmed = trim(value);
+      if (trimmed != null && !trimmed.isEmpty() && !uniques.contains(trimmed)) {
+        newContents.append(prefix).append(':').append(fieldFormatter.format(trimmed)).append(terminator);
+        String display = formatter == null ? trimmed : formatter.format(trimmed);
+        newDisplayContents.append(display).append('\n');
+        if (++count == max) {
+          break;
+        }
+        uniques.add(trimmed);
+      }
+    }
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/encode/EncodeActivity.java b/src/java/PluginQR/src/com/google/zxing/client/android/encode/EncodeActivity.java
new file mode 100644
index 00000000..58fd6152
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/encode/EncodeActivity.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.encode;
+
+import android.graphics.Point;
+import android.view.Display;
+import android.view.MenuInflater;
+import android.view.WindowManager;
+import com.google.zxing.WriterException;
+import com.google.zxing.client.android.Contents;
+import com.google.zxing.client.android.FinishListener;
+import com.google.zxing.client.android.Intents;
+import keepass2android.plugin.qr.R;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+/**
+ * This class encodes data from an Intent into a QR code, and then displays it full screen so that
+ * another person can scan it with their device.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class EncodeActivity extends Activity {
+
+  private static final String TAG = EncodeActivity.class.getSimpleName();
+
+  private static final int MAX_BARCODE_FILENAME_LENGTH = 24;
+  private static final Pattern NOT_ALPHANUMERIC = Pattern.compile("[^A-Za-z0-9]");
+  private static final String USE_VCARD_KEY = "USE_VCARD";
+
+  private QRCodeEncoder qrCodeEncoder;
+
+  @Override
+  public void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+    Intent intent = getIntent();
+    if (intent == null) {
+      finish();
+    } else {
+      String action = intent.getAction();
+      if (Intents.Encode.ACTION.equals(action) || Intent.ACTION_SEND.equals(action)) {
+        setContentView(R.layout.encode);
+      } else {
+        finish();
+      }
+    }
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    MenuInflater menuInflater = getMenuInflater();
+    menuInflater.inflate(R.menu.encode, menu);
+    boolean useVcard = qrCodeEncoder != null && qrCodeEncoder.isUseVCard();
+    int encodeNameResource = useVcard ? R.string.menu_encode_mecard : R.string.menu_encode_vcard;
+    MenuItem encodeItem = menu.findItem(R.id.menu_encode);
+    encodeItem.setTitle(encodeNameResource);
+    Intent intent = getIntent();
+    if (intent != null) {
+      String type = intent.getStringExtra(Intents.Encode.TYPE);
+      encodeItem.setVisible(Contents.Type.CONTACT.equals(type));
+    }
+    return super.onCreateOptionsMenu(menu);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case R.id.menu_share:
+        share();
+        return true;
+      case R.id.menu_encode:
+        Intent intent = getIntent();
+        if (intent == null) {
+          return false;
+        }
+        intent.putExtra(USE_VCARD_KEY, !qrCodeEncoder.isUseVCard());
+        startActivity(intent);
+        finish();
+        return true;
+      default:
+        return false;
+    }
+  }
+  
+  private void share() {
+    QRCodeEncoder encoder = qrCodeEncoder;
+    if (encoder == null) { // Odd
+      Log.w(TAG, "No existing barcode to send?");
+      return;
+    }
+
+    String contents = encoder.getContents();
+    if (contents == null) {
+      Log.w(TAG, "No existing barcode to send?");
+      return;
+    }
+
+    Bitmap bitmap;
+    try {
+      bitmap = encoder.encodeAsBitmap();
+    } catch (WriterException we) {
+      Log.w(TAG, we);
+      return;
+    }
+    if (bitmap == null) {
+      return;
+    }
+
+    File bsRoot = new File(Environment.getExternalStorageDirectory(), "BarcodeScanner");
+    File barcodesRoot = new File(bsRoot, "Barcodes");
+    if (!barcodesRoot.exists() && !barcodesRoot.mkdirs()) {
+      Log.w(TAG, "Couldn't make dir " + barcodesRoot);
+      showErrorMessage(R.string.msg_unmount_usb);
+      return;
+    }
+    File barcodeFile = new File(barcodesRoot, makeBarcodeFileName(contents) + ".png");
+    barcodeFile.delete();
+    FileOutputStream fos = null;
+    try {
+      fos = new FileOutputStream(barcodeFile);
+      bitmap.compress(Bitmap.CompressFormat.PNG, 0, fos);
+    } catch (FileNotFoundException fnfe) {
+      Log.w(TAG, "Couldn't access file " + barcodeFile + " due to " + fnfe);
+      showErrorMessage(R.string.msg_unmount_usb);
+      return;
+    } finally {
+      if (fos != null) {
+        try {
+          fos.close();
+        } catch (IOException ioe) {
+          // do nothing
+        }
+      }
+    }
+
+    Intent intent = new Intent(Intent.ACTION_SEND, Uri.parse("mailto:"));
+    intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + " - " + encoder.getTitle());
+    intent.putExtra(Intent.EXTRA_TEXT, contents);
+    intent.putExtra(Intent.EXTRA_STREAM, Uri.parse("file://" + barcodeFile.getAbsolutePath()));
+    intent.setType("image/png");
+    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+    startActivity(Intent.createChooser(intent, null));
+  }
+
+  private static CharSequence makeBarcodeFileName(CharSequence contents) {
+    String fileName = NOT_ALPHANUMERIC.matcher(contents).replaceAll("_");
+    if (fileName.length() > MAX_BARCODE_FILENAME_LENGTH) {
+      fileName = fileName.substring(0, MAX_BARCODE_FILENAME_LENGTH);
+    }
+    return fileName;
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    // This assumes the view is full screen, which is a good assumption
+    WindowManager manager = (WindowManager) getSystemService(WINDOW_SERVICE);
+    Display display = manager.getDefaultDisplay();
+    Point displaySize = new Point();
+    display.getSize(displaySize);
+    int width = displaySize.x;
+    int height = displaySize.y;
+    int smallerDimension = width < height ? width : height;
+    smallerDimension = smallerDimension * 7 / 8;
+
+    Intent intent = getIntent();
+    if (intent == null) {
+      return;
+    }
+
+    try {
+      boolean useVCard = intent.getBooleanExtra(USE_VCARD_KEY, false);
+      qrCodeEncoder = new QRCodeEncoder(this, intent, smallerDimension, useVCard);
+      Bitmap bitmap = qrCodeEncoder.encodeAsBitmap();
+      if (bitmap == null) {
+        Log.w(TAG, "Could not encode barcode");
+        showErrorMessage(R.string.msg_encode_contents_failed);
+        qrCodeEncoder = null;
+        return;
+      }
+
+      ImageView view = (ImageView) findViewById(R.id.image_view);
+      view.setImageBitmap(bitmap);
+
+      TextView contents = (TextView) findViewById(R.id.contents_text_view);
+      if (intent.getBooleanExtra(Intents.Encode.SHOW_CONTENTS, true)) {
+        contents.setText(qrCodeEncoder.getDisplayContents());
+        setTitle(qrCodeEncoder.getTitle());
+      } else {
+        contents.setText("");
+        setTitle("");
+      }
+    } catch (WriterException e) {
+      Log.w(TAG, "Could not encode barcode", e);
+      showErrorMessage(R.string.msg_encode_contents_failed);
+      qrCodeEncoder = null;
+    }
+  }
+
+  private void showErrorMessage(int message) {
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setMessage(message);
+    builder.setPositiveButton(R.string.button_ok, new FinishListener(this));
+    builder.setOnCancelListener(new FinishListener(this));
+    builder.show();
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/encode/Formatter.java b/src/java/PluginQR/src/com/google/zxing/client/android/encode/Formatter.java
new file mode 100644
index 00000000..40e89f23
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/encode/Formatter.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.encode;
+
+/**
+ * Encapsulates some simple formatting logic, to aid refactoring in {@link ContactEncoder}.
+ *
+ * @author Sean Owen
+ */
+interface Formatter {
+  
+  String format(String source);
+  
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/encode/MECARDContactEncoder.java b/src/java/PluginQR/src/com/google/zxing/client/android/encode/MECARDContactEncoder.java
new file mode 100644
index 00000000..7d9afd2c
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/encode/MECARDContactEncoder.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.encode;
+
+import android.telephony.PhoneNumberUtils;
+
+import java.util.regex.Pattern;
+
+/**
+ * Encodes contact information according to the MECARD format.
+ *
+ * @author Sean Owen
+ */
+final class MECARDContactEncoder extends ContactEncoder {
+
+  private static final Pattern RESERVED_MECARD_CHARS = Pattern.compile("([\\\\:;])");
+  private static final Pattern NEWLINE = Pattern.compile("\\n");
+  private static final Pattern COMMA = Pattern.compile(",");
+  private static final Formatter MECARD_FIELD_FORMATTER = new Formatter() {
+    @Override
+    public String format(String source) {
+      return NEWLINE.matcher(RESERVED_MECARD_CHARS.matcher(source).replaceAll("\\\\$1")).replaceAll("");
+    }
+  };
+  private static final char TERMINATOR = ';';
+  private static final Pattern NOT_DIGITS = Pattern.compile("[^0-9]+");
+
+  @Override
+  public String[] encode(Iterable<String> names,
+                         String organization,
+                         Iterable<String> addresses,
+                         Iterable<String> phones,
+                         Iterable<String> emails,
+                         Iterable<String> urls,
+                         String note) {
+    StringBuilder newContents = new StringBuilder(100);
+    newContents.append("MECARD:");
+    StringBuilder newDisplayContents = new StringBuilder(100);
+    appendUpToUnique(newContents, newDisplayContents, "N", names, 1, new Formatter() {
+      @Override
+      public String format(String source) {
+        return source == null ? null : COMMA.matcher(source).replaceAll("");
+      }
+    });
+    append(newContents, newDisplayContents, "ORG", organization);
+    appendUpToUnique(newContents, newDisplayContents, "ADR", addresses, 1, null);
+    appendUpToUnique(newContents, newDisplayContents, "TEL", phones, Integer.MAX_VALUE, new Formatter() {
+      @Override
+      public String format(String source) {
+        CharSequence s = PhoneNumberUtils.formatNumber(source);
+        return s == null ? null : NOT_DIGITS.matcher(s).replaceAll("");
+      }
+    });
+    appendUpToUnique(newContents, newDisplayContents, "EMAIL", emails, Integer.MAX_VALUE, null);
+    appendUpToUnique(newContents, newDisplayContents, "URL", urls, Integer.MAX_VALUE, null);
+    append(newContents, newDisplayContents, "NOTE", note);
+    newContents.append(';');
+    return new String[] { newContents.toString(), newDisplayContents.toString() };
+  }
+
+  private static void append(StringBuilder newContents,
+                             StringBuilder newDisplayContents,
+                             String prefix, 
+                             String value) {
+    doAppend(newContents, newDisplayContents, prefix, value, MECARD_FIELD_FORMATTER, TERMINATOR);
+  }
+  
+  private static void appendUpToUnique(StringBuilder newContents, 
+                                       StringBuilder newDisplayContents,
+                                       String prefix, 
+                                       Iterable<String> values, 
+                                       int max,
+                                       Formatter formatter) {
+    doAppendUpToUnique(newContents,
+                       newDisplayContents,
+                       prefix,
+                       values,
+                       max,
+                       formatter,
+                       MECARD_FIELD_FORMATTER,
+                       TERMINATOR);
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/encode/QRCodeEncoder.java b/src/java/PluginQR/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
new file mode 100644
index 00000000..e6957418
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.encode;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.Result;
+import com.google.zxing.WriterException;
+import com.google.zxing.client.android.Contents;
+import com.google.zxing.client.android.Intents;
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.AddressBookParsedResult;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.ResultParser;
+import com.google.zxing.common.BitMatrix;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.telephony.PhoneNumberUtils;
+import android.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.Map;
+
+/**
+ * This class does the work of decoding the user's request and extracting all the data
+ * to be encoded in a barcode.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+final class QRCodeEncoder {
+
+  private static final String TAG = QRCodeEncoder.class.getSimpleName();
+
+  private static final int WHITE = 0xFFFFFFFF;
+  private static final int BLACK = 0xFF000000;
+
+  private final Context activity;
+  private String contents;
+  private String displayContents;
+  private String title;
+  private BarcodeFormat format;
+  private final int dimension;
+  private final boolean useVCard;
+
+  QRCodeEncoder(Context activity, Intent intent, int dimension, boolean useVCard) throws WriterException {
+    this.activity = activity;
+    this.dimension = dimension;
+    this.useVCard = useVCard;
+    String action = intent.getAction();
+    if (action.equals(Intents.Encode.ACTION)) {
+      encodeContentsFromZXingIntent(intent);
+    } else if (action.equals(Intent.ACTION_SEND)) {
+      encodeContentsFromShareIntent(intent);
+    }
+  }
+
+  String getContents() {
+    return contents;
+  }
+
+  String getDisplayContents() {
+    return displayContents;
+  }
+
+  String getTitle() {
+    return title;
+  }
+
+  boolean isUseVCard() {
+    return useVCard;
+  }
+
+  // It would be nice if the string encoding lived in the core ZXing library,
+  // but we use platform specific code like PhoneNumberUtils, so it can't.
+  private boolean encodeContentsFromZXingIntent(Intent intent) {
+     // Default to QR_CODE if no format given.
+    String formatString = intent.getStringExtra(Intents.Encode.FORMAT);
+    format = null;
+    if (formatString != null) {
+      try {
+        format = BarcodeFormat.valueOf(formatString);
+      } catch (IllegalArgumentException iae) {
+        // Ignore it then
+      }
+    }
+    if (format == null || format == BarcodeFormat.QR_CODE) {
+      String type = intent.getStringExtra(Intents.Encode.TYPE);
+      if (type == null || type.isEmpty()) {
+        return false;
+      }
+      this.format = BarcodeFormat.QR_CODE;
+      encodeQRCodeContents(intent, type);
+    } else {
+      String data = intent.getStringExtra(Intents.Encode.DATA);
+      if (data != null && !data.isEmpty()) {
+        contents = data;
+        displayContents = data;
+        title = activity.getString(R.string.contents_text);
+      }
+    }
+    return contents != null && !contents.isEmpty();
+  }
+
+  // Handles send intents from multitude of Android applications
+  private void encodeContentsFromShareIntent(Intent intent) throws WriterException {
+    // Check if this is a plain text encoding, or contact
+    if (intent.hasExtra(Intent.EXTRA_STREAM)) {
+      encodeFromStreamExtra(intent);
+    } else {
+      encodeFromTextExtras(intent);
+    }
+  }
+
+  private void encodeFromTextExtras(Intent intent) throws WriterException {
+    // Notice: Google Maps shares both URL and details in one text, bummer!
+    String theContents = ContactEncoder.trim(intent.getStringExtra(Intent.EXTRA_TEXT));
+    if (theContents == null) {
+      theContents = ContactEncoder.trim(intent.getStringExtra("android.intent.extra.HTML_TEXT"));
+      // Intent.EXTRA_HTML_TEXT
+      if (theContents == null) {
+        theContents = ContactEncoder.trim(intent.getStringExtra(Intent.EXTRA_SUBJECT));
+        if (theContents == null) {
+          String[] emails = intent.getStringArrayExtra(Intent.EXTRA_EMAIL);
+          if (emails != null) {
+            theContents = ContactEncoder.trim(emails[0]);
+          } else {
+            theContents = "?";
+          }
+        }
+      }
+    }
+
+    // Trim text to avoid URL breaking.
+    if (theContents == null || theContents.isEmpty()) {
+      throw new WriterException("Empty EXTRA_TEXT");
+    }
+    contents = theContents;
+    // We only do QR code.
+    format = BarcodeFormat.QR_CODE;
+    if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
+      displayContents = intent.getStringExtra(Intent.EXTRA_SUBJECT);
+    } else if (intent.hasExtra(Intent.EXTRA_TITLE)) {
+      displayContents = intent.getStringExtra(Intent.EXTRA_TITLE);
+    } else {
+      displayContents = contents;
+    }
+    title = activity.getString(R.string.contents_text);
+  }
+
+  // Handles send intents from the Contacts app, retrieving a contact as a VCARD.
+  private void encodeFromStreamExtra(Intent intent) throws WriterException {
+    format = BarcodeFormat.QR_CODE;
+    Bundle bundle = intent.getExtras();
+    if (bundle == null) {
+      throw new WriterException("No extras");
+    }
+    Uri uri = bundle.getParcelable(Intent.EXTRA_STREAM);
+    if (uri == null) {
+      throw new WriterException("No EXTRA_STREAM");
+    }
+    byte[] vcard;
+    String vcardString;
+    try {
+      InputStream stream = activity.getContentResolver().openInputStream(uri);
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      byte[] buffer = new byte[2048];
+      int bytesRead;
+      while ((bytesRead = stream.read(buffer)) > 0) {
+        baos.write(buffer, 0, bytesRead);
+      }
+      vcard = baos.toByteArray();
+      vcardString = new String(vcard, 0, vcard.length, "UTF-8");
+    } catch (IOException ioe) {
+      throw new WriterException(ioe);
+    }
+    Log.d(TAG, "Encoding share intent content:");
+    Log.d(TAG, vcardString);
+    Result result = new Result(vcardString, vcard, null, BarcodeFormat.QR_CODE);
+    ParsedResult parsedResult = ResultParser.parseResult(result);
+    if (!(parsedResult instanceof AddressBookParsedResult)) {
+      throw new WriterException("Result was not an address");
+    }
+    encodeQRCodeContents((AddressBookParsedResult) parsedResult);
+    if (contents == null || contents.isEmpty()) {
+      throw new WriterException("No content to encode");
+    }
+  }
+
+  private void encodeQRCodeContents(Intent intent, String type) {
+    if (type.equals(Contents.Type.TEXT)) {
+      String data = intent.getStringExtra(Intents.Encode.DATA);
+      if (data != null && !data.isEmpty()) {
+        contents = data;
+        displayContents = data;
+        title = activity.getString(R.string.contents_text);
+      }
+    } else if (type.equals(Contents.Type.EMAIL)) {
+      String data = ContactEncoder.trim(intent.getStringExtra(Intents.Encode.DATA));
+      if (data != null) {
+        contents = "mailto:" + data;
+        displayContents = data;
+        title = activity.getString(R.string.contents_email);
+      }
+    } else if (type.equals(Contents.Type.PHONE)) {
+      String data = ContactEncoder.trim(intent.getStringExtra(Intents.Encode.DATA));
+      if (data != null) {
+        contents = "tel:" + data;
+        displayContents = PhoneNumberUtils.formatNumber(data);
+        title = activity.getString(R.string.contents_phone);
+      }
+    } else if (type.equals(Contents.Type.SMS)) {
+      String data = ContactEncoder.trim(intent.getStringExtra(Intents.Encode.DATA));
+      if (data != null) {
+        contents = "sms:" + data;
+        displayContents = PhoneNumberUtils.formatNumber(data);
+        title = activity.getString(R.string.contents_sms);
+      }
+    } else if (type.equals(Contents.Type.CONTACT)) {
+
+      Bundle bundle = intent.getBundleExtra(Intents.Encode.DATA);
+      if (bundle != null) {
+
+        String name = bundle.getString(ContactsContract.Intents.Insert.NAME);
+        String organization = bundle.getString(ContactsContract.Intents.Insert.COMPANY);
+        String address = bundle.getString(ContactsContract.Intents.Insert.POSTAL);
+        Collection<String> phones = new ArrayList<String>(Contents.PHONE_KEYS.length);
+        for (int x = 0; x < Contents.PHONE_KEYS.length; x++) {
+          phones.add(bundle.getString(Contents.PHONE_KEYS[x]));
+        }
+        Collection<String> emails = new ArrayList<String>(Contents.EMAIL_KEYS.length);
+        for (int x = 0; x < Contents.EMAIL_KEYS.length; x++) {
+          emails.add(bundle.getString(Contents.EMAIL_KEYS[x]));
+        }
+        String url = bundle.getString(Contents.URL_KEY);
+        Iterable<String> urls = url == null ? null : Collections.singletonList(url);
+        String note = bundle.getString(Contents.NOTE_KEY);
+
+        ContactEncoder mecardEncoder = useVCard ? new VCardContactEncoder() : new MECARDContactEncoder();
+        String[] encoded = mecardEncoder.encode(Collections.singleton(name),
+                                                organization,
+                                                Collections.singleton(address),
+                                                phones,
+                                                emails,
+                                                urls,
+                                                note);
+        // Make sure we've encoded at least one field.
+        if (!encoded[1].isEmpty()) {
+          contents = encoded[0];
+          displayContents = encoded[1];
+          title = activity.getString(R.string.contents_contact);
+        }
+
+      }
+
+    } else if (type.equals(Contents.Type.LOCATION)) {
+      Bundle bundle = intent.getBundleExtra(Intents.Encode.DATA);
+      if (bundle != null) {
+        // These must use Bundle.getFloat(), not getDouble(), it's part of the API.
+        float latitude = bundle.getFloat("LAT", Float.MAX_VALUE);
+        float longitude = bundle.getFloat("LONG", Float.MAX_VALUE);
+        if (latitude != Float.MAX_VALUE && longitude != Float.MAX_VALUE) {
+          contents = "geo:" + latitude + ',' + longitude;
+          displayContents = latitude + "," + longitude;
+          title = activity.getString(R.string.contents_location);
+        }
+      }
+    }
+  }
+
+  private void encodeQRCodeContents(AddressBookParsedResult contact) {
+    ContactEncoder encoder = useVCard ? new VCardContactEncoder() : new MECARDContactEncoder();
+    String[] encoded = encoder.encode(toIterable(contact.getNames()),
+                                      contact.getOrg(),
+                                      toIterable(contact.getAddresses()),
+                                      toIterable(contact.getPhoneNumbers()),
+                                      toIterable(contact.getEmails()),
+                                      toIterable(contact.getURLs()),
+                                      null);
+    // Make sure we've encoded at least one field.
+    if (!encoded[1].isEmpty()) {
+      contents = encoded[0];
+      displayContents = encoded[1];
+      title = activity.getString(R.string.contents_contact);
+    }
+  }
+
+  private static Iterable<String> toIterable(String[] values) {
+    return values == null ? null : Arrays.asList(values);
+  }
+
+  Bitmap encodeAsBitmap() throws WriterException {
+    String contentsToEncode = contents;
+    if (contentsToEncode == null) {
+      return null;
+    }
+    Map<EncodeHintType,Object> hints = null;
+    String encoding = guessAppropriateEncoding(contentsToEncode);
+    if (encoding != null) {
+      hints = new EnumMap<EncodeHintType,Object>(EncodeHintType.class);
+      hints.put(EncodeHintType.CHARACTER_SET, encoding);
+    }
+    BitMatrix result;
+    try {
+      result = new MultiFormatWriter().encode(contentsToEncode, format, dimension, dimension, hints);
+    } catch (IllegalArgumentException iae) {
+      // Unsupported format
+      return null;
+    }
+    int width = result.getWidth();
+    int height = result.getHeight();
+    int[] pixels = new int[width * height];
+    for (int y = 0; y < height; y++) {
+      int offset = y * width;
+      for (int x = 0; x < width; x++) {
+        pixels[offset + x] = result.get(x, y) ? BLACK : WHITE;
+      }
+    }
+
+    Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+    bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+    return bitmap;
+  }
+
+  private static String guessAppropriateEncoding(CharSequence contents) {
+    // Very crude at the moment
+    for (int i = 0; i < contents.length(); i++) {
+      if (contents.charAt(i) > 0xFF) {
+        return "UTF-8";
+      }
+    }
+    return null;
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/encode/VCardContactEncoder.java b/src/java/PluginQR/src/com/google/zxing/client/android/encode/VCardContactEncoder.java
new file mode 100644
index 00000000..a4573cf6
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/encode/VCardContactEncoder.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.encode;
+
+import android.telephony.PhoneNumberUtils;
+
+import java.util.regex.Pattern;
+
+/**
+ * Encodes contact information according to the vCard format.
+ *
+ * @author Sean Owen
+ */
+final class VCardContactEncoder extends ContactEncoder {
+
+  private static final Pattern RESERVED_VCARD_CHARS = Pattern.compile("([\\\\,;])");
+  private static final Pattern NEWLINE = Pattern.compile("\\n");
+  private static final Formatter VCARD_FIELD_FORMATTER = new Formatter() {
+    @Override
+    public String format(String source) {
+      return NEWLINE.matcher(RESERVED_VCARD_CHARS.matcher(source).replaceAll("\\\\$1")).replaceAll("");
+    }
+  };
+  private static final char TERMINATOR = '\n';
+
+  @Override
+  public String[] encode(Iterable<String> names,
+                         String organization,
+                         Iterable<String> addresses,
+                         Iterable<String> phones,
+                         Iterable<String> emails,
+                         Iterable<String> urls,
+                         String note) {
+    StringBuilder newContents = new StringBuilder(100);
+    newContents.append("BEGIN:VCARD").append(TERMINATOR);
+    newContents.append("VERSION:3.0").append(TERMINATOR);
+    StringBuilder newDisplayContents = new StringBuilder(100);
+    appendUpToUnique(newContents, newDisplayContents, "N", names, 1, null);
+    append(newContents, newDisplayContents, "ORG", organization);
+    appendUpToUnique(newContents, newDisplayContents, "ADR", addresses, 1, null);
+    appendUpToUnique(newContents, newDisplayContents, "TEL", phones, Integer.MAX_VALUE, new Formatter() {
+      @Override
+      public String format(String source) {
+        return PhoneNumberUtils.formatNumber(source);
+      }
+    });
+    appendUpToUnique(newContents, newDisplayContents, "EMAIL", emails, Integer.MAX_VALUE, null);
+    appendUpToUnique(newContents, newDisplayContents, "URL", urls, Integer.MAX_VALUE, null);
+    append(newContents, newDisplayContents, "NOTE", note);
+    newContents.append("END:VCARD").append(TERMINATOR);
+    return new String[] { newContents.toString(), newDisplayContents.toString() };
+  }
+  
+  private static void append(StringBuilder newContents, 
+                             StringBuilder newDisplayContents,
+                             String prefix, 
+                             String value) {
+    doAppend(newContents, newDisplayContents, prefix, value, VCARD_FIELD_FORMATTER, TERMINATOR);
+  }
+  
+  private static void appendUpToUnique(StringBuilder newContents, 
+                                       StringBuilder newDisplayContents,
+                                       String prefix, 
+                                       Iterable<String> values, 
+                                       int max,
+                                       Formatter formatter) {
+    doAppendUpToUnique(newContents,
+                       newDisplayContents,
+                       prefix,
+                       values,
+                       max,
+                       formatter,
+                       VCARD_FIELD_FORMATTER,
+                       TERMINATOR);
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/AddressBookResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
new file mode 100644
index 00000000..af19876d
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/AddressBookResultHandler.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.AddressBookParsedResult;
+import com.google.zxing.client.result.ParsedResult;
+
+import android.app.Activity;
+import android.telephony.PhoneNumberUtils;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.StyleSpan;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * Handles address book entries.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class AddressBookResultHandler extends ResultHandler {
+
+  private static final DateFormat[] DATE_FORMATS = {
+    new SimpleDateFormat("yyyyMMdd", Locale.ENGLISH),
+    new SimpleDateFormat("yyyyMMdd'T'HHmmss", Locale.ENGLISH),
+    new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH),
+    new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH),
+  };
+  static {
+    for (DateFormat format : DATE_FORMATS) {
+      format.setLenient(false);
+    }
+  }
+
+  private static final int[] BUTTON_TEXTS = {
+    R.string.button_add_contact,
+    R.string.button_show_map,
+    R.string.button_dial,
+    R.string.button_email,
+  };
+
+  private final boolean[] fields;
+  private int buttonCount;
+
+  // This takes all the work out of figuring out which buttons/actions should be in which
+  // positions, based on which fields are present in this barcode.
+  private int mapIndexToAction(int index) {
+    if (index < buttonCount) {
+      int count = -1;
+      for (int x = 0; x < MAX_BUTTON_COUNT; x++) {
+        if (fields[x]) {
+          count++;
+        }
+        if (count == index) {
+          return x;
+        }
+      }
+    }
+    return -1;
+  }
+
+  public AddressBookResultHandler(Activity activity, ParsedResult result) {
+    super(activity, result);
+    AddressBookParsedResult addressResult = (AddressBookParsedResult) result;
+    String[] addresses = addressResult.getAddresses();
+    boolean hasAddress = addresses != null && addresses.length > 0 && addresses[0] != null && !addresses[0].isEmpty();
+    String[] phoneNumbers = addressResult.getPhoneNumbers();
+    boolean hasPhoneNumber = phoneNumbers != null && phoneNumbers.length > 0;
+    String[] emails = addressResult.getEmails();
+    boolean hasEmailAddress = emails != null && emails.length > 0;
+
+    fields = new boolean[MAX_BUTTON_COUNT];
+    fields[0] = true; // Add contact is always available
+    fields[1] = hasAddress;
+    fields[2] = hasPhoneNumber;
+    fields[3] = hasEmailAddress;
+
+    buttonCount = 0;
+    for (int x = 0; x < MAX_BUTTON_COUNT; x++) {
+      if (fields[x]) {
+        buttonCount++;
+      }
+    }
+  }
+
+  @Override
+  public int getButtonCount() {
+    return buttonCount;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return BUTTON_TEXTS[mapIndexToAction(index)];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    AddressBookParsedResult addressResult = (AddressBookParsedResult) getResult();
+    String[] addresses = addressResult.getAddresses();
+    String address1 = addresses == null || addresses.length < 1 ? null : addresses[0];
+    String[] addressTypes = addressResult.getAddressTypes();
+    String address1Type = addressTypes == null || addressTypes.length < 1 ? null : addressTypes[0];
+    int action = mapIndexToAction(index);
+    switch (action) {
+      case 0:
+        addContact(addressResult.getNames(),
+                   addressResult.getNicknames(),
+                   addressResult.getPronunciation(),
+                   addressResult.getPhoneNumbers(),
+                   addressResult.getPhoneTypes(),
+                   addressResult.getEmails(),
+                   addressResult.getEmailTypes(),
+                   addressResult.getNote(),
+                   addressResult.getInstantMessenger(),
+                   address1,
+                   address1Type,
+                   addressResult.getOrg(),
+                   addressResult.getTitle(),
+                   addressResult.getURLs(),
+                   addressResult.getBirthday(),
+                   addressResult.getGeo());
+        break;
+      case 1:
+        String[] names = addressResult.getNames();
+        String title = names != null ? names[0] : null;
+        searchMap(address1, title);
+        break;
+      case 2:
+        dialPhone(addressResult.getPhoneNumbers()[0]);
+        break;
+      case 3:
+        sendEmail(addressResult.getEmails()[0], null, null);
+        break;
+      default:
+        break;
+    }
+  }
+
+  private static Date parseDate(String s) {
+    for (DateFormat currentFormat : DATE_FORMATS) {
+      try {
+        return currentFormat.parse(s);
+      } catch (ParseException e) {
+        // continue
+      }
+    }
+    return null;
+  }
+
+  // Overriden so we can hyphenate phone numbers, format birthdays, and bold the name.
+  @Override
+  public CharSequence getDisplayContents() {
+    AddressBookParsedResult result = (AddressBookParsedResult) getResult();
+    StringBuilder contents = new StringBuilder(100);
+    ParsedResult.maybeAppend(result.getNames(), contents);
+    int namesLength = contents.length();
+
+    String pronunciation = result.getPronunciation();
+    if (pronunciation != null && !pronunciation.isEmpty()) {
+      contents.append("\n(");
+      contents.append(pronunciation);
+      contents.append(')');
+    }
+
+    ParsedResult.maybeAppend(result.getTitle(), contents);
+    ParsedResult.maybeAppend(result.getOrg(), contents);
+    ParsedResult.maybeAppend(result.getAddresses(), contents);
+    String[] numbers = result.getPhoneNumbers();
+    if (numbers != null) {
+      for (String number : numbers) {
+        if (number != null) {
+          ParsedResult.maybeAppend(PhoneNumberUtils.formatNumber(number), contents);
+        }
+      }
+    }
+    ParsedResult.maybeAppend(result.getEmails(), contents);
+    ParsedResult.maybeAppend(result.getURLs(), contents);
+
+    String birthday = result.getBirthday();
+    if (birthday != null && !birthday.isEmpty()) {
+      Date date = parseDate(birthday);
+      if (date != null) {
+        ParsedResult.maybeAppend(DateFormat.getDateInstance(DateFormat.MEDIUM).format(date.getTime()), contents);
+      }
+    }
+    ParsedResult.maybeAppend(result.getNote(), contents);
+
+    if (namesLength > 0) {
+      // Bold the full name to make it stand out a bit.
+      Spannable styled = new SpannableString(contents.toString());
+      styled.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 0, namesLength, 0);
+      return styled;
+    } else {
+      return contents.toString();
+    }
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_address_book;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/CalendarResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/CalendarResultHandler.java
new file mode 100644
index 00000000..e849dbac
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/CalendarResultHandler.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import android.content.ActivityNotFoundException;
+import android.util.Log;
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.CalendarParsedResult;
+import com.google.zxing.client.result.ParsedResult;
+
+import android.app.Activity;
+import android.content.Intent;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+/**
+ * Handles calendar entries encoded in QR Codes.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ * @author Sean Owen
+ */
+public final class CalendarResultHandler extends ResultHandler {
+
+  private static final String TAG = CalendarResultHandler.class.getSimpleName();
+
+  private static final int[] buttons = {
+      R.string.button_add_calendar
+  };
+
+  public CalendarResultHandler(Activity activity, ParsedResult result) {
+    super(activity, result);
+  }
+
+  @Override
+  public int getButtonCount() {
+    return buttons.length;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    if (index == 0) {
+      CalendarParsedResult calendarResult = (CalendarParsedResult) getResult();
+
+      String description = calendarResult.getDescription();
+      String organizer = calendarResult.getOrganizer();
+      if (organizer != null) { // No separate Intent key, put in description
+        if (description == null) {
+          description = organizer;
+        } else {
+          description = description + '\n' + organizer;
+        }
+      }
+
+      addCalendarEvent(calendarResult.getSummary(),
+                       calendarResult.getStart(),
+                       calendarResult.isStartAllDay(),
+                       calendarResult.getEnd(),
+                       calendarResult.getLocation(),
+                       description,
+                       calendarResult.getAttendees());
+    }
+  }
+
+  /**
+   * Sends an intent to create a new calendar event by prepopulating the Add Event UI. Older
+   * versions of the system have a bug where the event title will not be filled out.
+   *
+   * @param summary A description of the event
+   * @param start   The start time
+   * @param allDay  if true, event is considered to be all day starting from start time
+   * @param end     The end time (optional)
+   * @param location a text description of the event location
+   * @param description a text description of the event itself
+   * @param attendees attendees to invite
+   */
+  private void addCalendarEvent(String summary,
+                                Date start,
+                                boolean allDay,
+                                Date end,
+                                String location,
+                                String description,
+                                String[] attendees) {
+    Intent intent = new Intent(Intent.ACTION_INSERT);
+    intent.setType("vnd.android.cursor.item/event");
+    long startMilliseconds = start.getTime();
+    intent.putExtra("beginTime", startMilliseconds);
+    if (allDay) {
+      intent.putExtra("allDay", true);
+    }
+    long endMilliseconds;
+    if (end == null) {
+      if (allDay) {
+        // + 1 day
+        endMilliseconds = startMilliseconds + 24 * 60 * 60 * 1000;
+      } else {
+        endMilliseconds = startMilliseconds;
+      }
+    } else {
+      endMilliseconds = end.getTime();
+    }
+    intent.putExtra("endTime", endMilliseconds);
+    intent.putExtra("title", summary);
+    intent.putExtra("eventLocation", location);
+    intent.putExtra("description", description);
+    if (attendees != null) {
+      intent.putExtra(Intent.EXTRA_EMAIL, attendees);
+      // Documentation says this is either a String[] or comma-separated String, which is right?
+    }
+
+    try {
+      // Do this manually at first
+      rawLaunchIntent(intent);
+    } catch (ActivityNotFoundException anfe) {
+      Log.w(TAG, "No calendar app available that responds to " + Intent.ACTION_INSERT);
+      // For calendar apps that don't like "INSERT":
+      intent.setAction(Intent.ACTION_EDIT);
+      launchIntent(intent); // Fail here for real if nothing can handle it
+    }
+  }
+
+
+  @Override
+  public CharSequence getDisplayContents() {
+
+    CalendarParsedResult calResult = (CalendarParsedResult) getResult();
+    StringBuilder result = new StringBuilder(100);
+
+    ParsedResult.maybeAppend(calResult.getSummary(), result);
+
+    Date start = calResult.getStart();
+    ParsedResult.maybeAppend(format(calResult.isStartAllDay(), start), result);
+
+    Date end = calResult.getEnd();
+    if (end != null) {
+      if (calResult.isEndAllDay() && !start.equals(end)) {
+        // Show only year/month/day
+        // if it's all-day and this is the end date, it's exclusive, so show the user
+        // that it ends on the day before to make more intuitive sense.
+        // But don't do it if the event already (incorrectly?) specifies the same start/end
+        end = new Date(end.getTime() - 24 * 60 * 60 * 1000);
+      }
+      ParsedResult.maybeAppend(format(calResult.isEndAllDay(), end), result);
+    }
+
+    ParsedResult.maybeAppend(calResult.getLocation(), result);
+    ParsedResult.maybeAppend(calResult.getOrganizer(), result);
+    ParsedResult.maybeAppend(calResult.getAttendees(), result);
+    ParsedResult.maybeAppend(calResult.getDescription(), result);
+    return result.toString();
+  }
+
+  private static String format(boolean allDay, Date date) {
+    if (date == null) {
+      return null;
+    }
+    DateFormat format = allDay
+        ? DateFormat.getDateInstance(DateFormat.MEDIUM)
+        : DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
+    return format.format(date);
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_calendar;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/EmailAddressResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/EmailAddressResultHandler.java
new file mode 100644
index 00000000..ef8c886c
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/EmailAddressResultHandler.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.EmailAddressParsedResult;
+import com.google.zxing.client.result.ParsedResult;
+
+import android.app.Activity;
+
+/**
+ * Handles email addresses.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class EmailAddressResultHandler extends ResultHandler {
+  private static final int[] buttons = {
+      R.string.button_email,
+      R.string.button_add_contact
+  };
+
+  public EmailAddressResultHandler(Activity activity, ParsedResult result) {
+    super(activity, result);
+  }
+
+  @Override
+  public int getButtonCount() {
+    return buttons.length;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    EmailAddressParsedResult emailResult = (EmailAddressParsedResult) getResult();
+    switch (index) {
+      case 0:
+        sendEmailFromUri(emailResult.getMailtoURI(),
+                         emailResult.getEmailAddress(),
+                         emailResult.getSubject(),
+                         emailResult.getBody());
+        break;
+      case 1:
+        String[] addresses = new String[1];
+        addresses[0] = emailResult.getEmailAddress();
+        addEmailOnlyContact(addresses, null);
+        break;
+    }
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_email_address;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/GeoResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/GeoResultHandler.java
new file mode 100644
index 00000000..731f9949
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/GeoResultHandler.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.GeoParsedResult;
+import com.google.zxing.client.result.ParsedResult;
+
+import android.app.Activity;
+
+/**
+ * Handles geographic coordinates (typically encoded as geo: URLs).
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class GeoResultHandler extends ResultHandler {
+  private static final int[] buttons = {
+      R.string.button_show_map,
+      R.string.button_get_directions
+  };
+
+  public GeoResultHandler(Activity activity, ParsedResult result) {
+    super(activity, result);
+  }
+
+  @Override
+  public int getButtonCount() {
+    return buttons.length;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    GeoParsedResult geoResult = (GeoParsedResult) getResult();
+    switch (index) {
+      case 0:
+        openMap(geoResult.getGeoURI());
+        break;
+      case 1:
+        getDirections(geoResult.getLatitude(), geoResult.getLongitude());
+        break;
+    }
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_geo;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/ISBNResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/ISBNResultHandler.java
new file mode 100644
index 00000000..f8c2482d
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/ISBNResultHandler.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import com.google.zxing.Result;
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.ISBNParsedResult;
+import com.google.zxing.client.result.ParsedResult;
+
+import android.app.Activity;
+
+/**
+ * Handles books encoded by their ISBN values.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class ISBNResultHandler extends ResultHandler {
+  private static final int[] buttons = {
+      R.string.button_product_search,
+      R.string.button_book_search,
+      R.string.button_search_book_contents,
+      R.string.button_custom_product_search
+  };
+
+  public ISBNResultHandler(Activity activity, ParsedResult result, Result rawResult) {
+    super(activity, result, rawResult);
+  }
+
+  @Override
+  public int getButtonCount() {
+    return hasCustomProductSearch() ? buttons.length : buttons.length - 1;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    ISBNParsedResult isbnResult = (ISBNParsedResult) getResult();
+    switch (index) {
+      case 0:
+        openProductSearch(isbnResult.getISBN());
+        break;
+      case 1:
+        openBookSearch(isbnResult.getISBN());
+        break;
+      case 2:
+        searchBookContents(isbnResult.getISBN());
+        break;
+      case 3:
+        openURL(fillInCustomSearchURL(isbnResult.getISBN()));
+        break;
+    }
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_isbn;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/ProductResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/ProductResultHandler.java
new file mode 100644
index 00000000..d0dcf984
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/ProductResultHandler.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import com.google.zxing.Result;
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.ExpandedProductParsedResult;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.ProductParsedResult;
+
+import android.app.Activity;
+
+/**
+ * Handles generic products which are not books.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class ProductResultHandler extends ResultHandler {
+  private static final int[] buttons = {
+      R.string.button_product_search,
+      R.string.button_web_search,
+      R.string.button_custom_product_search
+  };
+
+  public ProductResultHandler(Activity activity, ParsedResult result, Result rawResult) {
+    super(activity, result, rawResult);
+  }
+
+  @Override
+  public int getButtonCount() {
+    return hasCustomProductSearch() ? buttons.length : buttons.length - 1;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    String productID = getProductIDFromResult(getResult());
+    switch (index) {
+      case 0:
+        openProductSearch(productID);
+        break;
+      case 1:
+        webSearch(productID);
+        break;
+      case 2:
+        openURL(fillInCustomSearchURL(productID));
+        break;
+    }
+  }
+
+  private static String getProductIDFromResult(ParsedResult rawResult) {
+    if (rawResult instanceof ProductParsedResult) {
+      return ((ProductParsedResult) rawResult).getNormalizedProductID();
+    }
+    if (rawResult instanceof ExpandedProductParsedResult) {
+      return ((ExpandedProductParsedResult) rawResult).getRawText();
+    }
+    throw new IllegalArgumentException(rawResult.getClass().toString());
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_product;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultButtonListener.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultButtonListener.java
new file mode 100644
index 00000000..ae30c4d3
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultButtonListener.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import android.view.View;
+import android.widget.Button;
+
+/**
+ * Handles the result of barcode decoding in the context of the Android platform, by dispatching the
+ * proper intents to open other activities like GMail, Maps, etc.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class ResultButtonListener implements Button.OnClickListener {
+  private final ResultHandler resultHandler;
+  private final int index;
+
+  public ResultButtonListener(ResultHandler resultHandler, int index) {
+    this.resultHandler = resultHandler;
+    this.index = index;
+  }
+
+  @Override
+  public void onClick(View view) {
+    resultHandler.handleButtonPress(index);
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultHandler.java
new file mode 100644
index 00000000..dc55507a
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultHandler.java
@@ -0,0 +1,483 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import com.google.zxing.Result;
+import com.google.zxing.client.android.Contents;
+import com.google.zxing.client.android.Intents;
+import com.google.zxing.client.android.LocaleManager;
+import com.google.zxing.client.android.PreferencesActivity;
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.android.book.SearchBookContentsActivity;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.ParsedResultType;
+import com.google.zxing.client.result.ResultParser;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.preference.PreferenceManager;
+import android.provider.ContactsContract;
+import android.util.Log;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.Locale;
+
+/**
+ * A base class for the Android-specific barcode handlers. These allow the app to polymorphically
+ * suggest the appropriate actions for each data type.
+ *
+ * This class also contains a bunch of utility methods to take common actions like opening a URL.
+ * They could easily be moved into a helper object, but it can't be static because the Activity
+ * instance is needed to launch an intent.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ * @author Sean Owen
+ */
+public abstract class ResultHandler {
+
+  private static final String TAG = ResultHandler.class.getSimpleName();
+
+  private static final String[] EMAIL_TYPE_STRINGS = {"home", "work", "mobile"};
+  private static final String[] PHONE_TYPE_STRINGS = {"home", "work", "mobile", "fax", "pager", "main"};
+  private static final String[] ADDRESS_TYPE_STRINGS = {"home", "work"};
+  private static final int[] EMAIL_TYPE_VALUES = {
+      ContactsContract.CommonDataKinds.Email.TYPE_HOME,
+      ContactsContract.CommonDataKinds.Email.TYPE_WORK,
+      ContactsContract.CommonDataKinds.Email.TYPE_MOBILE,
+  };
+  private static final int[] PHONE_TYPE_VALUES = {
+      ContactsContract.CommonDataKinds.Phone.TYPE_HOME,
+      ContactsContract.CommonDataKinds.Phone.TYPE_WORK,
+      ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
+      ContactsContract.CommonDataKinds.Phone.TYPE_FAX_WORK,
+      ContactsContract.CommonDataKinds.Phone.TYPE_PAGER,
+      ContactsContract.CommonDataKinds.Phone.TYPE_MAIN,
+  };
+  private static final int[] ADDRESS_TYPE_VALUES = {
+      ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME,
+      ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK,
+  };
+  private static final int NO_TYPE = -1;
+
+  public static final int MAX_BUTTON_COUNT = 4;
+
+  private final ParsedResult result;
+  private final Activity activity;
+  private final Result rawResult;
+  private final String customProductSearch;
+
+  ResultHandler(Activity activity, ParsedResult result) {
+    this(activity, result, null);
+  }
+
+  ResultHandler(Activity activity, ParsedResult result, Result rawResult) {
+    this.result = result;
+    this.activity = activity;
+    this.rawResult = rawResult;
+    this.customProductSearch = parseCustomSearchURL();
+  }
+
+  public final ParsedResult getResult() {
+    return result;
+  }
+
+  final boolean hasCustomProductSearch() {
+    return customProductSearch != null;
+  }
+
+  final Activity getActivity() {
+    return activity;
+  }
+
+  /**
+   * Indicates how many buttons the derived class wants shown.
+   *
+   * @return The integer button count.
+   */
+  public abstract int getButtonCount();
+
+  /**
+   * The text of the nth action button.
+   *
+   * @param index From 0 to getButtonCount() - 1
+   * @return The button text as a resource ID
+   */
+  public abstract int getButtonText(int index);
+
+
+  /**
+   * Execute the action which corresponds to the nth button.
+   *
+   * @param index The button that was clicked.
+   */
+  public abstract void handleButtonPress(int index);
+
+  /**
+   * Some barcode contents are considered secure, and should not be saved to history, copied to
+   * the clipboard, or otherwise persisted.
+   *
+   * @return If true, do not create any permanent record of these contents.
+   */
+  public boolean areContentsSecure() {
+    return false;
+  }
+
+  /**
+   * Create a possibly styled string for the contents of the current barcode.
+   *
+   * @return The text to be displayed.
+   */
+  public CharSequence getDisplayContents() {
+    String contents = result.getDisplayResult();
+    return contents.replace("\r", "");
+  }
+
+  /**
+   * A string describing the kind of barcode that was found, e.g. "Found contact info".
+   *
+   * @return The resource ID of the string.
+   */
+  public abstract int getDisplayTitle();
+
+  /**
+   * A convenience method to get the parsed type. Should not be overridden.
+   *
+   * @return The parsed type, e.g. URI or ISBN
+   */
+  public final ParsedResultType getType() {
+    return result.getType();
+  }
+
+  final void addPhoneOnlyContact(String[] phoneNumbers,String[] phoneTypes) {
+    addContact(null, null, null, phoneNumbers, phoneTypes, null, null, null, null, null, null, null, null, null, null, null);
+  }
+
+  final void addEmailOnlyContact(String[] emails, String[] emailTypes) {
+    addContact(null, null, null, null, null, emails, emailTypes, null, null, null, null, null, null, null, null, null);
+  }
+
+  final void addContact(String[] names,
+                        String[] nicknames,
+                        String pronunciation,
+                        String[] phoneNumbers,
+                        String[] phoneTypes,
+                        String[] emails,
+                        String[] emailTypes,
+                        String note,
+                        String instantMessenger,
+                        String address,
+                        String addressType,
+                        String org,
+                        String title,
+                        String[] urls,
+                        String birthday,
+                        String[] geo) {
+
+    // Only use the first name in the array, if present.
+    Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT, ContactsContract.Contacts.CONTENT_URI);
+    intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
+    putExtra(intent, ContactsContract.Intents.Insert.NAME, names != null ? names[0] : null);
+
+    putExtra(intent, ContactsContract.Intents.Insert.PHONETIC_NAME, pronunciation);
+
+    int phoneCount = Math.min(phoneNumbers != null ? phoneNumbers.length : 0, Contents.PHONE_KEYS.length);
+    for (int x = 0; x < phoneCount; x++) {
+      putExtra(intent, Contents.PHONE_KEYS[x], phoneNumbers[x]);
+      if (phoneTypes != null && x < phoneTypes.length) {
+        int type = toPhoneContractType(phoneTypes[x]);
+        if (type >= 0) {
+          intent.putExtra(Contents.PHONE_TYPE_KEYS[x], type);
+        }
+      }
+    }
+
+    int emailCount = Math.min(emails != null ? emails.length : 0, Contents.EMAIL_KEYS.length);
+    for (int x = 0; x < emailCount; x++) {
+      putExtra(intent, Contents.EMAIL_KEYS[x], emails[x]);
+      if (emailTypes != null && x < emailTypes.length) {
+        int type = toEmailContractType(emailTypes[x]);
+        if (type >= 0) {
+          intent.putExtra(Contents.EMAIL_TYPE_KEYS[x], type);
+        }
+      }
+    }
+
+    // No field for URL, birthday; use notes
+    StringBuilder aggregatedNotes = new StringBuilder();
+    if (urls != null) {
+      for (String url : urls) {
+        if (url != null && !url.isEmpty()) {
+          aggregatedNotes.append('\n').append(url);
+        }
+      }
+    }
+    for (String aNote : new String[] { birthday, note }) {
+      if (aNote != null) {
+        aggregatedNotes.append('\n').append(aNote);
+      }
+    }
+    if (nicknames != null) {
+      for (String nickname : nicknames) {
+        if (nickname != null && !nickname.isEmpty()) {
+          aggregatedNotes.append('\n').append(nickname);
+        }
+      }
+    }
+    if (geo != null) {
+      aggregatedNotes.append('\n').append(geo[0]).append(',').append(geo[1]);
+    }
+
+    if (aggregatedNotes.length() > 0) {
+      // Remove extra leading '\n'
+      putExtra(intent, ContactsContract.Intents.Insert.NOTES, aggregatedNotes.substring(1));
+    }
+    
+    putExtra(intent, ContactsContract.Intents.Insert.IM_HANDLE, instantMessenger);
+    putExtra(intent, ContactsContract.Intents.Insert.POSTAL, address);
+    if (addressType != null) {
+      int type = toAddressContractType(addressType);
+      if (type >= 0) {
+        intent.putExtra(ContactsContract.Intents.Insert.POSTAL_TYPE, type);
+      }
+    }
+    putExtra(intent, ContactsContract.Intents.Insert.COMPANY, org);
+    putExtra(intent, ContactsContract.Intents.Insert.JOB_TITLE, title);
+    launchIntent(intent);
+  }
+
+  private static int toEmailContractType(String typeString) {
+    return doToContractType(typeString, EMAIL_TYPE_STRINGS, EMAIL_TYPE_VALUES);
+  }
+
+  private static int toPhoneContractType(String typeString) {
+    return doToContractType(typeString, PHONE_TYPE_STRINGS, PHONE_TYPE_VALUES);
+  }
+
+  private static int toAddressContractType(String typeString) {
+    return doToContractType(typeString, ADDRESS_TYPE_STRINGS, ADDRESS_TYPE_VALUES);
+  }
+
+  private static int doToContractType(String typeString, String[] types, int[] values) {
+    if (typeString == null) {
+      return NO_TYPE;
+    }
+    for (int i = 0; i < types.length; i++) {
+      String type = types[i];
+      if (typeString.startsWith(type) || typeString.startsWith(type.toUpperCase(Locale.ENGLISH))) {
+        return values[i];
+      }
+    }
+    return NO_TYPE;
+  }
+
+  final void shareByEmail(String contents) {
+    sendEmailFromUri("mailto:", null, null, contents);
+  }
+
+  final void sendEmail(String address, String subject, String body) {
+    sendEmailFromUri("mailto:" + address, address, subject, body);
+  }
+
+  // Use public Intent fields rather than private GMail app fields to specify subject and body.
+  final void sendEmailFromUri(String uri, String email, String subject, String body) {
+    Intent intent = new Intent(Intent.ACTION_SEND, Uri.parse(uri));
+    if (email != null) {
+      intent.putExtra(Intent.EXTRA_EMAIL, new String[] {email});
+    }
+    putExtra(intent, Intent.EXTRA_SUBJECT, subject);
+    putExtra(intent, Intent.EXTRA_TEXT, body);
+    intent.setType("text/plain");
+    launchIntent(intent);
+  }
+
+  final void shareBySMS(String contents) {
+    sendSMSFromUri("smsto:", contents);
+  }
+
+  final void sendSMS(String phoneNumber, String body) {
+    sendSMSFromUri("smsto:" + phoneNumber, body);
+  }
+
+  final void sendSMSFromUri(String uri, String body) {
+    Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse(uri));
+    putExtra(intent, "sms_body", body);
+    // Exit the app once the SMS is sent
+    intent.putExtra("compose_mode", true);
+    launchIntent(intent);
+  }
+
+  final void sendMMS(String phoneNumber, String subject, String body) {
+    sendMMSFromUri("mmsto:" + phoneNumber, subject, body);
+  }
+
+  final void sendMMSFromUri(String uri, String subject, String body) {
+    Intent intent = new Intent(Intent.ACTION_SENDTO, Uri.parse(uri));
+    // The Messaging app needs to see a valid subject or else it will treat this an an SMS.
+    if (subject == null || subject.isEmpty()) {
+      putExtra(intent, "subject", activity.getString(R.string.msg_default_mms_subject));
+    } else {
+      putExtra(intent, "subject", subject);
+    }
+    putExtra(intent, "sms_body", body);
+    intent.putExtra("compose_mode", true);
+    launchIntent(intent);
+  }
+
+  final void dialPhone(String phoneNumber) {
+    launchIntent(new Intent(Intent.ACTION_DIAL, Uri.parse("tel:" + phoneNumber)));
+  }
+
+  final void dialPhoneFromUri(String uri) {
+    launchIntent(new Intent(Intent.ACTION_DIAL, Uri.parse(uri)));
+  }
+
+  final void openMap(String geoURI) {
+    launchIntent(new Intent(Intent.ACTION_VIEW, Uri.parse(geoURI)));
+  }
+
+  /**
+   * Do a geo search using the address as the query.
+   *
+   * @param address The address to find
+   * @param title An optional title, e.g. the name of the business at this address
+   */
+  final void searchMap(String address, String title) {
+    String query = address;
+    if (title != null && !title.isEmpty()) {
+      query += " (" + title + ')';
+    }
+    launchIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("geo:0,0?q=" + Uri.encode(query))));
+  }
+
+  final void getDirections(double latitude, double longitude) {
+    launchIntent(new Intent(Intent.ACTION_VIEW, Uri.parse("http://maps.google." +
+        LocaleManager.getCountryTLD(activity) + "/maps?f=d&daddr=" + latitude + ',' + longitude)));
+  }
+
+  // Uses the mobile-specific version of Product Search, which is formatted for small screens.
+  final void openProductSearch(String upc) {
+    Uri uri = Uri.parse("http://www.google." + LocaleManager.getProductSearchCountryTLD(activity) +
+        "/m/products?q=" + upc + "&source=zxing");
+    launchIntent(new Intent(Intent.ACTION_VIEW, uri));
+  }
+
+  final void openBookSearch(String isbn) {
+    Uri uri = Uri.parse("http://books.google." + LocaleManager.getBookSearchCountryTLD(activity) +
+        "/books?vid=isbn" + isbn);
+    launchIntent(new Intent(Intent.ACTION_VIEW, uri));
+  }
+
+  final void searchBookContents(String isbnOrUrl) {
+    Intent intent = new Intent(Intents.SearchBookContents.ACTION);
+    intent.setClassName(activity, SearchBookContentsActivity.class.getName());
+    putExtra(intent, Intents.SearchBookContents.ISBN, isbnOrUrl);
+    launchIntent(intent);
+  }
+
+  final void openURL(String url) {
+    // Strangely, some Android browsers don't seem to register to handle HTTP:// or HTTPS://.
+    // Lower-case these as it should always be OK to lower-case these schemes.
+    if (url.startsWith("HTTP://")) {
+      url = "http" + url.substring(4);
+    } else if (url.startsWith("HTTPS://")) {
+      url = "https" + url.substring(5);
+    }
+    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+    try {
+      launchIntent(intent);
+    } catch (ActivityNotFoundException ignored) {
+      Log.w(TAG, "Nothing available to handle " + intent);
+    }
+  }
+
+  final void webSearch(String query) {
+    Intent intent = new Intent(Intent.ACTION_WEB_SEARCH);
+    intent.putExtra("query", query);
+    launchIntent(intent);
+  }
+
+  /**
+   * Like {@link #launchIntent(Intent)} but will tell you if it is not handle-able
+   * via {@link ActivityNotFoundException}.
+   *
+   * @throws ActivityNotFoundException
+   */
+  final void rawLaunchIntent(Intent intent) {
+    if (intent != null) {
+      intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+      Log.d(TAG, "Launching intent: " + intent + " with extras: " + intent.getExtras());
+      activity.startActivity(intent);
+    }
+  }
+
+  /**
+   * Like {@link #rawLaunchIntent(Intent)} but will show a user dialog if nothing is available to handle.
+   */
+  final void launchIntent(Intent intent) {
+    try {
+      rawLaunchIntent(intent);
+    } catch (ActivityNotFoundException ignored) {
+      AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+      builder.setTitle(R.string.app_name);
+      builder.setMessage(R.string.msg_intent_failed);
+      builder.setPositiveButton(R.string.button_ok, null);
+      builder.show();
+    }
+  }
+
+  private static void putExtra(Intent intent, String key, String value) {
+    if (value != null && !value.isEmpty()) {
+      intent.putExtra(key, value);
+    }
+  }
+
+  private String parseCustomSearchURL() {
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+    String customProductSearch = prefs.getString(PreferencesActivity.KEY_CUSTOM_PRODUCT_SEARCH,
+        null);
+    if (customProductSearch != null && customProductSearch.trim().isEmpty()) {
+      return null;
+    }
+    return customProductSearch;
+  }
+
+  final String fillInCustomSearchURL(String text) {
+    if (customProductSearch == null) {
+      return text; // ?
+    }
+    try {
+      text = URLEncoder.encode(text, "UTF-8");
+    } catch (UnsupportedEncodingException e) {
+      // can't happen; UTF-8 is always supported. Continue, I guess, without encoding      
+    }
+    String url = customProductSearch.replace("%s", text);
+    if (rawResult != null) {
+      url = url.replace("%f", rawResult.getBarcodeFormat().toString());
+      if (url.contains("%t")) {
+        ParsedResult parsedResultAgain = ResultParser.parseResult(rawResult);
+        url = url.replace("%t", parsedResultAgain.getType().toString());
+      }
+    }
+    return url;
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultHandlerFactory.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultHandlerFactory.java
new file mode 100644
index 00000000..a31d0898
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/ResultHandlerFactory.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import com.google.zxing.Result;
+import com.google.zxing.client.android.CaptureActivity;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.ResultParser;
+
+/**
+ * Manufactures Android-specific handlers based on the barcode content's type.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class ResultHandlerFactory {
+  private ResultHandlerFactory() {
+  }
+
+  public static ResultHandler makeResultHandler(CaptureActivity activity, Result rawResult) {
+    ParsedResult result = parseResult(rawResult);
+    switch (result.getType()) {
+      case ADDRESSBOOK:
+        return new AddressBookResultHandler(activity, result);
+      case EMAIL_ADDRESS:
+        return new EmailAddressResultHandler(activity, result);
+      case PRODUCT:
+        return new ProductResultHandler(activity, result, rawResult);
+      case URI:
+        return new URIResultHandler(activity, result);
+      case WIFI:
+        return new WifiResultHandler(activity, result);
+      case GEO:
+        return new GeoResultHandler(activity, result);
+      case TEL:
+        return new TelResultHandler(activity, result);
+      case SMS:
+        return new SMSResultHandler(activity, result);
+      case CALENDAR:
+        return new CalendarResultHandler(activity, result);
+      case ISBN:
+        return new ISBNResultHandler(activity, result, rawResult);
+      default:
+        return new TextResultHandler(activity, result, rawResult);
+    }
+  }
+
+  private static ParsedResult parseResult(Result rawResult) {
+    return ResultParser.parseResult(rawResult);
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/SMSResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/SMSResultHandler.java
new file mode 100644
index 00000000..ccf99023
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/SMSResultHandler.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.SMSParsedResult;
+
+import android.app.Activity;
+import android.telephony.PhoneNumberUtils;
+
+/**
+ * Handles SMS addresses, offering a choice of composing a new SMS or MMS message.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class SMSResultHandler extends ResultHandler {
+  private static final int[] buttons = {
+      R.string.button_sms,
+      R.string.button_mms
+  };
+
+  public SMSResultHandler(Activity activity, ParsedResult result) {
+    super(activity, result);
+  }
+
+  @Override
+  public int getButtonCount() {
+    return buttons.length;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    SMSParsedResult smsResult = (SMSParsedResult) getResult();
+    switch (index) {
+      case 0:
+        // Don't know of a way yet to express a SENDTO intent with multiple recipients
+        sendSMS(smsResult.getNumbers()[0], smsResult.getBody());
+        break;
+      case 1:
+        sendMMS(smsResult.getNumbers()[0], smsResult.getSubject(), smsResult.getBody());
+        break;
+    }
+  }
+
+  @Override
+  public CharSequence getDisplayContents() {
+    SMSParsedResult smsResult = (SMSParsedResult) getResult();
+    String[] rawNumbers = smsResult.getNumbers();
+    String[] formattedNumbers = new String[rawNumbers.length];
+    for (int i = 0; i < rawNumbers.length; i++) {
+      formattedNumbers[i] = PhoneNumberUtils.formatNumber(rawNumbers[i]);
+    }
+    StringBuilder contents = new StringBuilder(50);
+    ParsedResult.maybeAppend(formattedNumbers, contents);
+    ParsedResult.maybeAppend(smsResult.getSubject(), contents);
+    ParsedResult.maybeAppend(smsResult.getBody(), contents);
+    return contents.toString();
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_sms;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/TelResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/TelResultHandler.java
new file mode 100644
index 00000000..2be0fbb2
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/TelResultHandler.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.TelParsedResult;
+
+import android.app.Activity;
+import android.telephony.PhoneNumberUtils;
+
+/**
+ * Offers relevant actions for telephone numbers.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class TelResultHandler extends ResultHandler {
+  private static final int[] buttons = {
+      R.string.button_dial,
+      R.string.button_add_contact
+  };
+
+  public TelResultHandler(Activity activity, ParsedResult result) {
+    super(activity, result);
+  }
+
+  @Override
+  public int getButtonCount() {
+    return buttons.length;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    TelParsedResult telResult = (TelParsedResult) getResult();
+    switch (index) {
+      case 0:
+        dialPhoneFromUri(telResult.getTelURI());
+        // When dialer comes up, it allows underlying display activity to continue or something,
+        // but app can't get camera in this state. Avoid issues by just quitting, only in the
+        // case of a phone number
+        getActivity().finish();
+        break;
+      case 1:
+        String[] numbers = new String[1];
+        numbers[0] = telResult.getNumber();
+        addPhoneOnlyContact(numbers, null);
+        break;
+    }
+  }
+
+  // Overriden so we can take advantage of Android's phone number hyphenation routines.
+  @Override
+  public CharSequence getDisplayContents() {
+    String contents = getResult().getDisplayResult();
+    contents = contents.replace("\r", "");
+    return PhoneNumberUtils.formatNumber(contents);
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_tel;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/TextResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/TextResultHandler.java
new file mode 100644
index 00000000..1458f571
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/TextResultHandler.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import com.google.zxing.Result;
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.ParsedResult;
+
+import android.app.Activity;
+
+/**
+ * This class handles TextParsedResult as well as unknown formats. It's the fallback handler.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class TextResultHandler extends ResultHandler {
+
+  private static final int[] buttons = {
+      R.string.button_web_search,
+      R.string.button_share_by_email,
+      R.string.button_share_by_sms,
+      R.string.button_custom_product_search,
+  };
+
+  public TextResultHandler(Activity activity, ParsedResult result, Result rawResult) {
+    super(activity, result, rawResult);
+  }
+
+  @Override
+  public int getButtonCount() {
+    return hasCustomProductSearch() ? buttons.length : buttons.length - 1;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    String text = getResult().getDisplayResult();
+    switch (index) {
+      case 0:
+        webSearch(text);
+        break;
+      case 1:
+        shareByEmail(text);
+        break;
+      case 2:
+        shareBySMS(text);
+        break;
+      case 3:
+        openURL(fillInCustomSearchURL(text));
+        break;
+    }
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_text;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/URIResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/URIResultHandler.java
new file mode 100644
index 00000000..010ff77e
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/URIResultHandler.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import com.google.zxing.client.android.LocaleManager;
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.URIParsedResult;
+
+import android.app.Activity;
+
+import java.util.Locale;
+
+/**
+ * Offers appropriate actions for URLS.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
+ */
+public final class URIResultHandler extends ResultHandler {
+  // URIs beginning with entries in this array will not be saved to history or copied to the
+  // clipboard for security.
+  private static final String[] SECURE_PROTOCOLS = {
+    "otpauth:"
+  };
+
+  private static final int[] buttons = {
+      R.string.button_open_browser,
+      R.string.button_share_by_email,
+      R.string.button_share_by_sms,
+      R.string.button_search_book_contents,
+  };
+
+  public URIResultHandler(Activity activity, ParsedResult result) {
+    super(activity, result);
+  }
+
+  @Override
+  public int getButtonCount() {
+    if (LocaleManager.isBookSearchUrl(((URIParsedResult) getResult()).getURI())) {
+      return buttons.length;
+    }
+    return buttons.length - 1;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return buttons[index];
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    URIParsedResult uriResult = (URIParsedResult) getResult();
+    String uri = uriResult.getURI();
+    switch (index) {
+      case 0:
+        openURL(uri);
+        break;
+      case 1:
+        shareByEmail(uri);
+        break;
+      case 2:
+        shareBySMS(uri);
+        break;
+      case 3:
+        searchBookContents(uri);
+        break;
+    }
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_uri;
+  }
+
+  @Override
+  public boolean areContentsSecure() {
+    URIParsedResult uriResult = (URIParsedResult) getResult();
+    String uri = uriResult.getURI().toLowerCase(Locale.ENGLISH);
+    for (String secure : SECURE_PROTOCOLS) {
+      if (uri.startsWith(secure)) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/result/WifiResultHandler.java b/src/java/PluginQR/src/com/google/zxing/client/android/result/WifiResultHandler.java
new file mode 100644
index 00000000..8dd15b7d
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/result/WifiResultHandler.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.result;
+
+import android.app.Activity;
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.os.AsyncTask;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.google.zxing.client.android.CaptureActivity;
+import keepass2android.plugin.qr.R;
+import com.google.zxing.client.android.wifi.WifiConfigManager;
+import com.google.zxing.client.result.ParsedResult;
+import com.google.zxing.client.result.WifiParsedResult;
+
+/**
+ * Handles address book entries.
+ *
+ * @author Vikram Aggarwal
+ * @author Sean Owen
+ */
+public final class WifiResultHandler extends ResultHandler {
+
+  private static final String TAG = WifiResultHandler.class.getSimpleName();
+
+  private final CaptureActivity parent;
+
+  public WifiResultHandler(CaptureActivity activity, ParsedResult result) {
+    super(activity, result);
+    parent = activity;
+  }
+
+  @Override
+  public int getButtonCount() {
+    // We just need one button, and that is to configure the wireless.  This could change in the future.
+    return 1;
+  }
+
+  @Override
+  public int getButtonText(int index) {
+    return R.string.button_wifi;
+  }
+
+  @Override
+  public void handleButtonPress(int index) {
+    if (index == 0) {
+      WifiParsedResult wifiResult = (WifiParsedResult) getResult();
+      WifiManager wifiManager = (WifiManager) getActivity().getSystemService(Context.WIFI_SERVICE);
+      if (wifiManager == null) {
+        Log.w(TAG, "No WifiManager available from device");
+        return;
+      }
+      final Activity activity = getActivity();
+      activity.runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          Toast.makeText(activity.getApplicationContext(), R.string.wifi_changing_network, Toast.LENGTH_SHORT).show();
+        }
+      });
+      new WifiConfigManager(wifiManager).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, wifiResult);
+      parent.restartPreviewAfterDelay(0L);
+    }
+  }
+
+  // Display the name of the network and the network type to the user.
+  @Override
+  public CharSequence getDisplayContents() {
+    WifiParsedResult wifiResult = (WifiParsedResult) getResult();
+    StringBuilder contents = new StringBuilder(50);
+    String wifiLabel = parent.getString(R.string.wifi_ssid_label);
+    ParsedResult.maybeAppend(wifiLabel + '\n' + wifiResult.getSsid(), contents);
+    String typeLabel = parent.getString(R.string.wifi_type_label);
+    ParsedResult.maybeAppend(typeLabel + '\n' + wifiResult.getNetworkEncryption(), contents);
+    return contents.toString();
+  }
+
+  @Override
+  public int getDisplayTitle() {
+    return R.string.result_wifi;
+  }
+}
\ No newline at end of file
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/wifi/NetworkType.java b/src/java/PluginQR/src/com/google/zxing/client/android/wifi/NetworkType.java
new file mode 100644
index 00000000..809e3c6c
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/wifi/NetworkType.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.wifi;
+
+enum NetworkType {
+
+  WEP,
+  WPA,
+  NO_PASSWORD;
+
+  static NetworkType forIntentValue(String networkTypeString) {
+    if (networkTypeString == null) {
+      return NO_PASSWORD;
+    }
+    if ("WPA".equals(networkTypeString)) {
+      return WPA;
+    }
+    if ("WEP".equals(networkTypeString)) {
+      return WEP;
+    }
+    if ("nopass".equals(networkTypeString)) {
+      return NO_PASSWORD;
+    }
+    throw new IllegalArgumentException(networkTypeString);
+  }
+
+}
diff --git a/src/java/PluginQR/src/com/google/zxing/client/android/wifi/WifiConfigManager.java b/src/java/PluginQR/src/com/google/zxing/client/android/wifi/WifiConfigManager.java
new file mode 100644
index 00000000..24e1f8ef
--- /dev/null
+++ b/src/java/PluginQR/src/com/google/zxing/client/android/wifi/WifiConfigManager.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2011 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.client.android.wifi;
+
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.AsyncTask;
+import android.util.Log;
+
+import java.util.regex.Pattern;
+
+import com.google.zxing.client.result.WifiParsedResult;
+
+/**
+ * @author Vikram Aggarwal
+ * @author Sean Owen
+ */
+public final class WifiConfigManager extends AsyncTask<WifiParsedResult,Object,Object> {
+
+  private static final String TAG = WifiConfigManager.class.getSimpleName();
+
+  private static final Pattern HEX_DIGITS = Pattern.compile("[0-9A-Fa-f]+");
+
+  private final WifiManager wifiManager;
+
+  public WifiConfigManager(WifiManager wifiManager) {
+    this.wifiManager = wifiManager;
+  }
+
+  @Override
+  protected Object doInBackground(WifiParsedResult... args) {
+    WifiParsedResult theWifiResult = args[0];
+    // Start WiFi, otherwise nothing will work
+    if (!wifiManager.isWifiEnabled()) {
+      Log.i(TAG, "Enabling wi-fi...");
+      if (wifiManager.setWifiEnabled(true)) {
+        Log.i(TAG, "Wi-fi enabled");
+      } else {
+        Log.w(TAG, "Wi-fi could not be enabled!");
+        return null;
+      }
+      // This happens very quickly, but need to wait for it to enable. A little busy wait?
+      int count = 0;
+      while (!wifiManager.isWifiEnabled()) {
+        if (count >= 10) {
+          Log.i(TAG, "Took too long to enable wi-fi, quitting");
+          return null;
+        }
+        Log.i(TAG, "Still waiting for wi-fi to enable...");
+        try {
+          Thread.sleep(1000L);
+        } catch (InterruptedException ie) {
+          // continue
+        }
+        count++;
+      }
+    }
+    String networkTypeString = theWifiResult.getNetworkEncryption();
+    NetworkType networkType;
+    try {
+      networkType = NetworkType.forIntentValue(networkTypeString);
+    } catch (IllegalArgumentException ignored) {
+      Log.w(TAG, "Bad network type; see NetworkType values: " + networkTypeString);
+      return null;
+    }
+    if (networkType == NetworkType.NO_PASSWORD) {
+      changeNetworkUnEncrypted(wifiManager, theWifiResult);
+    } else {
+      String password = theWifiResult.getPassword();
+      if (password != null && !password.isEmpty()) {
+        if (networkType == NetworkType.WEP) {
+          changeNetworkWEP(wifiManager, theWifiResult);
+        } else if (networkType == NetworkType.WPA) {
+          changeNetworkWPA(wifiManager, theWifiResult);
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Update the network: either create a new network or modify an existing network
+   * @param config the new network configuration
+   */
+  private static void updateNetwork(WifiManager wifiManager, WifiConfiguration config) {
+    Integer foundNetworkID = findNetworkInExistingConfig(wifiManager, config.SSID);
+    if (foundNetworkID != null) {
+      Log.i(TAG, "Removing old configuration for network " + config.SSID);
+      wifiManager.removeNetwork(foundNetworkID);
+      wifiManager.saveConfiguration();
+    }
+    int networkId = wifiManager.addNetwork(config);
+    if (networkId >= 0) {
+      // Try to disable the current network and start a new one.
+      if (wifiManager.enableNetwork(networkId, true)) {
+        Log.i(TAG, "Associating to network " + config.SSID);
+        wifiManager.saveConfiguration();
+      } else {
+        Log.w(TAG, "Failed to enable network " + config.SSID);
+      }
+    } else {
+      Log.w(TAG, "Unable to add network " + config.SSID);
+    }
+  }
+
+  private static WifiConfiguration changeNetworkCommon(WifiParsedResult wifiResult) {
+    WifiConfiguration config = new WifiConfiguration();
+    config.allowedAuthAlgorithms.clear();
+    config.allowedGroupCiphers.clear();
+    config.allowedKeyManagement.clear();
+    config.allowedPairwiseCiphers.clear();
+    config.allowedProtocols.clear();
+    // Android API insists that an ascii SSID must be quoted to be correctly handled.
+    config.SSID = quoteNonHex(wifiResult.getSsid());
+    config.hiddenSSID = wifiResult.isHidden();
+    return config;
+  }
+
+  // Adding a WEP network
+  private static void changeNetworkWEP(WifiManager wifiManager, WifiParsedResult wifiResult) {
+    WifiConfiguration config = changeNetworkCommon(wifiResult);
+    config.wepKeys[0] = quoteNonHex(wifiResult.getPassword(), 10, 26, 58);
+    config.wepTxKeyIndex = 0;
+    config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.SHARED);
+    config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
+    config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
+    config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
+    config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.WEP40);
+    config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.WEP104);
+    updateNetwork(wifiManager, config);
+  }
+
+  // Adding a WPA or WPA2 network
+  private static void changeNetworkWPA(WifiManager wifiManager, WifiParsedResult wifiResult) {
+    WifiConfiguration config = changeNetworkCommon(wifiResult);
+    // Hex passwords that are 64 bits long are not to be quoted.
+    config.preSharedKey = quoteNonHex(wifiResult.getPassword(), 64);
+    config.allowedAuthAlgorithms.set(WifiConfiguration.AuthAlgorithm.OPEN);
+    config.allowedProtocols.set(WifiConfiguration.Protocol.WPA); // For WPA
+    config.allowedProtocols.set(WifiConfiguration.Protocol.RSN); // For WPA2
+    config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
+    config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_EAP);
+    config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.TKIP);
+    config.allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.CCMP);
+    config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.TKIP);
+    config.allowedGroupCiphers.set(WifiConfiguration.GroupCipher.CCMP);
+    updateNetwork(wifiManager, config);
+  }
+
+  // Adding an open, unsecured network
+  private static void changeNetworkUnEncrypted(WifiManager wifiManager, WifiParsedResult wifiResult) {
+    WifiConfiguration config = changeNetworkCommon(wifiResult);
+    config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
+    updateNetwork(wifiManager, config);
+  }
+
+  private static Integer findNetworkInExistingConfig(WifiManager wifiManager, String ssid) {
+    Iterable<WifiConfiguration> existingConfigs = wifiManager.getConfiguredNetworks();
+    for (WifiConfiguration existingConfig : existingConfigs) {
+      if (existingConfig.SSID.equals(ssid)) {
+        return existingConfig.networkId;
+      }
+    }
+    return null;
+  }
+
+  private static String quoteNonHex(String value, int... allowedLengths) {
+    return isHexOfLength(value, allowedLengths) ? value : convertToQuotedString(value);
+  }
+
+  /**
+   * Encloses the incoming string inside double quotes, if it isn't already quoted.
+   * @param s the input string
+   * @return a quoted string, of the form "input".  If the input string is null, it returns null
+   * as well.
+   */
+  private static String convertToQuotedString(String s) {
+    if (s == null || s.isEmpty()) {
+      return null;
+    }
+    // If already quoted, return as-is
+    if (s.charAt(0) == '"' && s.charAt(s.length() - 1) == '"') {
+      return s;
+    }
+    return '\"' + s + '\"';
+  }
+
+  /**
+   * @param value input to check
+   * @param allowedLengths allowed lengths, if any
+   * @return true if value is a non-null, non-empty string of hex digits, and if allowed lengths are given, has
+   *  an allowed length
+   */
+  private static boolean isHexOfLength(CharSequence value, int... allowedLengths) {
+    if (value == null || !HEX_DIGITS.matcher(value).matches()) {
+      return false;
+    }
+    if (allowedLengths.length == 0) {
+      return true;
+    }
+    for (int length : allowedLengths) {
+      if (value.length() == length) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+}
diff --git a/src/java/PluginQR/src/keepass2android/plugin/qr/AccessReceiver.java b/src/java/PluginQR/src/keepass2android/plugin/qr/AccessReceiver.java
new file mode 100644
index 00000000..d9db29c7
--- /dev/null
+++ b/src/java/PluginQR/src/keepass2android/plugin/qr/AccessReceiver.java
@@ -0,0 +1,17 @@
+package keepass2android.plugin.qr;
+
+import java.util.ArrayList;
+
+import keepass2android.pluginsdk.PluginAccessBroadcastReceiver;
+import keepass2android.pluginsdk.Strings;
+
+public class AccessReceiver extends PluginAccessBroadcastReceiver {
+
+	@Override
+	public ArrayList<String> getScopes() {
+		ArrayList<String> scopes = new ArrayList<String>();
+		scopes.add(Strings.SCOPE_CURRENT_ENTRY);
+		return scopes;
+	}
+
+}
diff --git a/src/java/PluginQR/src/keepass2android/plugin/qr/ActionReceiver.java b/src/java/PluginQR/src/keepass2android/plugin/qr/ActionReceiver.java
new file mode 100644
index 00000000..3b65fd30
--- /dev/null
+++ b/src/java/PluginQR/src/keepass2android/plugin/qr/ActionReceiver.java
@@ -0,0 +1,49 @@
+package keepass2android.plugin.qr;
+
+import org.json.JSONObject;
+
+import android.content.Intent;
+import android.widget.Toast;
+import keepass2android.pluginsdk.PluginAccessException;
+import keepass2android.pluginsdk.PluginActionBroadcastReceiver;
+import keepass2android.pluginsdk.Strings;
+
+public class ActionReceiver extends PluginActionBroadcastReceiver{
+	@Override
+	protected void openEntry(OpenEntry oe) {
+		try {
+			oe.addEntryAction(oe.getContext().getString(R.string.action_show_qr),
+					R.drawable.qrcode, null);
+			
+			for (String field: oe.getEntryFields().keySet())
+			{
+				oe.addEntryFieldAction("keepass2android.plugin.qr.show", Strings.PREFIX_STRING+field, oe.getContext().getString(R.string.action_show_qr),
+					R.drawable.qrcode, null);
+			}
+		} catch (PluginAccessException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	@Override
+	protected void actionSelected(ActionSelected actionSelected) {
+		Intent i = new Intent(actionSelected.getContext(), QRActivity.class);
+		i.putExtra(Strings.EXTRA_ENTRY_OUTPUT_DATA, new JSONObject(actionSelected.getEntryFields()).toString());
+		i.putExtra(Strings.EXTRA_FIELD_ID, actionSelected.getFieldId());
+		i.putExtra(Strings.EXTRA_SENDER, actionSelected.getHostPackage());
+		i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		actionSelected.getContext().startActivity(i);
+	}
+	
+	@Override
+	protected void entryOutputModified(EntryOutputModified eom) {
+		try {
+			eom.addEntryFieldAction("keepass2android.plugin.qr.show", eom.getModifiedFieldId(), eom.getContext().getString(R.string.action_show_qr),
+					R.drawable.qrcode, null);
+		} catch (PluginAccessException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	
+}
diff --git a/src/java/PluginQR/src/keepass2android/plugin/qr/Contents.java b/src/java/PluginQR/src/keepass2android/plugin/qr/Contents.java
new file mode 100644
index 00000000..be555e3c
--- /dev/null
+++ b/src/java/PluginQR/src/keepass2android/plugin/qr/Contents.java
@@ -0,0 +1,74 @@
+//
+// * Copyright (C) 2008 ZXing authors
+// * 
+// * Licensed under the Apache License, Version 2.0 (the "License");
+// * you may not use this file except in compliance with the License.
+// * You may obtain a copy of the License at
+// * 
+// * http://www.apache.org/licenses/LICENSE-2.0
+// * 
+// * Unless required by applicable law or agreed to in writing, software
+// * distributed under the License is distributed on an "AS IS" BASIS,
+// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// * See the License for the specific language governing permissions and
+// * limitations under the License.
+// 
+package keepass2android.plugin.qr;
+
+import android.provider.ContactsContract;
+
+public final class Contents {
+    private Contents() {
+    }
+
+    public static final class Type {
+
+     // Plain text. Use Intent.putExtra(DATA, string). This can be used for URLs too, but string
+     // must include "http://" or "https://".
+        public static final String TEXT = "TEXT_TYPE";
+
+        // An email type. Use Intent.putExtra(DATA, string) where string is the email address.
+        public static final String EMAIL = "EMAIL_TYPE";
+
+        // Use Intent.putExtra(DATA, string) where string is the phone number to call.
+        public static final String PHONE = "PHONE_TYPE";
+
+        // An SMS type. Use Intent.putExtra(DATA, string) where string is the number to SMS.
+        public static final String SMS = "SMS_TYPE";
+
+        public static final String CONTACT = "CONTACT_TYPE";
+
+        public static final String LOCATION = "LOCATION_TYPE";
+
+        private Type() {
+        }
+    }
+
+    public static final String URL_KEY = "URL_KEY";
+
+    public static final String NOTE_KEY = "NOTE_KEY";
+
+    // When using Type.CONTACT, these arrays provide the keys for adding or retrieving multiple phone numbers and addresses.
+    public static final String[] PHONE_KEYS = {
+            ContactsContract.Intents.Insert.PHONE, ContactsContract.Intents.Insert.SECONDARY_PHONE,
+            ContactsContract.Intents.Insert.TERTIARY_PHONE
+    };
+
+    public static final String[] PHONE_TYPE_KEYS = {
+            ContactsContract.Intents.Insert.PHONE_TYPE,
+            ContactsContract.Intents.Insert.SECONDARY_PHONE_TYPE,
+            ContactsContract.Intents.Insert.TERTIARY_PHONE_TYPE
+    };
+
+    public static final String[] EMAIL_KEYS = {
+            ContactsContract.Intents.Insert.EMAIL, ContactsContract.Intents.Insert.SECONDARY_EMAIL,
+            ContactsContract.Intents.Insert.TERTIARY_EMAIL
+    };
+
+    public static final String[] EMAIL_TYPE_KEYS = {
+            ContactsContract.Intents.Insert.EMAIL_TYPE,
+            ContactsContract.Intents.Insert.SECONDARY_EMAIL_TYPE,
+            ContactsContract.Intents.Insert.TERTIARY_EMAIL_TYPE
+    };
+}
+
diff --git a/src/java/PluginQR/src/keepass2android/plugin/qr/MainActivity.java b/src/java/PluginQR/src/keepass2android/plugin/qr/MainActivity.java
new file mode 100644
index 00000000..2f202db1
--- /dev/null
+++ b/src/java/PluginQR/src/keepass2android/plugin/qr/MainActivity.java
@@ -0,0 +1,156 @@
+package keepass2android.plugin.qr;
+
+import keepass2android.pluginsdk.AccessManager;
+import keepass2android.pluginsdk.Strings;
+
+import com.google.zxing.client.android.CaptureActivity;
+
+import android.app.Activity;
+import android.app.ActionBar;
+import android.app.Fragment;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.os.Build;
+
+public class MainActivity extends Activity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_main);
+
+		if (savedInstanceState == null) {
+			getFragmentManager().beginTransaction()
+					.add(R.id.container, new PlaceholderFragment()).commit();
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.main, menu);
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		// Handle action bar item clicks here. The action bar will
+		// automatically handle clicks on the Home/Up button, so long
+		// as you specify a parent activity in AndroidManifest.xml.
+		int id = item.getItemId();
+		if (id == R.id.action_settings) {
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+	
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+	
+	    if (requestCode == 0) {
+	        if (resultCode == RESULT_OK) {
+	            String contents = intent.getStringExtra("SCAN_RESULT");
+	            Log.d("QR", contents);
+	
+	           // Toast.makeText(this, contents, Toast.LENGTH_SHORT).show();
+	           } else if (resultCode == RESULT_CANCELED) {
+	            // Handle cancel
+	
+	        }
+	        return;
+	
+	    }
+	    super.onActivityResult(requestCode, resultCode, intent);
+	
+	}
+
+	/**
+	 * A placeholder fragment containing a simple view.
+	 */
+	public static class PlaceholderFragment extends Fragment {
+
+		private View mRootView;
+
+		public PlaceholderFragment() {
+		}
+		
+		@Override
+		public void onResume() {
+			
+			mRootView.findViewById(R.id.progressBar1).setVisibility(View.GONE);
+			if (AccessManager.getAllHostPackages(getActivity()).isEmpty())
+			{
+				((TextView)mRootView.findViewById(R.id.tvHostStatus)).setText(getString(R.string.not_enabled_as_plugin));
+				mRootView.findViewById(R.id.btnConfigPlugins).setVisibility(View.VISIBLE);
+			}
+			else
+			{
+				((TextView)mRootView.findViewById(R.id.tvHostStatus)).setText(getString(R.string.enabled_as_plugin));
+				mRootView.findViewById(R.id.btnConfigPlugins).setVisibility(View.INVISIBLE);
+			}
+			
+			super.onResume();
+		}
+
+		@Override
+		public View onCreateView(LayoutInflater inflater, ViewGroup container,
+				Bundle savedInstanceState) {
+			mRootView = inflater.inflate(R.layout.fragment_main, container,
+					false);
+			
+			mRootView.findViewById(R.id.btnScanQRCode).setOnClickListener(new OnClickListener() {
+				
+				@Override
+				public void onClick(View v) {
+					mRootView.findViewById(R.id.progressBar1).setVisibility(View.VISIBLE);
+					Intent i = new Intent(getActivity(), CaptureActivity.class);
+					i.setAction("com.google.zxing.client.android.SCAN");
+					getActivity().startActivityForResult(i, 0);
+					
+				}
+			});
+			
+			
+			mRootView.findViewById(R.id.btnShowQR).setOnClickListener(new OnClickListener() {
+				
+				@Override
+				public void onClick(View v) {
+					//todo
+					Log.d("QR", "ShowqR");
+				}
+			});
+			
+			mRootView.findViewById(R.id.btnConfigPlugins).setOnClickListener(new OnClickListener() {
+				
+				@Override
+				public void onClick(View v) {
+					try
+					{
+						Intent i = new Intent(Strings.ACTION_EDIT_PLUGIN_SETTINGS);
+						i.putExtra(Strings.EXTRA_PLUGIN_PACKAGE, getActivity().getPackageName());
+						startActivityForResult(i, 123);
+					}
+					catch(Exception e)
+					{
+						e.printStackTrace();
+					}
+
+					
+				}
+			});
+			
+			return mRootView;
+		}
+	}
+
+}
diff --git a/src/java/PluginQR/src/keepass2android/plugin/qr/QRActivity.java b/src/java/PluginQR/src/keepass2android/plugin/qr/QRActivity.java
new file mode 100644
index 00000000..de343c18
--- /dev/null
+++ b/src/java/PluginQR/src/keepass2android/plugin/qr/QRActivity.java
@@ -0,0 +1,455 @@
+package keepass2android.plugin.qr;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import keepass2android.pluginsdk.AccessManager;
+import keepass2android.pluginsdk.KeepassDefs;
+import keepass2android.pluginsdk.Strings;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.WriterException;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.app.Activity;
+import android.app.ActionBar;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Point;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Display;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.animation.DecelerateInterpolator;
+import android.widget.Adapter;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.os.Build;
+import android.preference.Preference;
+import android.preference.PreferenceManager;
+
+public class QRActivity extends Activity {
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		if ((getIntent() != null) && (getIntent().getStringExtra(Strings.EXTRA_ENTRY_OUTPUT_DATA)!= null))
+		Log.d("QR", getIntent().getStringExtra(Strings.EXTRA_ENTRY_OUTPUT_DATA));
+		
+		setContentView(R.layout.activity_qr);
+
+		if (savedInstanceState == null) {
+			getFragmentManager().beginTransaction()
+					.add(R.id.container, new PlaceholderFragment()).commit();
+		}
+		
+		
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+
+		// Inflate the menu; this adds items to the action bar if it is present.
+		getMenuInflater().inflate(R.menu.qr, menu);
+		return true;
+	}
+
+	/**
+	 * A placeholder fragment containing a simple view.
+	 */
+	public static class PlaceholderFragment extends Fragment {
+		
+		// Hold a reference to the current animator,
+	    // so that it can be canceled mid-way.
+	    private Animator mCurrentAnimator;
+
+
+		private int mShortAnimationDuration;
+		
+		Bitmap mBitmap;
+		ImageView mImageView;
+		TextView mErrorView;
+		HashMap<String, String> mEntryOutput;
+		ArrayList<String> mFieldList = new ArrayList<String>();
+		Spinner mSpinner;
+		String mHostname;
+
+		private CheckBox mCbIncludeLabel;
+
+
+		private Resources kp2aRes;
+
+		public PlaceholderFragment() {
+		}
+		
+		protected HashMap<String, String> getEntryFieldsFromIntent(Intent intent)  
+		{
+			HashMap<String, String> res = new HashMap<String, String>();
+			try {
+				JSONObject json = new JSONObject(intent.getStringExtra(Strings.EXTRA_ENTRY_OUTPUT_DATA));
+				for(Iterator<String> iter = json.keys();iter.hasNext();) {
+				    String key = iter.next();
+				    String value = json.get(key).toString();
+				    res.put(key, value);
+				}
+				
+			} catch (JSONException e) {
+				e.printStackTrace();
+			} catch (NullPointerException e) {
+				e.printStackTrace();
+			} 
+			return res;
+		}
+		
+		@Override
+		public View onCreateView(LayoutInflater inflater, ViewGroup container,
+				Bundle savedInstanceState) {
+			View rootView = inflater.inflate(R.layout.fragment_qr, container,
+					false);
+			
+			mSpinner = (Spinner) rootView.findViewById(R.id.spinner);
+			
+			mEntryOutput = getEntryFieldsFromIntent(getActivity().getIntent());
+			
+			ArrayList<String> spinnerItems = new ArrayList<String>();
+			spinnerItems.add(getActivity().getString(R.string.all_fields));
+			mFieldList.add(null); //all fields
+			
+			try {
+				mHostname = getActivity().getIntent().getStringExtra(Strings.EXTRA_SENDER);
+				kp2aRes = getActivity().getPackageManager().getResourcesForApplication(mHostname);
+			} catch (NameNotFoundException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+			addIfExists(KeepassDefs.UserNameField, "entry_user_name", spinnerItems);
+			addIfExists(KeepassDefs.UrlField, "entry_url", spinnerItems);
+			addIfExists(KeepassDefs.PasswordField, "entry_password", spinnerItems);
+			addIfExists(KeepassDefs.TitleField, "entry_title", spinnerItems);
+			addIfExists(KeepassDefs.NotesField, "entry_comment", spinnerItems);
+			
+			//add non-standard fields:
+			ArrayList<String> allKeys = new ArrayList<String>(mEntryOutput.keySet());
+			Collections.sort(allKeys);
+			
+			for (String k: allKeys)
+			{
+				if (!KeepassDefs.IsStandardField(k))
+				{
+					if (!TextUtils.isEmpty(mEntryOutput.get(k)))
+					mFieldList.add(k);
+					spinnerItems.add(k);
+				}
+			}
+			
+			mCbIncludeLabel = (CheckBox)rootView.findViewById(R.id.cbIncludeLabel);
+			
+			boolean includeLabel = PreferenceManager.getDefaultSharedPreferences(getActivity()).getBoolean("includeLabels", false);
+			mCbIncludeLabel.setChecked(includeLabel);
+			mCbIncludeLabel.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+				
+				@Override
+				public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+					PreferenceManager.getDefaultSharedPreferences(getActivity()).edit().putBoolean("includeLabels", isChecked);
+					updateQrCode(buildQrData(mFieldList.get( mSpinner.getSelectedItemPosition() )));
+				}
+			});
+			
+			ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(), android.R.layout.simple_spinner_item, spinnerItems);
+			adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+			mSpinner.setAdapter(adapter);
+			
+			mImageView = ((ImageView)rootView.findViewById(R.id.qrView));
+			mErrorView = ((TextView)rootView.findViewById(R.id.tvError));
+			String fieldId = null;
+			
+			if (getActivity().getIntent() != null)
+			{
+				fieldId = getActivity().getIntent().getStringExtra(Strings.EXTRA_FIELD_ID);
+				if (fieldId != null)
+				{
+					fieldId = fieldId.substring(Strings.PREFIX_STRING.length());
+				}
+			}
+			updateQrCode(buildQrData(fieldId));
+			
+			mImageView.setOnClickListener(new OnClickListener() {
+				
+				@Override
+				public void onClick(View v) {
+					zoomImageFromThumb();
+				}
+			});
+
+			mSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+				@Override
+				public void onItemSelected(AdapterView<?> arg0, View arg1,
+						int arg2, long arg3) {
+					if  (arg2 != 0)
+						mCbIncludeLabel.setVisibility(View.VISIBLE);
+					else
+						mCbIncludeLabel.setVisibility(View.GONE);
+					updateQrCode(buildQrData(mFieldList.get(arg2)));
+				}
+
+				@Override
+				public void onNothingSelected(AdapterView<?> arg0) {
+					
+				}
+			});
+			
+			mSpinner.setSelection(mFieldList.indexOf(fieldId));
+			
+			mShortAnimationDuration = getResources().getInteger(
+	                android.R.integer.config_shortAnimTime);
+			
+		
+
+			return rootView;
+		}
+
+		private void addIfExists(String fieldKey, String resKey,
+				ArrayList<String> spinnerItems) {
+			if (!TextUtils.isEmpty(mEntryOutput.get(fieldKey)))
+			{
+				mFieldList.add(fieldKey);
+				String displayString = fieldKey;
+				try
+				{
+					displayString = kp2aRes.getString(kp2aRes.getIdentifier(resKey, "string", mHostname));
+				}
+				catch (Exception e)
+				{
+					e.printStackTrace();
+				}
+				spinnerItems.add(displayString);
+			}
+			
+
+		}
+
+		private String buildQrData(String fieldId) {
+			String res = "";
+
+			if (fieldId == null)
+			{
+				res = "kp2a:\n";
+				for (String k:mFieldList)
+				{
+					if (k == null)
+						continue;
+					res += QRCodeEncoder.escapeMECARD(k)+":";
+					res += QRCodeEncoder.escapeMECARD(mEntryOutput.get(k))+";\n";
+				}
+			}
+			else
+			{
+				if ((mCbIncludeLabel.isChecked()))
+				{
+					res = fieldId+": ";
+					
+				}
+				res += mEntryOutput.get(fieldId);
+			}
+			
+			return res;
+		}
+
+		private void updateQrCode(String qrData) {
+			DisplayMetrics displayMetrics = new DisplayMetrics();
+			WindowManager wm = (WindowManager) getActivity().getSystemService(Context.WINDOW_SERVICE); // the results will be higher than using the activity context object or the getWindowManager() shortcut
+			wm.getDefaultDisplay().getMetrics(displayMetrics);
+			int screenWidth = displayMetrics.widthPixels;
+			int screenHeight = displayMetrics.heightPixels;
+			
+			int qrCodeDimension = screenWidth > screenHeight ? screenHeight : screenWidth;
+			QRCodeEncoder qrCodeEncoder = new QRCodeEncoder(qrData, null,
+			        Contents.Type.TEXT, BarcodeFormat.QR_CODE.toString(), qrCodeDimension);
+
+			
+
+			try {
+			    mBitmap = qrCodeEncoder.encodeAsBitmap();
+			    mImageView.setImageBitmap(mBitmap);
+			    mImageView.setVisibility(View.VISIBLE);
+			    mErrorView.setVisibility(View.GONE);
+			} catch (WriterException e) {
+			    e.printStackTrace();
+			    mErrorView.setText("Error: "+e.getMessage());
+			    mErrorView.setVisibility(View.VISIBLE);
+			    mImageView.setVisibility(View.GONE);
+			}
+		}
+		
+		private void zoomImageFromThumb() {
+		    // If there's an animation in progress, cancel it
+		    // immediately and proceed with this one.
+		    if (mCurrentAnimator != null) {
+		        mCurrentAnimator.cancel();
+		    }
+
+		    // Load the high-resolution "zoomed-in" image.
+		    final ImageView expandedImageView = (ImageView) getActivity().findViewById(
+		            R.id.expanded_image);
+		    expandedImageView.setImageBitmap(mBitmap);
+
+		    // Calculate the starting and ending bounds for the zoomed-in image.
+		    // This step involves lots of math. Yay, math.
+		    final Rect startBounds = new Rect();
+		    final Rect finalBounds = new Rect();
+		    final Point globalOffset = new Point();
+
+		    // The start bounds are the global visible rectangle of the thumbnail,
+		    // and the final bounds are the global visible rectangle of the container
+		    // view. Also set the container view's offset as the origin for the
+		    // bounds, since that's the origin for the positioning animation
+		    // properties (X, Y).
+		    mImageView.getGlobalVisibleRect(startBounds);
+		    getActivity().findViewById(R.id.container)
+		            .getGlobalVisibleRect(finalBounds, globalOffset);
+		    startBounds.offset(-globalOffset.x, -globalOffset.y);
+		    finalBounds.offset(-globalOffset.x, -globalOffset.y);
+
+		    // Adjust the start bounds to be the same aspect ratio as the final
+		    // bounds using the "center crop" technique. This prevents undesirable
+		    // stretching during the animation. Also calculate the start scaling
+		    // factor (the end scaling factor is always 1.0).
+		    float startScale;
+		    if ((float) finalBounds.width() / finalBounds.height()
+		            > (float) startBounds.width() / startBounds.height()) {
+		        // Extend start bounds horizontally
+		        startScale = (float) startBounds.height() / finalBounds.height();
+		        float startWidth = startScale * finalBounds.width();
+		        float deltaWidth = (startWidth - startBounds.width()) / 2;
+		        startBounds.left -= deltaWidth;
+		        startBounds.right += deltaWidth;
+		    } else {
+		        // Extend start bounds vertically
+		        startScale = (float) startBounds.width() / finalBounds.width();
+		        float startHeight = startScale * finalBounds.height();
+		        float deltaHeight = (startHeight - startBounds.height()) / 2;
+		        startBounds.top -= deltaHeight;
+		        startBounds.bottom += deltaHeight;
+		    }
+
+		    // Hide the thumbnail and show the zoomed-in view. When the animation
+		    // begins, it will position the zoomed-in view in the place of the
+		    // thumbnail.
+		    mImageView.setAlpha(0f);
+		    expandedImageView.setVisibility(View.VISIBLE);
+
+		    // Set the pivot point for SCALE_X and SCALE_Y transformations
+		    // to the top-left corner of the zoomed-in view (the default
+		    // is the center of the view).
+		    expandedImageView.setPivotX(0f);
+		    expandedImageView.setPivotY(0f);
+
+		    // Construct and run the parallel animation of the four translation and
+		    // scale properties (X, Y, SCALE_X, and SCALE_Y).
+		    AnimatorSet set = new AnimatorSet();
+		    set
+		            .play(ObjectAnimator.ofFloat(expandedImageView, View.X,
+		                    startBounds.left, finalBounds.left))
+		            .with(ObjectAnimator.ofFloat(expandedImageView, View.Y,
+		                    startBounds.top, finalBounds.top))
+		            .with(ObjectAnimator.ofFloat(expandedImageView, View.SCALE_X,
+		            startScale, 1f)).with(ObjectAnimator.ofFloat(expandedImageView,
+		                    View.SCALE_Y, startScale, 1f));
+		    set.setDuration(mShortAnimationDuration);
+		    set.setInterpolator(new DecelerateInterpolator());
+		    set.addListener(new AnimatorListenerAdapter() {
+		        @Override
+		        public void onAnimationEnd(Animator animation) {
+		            mCurrentAnimator = null;
+		        }
+
+		        @Override
+		        public void onAnimationCancel(Animator animation) {
+		            mCurrentAnimator = null;
+		        }
+		    });
+		    set.start();
+		    mCurrentAnimator = set;
+
+		    // Upon clicking the zoomed-in image, it should zoom back down
+		    // to the original bounds and show the thumbnail instead of
+		    // the expanded image.
+		    final float startScaleFinal = startScale;
+		    expandedImageView.setOnClickListener(new View.OnClickListener() {
+		        @Override
+		        public void onClick(View view) {
+		            if (mCurrentAnimator != null) {
+		                mCurrentAnimator.cancel();
+		            }
+
+		            // Animate the four positioning/sizing properties in parallel,
+		            // back to their original values.
+		            AnimatorSet set = new AnimatorSet();
+		            set.play(ObjectAnimator
+		                        .ofFloat(expandedImageView, View.X, startBounds.left))
+		                        .with(ObjectAnimator
+		                                .ofFloat(expandedImageView, 
+		                                        View.Y,startBounds.top))
+		                        .with(ObjectAnimator
+		                                .ofFloat(expandedImageView, 
+		                                        View.SCALE_X, startScaleFinal))
+		                        .with(ObjectAnimator
+		                                .ofFloat(expandedImageView, 
+		                                        View.SCALE_Y, startScaleFinal));
+		            set.setDuration(mShortAnimationDuration);
+		            set.setInterpolator(new DecelerateInterpolator());
+		            set.addListener(new AnimatorListenerAdapter() {
+		                @Override
+		                public void onAnimationEnd(Animator animation) {
+		                	mImageView.setAlpha(1f);
+		                    expandedImageView.setVisibility(View.GONE);
+		                    mCurrentAnimator = null;
+		                }
+
+		                @Override
+		                public void onAnimationCancel(Animator animation) {
+		                	mImageView.setAlpha(1f);
+		                    expandedImageView.setVisibility(View.GONE);
+		                    mCurrentAnimator = null;
+		                }
+		            });
+		            set.start();
+		            mCurrentAnimator = set;
+		        }
+		    });
+		}
+	}
+
+}
diff --git a/src/java/PluginQR/src/keepass2android/plugin/qr/QRCodeEncoder.java b/src/java/PluginQR/src/keepass2android/plugin/qr/QRCodeEncoder.java
new file mode 100644
index 00000000..ef0f7392
--- /dev/null
+++ b/src/java/PluginQR/src/keepass2android/plugin/qr/QRCodeEncoder.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2008 ZXing authors
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package keepass2android.plugin.qr;
+
+import android.provider.ContactsContract;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.telephony.PhoneNumberUtils;
+
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+
+public final class QRCodeEncoder {
+    private static final int WHITE = 0xFFFFFFFF;
+    private static final int BLACK = 0xFF000000;
+
+    private int dimension = Integer.MIN_VALUE;
+    private String contents = null;
+    private String displayContents = null;
+    private String title = null;
+    private BarcodeFormat format = null;
+    private boolean encoded = false;
+
+    public QRCodeEncoder(String data, Bundle bundle, String type, String format, int dimension) {
+        this.dimension = dimension;
+        encoded = encodeContents(data, bundle, type, format);
+    }
+
+    public String getContents() {
+        return contents;
+    }
+
+    public String getDisplayContents() {
+        return displayContents;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    private boolean encodeContents(String data, Bundle bundle, String type, String formatString) {
+        // Default to QR_CODE if no format given.
+        format = null;
+        if (formatString != null) {
+            try {
+                format = BarcodeFormat.valueOf(formatString);
+            } catch (IllegalArgumentException iae) {
+                // Ignore it then
+            }
+        }
+        if (format == null || format == BarcodeFormat.QR_CODE) {
+            this.format = BarcodeFormat.QR_CODE;
+            encodeQRCodeContents(data, bundle, type);
+        } else if (data != null && data.length() > 0) {
+            contents = data;
+            displayContents = data;
+            title = "Text";
+        }
+        return contents != null && contents.length() > 0;
+    }
+
+    private void encodeQRCodeContents(String data, Bundle bundle, String type) {
+        if (type.equals(Contents.Type.TEXT)) {
+            if (data != null && data.length() > 0) {
+                contents = data;
+                displayContents = data;
+                title = "Text";
+            }
+        } else if (type.equals(Contents.Type.EMAIL)) {
+            data = trim(data);
+            if (data != null) {
+                contents = "mailto:" + data;
+                displayContents = data;
+                title = "E-Mail";
+            }
+        } else if (type.equals(Contents.Type.PHONE)) {
+            data = trim(data);
+            if (data != null) {
+                contents = "tel:" + data;
+                displayContents = PhoneNumberUtils.formatNumber(data);
+                title = "Phone";
+            }
+        } else if (type.equals(Contents.Type.SMS)) {
+            data = trim(data);
+            if (data != null) {
+                contents = "sms:" + data;
+                displayContents = PhoneNumberUtils.formatNumber(data);
+                title = "SMS";
+            }
+        } else if (type.equals(Contents.Type.CONTACT)) {
+            if (bundle != null) {
+                StringBuilder newContents = new StringBuilder(100);
+                StringBuilder newDisplayContents = new StringBuilder(100);
+
+                newContents.append("MECARD:");
+
+                String name = trim(bundle.getString(ContactsContract.Intents.Insert.NAME));
+                if (name != null) {
+                    newContents.append("N:").append(escapeMECARD(name)).append(';');
+                    newDisplayContents.append(name);
+                }
+
+                String address = trim(bundle.getString(ContactsContract.Intents.Insert.POSTAL));
+                if (address != null) {
+                    newContents.append("ADR:").append(escapeMECARD(address)).append(';');
+                    newDisplayContents.append('\n').append(address);
+                }
+
+                Collection<String> uniquePhones = new HashSet<String>(Contents.PHONE_KEYS.length);
+                for (int x = 0; x < Contents.PHONE_KEYS.length; x++) {
+                    String phone = trim(bundle.getString(Contents.PHONE_KEYS[x]));
+                    if (phone != null) {
+                        uniquePhones.add(phone);
+                    }
+                }
+                for (String phone : uniquePhones) {
+                    newContents.append("TEL:").append(escapeMECARD(phone)).append(';');
+                    newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone));
+                }
+
+                Collection<String> uniqueEmails = new HashSet<String>(Contents.EMAIL_KEYS.length);
+                for (int x = 0; x < Contents.EMAIL_KEYS.length; x++) {
+                    String email = trim(bundle.getString(Contents.EMAIL_KEYS[x]));
+                    if (email != null) {
+                        uniqueEmails.add(email);
+                    }
+                }
+                for (String email : uniqueEmails) {
+                    newContents.append("EMAIL:").append(escapeMECARD(email)).append(';');
+                    newDisplayContents.append('\n').append(email);
+                }
+
+                String url = trim(bundle.getString(Contents.URL_KEY));
+                if (url != null) {
+                    // escapeMECARD(url) -> wrong escape e.g. http\://zxing.google.com
+                    newContents.append("URL:").append(url).append(';');
+                    newDisplayContents.append('\n').append(url);
+                }
+
+                String note = trim(bundle.getString(Contents.NOTE_KEY));
+                if (note != null) {
+                    newContents.append("NOTE:").append(escapeMECARD(note)).append(';');
+                    newDisplayContents.append('\n').append(note);
+                }
+
+                // Make sure we've encoded at least one field.
+                if (newDisplayContents.length() > 0) {
+                    newContents.append(';');
+                    contents = newContents.toString();
+                    displayContents = newDisplayContents.toString();
+                    title = "Contact";
+                } else {
+                    contents = null;
+                    displayContents = null;
+                }
+
+            }
+        } else if (type.equals(Contents.Type.LOCATION)) {
+            if (bundle != null) {
+                // These must use Bundle.getFloat(), not getDouble(), it's part of the API.
+                float latitude = bundle.getFloat("LAT", Float.MAX_VALUE);
+                float longitude = bundle.getFloat("LONG", Float.MAX_VALUE);
+                if (latitude != Float.MAX_VALUE && longitude != Float.MAX_VALUE) {
+                    contents = "geo:" + latitude + ',' + longitude;
+                    displayContents = latitude + "," + longitude;
+                    title = "Location";
+                }
+            }
+        }
+    }
+
+    public Bitmap encodeAsBitmap() throws WriterException {
+        if (!encoded) return null;
+
+        Map<EncodeHintType, Object> hints = null;
+        String encoding = guessAppropriateEncoding(contents);
+        hints = new EnumMap<EncodeHintType, Object>(EncodeHintType.class);
+        if (encoding != null) {
+            
+            hints.put(EncodeHintType.CHARACTER_SET, encoding);
+        }
+        hints.put(EncodeHintType.MARGIN, 2); /* default = 4 */  
+        
+        
+        MultiFormatWriter writer = new MultiFormatWriter();
+        BitMatrix result = writer.encode(contents, format, dimension, dimension, hints);
+        int width = result.getWidth();
+        int height = result.getHeight();
+        int[] pixels = new int[width * height];
+        // All are 0, or black, by default
+        for (int y = 0; y < height; y++) {
+            int offset = y * width;
+            for (int x = 0; x < width; x++) {
+                pixels[offset + x] = result.get(x, y) ? BLACK : WHITE;
+            }
+        }
+
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
+        return bitmap;
+    }
+
+    private static String guessAppropriateEncoding(CharSequence contents) {
+        // Very crude at the moment
+        for (int i = 0; i < contents.length(); i++) {
+            if (contents.charAt(i) > 0xFF) { return "UTF-8"; }
+        }
+        return null;
+    }
+
+    private static String trim(String s) {
+        if (s == null) { return null; }
+        String result = s.trim();
+        return result.length() == 0 ? null : result;
+    }
+
+    public static String escapeMECARD(String input) {
+        if (input == null || (input.indexOf(':') < 0 && input.indexOf(';') < 0)) { return input; }
+        int length = input.length();
+        StringBuilder result = new StringBuilder(length);
+        for (int i = 0; i < length; i++) {
+            char c = input.charAt(i);
+            if (c == ':' || c == ';') {
+                result.append('\\');
+            }
+            result.append(c);
+        }
+        return result.toString();
+    }
+}
+
diff --git a/src/java/android-filechooser/code/project.zip b/src/java/android-filechooser/code/project.zip
index 22424101..dae0d664 100644
Binary files a/src/java/android-filechooser/code/project.zip and b/src/java/android-filechooser/code/project.zip differ
diff --git a/src/keepass2android/ChangeLog.cs b/src/keepass2android/ChangeLog.cs
index b0265368..c1dd359b 100644
--- a/src/keepass2android/ChangeLog.cs
+++ b/src/keepass2android/ChangeLog.cs
@@ -38,7 +38,8 @@ namespace keepass2android
 					ctx.GetString(Resource.String.ChangeLog)
 					 };
 
-			builder.SetPositiveButton(Android.Resource.String.Ok, (dlgSender, dlgEvt) => { });
+			builder.SetPositiveButton(Android.Resource.String.Ok, (dlgSender, dlgEvt) => {((AlertDialog)dlgSender).Dismiss(); });
+			builder.SetCancelable(false);
 
 			builder.SetMessage("temp");
 			Dialog dialog = builder.Create();
diff --git a/src/keepass2android/CreateDatabaseActivity.cs b/src/keepass2android/CreateDatabaseActivity.cs
index 90525979..8383d044 100644
--- a/src/keepass2android/CreateDatabaseActivity.cs
+++ b/src/keepass2android/CreateDatabaseActivity.cs
@@ -27,7 +27,8 @@ namespace keepass2android
 		private bool _restoringInstanceState;
 		private bool _showPassword;
 
-		private ActivityDesign _design;
+		private readonly ActivityDesign _design;
+		private AppTask _appTask;
 
 		public CreateDatabaseActivity()
 		{
@@ -57,7 +58,7 @@ namespace keepass2android
 			_design.ApplyTheme();
 
 			SetContentView(Resource.Layout.create_database);
-
+			_appTask = AppTask.GetTaskInOnCreate(bundle, Intent);
 
 			SetDefaultIoc();
 
@@ -527,7 +528,7 @@ namespace keepass2android
 						dbHelper.CreateFile(_ioc, Filename);
 					}
 
-					GroupActivity.Launch(_activity, new NullTask());
+					GroupActivity.Launch(_activity, _activity._appTask);
 					_activity.Finish();
 
 				}
diff --git a/src/keepass2android/EntryActivity.cs b/src/keepass2android/EntryActivity.cs
index 3ae72e4f..60f7fb85 100644
--- a/src/keepass2android/EntryActivity.cs
+++ b/src/keepass2android/EntryActivity.cs
@@ -19,59 +19,93 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Linq;
-
+using System.Threading;
 using Android.App;
 using Android.Content;
 using Android.OS;
+using Android.Runtime;
+using Android.Text;
 using Android.Views;
 using Android.Widget;
-using KeePassLib;
-using KeePassLib.Utility;
 using Android.Preferences;
 using Android.Text.Method;
 using System.Globalization;
 using Android.Content.PM;
-using KeePassLib.Security;
 using Android.Webkit;
 using Android.Graphics;
 using Java.IO;
+using KeePassLib;
+using KeePassLib.Security;
+using KeePassLib.Utility;
+using Keepass2android.Pluginsdk;
+using PluginHostTest;
 using keepass2android.Io;
+using Uri = Android.Net.Uri;
 
 namespace keepass2android
 {
+
 	[Activity (Label = "@string/app_name", ConfigurationChanges=ConfigChanges.Orientation|ConfigChanges.KeyboardHidden, Theme="@style/NoTitleBar")]			
-	public class EntryActivity : LockCloseActivity {
+	public class EntryActivity : LockCloseActivity 
+	{
 		public const String KeyEntry = "entry";
 		public const String KeyRefreshPos = "refresh_pos";
 		public const String KeyCloseAfterCreate = "close_after_create";
 
-		private static Typeface _passwordFont;
-
-		public static void Launch(Activity act, PwEntry pw, int pos, AppTask appTask) {
+		public static void Launch(Activity act, PwEntry pw, int pos, AppTask appTask, ActivityFlags? flags = null)
+		{
 			Intent i = new Intent(act, typeof(EntryActivity));
-			
-			
+
 			i.PutExtra(KeyEntry, pw.Uuid.ToHexString());
 			i.PutExtra(KeyRefreshPos, pos);
 
+			if (flags != null)
+				i.SetFlags((ActivityFlags) flags);
+
 			appTask.ToIntent(i);
+			if (flags != null && (((ActivityFlags) flags) | ActivityFlags.ForwardResult) == ActivityFlags.ForwardResult)
+				act.StartActivity(i);
+			else
+				act.StartActivityForResult(i, 0);
+		}
+
+		public EntryActivity (IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			
+		}
+
+		public EntryActivity()
+		{
 			
-			act.StartActivityForResult(i,0);
 		}
 
 		protected PwEntry Entry;
-	
-		private bool _showPassword;
+
+		private static Typeface _passwordFont;
+
+		internal bool _showPassword;
 		private int _pos;
 
 		AppTask _appTask;
 		private List<TextView> _protectedTextViews;
+		private IMenu _menu;
+
+		private readonly Dictionary<string, List<IPopupMenuItem>> _popupMenuItems =
+			new Dictionary<string, List<IPopupMenuItem>>();
+
+		private readonly Dictionary<string, IStringView> _stringViews = new Dictionary<string, IStringView>();
+		private readonly List<PluginMenuOption> _pendingMenuOptions = new List<PluginMenuOption>();
+		
+		//make sure _timer doesn't go out of scope:
+		private Timer _timer;
 
 
-		protected void SetEntryView() {
+		protected void SetEntryView()
+		{
 			SetContentView(Resource.Layout.entry_view);
 		}
-		
+
 		protected void SetupEditButtons() {
 			View edit =  FindViewById(Resource.Id.entry_edit);
 			if (App.Kp2a.GetDb().CanWrite)
@@ -88,21 +122,193 @@ namespace keepass2android
 			}
 			
 		}
+
+		private class PluginActionReceiver : BroadcastReceiver
+		{
+			private readonly EntryActivity _activity;
+
+			public PluginActionReceiver(EntryActivity activity)
+			{
+				_activity = activity;
+			}
+
+			public override void OnReceive(Context context, Intent intent)
+			{
+				var pluginPackage = intent.GetStringExtra(Strings.ExtraSender);
+				if (new PluginDatabase(context).IsValidAccessToken(pluginPackage,
+				                                                   intent.GetStringExtra(Strings.ExtraAccessToken),
+				                                                   Strings.ScopeCurrentEntry))
+				{
+					if (intent.GetStringExtra(Strings.ExtraEntryId) != _activity.Entry.Uuid.ToHexString())
+					{
+						Kp2aLog.Log("received action for wrong entry " + intent.GetStringExtra(Strings.ExtraEntryId));
+						return;
+					}
+					_activity.AddPluginAction(pluginPackage,
+					                          intent.GetStringExtra(Strings.ExtraFieldId),
+											  intent.GetStringExtra(Strings.ExtraActionId),
+					                          intent.GetStringExtra(Strings.ExtraActionDisplayText),
+					                          intent.GetIntExtra(Strings.ExtraActionIconResId, -1),
+					                          intent.GetBundleExtra(Strings.ExtraActionData));
+				}
+				else
+				{
+					Kp2aLog.Log("received invalid request. Plugin not authorized.");
+				}
+			}
+		}
+
+		private class PluginFieldReceiver : BroadcastReceiver
+		{
+			private readonly EntryActivity _activity;
+
+			public PluginFieldReceiver(EntryActivity activity)
+			{
+				_activity = activity;
+			}
+
+			public override void OnReceive(Context context, Intent intent)
+			{
+				if (intent.GetStringExtra(Strings.ExtraEntryId) != _activity.Entry.Uuid.ToHexString())
+				{
+					Kp2aLog.Log("received field for wrong entry " + intent.GetStringExtra(Strings.ExtraEntryId));
+					return;
+				}
+				if (!new PluginDatabase(context).IsValidAccessToken(intent.GetStringExtra(Strings.ExtraSender),
+				                                                    intent.GetStringExtra(Strings.ExtraAccessToken),
+				                                                    Strings.ScopeCurrentEntry))
+				{
+					Kp2aLog.Log("received field with invalid access token from " + intent.GetStringExtra(Strings.ExtraSender));
+					return;
+				}
+				string key = intent.GetStringExtra(Strings.ExtraFieldId);
+				string value = intent.GetStringExtra(Strings.ExtraFieldValue);
+				bool isProtected = intent.GetBooleanExtra(Strings.ExtraFieldProtected, false);
+				_activity.SetPluginField(key, value, isProtected);
+			}
+		}
+
+		private void SetPluginField(string key, string value, bool isProtected)
+		{
+			//update or add the string view:
+			IStringView existingField;
+			if (_stringViews.TryGetValue(key, out existingField))
+			{
+				existingField.Text = value;
+			}
+			else
+			{
+				ViewGroup extraGroup = (ViewGroup) FindViewById(Resource.Id.extra_strings);
+				var view = CreateExtraSection(key, value, isProtected);
+				extraGroup.AddView(view.View);
+			}
+
+			//update the Entry output in the App database and notify the CopyToClipboard service
+			App.Kp2a.GetDb().LastOpenedEntry.OutputStrings.Set(key, new ProtectedString(isProtected, value));
+			Intent updateKeyboardIntent = new Intent(this, typeof(CopyToClipboardService));
+			Intent.SetAction(Intents.UpdateKeyboard);
+			updateKeyboardIntent.PutExtra(KeyEntry, Entry.Uuid.ToHexString());
+			StartService(updateKeyboardIntent);
+
+			//notify plugins
+			NotifyPluginsOnModification(Strings.PrefixString+key);
+		}
+
+		private void AddPluginAction(string pluginPackage, string fieldId, string popupItemId, string displayText, int iconId, Bundle bundleExtra)
+		{
+			if (fieldId != null)
+			{
+				try
+				{
+					//create a new popup item for the plugin action:
+					var newPopup = new PluginPopupMenuItem(this, pluginPackage, fieldId, popupItemId, displayText, iconId, bundleExtra);
+					//see if we already have a popup item for this field with the same item id
+					var popupsForField = _popupMenuItems[fieldId];
+					var popupItemPos = popupsForField.FindIndex(0,
+															item =>
+															(item is PluginPopupMenuItem) &&
+															((PluginPopupMenuItem)item).PopupItemId == popupItemId);
+
+					//replace existing or add
+					if (popupItemPos >= 0)
+					{
+						popupsForField[popupItemPos] = newPopup;
+					}
+					else
+					{
+						popupsForField.Add(newPopup);
+					}
+				}
+				catch (Exception e)
+				{
+					Kp2aLog.Log(e.ToString());
+				}
+				
+			}
+			else
+			{
+				//we need to add an option to the  menu.
+				//As it is not sure that OnCreateOptionsMenu was called yet, we cannot access _menu without a check:
+
+				Intent i = new Intent(Strings.ActionEntryActionSelected);
+				i.SetPackage(pluginPackage);
+				i.PutExtra(Strings.ExtraActionData, bundleExtra);
+				i.PutExtra(Strings.ExtraSender, PackageName);
+				PluginHost.AddEntryToIntent(i, App.Kp2a.GetDb().LastOpenedEntry);
+
+				var menuOption = new PluginMenuOption()
+					{
+						DisplayText = displayText,
+						Icon = PackageManager.GetResourcesForApplication(pluginPackage).GetDrawable(iconId),
+						Intent = i
+					};
+
+				if (_menu != null)
+				{
+					AddMenuOption(menuOption);
+				}
+				else
+				{
+					lock (_pendingMenuOptions)
+					{
+						_pendingMenuOptions.Add(menuOption);
+					}
+
+				}
+
+
+			}
+		}
+
+		private void AddMenuOption(PluginMenuOption menuOption)
+		{
+			var menuItem = _menu.Add(menuOption.DisplayText);
+			menuItem.SetIcon(menuOption.Icon);
+			menuItem.SetIntent(menuOption.Intent);
+		}
+
 		
+
+
 		protected override void OnCreate(Bundle savedInstanceState)
 		{
-			
+
 			ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
 
 			long usageCount = prefs.GetLong(GetString(Resource.String.UsageCount_key), 0);
 
 			ISharedPreferencesEditor edit = prefs.Edit();
-			edit.PutLong(GetString(Resource.String.UsageCount_key), usageCount+1);
-			EditorCompat.Apply(edit);
+			edit.PutLong(GetString(Resource.String.UsageCount_key), usageCount + 1);
+			edit.Commit();
+
+			_showPassword =
+				!prefs.GetBoolean(GetString(Resource.String.maskpass_key), Resources.GetBoolean(Resource.Boolean.maskpass_default));
 
-			_showPassword = ! prefs.GetBoolean(GetString(Resource.String.maskpass_key), Resources.GetBoolean(Resource.Boolean.maskpass_default));
-			
 			base.OnCreate(savedInstanceState);
+			RequestWindowFeature(WindowFeatures.IndeterminateProgress);
+
+			new ActivityDesign(this).ApplyTheme();
+
 			SetEntryView();
 
 			Database db = App.Kp2a.GetDb();
@@ -112,23 +318,23 @@ namespace keepass2android
 				Finish();
 				return;
 			}
-			
+
 			SetResult(KeePass.ExitNormal);
-			
+
 			Intent i = Intent;
 			PwUuid uuid = new PwUuid(MemUtil.HexStringToByteArray(i.GetStringExtra(KeyEntry)));
 			_pos = i.GetIntExtra(KeyRefreshPos, -1);
 
 			_appTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);
 
-			Entry = db.Entries [uuid];
+			Entry = db.Entries[uuid];
 
-			// Refresh Menu contents in case onCreateMenuOptions was called before _entry was set
+			// Refresh Menu contents in case onCreateMenuOptions was called before Entry was set
 			ActivityCompat.InvalidateOptionsMenu(this);
-			
+
 			// Update last access time.
 			Entry.Touch(false);
-			
+
 			if (PwDefs.IsTanEntry(Entry) && prefs.GetBoolean(GetString(Resource.String.TanExpiresOnUse_key), Resources.GetBoolean(Resource.Boolean.TanExpiresOnUse_default)) && ((Entry.Expires == false) || Entry.ExpiryTime > DateTime.Now))
 			{
 				PwEntry backupEntry = Entry.CloneDeep();
@@ -137,48 +343,72 @@ namespace keepass2android
 				Entry.Touch(true);
 				RequiresRefresh();
 				UpdateEntry update = new UpdateEntry(this, App.Kp2a, backupEntry, Entry, null);
-                ProgressTask pt = new ProgressTask(App.Kp2a, this, update);
+				ProgressTask pt = new ProgressTask(App.Kp2a, this, update);
 				pt.Run();
 			}
-			FillData(false);
-			
+			FillData();
+
 			SetupEditButtons();
 
-			//depending on the app task, the final things to do might be delayed, so let the appTask call CompleteOnCreate when appropriate
-			_appTask.OnCompleteCreateEntryActivity(this);
-			
+			App.Kp2a.GetDb().LastOpenedEntry = new PwEntryOutput(Entry, App.Kp2a.GetDb().KpDatabase);
+
+			RegisterReceiver(new PluginActionReceiver(this), new IntentFilter(Strings.ActionAddEntryAction));
+			RegisterReceiver(new PluginFieldReceiver(this), new IntentFilter(Strings.ActionSetEntryField));
+
+			new Thread(NotifyPluginsOnOpen).Start();
+
+			//the rest of the things to do depends on the current app task:
+			_appTask.CompleteOnCreateEntryActivity(this);
 		}
 
-		public void CompleteOnCreate()
+		private void NotifyPluginsOnOpen()
+		{
+			Intent i = new Intent(Strings.ActionOpenEntry);
+			i.PutExtra(Strings.ExtraSender, PackageName);
+			AddEntryToIntent(i);
+
+
+			foreach (var plugin in new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeCurrentEntry))
+			{
+				i.SetPackage(plugin);
+				SendBroadcast(i);
+			}
+		}
+		private void NotifyPluginsOnModification(string fieldId)
+		{
+			Intent i = new Intent(Strings.ActionEntryOutputModified);
+			i.PutExtra(Strings.ExtraSender, PackageName);
+			i.PutExtra(Strings.ExtraFieldId, fieldId);
+			AddEntryToIntent(i);
+
+
+			foreach (var plugin in new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeCurrentEntry))
+			{
+				i.SetPackage(plugin);
+				SendBroadcast(i);
+			}
+		}
+
+		
+
+		internal void StartNotificationsService(bool closeAfterCreate)
 		{
 			Intent showNotIntent = new Intent(this, typeof (CopyToClipboardService));
-			Intent.SetAction(Intents.ShowNotification);
+			showNotIntent.SetAction(Intents.ShowNotification);
 			showNotIntent.PutExtra(KeyEntry, Entry.Uuid.ToHexString());
-			bool closeAfterCreate = _appTask.CloseEntryActivityAfterCreate;
+
 			showNotIntent.PutExtra(KeyCloseAfterCreate, closeAfterCreate);
 
 			StartService(showNotIntent);
-
-			Kp2aLog.Log("Requesting copy to clipboard for Uuid=" + Entry.Uuid.ToHexString());
-
-			/*foreach (PwUuid key in App.Kp2a.GetDb().entries.Keys)
-			{
-				Kp2aLog.Log(this,key.ToHexString() + " -> " + App.Kp2a.GetDb().entries[key].Uuid.ToHexString());
-			}*/
-
-			if (closeAfterCreate)
-			{
-				SetResult(KeePass.ExitCloseAfterTaskComplete);
-				Finish();
-			}
 		}
 
 
-		private String getDateTime(DateTime dt) {
-			return dt.ToString ("g", CultureInfo.CurrentUICulture);
+		private String getDateTime(DateTime dt)
+		{
+			return dt.ToString("g", CultureInfo.CurrentUICulture);
 		}
 
-		String concatTags(List<string> tags)
+		private String concatTags(List<string> tags)
 		{
 			StringBuilder sb = new StringBuilder();
 			foreach (string tag in tags)
@@ -187,127 +417,142 @@ namespace keepass2android
 				sb.Append(", ");
 			}
 			if (tags.Count > 0)
-				sb.Remove(sb.Length-2,2);
+				sb.Remove(sb.Length - 2, 2);
 			return sb.ToString();
 		}
 
-		void PopulateExtraStrings(bool trimList)
+		private void PopulateExtraStrings()
 		{
-			ViewGroup extraGroup = (ViewGroup)FindViewById(Resource.Id.extra_strings);
-			if (trimList)
+			ViewGroup extraGroup = (ViewGroup) FindViewById(Resource.Id.extra_strings);
+			foreach (var pair in Entry.Strings.Where(pair => !PwDefs.IsStandardField(pair.Key)).OrderBy(pair => pair.Key))
 			{
-				extraGroup.RemoveAllViews();
+				var stringView = CreateExtraSection(pair.Key, pair.Value.ReadString(), pair.Value.IsProtected);
+				extraGroup.AddView(stringView.View);
 			}
-			bool hasExtraFields = false;
-			foreach (var view in from pair in Entry.Strings where !PwDefs.IsStandardField(pair.Key) orderby pair.Key 
-								 select CreateEditSection(pair.Key, pair.Value.ReadString(), pair.Value.IsProtected))
-			{
-				extraGroup.AddView(view);
-				hasExtraFields = true;
-			}
-			FindViewById(Resource.Id.entry_extra_strings_label).Visibility = hasExtraFields ? ViewStates.Visible : ViewStates.Gone;
+
 		}
 
-		View CreateEditSection(string key, string value, bool isProtected)
+		private ExtraStringView CreateExtraSection(string key, string value, bool isProtected)
 		{
 			LinearLayout layout = new LinearLayout(this, null) {Orientation = Orientation.Vertical};
-			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent);
-			layoutParams.SetMargins(10,0,0,0);
+			LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent,
+			                                                                       ViewGroup.LayoutParams.WrapContent);
+
 			layout.LayoutParameters = layoutParams;
-			View viewInflated = LayoutInflater.Inflate(Resource.Layout.entry_extrastring_title,null);
-			TextView keyView = (TextView)viewInflated;
+			View viewInflated = LayoutInflater.Inflate(Resource.Layout.entry_extrastring_title, null);
+			TextView keyView = viewInflated.FindViewById<TextView>(Resource.Id.entry_title);
 			if (key != null)
 				keyView.Text = key;
-			
-			layout.AddView(keyView);
-			TextView valueView = (TextView)LayoutInflater.Inflate(Resource.Layout.entry_extrastring_value, null);
+
+			layout.AddView(viewInflated);
+			RelativeLayout valueViewContainer =
+				(RelativeLayout) LayoutInflater.Inflate(Resource.Layout.entry_extrastring_value, null);
+			var valueView = valueViewContainer.FindViewById<TextView>(Resource.Id.entry_extra);
 			if (value != null)
 				valueView.Text = value;
 			SetPasswordTypeface(valueView);
 			if (isProtected)
+			{
 				RegisterProtectedTextView(valueView);
+				valueView.TransformationMethod = PasswordTransformationMethod.Instance;
+			}
 
+			layout.AddView(valueViewContainer);
+			var stringView = new ExtraStringView(layout, valueView, keyView);
+
+			_stringViews.Add(key, stringView);
+			RegisterTextPopup(valueViewContainer, valueViewContainer.FindViewById(Resource.Id.extra_vdots), key, isProtected);
+
+			return stringView;
 
-			if ((int)Build.VERSION.SdkInt >= 11)
-				valueView.SetTextIsSelectable(true);
-			layout.AddView(valueView);
-			return layout;
 		}
 
-		private void RegisterProtectedTextView(TextView protectedTextView)
+
+
+		private List<IPopupMenuItem> RegisterPopup(string popupKey, View clickView, View anchorView)
 		{
-			_protectedTextViews.Add(protectedTextView);
+			clickView.Click += (sender, args) =>
+				{
+					ShowPopup(anchorView, popupKey);
+				};
+			_popupMenuItems[popupKey] = new List<IPopupMenuItem>();
+			return _popupMenuItems[popupKey];
 		}
-
-		Android.Net.Uri WriteBinaryToFile(string key, bool writeToCacheDirectory)
+				internal Uri WriteBinaryToFile(string key, bool writeToCacheDirectory)
 		{
 			ProtectedBinary pb = Entry.Binaries.Get(key);
 			System.Diagnostics.Debug.Assert(pb != null);
 			if (pb == null)
 				throw new ArgumentException();
 
+
 			ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
 			string binaryDirectory = prefs.GetString(GetString(Resource.String.BinaryDirectory_key), GetString(Resource.String.BinaryDirectory_default));
 			if (writeToCacheDirectory)
 				binaryDirectory = CacheDir.Path + File.Separator + AttachmentContentProvider.AttachmentCacheSubDir;
-		
+
 			string filepart = key;
 			if (writeToCacheDirectory)
 				filepart = filepart.Replace(" ", "");
 			var targetFile = new File(binaryDirectory, filepart);
 
 			File parent = targetFile.ParentFile;
-			
-			if (parent == null || (parent.Exists() && ! parent.IsDirectory))
+
+			if (parent == null || (parent.Exists() && !parent.IsDirectory))
 			{
 				Toast.MakeText(this,
-				               Resource.String.error_invalid_path,
-				               ToastLength.Long).Show();
+							   Resource.String.error_invalid_path,
+							   ToastLength.Long).Show();
 				return null;
 			}
-			
-			if (! parent.Exists())
+
+			if (!parent.Exists())
 			{
 				// Create parent directory
-				if (! parent.Mkdirs())
+				if (!parent.Mkdirs())
 				{
 					Toast.MakeText(this,
-					               Resource.String.error_could_not_create_parent,
-					               ToastLength.Long).Show();
+								   Resource.String.error_could_not_create_parent,
+								   ToastLength.Long).Show();
 					return null;
-					
+
 				}
 			}
 			string filename = targetFile.AbsolutePath;
-			Android.Net.Uri fileUri = Android.Net.Uri.FromFile(targetFile);
+			Uri fileUri = Uri.FromFile(targetFile);
 
 			byte[] pbData = pb.ReadData();
 			try
 			{
 				System.IO.File.WriteAllBytes(filename, pbData);
-			} catch (Exception exWrite)
+			}
+			catch (Exception exWrite)
 			{
-				Toast.MakeText(this, GetString(Resource.String.SaveAttachment_Failed, new Java.Lang.Object[]{ filename})
+				Toast.MakeText(this, GetString(Resource.String.SaveAttachment_Failed, new Java.Lang.Object[] { filename })
 					+ exWrite.Message, ToastLength.Long).Show();
 				return null;
-			} finally
+			}
+			finally
 			{
 				MemUtil.ZeroByteArray(pbData);
 			}
-			Toast.MakeText(this, GetString(Resource.String.SaveAttachment_doneMessage, new Java.Lang.Object[]{filename}), ToastLength.Short).Show();			
+			Toast.MakeText(this, GetString(Resource.String.SaveAttachment_doneMessage, new Java.Lang.Object[] { filename }), ToastLength.Short).Show();
 			if (writeToCacheDirectory)
 			{
-				return Android.Net.Uri.Parse("content://" + AttachmentContentProvider.Authority + "/"
-				                              + filename);
-			}
-				return fileUri;
+				return Uri.Parse("content://" + AttachmentContentProvider.Authority + "/"
+											  + filename);
 			}
+			return fileUri;
+		}
 
-		void OpenBinaryFile(Android.Net.Uri uri)
+		internal void OpenBinaryFile(Android.Net.Uri uri)
 		{
+
+
 			String theMimeType = GetMimeType(uri.Path);
 			if (theMimeType != null)
 			{
+
 				Intent theIntent = new Intent(Intent.ActionView);
 				theIntent.AddFlags(ActivityFlags.NewTask | ActivityFlags.ExcludeFromRecents);
 				theIntent.SetDataAndType(uri, theMimeType);
@@ -321,18 +566,42 @@ namespace keepass2android
 					Toast.MakeText(this, "Couldn't open file", ToastLength.Short).Show();
 				}
 			}
+
 		}
 
-		void PopulateBinaries(bool trimList)
+
+
+		private void RegisterProtectedTextView(TextView protectedTextView)
 		{
-			ViewGroup binariesGroup = (ViewGroup)FindViewById(Resource.Id.binaries);
-			if (trimList)
-			{
-				binariesGroup.RemoveAllViews();
-			}
+			_protectedTextViews.Add(protectedTextView);
+		}
+
+
+		private void PopulateBinaries()
+		{
+			ViewGroup binariesGroup = (ViewGroup) FindViewById(Resource.Id.binaries);
 			foreach (KeyValuePair<string, ProtectedBinary> pair in Entry.Binaries)
 			{
 				String key = pair.Key;
+
+
+				RelativeLayout valueViewContainer =
+					(RelativeLayout) LayoutInflater.Inflate(Resource.Layout.entry_extrastring_value, null);
+				var valueView = valueViewContainer.FindViewById<TextView>(Resource.Id.entry_extra);
+				if (key != null)
+					valueView.Text = key;
+
+				string popupKey = Strings.PrefixBinary + key;
+
+				var itemList = RegisterPopup(popupKey, valueViewContainer, valueViewContainer.FindViewById(Resource.Id.extra_vdots));
+				itemList.Add(new WriteBinaryToFilePopupItem(key, this));
+				itemList.Add(new OpenBinaryPopupItem(key, this));
+
+
+
+
+				binariesGroup.AddView(valueViewContainer);
+				/*
 				Button binaryButton = new Button(this);
 				RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.FillParent, ViewGroup.LayoutParams.WrapContent);
 				binaryButton.Text = key;
@@ -348,16 +617,12 @@ namespace keepass2android
 					
 					builder.SetPositiveButton(GetString(Resource.String.SaveAttachmentDialog_save), (dlgSender, dlgEvt) => 
 					                                                                                                                    {
-							WriteBinaryToFile(btnSender.Text, false);
+							
 						});
 					
 					builder.SetNegativeButton(GetString(Resource.String.SaveAttachmentDialog_open), (dlgSender, dlgEvt) => 
 					                                                                                                                   {
-							Android.Net.Uri newUri = WriteBinaryToFile(btnSender.Text, true);
-						if (newUri != null)
-						{
-								OpenBinaryFile(newUri);
-						}
+							
 						});
 
 					Dialog dialog = builder.Create();
@@ -366,10 +631,10 @@ namespace keepass2android
 
 				};
 				binariesGroup.AddView(binaryButton,layoutParams);
+				*/
 
-				
 			}
-			FindViewById(Resource.Id.entry_binaries_label).Visibility = Entry.Binaries.UCount > 0 ? ViewStates.Visible : ViewStates.Gone;
+			FindViewById(Resource.Id.entry_binaries_label).Visibility = Entry.Binaries.Any() ? ViewStates.Visible : ViewStates.Gone;
 		}
 
 		// url = file path or whatever suitable URL you want.
@@ -377,7 +642,8 @@ namespace keepass2android
 		{
 			String type = null;
 			String extension = MimeTypeMap.GetFileExtensionFromUrl(url);
-			if (extension != null) {
+			if (extension != null)
+			{
 				MimeTypeMap mime = MimeTypeMap.Singleton;
 				type = mime.GetMimeTypeFromExtension(extension);
 			}
@@ -390,156 +656,244 @@ namespace keepass2android
 			OverridePendingTransition(Resource.Animation.anim_enter_back, Resource.Animation.anim_leave_back);
 		}
 
-		protected void FillData(bool trimList)
+		protected void FillData()
 		{
 			_protectedTextViews = new List<TextView>();
-			ImageView iv = (ImageView)FindViewById(Resource.Id.entry_icon);
+			ImageView iv = (ImageView) FindViewById(Resource.Id.entry_icon);
 			if (iv != null)
 			{
-			App.Kp2a.GetDb().DrawableFactory.AssignDrawableTo(iv, Resources, App.Kp2a.GetDb().KpDatabase, Entry.IconId, Entry.CustomIconUuid);
+				iv.SetImageDrawable(Resources.GetDrawable(Resource.Drawable.ic00));
 			}
-			
-			//populateText(Resource.Id.entry_title, _entry.Strings.ReadSafe(PwDefs.TitleField));
-			var button = ((Button)FindViewById(Resource.Id.entry_title));
-			if (button != null)
-			{
-			button.Text = Entry.Strings.ReadSafe(PwDefs.TitleField);
-			button.Click += (sender, e) => {
-				Finish(); };
-			}
-			if (Util.HasActionBar(this))
-			{
-				ActionBar.Title = Entry.Strings.ReadSafe(PwDefs.TitleField);
-				ActionBar.SetDisplayHomeAsUpEnabled(true);
-			}
-			PopulateText(Resource.Id.entry_user_name, Resource.Id.entry_user_name_label, Entry.Strings.ReadSafe(PwDefs.UserNameField));
-			
-			PopulateText(Resource.Id.entry_url, Resource.Id.entry_url_label, Entry.Strings.ReadSafe(PwDefs.UrlField));
-			PopulateText(Resource.Id.entry_password, Resource.Id.entry_password_label, Entry.Strings.ReadSafe(PwDefs.PasswordField));
+
+
+
+			ActionBar.Title = Entry.Strings.ReadSafe(PwDefs.TitleField);
+			ActionBar.SetDisplayHomeAsUpEnabled(true);
+
+			PopulateStandardText(Resource.Id.entry_user_name, Resource.Id.entryfield_container_username, PwDefs.UserNameField);
+			PopulateStandardText(Resource.Id.entry_url, Resource.Id.entryfield_container_url, PwDefs.UrlField);
+			PopulateStandardText(Resource.Id.entry_password, Resource.Id.entryfield_container_password, PwDefs.PasswordField);
 			RegisterProtectedTextView(FindViewById<TextView>(Resource.Id.entry_password));
 			SetPasswordTypeface(FindViewById<TextView>(Resource.Id.entry_password));
-			
-			
-			PopulateText(Resource.Id.entry_created, Resource.Id.entry_created_label, getDateTime(Entry.CreationTime));
-			PopulateText(Resource.Id.entry_modified, Resource.Id.entry_modified_label, getDateTime(Entry.LastModificationTime));
-			
+
+			RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.username_container),
+			                  FindViewById(Resource.Id.username_vdots), PwDefs.UserNameField);
+			RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.url_container),
+			                  FindViewById(Resource.Id.url_vdots), PwDefs.UrlField)
+				.Add(new GotoUrlMenuItem(this));
+			RegisterTextPopup(FindViewById<RelativeLayout>(Resource.Id.password_container),
+			                  FindViewById(Resource.Id.password_vdots), PwDefs.PasswordField);
+
+
+			PopulateText(Resource.Id.entry_created, Resource.Id.entryfield_container_created, getDateTime(Entry.CreationTime));
+			PopulateText(Resource.Id.entry_modified, Resource.Id.entryfield_container_modified, getDateTime(Entry.LastModificationTime));
+
 			if (Entry.Expires)
 			{
-				FindViewById(Resource.Id.entry_expires).Visibility = ViewStates.Visible;
-				FindViewById(Resource.Id.entry_expires_label).Visibility = ViewStates.Visible;
-				
-				PopulateText(Resource.Id.entry_expires, Resource.Id.entry_expires_label, getDateTime(Entry.ExpiryTime));
+				PopulateText(Resource.Id.entry_expires, Resource.Id.entryfield_container_expires, getDateTime(Entry.ExpiryTime));
 
-			} 
+			}
 			else
 			{
-				FindViewById(Resource.Id.entry_expires).Visibility = ViewStates.Gone;
-				FindViewById(Resource.Id.entry_expires_label).Visibility = ViewStates.Gone;
+				PopulateText(Resource.Id.entry_expires, Resource.Id.entryfield_container_expires, null);
 			}
-			PopulateText(Resource.Id.entry_comment, Resource.Id.entry_comment_label, Entry.Strings.ReadSafe(PwDefs.NotesField));
+			PopulateStandardText(Resource.Id.entry_comment, Resource.Id.entryfield_container_comment, PwDefs.NotesField);
+			PopulateText(Resource.Id.entry_tags, Resource.Id.entryfield_container_tags, concatTags(Entry.Tags));
+			PopulateText(Resource.Id.entry_override_url, Resource.Id.entryfield_container_overrideurl, Entry.OverrideUrl);
 
-			PopulateText(Resource.Id.entry_tags, Resource.Id.entry_tags_label, concatTags(Entry.Tags));
+			PopulateExtraStrings();
 
-			PopulateText(Resource.Id.entry_override_url, Resource.Id.entry_override_url_label, Entry.OverrideUrl);
-
-			PopulateExtraStrings(trimList);
-
-			PopulateBinaries(trimList);
+			PopulateBinaries();
 
 			SetPasswordStyle();
 		}
 
+		
+
+		protected override void OnDestroy()
+		{
+			NotifyPluginsOnClose();
+			base.OnDestroy();
+		}
+
+		private void NotifyPluginsOnClose()
+		{
+			Intent i = new Intent(Strings.ActionCloseEntryView);
+			i.PutExtra(Strings.ExtraSender, PackageName);
+			foreach (var plugin in new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeCurrentEntry))
+			{
+				i.SetPackage(plugin);
+				SendBroadcast(i);
+			}
+		}
+		private List<IPopupMenuItem> RegisterTextPopup(View container, View anchor, string fieldKey)
+		{
+			return RegisterTextPopup(container, anchor, fieldKey, Entry.Strings.GetSafe(fieldKey).IsProtected);
+		}
+
+		private List<IPopupMenuItem> RegisterTextPopup(View container, View anchor, string fieldKey, bool isProtected)
+		{
+			string popupKey = Strings.PrefixString + fieldKey;
+			var popupItems = RegisterPopup(
+				popupKey,
+				container,
+				anchor);
+			popupItems.Add(new CopyToClipboardPopupMenuIcon(this, _stringViews[fieldKey]));
+			if (isProtected)
+				popupItems.Add(new ToggleVisibilityPopupMenuItem(this));
+			return popupItems;
+		}
+
+
+
+		private void ShowPopup(View anchor, string popupKey)
+		{
+			//PopupMenu popupMenu = new PopupMenu(this, FindViewById(Resource.Id.entry_user_name));
+			PopupMenu popupMenu = new PopupMenu(this, anchor);
+
+			AccessManager.PreparePopup(popupMenu);
+			int itemId = 0;
+			foreach (IPopupMenuItem popupItem in _popupMenuItems[popupKey])
+			{
+				popupMenu.Menu.Add(0, itemId, 0, popupItem.Text)
+				         .SetIcon(popupItem.Icon);
+				itemId++;
+			}
+
+			popupMenu.MenuItemClick += delegate(object sender, PopupMenu.MenuItemClickEventArgs args)
+				{
+					_popupMenuItems[popupKey][args.Item.ItemId].HandleClick();
+				};
+			popupMenu.Show();
+		}
+
+		
 		private void SetPasswordTypeface(TextView textView)
 		{
 			if (_passwordFont == null)
-				_passwordFont = Typeface.CreateFromAsset(Assets, "DejaVuSansMono.ttf" );
+				_passwordFont = Typeface.CreateFromAsset(Assets, "DejaVuSansMono.ttf");
 			textView.Typeface = _passwordFont;
 		}
 
-		private void PopulateText(int viewId, int headerViewId,int resId) {
-			View header = FindViewById(headerViewId);
-			TextView tv = (TextView)FindViewById(viewId);
-
-			header.Visibility = tv.Visibility = ViewStates.Visible;
-			tv.SetText (resId);
-		}
-		
-		private void PopulateText(int viewId, int headerViewId, String text)
+		private void PopulateText(int viewId, int containerViewId, String text)
 		{
-			View header = FindViewById(headerViewId);
-			TextView tv = (TextView)FindViewById(viewId);
+			View container = FindViewById(containerViewId);
+			TextView tv = (TextView) FindViewById(viewId);
 			if (String.IsNullOrEmpty(text))
 			{
-				header.Visibility = tv.Visibility = ViewStates.Gone;
+				container.Visibility = tv.Visibility = ViewStates.Gone;
 			}
 			else
 			{
-				header.Visibility = tv.Visibility = ViewStates.Visible;
+				container.Visibility = tv.Visibility = ViewStates.Visible;
 				tv.Text = text;
 
 			}
 		}
 
-		void RequiresRefresh ()
+		private void PopulateStandardText(int viewId, int containerViewId, String key)
 		{
-			Intent ret = new Intent ();
-			ret.PutExtra (KeyRefreshPos, _pos);
-			SetResult (KeePass.ExitRefresh, ret);
+			PopulateText(viewId, containerViewId, Entry.Strings.ReadSafe(key));
+			_stringViews.Add(key, new StandardStringView(viewId, containerViewId, this));
 		}
-		
+
+		private void RequiresRefresh()
+		{
+			Intent ret = new Intent();
+			ret.PutExtra(KeyRefreshPos, _pos);
+			_appTask.ToIntent(ret);
+			SetResult(KeePass.ExitRefresh, ret);
+		}
+
 		protected override void OnActivityResult(int requestCode, Result resultCode, Intent data) {
 			base.OnActivityResult(requestCode, resultCode, data);
+			if (AppTask.TryGetFromActivityResult(data, ref _appTask))
+			{
+				//make sure app task is passed to calling activity.
+				//the result code might be modified later.
+				Intent retData = new Intent();
+				_appTask.ToIntent(retData);
+				SetResult(KeePass.ExitNormal, retData);	
+			}
+
+		
+			
+
 			if ( resultCode == KeePass.ExitRefresh || resultCode == KeePass.ExitRefreshTitle ) {
-				FillData(true);
 				if ( resultCode == KeePass.ExitRefreshTitle ) {
 					RequiresRefresh ();
 				}
+				Recreate();
 			}
 		}
-		
-		public override bool OnCreateOptionsMenu(IMenu menu) {
+
+		public override bool OnCreateOptionsMenu(IMenu menu)
+		{
+			_menu = menu;
 			base.OnCreateOptionsMenu(menu);
 
 			MenuInflater inflater = MenuInflater;
 			inflater.Inflate(Resource.Menu.entry, menu);
-			
-			IMenuItem togglePassword = menu.FindItem(Resource.Id.menu_toggle_pass);
-			if ( _showPassword ) {
-				togglePassword.SetTitle(Resource.String.menu_hide_password);
-			} else {
-				togglePassword.SetTitle(Resource.String.show_password);
+
+			lock (_pendingMenuOptions)
+			{
+				foreach (var option in _pendingMenuOptions)
+					AddMenuOption(option);
+				_pendingMenuOptions.Clear();
 			}
 
+
+			UpdateTogglePasswordMenu();
+
 			IMenuItem gotoUrl = menu.FindItem(Resource.Id.menu_goto_url);
 			//Disabled IMenuItem copyUser = menu.FindItem(Resource.Id.menu_copy_user);
 			//Disabled IMenuItem copyPass = menu.FindItem(Resource.Id.menu_copy_pass);
-			
+
 			// In API >= 11 onCreateOptionsMenu may be called before onCreate completes
 			// so _entry may not be set
-			if (Entry == null) {
+			if (Entry == null)
+			{
 				gotoUrl.SetVisible(false);
 				//Disabled copyUser.SetVisible(false);
 				//Disabled copyPass.SetVisible(false);
 			}
-			else {
-				String url = Entry.Strings.ReadSafe (PwDefs.UrlField);
-				if (String.IsNullOrEmpty(url)) {
+			else
+			{
+				String url = Entry.Strings.ReadSafe(PwDefs.UrlField);
+				if (String.IsNullOrEmpty(url))
+				{
 					// disable button if url is not available
 					gotoUrl.SetVisible(false);
 				}
-				if ( String.IsNullOrEmpty(Entry.Strings.ReadSafe(PwDefs.UserNameField ))) {
+				if (String.IsNullOrEmpty(Entry.Strings.ReadSafe(PwDefs.UserNameField)))
+				{
 					// disable button if username is not available
 					//Disabled copyUser.SetVisible(false);
 				}
-				if ( String.IsNullOrEmpty(Entry.Strings.ReadSafe(PwDefs.PasswordField ))) {
+				if (String.IsNullOrEmpty(Entry.Strings.ReadSafe(PwDefs.PasswordField)))
+				{
 					// disable button if password is not available
 					//Disabled copyPass.SetVisible(false);
 				}
 			}
 			return true;
 		}
-		
-		private void SetPasswordStyle() {
+
+		private void UpdateTogglePasswordMenu()
+		{
+			IMenuItem togglePassword = _menu.FindItem(Resource.Id.menu_toggle_pass);
+			if (_showPassword)
+			{
+				togglePassword.SetTitle(Resource.String.menu_hide_password);
+			}
+			else
+			{
+				togglePassword.SetTitle(Resource.String.show_password);
+			}
+		}
+
+		private void SetPasswordStyle()
+		{
 			foreach (TextView password in _protectedTextViews)
 			{
 
@@ -553,62 +907,71 @@ namespace keepass2android
 				}
 			}
 		}
+
 		protected override void OnResume()
 		{
 			ClearCache();
 			base.OnResume();
 		}
-		
-		public void ClearCache() {
-			try {
+
+		public void ClearCache()
+		{
+			try
+			{
 				File dir = new File(CacheDir.Path + File.Separator + AttachmentContentProvider.AttachmentCacheSubDir);
-				if (dir.IsDirectory) {
+				if (dir.IsDirectory)
+				{
 					IoUtil.DeleteDir(dir);
 				}
-			} catch (Exception) {
+			}
+			catch (Exception)
+			{
 
 			}
 		}
-		
-		
-		public override bool OnOptionsItemSelected(IMenuItem item) {
-			switch ( item.ItemId ) {
-			case Resource.Id.menu_donate:
-				try {
+
+		public override bool OnOptionsItemSelected(IMenuItem item)
+		{
+			//check if this is a plugin action
+			if ((item.Intent != null) && (item.Intent.Action == Strings.ActionEntryActionSelected))
+			{
+				//yes. let the plugin handle the click:
+				SendBroadcast(item.Intent);
+				return true;
+			}
+
+			switch (item.ItemId)
+			{
+				case Resource.Id.menu_donate:
+					try
+					{
 						Util.GotoDonateUrl(this);
-				} catch (ActivityNotFoundException) {
-					Toast.MakeText(this, Resource.String.error_failed_to_launch_link, ToastLength.Long).Show();
-					return false;
-				}
-				
-				return true;
-			case Resource.Id.menu_toggle_pass:
-				if ( _showPassword ) {
-					item.SetTitle(Resource.String.show_password);
-					_showPassword = false;
-				} else {
-					item.SetTitle(Resource.String.menu_hide_password);
-					_showPassword = true;
-				}
-				SetPasswordStyle();
-				
-				return true;
-				
-			case Resource.Id.menu_goto_url:
-					string url = Entry.Strings.ReadSafe (PwDefs.UrlField);
-				
-				// Default http:// if no protocol specified
-				if ( ! url.Contains("://") ) {
-					url = "http://" + url;
-				}
-				
-				try {
-					Util.GotoUrl(this, url);
-				} catch (ActivityNotFoundException) {
-					Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
-				}
-				return true;
-				/* TODO: required?
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.error_failed_to_launch_link, ToastLength.Long).Show();
+						return false;
+					}
+
+					return true;
+				case Resource.Id.menu_toggle_pass:
+					if (_showPassword)
+					{
+						item.SetTitle(Resource.String.show_password);
+						_showPassword = false;
+					}
+					else
+					{
+						item.SetTitle(Resource.String.menu_hide_password);
+						_showPassword = true;
+					}
+					SetPasswordStyle();
+
+					return true;
+
+				case Resource.Id.menu_goto_url:
+					return GotoUrl();
+			/* TODO: required?
 			case Resource.Id.menu_copy_user:
 				timeoutCopyToClipboard(_entry.Strings.ReadSafe (PwDefs.UserNameField));
 				return true;
@@ -617,30 +980,38 @@ namespace keepass2android
 				timeoutCopyToClipboard(_entry.Strings.ReadSafe (PwDefs.UserNameField));
 				return true;
 				*/
-			case Resource.Id.menu_rate:
-				try {
+				case Resource.Id.menu_rate:
+					try
+					{
 						Util.GotoMarket(this);
-				} catch (ActivityNotFoundException) {
-					Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
-				}
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
+					}
 					return true;
-			case Resource.Id.menu_suggest_improvements:
-				try {
+				case Resource.Id.menu_suggest_improvements:
+					try
+					{
 						Util.GotoUrl(this, Resource.String.SuggestionsURL);
-				} catch (ActivityNotFoundException) {
-					Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
-				}
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
+					}
+					return true;
+				case Resource.Id.menu_lock:
+					return true;
+				case Resource.Id.menu_translate:
+					try
+					{
+						Util.GotoUrl(this, Resource.String.TranslationURL);
+					}
+					catch (ActivityNotFoundException)
+					{
+						Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
+					}
 					return true;
-			case Resource.Id.menu_lock:
-                App.Kp2a.LockDatabase();
-				return true;
-			case Resource.Id.menu_translate:
-				try {
-					Util.GotoUrl(this, Resource.String.TranslationURL);
-				} catch (ActivityNotFoundException) {
-					Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
-				}
-				return true;
 				case Android.Resource.Id.Home:
 					//Currently the action bar only displays the home button when we come from a previous activity.
 					//So we can simply Finish. See this page for information on how to do this in more general (future?) cases:
@@ -651,36 +1022,13 @@ namespace keepass2android
 					return true;
 			}
 
-			
+
 			return base.OnOptionsItemSelected(item);
 		}
 
-		/// <summary>
-		/// brings up a dialog asking the user whether he wants to add the given URL to the entry for automatic finding
-		/// </summary>
-		public void AskAddUrlThenCompleteCreate(string url)
-		{
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.SetTitle(GetString(Resource.String.AddUrlToEntryDialog_title));
-
-			builder.SetMessage(GetString(Resource.String.AddUrlToEntryDialog_text, new Java.Lang.Object[] { url } ));
-
-			builder.SetPositiveButton(GetString(Resource.String.yes), (dlgSender, dlgEvt) =>
-				{
-					AddUrlToEntryThenCompleteCreate(url);
-				});
-
-			builder.SetNegativeButton(GetString(Resource.String.no), (dlgSender, dlgEvt) =>
-			{
-				CompleteOnCreate();
-			});
-
-			Dialog dialog = builder.Create();
-			dialog.Show();
-
-		}
-
-		private void AddUrlToEntryThenCompleteCreate(string url)
+		
+		
+		internal void AddUrlToEntry(string url, Action finishAction)
 		{
 			PwEntry initialEntry = Entry.CloneDeep();
 
@@ -711,17 +1059,71 @@ namespace keepass2android
 			ActionOnFinish closeOrShowError = new ActionOnFinish((success, message) =>
 			{
 				OnFinish.DisplayMessage(this, message);
-				CompleteOnCreate();
+				finishAction();
 			});
 
-			
+
 			RunnableOnFinish runnable = new UpdateEntry(this, App.Kp2a, initialEntry, newEntry, closeOrShowError);
-			
+
 			ProgressTask pt = new ProgressTask(App.Kp2a, this, runnable);
 			pt.Run();
-			
+
+		}	
+		public void ToggleVisibility()
+		{
+			_showPassword = !_showPassword;
+			SetPasswordStyle();
+			UpdateTogglePasswordMenu();
+		}
+
+
+		public bool GotoUrl()
+		{
+			string url = _stringViews[PwDefs.UrlField].Text;
+			if (url == null) return false;
+
+			// Default http:// if no protocol specified
+			if (!url.Contains("://"))
+			{
+				url = "http://" + url;
+			}
+
+			try
+			{
+				Util.GotoUrl(this, url);
+			}
+			catch (ActivityNotFoundException)
+			{
+				Toast.MakeText(this, Resource.String.no_url_handler, ToastLength.Long).Show();
+			}
+			return true;
+		}
+
+		public void AddEntryToIntent(Intent intent)
+		{
+			PluginHost.AddEntryToIntent(intent, App.Kp2a.GetDb().LastOpenedEntry);
+		}
+
+		public void CloseAfterTaskComplete()
+		{
+			//before closing, wait a little to get plugin updates
+			int numPlugins = new PluginDatabase(this).GetPluginsWithAcceptedScope(Strings.ScopeCurrentEntry).Count();
+			var timeToWait = TimeSpan.FromMilliseconds(500*numPlugins);
+			SetProgressBarIndeterminateVisibility(true);
+			_timer = new Timer(obj =>
+				{
+					RunOnUiThread(() =>
+						{
+							//task is completed -> return NullTask
+							Intent resIntent = new Intent();
+							new NullTask().ToIntent(resIntent);
+							SetResult(KeePass.ExitCloseAfterTaskComplete, resIntent);
+							//close activity:
+							Finish();
+						}
+						);
+				},
+				null, timeToWait, TimeSpan.FromMilliseconds(-1));
 		}
 	}
-
-}
-
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs b/src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
new file mode 100644
index 00000000..a1a4207d
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/CopyToClipboardPopupMenuIcon.cs
@@ -0,0 +1,41 @@
+using Android.Content;
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Reperesents the popup menu item in EntryActivity to copy a string to clipboard
+	/// </summary>
+	class CopyToClipboardPopupMenuIcon : IPopupMenuItem
+	{
+		private readonly Context _context;
+		private readonly IStringView _stringView;
+
+		public CopyToClipboardPopupMenuIcon(Context context, IStringView stringView)
+		{
+			_context = context;
+			_stringView = stringView;
+			
+		}
+
+		public Drawable Icon 
+		{ 
+			get
+			{
+				return _context.Resources.GetDrawable(Resource.Drawable.ic_menu_copy_holo_light);
+			}
+		}
+		public string Text
+		{
+			//TODO localize
+			get { return "Copy to clipboard"; }
+		}
+
+		
+		public void HandleClick()
+		{
+			CopyToClipboardService.CopyValueToClipboardWithTimeout(_context, _stringView.Text);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/ExtraStringView.cs b/src/keepass2android/EntryActivityClasses/ExtraStringView.cs
new file mode 100644
index 00000000..65edfb48
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/ExtraStringView.cs
@@ -0,0 +1,44 @@
+using System;
+using Android.Views;
+using Android.Widget;
+
+namespace keepass2android
+{
+	internal class ExtraStringView : IStringView
+	{
+		private readonly View _container;
+		private readonly TextView _valueView;
+		private readonly TextView _keyView;
+
+		public ExtraStringView(LinearLayout container, TextView valueView, TextView keyView)
+		{
+			_container = container;
+			_valueView = valueView;
+			_keyView = keyView;
+		}
+
+		public View View
+		{
+			get { return _container; }
+		}
+
+		public string Text
+		{
+			get { return _valueView.Text; }
+			set
+			{
+				if (String.IsNullOrEmpty(value))
+				{
+					_valueView.Visibility = ViewStates.Gone;
+					_keyView.Visibility = ViewStates.Gone;
+				}
+				else
+				{
+					_valueView.Visibility = ViewStates.Visible;
+					_keyView.Visibility = ViewStates.Visible;
+					_valueView.Text = value;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs b/src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs
new file mode 100644
index 00000000..b1a56d97
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/GotoUrlMenuItem.cs
@@ -0,0 +1,33 @@
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Reperesents the popup menu item in EntryActivity to go to the URL in the field
+	/// </summary>
+	class GotoUrlMenuItem : IPopupMenuItem
+	{
+		private readonly EntryActivity _ctx;
+
+		public GotoUrlMenuItem(EntryActivity ctx)
+		{
+			_ctx = ctx;
+		}
+
+		public Drawable Icon
+		{
+			get { return _ctx.Resources.GetDrawable(Android.Resource.Drawable.IcMenuUpload); }
+		}
+
+		public string Text
+		{
+			get { return _ctx.Resources.GetString(Resource.String.menu_url); }
+		}
+
+		public void HandleClick()
+		{
+			_ctx.GotoUrl();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/IPopupMenuItem.cs b/src/keepass2android/EntryActivityClasses/IPopupMenuItem.cs
new file mode 100644
index 00000000..9cb8c149
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/IPopupMenuItem.cs
@@ -0,0 +1,17 @@
+using System;
+using Android.Graphics.Drawables;
+using KeePassLib;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Interface for popup menu items in EntryActivity
+	/// </summary>
+	internal interface IPopupMenuItem	
+	{
+		Drawable Icon { get; }
+		String Text { get; }
+
+		void HandleClick();
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/IStringView.cs b/src/keepass2android/EntryActivityClasses/IStringView.cs
new file mode 100644
index 00000000..a5c5036c
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/IStringView.cs
@@ -0,0 +1,7 @@
+namespace keepass2android
+{
+	internal interface IStringView
+	{
+		string Text { set; get; }
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs b/src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs
new file mode 100644
index 00000000..38c07867
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/OpenBinaryPopupItem.cs
@@ -0,0 +1,40 @@
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents the popup menu item in EntryActivity to open the associated attachment
+	/// </summary>
+	internal class OpenBinaryPopupItem : IPopupMenuItem
+	{
+		private readonly string _key;
+		private readonly EntryActivity _entryActivity;
+
+		public OpenBinaryPopupItem(string key, EntryActivity entryActivity)
+		{
+			_key = key;
+			_entryActivity = entryActivity;
+		}
+
+		public Drawable Icon
+		{
+			get { return _entryActivity.Resources.GetDrawable(Android.Resource.Drawable.IcMenuShare); }
+		}
+
+		public string Text
+		{
+			get { return _entryActivity.Resources.GetString(Resource.String.SaveAttachmentDialog_open); }
+		}
+
+		public void HandleClick()
+		{
+			Android.Net.Uri newUri = _entryActivity.WriteBinaryToFile(_key, true);
+			if (newUri != null)
+			{
+				_entryActivity.OpenBinaryFile(newUri);
+			}
+			
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/PluginMenuOption.cs b/src/keepass2android/EntryActivityClasses/PluginMenuOption.cs
new file mode 100644
index 00000000..d3e91ef4
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/PluginMenuOption.cs
@@ -0,0 +1,14 @@
+using Android.Content;
+using Android.Graphics.Drawables;
+
+namespace keepass2android
+{
+	class PluginMenuOption
+	{
+		public string DisplayText { get; set; }
+
+		public Drawable Icon { get; set; }
+
+		public Intent Intent { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/PluginPopupMenuItem.cs b/src/keepass2android/EntryActivityClasses/PluginPopupMenuItem.cs
new file mode 100644
index 00000000..779f02ad
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/PluginPopupMenuItem.cs
@@ -0,0 +1,59 @@
+using Android.Content;
+using Android.Graphics.Drawables;
+using Android.OS;
+using Keepass2android.Pluginsdk;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents a popup menu item in EntryActivity which was added by a plugin. The click will therefore broadcast to the plugin.
+	/// </summary>
+	class PluginPopupMenuItem : IPopupMenuItem
+	{
+		private readonly EntryActivity _activity;
+		private readonly string _pluginPackage;
+		private readonly string _fieldId;
+		private readonly string _popupItemId;
+		private readonly string _displayText;
+		private readonly int _iconId;
+		private readonly Bundle _bundleExtra;
+
+		public PluginPopupMenuItem(EntryActivity activity, string pluginPackage, string fieldId, string popupItemId, string displayText, int iconId, Bundle bundleExtra)
+		{
+			_activity = activity;
+			_pluginPackage = pluginPackage;
+			_fieldId = fieldId;
+			_popupItemId = popupItemId;
+			_displayText = displayText;
+			_iconId = iconId;
+			_bundleExtra = bundleExtra;
+		}
+
+		public Drawable Icon 
+		{ 
+			get { return _activity.PackageManager.GetResourcesForApplication(_pluginPackage).GetDrawable(_iconId); }
+		}
+		public string Text 
+		{ 
+			get { return _displayText; } 
+		}
+
+		public string PopupItemId
+		{
+			get { return _popupItemId; }
+		}
+
+		public void HandleClick()
+		{
+			Intent i = new Intent(Strings.ActionEntryActionSelected);
+			i.SetPackage(_pluginPackage);
+			i.PutExtra(Strings.ExtraActionData, _bundleExtra);
+			i.PutExtra(Strings.ExtraFieldId, _fieldId);
+			i.PutExtra(Strings.ExtraSender, _activity.PackageName);
+
+			_activity.AddEntryToIntent(i);
+
+			_activity.SendBroadcast(i);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/StandardStringView.cs b/src/keepass2android/EntryActivityClasses/StandardStringView.cs
new file mode 100644
index 00000000..bcbcb019
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/StandardStringView.cs
@@ -0,0 +1,44 @@
+using System;
+using Android.App;
+using Android.Views;
+using Android.Widget;
+
+namespace keepass2android
+{
+	internal class StandardStringView : IStringView
+	{
+		private readonly int _viewId;
+		private readonly int _containerViewId;
+		private readonly Activity _activity;
+
+		public StandardStringView(int viewId, int containerViewId, Activity activity)
+		{
+			_viewId = viewId;
+			_containerViewId = containerViewId;
+			_activity = activity;
+		}
+
+		public string Text
+		{
+			set
+			{
+				View container = _activity.FindViewById(_containerViewId);
+				TextView tv = (TextView) _activity.FindViewById(_viewId);
+				if (String.IsNullOrEmpty(value))
+				{
+					container.Visibility = tv.Visibility = ViewStates.Gone;
+				}
+				else
+				{
+					container.Visibility = tv.Visibility = ViewStates.Visible;
+					tv.Text = value;
+				}
+			}
+			get
+			{
+				TextView tv = (TextView) _activity.FindViewById(_viewId);
+				return tv.Text;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs b/src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
new file mode 100644
index 00000000..54ff1890
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/ToggleVisibilityPopupMenuItem.cs
@@ -0,0 +1,46 @@
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Reperesents the popup menu item in EntryActivity to toggle visibility of all protected strings (e.g. Password)
+	/// </summary>
+	class ToggleVisibilityPopupMenuItem : IPopupMenuItem
+	{
+		private readonly EntryActivity _activity;
+		
+
+		public ToggleVisibilityPopupMenuItem(EntryActivity activity)
+		{
+			_activity = activity;
+			
+		}
+
+		public Drawable Icon 
+		{ 
+			get
+			{
+				//return new TextDrawable("\uF06E", _activity);
+				return _activity.Resources.GetDrawable(Resource.Drawable.ic_action_eye_open);
+				
+			}
+		}
+		public string Text
+		{
+			get
+			{
+				return _activity.Resources.GetString(
+					_activity._showPassword ? 
+						Resource.String.menu_hide_password 
+						: Resource.String.show_password);
+			}
+		}
+
+		
+		public void HandleClick()
+		{
+			_activity.ToggleVisibility();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs b/src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
new file mode 100644
index 00000000..a90fc61b
--- /dev/null
+++ b/src/keepass2android/EntryActivityClasses/WriteBinaryToFilePopupItem.cs
@@ -0,0 +1,35 @@
+using Android.Graphics.Drawables;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents the popup menu item in EntryActivity to store the binary attachment on SD card
+	/// </summary>
+	internal class WriteBinaryToFilePopupItem : IPopupMenuItem
+	{
+		private readonly string _key;
+		private readonly EntryActivity _activity;
+
+		public WriteBinaryToFilePopupItem(string key, EntryActivity activity)
+		{
+			_key = key;
+			_activity = activity;
+		}
+
+		public Drawable Icon
+		{
+			get { return _activity.Resources.GetDrawable(Android.Resource.Drawable.IcMenuSave); }
+		}
+
+		public string Text
+		{
+			get { return _activity.Resources.GetString(Resource.String.SaveAttachmentDialog_save); }
+		}
+
+		public void HandleClick()
+		{
+			_activity.WriteBinaryToFile(_key, false);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs
index e8826b16..2b747a93 100644
--- a/src/keepass2android/EntryEditActivity.cs
+++ b/src/keepass2android/EntryEditActivity.cs
@@ -601,7 +601,7 @@ namespace keepass2android
 			Intent intent = Intent;
 			intent.PutExtra(IntentContinueWithEditing, true);
 			OverridePendingTransition(0, 0);
-			intent.AddFlags(ActivityFlags.NoAnimation);
+			intent.AddFlags(ActivityFlags.NoAnimation | ActivityFlags.ForwardResult);
 			_closeForReload = true;
 			SetResult(KeePass.ExitRefreshTitle); //probably the entry will be modified -> let the EditActivity refresh to be safe
 			Finish();
@@ -717,9 +717,6 @@ namespace keepass2android
 				}
 				
 				return true;
-			case Resource.Id.menu_cancel_edit:
-				Finish();
-				break;
 			case Resource.Id.menu_rate:
 				try {
 					Util.GotoMarket(this);
diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android/GroupBaseActivity.cs
index 9721e1d8..4949dd65 100644
--- a/src/keepass2android/GroupBaseActivity.cs
+++ b/src/keepass2android/GroupBaseActivity.cs
@@ -70,7 +70,11 @@ namespace keepass2android
 		{
 			base.OnActivityResult(requestCode, resultCode, data);
 
-			AppTask.TryGetFromActivityResult(data, ref AppTask);
+			if (AppTask.TryGetFromActivityResult(data, ref AppTask))
+			{
+				//make sure the app task is passed to the calling activity
+				AppTask.SetActivityResult(this, KeePass.ExitNormal);
+			}
 
 			if (resultCode == Result.Ok)
 			{
@@ -127,7 +131,9 @@ namespace keepass2android
 
 		public override bool OnSearchRequested()
 		{
-			StartActivityForResult(typeof(SearchActivity), 0);
+			Intent i = new Intent(this, typeof(SearchActivity));
+			AppTask.ToIntent(i);
+			StartActivityForResult(i, 0);
 			return true;
 		}
 
@@ -214,35 +220,9 @@ namespace keepass2android
 				titleText = GetText(Resource.String.root);
 			}
 
-			//see if the button for SDK Version < 11 is there
-			Button tv = (Button)FindViewById(Resource.Id.group_name);
-			if (tv != null)
-			{
-				if (Group != null)
-				{
-					tv.Text = titleText;
-				}
-
-				if (clickable)
-				{
-					tv.Click += (sender, e) => 
-					{
-						AppTask.SetActivityResult(this, KeePass.ExitNormal);
-						Finish();
-					};
-				} else
-				{
-					tv.SetCompoundDrawables(null, null, null, null);
-					tv.Clickable = false;
-				}
-			}
-			//ICS?
-			if (Util.HasActionBar(this))
-			{
-				ActionBar.Title = titleText;
-				if (clickable)
-					ActionBar.SetDisplayHomeAsUpEnabled(true);
-			}
+			ActionBar.Title = titleText;
+			if (clickable)
+				ActionBar.SetDisplayHomeAsUpEnabled(true);
 		}
 
 		
@@ -256,6 +236,67 @@ namespace keepass2android
 					ActionBar.SetIcon(drawable);
 			}
 		}
+
+		class SuggestionListener: Java.Lang.Object, SearchView.IOnSuggestionListener
+		{
+			private readonly CursorAdapter _suggestionsAdapter;
+			private readonly GroupBaseActivity _activity;
+			private readonly IMenuItem _searchItem;
+
+
+			public SuggestionListener(CursorAdapter suggestionsAdapter, GroupBaseActivity activity, IMenuItem searchItem)
+			{
+				_suggestionsAdapter = suggestionsAdapter;
+				_activity = activity;
+				_searchItem = searchItem;
+			}
+
+			public bool OnSuggestionClick(int position)
+			{
+				var cursor = _suggestionsAdapter.Cursor;
+				cursor.MoveToPosition(position);
+				string entryIdAsHexString = cursor.GetString(cursor.GetColumnIndexOrThrow(SearchManager.SuggestColumnIntentDataId));
+				EntryActivity.Launch(_activity, App.Kp2a.GetDb().Entries[new PwUuid(MemUtil.HexStringToByteArray(entryIdAsHexString))],-1,_activity.AppTask);
+				((SearchView) _searchItem.ActionView).Iconified = true;
+				return true;
+			}
+
+			public bool OnSuggestionSelect(int position)
+			{
+				return false;
+			}
+		}
+
+		class OnQueryTextListener: Java.Lang.Object, SearchView.IOnQueryTextListener
+		{
+			private readonly GroupBaseActivity _activity;
+
+			public OnQueryTextListener(GroupBaseActivity activity)
+			{
+				_activity = activity;
+			}
+
+			public bool OnQueryTextChange(string newText)
+			{
+				return false;
+			}
+
+			public bool OnQueryTextSubmit(string query)
+			{
+				if (String.IsNullOrEmpty(query))
+					return false; //let the default happen
+
+				Intent searchIntent = new Intent(_activity, typeof(search.SearchResults));
+				searchIntent.SetAction(Intent.ActionSearch); //currently not necessary to set because SearchResults doesn't care, but let's be as close to the default as possible
+				searchIntent.PutExtra(SearchManager.Query, query);
+				//forward appTask:
+				_activity.AppTask.ToIntent(searchIntent);
+
+				_activity.StartActivityForResult(searchIntent, 0);
+				
+				return true;
+			}
+		}
 		
 		public override bool OnCreateOptionsMenu(IMenu menu) {
 			base.OnCreateOptionsMenu(menu);
@@ -264,10 +305,13 @@ namespace keepass2android
 			inflater.Inflate(Resource.Menu.group, menu);
 			if (Util.HasActionBar(this))
 			{
-				var searchManager = (SearchManager) GetSystemService(Context.SearchService);
-				var searchView = (SearchView) menu.FindItem(Resource.Id.menu_search).ActionView;
-
+				var searchManager = (SearchManager) GetSystemService(SearchService);
+				IMenuItem searchItem = menu.FindItem(Resource.Id.menu_search);
+				var searchView = (SearchView) searchItem.ActionView;
+				
 				searchView.SetSearchableInfo(searchManager.GetSearchableInfo(ComponentName));
+				searchView.SetOnSuggestionListener(new SuggestionListener(searchView.SuggestionsAdapter, this, searchItem));
+				searchView.SetOnQueryTextListener(new OnQueryTextListener(this));
 			}
 			var item = menu.FindItem(Resource.Id.menu_sync);
 			if (item != null)
diff --git a/src/keepass2android/KeePass.cs b/src/keepass2android/KeePass.cs
index 50f26c12..ec22af59 100644
--- a/src/keepass2android/KeePass.cs
+++ b/src/keepass2android/KeePass.cs
@@ -28,6 +28,40 @@ using Java.Lang.Reflect;
 using KeePassLib.Serialization;
 using Exception = System.Exception;
 using String = System.String;
+/**
+ * General documentation
+ * 
+ * Activity stack and activity results
+ * ===================================
+ * 
+ * Keepass2Android comprises quite a number of different activities and entry points: The app can be started 
+ * using the launcher icon (-> Activity "Keepass"), or by sending a URL (-> FileSelect), opening a .kdb(x)-file (->Password),
+ * swiping a YubikeyNEO (NfcOtpActivity).
+ * While the database is closed, there is only one activity on the stack: Keepass -> FileSelect <-> Password.
+ * After opening an database (in Password), Password is always the root of the stack (exception: after creating a database, 
+ * FileSelect is the root without Password being open). 
+ * 
+ * Some possible stacks:
+ * Password -> Group ( -> Group (subgroups) ... ) -> EntryView -> EntryEdit
+ *                         (AdvancedSearch Menu)  -> Search -> SearchResults -> EntryView -> EntryEdit
+ *                         (SearchWidget)         -> SearchResults -> EntryView -> EntryEdit
+ * Password -> ShareUrlResults -> EntryView
+ * FileSelect -> Group (after Create DB)
+ * 
+ * 
+ * In each of these activities, an AppTask may be present and must be passed to started activities and ActivityResults
+ * must be returned. Therefore, if any Activity calls { StartActivity(newActivity);Finish(); }, it must specify FLAG_ACTIVITY_FORWARD_RESULT.
+ * 
+ * Further sub-activities may be opened (e.g. Settings -> ExportDb, ...), but these are not necesarrily
+ * part of the AppTask. Then, neither the task has to be passed nor must the sub-activity return an ActivityResult.
+ * 
+ * Activities with AppTasks should check if they get a new AppTask in OnActivityResult.
+ * 
+ * Note: Chrome fires the ActionSend (Share URL) intent with NEW_TASK (i.e. KP2A appears in a separate task, either a new one,
+ * or, if it was running before, in the KP2A task), whereas Firefox doesn't specify that flag and KP2A appears "inside" Firefox.
+ * This means that the AppTask must be cleared for use in Chrome after finding an entry or pressing back button in ShareUrlResults.
+ * This would not be necessary for Firefox where the (Android) Task of standalone KP2A is not affected by the search.
+ */
 
 namespace keepass2android
 {
@@ -51,11 +85,23 @@ namespace keepass2android
 		AppTask _appTask;
 		private ActivityDesign _design;
 
-		protected override void OnCreate (Bundle bundle)
+		protected override void OnCreate(Bundle savedInstanceState)
 		{
-			base.OnCreate (bundle);
+			base.OnCreate(savedInstanceState);
 			_design.ApplyTheme();
-			_appTask = AppTask.GetTaskInOnCreate(bundle, Intent);
+			//see comment to this in PasswordActivity.
+			//Note that this activity is affected even though it's finished when the app is closed because it
+			//seems that the "app launch intent" is re-delivered, so this might end up here.
+			if ((_appTask == null) && (Intent.Flags.HasFlag(ActivityFlags.LaunchedFromHistory)))
+			{
+				_appTask = new NullTask();
+			}
+			else
+			{
+				_appTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);
+			}
+
+
 			Kp2aLog.Log("KeePass.OnCreate");
 		}
 
@@ -241,9 +287,8 @@ namespace keepass2android
 
 			Intent intent = new Intent(this, typeof(FileSelectActivity));
 			_appTask.ToIntent(intent);
-
-
-			StartActivityForResult(intent, 0);
+			intent.AddFlags(ActivityFlags.ForwardResult);
+			StartActivity(intent);
 			Finish();
 			
 		}
@@ -255,11 +300,6 @@ namespace keepass2android
 		}
 
 
-		protected override void OnActivityResult(int requestCode, Result resultCode, Intent data) {
-			base.OnActivityResult(requestCode, resultCode, data);
-			
-			Finish();
-		}
 	}
 }
 
diff --git a/src/keepass2android/LockCloseActivity.cs b/src/keepass2android/LockCloseActivity.cs
index 6c6bf010..e716e472 100644
--- a/src/keepass2android/LockCloseActivity.cs
+++ b/src/keepass2android/LockCloseActivity.cs
@@ -18,6 +18,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
 using System;
 using Android.Content;
 using Android.OS;
+using Android.Runtime;
 using KeePassLib.Serialization;
 
 namespace keepass2android
@@ -41,6 +42,12 @@ namespace keepass2android
 			_design = new ActivityDesign(this);
 		}
 
+		protected LockCloseActivity(IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			_design = new ActivityDesign(this);
+		}
+
 		protected override void OnCreate(Bundle savedInstanceState)
 		{
 			base.OnCreate(savedInstanceState);
@@ -108,10 +115,10 @@ namespace keepass2android
 
 		private class LockCloseActivityBroadcastReceiver : BroadcastReceiver
 		{			
-			readonly LockCloseActivity _service;
-			public LockCloseActivityBroadcastReceiver(LockCloseActivity service)
+			readonly LockCloseActivity _activity;
+			public LockCloseActivityBroadcastReceiver(LockCloseActivity activity)
 			{
-				_service = service;
+				_activity = activity;
 			}
 
 			public override void OnReceive(Context context, Intent intent)
@@ -119,7 +126,7 @@ namespace keepass2android
 				switch (intent.Action)
 				{
 					case Intents.DatabaseLocked:
-						_service.OnLockDatabase();
+						_activity.OnLockDatabase();
 						break;
 					case Intent.ActionScreenOff:
 						App.Kp2a.OnScreenOff();
diff --git a/src/keepass2android/LockCloseListActivity.cs b/src/keepass2android/LockCloseListActivity.cs
index 1cf3efa1..a1496a05 100644
--- a/src/keepass2android/LockCloseListActivity.cs
+++ b/src/keepass2android/LockCloseListActivity.cs
@@ -95,10 +95,10 @@ namespace keepass2android
 
 		private class LockCloseListActivityBroadcastReceiver : BroadcastReceiver
 		{
-			readonly LockCloseListActivity _service;
-			public LockCloseListActivityBroadcastReceiver(LockCloseListActivity service)
+			readonly LockCloseListActivity _activity;
+			public LockCloseListActivityBroadcastReceiver(LockCloseListActivity activity)
 			{
-				_service = service;
+				_activity = activity;
 			}
 
 			public override void OnReceive(Context context, Intent intent)
@@ -106,7 +106,7 @@ namespace keepass2android
 				switch (intent.Action)
 				{
 					case Intents.DatabaseLocked:
-						_service.OnLockDatabase();
+						_activity.OnLockDatabase();
 						break;
 					case Intent.ActionScreenOff:
 						App.Kp2a.OnScreenOff();
diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs
index 87d89f82..27806ecc 100644
--- a/src/keepass2android/PasswordActivity.cs
+++ b/src/keepass2android/PasswordActivity.cs
@@ -179,11 +179,11 @@ namespace keepass2android
 			Intent i = new Intent(act, typeof(PasswordActivity));
 			
 			PutIoConnectionToIntent(ioc, i);
-			i.SetFlags(ActivityFlags.ClearTask);
+			i.SetFlags(ActivityFlags.ClearTask | ActivityFlags.ForwardResult);
 
 			appTask.ToIntent(i);
 
-			act.StartActivityForResult(i, 0);
+			act.StartActivity(i);
 			
 		}
 
@@ -198,11 +198,21 @@ namespace keepass2android
 
 			Kp2aLog.Log("PasswordActivity.OnActivityResult "+resultCode+"/"+requestCode);
 
+			AppTask.TryGetFromActivityResult(data, ref AppTask);
+
 			//NOTE: original code from k eepassdroid used switch ((Android.App.Result)requestCode) { (but doesn't work here, although k eepassdroid works)
 			switch(resultCode) {
 
-				case KeePass.ExitNormal: // Returned to this screen using the Back key, treat as locking the database
-					App.Kp2a.LockDatabase();
+				case KeePass.ExitNormal: // Returned to this screen using the Back key
+					if (PreferenceManager.GetDefaultSharedPreferences(this)
+						                 .GetBoolean(GetString(Resource.String.LockWhenNavigateBack_key), false))
+					{
+						App.Kp2a.LockDatabase();	
+					}
+					//by leaving the app with the back button, the user probably wants to cancel the task
+					//The activity might be resumed (through Android's recent tasks list), then use a NullTask:
+					AppTask = new NullTask();
+					Finish();
 					break;
 				case KeePass.ExitLock:
 					// The database has already been locked, and the quick unlock screen will be shown if appropriate
@@ -266,6 +276,7 @@ namespace keepass2android
 			
 		}
 
+
 		private void LoadOtpFile()
 		{
 			new LoadingDialog<object, object, object>(this, true, 
@@ -340,7 +351,19 @@ namespace keepass2android
 
 			Intent i = Intent;
 
-			AppTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);
+			//only load the AppTask if this is the "first" OnCreate (not because of kill/resume, i.e. savedInstanceState==null)
+			// and if the activity is not launched from history (i.e. recent tasks) because this would mean that
+			// the Activity was closed already (user cancelling the task or task complete) but is restarted due recent tasks.
+			// Don't re-start the task (especially bad if tak was complete already)
+			if ((savedInstanceState == null) && (Intent.Flags.HasFlag(ActivityFlags.LaunchedFromHistory)))
+			{
+				AppTask = new NullTask();
+			}
+			else
+			{
+				AppTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);	
+			}
+			
 
 			String action = i.Action;
 			
@@ -470,7 +493,6 @@ namespace keepass2android
 
 				Toast.MakeText(this, GetString(Resource.String.otp_discarded_because_no_db), ToastLength.Long).Show();
 				GoToFileSelectActivity();
-				Finish();
 				return false;
 			}
 
@@ -1096,7 +1118,8 @@ namespace keepass2android
 			Intent intent = new Intent(this, typeof (FileSelectActivity));
 			intent.PutExtra(FileSelectActivity.NoForwardToPasswordActivity, true);
 			AppTask.ToIntent(intent);
-			StartActivityForResult(intent, 0);
+			intent.AddFlags(ActivityFlags.ForwardResult);
+			StartActivity(intent);
 			Finish();
 		}
 
diff --git a/src/keepass2android/Resources/Resource.designer.cs b/src/keepass2android/Resources/Resource.designer.cs
index e0cb5f80..63290ae2 100644
--- a/src/keepass2android/Resources/Resource.designer.cs
+++ b/src/keepass2android/Resources/Resource.designer.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.34011
+//     Laufzeitversion:4.0.30319.34014
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.
@@ -35,46 +35,28 @@ namespace keepass2android
 		{
 			
 			// aapt resource value: 0x7f040000
-			public const int abc_fade_in = 2130968576;
+			public const int anim_enter = 2130968576;
 			
 			// aapt resource value: 0x7f040001
-			public const int abc_fade_out = 2130968577;
+			public const int anim_enter_back = 2130968577;
 			
 			// aapt resource value: 0x7f040002
-			public const int abc_slide_in_bottom = 2130968578;
+			public const int anim_leave = 2130968578;
 			
 			// aapt resource value: 0x7f040003
-			public const int abc_slide_in_top = 2130968579;
+			public const int anim_leave_back = 2130968579;
 			
 			// aapt resource value: 0x7f040004
-			public const int abc_slide_out_bottom = 2130968580;
+			public const int key_preview_fadein = 2130968580;
 			
 			// aapt resource value: 0x7f040005
-			public const int abc_slide_out_top = 2130968581;
+			public const int key_preview_fadeout = 2130968581;
 			
 			// aapt resource value: 0x7f040006
-			public const int anim_enter = 2130968582;
+			public const int mini_keyboard_fadein = 2130968582;
 			
 			// aapt resource value: 0x7f040007
-			public const int anim_enter_back = 2130968583;
-			
-			// aapt resource value: 0x7f040008
-			public const int anim_leave = 2130968584;
-			
-			// aapt resource value: 0x7f040009
-			public const int anim_leave_back = 2130968585;
-			
-			// aapt resource value: 0x7f04000a
-			public const int key_preview_fadein = 2130968586;
-			
-			// aapt resource value: 0x7f04000b
-			public const int key_preview_fadeout = 2130968587;
-			
-			// aapt resource value: 0x7f04000c
-			public const int mini_keyboard_fadein = 2130968588;
-			
-			// aapt resource value: 0x7f04000d
-			public const int mini_keyboard_fadeout = 2130968589;
+			public const int mini_keyboard_fadeout = 2130968583;
 			
 			static Animation()
 			{
@@ -162,249 +144,141 @@ namespace keepass2android
 		public partial class Attribute
 		{
 			
-			// aapt resource value: 0x7f0100ad
-			public const int ActionBarButtonParentStyle = 2130772141;
-			
-			// aapt resource value: 0x7f0100b3
-			public const int AddFieldDrawable = 2130772147;
-			
-			// aapt resource value: 0x7f0100b1
-			public const int CancelDrawable = 2130772145;
-			
-			// aapt resource value: 0x7f0100b7
-			public const int CreateDbDrawable = 2130772151;
-			
-			// aapt resource value: 0x7f0100bb
-			public const int NavigationAcceptDrawable = 2130772155;
-			
-			// aapt resource value: 0x7f0100b4
-			public const int NewEntryDrawable = 2130772148;
-			
-			// aapt resource value: 0x7f0100b2
-			public const int NewGroupDrawable = 2130772146;
-			
-			// aapt resource value: 0x7f0100b5
-			public const int OpenFileDrawable = 2130772149;
-			
-			// aapt resource value: 0x7f0100b6
-			public const int OpenUrlDrawable = 2130772150;
-			
-			// aapt resource value: 0x7f0100ae
-			public const int TextColorGroup = 2130772142;
-			
-			// aapt resource value: 0x7f0100af
-			public const int TextColorHeader = 2130772143;
-			
-			// aapt resource value: 0x7f0100b0
-			public const int TextColorItem = 2130772144;
-			
-			// aapt resource value: 0x7f0100ac
-			public const int TextViewParentStyle = 2130772140;
-			
-			// aapt resource value: 0x7f010029
-			public const int actionBarDivider = 2130772009;
-			
-			// aapt resource value: 0x7f01002a
-			public const int actionBarItemBackground = 2130772010;
-			
-			// aapt resource value: 0x7f010028
-			public const int actionBarSize = 2130772008;
-			
-			// aapt resource value: 0x7f010026
-			public const int actionBarSplitStyle = 2130772006;
-			
-			// aapt resource value: 0x7f010025
-			public const int actionBarStyle = 2130772005;
-			
-			// aapt resource value: 0x7f010022
-			public const int actionBarTabBarStyle = 2130772002;
-			
-			// aapt resource value: 0x7f010021
-			public const int actionBarTabStyle = 2130772001;
-			
-			// aapt resource value: 0x7f010023
-			public const int actionBarTabTextStyle = 2130772003;
-			
-			// aapt resource value: 0x7f010027
-			public const int actionBarWidgetTheme = 2130772007;
-			
-			// aapt resource value: 0x7f010030
-			public const int actionButtonStyle = 2130772016;
-			
-			// aapt resource value: 0x7f010061
-			public const int actionDropDownStyle = 2130772065;
-			
-			// aapt resource value: 0x7f010068
-			public const int actionLayout = 2130772072;
-			
-			// aapt resource value: 0x7f01002b
-			public const int actionMenuTextAppearance = 2130772011;
-			
-			// aapt resource value: 0x7f01002c
-			public const int actionMenuTextColor = 2130772012;
-			
-			// aapt resource value: 0x7f010056
-			public const int actionModeBackground = 2130772054;
-			
-			// aapt resource value: 0x7f010055
-			public const int actionModeCloseButtonStyle = 2130772053;
-			
-			// aapt resource value: 0x7f010058
-			public const int actionModeCloseDrawable = 2130772056;
-			
-			// aapt resource value: 0x7f01005a
-			public const int actionModeCopyDrawable = 2130772058;
-			
-			// aapt resource value: 0x7f010059
-			public const int actionModeCutDrawable = 2130772057;
-			
-			// aapt resource value: 0x7f01005e
-			public const int actionModeFindDrawable = 2130772062;
-			
-			// aapt resource value: 0x7f01005b
-			public const int actionModePasteDrawable = 2130772059;
-			
-			// aapt resource value: 0x7f010060
-			public const int actionModePopupWindowStyle = 2130772064;
-			
-			// aapt resource value: 0x7f01005c
-			public const int actionModeSelectAllDrawable = 2130772060;
-			
-			// aapt resource value: 0x7f01005d
-			public const int actionModeShareDrawable = 2130772061;
-			
-			// aapt resource value: 0x7f010057
-			public const int actionModeSplitBackground = 2130772055;
-			
-			// aapt resource value: 0x7f010054
-			public const int actionModeStyle = 2130772052;
-			
-			// aapt resource value: 0x7f01005f
-			public const int actionModeWebSearchDrawable = 2130772063;
-			
-			// aapt resource value: 0x7f010024
-			public const int actionOverflowButtonStyle = 2130772004;
-			
-			// aapt resource value: 0x7f01006a
-			public const int actionProviderClass = 2130772074;
-			
-			// aapt resource value: 0x7f010069
-			public const int actionViewClass = 2130772073;
-			
-			// aapt resource value: 0x7f010086
-			public const int activityChooserViewStyle = 2130772102;
-			
-			// aapt resource value: 0x7f0100a0
-			public const int afc_badge_file_provider_localfile = 2130772128;
-			
-			// aapt resource value: 0x7f0100a9
-			public const int afc_button_bar_button_style = 2130772137;
-			
-			// aapt resource value: 0x7f0100a8
-			public const int afc_button_bar_style = 2130772136;
-			
-			// aapt resource value: 0x7f01008e
-			public const int afc_button_home = 2130772110;
-			
-			// aapt resource value: 0x7f0100ab
-			public const int afc_color_list_group_view_background = 2130772139;
-			
-			// aapt resource value: 0x7f0100aa
-			public const int afc_color_listview_cache_hint = 2130772138;
-			
-			// aapt resource value: 0x7f010098
-			public const int afc_ic_button_sort_by_date_asc = 2130772120;
-			
-			// aapt resource value: 0x7f010099
-			public const int afc_ic_button_sort_by_date_desc = 2130772121;
-			
-			// aapt resource value: 0x7f01009a
-			public const int afc_ic_button_sort_by_name_asc = 2130772122;
-			
-			// aapt resource value: 0x7f01009b
-			public const int afc_ic_button_sort_by_name_desc = 2130772123;
-			
-			// aapt resource value: 0x7f01009c
-			public const int afc_ic_button_sort_by_size_asc = 2130772124;
-			
-			// aapt resource value: 0x7f01009d
-			public const int afc_ic_button_sort_by_size_desc = 2130772125;
-			
-			// aapt resource value: 0x7f010090
-			public const int afc_ic_menu_gridview = 2130772112;
-			
-			// aapt resource value: 0x7f01008f
-			public const int afc_ic_menu_home = 2130772111;
-			
-			// aapt resource value: 0x7f010091
-			public const int afc_ic_menu_listview = 2130772113;
-			
-			// aapt resource value: 0x7f010092
-			public const int afc_ic_menu_sort_by_date_asc = 2130772114;
-			
-			// aapt resource value: 0x7f010093
-			public const int afc_ic_menu_sort_by_date_desc = 2130772115;
-			
-			// aapt resource value: 0x7f010094
-			public const int afc_ic_menu_sort_by_name_asc = 2130772116;
-			
-			// aapt resource value: 0x7f010095
-			public const int afc_ic_menu_sort_by_name_desc = 2130772117;
-			
-			// aapt resource value: 0x7f010096
-			public const int afc_ic_menu_sort_by_size_asc = 2130772118;
-			
-			// aapt resource value: 0x7f010097
-			public const int afc_ic_menu_sort_by_size_desc = 2130772119;
-			
-			// aapt resource value: 0x7f01009f
-			public const int afc_ic_widget_search_view_action_clear = 2130772127;
-			
-			// aapt resource value: 0x7f01009e
-			public const int afc_ic_widget_search_view_action_search = 2130772126;
-			
-			// aapt resource value: 0x7f0100a6
-			public const int afc_selector_action_navi_left_foreground = 2130772134;
-			
-			// aapt resource value: 0x7f0100a7
-			public const int afc_selector_action_navi_right_foreground = 2130772135;
-			
-			// aapt resource value: 0x7f0100a2
-			public const int afc_selector_button_location = 2130772130;
-			
-			// aapt resource value: 0x7f0100a5
-			public const int afc_selector_button_ok_saveas = 2130772133;
-			
-			// aapt resource value: 0x7f0100a1
-			public const int afc_selector_image_button = 2130772129;
-			
-			// aapt resource value: 0x7f0100a3
-			public const int afc_selector_main_button_navi_left = 2130772131;
-			
-			// aapt resource value: 0x7f0100a4
-			public const int afc_selector_main_button_navi_right = 2130772132;
-			
-			// aapt resource value: 0x7f01008d
-			public const int afc_theme_dialog = 2130772109;
+			// aapt resource value: 0x7f010043
+			public const int ActionBarButtonParentStyle = 2130772035;
 			
 			// aapt resource value: 0x7f010049
-			public const int background = 2130772041;
+			public const int AddFieldDrawable = 2130772041;
+			
+			// aapt resource value: 0x7f010047
+			public const int CancelDrawable = 2130772039;
+			
+			// aapt resource value: 0x7f01004d
+			public const int CreateDbDrawable = 2130772045;
+			
+			// aapt resource value: 0x7f010051
+			public const int NavigationAcceptDrawable = 2130772049;
+			
+			// aapt resource value: 0x7f01004a
+			public const int NewEntryDrawable = 2130772042;
+			
+			// aapt resource value: 0x7f010048
+			public const int NewGroupDrawable = 2130772040;
+			
+			// aapt resource value: 0x7f01004b
+			public const int OpenFileDrawable = 2130772043;
+			
+			// aapt resource value: 0x7f01004c
+			public const int OpenUrlDrawable = 2130772044;
+			
+			// aapt resource value: 0x7f010044
+			public const int TextColorGroup = 2130772036;
+			
+			// aapt resource value: 0x7f010045
+			public const int TextColorHeader = 2130772037;
+			
+			// aapt resource value: 0x7f010046
+			public const int TextColorItem = 2130772038;
+			
+			// aapt resource value: 0x7f010042
+			public const int TextViewParentStyle = 2130772034;
+			
+			// aapt resource value: 0x7f010036
+			public const int afc_badge_file_provider_localfile = 2130772022;
+			
+			// aapt resource value: 0x7f01003f
+			public const int afc_button_bar_button_style = 2130772031;
+			
+			// aapt resource value: 0x7f01003e
+			public const int afc_button_bar_style = 2130772030;
+			
+			// aapt resource value: 0x7f010024
+			public const int afc_button_home = 2130772004;
+			
+			// aapt resource value: 0x7f010041
+			public const int afc_color_list_group_view_background = 2130772033;
+			
+			// aapt resource value: 0x7f010040
+			public const int afc_color_listview_cache_hint = 2130772032;
+			
+			// aapt resource value: 0x7f01002e
+			public const int afc_ic_button_sort_by_date_asc = 2130772014;
+			
+			// aapt resource value: 0x7f01002f
+			public const int afc_ic_button_sort_by_date_desc = 2130772015;
+			
+			// aapt resource value: 0x7f010030
+			public const int afc_ic_button_sort_by_name_asc = 2130772016;
+			
+			// aapt resource value: 0x7f010031
+			public const int afc_ic_button_sort_by_name_desc = 2130772017;
+			
+			// aapt resource value: 0x7f010032
+			public const int afc_ic_button_sort_by_size_asc = 2130772018;
+			
+			// aapt resource value: 0x7f010033
+			public const int afc_ic_button_sort_by_size_desc = 2130772019;
+			
+			// aapt resource value: 0x7f010026
+			public const int afc_ic_menu_gridview = 2130772006;
+			
+			// aapt resource value: 0x7f010025
+			public const int afc_ic_menu_home = 2130772005;
+			
+			// aapt resource value: 0x7f010027
+			public const int afc_ic_menu_listview = 2130772007;
+			
+			// aapt resource value: 0x7f010028
+			public const int afc_ic_menu_sort_by_date_asc = 2130772008;
+			
+			// aapt resource value: 0x7f010029
+			public const int afc_ic_menu_sort_by_date_desc = 2130772009;
+			
+			// aapt resource value: 0x7f01002a
+			public const int afc_ic_menu_sort_by_name_asc = 2130772010;
+			
+			// aapt resource value: 0x7f01002b
+			public const int afc_ic_menu_sort_by_name_desc = 2130772011;
+			
+			// aapt resource value: 0x7f01002c
+			public const int afc_ic_menu_sort_by_size_asc = 2130772012;
+			
+			// aapt resource value: 0x7f01002d
+			public const int afc_ic_menu_sort_by_size_desc = 2130772013;
+			
+			// aapt resource value: 0x7f010035
+			public const int afc_ic_widget_search_view_action_clear = 2130772021;
+			
+			// aapt resource value: 0x7f010034
+			public const int afc_ic_widget_search_view_action_search = 2130772020;
+			
+			// aapt resource value: 0x7f01003c
+			public const int afc_selector_action_navi_left_foreground = 2130772028;
+			
+			// aapt resource value: 0x7f01003d
+			public const int afc_selector_action_navi_right_foreground = 2130772029;
+			
+			// aapt resource value: 0x7f010038
+			public const int afc_selector_button_location = 2130772024;
+			
+			// aapt resource value: 0x7f01003b
+			public const int afc_selector_button_ok_saveas = 2130772027;
+			
+			// aapt resource value: 0x7f010037
+			public const int afc_selector_image_button = 2130772023;
+			
+			// aapt resource value: 0x7f010039
+			public const int afc_selector_main_button_navi_left = 2130772025;
+			
+			// aapt resource value: 0x7f01003a
+			public const int afc_selector_main_button_navi_right = 2130772026;
+			
+			// aapt resource value: 0x7f010023
+			public const int afc_theme_dialog = 2130772003;
 			
 			// aapt resource value: 0x7f01001b
 			public const int backgroundDimAmount = 2130771995;
 			
-			// aapt resource value: 0x7f01004b
-			public const int backgroundSplit = 2130772043;
-			
-			// aapt resource value: 0x7f01004a
-			public const int backgroundStacked = 2130772042;
-			
-			// aapt resource value: 0x7f010032
-			public const int buttonBarButtonStyle = 2130772018;
-			
-			// aapt resource value: 0x7f010031
-			public const int buttonBarStyle = 2130772017;
-			
 			// aapt resource value: 0x7f010001
 			public const int cameraBearing = 2130771969;
 			
@@ -420,89 +294,32 @@ namespace keepass2android
 			// aapt resource value: 0x7f010005
 			public const int cameraZoom = 2130771973;
 			
-			// aapt resource value: 0x7f01008a
-			public const int closable = 2130772106;
+			// aapt resource value: 0x7f010020
+			public const int closable = 2130772000;
 			
-			// aapt resource value: 0x7f01004c
-			public const int customNavigationLayout = 2130772044;
+			// aapt resource value: 0x7f01001e
+			public const int delayTimeSubmission = 2130771998;
 			
-			// aapt resource value: 0x7f010088
-			public const int delayTimeSubmission = 2130772104;
+			// aapt resource value: 0x7f010021
+			public const int enabled = 2130772001;
 			
-			// aapt resource value: 0x7f01006e
-			public const int disableChildrenWhenDisabled = 2130772078;
+			// aapt resource value: 0x7f010052
+			public const int help_text = 2130772050;
 			
-			// aapt resource value: 0x7f010042
-			public const int displayOptions = 2130772034;
+			// aapt resource value: 0x7f010022
+			public const int hint = 2130772002;
 			
-			// aapt resource value: 0x7f010048
-			public const int divider = 2130772040;
-			
-			// aapt resource value: 0x7f010035
-			public const int dividerHorizontal = 2130772021;
-			
-			// aapt resource value: 0x7f010070
-			public const int dividerPadding = 2130772080;
-			
-			// aapt resource value: 0x7f010034
-			public const int dividerVertical = 2130772020;
-			
-			// aapt resource value: 0x7f01003b
-			public const int dropDownListViewStyle = 2130772027;
-			
-			// aapt resource value: 0x7f010062
-			public const int dropdownListPreferredItemHeight = 2130772066;
-			
-			// aapt resource value: 0x7f01008b
-			public const int enabled = 2130772107;
-			
-			// aapt resource value: 0x7f010085
-			public const int expandActivityOverflowButtonDrawable = 2130772101;
-			
-			// aapt resource value: 0x7f010040
-			public const int height = 2130772032;
-			
-			// aapt resource value: 0x7f0100bc
-			public const int help_text = 2130772156;
-			
-			// aapt resource value: 0x7f01008c
-			public const int hint = 2130772108;
-			
-			// aapt resource value: 0x7f01002d
-			public const int homeAsUpIndicator = 2130772013;
-			
-			// aapt resource value: 0x7f01004d
-			public const int homeLayout = 2130772045;
-			
-			// aapt resource value: 0x7f0100ba
-			public const int ic_action_search_drawable = 2130772154;
-			
-			// aapt resource value: 0x7f0100b9
-			public const int ic_launcher_folder_small = 2130772153;
-			
-			// aapt resource value: 0x7f0100b8
-			public const int ic_menu_add_field = 2130772152;
-			
-			// aapt resource value: 0x7f010046
-			public const int icon = 2130772038;
-			
-			// aapt resource value: 0x7f010089
-			public const int iconified = 2130772105;
-			
-			// aapt resource value: 0x7f010074
-			public const int iconifiedByDefault = 2130772084;
+			// aapt resource value: 0x7f010050
+			public const int ic_action_search_drawable = 2130772048;
 			
 			// aapt resource value: 0x7f01004f
-			public const int indeterminateProgressStyle = 2130772047;
+			public const int ic_launcher_folder_small = 2130772047;
 			
-			// aapt resource value: 0x7f010084
-			public const int initialActivityCount = 2130772100;
+			// aapt resource value: 0x7f01004e
+			public const int ic_menu_add_field = 2130772046;
 			
-			// aapt resource value: 0x7f010073
-			public const int isLightTheme = 2130772083;
-			
-			// aapt resource value: 0x7f010051
-			public const int itemPadding = 2130772049;
+			// aapt resource value: 0x7f01001f
+			public const int iconified = 2130771999;
 			
 			// aapt resource value: 0x7f01000f
 			public const int keyBackground = 2130771983;
@@ -534,165 +351,21 @@ namespace keepass2android
 			// aapt resource value: 0x7f010011
 			public const int labelTextSize = 2130771985;
 			
-			// aapt resource value: 0x7f010066
-			public const int listChoiceBackgroundIndicator = 2130772070;
-			
-			// aapt resource value: 0x7f01003c
-			public const int listPopupWindowStyle = 2130772028;
-			
-			// aapt resource value: 0x7f010036
-			public const int listPreferredItemHeight = 2130772022;
-			
-			// aapt resource value: 0x7f010038
-			public const int listPreferredItemHeightLarge = 2130772024;
-			
-			// aapt resource value: 0x7f010037
-			public const int listPreferredItemHeightSmall = 2130772023;
-			
-			// aapt resource value: 0x7f010039
-			public const int listPreferredItemPaddingLeft = 2130772025;
-			
-			// aapt resource value: 0x7f01003a
-			public const int listPreferredItemPaddingRight = 2130772026;
-			
-			// aapt resource value: 0x7f010047
-			public const int logo = 2130772039;
-			
 			// aapt resource value: 0x7f010000
 			public const int mapType = 2130771968;
 			
-			// aapt resource value: 0x7f010041
-			public const int navigationMode = 2130772033;
-			
-			// aapt resource value: 0x7f010053
-			public const int paddingEnd = 2130772051;
-			
-			// aapt resource value: 0x7f010052
-			public const int paddingStart = 2130772050;
-			
-			// aapt resource value: 0x7f010065
-			public const int panelMenuListTheme = 2130772069;
-			
-			// aapt resource value: 0x7f010064
-			public const int panelMenuListWidth = 2130772068;
-			
 			// aapt resource value: 0x7f010018
 			public const int popupLayout = 2130771992;
 			
-			// aapt resource value: 0x7f010063
-			public const int popupMenuStyle = 2130772067;
-			
-			// aapt resource value: 0x7f01006d
-			public const int popupPromptView = 2130772077;
-			
-			// aapt resource value: 0x7f010050
-			public const int progressBarPadding = 2130772048;
-			
-			// aapt resource value: 0x7f01004e
-			public const int progressBarStyle = 2130772046;
-			
-			// aapt resource value: 0x7f01006b
-			public const int prompt = 2130772075;
-			
-			// aapt resource value: 0x7f010075
-			public const int queryHint = 2130772085;
-			
-			// aapt resource value: 0x7f010076
-			public const int searchDropdownBackground = 2130772086;
-			
-			// aapt resource value: 0x7f01007f
-			public const int searchResultListItemHeight = 2130772095;
-			
-			// aapt resource value: 0x7f010083
-			public const int searchViewAutoCompleteTextView = 2130772099;
-			
-			// aapt resource value: 0x7f010077
-			public const int searchViewCloseIcon = 2130772087;
-			
-			// aapt resource value: 0x7f01007b
-			public const int searchViewEditQuery = 2130772091;
-			
-			// aapt resource value: 0x7f01007c
-			public const int searchViewEditQueryBackground = 2130772092;
-			
-			// aapt resource value: 0x7f010078
-			public const int searchViewGoIcon = 2130772088;
-			
-			// aapt resource value: 0x7f010079
-			public const int searchViewSearchIcon = 2130772089;
-			
-			// aapt resource value: 0x7f01007d
-			public const int searchViewTextField = 2130772093;
-			
-			// aapt resource value: 0x7f01007e
-			public const int searchViewTextFieldRight = 2130772094;
-			
-			// aapt resource value: 0x7f01007a
-			public const int searchViewVoiceIcon = 2130772090;
-			
-			// aapt resource value: 0x7f010033
-			public const int selectableItemBackground = 2130772019;
-			
 			// aapt resource value: 0x7f010019
 			public const int shadowColor = 2130771993;
 			
 			// aapt resource value: 0x7f01001a
 			public const int shadowRadius = 2130771994;
 			
-			// aapt resource value: 0x7f010067
-			public const int showAsAction = 2130772071;
-			
-			// aapt resource value: 0x7f01006f
-			public const int showDividers = 2130772079;
-			
-			// aapt resource value: 0x7f010072
-			public const int spinnerDropDownItemStyle = 2130772082;
-			
-			// aapt resource value: 0x7f01006c
-			public const int spinnerMode = 2130772076;
-			
-			// aapt resource value: 0x7f010071
-			public const int spinnerStyle = 2130772081;
-			
-			// aapt resource value: 0x7f010043
-			public const int subtitle = 2130772035;
-			
-			// aapt resource value: 0x7f010045
-			public const int subtitleTextStyle = 2130772037;
-			
 			// aapt resource value: 0x7f01001d
 			public const int symbolColorScheme = 2130771997;
 			
-			// aapt resource value: 0x7f010087
-			public const int textAllCaps = 2130772103;
-			
-			// aapt resource value: 0x7f01002e
-			public const int textAppearanceLargePopupMenu = 2130772014;
-			
-			// aapt resource value: 0x7f01003d
-			public const int textAppearanceListItem = 2130772029;
-			
-			// aapt resource value: 0x7f01003e
-			public const int textAppearanceListItemSmall = 2130772030;
-			
-			// aapt resource value: 0x7f010081
-			public const int textAppearanceSearchResultSubtitle = 2130772097;
-			
-			// aapt resource value: 0x7f010080
-			public const int textAppearanceSearchResultTitle = 2130772096;
-			
-			// aapt resource value: 0x7f01002f
-			public const int textAppearanceSmallPopupMenu = 2130772015;
-			
-			// aapt resource value: 0x7f010082
-			public const int textColorSearchUrl = 2130772098;
-			
-			// aapt resource value: 0x7f01003f
-			public const int title = 2130772031;
-			
-			// aapt resource value: 0x7f010044
-			public const int titleTextStyle = 2130772036;
-			
 			// aapt resource value: 0x7f010006
 			public const int uiCompass = 2130771974;
 			
@@ -717,15 +390,6 @@ namespace keepass2android
 			// aapt resource value: 0x7f010017
 			public const int verticalCorrection = 2130771991;
 			
-			// aapt resource value: 0x7f01001e
-			public const int windowActionBar = 2130771998;
-			
-			// aapt resource value: 0x7f01001f
-			public const int windowActionBarOverlay = 2130771999;
-			
-			// aapt resource value: 0x7f010020
-			public const int windowSplitActionBar = 2130772000;
-			
 			// aapt resource value: 0x7f01000d
 			public const int zOrderOnTop = 2130771981;
 			
@@ -742,62 +406,44 @@ namespace keepass2android
 		public partial class Boolean
 		{
 			
-			// aapt resource value: 0x7f0a0019
-			public const int CopyToClipboardNotification_default = 2131361817;
+			// aapt resource value: 0x7f0a0013
+			public const int CopyToClipboardNotification_default = 2131361811;
 			
-			// aapt resource value: 0x7f0a001b
-			public const int OpenKp2aKeyboardAutomatically_default = 2131361819;
-			
-			// aapt resource value: 0x7f0a001d
-			public const int PreloadDatabaseEnabled_default = 2131361821;
-			
-			// aapt resource value: 0x7f0a0018
-			public const int RememberRecentFiles_default = 2131361816;
-			
-			// aapt resource value: 0x7f0a001c
-			public const int ShowUnlockedNotification_default = 2131361820;
+			// aapt resource value: 0x7f0a0015
+			public const int OpenKp2aKeyboardAutomatically_default = 2131361813;
 			
 			// aapt resource value: 0x7f0a0017
-			public const int ShowUsernameInList_default = 2131361815;
+			public const int PreloadDatabaseEnabled_default = 2131361815;
+			
+			// aapt resource value: 0x7f0a0012
+			public const int RememberRecentFiles_default = 2131361810;
 			
 			// aapt resource value: 0x7f0a0016
-			public const int TanExpiresOnUse_default = 2131361814;
-			
-			// aapt resource value: 0x7f0a001a
-			public const int UseKp2aKeyboard_default = 2131361818;
-			
-			// aapt resource value: 0x7f0a0007
-			public const int abc_action_bar_embed_tabs_pre_jb = 2131361799;
-			
-			// aapt resource value: 0x7f0a0008
-			public const int abc_action_bar_expanded_action_views_exclusive = 2131361800;
-			
-			// aapt resource value: 0x7f0a000c
-			public const int abc_config_actionMenuItemAllCaps = 2131361804;
-			
-			// aapt resource value: 0x7f0a000b
-			public const int abc_config_allowActionMenuItemTextWithIcon = 2131361803;
-			
-			// aapt resource value: 0x7f0a000a
-			public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131361802;
-			
-			// aapt resource value: 0x7f0a0009
-			public const int abc_split_action_bar_is_narrow = 2131361801;
-			
-			// aapt resource value: 0x7f0a000d
-			public const int afc_is_large_screen = 2131361805;
+			public const int ShowUnlockedNotification_default = 2131361814;
 			
 			// aapt resource value: 0x7f0a0011
-			public const int afc_pkey_display_remember_last_location_def = 2131361809;
+			public const int ShowUsernameInList_default = 2131361809;
 			
 			// aapt resource value: 0x7f0a0010
-			public const int afc_pkey_display_show_time_for_old_days_def = 2131361808;
+			public const int TanExpiresOnUse_default = 2131361808;
 			
-			// aapt resource value: 0x7f0a000f
-			public const int afc_pkey_display_show_time_for_old_days_this_year_def = 2131361807;
+			// aapt resource value: 0x7f0a0014
+			public const int UseKp2aKeyboard_default = 2131361812;
 			
-			// aapt resource value: 0x7f0a000e
-			public const int afc_pkey_display_sort_ascending_def = 2131361806;
+			// aapt resource value: 0x7f0a0007
+			public const int afc_is_large_screen = 2131361799;
+			
+			// aapt resource value: 0x7f0a000b
+			public const int afc_pkey_display_remember_last_location_def = 2131361803;
+			
+			// aapt resource value: 0x7f0a000a
+			public const int afc_pkey_display_show_time_for_old_days_def = 2131361802;
+			
+			// aapt resource value: 0x7f0a0009
+			public const int afc_pkey_display_show_time_for_old_days_this_year_def = 2131361801;
+			
+			// aapt resource value: 0x7f0a0008
+			public const int afc_pkey_display_sort_ascending_def = 2131361800;
 			
 			// aapt resource value: 0x7f0a0006
 			public const int config_long_press_comma_for_settings_enabled = 2131361798;
@@ -817,17 +463,17 @@ namespace keepass2android
 			// aapt resource value: 0x7f0a0001
 			public const int im_is_default = 2131361793;
 			
-			// aapt resource value: 0x7f0a0013
-			public const int keyfile_default = 2131361811;
+			// aapt resource value: 0x7f0a000d
+			public const int keyfile_default = 2131361805;
 			
-			// aapt resource value: 0x7f0a0012
-			public const int maskpass_default = 2131361810;
+			// aapt resource value: 0x7f0a000c
+			public const int maskpass_default = 2131361804;
 			
-			// aapt resource value: 0x7f0a0015
-			public const int omitbackup_default = 2131361813;
+			// aapt resource value: 0x7f0a000f
+			public const int omitbackup_default = 2131361807;
 			
-			// aapt resource value: 0x7f0a0014
-			public const int sort_default = 2131361812;
+			// aapt resource value: 0x7f0a000e
+			public const int sort_default = 2131361806;
 			
 			// aapt resource value: 0x7f0a0002
 			public const int voice_input_default = 2131361794;
@@ -845,38 +491,23 @@ namespace keepass2android
 		public partial class Color
 		{
 			
-			// aapt resource value: 0x7f070028
-			public const int abc_search_url_text_holo = 2131165224;
-			
 			// aapt resource value: 0x7f070015
-			public const int abc_search_url_text_normal = 2131165205;
-			
-			// aapt resource value: 0x7f070017
-			public const int abc_search_url_text_pressed = 2131165207;
-			
-			// aapt resource value: 0x7f070016
-			public const int abc_search_url_text_selected = 2131165206;
+			public const int afc_border_line_dark = 2131165205;
 			
 			// aapt resource value: 0x7f070018
-			public const int afc_border_line_dark = 2131165208;
-			
-			// aapt resource value: 0x7f07001b
-			public const int afc_list_group_view_background_dark = 2131165211;
-			
-			// aapt resource value: 0x7f07001c
-			public const int afc_list_group_view_background_light = 2131165212;
+			public const int afc_list_group_view_background_dark = 2131165208;
 			
 			// aapt resource value: 0x7f070019
-			public const int afc_listview_cache_hint_dark = 2131165209;
+			public const int afc_list_group_view_background_light = 2131165209;
+			
+			// aapt resource value: 0x7f070016
+			public const int afc_listview_cache_hint_dark = 2131165206;
+			
+			// aapt resource value: 0x7f070017
+			public const int afc_listview_cache_hint_light = 2131165207;
 			
 			// aapt resource value: 0x7f07001a
-			public const int afc_listview_cache_hint_light = 2131165210;
-			
-			// aapt resource value: 0x7f070024
-			public const int bg_gray = 2131165220;
-			
-			// aapt resource value: 0x7f07001d
-			public const int blue_highlight = 2131165213;
+			public const int blue_highlight = 2131165210;
 			
 			// aapt resource value: 0x7f07000a
 			public const int candidate_normal = 2131165194;
@@ -917,35 +548,32 @@ namespace keepass2android
 			// aapt resource value: 0x7f070005
 			public const int common_signin_btn_light_text_pressed = 2131165189;
 			
-			// aapt resource value: 0x7f070029
-			public const int common_signin_btn_text_dark = 2131165225;
-			
-			// aapt resource value: 0x7f07002a
-			public const int common_signin_btn_text_light = 2131165226;
-			
-			// aapt resource value: 0x7f070027
-			public const int dark_gray = 2131165223;
-			
-			// aapt resource value: 0x7f070026
-			public const int element_being_moved = 2131165222;
-			
-			// aapt resource value: 0x7f070022
-			public const int emphasis = 2131165218;
-			
 			// aapt resource value: 0x7f070023
-			public const int emphasis2 = 2131165219;
+			public const int common_signin_btn_text_dark = 2131165219;
 			
-			// aapt resource value: 0x7f07001e
-			public const int group = 2131165214;
-			
-			// aapt resource value: 0x7f070021
-			public const int group_header_button_pressed = 2131165217;
+			// aapt resource value: 0x7f070024
+			public const int common_signin_btn_text_light = 2131165220;
 			
 			// aapt resource value: 0x7f07001f
-			public const int icon_background = 2131165215;
+			public const int dark_gray = 2131165215;
 			
 			// aapt resource value: 0x7f070020
-			public const int icon_text = 2131165216;
+			public const int element_being_moved = 2131165216;
+			
+			// aapt resource value: 0x7f070021
+			public const int emphasis = 2131165217;
+			
+			// aapt resource value: 0x7f070022
+			public const int emphasis2 = 2131165218;
+			
+			// aapt resource value: 0x7f07001b
+			public const int group = 2131165211;
+			
+			// aapt resource value: 0x7f07001c
+			public const int icon_background = 2131165212;
+			
+			// aapt resource value: 0x7f07001d
+			public const int icon_text = 2131165213;
 			
 			// aapt resource value: 0x7f07000f
 			public const int latinkeyboard_bar_language_shadow_black = 2131165199;
@@ -971,8 +599,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f07000d
 			public const int latinkeyboard_transparent = 2131165197;
 			
-			// aapt resource value: 0x7f070025
-			public const int light_gray = 2131165221;
+			// aapt resource value: 0x7f07001e
+			public const int light_gray = 2131165214;
 			
 			static Color()
 			{
@@ -987,131 +615,83 @@ namespace keepass2android
 		public partial class Dimension
 		{
 			
-			// aapt resource value: 0x7f0c0015
-			public const int abc_action_bar_default_height = 2131492885;
-			
-			// aapt resource value: 0x7f0c0016
-			public const int abc_action_bar_icon_vertical_padding = 2131492886;
-			
-			// aapt resource value: 0x7f0c001c
-			public const int abc_action_bar_stacked_max_height = 2131492892;
-			
-			// aapt resource value: 0x7f0c0014
-			public const int abc_action_bar_stacked_tab_max_width = 2131492884;
-			
-			// aapt resource value: 0x7f0c001a
-			public const int abc_action_bar_subtitle_bottom_margin = 2131492890;
-			
-			// aapt resource value: 0x7f0c0018
-			public const int abc_action_bar_subtitle_text_size = 2131492888;
-			
-			// aapt resource value: 0x7f0c0019
-			public const int abc_action_bar_subtitle_top_margin = 2131492889;
-			
-			// aapt resource value: 0x7f0c0017
-			public const int abc_action_bar_title_text_size = 2131492887;
-			
-			// aapt resource value: 0x7f0c001b
-			public const int abc_action_button_min_width = 2131492891;
-			
-			// aapt resource value: 0x7f0c0013
-			public const int abc_config_prefDialogWidth = 2131492883;
-			
-			// aapt resource value: 0x7f0c0022
-			public const int abc_dropdownitem_icon_width = 2131492898;
-			
-			// aapt resource value: 0x7f0c0020
-			public const int abc_dropdownitem_text_padding_left = 2131492896;
-			
-			// aapt resource value: 0x7f0c0021
-			public const int abc_dropdownitem_text_padding_right = 2131492897;
-			
-			// aapt resource value: 0x7f0c001d
-			public const int abc_panel_menu_list_width = 2131492893;
-			
-			// aapt resource value: 0x7f0c001f
-			public const int abc_search_view_preferred_width = 2131492895;
-			
-			// aapt resource value: 0x7f0c001e
-			public const int abc_search_view_text_min_width = 2131492894;
-			
-			// aapt resource value: 0x7f0c003b
-			public const int activity_horizontal_margin = 2131492923;
-			
-			// aapt resource value: 0x7f0c003c
-			public const int activity_vertical_margin = 2131492924;
-			
-			// aapt resource value: 0x7f0c0025
-			public const int afc_10dp = 2131492901;
-			
-			// aapt resource value: 0x7f0c0028
-			public const int afc_10sp = 2131492904;
-			
-			// aapt resource value: 0x7f0c0024
-			public const int afc_15dp = 2131492900;
-			
-			// aapt resource value: 0x7f0c0027
-			public const int afc_2dp = 2131492903;
-			
-			// aapt resource value: 0x7f0c002a
-			public const int afc_2sp = 2131492906;
-			
-			// aapt resource value: 0x7f0c0023
-			public const int afc_30dp = 2131492899;
-			
-			// aapt resource value: 0x7f0c0026
-			public const int afc_5dp = 2131492902;
-			
-			// aapt resource value: 0x7f0c0029
-			public const int afc_5sp = 2131492905;
-			
 			// aapt resource value: 0x7f0c002b
-			public const int afc_button_location_max_width = 2131492907;
+			public const int activity_horizontal_margin = 2131492907;
 			
 			// aapt resource value: 0x7f0c002c
-			public const int afc_button_location_min_width = 2131492908;
+			public const int activity_vertical_margin = 2131492908;
 			
-			// aapt resource value: 0x7f0c0033
-			public const int afc_button_navigators_min_height = 2131492915;
+			// aapt resource value: 0x7f0c0015
+			public const int afc_10dp = 2131492885;
 			
-			// aapt resource value: 0x7f0c0034
-			public const int afc_button_ok_saveas_size = 2131492916;
+			// aapt resource value: 0x7f0c0018
+			public const int afc_10sp = 2131492888;
 			
-			// aapt resource value: 0x7f0c002d
-			public const int afc_context_menu_item_padding = 2131492909;
+			// aapt resource value: 0x7f0c0014
+			public const int afc_15dp = 2131492884;
 			
-			// aapt resource value: 0x7f0c002e
-			public const int afc_context_menu_item_padding_left = 2131492910;
+			// aapt resource value: 0x7f0c0017
+			public const int afc_2dp = 2131492887;
 			
-			// aapt resource value: 0x7f0c002f
-			public const int afc_context_menu_width = 2131492911;
+			// aapt resource value: 0x7f0c001a
+			public const int afc_2sp = 2131492890;
 			
-			// aapt resource value: 0x7f0c0036
-			public const int afc_file_icon_size = 2131492918;
+			// aapt resource value: 0x7f0c0013
+			public const int afc_30dp = 2131492883;
 			
-			// aapt resource value: 0x7f0c0030
-			public const int afc_single_button_min_width = 2131492912;
+			// aapt resource value: 0x7f0c0016
+			public const int afc_5dp = 2131492886;
 			
-			// aapt resource value: 0x7f0c0035
-			public const int afc_thumbnail_size = 2131492917;
+			// aapt resource value: 0x7f0c0019
+			public const int afc_5sp = 2131492889;
 			
-			// aapt resource value: 0x7f0c0031
-			public const int afc_viewgroup_button_locations_bottom_divider_height = 2131492913;
+			// aapt resource value: 0x7f0c001b
+			public const int afc_button_location_max_width = 2131492891;
 			
-			// aapt resource value: 0x7f0c0032
-			public const int afc_widget_search_view_button_clear_size = 2131492914;
+			// aapt resource value: 0x7f0c001c
+			public const int afc_button_location_min_width = 2131492892;
 			
-			// aapt resource value: 0x7f0c0039
-			public const int aosp_dialog_fixed_height_major = 2131492921;
+			// aapt resource value: 0x7f0c0023
+			public const int afc_button_navigators_min_height = 2131492899;
 			
-			// aapt resource value: 0x7f0c003a
-			public const int aosp_dialog_fixed_height_minor = 2131492922;
+			// aapt resource value: 0x7f0c0024
+			public const int afc_button_ok_saveas_size = 2131492900;
 			
-			// aapt resource value: 0x7f0c0037
-			public const int aosp_dialog_fixed_width_major = 2131492919;
+			// aapt resource value: 0x7f0c001d
+			public const int afc_context_menu_item_padding = 2131492893;
 			
-			// aapt resource value: 0x7f0c0038
-			public const int aosp_dialog_fixed_width_minor = 2131492920;
+			// aapt resource value: 0x7f0c001e
+			public const int afc_context_menu_item_padding_left = 2131492894;
+			
+			// aapt resource value: 0x7f0c001f
+			public const int afc_context_menu_width = 2131492895;
+			
+			// aapt resource value: 0x7f0c0026
+			public const int afc_file_icon_size = 2131492902;
+			
+			// aapt resource value: 0x7f0c0020
+			public const int afc_single_button_min_width = 2131492896;
+			
+			// aapt resource value: 0x7f0c0025
+			public const int afc_thumbnail_size = 2131492901;
+			
+			// aapt resource value: 0x7f0c0021
+			public const int afc_viewgroup_button_locations_bottom_divider_height = 2131492897;
+			
+			// aapt resource value: 0x7f0c0022
+			public const int afc_widget_search_view_button_clear_size = 2131492898;
+			
+			// aapt resource value: 0x7f0c0029
+			public const int aosp_dialog_fixed_height_major = 2131492905;
+			
+			// aapt resource value: 0x7f0c002a
+			public const int aosp_dialog_fixed_height_minor = 2131492906;
+			
+			// aapt resource value: 0x7f0c0027
+			public const int aosp_dialog_fixed_width_major = 2131492903;
+			
+			// aapt resource value: 0x7f0c0028
+			public const int aosp_dialog_fixed_width_minor = 2131492904;
 			
 			// aapt resource value: 0x7f0c0004
 			public const int bubble_pointer_offset = 2131492868;
@@ -1184,1453 +764,1201 @@ namespace keepass2android
 		{
 			
 			// aapt resource value: 0x7f020000
-			public const int abc_ab_bottom_solid_dark_holo = 2130837504;
+			public const int afc_badge_file_provider_localfile_dark = 2130837504;
 			
 			// aapt resource value: 0x7f020001
-			public const int abc_ab_bottom_solid_light_holo = 2130837505;
+			public const int afc_badge_file_provider_localfile_light = 2130837505;
 			
 			// aapt resource value: 0x7f020002
-			public const int abc_ab_bottom_transparent_dark_holo = 2130837506;
+			public const int afc_bookmarks_dark = 2130837506;
 			
 			// aapt resource value: 0x7f020003
-			public const int abc_ab_bottom_transparent_light_holo = 2130837507;
+			public const int afc_button_home_dark = 2130837507;
 			
 			// aapt resource value: 0x7f020004
-			public const int abc_ab_share_pack_holo_dark = 2130837508;
+			public const int afc_button_home_light = 2130837508;
 			
 			// aapt resource value: 0x7f020005
-			public const int abc_ab_share_pack_holo_light = 2130837509;
+			public const int afc_button_location_dark_pressed = 2130837509;
 			
 			// aapt resource value: 0x7f020006
-			public const int abc_ab_solid_dark_holo = 2130837510;
+			public const int afc_button_location_light_pressed = 2130837510;
 			
 			// aapt resource value: 0x7f020007
-			public const int abc_ab_solid_light_holo = 2130837511;
+			public const int afc_context_menu_item_divider = 2130837511;
 			
 			// aapt resource value: 0x7f020008
-			public const int abc_ab_stacked_solid_dark_holo = 2130837512;
+			public const int afc_expandable_listview_group_divider = 2130837512;
 			
 			// aapt resource value: 0x7f020009
-			public const int abc_ab_stacked_solid_light_holo = 2130837513;
+			public const int afc_file = 2130837513;
 			
 			// aapt resource value: 0x7f02000a
-			public const int abc_ab_stacked_transparent_dark_holo = 2130837514;
+			public const int afc_file_apk = 2130837514;
 			
 			// aapt resource value: 0x7f02000b
-			public const int abc_ab_stacked_transparent_light_holo = 2130837515;
+			public const int afc_file_audio = 2130837515;
 			
 			// aapt resource value: 0x7f02000c
-			public const int abc_ab_transparent_dark_holo = 2130837516;
+			public const int afc_file_compressed = 2130837516;
 			
 			// aapt resource value: 0x7f02000d
-			public const int abc_ab_transparent_light_holo = 2130837517;
+			public const int afc_file_image = 2130837517;
 			
 			// aapt resource value: 0x7f02000e
-			public const int abc_cab_background_bottom_holo_dark = 2130837518;
+			public const int afc_file_kp2a = 2130837518;
 			
 			// aapt resource value: 0x7f02000f
-			public const int abc_cab_background_bottom_holo_light = 2130837519;
+			public const int afc_file_locked_dark = 2130837519;
 			
 			// aapt resource value: 0x7f020010
-			public const int abc_cab_background_top_holo_dark = 2130837520;
+			public const int afc_file_plain_text = 2130837520;
 			
 			// aapt resource value: 0x7f020011
-			public const int abc_cab_background_top_holo_light = 2130837521;
+			public const int afc_file_video = 2130837521;
 			
 			// aapt resource value: 0x7f020012
-			public const int abc_ic_ab_back_holo_dark = 2130837522;
+			public const int afc_folder = 2130837522;
 			
 			// aapt resource value: 0x7f020013
-			public const int abc_ic_ab_back_holo_light = 2130837523;
+			public const int afc_ic_action_clear_dark = 2130837523;
 			
 			// aapt resource value: 0x7f020014
-			public const int abc_ic_cab_done_holo_dark = 2130837524;
+			public const int afc_ic_action_clear_light = 2130837524;
 			
 			// aapt resource value: 0x7f020015
-			public const int abc_ic_cab_done_holo_light = 2130837525;
+			public const int afc_ic_action_navi_left_dark = 2130837525;
 			
 			// aapt resource value: 0x7f020016
-			public const int abc_ic_clear = 2130837526;
+			public const int afc_ic_action_navi_left_dark_disabled = 2130837526;
 			
 			// aapt resource value: 0x7f020017
-			public const int abc_ic_clear_disabled = 2130837527;
+			public const int afc_ic_action_navi_left_light = 2130837527;
 			
 			// aapt resource value: 0x7f020018
-			public const int abc_ic_clear_holo_light = 2130837528;
+			public const int afc_ic_action_navi_left_light_disabled = 2130837528;
 			
 			// aapt resource value: 0x7f020019
-			public const int abc_ic_clear_normal = 2130837529;
+			public const int afc_ic_action_navi_right_dark = 2130837529;
 			
 			// aapt resource value: 0x7f02001a
-			public const int abc_ic_clear_search_api_disabled_holo_light = 2130837530;
+			public const int afc_ic_action_navi_right_dark_disabled = 2130837530;
 			
 			// aapt resource value: 0x7f02001b
-			public const int abc_ic_clear_search_api_holo_light = 2130837531;
+			public const int afc_ic_action_navi_right_light = 2130837531;
 			
 			// aapt resource value: 0x7f02001c
-			public const int abc_ic_commit_search_api_holo_dark = 2130837532;
+			public const int afc_ic_action_navi_right_light_disabled = 2130837532;
 			
 			// aapt resource value: 0x7f02001d
-			public const int abc_ic_commit_search_api_holo_light = 2130837533;
+			public const int afc_ic_action_search_dark = 2130837533;
 			
 			// aapt resource value: 0x7f02001e
-			public const int abc_ic_go = 2130837534;
+			public const int afc_ic_action_search_light = 2130837534;
 			
 			// aapt resource value: 0x7f02001f
-			public const int abc_ic_go_search_api_holo_light = 2130837535;
+			public const int afc_ic_button_ok_saveas_dark = 2130837535;
 			
 			// aapt resource value: 0x7f020020
-			public const int abc_ic_menu_moreoverflow_normal_holo_dark = 2130837536;
+			public const int afc_ic_button_ok_saveas_dark_focused = 2130837536;
 			
 			// aapt resource value: 0x7f020021
-			public const int abc_ic_menu_moreoverflow_normal_holo_light = 2130837537;
+			public const int afc_ic_button_ok_saveas_dark_pressed = 2130837537;
 			
 			// aapt resource value: 0x7f020022
-			public const int abc_ic_menu_share_holo_dark = 2130837538;
+			public const int afc_ic_button_ok_saveas_light = 2130837538;
 			
 			// aapt resource value: 0x7f020023
-			public const int abc_ic_menu_share_holo_light = 2130837539;
+			public const int afc_ic_button_ok_saveas_light_focused = 2130837539;
 			
 			// aapt resource value: 0x7f020024
-			public const int abc_ic_search = 2130837540;
+			public const int afc_ic_button_ok_saveas_light_pressed = 2130837540;
 			
 			// aapt resource value: 0x7f020025
-			public const int abc_ic_search_api_holo_light = 2130837541;
+			public const int afc_ic_menu_gridview = 2130837541;
 			
 			// aapt resource value: 0x7f020026
-			public const int abc_ic_voice_search = 2130837542;
+			public const int afc_ic_menu_gridview_dark = 2130837542;
 			
 			// aapt resource value: 0x7f020027
-			public const int abc_ic_voice_search_api_holo_light = 2130837543;
+			public const int afc_ic_menu_gridview_light = 2130837543;
 			
 			// aapt resource value: 0x7f020028
-			public const int abc_item_background_holo_dark = 2130837544;
+			public const int afc_ic_menu_home = 2130837544;
 			
 			// aapt resource value: 0x7f020029
-			public const int abc_item_background_holo_light = 2130837545;
+			public const int afc_ic_menu_home_dark = 2130837545;
 			
 			// aapt resource value: 0x7f02002a
-			public const int abc_list_divider_holo_dark = 2130837546;
+			public const int afc_ic_menu_home_light = 2130837546;
 			
 			// aapt resource value: 0x7f02002b
-			public const int abc_list_divider_holo_light = 2130837547;
+			public const int afc_ic_menu_listview = 2130837547;
 			
 			// aapt resource value: 0x7f02002c
-			public const int abc_list_focused_holo = 2130837548;
+			public const int afc_ic_menu_listview_dark = 2130837548;
 			
 			// aapt resource value: 0x7f02002d
-			public const int abc_list_longpressed_holo = 2130837549;
+			public const int afc_ic_menu_listview_light = 2130837549;
 			
 			// aapt resource value: 0x7f02002e
-			public const int abc_list_pressed_holo_dark = 2130837550;
+			public const int afc_ic_menu_sort_by_date_asc = 2130837550;
 			
 			// aapt resource value: 0x7f02002f
-			public const int abc_list_pressed_holo_light = 2130837551;
+			public const int afc_ic_menu_sort_by_date_asc_dark = 2130837551;
 			
 			// aapt resource value: 0x7f020030
-			public const int abc_list_selector_background_transition_holo_dark = 2130837552;
+			public const int afc_ic_menu_sort_by_date_asc_light = 2130837552;
 			
 			// aapt resource value: 0x7f020031
-			public const int abc_list_selector_background_transition_holo_light = 2130837553;
+			public const int afc_ic_menu_sort_by_date_desc = 2130837553;
 			
 			// aapt resource value: 0x7f020032
-			public const int abc_list_selector_disabled_holo_dark = 2130837554;
+			public const int afc_ic_menu_sort_by_date_desc_dark = 2130837554;
 			
 			// aapt resource value: 0x7f020033
-			public const int abc_list_selector_disabled_holo_light = 2130837555;
+			public const int afc_ic_menu_sort_by_date_desc_light = 2130837555;
 			
 			// aapt resource value: 0x7f020034
-			public const int abc_list_selector_holo_dark = 2130837556;
+			public const int afc_ic_menu_sort_by_name_asc = 2130837556;
 			
 			// aapt resource value: 0x7f020035
-			public const int abc_list_selector_holo_light = 2130837557;
+			public const int afc_ic_menu_sort_by_name_asc_dark = 2130837557;
 			
 			// aapt resource value: 0x7f020036
-			public const int abc_menu_dropdown_panel_holo_dark = 2130837558;
+			public const int afc_ic_menu_sort_by_name_asc_light = 2130837558;
 			
 			// aapt resource value: 0x7f020037
-			public const int abc_menu_dropdown_panel_holo_light = 2130837559;
+			public const int afc_ic_menu_sort_by_name_desc = 2130837559;
 			
 			// aapt resource value: 0x7f020038
-			public const int abc_menu_hardkey_panel_holo_dark = 2130837560;
+			public const int afc_ic_menu_sort_by_name_desc_dark = 2130837560;
 			
 			// aapt resource value: 0x7f020039
-			public const int abc_menu_hardkey_panel_holo_light = 2130837561;
+			public const int afc_ic_menu_sort_by_name_desc_light = 2130837561;
 			
 			// aapt resource value: 0x7f02003a
-			public const int abc_search_dropdown_dark = 2130837562;
+			public const int afc_ic_menu_sort_by_size_asc = 2130837562;
 			
 			// aapt resource value: 0x7f02003b
-			public const int abc_search_dropdown_light = 2130837563;
+			public const int afc_ic_menu_sort_by_size_asc_dark = 2130837563;
 			
 			// aapt resource value: 0x7f02003c
-			public const int abc_spinner_ab_default_holo_dark = 2130837564;
+			public const int afc_ic_menu_sort_by_size_asc_light = 2130837564;
 			
 			// aapt resource value: 0x7f02003d
-			public const int abc_spinner_ab_default_holo_light = 2130837565;
+			public const int afc_ic_menu_sort_by_size_desc = 2130837565;
 			
 			// aapt resource value: 0x7f02003e
-			public const int abc_spinner_ab_disabled_holo_dark = 2130837566;
+			public const int afc_ic_menu_sort_by_size_desc_dark = 2130837566;
 			
 			// aapt resource value: 0x7f02003f
-			public const int abc_spinner_ab_disabled_holo_light = 2130837567;
+			public const int afc_ic_menu_sort_by_size_desc_light = 2130837567;
 			
 			// aapt resource value: 0x7f020040
-			public const int abc_spinner_ab_focused_holo_dark = 2130837568;
+			public const int afc_image_button_dark_focused = 2130837568;
 			
 			// aapt resource value: 0x7f020041
-			public const int abc_spinner_ab_focused_holo_light = 2130837569;
+			public const int afc_image_button_dark_pressed = 2130837569;
 			
 			// aapt resource value: 0x7f020042
-			public const int abc_spinner_ab_holo_dark = 2130837570;
+			public const int afc_image_button_light_focused = 2130837570;
 			
 			// aapt resource value: 0x7f020043
-			public const int abc_spinner_ab_holo_light = 2130837571;
+			public const int afc_image_button_light_pressed = 2130837571;
 			
 			// aapt resource value: 0x7f020044
-			public const int abc_spinner_ab_pressed_holo_dark = 2130837572;
+			public const int afc_main_button_navi_left_dark = 2130837572;
 			
 			// aapt resource value: 0x7f020045
-			public const int abc_spinner_ab_pressed_holo_light = 2130837573;
+			public const int afc_main_button_navi_left_disabled_dark = 2130837573;
 			
 			// aapt resource value: 0x7f020046
-			public const int abc_tab_indicator_ab_holo = 2130837574;
+			public const int afc_main_button_navi_left_disabled_light = 2130837574;
 			
 			// aapt resource value: 0x7f020047
-			public const int abc_tab_selected_focused_holo = 2130837575;
+			public const int afc_main_button_navi_left_light = 2130837575;
 			
 			// aapt resource value: 0x7f020048
-			public const int abc_tab_selected_holo = 2130837576;
+			public const int afc_main_button_navi_left_pressed_dark = 2130837576;
 			
 			// aapt resource value: 0x7f020049
-			public const int abc_tab_selected_pressed_holo = 2130837577;
+			public const int afc_main_button_navi_left_pressed_light = 2130837577;
 			
 			// aapt resource value: 0x7f02004a
-			public const int abc_tab_unselected_pressed_holo = 2130837578;
+			public const int afc_main_button_navi_right_dark = 2130837578;
 			
 			// aapt resource value: 0x7f02004b
-			public const int abc_textfield_search_default_holo_dark = 2130837579;
+			public const int afc_main_button_navi_right_disabled_dark = 2130837579;
 			
 			// aapt resource value: 0x7f02004c
-			public const int abc_textfield_search_default_holo_light = 2130837580;
+			public const int afc_main_button_navi_right_disabled_light = 2130837580;
 			
 			// aapt resource value: 0x7f02004d
-			public const int abc_textfield_search_right_default_holo_dark = 2130837581;
+			public const int afc_main_button_navi_right_light = 2130837581;
 			
 			// aapt resource value: 0x7f02004e
-			public const int abc_textfield_search_right_default_holo_light = 2130837582;
+			public const int afc_main_button_navi_right_pressed_dark = 2130837582;
 			
 			// aapt resource value: 0x7f02004f
-			public const int abc_textfield_search_right_selected_holo_dark = 2130837583;
+			public const int afc_main_button_navi_right_pressed_light = 2130837583;
 			
 			// aapt resource value: 0x7f020050
-			public const int abc_textfield_search_right_selected_holo_light = 2130837584;
+			public const int afc_selector_action_navi_left_dark_foreground = 2130837584;
 			
 			// aapt resource value: 0x7f020051
-			public const int abc_textfield_search_selected_holo_dark = 2130837585;
+			public const int afc_selector_action_navi_left_light_foreground = 2130837585;
 			
 			// aapt resource value: 0x7f020052
-			public const int abc_textfield_search_selected_holo_light = 2130837586;
+			public const int afc_selector_action_navi_right_dark_foreground = 2130837586;
 			
 			// aapt resource value: 0x7f020053
-			public const int abc_textfield_searchview_holo_dark = 2130837587;
+			public const int afc_selector_action_navi_right_light_foreground = 2130837587;
 			
 			// aapt resource value: 0x7f020054
-			public const int abc_textfield_searchview_holo_light = 2130837588;
+			public const int afc_selector_button_location_dark = 2130837588;
 			
 			// aapt resource value: 0x7f020055
-			public const int abc_textfield_searchview_right_holo_dark = 2130837589;
+			public const int afc_selector_button_location_light = 2130837589;
 			
 			// aapt resource value: 0x7f020056
-			public const int abc_textfield_searchview_right_holo_light = 2130837590;
+			public const int afc_selector_button_ok_saveas_dark = 2130837590;
 			
 			// aapt resource value: 0x7f020057
-			public const int afc_badge_file_provider_localfile_dark = 2130837591;
+			public const int afc_selector_button_ok_saveas_light = 2130837591;
 			
 			// aapt resource value: 0x7f020058
-			public const int afc_badge_file_provider_localfile_light = 2130837592;
+			public const int afc_selector_image_button_dark = 2130837592;
 			
 			// aapt resource value: 0x7f020059
-			public const int afc_bookmarks_dark = 2130837593;
+			public const int afc_selector_image_button_light = 2130837593;
 			
 			// aapt resource value: 0x7f02005a
-			public const int afc_button_home_dark = 2130837594;
+			public const int afc_selector_main_button_navi_left_dark = 2130837594;
 			
 			// aapt resource value: 0x7f02005b
-			public const int afc_button_home_light = 2130837595;
+			public const int afc_selector_main_button_navi_left_light = 2130837595;
 			
 			// aapt resource value: 0x7f02005c
-			public const int afc_button_location_dark_pressed = 2130837596;
+			public const int afc_selector_main_button_navi_right_dark = 2130837596;
 			
 			// aapt resource value: 0x7f02005d
-			public const int afc_button_location_light_pressed = 2130837597;
+			public const int afc_selector_main_button_navi_right_light = 2130837597;
 			
 			// aapt resource value: 0x7f02005e
-			public const int afc_context_menu_item_divider = 2130837598;
+			public const int afc_view_locations_divider_dark = 2130837598;
 			
 			// aapt resource value: 0x7f02005f
-			public const int afc_expandable_listview_group_divider = 2130837599;
+			public const int aosp_background_holo_dark = 2130837599;
 			
 			// aapt resource value: 0x7f020060
-			public const int afc_file = 2130837600;
+			public const int aosp_background_holo_light = 2130837600;
 			
 			// aapt resource value: 0x7f020061
-			public const int afc_file_apk = 2130837601;
+			public const int aosp_dialog_full_holo_dark = 2130837601;
 			
 			// aapt resource value: 0x7f020062
-			public const int afc_file_audio = 2130837602;
+			public const int aosp_dialog_full_holo_light = 2130837602;
 			
 			// aapt resource value: 0x7f020063
-			public const int afc_file_compressed = 2130837603;
+			public const int BlueButton = 2130837603;
 			
 			// aapt resource value: 0x7f020064
-			public const int afc_file_image = 2130837604;
+			public const int btn_keyboard_key = 2130837604;
 			
 			// aapt resource value: 0x7f020065
-			public const int afc_file_kp2a = 2130837605;
+			public const int btn_keyboard_key2 = 2130837605;
 			
 			// aapt resource value: 0x7f020066
-			public const int afc_file_locked_dark = 2130837606;
+			public const int btn_keyboard_key3 = 2130837606;
 			
 			// aapt resource value: 0x7f020067
-			public const int afc_file_plain_text = 2130837607;
+			public const int btn_keyboard_key_dark_normal = 2130837607;
 			
 			// aapt resource value: 0x7f020068
-			public const int afc_file_video = 2130837608;
+			public const int btn_keyboard_key_dark_normal_off = 2130837608;
 			
 			// aapt resource value: 0x7f020069
-			public const int afc_folder = 2130837609;
+			public const int btn_keyboard_key_dark_normal_on = 2130837609;
 			
 			// aapt resource value: 0x7f02006a
-			public const int afc_ic_action_clear_dark = 2130837610;
+			public const int btn_keyboard_key_dark_pressed = 2130837610;
 			
 			// aapt resource value: 0x7f02006b
-			public const int afc_ic_action_clear_light = 2130837611;
+			public const int btn_keyboard_key_dark_pressed_off = 2130837611;
 			
 			// aapt resource value: 0x7f02006c
-			public const int afc_ic_action_navi_left_dark = 2130837612;
+			public const int btn_keyboard_key_dark_pressed_on = 2130837612;
 			
 			// aapt resource value: 0x7f02006d
-			public const int afc_ic_action_navi_left_dark_disabled = 2130837613;
+			public const int btn_keyboard_key_fulltrans = 2130837613;
 			
 			// aapt resource value: 0x7f02006e
-			public const int afc_ic_action_navi_left_light = 2130837614;
+			public const int btn_keyboard_key_fulltrans_normal = 2130837614;
 			
 			// aapt resource value: 0x7f02006f
-			public const int afc_ic_action_navi_left_light_disabled = 2130837615;
+			public const int btn_keyboard_key_fulltrans_pressed = 2130837615;
 			
 			// aapt resource value: 0x7f020070
-			public const int afc_ic_action_navi_right_dark = 2130837616;
+			public const int btn_keyboard_key_gingerbread = 2130837616;
 			
 			// aapt resource value: 0x7f020071
-			public const int afc_ic_action_navi_right_dark_disabled = 2130837617;
+			public const int btn_keyboard_key_gingerbread_popup = 2130837617;
 			
 			// aapt resource value: 0x7f020072
-			public const int afc_ic_action_navi_right_light = 2130837618;
+			public const int btn_keyboard_key_light_normal = 2130837618;
 			
 			// aapt resource value: 0x7f020073
-			public const int afc_ic_action_navi_right_light_disabled = 2130837619;
+			public const int btn_keyboard_key_light_popup_normal = 2130837619;
 			
 			// aapt resource value: 0x7f020074
-			public const int afc_ic_action_search_dark = 2130837620;
+			public const int btn_keyboard_key_light_popup_selected = 2130837620;
 			
 			// aapt resource value: 0x7f020075
-			public const int afc_ic_action_search_light = 2130837621;
+			public const int btn_keyboard_key_light_pressed = 2130837621;
 			
 			// aapt resource value: 0x7f020076
-			public const int afc_ic_button_ok_saveas_dark = 2130837622;
+			public const int btn_keyboard_key_normal = 2130837622;
 			
 			// aapt resource value: 0x7f020077
-			public const int afc_ic_button_ok_saveas_dark_focused = 2130837623;
+			public const int btn_keyboard_key_normal_off = 2130837623;
 			
 			// aapt resource value: 0x7f020078
-			public const int afc_ic_button_ok_saveas_dark_pressed = 2130837624;
+			public const int btn_keyboard_key_normal_off_stone = 2130837624;
 			
 			// aapt resource value: 0x7f020079
-			public const int afc_ic_button_ok_saveas_light = 2130837625;
+			public const int btn_keyboard_key_normal_on = 2130837625;
 			
 			// aapt resource value: 0x7f02007a
-			public const int afc_ic_button_ok_saveas_light_focused = 2130837626;
+			public const int btn_keyboard_key_normal_on_stone = 2130837626;
 			
 			// aapt resource value: 0x7f02007b
-			public const int afc_ic_button_ok_saveas_light_pressed = 2130837627;
+			public const int btn_keyboard_key_normal_stone = 2130837627;
 			
 			// aapt resource value: 0x7f02007c
-			public const int afc_ic_menu_gridview = 2130837628;
+			public const int btn_keyboard_key_pressed = 2130837628;
 			
 			// aapt resource value: 0x7f02007d
-			public const int afc_ic_menu_gridview_dark = 2130837629;
+			public const int btn_keyboard_key_pressed_off = 2130837629;
 			
 			// aapt resource value: 0x7f02007e
-			public const int afc_ic_menu_gridview_light = 2130837630;
+			public const int btn_keyboard_key_pressed_on = 2130837630;
 			
 			// aapt resource value: 0x7f02007f
-			public const int afc_ic_menu_home = 2130837631;
+			public const int btn_keyboard_key_stone = 2130837631;
 			
 			// aapt resource value: 0x7f020080
-			public const int afc_ic_menu_home_dark = 2130837632;
+			public const int btn_new_group = 2130837632;
 			
 			// aapt resource value: 0x7f020081
-			public const int afc_ic_menu_home_light = 2130837633;
+			public const int btn_new_group_dark = 2130837633;
 			
 			// aapt resource value: 0x7f020082
-			public const int afc_ic_menu_listview = 2130837634;
+			public const int btn_new_group_holodark = 2130837634;
 			
 			// aapt resource value: 0x7f020083
-			public const int afc_ic_menu_listview_dark = 2130837635;
+			public const int cancel = 2130837635;
 			
 			// aapt resource value: 0x7f020084
-			public const int afc_ic_menu_listview_light = 2130837636;
+			public const int candidate_feedback_background = 2130837636;
 			
 			// aapt resource value: 0x7f020085
-			public const int afc_ic_menu_sort_by_date_asc = 2130837637;
+			public const int caution = 2130837637;
 			
 			// aapt resource value: 0x7f020086
-			public const int afc_ic_menu_sort_by_date_asc_dark = 2130837638;
+			public const int collections_collection = 2130837638;
 			
 			// aapt resource value: 0x7f020087
-			public const int afc_ic_menu_sort_by_date_asc_light = 2130837639;
+			public const int collections_collection_holodark = 2130837639;
 			
 			// aapt resource value: 0x7f020088
-			public const int afc_ic_menu_sort_by_date_desc = 2130837640;
+			public const int collections_new_label = 2130837640;
 			
 			// aapt resource value: 0x7f020089
-			public const int afc_ic_menu_sort_by_date_desc_dark = 2130837641;
+			public const int collections_new_label_holodark = 2130837641;
 			
 			// aapt resource value: 0x7f02008a
-			public const int afc_ic_menu_sort_by_date_desc_light = 2130837642;
+			public const int common_signin_btn_icon_dark = 2130837642;
 			
 			// aapt resource value: 0x7f02008b
-			public const int afc_ic_menu_sort_by_name_asc = 2130837643;
+			public const int common_signin_btn_icon_disabled_dark = 2130837643;
 			
 			// aapt resource value: 0x7f02008c
-			public const int afc_ic_menu_sort_by_name_asc_dark = 2130837644;
+			public const int common_signin_btn_icon_disabled_focus_dark = 2130837644;
 			
 			// aapt resource value: 0x7f02008d
-			public const int afc_ic_menu_sort_by_name_asc_light = 2130837645;
+			public const int common_signin_btn_icon_disabled_focus_light = 2130837645;
 			
 			// aapt resource value: 0x7f02008e
-			public const int afc_ic_menu_sort_by_name_desc = 2130837646;
+			public const int common_signin_btn_icon_disabled_light = 2130837646;
 			
 			// aapt resource value: 0x7f02008f
-			public const int afc_ic_menu_sort_by_name_desc_dark = 2130837647;
+			public const int common_signin_btn_icon_focus_dark = 2130837647;
 			
 			// aapt resource value: 0x7f020090
-			public const int afc_ic_menu_sort_by_name_desc_light = 2130837648;
+			public const int common_signin_btn_icon_focus_light = 2130837648;
 			
 			// aapt resource value: 0x7f020091
-			public const int afc_ic_menu_sort_by_size_asc = 2130837649;
+			public const int common_signin_btn_icon_light = 2130837649;
 			
 			// aapt resource value: 0x7f020092
-			public const int afc_ic_menu_sort_by_size_asc_dark = 2130837650;
+			public const int common_signin_btn_icon_normal_dark = 2130837650;
 			
 			// aapt resource value: 0x7f020093
-			public const int afc_ic_menu_sort_by_size_asc_light = 2130837651;
+			public const int common_signin_btn_icon_normal_light = 2130837651;
 			
 			// aapt resource value: 0x7f020094
-			public const int afc_ic_menu_sort_by_size_desc = 2130837652;
+			public const int common_signin_btn_icon_pressed_dark = 2130837652;
 			
 			// aapt resource value: 0x7f020095
-			public const int afc_ic_menu_sort_by_size_desc_dark = 2130837653;
+			public const int common_signin_btn_icon_pressed_light = 2130837653;
 			
 			// aapt resource value: 0x7f020096
-			public const int afc_ic_menu_sort_by_size_desc_light = 2130837654;
+			public const int common_signin_btn_text_dark = 2130837654;
 			
 			// aapt resource value: 0x7f020097
-			public const int afc_image_button_dark_focused = 2130837655;
+			public const int common_signin_btn_text_disabled_dark = 2130837655;
 			
 			// aapt resource value: 0x7f020098
-			public const int afc_image_button_dark_pressed = 2130837656;
+			public const int common_signin_btn_text_disabled_focus_dark = 2130837656;
 			
 			// aapt resource value: 0x7f020099
-			public const int afc_image_button_light_focused = 2130837657;
+			public const int common_signin_btn_text_disabled_focus_light = 2130837657;
 			
 			// aapt resource value: 0x7f02009a
-			public const int afc_image_button_light_pressed = 2130837658;
+			public const int common_signin_btn_text_disabled_light = 2130837658;
 			
 			// aapt resource value: 0x7f02009b
-			public const int afc_main_button_navi_left_dark = 2130837659;
+			public const int common_signin_btn_text_focus_dark = 2130837659;
 			
 			// aapt resource value: 0x7f02009c
-			public const int afc_main_button_navi_left_disabled_dark = 2130837660;
+			public const int common_signin_btn_text_focus_light = 2130837660;
 			
 			// aapt resource value: 0x7f02009d
-			public const int afc_main_button_navi_left_disabled_light = 2130837661;
+			public const int common_signin_btn_text_light = 2130837661;
 			
 			// aapt resource value: 0x7f02009e
-			public const int afc_main_button_navi_left_light = 2130837662;
+			public const int common_signin_btn_text_normal_dark = 2130837662;
 			
 			// aapt resource value: 0x7f02009f
-			public const int afc_main_button_navi_left_pressed_dark = 2130837663;
+			public const int common_signin_btn_text_normal_light = 2130837663;
 			
 			// aapt resource value: 0x7f0200a0
-			public const int afc_main_button_navi_left_pressed_light = 2130837664;
+			public const int common_signin_btn_text_pressed_dark = 2130837664;
 			
 			// aapt resource value: 0x7f0200a1
-			public const int afc_main_button_navi_right_dark = 2130837665;
+			public const int common_signin_btn_text_pressed_light = 2130837665;
 			
 			// aapt resource value: 0x7f0200a2
-			public const int afc_main_button_navi_right_disabled_dark = 2130837666;
+			public const int device_access_new_account = 2130837666;
 			
 			// aapt resource value: 0x7f0200a3
-			public const int afc_main_button_navi_right_disabled_light = 2130837667;
+			public const int device_access_new_account_dark = 2130837667;
 			
 			// aapt resource value: 0x7f0200a4
-			public const int afc_main_button_navi_right_light = 2130837668;
+			public const int device_access_new_account_holodark = 2130837668;
 			
 			// aapt resource value: 0x7f0200a5
-			public const int afc_main_button_navi_right_pressed_dark = 2130837669;
+			public const int device_access_not_secure = 2130837669;
 			
 			// aapt resource value: 0x7f0200a6
-			public const int afc_main_button_navi_right_pressed_light = 2130837670;
+			public const int dialog_bubble_step02 = 2130837670;
 			
 			// aapt resource value: 0x7f0200a7
-			public const int afc_selector_action_navi_left_dark_foreground = 2130837671;
+			public const int dialog_bubble_step07 = 2130837671;
 			
 			// aapt resource value: 0x7f0200a8
-			public const int afc_selector_action_navi_left_light_foreground = 2130837672;
+			public const int donate_cake = 2130837672;
 			
 			// aapt resource value: 0x7f0200a9
-			public const int afc_selector_action_navi_right_dark_foreground = 2130837673;
+			public const int EntryFieldHeaderBackground = 2130837673;
 			
 			// aapt resource value: 0x7f0200aa
-			public const int afc_selector_action_navi_right_light_foreground = 2130837674;
+			public const int extra_string_header = 2130837674;
 			
 			// aapt resource value: 0x7f0200ab
-			public const int afc_selector_button_location_dark = 2130837675;
+			public const int GreenButton = 2130837675;
 			
 			// aapt resource value: 0x7f0200ac
-			public const int afc_selector_button_location_light = 2130837676;
+			public const int highlight_pressed = 2130837676;
 			
 			// aapt resource value: 0x7f0200ad
-			public const int afc_selector_button_ok_saveas_dark = 2130837677;
+			public const int hint_popup = 2130837677;
 			
 			// aapt resource value: 0x7f0200ae
-			public const int afc_selector_button_ok_saveas_light = 2130837678;
+			public const int ic00 = 2130837678;
 			
 			// aapt resource value: 0x7f0200af
-			public const int afc_selector_image_button_dark = 2130837679;
+			public const int ic01 = 2130837679;
 			
 			// aapt resource value: 0x7f0200b0
-			public const int afc_selector_image_button_light = 2130837680;
+			public const int ic02 = 2130837680;
 			
 			// aapt resource value: 0x7f0200b1
-			public const int afc_selector_main_button_navi_left_dark = 2130837681;
+			public const int ic03 = 2130837681;
 			
 			// aapt resource value: 0x7f0200b2
-			public const int afc_selector_main_button_navi_left_light = 2130837682;
+			public const int ic04 = 2130837682;
 			
 			// aapt resource value: 0x7f0200b3
-			public const int afc_selector_main_button_navi_right_dark = 2130837683;
+			public const int ic05 = 2130837683;
 			
 			// aapt resource value: 0x7f0200b4
-			public const int afc_selector_main_button_navi_right_light = 2130837684;
+			public const int ic06 = 2130837684;
 			
 			// aapt resource value: 0x7f0200b5
-			public const int afc_view_locations_divider_dark = 2130837685;
+			public const int ic07 = 2130837685;
 			
 			// aapt resource value: 0x7f0200b6
-			public const int aosp_background_holo_dark = 2130837686;
+			public const int ic08 = 2130837686;
 			
 			// aapt resource value: 0x7f0200b7
-			public const int aosp_background_holo_light = 2130837687;
+			public const int ic09 = 2130837687;
 			
 			// aapt resource value: 0x7f0200b8
-			public const int aosp_dialog_full_holo_dark = 2130837688;
+			public const int ic10 = 2130837688;
 			
 			// aapt resource value: 0x7f0200b9
-			public const int aosp_dialog_full_holo_light = 2130837689;
+			public const int ic11 = 2130837689;
 			
 			// aapt resource value: 0x7f0200ba
-			public const int BlueButton = 2130837690;
+			public const int ic12 = 2130837690;
 			
 			// aapt resource value: 0x7f0200bb
-			public const int btn_keyboard_key = 2130837691;
+			public const int ic13 = 2130837691;
 			
 			// aapt resource value: 0x7f0200bc
-			public const int btn_keyboard_key2 = 2130837692;
+			public const int ic14 = 2130837692;
 			
 			// aapt resource value: 0x7f0200bd
-			public const int btn_keyboard_key3 = 2130837693;
+			public const int ic15 = 2130837693;
 			
 			// aapt resource value: 0x7f0200be
-			public const int btn_keyboard_key_dark_normal = 2130837694;
+			public const int ic16 = 2130837694;
 			
 			// aapt resource value: 0x7f0200bf
-			public const int btn_keyboard_key_dark_normal_off = 2130837695;
+			public const int ic17 = 2130837695;
 			
 			// aapt resource value: 0x7f0200c0
-			public const int btn_keyboard_key_dark_normal_on = 2130837696;
+			public const int ic18 = 2130837696;
 			
 			// aapt resource value: 0x7f0200c1
-			public const int btn_keyboard_key_dark_pressed = 2130837697;
+			public const int ic19 = 2130837697;
 			
 			// aapt resource value: 0x7f0200c2
-			public const int btn_keyboard_key_dark_pressed_off = 2130837698;
+			public const int ic20 = 2130837698;
 			
 			// aapt resource value: 0x7f0200c3
-			public const int btn_keyboard_key_dark_pressed_on = 2130837699;
+			public const int ic21 = 2130837699;
 			
 			// aapt resource value: 0x7f0200c4
-			public const int btn_keyboard_key_fulltrans = 2130837700;
+			public const int ic22 = 2130837700;
 			
 			// aapt resource value: 0x7f0200c5
-			public const int btn_keyboard_key_fulltrans_normal = 2130837701;
+			public const int ic23 = 2130837701;
 			
 			// aapt resource value: 0x7f0200c6
-			public const int btn_keyboard_key_fulltrans_pressed = 2130837702;
+			public const int ic24 = 2130837702;
 			
 			// aapt resource value: 0x7f0200c7
-			public const int btn_keyboard_key_gingerbread = 2130837703;
+			public const int ic25 = 2130837703;
 			
 			// aapt resource value: 0x7f0200c8
-			public const int btn_keyboard_key_gingerbread_popup = 2130837704;
+			public const int ic26 = 2130837704;
 			
 			// aapt resource value: 0x7f0200c9
-			public const int btn_keyboard_key_light_normal = 2130837705;
+			public const int ic27 = 2130837705;
 			
 			// aapt resource value: 0x7f0200ca
-			public const int btn_keyboard_key_light_popup_normal = 2130837706;
+			public const int ic28 = 2130837706;
 			
 			// aapt resource value: 0x7f0200cb
-			public const int btn_keyboard_key_light_popup_selected = 2130837707;
+			public const int ic29 = 2130837707;
 			
 			// aapt resource value: 0x7f0200cc
-			public const int btn_keyboard_key_light_pressed = 2130837708;
+			public const int ic30 = 2130837708;
 			
 			// aapt resource value: 0x7f0200cd
-			public const int btn_keyboard_key_normal = 2130837709;
+			public const int ic31 = 2130837709;
 			
 			// aapt resource value: 0x7f0200ce
-			public const int btn_keyboard_key_normal_off = 2130837710;
+			public const int ic32 = 2130837710;
 			
 			// aapt resource value: 0x7f0200cf
-			public const int btn_keyboard_key_normal_off_stone = 2130837711;
+			public const int ic33 = 2130837711;
 			
 			// aapt resource value: 0x7f0200d0
-			public const int btn_keyboard_key_normal_on = 2130837712;
+			public const int ic34 = 2130837712;
 			
 			// aapt resource value: 0x7f0200d1
-			public const int btn_keyboard_key_normal_on_stone = 2130837713;
+			public const int ic35 = 2130837713;
 			
 			// aapt resource value: 0x7f0200d2
-			public const int btn_keyboard_key_normal_stone = 2130837714;
+			public const int ic36 = 2130837714;
 			
 			// aapt resource value: 0x7f0200d3
-			public const int btn_keyboard_key_pressed = 2130837715;
+			public const int ic37 = 2130837715;
 			
 			// aapt resource value: 0x7f0200d4
-			public const int btn_keyboard_key_pressed_off = 2130837716;
+			public const int ic38 = 2130837716;
 			
 			// aapt resource value: 0x7f0200d5
-			public const int btn_keyboard_key_pressed_on = 2130837717;
+			public const int ic39 = 2130837717;
 			
 			// aapt resource value: 0x7f0200d6
-			public const int btn_keyboard_key_stone = 2130837718;
+			public const int ic40 = 2130837718;
 			
 			// aapt resource value: 0x7f0200d7
-			public const int btn_new_group = 2130837719;
+			public const int ic41 = 2130837719;
 			
 			// aapt resource value: 0x7f0200d8
-			public const int btn_new_group_dark = 2130837720;
+			public const int ic42 = 2130837720;
 			
 			// aapt resource value: 0x7f0200d9
-			public const int btn_new_group_holodark = 2130837721;
+			public const int ic43 = 2130837721;
 			
 			// aapt resource value: 0x7f0200da
-			public const int cancel = 2130837722;
+			public const int ic44 = 2130837722;
 			
 			// aapt resource value: 0x7f0200db
-			public const int candidate_feedback_background = 2130837723;
+			public const int ic45 = 2130837723;
 			
 			// aapt resource value: 0x7f0200dc
-			public const int caution = 2130837724;
+			public const int ic46 = 2130837724;
 			
 			// aapt resource value: 0x7f0200dd
-			public const int collections_collection = 2130837725;
+			public const int ic47 = 2130837725;
 			
 			// aapt resource value: 0x7f0200de
-			public const int collections_collection_holodark = 2130837726;
+			public const int ic48 = 2130837726;
 			
 			// aapt resource value: 0x7f0200df
-			public const int collections_new_label = 2130837727;
+			public const int ic49 = 2130837727;
 			
 			// aapt resource value: 0x7f0200e0
-			public const int collections_new_label_holodark = 2130837728;
+			public const int ic50 = 2130837728;
 			
 			// aapt resource value: 0x7f0200e1
-			public const int common_signin_btn_icon_dark = 2130837729;
+			public const int ic51 = 2130837729;
 			
 			// aapt resource value: 0x7f0200e2
-			public const int common_signin_btn_icon_disabled_dark = 2130837730;
+			public const int ic52 = 2130837730;
 			
 			// aapt resource value: 0x7f0200e3
-			public const int common_signin_btn_icon_disabled_focus_dark = 2130837731;
+			public const int ic53 = 2130837731;
 			
 			// aapt resource value: 0x7f0200e4
-			public const int common_signin_btn_icon_disabled_focus_light = 2130837732;
+			public const int ic54 = 2130837732;
 			
 			// aapt resource value: 0x7f0200e5
-			public const int common_signin_btn_icon_disabled_light = 2130837733;
+			public const int ic55 = 2130837733;
 			
 			// aapt resource value: 0x7f0200e6
-			public const int common_signin_btn_icon_focus_dark = 2130837734;
+			public const int ic56 = 2130837734;
 			
 			// aapt resource value: 0x7f0200e7
-			public const int common_signin_btn_icon_focus_light = 2130837735;
+			public const int ic57 = 2130837735;
 			
 			// aapt resource value: 0x7f0200e8
-			public const int common_signin_btn_icon_light = 2130837736;
+			public const int ic58 = 2130837736;
 			
 			// aapt resource value: 0x7f0200e9
-			public const int common_signin_btn_icon_normal_dark = 2130837737;
+			public const int ic59 = 2130837737;
 			
 			// aapt resource value: 0x7f0200ea
-			public const int common_signin_btn_icon_normal_light = 2130837738;
+			public const int ic60 = 2130837738;
 			
 			// aapt resource value: 0x7f0200eb
-			public const int common_signin_btn_icon_pressed_dark = 2130837739;
+			public const int ic61 = 2130837739;
 			
 			// aapt resource value: 0x7f0200ec
-			public const int common_signin_btn_icon_pressed_light = 2130837740;
+			public const int ic62 = 2130837740;
 			
 			// aapt resource value: 0x7f0200ed
-			public const int common_signin_btn_text_dark = 2130837741;
+			public const int ic63 = 2130837741;
 			
 			// aapt resource value: 0x7f0200ee
-			public const int common_signin_btn_text_disabled_dark = 2130837742;
+			public const int ic64 = 2130837742;
 			
 			// aapt resource value: 0x7f0200ef
-			public const int common_signin_btn_text_disabled_focus_dark = 2130837743;
+			public const int ic65 = 2130837743;
 			
 			// aapt resource value: 0x7f0200f0
-			public const int common_signin_btn_text_disabled_focus_light = 2130837744;
+			public const int ic66 = 2130837744;
 			
 			// aapt resource value: 0x7f0200f1
-			public const int common_signin_btn_text_disabled_light = 2130837745;
+			public const int ic67 = 2130837745;
 			
 			// aapt resource value: 0x7f0200f2
-			public const int common_signin_btn_text_focus_dark = 2130837746;
+			public const int ic68 = 2130837746;
 			
 			// aapt resource value: 0x7f0200f3
-			public const int common_signin_btn_text_focus_light = 2130837747;
+			public const int ic99_blank = 2130837747;
 			
 			// aapt resource value: 0x7f0200f4
-			public const int common_signin_btn_text_light = 2130837748;
+			public const int ic_action_eye_open = 2130837748;
 			
 			// aapt resource value: 0x7f0200f5
-			public const int common_signin_btn_text_normal_dark = 2130837749;
+			public const int ic_action_search = 2130837749;
 			
 			// aapt resource value: 0x7f0200f6
-			public const int common_signin_btn_text_normal_light = 2130837750;
+			public const int ic_action_search_holodark = 2130837750;
 			
 			// aapt resource value: 0x7f0200f7
-			public const int common_signin_btn_text_pressed_dark = 2130837751;
+			public const int ic_dialog_keyboard = 2130837751;
 			
 			// aapt resource value: 0x7f0200f8
-			public const int common_signin_btn_text_pressed_light = 2130837752;
+			public const int ic_keepass2android = 2130837752;
 			
 			// aapt resource value: 0x7f0200f9
-			public const int device_access_new_account = 2130837753;
+			public const int ic_keepass2android_nonet = 2130837753;
 			
 			// aapt resource value: 0x7f0200fa
-			public const int device_access_new_account_dark = 2130837754;
+			public const int ic_launcher = 2130837754;
 			
 			// aapt resource value: 0x7f0200fb
-			public const int device_access_new_account_holodark = 2130837755;
+			public const int ic_launcher_folder_small = 2130837755;
 			
 			// aapt resource value: 0x7f0200fc
-			public const int device_access_not_secure = 2130837756;
+			public const int ic_launcher_gray = 2130837756;
 			
 			// aapt resource value: 0x7f0200fd
-			public const int dialog_bubble_step02 = 2130837757;
+			public const int ic_launcher_gray_bday = 2130837757;
 			
 			// aapt resource value: 0x7f0200fe
-			public const int dialog_bubble_step07 = 2130837758;
+			public const int ic_launcher_offline = 2130837758;
 			
 			// aapt resource value: 0x7f0200ff
-			public const int donate_cake = 2130837759;
+			public const int ic_launcher_red = 2130837759;
 			
 			// aapt resource value: 0x7f020100
-			public const int EntryFieldHeaderBackground = 2130837760;
+			public const int ic_menu_add_field_holo_light = 2130837760;
 			
 			// aapt resource value: 0x7f020101
-			public const int extra_string_header = 2130837761;
+			public const int ic_menu_add_field_holodark = 2130837761;
 			
 			// aapt resource value: 0x7f020102
-			public const int GreenButton = 2130837762;
+			public const int ic_menu_copy_holo_light = 2130837762;
 			
 			// aapt resource value: 0x7f020103
-			public const int HeaderButtonBackground = 2130837763;
+			public const int ic_menu_remove_field_holo_light = 2130837763;
 			
 			// aapt resource value: 0x7f020104
-			public const int highlight_pressed = 2130837764;
+			public const int ic_menu_remove_field_holodark = 2130837764;
 			
 			// aapt resource value: 0x7f020105
-			public const int hint_popup = 2130837765;
+			public const int ic_menu_view = 2130837765;
 			
 			// aapt resource value: 0x7f020106
-			public const int ic00 = 2130837766;
+			public const int ic_mic_dialog = 2130837766;
 			
 			// aapt resource value: 0x7f020107
-			public const int ic01 = 2130837767;
+			public const int ic_storage_androidget = 2130837767;
 			
 			// aapt resource value: 0x7f020108
-			public const int ic02 = 2130837768;
+			public const int ic_storage_androidsend = 2130837768;
 			
 			// aapt resource value: 0x7f020109
-			public const int ic03 = 2130837769;
+			public const int ic_storage_dropbox = 2130837769;
 			
 			// aapt resource value: 0x7f02010a
-			public const int ic04 = 2130837770;
+			public const int ic_storage_dropboxKP2A = 2130837770;
 			
 			// aapt resource value: 0x7f02010b
-			public const int ic05 = 2130837771;
+			public const int ic_storage_file = 2130837771;
 			
 			// aapt resource value: 0x7f02010c
-			public const int ic06 = 2130837772;
+			public const int ic_storage_ftp = 2130837772;
 			
 			// aapt resource value: 0x7f02010d
-			public const int ic07 = 2130837773;
+			public const int ic_storage_gdrive = 2130837773;
 			
 			// aapt resource value: 0x7f02010e
-			public const int ic08 = 2130837774;
+			public const int ic_storage_http = 2130837774;
 			
 			// aapt resource value: 0x7f02010f
-			public const int ic09 = 2130837775;
+			public const int ic_storage_https = 2130837775;
 			
 			// aapt resource value: 0x7f020110
-			public const int ic10 = 2130837776;
+			public const int ic_storage_sftp = 2130837776;
 			
 			// aapt resource value: 0x7f020111
-			public const int ic11 = 2130837777;
+			public const int ic_storage_skydrive = 2130837777;
 			
 			// aapt resource value: 0x7f020112
-			public const int ic12 = 2130837778;
+			public const int ic_subtype_keyboard = 2130837778;
 			
 			// aapt resource value: 0x7f020113
-			public const int ic13 = 2130837779;
+			public const int ic_subtype_mic = 2130837779;
 			
 			// aapt resource value: 0x7f020114
-			public const int ic14 = 2130837780;
+			public const int ic_suggest_scroll_background = 2130837780;
 			
 			// aapt resource value: 0x7f020115
-			public const int ic15 = 2130837781;
+			public const int ic_suggest_strip_microphone = 2130837781;
 			
 			// aapt resource value: 0x7f020116
-			public const int ic16 = 2130837782;
+			public const int ic_suggest_strip_microphone_swipe = 2130837782;
 			
 			// aapt resource value: 0x7f020117
-			public const int ic17 = 2130837783;
+			public const int ic_unlocked_gray = 2130837783;
 			
 			// aapt resource value: 0x7f020118
-			public const int ic18 = 2130837784;
+			public const int keyboard_background = 2130837784;
 			
 			// aapt resource value: 0x7f020119
-			public const int ic19 = 2130837785;
+			public const int keyboard_dark_background = 2130837785;
 			
 			// aapt resource value: 0x7f02011a
-			public const int ic20 = 2130837786;
+			public const int keyboard_hint_0 = 2130837786;
 			
 			// aapt resource value: 0x7f02011b
-			public const int ic21 = 2130837787;
+			public const int keyboard_hint_1 = 2130837787;
 			
 			// aapt resource value: 0x7f02011c
-			public const int ic22 = 2130837788;
+			public const int keyboard_hint_2 = 2130837788;
 			
 			// aapt resource value: 0x7f02011d
-			public const int ic23 = 2130837789;
+			public const int keyboard_hint_3 = 2130837789;
 			
 			// aapt resource value: 0x7f02011e
-			public const int ic24 = 2130837790;
+			public const int keyboard_hint_4 = 2130837790;
 			
 			// aapt resource value: 0x7f02011f
-			public const int ic25 = 2130837791;
+			public const int keyboard_hint_5 = 2130837791;
 			
 			// aapt resource value: 0x7f020120
-			public const int ic26 = 2130837792;
+			public const int keyboard_hint_6 = 2130837792;
 			
 			// aapt resource value: 0x7f020121
-			public const int ic27 = 2130837793;
+			public const int keyboard_hint_7 = 2130837793;
 			
 			// aapt resource value: 0x7f020122
-			public const int ic28 = 2130837794;
+			public const int keyboard_hint_8 = 2130837794;
 			
 			// aapt resource value: 0x7f020123
-			public const int ic29 = 2130837795;
+			public const int keyboard_hint_9 = 2130837795;
 			
 			// aapt resource value: 0x7f020124
-			public const int ic30 = 2130837796;
+			public const int keyboard_key_feedback = 2130837796;
 			
 			// aapt resource value: 0x7f020125
-			public const int ic31 = 2130837797;
+			public const int keyboard_key_feedback_background = 2130837797;
 			
 			// aapt resource value: 0x7f020126
-			public const int ic32 = 2130837798;
+			public const int keyboard_key_feedback_more_background = 2130837798;
 			
 			// aapt resource value: 0x7f020127
-			public const int ic33 = 2130837799;
+			public const int keyboard_popup_panel_background = 2130837799;
 			
 			// aapt resource value: 0x7f020128
-			public const int ic34 = 2130837800;
+			public const int keyboard_suggest_strip = 2130837800;
 			
 			// aapt resource value: 0x7f020129
-			public const int ic35 = 2130837801;
+			public const int keyboard_suggest_strip_divider = 2130837801;
 			
 			// aapt resource value: 0x7f02012a
-			public const int ic36 = 2130837802;
+			public const int list_selector_background_pressed = 2130837802;
 			
 			// aapt resource value: 0x7f02012b
-			public const int ic37 = 2130837803;
+			public const int location_web_site = 2130837803;
 			
 			// aapt resource value: 0x7f02012c
-			public const int ic38 = 2130837804;
+			public const int location_web_site_holodark = 2130837804;
 			
 			// aapt resource value: 0x7f02012d
-			public const int ic39 = 2130837805;
+			public const int mic_slash = 2130837805;
 			
 			// aapt resource value: 0x7f02012e
-			public const int ic40 = 2130837806;
+			public const int navigation_accept = 2130837806;
 			
 			// aapt resource value: 0x7f02012f
-			public const int ic41 = 2130837807;
+			public const int navigation_accept_dark = 2130837807;
 			
 			// aapt resource value: 0x7f020130
-			public const int ic42 = 2130837808;
+			public const int navigation_cancel = 2130837808;
 			
 			// aapt resource value: 0x7f020131
-			public const int ic43 = 2130837809;
+			public const int navigation_cancel_holodark = 2130837809;
 			
 			// aapt resource value: 0x7f020132
-			public const int ic44 = 2130837810;
+			public const int navigation_previous_item = 2130837810;
 			
 			// aapt resource value: 0x7f020133
-			public const int ic45 = 2130837811;
+			public const int navigation_previous_item_dark = 2130837811;
 			
 			// aapt resource value: 0x7f020134
-			public const int ic46 = 2130837812;
+			public const int notify = 2130837812;
 			
 			// aapt resource value: 0x7f020135
-			public const int ic47 = 2130837813;
+			public const int notify_keyboard = 2130837813;
 			
 			// aapt resource value: 0x7f020136
-			public const int ic48 = 2130837814;
+			public const int ok_cancel = 2130837814;
 			
 			// aapt resource value: 0x7f020137
-			public const int ic49 = 2130837815;
+			public const int oktoberfest = 2130837815;
 			
 			// aapt resource value: 0x7f020138
-			public const int ic50 = 2130837816;
+			public const int old_ic_launcher_gray = 2130837816;
 			
 			// aapt resource value: 0x7f020139
-			public const int ic51 = 2130837817;
+			public const int RedButton = 2130837817;
 			
 			// aapt resource value: 0x7f02013a
-			public const int ic52 = 2130837818;
+			public const int section_header = 2130837818;
 			
 			// aapt resource value: 0x7f02013b
-			public const int ic53 = 2130837819;
+			public const int speak_now_level0 = 2130837819;
 			
 			// aapt resource value: 0x7f02013c
-			public const int ic54 = 2130837820;
+			public const int speak_now_level1 = 2130837820;
 			
 			// aapt resource value: 0x7f02013d
-			public const int ic55 = 2130837821;
+			public const int speak_now_level2 = 2130837821;
 			
 			// aapt resource value: 0x7f02013e
-			public const int ic56 = 2130837822;
+			public const int speak_now_level3 = 2130837822;
 			
 			// aapt resource value: 0x7f02013f
-			public const int ic57 = 2130837823;
+			public const int speak_now_level4 = 2130837823;
 			
 			// aapt resource value: 0x7f020140
-			public const int ic58 = 2130837824;
+			public const int speak_now_level5 = 2130837824;
 			
 			// aapt resource value: 0x7f020141
-			public const int ic59 = 2130837825;
+			public const int speak_now_level6 = 2130837825;
 			
 			// aapt resource value: 0x7f020142
-			public const int ic60 = 2130837826;
+			public const int sym_bkeyboard_123_mic = 2130837826;
 			
 			// aapt resource value: 0x7f020143
-			public const int ic61 = 2130837827;
+			public const int sym_bkeyboard_delete = 2130837827;
 			
 			// aapt resource value: 0x7f020144
-			public const int ic62 = 2130837828;
+			public const int sym_bkeyboard_done = 2130837828;
 			
 			// aapt resource value: 0x7f020145
-			public const int ic63 = 2130837829;
+			public const int sym_bkeyboard_kp2a = 2130837829;
 			
 			// aapt resource value: 0x7f020146
-			public const int ic64 = 2130837830;
+			public const int sym_bkeyboard_mic = 2130837830;
 			
 			// aapt resource value: 0x7f020147
-			public const int ic65 = 2130837831;
+			public const int sym_bkeyboard_num0 = 2130837831;
 			
 			// aapt resource value: 0x7f020148
-			public const int ic66 = 2130837832;
+			public const int sym_bkeyboard_num1 = 2130837832;
 			
 			// aapt resource value: 0x7f020149
-			public const int ic67 = 2130837833;
+			public const int sym_bkeyboard_num2 = 2130837833;
 			
 			// aapt resource value: 0x7f02014a
-			public const int ic68 = 2130837834;
+			public const int sym_bkeyboard_num3 = 2130837834;
 			
 			// aapt resource value: 0x7f02014b
-			public const int ic99_blank = 2130837835;
+			public const int sym_bkeyboard_num4 = 2130837835;
 			
 			// aapt resource value: 0x7f02014c
-			public const int ic_action_eye_open = 2130837836;
+			public const int sym_bkeyboard_num5 = 2130837836;
 			
 			// aapt resource value: 0x7f02014d
-			public const int ic_action_search = 2130837837;
+			public const int sym_bkeyboard_num6 = 2130837837;
 			
 			// aapt resource value: 0x7f02014e
-			public const int ic_action_search_holodark = 2130837838;
+			public const int sym_bkeyboard_num7 = 2130837838;
 			
 			// aapt resource value: 0x7f02014f
-			public const int ic_dialog_keyboard = 2130837839;
+			public const int sym_bkeyboard_num8 = 2130837839;
 			
 			// aapt resource value: 0x7f020150
-			public const int ic_keepass2android = 2130837840;
+			public const int sym_bkeyboard_num9 = 2130837840;
 			
 			// aapt resource value: 0x7f020151
-			public const int ic_keepass2android_nonet = 2130837841;
+			public const int sym_bkeyboard_numalt = 2130837841;
 			
 			// aapt resource value: 0x7f020152
-			public const int ic_launcher = 2130837842;
+			public const int sym_bkeyboard_numpound = 2130837842;
 			
 			// aapt resource value: 0x7f020153
-			public const int ic_launcher_folder_small = 2130837843;
+			public const int sym_bkeyboard_numstar = 2130837843;
 			
 			// aapt resource value: 0x7f020154
-			public const int ic_launcher_gray = 2130837844;
+			public const int sym_bkeyboard_return = 2130837844;
 			
 			// aapt resource value: 0x7f020155
-			public const int ic_launcher_gray_bday = 2130837845;
+			public const int sym_bkeyboard_search = 2130837845;
 			
 			// aapt resource value: 0x7f020156
-			public const int ic_launcher_offline = 2130837846;
+			public const int sym_bkeyboard_settings = 2130837846;
 			
 			// aapt resource value: 0x7f020157
-			public const int ic_launcher_red = 2130837847;
+			public const int sym_bkeyboard_shift = 2130837847;
 			
 			// aapt resource value: 0x7f020158
-			public const int ic_menu_add_field_holo_light = 2130837848;
+			public const int sym_bkeyboard_shift_locked = 2130837848;
 			
 			// aapt resource value: 0x7f020159
-			public const int ic_menu_add_field_holodark = 2130837849;
+			public const int sym_bkeyboard_space = 2130837849;
 			
 			// aapt resource value: 0x7f02015a
-			public const int ic_menu_remove_field_holo_light = 2130837850;
+			public const int sym_bkeyboard_tab = 2130837850;
 			
 			// aapt resource value: 0x7f02015b
-			public const int ic_menu_remove_field_holodark = 2130837851;
+			public const int sym_keyboard = 2130837851;
 			
 			// aapt resource value: 0x7f02015c
-			public const int ic_menu_view = 2130837852;
+			public const int sym_keyboard_123_mic = 2130837852;
 			
 			// aapt resource value: 0x7f02015d
-			public const int ic_mic_dialog = 2130837853;
+			public const int sym_keyboard_delete = 2130837853;
 			
 			// aapt resource value: 0x7f02015e
-			public const int ic_storage_androidget = 2130837854;
+			public const int sym_keyboard_done = 2130837854;
 			
 			// aapt resource value: 0x7f02015f
-			public const int ic_storage_androidsend = 2130837855;
+			public const int sym_keyboard_feedback_123_mic = 2130837855;
 			
 			// aapt resource value: 0x7f020160
-			public const int ic_storage_dropbox = 2130837856;
+			public const int sym_keyboard_feedback_delete = 2130837856;
 			
 			// aapt resource value: 0x7f020161
-			public const int ic_storage_dropboxKP2A = 2130837857;
+			public const int sym_keyboard_feedback_done = 2130837857;
 			
 			// aapt resource value: 0x7f020162
-			public const int ic_storage_file = 2130837858;
+			public const int sym_keyboard_feedback_kp2a = 2130837858;
 			
 			// aapt resource value: 0x7f020163
-			public const int ic_storage_ftp = 2130837859;
+			public const int sym_keyboard_feedback_language_arrows_left = 2130837859;
 			
 			// aapt resource value: 0x7f020164
-			public const int ic_storage_gdrive = 2130837860;
+			public const int sym_keyboard_feedback_language_arrows_right = 2130837860;
 			
 			// aapt resource value: 0x7f020165
-			public const int ic_storage_http = 2130837861;
+			public const int sym_keyboard_feedback_mic = 2130837861;
 			
 			// aapt resource value: 0x7f020166
-			public const int ic_storage_https = 2130837862;
+			public const int sym_keyboard_feedback_numalt = 2130837862;
 			
 			// aapt resource value: 0x7f020167
-			public const int ic_storage_sftp = 2130837863;
+			public const int sym_keyboard_feedback_return = 2130837863;
 			
 			// aapt resource value: 0x7f020168
-			public const int ic_storage_skydrive = 2130837864;
+			public const int sym_keyboard_feedback_search = 2130837864;
 			
 			// aapt resource value: 0x7f020169
-			public const int ic_subtype_keyboard = 2130837865;
+			public const int sym_keyboard_feedback_settings = 2130837865;
 			
 			// aapt resource value: 0x7f02016a
-			public const int ic_subtype_mic = 2130837866;
+			public const int sym_keyboard_feedback_shift = 2130837866;
 			
 			// aapt resource value: 0x7f02016b
-			public const int ic_suggest_scroll_background = 2130837867;
+			public const int sym_keyboard_feedback_shift_locked = 2130837867;
 			
 			// aapt resource value: 0x7f02016c
-			public const int ic_suggest_strip_microphone = 2130837868;
+			public const int sym_keyboard_feedback_space = 2130837868;
 			
 			// aapt resource value: 0x7f02016d
-			public const int ic_suggest_strip_microphone_swipe = 2130837869;
+			public const int sym_keyboard_feedback_tab = 2130837869;
 			
 			// aapt resource value: 0x7f02016e
-			public const int ic_unlocked_gray = 2130837870;
+			public const int sym_keyboard_kp2a = 2130837870;
 			
 			// aapt resource value: 0x7f02016f
-			public const int keyboard_background = 2130837871;
+			public const int sym_keyboard_language_arrows_left = 2130837871;
 			
 			// aapt resource value: 0x7f020170
-			public const int keyboard_dark_background = 2130837872;
+			public const int sym_keyboard_language_arrows_right = 2130837872;
 			
 			// aapt resource value: 0x7f020171
-			public const int keyboard_hint_0 = 2130837873;
+			public const int sym_keyboard_mic = 2130837873;
 			
 			// aapt resource value: 0x7f020172
-			public const int keyboard_hint_1 = 2130837874;
+			public const int sym_keyboard_num0 = 2130837874;
 			
 			// aapt resource value: 0x7f020173
-			public const int keyboard_hint_2 = 2130837875;
+			public const int sym_keyboard_num1 = 2130837875;
 			
 			// aapt resource value: 0x7f020174
-			public const int keyboard_hint_3 = 2130837876;
+			public const int sym_keyboard_num2 = 2130837876;
 			
 			// aapt resource value: 0x7f020175
-			public const int keyboard_hint_4 = 2130837877;
+			public const int sym_keyboard_num3 = 2130837877;
 			
 			// aapt resource value: 0x7f020176
-			public const int keyboard_hint_5 = 2130837878;
+			public const int sym_keyboard_num4 = 2130837878;
 			
 			// aapt resource value: 0x7f020177
-			public const int keyboard_hint_6 = 2130837879;
+			public const int sym_keyboard_num5 = 2130837879;
 			
 			// aapt resource value: 0x7f020178
-			public const int keyboard_hint_7 = 2130837880;
+			public const int sym_keyboard_num6 = 2130837880;
 			
 			// aapt resource value: 0x7f020179
-			public const int keyboard_hint_8 = 2130837881;
+			public const int sym_keyboard_num7 = 2130837881;
 			
 			// aapt resource value: 0x7f02017a
-			public const int keyboard_hint_9 = 2130837882;
+			public const int sym_keyboard_num8 = 2130837882;
 			
 			// aapt resource value: 0x7f02017b
-			public const int keyboard_key_feedback = 2130837883;
+			public const int sym_keyboard_num9 = 2130837883;
 			
 			// aapt resource value: 0x7f02017c
-			public const int keyboard_key_feedback_background = 2130837884;
+			public const int sym_keyboard_numalt = 2130837884;
 			
 			// aapt resource value: 0x7f02017d
-			public const int keyboard_key_feedback_more_background = 2130837885;
+			public const int sym_keyboard_numpound = 2130837885;
 			
 			// aapt resource value: 0x7f02017e
-			public const int keyboard_popup_panel_background = 2130837886;
+			public const int sym_keyboard_numstar = 2130837886;
 			
 			// aapt resource value: 0x7f02017f
-			public const int keyboard_suggest_strip = 2130837887;
+			public const int sym_keyboard_return = 2130837887;
 			
 			// aapt resource value: 0x7f020180
-			public const int keyboard_suggest_strip_divider = 2130837888;
+			public const int sym_keyboard_search = 2130837888;
 			
 			// aapt resource value: 0x7f020181
-			public const int list_selector_background_pressed = 2130837889;
+			public const int sym_keyboard_settings = 2130837889;
 			
 			// aapt resource value: 0x7f020182
-			public const int location_web_site = 2130837890;
+			public const int sym_keyboard_shift = 2130837890;
 			
 			// aapt resource value: 0x7f020183
-			public const int location_web_site_holodark = 2130837891;
+			public const int sym_keyboard_shift_lock = 2130837891;
 			
 			// aapt resource value: 0x7f020184
-			public const int mic_slash = 2130837892;
+			public const int sym_keyboard_shift_locked = 2130837892;
 			
 			// aapt resource value: 0x7f020185
-			public const int navigation_accept = 2130837893;
+			public const int sym_keyboard_space = 2130837893;
 			
 			// aapt resource value: 0x7f020186
-			public const int navigation_accept_dark = 2130837894;
+			public const int sym_keyboard_space_led = 2130837894;
 			
 			// aapt resource value: 0x7f020187
-			public const int navigation_cancel = 2130837895;
+			public const int sym_keyboard_tab = 2130837895;
 			
 			// aapt resource value: 0x7f020188
-			public const int navigation_cancel_holodark = 2130837896;
+			public const int transparent = 2130837896;
 			
 			// aapt resource value: 0x7f020189
-			public const int navigation_previous_item = 2130837897;
+			public const int vdots = 2130837897;
 			
 			// aapt resource value: 0x7f02018a
-			public const int navigation_previous_item_dark = 2130837898;
+			public const int vdots_holodark = 2130837898;
 			
 			// aapt resource value: 0x7f02018b
-			public const int notify = 2130837899;
+			public const int voice_ime_background = 2130837899;
 			
 			// aapt resource value: 0x7f02018c
-			public const int notify_keyboard = 2130837900;
+			public const int voice_swipe_hint = 2130837900;
 			
 			// aapt resource value: 0x7f02018d
-			public const int ok_cancel = 2130837901;
+			public const int working = 2130837901;
 			
 			// aapt resource value: 0x7f02018e
-			public const int oktoberfest = 2130837902;
-			
-			// aapt resource value: 0x7f02018f
-			public const int RedButton = 2130837903;
-			
-			// aapt resource value: 0x7f020190
-			public const int section_header = 2130837904;
-			
-			// aapt resource value: 0x7f020191
-			public const int speak_now_level0 = 2130837905;
-			
-			// aapt resource value: 0x7f020192
-			public const int speak_now_level1 = 2130837906;
-			
-			// aapt resource value: 0x7f020193
-			public const int speak_now_level2 = 2130837907;
-			
-			// aapt resource value: 0x7f020194
-			public const int speak_now_level3 = 2130837908;
-			
-			// aapt resource value: 0x7f020195
-			public const int speak_now_level4 = 2130837909;
-			
-			// aapt resource value: 0x7f020196
-			public const int speak_now_level5 = 2130837910;
-			
-			// aapt resource value: 0x7f020197
-			public const int speak_now_level6 = 2130837911;
-			
-			// aapt resource value: 0x7f020198
-			public const int sym_bkeyboard_123_mic = 2130837912;
-			
-			// aapt resource value: 0x7f020199
-			public const int sym_bkeyboard_delete = 2130837913;
-			
-			// aapt resource value: 0x7f02019a
-			public const int sym_bkeyboard_done = 2130837914;
-			
-			// aapt resource value: 0x7f02019b
-			public const int sym_bkeyboard_kp2a = 2130837915;
-			
-			// aapt resource value: 0x7f02019c
-			public const int sym_bkeyboard_mic = 2130837916;
-			
-			// aapt resource value: 0x7f02019d
-			public const int sym_bkeyboard_num0 = 2130837917;
-			
-			// aapt resource value: 0x7f02019e
-			public const int sym_bkeyboard_num1 = 2130837918;
-			
-			// aapt resource value: 0x7f02019f
-			public const int sym_bkeyboard_num2 = 2130837919;
-			
-			// aapt resource value: 0x7f0201a0
-			public const int sym_bkeyboard_num3 = 2130837920;
-			
-			// aapt resource value: 0x7f0201a1
-			public const int sym_bkeyboard_num4 = 2130837921;
-			
-			// aapt resource value: 0x7f0201a2
-			public const int sym_bkeyboard_num5 = 2130837922;
-			
-			// aapt resource value: 0x7f0201a3
-			public const int sym_bkeyboard_num6 = 2130837923;
-			
-			// aapt resource value: 0x7f0201a4
-			public const int sym_bkeyboard_num7 = 2130837924;
-			
-			// aapt resource value: 0x7f0201a5
-			public const int sym_bkeyboard_num8 = 2130837925;
-			
-			// aapt resource value: 0x7f0201a6
-			public const int sym_bkeyboard_num9 = 2130837926;
-			
-			// aapt resource value: 0x7f0201a7
-			public const int sym_bkeyboard_numalt = 2130837927;
-			
-			// aapt resource value: 0x7f0201a8
-			public const int sym_bkeyboard_numpound = 2130837928;
-			
-			// aapt resource value: 0x7f0201a9
-			public const int sym_bkeyboard_numstar = 2130837929;
-			
-			// aapt resource value: 0x7f0201aa
-			public const int sym_bkeyboard_return = 2130837930;
-			
-			// aapt resource value: 0x7f0201ab
-			public const int sym_bkeyboard_search = 2130837931;
-			
-			// aapt resource value: 0x7f0201ac
-			public const int sym_bkeyboard_settings = 2130837932;
-			
-			// aapt resource value: 0x7f0201ad
-			public const int sym_bkeyboard_shift = 2130837933;
-			
-			// aapt resource value: 0x7f0201ae
-			public const int sym_bkeyboard_shift_locked = 2130837934;
-			
-			// aapt resource value: 0x7f0201af
-			public const int sym_bkeyboard_space = 2130837935;
-			
-			// aapt resource value: 0x7f0201b0
-			public const int sym_bkeyboard_tab = 2130837936;
-			
-			// aapt resource value: 0x7f0201b1
-			public const int sym_keyboard = 2130837937;
-			
-			// aapt resource value: 0x7f0201b2
-			public const int sym_keyboard_123_mic = 2130837938;
-			
-			// aapt resource value: 0x7f0201b3
-			public const int sym_keyboard_delete = 2130837939;
-			
-			// aapt resource value: 0x7f0201b4
-			public const int sym_keyboard_done = 2130837940;
-			
-			// aapt resource value: 0x7f0201b5
-			public const int sym_keyboard_feedback_123_mic = 2130837941;
-			
-			// aapt resource value: 0x7f0201b6
-			public const int sym_keyboard_feedback_delete = 2130837942;
-			
-			// aapt resource value: 0x7f0201b7
-			public const int sym_keyboard_feedback_done = 2130837943;
-			
-			// aapt resource value: 0x7f0201b8
-			public const int sym_keyboard_feedback_kp2a = 2130837944;
-			
-			// aapt resource value: 0x7f0201b9
-			public const int sym_keyboard_feedback_language_arrows_left = 2130837945;
-			
-			// aapt resource value: 0x7f0201ba
-			public const int sym_keyboard_feedback_language_arrows_right = 2130837946;
-			
-			// aapt resource value: 0x7f0201bb
-			public const int sym_keyboard_feedback_mic = 2130837947;
-			
-			// aapt resource value: 0x7f0201bc
-			public const int sym_keyboard_feedback_numalt = 2130837948;
-			
-			// aapt resource value: 0x7f0201bd
-			public const int sym_keyboard_feedback_return = 2130837949;
-			
-			// aapt resource value: 0x7f0201be
-			public const int sym_keyboard_feedback_search = 2130837950;
-			
-			// aapt resource value: 0x7f0201bf
-			public const int sym_keyboard_feedback_settings = 2130837951;
-			
-			// aapt resource value: 0x7f0201c0
-			public const int sym_keyboard_feedback_shift = 2130837952;
-			
-			// aapt resource value: 0x7f0201c1
-			public const int sym_keyboard_feedback_shift_locked = 2130837953;
-			
-			// aapt resource value: 0x7f0201c2
-			public const int sym_keyboard_feedback_space = 2130837954;
-			
-			// aapt resource value: 0x7f0201c3
-			public const int sym_keyboard_feedback_tab = 2130837955;
-			
-			// aapt resource value: 0x7f0201c4
-			public const int sym_keyboard_kp2a = 2130837956;
-			
-			// aapt resource value: 0x7f0201c5
-			public const int sym_keyboard_language_arrows_left = 2130837957;
-			
-			// aapt resource value: 0x7f0201c6
-			public const int sym_keyboard_language_arrows_right = 2130837958;
-			
-			// aapt resource value: 0x7f0201c7
-			public const int sym_keyboard_mic = 2130837959;
-			
-			// aapt resource value: 0x7f0201c8
-			public const int sym_keyboard_num0 = 2130837960;
-			
-			// aapt resource value: 0x7f0201c9
-			public const int sym_keyboard_num1 = 2130837961;
-			
-			// aapt resource value: 0x7f0201ca
-			public const int sym_keyboard_num2 = 2130837962;
-			
-			// aapt resource value: 0x7f0201cb
-			public const int sym_keyboard_num3 = 2130837963;
-			
-			// aapt resource value: 0x7f0201cc
-			public const int sym_keyboard_num4 = 2130837964;
-			
-			// aapt resource value: 0x7f0201cd
-			public const int sym_keyboard_num5 = 2130837965;
-			
-			// aapt resource value: 0x7f0201ce
-			public const int sym_keyboard_num6 = 2130837966;
-			
-			// aapt resource value: 0x7f0201cf
-			public const int sym_keyboard_num7 = 2130837967;
-			
-			// aapt resource value: 0x7f0201d0
-			public const int sym_keyboard_num8 = 2130837968;
-			
-			// aapt resource value: 0x7f0201d1
-			public const int sym_keyboard_num9 = 2130837969;
-			
-			// aapt resource value: 0x7f0201d2
-			public const int sym_keyboard_numalt = 2130837970;
-			
-			// aapt resource value: 0x7f0201d3
-			public const int sym_keyboard_numpound = 2130837971;
-			
-			// aapt resource value: 0x7f0201d4
-			public const int sym_keyboard_numstar = 2130837972;
-			
-			// aapt resource value: 0x7f0201d5
-			public const int sym_keyboard_return = 2130837973;
-			
-			// aapt resource value: 0x7f0201d6
-			public const int sym_keyboard_search = 2130837974;
-			
-			// aapt resource value: 0x7f0201d7
-			public const int sym_keyboard_settings = 2130837975;
-			
-			// aapt resource value: 0x7f0201d8
-			public const int sym_keyboard_shift = 2130837976;
-			
-			// aapt resource value: 0x7f0201d9
-			public const int sym_keyboard_shift_lock = 2130837977;
-			
-			// aapt resource value: 0x7f0201da
-			public const int sym_keyboard_shift_locked = 2130837978;
-			
-			// aapt resource value: 0x7f0201db
-			public const int sym_keyboard_space = 2130837979;
-			
-			// aapt resource value: 0x7f0201dc
-			public const int sym_keyboard_space_led = 2130837980;
-			
-			// aapt resource value: 0x7f0201dd
-			public const int sym_keyboard_tab = 2130837981;
-			
-			// aapt resource value: 0x7f0201de
-			public const int transparent = 2130837982;
-			
-			// aapt resource value: 0x7f0201df
-			public const int voice_ime_background = 2130837983;
-			
-			// aapt resource value: 0x7f0201e0
-			public const int voice_swipe_hint = 2130837984;
-			
-			// aapt resource value: 0x7f0201e1
-			public const int working = 2130837985;
-			
-			// aapt resource value: 0x7f0201e2
-			public const int YellowButton = 2130837986;
+			public const int YellowButton = 2130837902;
 			
 			static Drawable()
 			{
@@ -2645,242 +1973,194 @@ namespace keepass2android
 		public partial class Id
 		{
 			
-			// aapt resource value: 0x7f08005a
-			public const int Credit = 2131230810;
+			// aapt resource value: 0x7f08001a
+			public const int Credit = 2131230746;
 			
-			// aapt resource value: 0x7f08005b
-			public const int Credit2 = 2131230811;
+			// aapt resource value: 0x7f08001b
+			public const int Credit2 = 2131230747;
 			
-			// aapt resource value: 0x7f0800f7
-			public const int IconGridView = 2131230967;
+			// aapt resource value: 0x7f0800c6
+			public const int IconGridView = 2131230918;
 			
-			// aapt resource value: 0x7f0800f9
-			public const int LatinKeyboardBaseView = 2131230969;
+			// aapt resource value: 0x7f0800c8
+			public const int LatinKeyboardBaseView = 2131230920;
 			
-			// aapt resource value: 0x7f0800f8
-			public const int LatinkeyboardBaseView = 2131230968;
+			// aapt resource value: 0x7f0800c7
+			public const int LatinkeyboardBaseView = 2131230919;
 			
-			// aapt resource value: 0x7f080118
-			public const int QuickUnlock_button = 2131231000;
+			// aapt resource value: 0x7f0800f3
+			public const int QuickUnlock_button = 2131230963;
 			
-			// aapt resource value: 0x7f080119
-			public const int QuickUnlock_buttonLock = 2131231001;
+			// aapt resource value: 0x7f0800f4
+			public const int QuickUnlock_buttonLock = 2131230964;
 			
-			// aapt resource value: 0x7f080116
-			public const int QuickUnlock_label = 2131230998;
+			// aapt resource value: 0x7f0800f1
+			public const int QuickUnlock_label = 2131230961;
 			
-			// aapt resource value: 0x7f080117
-			public const int QuickUnlock_password = 2131230999;
-			
-			// aapt resource value: 0x7f0800d9
-			public const int RelativeLayout = 2131230937;
-			
-			// aapt resource value: 0x7f0800d8
-			public const int ScrollView = 2131230936;
-			
-			// aapt resource value: 0x7f080049
-			public const int about_title = 2131230793;
-			
-			// aapt resource value: 0x7f0800d6
-			public const int accept_button = 2131230934;
-			
-			// aapt resource value: 0x7f080021
-			public const int action_bar = 2131230753;
-			
-			// aapt resource value: 0x7f08001c
-			public const int action_bar_activity_content = 2131230748;
-			
-			// aapt resource value: 0x7f080020
-			public const int action_bar_container = 2131230752;
-			
-			// aapt resource value: 0x7f080024
-			public const int action_bar_overlay_layout = 2131230756;
-			
-			// aapt resource value: 0x7f08001f
-			public const int action_bar_root = 2131230751;
-			
-			// aapt resource value: 0x7f080028
-			public const int action_bar_subtitle = 2131230760;
-			
-			// aapt resource value: 0x7f080027
-			public const int action_bar_title = 2131230759;
-			
-			// aapt resource value: 0x7f080022
-			public const int action_context_bar = 2131230754;
-			
-			// aapt resource value: 0x7f08001d
-			public const int action_menu_divider = 2131230749;
-			
-			// aapt resource value: 0x7f08001e
-			public const int action_menu_presenter = 2131230750;
-			
-			// aapt resource value: 0x7f080036
-			public const int action_mode_bar = 2131230774;
-			
-			// aapt resource value: 0x7f080035
-			public const int action_mode_bar_stub = 2131230773;
-			
-			// aapt resource value: 0x7f080029
-			public const int action_mode_close_button = 2131230761;
-			
-			// aapt resource value: 0x7f08002a
-			public const int activity_chooser_view_content = 2131230762;
-			
-			// aapt resource value: 0x7f0800a9
-			public const int add_advanced = 2131230889;
-			
-			// aapt resource value: 0x7f0800ec
-			public const int add_entry = 2131230956;
-			
-			// aapt resource value: 0x7f0800eb
-			public const int add_group = 2131230955;
-			
-			// aapt resource value: 0x7f080130
-			public const int add_url_entry = 2131231024;
+			// aapt resource value: 0x7f0800f2
+			public const int QuickUnlock_password = 2131230962;
 			
 			// aapt resource value: 0x7f0800a8
-			public const int advanced_container = 2131230888;
+			public const int RelativeLayout = 2131230888;
+			
+			// aapt resource value: 0x7f0800a7
+			public const int ScrollView = 2131230887;
+			
+			// aapt resource value: 0x7f080009
+			public const int about_title = 2131230729;
+			
+			// aapt resource value: 0x7f0800a5
+			public const int accept_button = 2131230885;
 			
 			// aapt resource value: 0x7f080064
-			public const int afc_button_go_back = 2131230820;
+			public const int add_advanced = 2131230820;
 			
-			// aapt resource value: 0x7f080065
-			public const int afc_button_go_forward = 2131230821;
+			// aapt resource value: 0x7f0800ba
+			public const int add_entry = 2131230906;
 			
-			// aapt resource value: 0x7f080073
-			public const int afc_button_ok = 2131230835;
+			// aapt resource value: 0x7f0800b9
+			public const int add_group = 2131230905;
 			
-			// aapt resource value: 0x7f08007a
-			public const int afc_button_sort_by_date_asc = 2131230842;
-			
-			// aapt resource value: 0x7f08007b
-			public const int afc_button_sort_by_date_desc = 2131230843;
-			
-			// aapt resource value: 0x7f080076
-			public const int afc_button_sort_by_name_asc = 2131230838;
-			
-			// aapt resource value: 0x7f080077
-			public const int afc_button_sort_by_name_desc = 2131230839;
-			
-			// aapt resource value: 0x7f080078
-			public const int afc_button_sort_by_size_asc = 2131230840;
-			
-			// aapt resource value: 0x7f080079
-			public const int afc_button_sort_by_size_desc = 2131230841;
-			
-			// aapt resource value: 0x7f080062
-			public const int afc_checkbox_selection = 2131230818;
-			
-			// aapt resource value: 0x7f080070
-			public const int afc_footer_view_divider = 2131230832;
-			
-			// aapt resource value: 0x7f08005c
-			public const int afc_fragment_files = 2131230812;
-			
-			// aapt resource value: 0x7f080069
-			public const int afc_header_view_divider = 2131230825;
-			
-			// aapt resource value: 0x7f08005e
-			public const int afc_imageview_icon = 2131230814;
-			
-			// aapt resource value: 0x7f08005f
-			public const int afc_imageview_locked_symbol = 2131230815;
-			
-			// aapt resource value: 0x7f08005d
-			public const int afc_listview_menu = 2131230813;
-			
-			// aapt resource value: 0x7f08014c
-			public const int afc_menuitem_home = 2131231052;
-			
-			// aapt resource value: 0x7f08014f
-			public const int afc_menuitem_new_folder = 2131231055;
-			
-			// aapt resource value: 0x7f08014d
-			public const int afc_menuitem_sort = 2131231053;
-			
-			// aapt resource value: 0x7f08014e
-			public const int afc_menuitem_switch_viewmode = 2131231054;
-			
-			// aapt resource value: 0x7f08007d
-			public const int afc_progress_bar = 2131230845;
-			
-			// aapt resource value: 0x7f08007c
-			public const int afc_text1 = 2131230844;
-			
-			// aapt resource value: 0x7f08007e
-			public const int afc_textview = 2131230846;
-			
-			// aapt resource value: 0x7f080061
-			public const int afc_textview_file_info = 2131230817;
-			
-			// aapt resource value: 0x7f080060
-			public const int afc_textview_filename = 2131230816;
-			
-			// aapt resource value: 0x7f08006a
-			public const int afc_textview_full_dir_name = 2131230826;
-			
-			// aapt resource value: 0x7f080075
-			public const int afc_textview_home = 2131230837;
-			
-			// aapt resource value: 0x7f080072
-			public const int afc_textview_saveas_filename = 2131230834;
-			
-			// aapt resource value: 0x7f08006d
-			public const int afc_view_files_container = 2131230829;
-			
-			// aapt resource value: 0x7f08006e
-			public const int afc_view_files_footer_view = 2131230830;
-			
-			// aapt resource value: 0x7f08006f
-			public const int afc_view_loading = 2131230831;
-			
-			// aapt resource value: 0x7f080068
-			public const int afc_view_locations = 2131230824;
-			
-			// aapt resource value: 0x7f080067
-			public const int afc_view_locations_container = 2131230823;
-			
-			// aapt resource value: 0x7f080074
-			public const int afc_viewgroup_bookmarks = 2131230836;
-			
-			// aapt resource value: 0x7f080066
-			public const int afc_viewgroup_button_locations = 2131230822;
-			
-			// aapt resource value: 0x7f08006c
-			public const int afc_viewgroup_files = 2131230828;
-			
-			// aapt resource value: 0x7f080071
-			public const int afc_viewgroup_footer = 2131230833;
-			
-			// aapt resource value: 0x7f08006b
-			public const int afc_viewgroup_footer_container = 2131230827;
+			// aapt resource value: 0x7f08010e
+			public const int add_url_entry = 2131230990;
 			
 			// aapt resource value: 0x7f080063
-			public const int afc_viewgroup_header = 2131230819;
+			public const int advanced_container = 2131230819;
 			
-			// aapt resource value: 0x7f080081
-			public const int afc_widget_search_view_button_clear = 2131230849;
+			// aapt resource value: 0x7f080024
+			public const int afc_button_go_back = 2131230756;
 			
-			// aapt resource value: 0x7f08007f
-			public const int afc_widget_search_view_button_search = 2131230847;
+			// aapt resource value: 0x7f080025
+			public const int afc_button_go_forward = 2131230757;
 			
-			// aapt resource value: 0x7f080080
-			public const int afc_widget_search_view_textview_search = 2131230848;
+			// aapt resource value: 0x7f080033
+			public const int afc_button_ok = 2131230771;
 			
-			// aapt resource value: 0x7f080013
-			public const int always = 2131230739;
+			// aapt resource value: 0x7f08003a
+			public const int afc_button_sort_by_date_asc = 2131230778;
 			
-			// aapt resource value: 0x7f080058
-			public const int android_filechooser_contrib = 2131230808;
+			// aapt resource value: 0x7f08003b
+			public const int afc_button_sort_by_date_desc = 2131230779;
 			
-			// aapt resource value: 0x7f080055
-			public const int author = 2131230805;
+			// aapt resource value: 0x7f080036
+			public const int afc_button_sort_by_name_asc = 2131230774;
+			
+			// aapt resource value: 0x7f080037
+			public const int afc_button_sort_by_name_desc = 2131230775;
+			
+			// aapt resource value: 0x7f080038
+			public const int afc_button_sort_by_size_asc = 2131230776;
+			
+			// aapt resource value: 0x7f080039
+			public const int afc_button_sort_by_size_desc = 2131230777;
+			
+			// aapt resource value: 0x7f080022
+			public const int afc_checkbox_selection = 2131230754;
+			
+			// aapt resource value: 0x7f080030
+			public const int afc_footer_view_divider = 2131230768;
+			
+			// aapt resource value: 0x7f08001c
+			public const int afc_fragment_files = 2131230748;
+			
+			// aapt resource value: 0x7f080029
+			public const int afc_header_view_divider = 2131230761;
+			
+			// aapt resource value: 0x7f08001e
+			public const int afc_imageview_icon = 2131230750;
+			
+			// aapt resource value: 0x7f08001f
+			public const int afc_imageview_locked_symbol = 2131230751;
+			
+			// aapt resource value: 0x7f08001d
+			public const int afc_listview_menu = 2131230749;
+			
+			// aapt resource value: 0x7f08012a
+			public const int afc_menuitem_home = 2131231018;
+			
+			// aapt resource value: 0x7f08012d
+			public const int afc_menuitem_new_folder = 2131231021;
+			
+			// aapt resource value: 0x7f08012b
+			public const int afc_menuitem_sort = 2131231019;
+			
+			// aapt resource value: 0x7f08012c
+			public const int afc_menuitem_switch_viewmode = 2131231020;
+			
+			// aapt resource value: 0x7f08003d
+			public const int afc_progress_bar = 2131230781;
+			
+			// aapt resource value: 0x7f08003c
+			public const int afc_text1 = 2131230780;
+			
+			// aapt resource value: 0x7f08003e
+			public const int afc_textview = 2131230782;
+			
+			// aapt resource value: 0x7f080021
+			public const int afc_textview_file_info = 2131230753;
+			
+			// aapt resource value: 0x7f080020
+			public const int afc_textview_filename = 2131230752;
+			
+			// aapt resource value: 0x7f08002a
+			public const int afc_textview_full_dir_name = 2131230762;
+			
+			// aapt resource value: 0x7f080035
+			public const int afc_textview_home = 2131230773;
+			
+			// aapt resource value: 0x7f080032
+			public const int afc_textview_saveas_filename = 2131230770;
+			
+			// aapt resource value: 0x7f08002d
+			public const int afc_view_files_container = 2131230765;
+			
+			// aapt resource value: 0x7f08002e
+			public const int afc_view_files_footer_view = 2131230766;
+			
+			// aapt resource value: 0x7f08002f
+			public const int afc_view_loading = 2131230767;
+			
+			// aapt resource value: 0x7f080028
+			public const int afc_view_locations = 2131230760;
+			
+			// aapt resource value: 0x7f080027
+			public const int afc_view_locations_container = 2131230759;
+			
+			// aapt resource value: 0x7f080034
+			public const int afc_viewgroup_bookmarks = 2131230772;
+			
+			// aapt resource value: 0x7f080026
+			public const int afc_viewgroup_button_locations = 2131230758;
+			
+			// aapt resource value: 0x7f08002c
+			public const int afc_viewgroup_files = 2131230764;
+			
+			// aapt resource value: 0x7f080031
+			public const int afc_viewgroup_footer = 2131230769;
+			
+			// aapt resource value: 0x7f08002b
+			public const int afc_viewgroup_footer_container = 2131230763;
+			
+			// aapt resource value: 0x7f080023
+			public const int afc_viewgroup_header = 2131230755;
+			
+			// aapt resource value: 0x7f080041
+			public const int afc_widget_search_view_button_clear = 2131230785;
+			
+			// aapt resource value: 0x7f08003f
+			public const int afc_widget_search_view_button_search = 2131230783;
+			
+			// aapt resource value: 0x7f080040
+			public const int afc_widget_search_view_textview_search = 2131230784;
 			
 			// aapt resource value: 0x7f080018
-			public const int beginning = 2131230744;
+			public const int android_filechooser_contrib = 2131230744;
 			
-			// aapt resource value: 0x7f0800ab
-			public const int binaries = 2131230891;
+			// aapt resource value: 0x7f080015
+			public const int author = 2131230741;
+			
+			// aapt resource value: 0x7f080066
+			public const int binaries = 2131230822;
 			
 			// aapt resource value: 0x7f080008
 			public const int black = 2131230728;
@@ -2888,545 +2168,527 @@ namespace keepass2android
 			// aapt resource value: 0x7f080005
 			public const int bold = 2131230725;
 			
-			// aapt resource value: 0x7f0800b8
-			public const int bottom_bar = 2131230904;
-			
-			// aapt resource value: 0x7f0800d0
-			public const int bottom_layout = 2131230928;
-			
-			// aapt resource value: 0x7f0800cb
-			public const int browse_button = 2131230923;
-			
-			// aapt resource value: 0x7f080086
-			public const int btn_change_location = 2131230854;
-			
-			// aapt resource value: 0x7f08008f
-			public const int btn_create = 2131230863;
-			
-			// aapt resource value: 0x7f0800de
-			public const int btn_length12 = 2131230942;
-			
-			// aapt resource value: 0x7f0800dd
-			public const int btn_length16 = 2131230941;
-			
-			// aapt resource value: 0x7f0800e0
-			public const int btn_length6 = 2131230944;
-			
-			// aapt resource value: 0x7f0800df
-			public const int btn_length8 = 2131230943;
-			
-			// aapt resource value: 0x7f08011d
-			public const int button = 2131231005;
-			
-			// aapt resource value: 0x7f08011e
-			public const int button_text = 2131231006;
-			
-			// aapt resource value: 0x7f0800f1
-			public const int cancel = 2131230961;
-			
-			// aapt resource value: 0x7f0800d7
-			public const int cancel_button = 2131230935;
-			
-			// aapt resource value: 0x7f0800ee
-			public const int cancel_insert_element = 2131230958;
-			
-			// aapt resource value: 0x7f080082
-			public const int candidates = 2131230850;
-			
-			// aapt resource value: 0x7f08012d
-			public const int cbCaseSensitive = 2131231021;
-			
-			// aapt resource value: 0x7f08012e
-			public const int cbExcludeExpiredEntries = 2131231022;
-			
-			// aapt resource value: 0x7f080123
-			public const int cbRegEx = 2131231011;
-			
-			// aapt resource value: 0x7f08012c
-			public const int cbSearchInGroupName = 2131231020;
-			
-			// aapt resource value: 0x7f080129
-			public const int cbSearchInNotes = 2131231017;
-			
-			// aapt resource value: 0x7f08012a
-			public const int cbSearchInOtherStrings = 2131231018;
-			
-			// aapt resource value: 0x7f080128
-			public const int cbSearchInPassword = 2131231016;
-			
-			// aapt resource value: 0x7f08012b
-			public const int cbSearchInTags = 2131231019;
-			
-			// aapt resource value: 0x7f080125
-			public const int cbSearchInTitle = 2131231013;
-			
-			// aapt resource value: 0x7f080126
-			public const int cbSearchInUrl = 2131231014;
-			
-			// aapt resource value: 0x7f080127
-			public const int cbSearchInUsername = 2131231015;
-			
-			// aapt resource value: 0x7f0800e9
-			public const int cb_brackets = 2131230953;
-			
-			// aapt resource value: 0x7f0800e4
-			public const int cb_digits = 2131230948;
-			
-			// aapt resource value: 0x7f0800e3
-			public const int cb_lowercase = 2131230947;
-			
-			// aapt resource value: 0x7f0800e5
-			public const int cb_minus = 2131230949;
-			
-			// aapt resource value: 0x7f0800e7
-			public const int cb_space = 2131230951;
-			
-			// aapt resource value: 0x7f0800e8
-			public const int cb_specials = 2131230952;
-			
-			// aapt resource value: 0x7f0800e6
-			public const int cb_underline = 2131230950;
-			
-			// aapt resource value: 0x7f0800e2
-			public const int cb_uppercase = 2131230946;
-			
-			// aapt resource value: 0x7f080032
-			public const int checkbox = 2131230770;
-			
-			// aapt resource value: 0x7f080015
-			public const int collapseActionView = 2131230741;
-			
-			// aapt resource value: 0x7f080054
-			public const int contributors_title = 2131230804;
-			
-			// aapt resource value: 0x7f0800ce
-			public const int create = 2131230926;
-			
-			// aapt resource value: 0x7f08013e
-			public const int cred_password = 2131231038;
-			
-			// aapt resource value: 0x7f08013f
-			public const int cred_remember_mode = 2131231039;
-			
-			// aapt resource value: 0x7f08013d
-			public const int cred_username = 2131231037;
-			
-			// aapt resource value: 0x7f08002d
-			public const int default_activity_button = 2131230765;
-			
-			// aapt resource value: 0x7f080098
-			public const int delete_extra = 2131230872;
-			
-			// aapt resource value: 0x7f080016
-			public const int dialog = 2131230742;
-			
-			// aapt resource value: 0x7f080010
-			public const int disableHome = 2131230736;
-			
-			// aapt resource value: 0x7f080053
-			public const int disclaimer = 2131230803;
-			
-			// aapt resource value: 0x7f080052
-			public const int disclaimer_title = 2131230802;
-			
-			// aapt resource value: 0x7f08004a
-			public const int divider1 = 2131230794;
-			
-			// aapt resource value: 0x7f08004e
-			public const int divider2 = 2131230798;
-			
-			// aapt resource value: 0x7f080051
-			public const int divider3 = 2131230801;
-			
-			// aapt resource value: 0x7f080092
-			public const int donate_question = 2131230866;
-			
-			// aapt resource value: 0x7f080017
-			public const int dropdown = 2131230743;
-			
-			// aapt resource value: 0x7f0800b3
-			public const int edit_extra = 2131230899;
-			
-			// aapt resource value: 0x7f08003d
-			public const int edit_query = 2131230781;
-			
-			// aapt resource value: 0x7f080114
-			public const int enable_quickunlock = 2131230996;
-			
-			// aapt resource value: 0x7f08001a
-			public const int end = 2131230746;
-			
-			// aapt resource value: 0x7f0800aa
-			public const int entry_binaries_label = 2131230890;
-			
-			// aapt resource value: 0x7f0800a6
-			public const int entry_comment = 2131230886;
-			
-			// aapt resource value: 0x7f0800a5
-			public const int entry_comment_label = 2131230885;
-			
-			// aapt resource value: 0x7f08008b
-			public const int entry_confpassword = 2131230859;
-			
-			// aapt resource value: 0x7f0800bb
-			public const int entry_contents = 2131230907;
-			
-			// aapt resource value: 0x7f0800c0
-			public const int entry_created = 2131230912;
-			
-			// aapt resource value: 0x7f0800bf
-			public const int entry_created_label = 2131230911;
-			
-			// aapt resource value: 0x7f0800ba
-			public const int entry_divider2 = 2131230906;
-			
-			// aapt resource value: 0x7f0800b9
-			public const int entry_edit = 2131230905;
-			
-			// aapt resource value: 0x7f0800b2
-			public const int entry_expires = 2131230898;
-			
-			// aapt resource value: 0x7f0800b1
-			public const int entry_expires_checkbox = 2131230897;
-			
-			// aapt resource value: 0x7f0800b0
-			public const int entry_expires_label = 2131230896;
-			
-			// aapt resource value: 0x7f0800a7
-			public const int entry_extra_strings_label = 2131230887;
-			
-			// aapt resource value: 0x7f0800b4
-			public const int entry_icon = 2131230900;
-			
-			// aapt resource value: 0x7f0800c2
-			public const int entry_modified = 2131230914;
-			
-			// aapt resource value: 0x7f0800c1
-			public const int entry_modified_label = 2131230913;
-			
-			// aapt resource value: 0x7f0800af
-			public const int entry_override_url = 2131230895;
-			
-			// aapt resource value: 0x7f0800ae
-			public const int entry_override_url_label = 2131230894;
-			
-			// aapt resource value: 0x7f08008a
-			public const int entry_password = 2131230858;
-			
-			// aapt resource value: 0x7f0800a3
-			public const int entry_password_label = 2131230883;
-			
-			// aapt resource value: 0x7f08009a
-			public const int entry_save = 2131230874;
-			
-			// aapt resource value: 0x7f080099
-			public const int entry_save_header = 2131230873;
-			
-			// aapt resource value: 0x7f08009b
-			public const int entry_scroll = 2131230875;
-			
-			// aapt resource value: 0x7f0800bd
-			public const int entry_table = 2131230909;
-			
-			// aapt resource value: 0x7f0800ad
-			public const int entry_tags = 2131230893;
-			
-			// aapt resource value: 0x7f0800ac
-			public const int entry_tags_label = 2131230892;
-			
-			// aapt resource value: 0x7f0800b5
-			public const int entry_text = 2131230901;
-			
-			// aapt resource value: 0x7f0800b6
-			public const int entry_text_detail = 2131230902;
-			
-			// aapt resource value: 0x7f08009e
-			public const int entry_title = 2131230878;
-			
-			// aapt resource value: 0x7f08009c
-			public const int entry_title_label = 2131230876;
-			
-			// aapt resource value: 0x7f0800a2
-			public const int entry_url = 2131230882;
-			
-			// aapt resource value: 0x7f0800a1
-			public const int entry_url_label = 2131230881;
-			
-			// aapt resource value: 0x7f0800a0
-			public const int entry_user_name = 2131230880;
+			// aapt resource value: 0x7f080077
+			public const int bottom_bar = 2131230839;
 			
 			// aapt resource value: 0x7f08009f
-			public const int entry_user_name_label = 2131230879;
+			public const int bottom_layout = 2131230879;
 			
-			// aapt resource value: 0x7f08002b
-			public const int expand_activities_button = 2131230763;
-			
-			// aapt resource value: 0x7f080031
-			public const int expanded_menu = 2131230769;
-			
-			// aapt resource value: 0x7f0800be
-			public const int extra_strings = 2131230910;
-			
-			// aapt resource value: 0x7f080050
-			public const int feedback = 2131230800;
-			
-			// aapt resource value: 0x7f08004f
-			public const int feedback_title = 2131230799;
-			
-			// aapt resource value: 0x7f0800c3
-			public const int file_filename = 2131230915;
-			
-			// aapt resource value: 0x7f0800c4
-			public const int file_listtop = 2131230916;
-			
-			// aapt resource value: 0x7f0800d3
-			public const int file_select = 2131230931;
-			
-			// aapt resource value: 0x7f0800fd
-			public const int filename = 2131230973;
-			
-			// aapt resource value: 0x7f0800c9
-			public const int filename_form = 2131230921;
-			
-			// aapt resource value: 0x7f0800fa
-			public const int filename_group = 2131230970;
-			
-			// aapt resource value: 0x7f0800fb
-			public const int filename_label = 2131230971;
-			
-			// aapt resource value: 0x7f0800fc
-			public const int filenamescroll = 2131230972;
-			
-			// aapt resource value: 0x7f080084
-			public const int filestorage_label = 2131230852;
-			
-			// aapt resource value: 0x7f080083
-			public const int filestorage_logo = 2131230851;
-			
-			// aapt resource value: 0x7f0800cf
-			public const int fnv_cancel = 2131230927;
-			
-			// aapt resource value: 0x7f0800d4
-			public const int fssa_progress_bar = 2131230932;
-			
-			// aapt resource value: 0x7f080056
-			public const int further_authors = 2131230806;
-			
-			// aapt resource value: 0x7f080088
-			public const int generate_button = 2131230856;
-			
-			// aapt resource value: 0x7f0800db
-			public const int generate_password_button = 2131230939;
-			
-			// aapt resource value: 0x7f0800ea
-			public const int group_header = 2131230954;
-			
-			// aapt resource value: 0x7f0800f2
-			public const int group_icon = 2131230962;
-			
-			// aapt resource value: 0x7f0800f4
-			public const int group_label = 2131230964;
+			// aapt resource value: 0x7f08009a
+			public const int browse_button = 2131230874;
 			
 			// aapt resource value: 0x7f0800ef
-			public const int group_name = 2131230959;
+			public const int btnPluginsOnline = 2131230959;
 			
-			// aapt resource value: 0x7f0800f3
-			public const int group_text = 2131230963;
+			// aapt resource value: 0x7f080046
+			public const int btn_change_location = 2131230790;
 			
-			// aapt resource value: 0x7f08013c
-			public const int help = 2131231036;
+			// aapt resource value: 0x7f08004f
+			public const int btn_create = 2131230799;
 			
-			// aapt resource value: 0x7f08001b
-			public const int home = 2131230747;
+			// aapt resource value: 0x7f0800ad
+			public const int btn_length12 = 2131230893;
 			
-			// aapt resource value: 0x7f08000d
-			public const int homeAsUp = 2131230733;
+			// aapt resource value: 0x7f0800ac
+			public const int btn_length16 = 2131230892;
+			
+			// aapt resource value: 0x7f0800af
+			public const int btn_length6 = 2131230895;
+			
+			// aapt resource value: 0x7f0800ae
+			public const int btn_length8 = 2131230894;
+			
+			// aapt resource value: 0x7f0800f9
+			public const int button = 2131230969;
+			
+			// aapt resource value: 0x7f0800fa
+			public const int button_text = 2131230970;
+			
+			// aapt resource value: 0x7f0800bf
+			public const int cancel = 2131230911;
+			
+			// aapt resource value: 0x7f0800a6
+			public const int cancel_button = 2131230886;
+			
+			// aapt resource value: 0x7f0800bc
+			public const int cancel_insert_element = 2131230908;
+			
+			// aapt resource value: 0x7f080042
+			public const int candidates = 2131230786;
+			
+			// aapt resource value: 0x7f08010b
+			public const int cbCaseSensitive = 2131230987;
+			
+			// aapt resource value: 0x7f08010c
+			public const int cbExcludeExpiredEntries = 2131230988;
+			
+			// aapt resource value: 0x7f080101
+			public const int cbRegEx = 2131230977;
+			
+			// aapt resource value: 0x7f08010a
+			public const int cbSearchInGroupName = 2131230986;
+			
+			// aapt resource value: 0x7f080107
+			public const int cbSearchInNotes = 2131230983;
+			
+			// aapt resource value: 0x7f080108
+			public const int cbSearchInOtherStrings = 2131230984;
+			
+			// aapt resource value: 0x7f080106
+			public const int cbSearchInPassword = 2131230982;
+			
+			// aapt resource value: 0x7f080109
+			public const int cbSearchInTags = 2131230985;
+			
+			// aapt resource value: 0x7f080103
+			public const int cbSearchInTitle = 2131230979;
+			
+			// aapt resource value: 0x7f080104
+			public const int cbSearchInUrl = 2131230980;
+			
+			// aapt resource value: 0x7f080105
+			public const int cbSearchInUsername = 2131230981;
+			
+			// aapt resource value: 0x7f0800b8
+			public const int cb_brackets = 2131230904;
+			
+			// aapt resource value: 0x7f0800b3
+			public const int cb_digits = 2131230899;
+			
+			// aapt resource value: 0x7f0800ed
+			public const int cb_enabled = 2131230957;
+			
+			// aapt resource value: 0x7f0800b2
+			public const int cb_lowercase = 2131230898;
+			
+			// aapt resource value: 0x7f0800b4
+			public const int cb_minus = 2131230900;
+			
+			// aapt resource value: 0x7f0800b6
+			public const int cb_space = 2131230902;
+			
+			// aapt resource value: 0x7f0800b7
+			public const int cb_specials = 2131230903;
+			
+			// aapt resource value: 0x7f0800b5
+			public const int cb_underline = 2131230901;
+			
+			// aapt resource value: 0x7f0800b1
+			public const int cb_uppercase = 2131230897;
+			
+			// aapt resource value: 0x7f080014
+			public const int contributors_title = 2131230740;
+			
+			// aapt resource value: 0x7f08009d
+			public const int create = 2131230877;
+			
+			// aapt resource value: 0x7f08011c
+			public const int cred_password = 2131231004;
+			
+			// aapt resource value: 0x7f08011d
+			public const int cred_remember_mode = 2131231005;
+			
+			// aapt resource value: 0x7f08011b
+			public const int cred_username = 2131231003;
+			
+			// aapt resource value: 0x7f080059
+			public const int delete_extra = 2131230809;
+			
+			// aapt resource value: 0x7f0800e8
+			public const int deny_button = 2131230952;
+			
+			// aapt resource value: 0x7f080013
+			public const int disclaimer = 2131230739;
+			
+			// aapt resource value: 0x7f080012
+			public const int disclaimer_title = 2131230738;
+			
+			// aapt resource value: 0x7f08000a
+			public const int divider1 = 2131230730;
+			
+			// aapt resource value: 0x7f08000e
+			public const int divider2 = 2131230734;
+			
+			// aapt resource value: 0x7f080011
+			public const int divider3 = 2131230737;
+			
+			// aapt resource value: 0x7f080052
+			public const int donate_question = 2131230802;
+			
+			// aapt resource value: 0x7f08006e
+			public const int edit_extra = 2131230830;
+			
+			// aapt resource value: 0x7f0800e7
+			public const int enable_quickunlock = 2131230951;
+			
+			// aapt resource value: 0x7f080065
+			public const int entry_binaries_label = 2131230821;
+			
+			// aapt resource value: 0x7f080062
+			public const int entry_comment = 2131230818;
+			
+			// aapt resource value: 0x7f080061
+			public const int entry_comment_label = 2131230817;
+			
+			// aapt resource value: 0x7f08004b
+			public const int entry_confpassword = 2131230795;
+			
+			// aapt resource value: 0x7f08007a
+			public const int entry_contents = 2131230842;
+			
+			// aapt resource value: 0x7f08008d
+			public const int entry_created = 2131230861;
+			
+			// aapt resource value: 0x7f08008c
+			public const int entry_created_label = 2131230860;
+			
+			// aapt resource value: 0x7f080079
+			public const int entry_divider2 = 2131230841;
+			
+			// aapt resource value: 0x7f080078
+			public const int entry_edit = 2131230840;
+			
+			// aapt resource value: 0x7f08006d
+			public const int entry_expires = 2131230829;
+			
+			// aapt resource value: 0x7f08006c
+			public const int entry_expires_checkbox = 2131230828;
+			
+			// aapt resource value: 0x7f08006b
+			public const int entry_expires_label = 2131230827;
+			
+			// aapt resource value: 0x7f080072
+			public const int entry_extra = 2131230834;
+			
+			// aapt resource value: 0x7f080073
+			public const int entry_icon = 2131230835;
+			
+			// aapt resource value: 0x7f080090
+			public const int entry_modified = 2131230864;
+			
+			// aapt resource value: 0x7f08008f
+			public const int entry_modified_label = 2131230863;
+			
+			// aapt resource value: 0x7f08006a
+			public const int entry_override_url = 2131230826;
+			
+			// aapt resource value: 0x7f080069
+			public const int entry_override_url_label = 2131230825;
+			
+			// aapt resource value: 0x7f08004a
+			public const int entry_password = 2131230794;
+			
+			// aapt resource value: 0x7f08005f
+			public const int entry_password_label = 2131230815;
+			
+			// aapt resource value: 0x7f0800fb
+			public const int entry_save = 2131230971;
+			
+			// aapt resource value: 0x7f08005a
+			public const int entry_scroll = 2131230810;
+			
+			// aapt resource value: 0x7f08007b
+			public const int entry_table = 2131230843;
+			
+			// aapt resource value: 0x7f080068
+			public const int entry_tags = 2131230824;
+			
+			// aapt resource value: 0x7f080067
+			public const int entry_tags_label = 2131230823;
+			
+			// aapt resource value: 0x7f080074
+			public const int entry_text = 2131230836;
+			
+			// aapt resource value: 0x7f080075
+			public const int entry_text_detail = 2131230837;
+			
+			// aapt resource value: 0x7f08005c
+			public const int entry_title = 2131230812;
+			
+			// aapt resource value: 0x7f08005e
+			public const int entry_url = 2131230814;
+			
+			// aapt resource value: 0x7f080081
+			public const int entry_url_label = 2131230849;
+			
+			// aapt resource value: 0x7f08005d
+			public const int entry_user_name = 2131230813;
+			
+			// aapt resource value: 0x7f08007d
+			public const int entry_user_name_label = 2131230845;
+			
+			// aapt resource value: 0x7f080087
+			public const int entryfield_container_comment = 2131230855;
+			
+			// aapt resource value: 0x7f08008b
+			public const int entryfield_container_created = 2131230859;
+			
+			// aapt resource value: 0x7f080091
+			public const int entryfield_container_expires = 2131230865;
+			
+			// aapt resource value: 0x7f08008e
+			public const int entryfield_container_modified = 2131230862;
+			
+			// aapt resource value: 0x7f08008a
+			public const int entryfield_container_overrideurl = 2131230858;
+			
+			// aapt resource value: 0x7f080084
+			public const int entryfield_container_password = 2131230852;
+			
+			// aapt resource value: 0x7f080089
+			public const int entryfield_container_tags = 2131230857;
+			
+			// aapt resource value: 0x7f080080
+			public const int entryfield_container_url = 2131230848;
+			
+			// aapt resource value: 0x7f08007c
+			public const int entryfield_container_username = 2131230844;
+			
+			// aapt resource value: 0x7f080070
+			public const int extra_container = 2131230832;
+			
+			// aapt resource value: 0x7f080088
+			public const int extra_strings = 2131230856;
+			
+			// aapt resource value: 0x7f08006f
+			public const int extra_title_container = 2131230831;
+			
+			// aapt resource value: 0x7f080071
+			public const int extra_vdots = 2131230833;
+			
+			// aapt resource value: 0x7f080010
+			public const int feedback = 2131230736;
+			
+			// aapt resource value: 0x7f08000f
+			public const int feedback_title = 2131230735;
+			
+			// aapt resource value: 0x7f080092
+			public const int file_filename = 2131230866;
+			
+			// aapt resource value: 0x7f080093
+			public const int file_listtop = 2131230867;
+			
+			// aapt resource value: 0x7f0800a2
+			public const int file_select = 2131230882;
+			
+			// aapt resource value: 0x7f0800d0
+			public const int filename = 2131230928;
+			
+			// aapt resource value: 0x7f080098
+			public const int filename_form = 2131230872;
+			
+			// aapt resource value: 0x7f0800cd
+			public const int filename_group = 2131230925;
+			
+			// aapt resource value: 0x7f0800ce
+			public const int filename_label = 2131230926;
+			
+			// aapt resource value: 0x7f0800cf
+			public const int filenamescroll = 2131230927;
+			
+			// aapt resource value: 0x7f080044
+			public const int filestorage_label = 2131230788;
+			
+			// aapt resource value: 0x7f080043
+			public const int filestorage_logo = 2131230787;
+			
+			// aapt resource value: 0x7f08009e
+			public const int fnv_cancel = 2131230878;
+			
+			// aapt resource value: 0x7f0800a3
+			public const int fssa_progress_bar = 2131230883;
+			
+			// aapt resource value: 0x7f080016
+			public const int further_authors = 2131230742;
+			
+			// aapt resource value: 0x7f080048
+			public const int generate_button = 2131230792;
+			
+			// aapt resource value: 0x7f0800aa
+			public const int generate_password_button = 2131230890;
+			
+			// aapt resource value: 0x7f0800c0
+			public const int group_icon = 2131230912;
+			
+			// aapt resource value: 0x7f0800c2
+			public const int group_label = 2131230914;
+			
+			// aapt resource value: 0x7f0800bd
+			public const int group_name = 2131230909;
+			
+			// aapt resource value: 0x7f0800c1
+			public const int group_text = 2131230913;
+			
+			// aapt resource value: 0x7f08011a
+			public const int help = 2131231002;
 			
 			// aapt resource value: 0x7f080004
 			public const int hybrid = 2131230724;
 			
-			// aapt resource value: 0x7f08002f
-			public const int icon = 2131230767;
+			// aapt resource value: 0x7f0800c3
+			public const int icon = 2131230915;
 			
-			// aapt resource value: 0x7f08009d
-			public const int icon_button = 2131230877;
+			// aapt resource value: 0x7f08005b
+			public const int icon_button = 2131230811;
 			
-			// aapt resource value: 0x7f0800f5
-			public const int icon_image = 2131230965;
+			// aapt resource value: 0x7f0800c4
+			public const int icon_image = 2131230916;
 			
-			// aapt resource value: 0x7f0800f6
-			public const int icon_text = 2131230966;
+			// aapt resource value: 0x7f0800c5
+			public const int icon_text = 2131230917;
 			
-			// aapt resource value: 0x7f080012
-			public const int ifRoom = 2131230738;
+			// aapt resource value: 0x7f0800f7
+			public const int image = 2131230967;
 			
-			// aapt resource value: 0x7f08002c
-			public const int image = 2131230764;
+			// aapt resource value: 0x7f0800c9
+			public const int imgIcon = 2131230921;
 			
-			// aapt resource value: 0x7f0800d1
-			public const int imglogo = 2131230929;
+			// aapt resource value: 0x7f0800a0
+			public const int imglogo = 2131230880;
 			
-			// aapt resource value: 0x7f080093
-			public const int imgoktfest = 2131230867;
+			// aapt resource value: 0x7f080053
+			public const int imgoktfest = 2131230803;
 			
-			// aapt resource value: 0x7f080105
-			public const int init_otp = 2131230981;
+			// aapt resource value: 0x7f0800d8
+			public const int init_otp = 2131230936;
 			
-			// aapt resource value: 0x7f080139
-			public const int initial_dir = 2131231033;
+			// aapt resource value: 0x7f080117
+			public const int initial_dir = 2131230999;
 			
-			// aapt resource value: 0x7f0800ed
-			public const int insert_element = 2131230957;
+			// aapt resource value: 0x7f0800bb
+			public const int insert_element = 2131230907;
 			
 			// aapt resource value: 0x7f080006
 			public const int italic = 2131230726;
 			
-			// aapt resource value: 0x7f080059
-			public const int keyboard_contrib = 2131230809;
-			
-			// aapt resource value: 0x7f080101
-			public const int keyfileLine = 2131230977;
-			
-			// aapt resource value: 0x7f08008e
-			public const int keyfile_filename = 2131230862;
-			
-			// aapt resource value: 0x7f08008c
-			public const int keyfile_title = 2131230860;
-			
-			// aapt resource value: 0x7f080113
-			public const int kill_app = 2131230995;
-			
-			// aapt resource value: 0x7f0800d2
-			public const int label_app_name = 2131230930;
-			
-			// aapt resource value: 0x7f080085
-			public const int label_filename = 2131230853;
-			
-			// aapt resource value: 0x7f0800ca
-			public const int label_open_by_filename = 2131230922;
-			
-			// aapt resource value: 0x7f0800cc
-			public const int label_open_by_filename_details = 2131230924;
-			
-			// aapt resource value: 0x7f0800c5
-			public const int label_warning = 2131230917;
-			
-			// aapt resource value: 0x7f080038
-			public const int left_icon = 2131230776;
-			
-			// aapt resource value: 0x7f0800e1
-			public const int length = 2131230945;
-			
-			// aapt resource value: 0x7f0800dc
-			public const int length_label = 2131230940;
-			
-			// aapt resource value: 0x7f080122
-			public const int linearLayout1 = 2131231010;
-			
-			// aapt resource value: 0x7f080009
-			public const int listMode = 2131230729;
-			
-			// aapt resource value: 0x7f08002e
-			public const int list_item = 2131230766;
-			
-			// aapt resource value: 0x7f08011a
-			public const int main_image = 2131231002;
-			
-			// aapt resource value: 0x7f080159
-			public const int menu_about = 2131231065;
-			
-			// aapt resource value: 0x7f080158
-			public const int menu_app_settings = 2131231064;
-			
-			// aapt resource value: 0x7f080157
-			public const int menu_cancel_edit = 2131231063;
-			
-			// aapt resource value: 0x7f08015f
-			public const int menu_change_db = 2131231071;
-			
-			// aapt resource value: 0x7f08015b
-			public const int menu_change_master_key = 2131231067;
-			
-			// aapt resource value: 0x7f080150
-			public const int menu_donate = 2131231056;
-			
-			// aapt resource value: 0x7f080152
-			public const int menu_goto_url = 2131231058;
-			
-			// aapt resource value: 0x7f080153
-			public const int menu_lock = 2131231059;
-			
-			// aapt resource value: 0x7f080155
-			public const int menu_rate = 2131231061;
-			
-			// aapt resource value: 0x7f08015a
-			public const int menu_search = 2131231066;
-			
-			// aapt resource value: 0x7f08015e
-			public const int menu_search_advanced = 2131231070;
-			
-			// aapt resource value: 0x7f08015d
-			public const int menu_sort = 2131231069;
-			
-			// aapt resource value: 0x7f080154
-			public const int menu_suggest_improvements = 2131231060;
-			
-			// aapt resource value: 0x7f08015c
-			public const int menu_sync = 2131231068;
-			
-			// aapt resource value: 0x7f080151
-			public const int menu_toggle_pass = 2131231057;
-			
-			// aapt resource value: 0x7f080156
-			public const int menu_translate = 2131231062;
-			
 			// aapt resource value: 0x7f080019
-			public const int middle = 2131230745;
+			public const int keyboard_contrib = 2131230745;
 			
-			// aapt resource value: 0x7f080142
-			public const int mode_email = 2131231042;
+			// aapt resource value: 0x7f0800d4
+			public const int keyfileLine = 2131230932;
 			
-			// aapt resource value: 0x7f080147
-			public const int mode_email_with_settings_key = 2131231047;
+			// aapt resource value: 0x7f08004e
+			public const int keyfile_filename = 2131230798;
 			
-			// aapt resource value: 0x7f080143
-			public const int mode_im = 2131231043;
+			// aapt resource value: 0x7f08004c
+			public const int keyfile_title = 2131230796;
 			
-			// aapt resource value: 0x7f080148
-			public const int mode_im_with_settings_key = 2131231048;
+			// aapt resource value: 0x7f0800e6
+			public const int kill_app = 2131230950;
 			
-			// aapt resource value: 0x7f080140
-			public const int mode_normal = 2131231040;
+			// aapt resource value: 0x7f0800a1
+			public const int label_app_name = 2131230881;
 			
-			// aapt resource value: 0x7f080145
-			public const int mode_normal_with_settings_key = 2131231045;
+			// aapt resource value: 0x7f080045
+			public const int label_filename = 2131230789;
 			
-			// aapt resource value: 0x7f08014a
-			public const int mode_symbols = 2131231050;
+			// aapt resource value: 0x7f080099
+			public const int label_open_by_filename = 2131230873;
 			
-			// aapt resource value: 0x7f08014b
-			public const int mode_symbols_with_settings_key = 2131231051;
+			// aapt resource value: 0x7f08009b
+			public const int label_open_by_filename_details = 2131230875;
 			
-			// aapt resource value: 0x7f080141
-			public const int mode_url = 2131231041;
+			// aapt resource value: 0x7f080094
+			public const int label_warning = 2131230868;
 			
-			// aapt resource value: 0x7f080146
-			public const int mode_url_with_settings_key = 2131231046;
+			// aapt resource value: 0x7f0800b0
+			public const int length = 2131230896;
 			
-			// aapt resource value: 0x7f080144
-			public const int mode_webentry = 2131231044;
+			// aapt resource value: 0x7f0800ab
+			public const int length_label = 2131230891;
 			
-			// aapt resource value: 0x7f080149
-			public const int mode_webentry_with_settings_key = 2131231049;
+			// aapt resource value: 0x7f080100
+			public const int linearLayout1 = 2131230976;
 			
-			// aapt resource value: 0x7f080011
-			public const int never = 2131230737;
+			// aapt resource value: 0x7f0800f5
+			public const int main_image = 2131230965;
 			
-			// aapt resource value: 0x7f080095
-			public const int no_donate = 2131230869;
+			// aapt resource value: 0x7f080135
+			public const int menu_about = 2131231029;
+			
+			// aapt resource value: 0x7f080136
+			public const int menu_app_settings = 2131231030;
+			
+			// aapt resource value: 0x7f08013c
+			public const int menu_change_db = 2131231036;
+			
+			// aapt resource value: 0x7f080139
+			public const int menu_change_master_key = 2131231033;
+			
+			// aapt resource value: 0x7f080130
+			public const int menu_donate = 2131231024;
 			
 			// aapt resource value: 0x7f080131
-			public const int no_results = 2131231025;
+			public const int menu_goto_url = 2131231025;
+			
+			// aapt resource value: 0x7f08012e
+			public const int menu_lock = 2131231022;
+			
+			// aapt resource value: 0x7f080133
+			public const int menu_rate = 2131231027;
+			
+			// aapt resource value: 0x7f080137
+			public const int menu_search = 2131231031;
+			
+			// aapt resource value: 0x7f080138
+			public const int menu_search_advanced = 2131231032;
+			
+			// aapt resource value: 0x7f08013b
+			public const int menu_sort = 2131231035;
+			
+			// aapt resource value: 0x7f080132
+			public const int menu_suggest_improvements = 2131231026;
+			
+			// aapt resource value: 0x7f08013a
+			public const int menu_sync = 2131231034;
+			
+			// aapt resource value: 0x7f08012f
+			public const int menu_toggle_pass = 2131231023;
+			
+			// aapt resource value: 0x7f080134
+			public const int menu_translate = 2131231028;
+			
+			// aapt resource value: 0x7f080120
+			public const int mode_email = 2131231008;
+			
+			// aapt resource value: 0x7f080125
+			public const int mode_email_with_settings_key = 2131231013;
+			
+			// aapt resource value: 0x7f080121
+			public const int mode_im = 2131231009;
+			
+			// aapt resource value: 0x7f080126
+			public const int mode_im_with_settings_key = 2131231014;
+			
+			// aapt resource value: 0x7f08011e
+			public const int mode_normal = 2131231006;
+			
+			// aapt resource value: 0x7f080123
+			public const int mode_normal_with_settings_key = 2131231011;
+			
+			// aapt resource value: 0x7f080128
+			public const int mode_symbols = 2131231016;
+			
+			// aapt resource value: 0x7f080129
+			public const int mode_symbols_with_settings_key = 2131231017;
+			
+			// aapt resource value: 0x7f08011f
+			public const int mode_url = 2131231007;
+			
+			// aapt resource value: 0x7f080124
+			public const int mode_url_with_settings_key = 2131231012;
+			
+			// aapt resource value: 0x7f080122
+			public const int mode_webentry = 2131231010;
+			
+			// aapt resource value: 0x7f080127
+			public const int mode_webentry_with_settings_key = 2131231015;
+			
+			// aapt resource value: 0x7f080055
+			public const int no_donate = 2131230805;
+			
+			// aapt resource value: 0x7f08010f
+			public const int no_results = 2131230991;
 			
 			// aapt resource value: 0x7f080000
 			public const int none = 2131230720;
@@ -3434,273 +2696,234 @@ namespace keepass2android
 			// aapt resource value: 0x7f080001
 			public const int normal = 2131230721;
 			
-			// aapt resource value: 0x7f0800f0
-			public const int ok = 2131230960;
+			// aapt resource value: 0x7f0800be
+			public const int ok = 2131230910;
 			
-			// aapt resource value: 0x7f080094
-			public const int ok_donate = 2131230868;
+			// aapt resource value: 0x7f080054
+			public const int ok_donate = 2131230804;
 			
-			// aapt resource value: 0x7f0800cd
-			public const int open = 2131230925;
+			// aapt resource value: 0x7f08009c
+			public const int open = 2131230876;
 			
-			// aapt resource value: 0x7f080109
-			public const int otp1 = 2131230985;
+			// aapt resource value: 0x7f0800dc
+			public const int otp1 = 2131230940;
 			
-			// aapt resource value: 0x7f08010a
-			public const int otp2 = 2131230986;
+			// aapt resource value: 0x7f0800dd
+			public const int otp2 = 2131230941;
 			
-			// aapt resource value: 0x7f08010b
-			public const int otp3 = 2131230987;
+			// aapt resource value: 0x7f0800de
+			public const int otp3 = 2131230942;
 			
-			// aapt resource value: 0x7f08010c
-			public const int otp4 = 2131230988;
+			// aapt resource value: 0x7f0800df
+			public const int otp4 = 2131230943;
 			
-			// aapt resource value: 0x7f08010d
-			public const int otp5 = 2131230989;
+			// aapt resource value: 0x7f0800e0
+			public const int otp5 = 2131230944;
 			
-			// aapt resource value: 0x7f08010e
-			public const int otp6 = 2131230990;
-			
-			// aapt resource value: 0x7f080107
-			public const int otpEntry = 2131230983;
-			
-			// aapt resource value: 0x7f080104
-			public const int otpInitView = 2131230980;
-			
-			// aapt resource value: 0x7f08010f
-			public const int otpSecretLine = 2131230991;
-			
-			// aapt resource value: 0x7f080103
-			public const int otpView = 2131230979;
-			
-			// aapt resource value: 0x7f080108
-			public const int otp_expl = 2131230984;
-			
-			// aapt resource value: 0x7f080106
-			public const int otps_pending = 2131230982;
-			
-			// aapt resource value: 0x7f080111
-			public const int otpsecret_format_spinner = 2131230993;
-			
-			// aapt resource value: 0x7f080133
-			public const int pass_conf_password = 2131231027;
-			
-			// aapt resource value: 0x7f080102
-			public const int pass_keyfile = 2131230978;
-			
-			// aapt resource value: 0x7f080112
-			public const int pass_ok = 2131230994;
-			
-			// aapt resource value: 0x7f080110
-			public const int pass_otpsecret = 2131230992;
-			
-			// aapt resource value: 0x7f080132
-			public const int pass_password = 2131231026;
+			// aapt resource value: 0x7f0800e1
+			public const int otp6 = 2131230945;
 			
 			// aapt resource value: 0x7f0800da
-			public const int password = 2131230938;
+			public const int otpEntry = 2131230938;
 			
-			// aapt resource value: 0x7f080100
-			public const int passwordLine = 2131230976;
+			// aapt resource value: 0x7f0800d7
+			public const int otpInitView = 2131230935;
 			
-			// aapt resource value: 0x7f0800fe
-			public const int password_label = 2131230974;
+			// aapt resource value: 0x7f0800e2
+			public const int otpSecretLine = 2131230946;
 			
-			// aapt resource value: 0x7f0800ff
-			public const int password_mode_spinner = 2131230975;
+			// aapt resource value: 0x7f0800d6
+			public const int otpView = 2131230934;
 			
-			// aapt resource value: 0x7f0800a4
-			public const int password_section = 2131230884;
+			// aapt resource value: 0x7f0800db
+			public const int otp_expl = 2131230939;
 			
-			// aapt resource value: 0x7f080087
-			public const int password_title = 2131230855;
+			// aapt resource value: 0x7f0800d9
+			public const int otps_pending = 2131230937;
 			
-			// aapt resource value: 0x7f080057
-			public const int plugin1 = 2131230807;
+			// aapt resource value: 0x7f0800e4
+			public const int otpsecret_format_spinner = 2131230948;
 			
-			// aapt resource value: 0x7f080135
-			public const int portsep = 2131231029;
+			// aapt resource value: 0x7f080111
+			public const int pass_conf_password = 2131230993;
 			
-			// aapt resource value: 0x7f08011c
-			public const int progress = 2131231004;
+			// aapt resource value: 0x7f0800d5
+			public const int pass_keyfile = 2131230933;
 			
-			// aapt resource value: 0x7f08003b
-			public const int progress_circular = 2131230779;
+			// aapt resource value: 0x7f0800e5
+			public const int pass_ok = 2131230949;
 			
-			// aapt resource value: 0x7f08003c
-			public const int progress_horizontal = 2131230780;
+			// aapt resource value: 0x7f0800e3
+			public const int pass_otpsecret = 2131230947;
 			
-			// aapt resource value: 0x7f080097
-			public const int protection = 2131230871;
+			// aapt resource value: 0x7f080110
+			public const int pass_password = 2131230992;
 			
-			// aapt resource value: 0x7f080115
-			public const int qu_filename = 2131230997;
+			// aapt resource value: 0x7f0800a9
+			public const int password = 2131230889;
 			
-			// aapt resource value: 0x7f080034
-			public const int radio = 2131230772;
+			// aapt resource value: 0x7f0800d3
+			public const int passwordLine = 2131230931;
 			
-			// aapt resource value: 0x7f080039
-			public const int right_container = 2131230777;
+			// aapt resource value: 0x7f080085
+			public const int password_container = 2131230853;
 			
-			// aapt resource value: 0x7f08003a
-			public const int right_icon = 2131230778;
+			// aapt resource value: 0x7f0800d1
+			public const int password_label = 2131230929;
 			
-			// aapt resource value: 0x7f080090
-			public const int rounds = 2131230864;
+			// aapt resource value: 0x7f0800d2
+			public const int password_mode_spinner = 2131230930;
 			
-			// aapt resource value: 0x7f080091
-			public const int rounds_explaination = 2131230865;
+			// aapt resource value: 0x7f080060
+			public const int password_section = 2131230816;
+			
+			// aapt resource value: 0x7f080047
+			public const int password_title = 2131230791;
+			
+			// aapt resource value: 0x7f080086
+			public const int password_vdots = 2131230854;
+			
+			// aapt resource value: 0x7f080017
+			public const int plugin1 = 2131230743;
+			
+			// aapt resource value: 0x7f0800e9
+			public const int plugin_scroll = 2131230953;
+			
+			// aapt resource value: 0x7f080113
+			public const int portsep = 2131230995;
+			
+			// aapt resource value: 0x7f0800f8
+			public const int progress = 2131230968;
+			
+			// aapt resource value: 0x7f080058
+			public const int protection = 2131230808;
+			
+			// aapt resource value: 0x7f0800f0
+			public const int qu_filename = 2131230960;
+			
+			// aapt resource value: 0x7f080050
+			public const int rounds = 2131230800;
+			
+			// aapt resource value: 0x7f080051
+			public const int rounds_explaination = 2131230801;
 			
 			// aapt resource value: 0x7f080002
 			public const int satellite = 2131230722;
 			
-			// aapt resource value: 0x7f080121
-			public const int scrollView1 = 2131231009;
+			// aapt resource value: 0x7f0800ea
+			public const int scopes_list = 2131230954;
 			
-			// aapt resource value: 0x7f080120
-			public const int searchEditText = 2131231008;
+			// aapt resource value: 0x7f0800ee
+			public const int scopes_title = 2131230958;
 			
-			// aapt resource value: 0x7f08003f
-			public const int search_badge = 2131230783;
+			// aapt resource value: 0x7f0800ff
+			public const int scrollView1 = 2131230975;
 			
-			// aapt resource value: 0x7f08003e
-			public const int search_bar = 2131230782;
+			// aapt resource value: 0x7f0800fe
+			public const int searchEditText = 2131230974;
 			
-			// aapt resource value: 0x7f080040
-			public const int search_button = 2131230784;
+			// aapt resource value: 0x7f0800fd
+			public const int search_button = 2131230973;
 			
-			// aapt resource value: 0x7f080045
-			public const int search_close_btn = 2131230789;
+			// aapt resource value: 0x7f080102
+			public const int search_in_label = 2131230978;
 			
-			// aapt resource value: 0x7f080041
-			public const int search_edit_frame = 2131230785;
+			// aapt resource value: 0x7f0800fc
+			public const int search_label = 2131230972;
 			
-			// aapt resource value: 0x7f080047
-			public const int search_go_btn = 2131230791;
+			// aapt resource value: 0x7f08010d
+			public const int select_other_entry = 2131230989;
 			
-			// aapt resource value: 0x7f080124
-			public const int search_in_label = 2131231012;
+			// aapt resource value: 0x7f080112
+			public const int sftp_host = 2131230994;
 			
-			// aapt resource value: 0x7f08011f
-			public const int search_label = 2131231007;
+			// aapt resource value: 0x7f080118
+			public const int sftp_initial_dir = 2131231000;
 			
-			// aapt resource value: 0x7f080042
-			public const int search_mag_icon = 2131230786;
+			// aapt resource value: 0x7f080116
+			public const int sftp_password = 2131230998;
 			
-			// aapt resource value: 0x7f080043
-			public const int search_plate = 2131230787;
+			// aapt resource value: 0x7f080114
+			public const int sftp_port = 2131230996;
 			
-			// aapt resource value: 0x7f080044
-			public const int search_src_text = 2131230788;
+			// aapt resource value: 0x7f080115
+			public const int sftp_user = 2131230997;
 			
-			// aapt resource value: 0x7f080048
-			public const int search_voice_btn = 2131230792;
+			// aapt resource value: 0x7f080097
+			public const int start_create = 2131230871;
 			
-			// aapt resource value: 0x7f08012f
-			public const int select_other_entry = 2131231023;
+			// aapt resource value: 0x7f080119
+			public const int start_create_import = 2131231001;
 			
-			// aapt resource value: 0x7f080134
-			public const int sftp_host = 2131231028;
+			// aapt resource value: 0x7f080095
+			public const int start_open_file = 2131230869;
 			
-			// aapt resource value: 0x7f08013a
-			public const int sftp_initial_dir = 2131231034;
-			
-			// aapt resource value: 0x7f080138
-			public const int sftp_password = 2131231032;
-			
-			// aapt resource value: 0x7f080136
-			public const int sftp_port = 2131231030;
-			
-			// aapt resource value: 0x7f080137
-			public const int sftp_user = 2131231031;
-			
-			// aapt resource value: 0x7f080033
-			public const int shortcut = 2131230771;
-			
-			// aapt resource value: 0x7f08000f
-			public const int showCustom = 2131230735;
-			
-			// aapt resource value: 0x7f08000c
-			public const int showHome = 2131230732;
-			
-			// aapt resource value: 0x7f08000e
-			public const int showTitle = 2131230734;
-			
-			// aapt resource value: 0x7f080023
-			public const int split_action_bar = 2131230755;
-			
-			// aapt resource value: 0x7f0800c8
-			public const int start_create = 2131230920;
-			
-			// aapt resource value: 0x7f08013b
-			public const int start_create_import = 2131231035;
-			
-			// aapt resource value: 0x7f0800c6
-			public const int start_open_file = 2131230918;
-			
-			// aapt resource value: 0x7f0800c7
-			public const int start_open_url = 2131230919;
-			
-			// aapt resource value: 0x7f080046
-			public const int submit_area = 2131230790;
-			
-			// aapt resource value: 0x7f08000a
-			public const int tabMode = 2131230730;
+			// aapt resource value: 0x7f080096
+			public const int start_open_url = 2131230870;
 			
 			// aapt resource value: 0x7f080003
 			public const int terrain = 2131230723;
 			
-			// aapt resource value: 0x7f08011b
-			public const int text = 2131231003;
+			// aapt resource value: 0x7f0800f6
+			public const int text = 2131230966;
 			
-			// aapt resource value: 0x7f0800d5
-			public const int textView = 2131230933;
+			// aapt resource value: 0x7f0800a4
+			public const int textView = 2131230884;
 			
-			// aapt resource value: 0x7f080030
-			public const int title = 2131230768;
+			// aapt resource value: 0x7f080056
+			public const int title = 2131230806;
 			
-			// aapt resource value: 0x7f0800b7
-			public const int title_block = 2131230903;
+			// aapt resource value: 0x7f080049
+			public const int toggle_password = 2131230793;
 			
-			// aapt resource value: 0x7f080037
-			public const int title_container = 2131230775;
+			// aapt resource value: 0x7f080076
+			public const int top = 2131230838;
 			
-			// aapt resource value: 0x7f080089
-			public const int toggle_password = 2131230857;
+			// aapt resource value: 0x7f0800eb
+			public const int txtAuthor = 2131230955;
 			
-			// aapt resource value: 0x7f0800bc
-			public const int top = 2131230908;
+			// aapt resource value: 0x7f0800ca
+			public const int txtLabel = 2131230922;
 			
-			// aapt resource value: 0x7f080025
-			public const int top_action_bar = 2131230757;
+			// aapt resource value: 0x7f0800ec
+			public const int txtShortDesc = 2131230956;
 			
-			// aapt resource value: 0x7f080026
-			public const int up = 2131230758;
+			// aapt resource value: 0x7f0800cc
+			public const int txtStatus = 2131230924;
 			
-			// aapt resource value: 0x7f08000b
-			public const int useLogo = 2131230731;
+			// aapt resource value: 0x7f0800cb
+			public const int txtVersion = 2131230923;
 			
-			// aapt resource value: 0x7f08008d
-			public const int use_keyfile = 2131230861;
+			// aapt resource value: 0x7f080082
+			public const int url_container = 2131230850;
 			
-			// aapt resource value: 0x7f080096
-			public const int value = 2131230870;
+			// aapt resource value: 0x7f080083
+			public const int url_vdots = 2131230851;
 			
 			// aapt resource value: 0x7f08004d
-			public const int versionB = 2131230797;
+			public const int use_keyfile = 2131230797;
 			
-			// aapt resource value: 0x7f08004c
-			public const int versionX = 2131230796;
+			// aapt resource value: 0x7f08007e
+			public const int username_container = 2131230846;
 			
-			// aapt resource value: 0x7f08004b
-			public const int version_title = 2131230795;
+			// aapt resource value: 0x7f08007f
+			public const int username_vdots = 2131230847;
+			
+			// aapt resource value: 0x7f080057
+			public const int value = 2131230807;
+			
+			// aapt resource value: 0x7f08000d
+			public const int versionB = 2131230733;
+			
+			// aapt resource value: 0x7f08000c
+			public const int versionX = 2131230732;
+			
+			// aapt resource value: 0x7f08000b
+			public const int version_title = 2131230731;
 			
 			// aapt resource value: 0x7f080007
 			public const int white = 2131230727;
 			
-			// aapt resource value: 0x7f080014
-			public const int withText = 2131230740;
-			
 			static Id()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
@@ -3714,20 +2937,17 @@ namespace keepass2android
 		public partial class Integer
 		{
 			
-			// aapt resource value: 0x7f0b001a
-			public const int abc_max_action_buttons = 2131427354;
-			
-			// aapt resource value: 0x7f0b001c
-			public const int afc_afc_search_view_delay_time_submission = 2131427356;
-			
 			// aapt resource value: 0x7f0b001b
-			public const int afc_lib_version_code = 2131427355;
+			public const int afc_afc_search_view_delay_time_submission = 2131427355;
 			
-			// aapt resource value: 0x7f0b001e
-			public const int afc_pkey_display_sort_type_def = 2131427358;
+			// aapt resource value: 0x7f0b001a
+			public const int afc_lib_version_code = 2131427354;
 			
 			// aapt resource value: 0x7f0b001d
-			public const int afc_pkey_display_view_type_def = 2131427357;
+			public const int afc_pkey_display_sort_type_def = 2131427357;
+			
+			// aapt resource value: 0x7f0b001c
+			public const int afc_pkey_display_view_type_def = 2131427356;
 			
 			// aapt resource value: 0x7f0b0001
 			public const int config_delay_after_preview = 2131427329;
@@ -3821,301 +3041,232 @@ namespace keepass2android
 		{
 			
 			// aapt resource value: 0x7f030000
-			public const int abc_action_bar_decor = 2130903040;
+			public const int about = 2130903040;
 			
 			// aapt resource value: 0x7f030001
-			public const int abc_action_bar_decor_include = 2130903041;
+			public const int afc_activity_filechooser = 2130903041;
 			
 			// aapt resource value: 0x7f030002
-			public const int abc_action_bar_decor_overlay = 2130903042;
+			public const int afc_button_location = 2130903042;
 			
 			// aapt resource value: 0x7f030003
-			public const int abc_action_bar_home = 2130903043;
+			public const int afc_context_menu_tiem = 2130903043;
 			
 			// aapt resource value: 0x7f030004
-			public const int abc_action_bar_tab = 2130903044;
+			public const int afc_context_menu_view = 2130903044;
 			
 			// aapt resource value: 0x7f030005
-			public const int abc_action_bar_tabbar = 2130903045;
+			public const int afc_file_item = 2130903045;
 			
 			// aapt resource value: 0x7f030006
-			public const int abc_action_bar_title_item = 2130903046;
+			public const int afc_fragment_files = 2130903046;
 			
 			// aapt resource value: 0x7f030007
-			public const int abc_action_bar_view_list_nav_layout = 2130903047;
+			public const int afc_fragment_files_large = 2130903047;
 			
 			// aapt resource value: 0x7f030008
-			public const int abc_action_menu_item_layout = 2130903048;
+			public const int afc_gridview_files = 2130903048;
 			
 			// aapt resource value: 0x7f030009
-			public const int abc_action_menu_layout = 2130903049;
+			public const int afc_listview_files = 2130903049;
 			
 			// aapt resource value: 0x7f03000a
-			public const int abc_action_mode_bar = 2130903050;
+			public const int afc_settings_sort_view = 2130903050;
 			
 			// aapt resource value: 0x7f03000b
-			public const int abc_action_mode_close_item = 2130903051;
+			public const int afc_simple_text_input_view = 2130903051;
 			
 			// aapt resource value: 0x7f03000c
-			public const int abc_activity_chooser_view = 2130903052;
+			public const int afc_view_loading = 2130903052;
 			
 			// aapt resource value: 0x7f03000d
-			public const int abc_activity_chooser_view_include = 2130903053;
+			public const int afc_view_locations_divider = 2130903053;
 			
 			// aapt resource value: 0x7f03000e
-			public const int abc_activity_chooser_view_list_item = 2130903054;
+			public const int afc_widget_search_view = 2130903054;
 			
 			// aapt resource value: 0x7f03000f
-			public const int abc_expanded_menu_layout = 2130903055;
+			public const int bubble_text = 2130903055;
 			
 			// aapt resource value: 0x7f030010
-			public const int abc_list_menu_item_checkbox = 2130903056;
+			public const int candidate_preview = 2130903056;
 			
 			// aapt resource value: 0x7f030011
-			public const int abc_list_menu_item_icon = 2130903057;
+			public const int candidates = 2130903057;
 			
 			// aapt resource value: 0x7f030012
-			public const int abc_list_menu_item_layout = 2130903058;
+			public const int create_database = 2130903058;
 			
 			// aapt resource value: 0x7f030013
-			public const int abc_list_menu_item_radio = 2130903059;
+			public const int database_settings = 2130903059;
 			
 			// aapt resource value: 0x7f030014
-			public const int abc_popup_menu_item_layout = 2130903060;
+			public const int donate = 2130903060;
 			
 			// aapt resource value: 0x7f030015
-			public const int abc_screen = 2130903061;
+			public const int donate_bday = 2130903061;
 			
 			// aapt resource value: 0x7f030016
-			public const int abc_search_dropdown_item_icons_2line = 2130903062;
+			public const int donate_bdaymissed = 2130903062;
 			
 			// aapt resource value: 0x7f030017
-			public const int abc_search_view = 2130903063;
+			public const int edit_extra_string_dialog = 2130903063;
 			
 			// aapt resource value: 0x7f030018
-			public const int about = 2130903064;
+			public const int entry_edit = 2130903064;
 			
 			// aapt resource value: 0x7f030019
-			public const int afc_activity_filechooser = 2130903065;
+			public const int entry_edit_section = 2130903065;
 			
 			// aapt resource value: 0x7f03001a
-			public const int afc_button_location = 2130903066;
+			public const int entry_extrastring_title = 2130903066;
 			
 			// aapt resource value: 0x7f03001b
-			public const int afc_context_menu_tiem = 2130903067;
+			public const int entry_extrastring_value = 2130903067;
 			
 			// aapt resource value: 0x7f03001c
-			public const int afc_context_menu_view = 2130903068;
+			public const int entry_list_entry = 2130903068;
 			
 			// aapt resource value: 0x7f03001d
-			public const int afc_file_item = 2130903069;
+			public const int entry_section = 2130903069;
 			
 			// aapt resource value: 0x7f03001e
-			public const int afc_fragment_files = 2130903070;
+			public const int entry_view = 2130903070;
 			
 			// aapt resource value: 0x7f03001f
-			public const int afc_fragment_files_large = 2130903071;
+			public const int entry_view_contents = 2130903071;
 			
 			// aapt resource value: 0x7f030020
-			public const int afc_gridview_files = 2130903072;
+			public const int entry_view_test = 2130903072;
 			
 			// aapt resource value: 0x7f030021
-			public const int afc_listview_files = 2130903073;
+			public const int file_row = 2130903073;
 			
 			// aapt resource value: 0x7f030022
-			public const int afc_settings_sort_view = 2130903074;
+			public const int file_selection = 2130903074;
 			
 			// aapt resource value: 0x7f030023
-			public const int afc_simple_text_input_view = 2130903075;
+			public const int file_selection_buttons = 2130903075;
 			
 			// aapt resource value: 0x7f030024
-			public const int afc_view_loading = 2130903076;
+			public const int file_selection_filename = 2130903076;
 			
 			// aapt resource value: 0x7f030025
-			public const int afc_view_locations_divider = 2130903077;
+			public const int file_selection_no_recent = 2130903077;
 			
 			// aapt resource value: 0x7f030026
-			public const int afc_widget_search_view = 2130903078;
+			public const int file_storage_setup = 2130903078;
 			
 			// aapt resource value: 0x7f030027
-			public const int bubble_text = 2130903079;
+			public const int filestorage_selection = 2130903079;
 			
 			// aapt resource value: 0x7f030028
-			public const int candidate_preview = 2130903080;
+			public const int filestorage_selection_listitem = 2130903080;
 			
 			// aapt resource value: 0x7f030029
-			public const int candidates = 2130903081;
+			public const int filestorage_selection_listitem_kp2a = 2130903081;
 			
 			// aapt resource value: 0x7f03002a
-			public const int create_database = 2130903082;
+			public const int generate_password = 2130903082;
 			
 			// aapt resource value: 0x7f03002b
-			public const int database_settings = 2130903083;
+			public const int group_add_entry = 2130903083;
 			
 			// aapt resource value: 0x7f03002c
-			public const int donate = 2130903084;
+			public const int group_edit = 2130903084;
 			
 			// aapt resource value: 0x7f03002d
-			public const int donate_bday = 2130903085;
+			public const int group_empty = 2130903085;
 			
 			// aapt resource value: 0x7f03002e
-			public const int donate_bdaymissed = 2130903086;
+			public const int group_list_entry = 2130903086;
 			
 			// aapt resource value: 0x7f03002f
-			public const int edit_extra_string_dialog = 2130903087;
+			public const int icon = 2130903087;
 			
 			// aapt resource value: 0x7f030030
-			public const int entry_edit = 2130903088;
+			public const int icon_picker = 2130903088;
 			
 			// aapt resource value: 0x7f030031
-			public const int entry_edit_section = 2130903089;
+			public const int input_basic = 2130903089;
 			
 			// aapt resource value: 0x7f030032
-			public const int entry_extrastring_title = 2130903090;
+			public const int input_basic_highcontrast = 2130903090;
 			
 			// aapt resource value: 0x7f030033
-			public const int entry_extrastring_value = 2130903091;
+			public const int input_gingerbread = 2130903091;
 			
 			// aapt resource value: 0x7f030034
-			public const int entry_list_entry = 2130903092;
+			public const int input_stone_bold = 2130903092;
 			
 			// aapt resource value: 0x7f030035
-			public const int entry_section = 2130903093;
+			public const int input_stone_normal = 2130903093;
 			
 			// aapt resource value: 0x7f030036
-			public const int entry_view = 2130903094;
+			public const int input_stone_popup = 2130903094;
 			
 			// aapt resource value: 0x7f030037
-			public const int entry_view_contents = 2130903095;
+			public const int InViewButton = 2130903095;
 			
 			// aapt resource value: 0x7f030038
-			public const int entry_view_test = 2130903096;
+			public const int key_preview = 2130903096;
 			
 			// aapt resource value: 0x7f030039
-			public const int file_row = 2130903097;
+			public const int keyboard_popup = 2130903097;
 			
 			// aapt resource value: 0x7f03003a
-			public const int file_selection = 2130903098;
+			public const int ListViewPluginRow = 2130903098;
 			
 			// aapt resource value: 0x7f03003b
-			public const int file_selection_buttons = 2130903099;
+			public const int password = 2130903099;
 			
 			// aapt resource value: 0x7f03003c
-			public const int file_selection_filename = 2130903100;
+			public const int plugin_details = 2130903100;
 			
 			// aapt resource value: 0x7f03003d
-			public const int file_selection_no_recent = 2130903101;
+			public const int plugin_list = 2130903101;
 			
 			// aapt resource value: 0x7f03003e
-			public const int file_storage_setup = 2130903102;
+			public const int QuickUnlock = 2130903102;
 			
 			// aapt resource value: 0x7f03003f
-			public const int filestorage_selection = 2130903103;
+			public const int QuickUnlock_Unused = 2130903103;
 			
 			// aapt resource value: 0x7f030040
-			public const int filestorage_selection_listitem = 2130903104;
+			public const int recognition_status = 2130903104;
 			
 			// aapt resource value: 0x7f030041
-			public const int filestorage_selection_listitem_kp2a = 2130903105;
+			public const int SaveButton = 2130903105;
 			
 			// aapt resource value: 0x7f030042
-			public const int generate_password = 2130903106;
+			public const int search = 2130903106;
 			
 			// aapt resource value: 0x7f030043
-			public const int group_add_entry = 2130903107;
+			public const int searchurlresults = 2130903107;
 			
 			// aapt resource value: 0x7f030044
-			public const int group_edit = 2130903108;
+			public const int searchurlresults_empty = 2130903108;
 			
 			// aapt resource value: 0x7f030045
-			public const int group_empty = 2130903109;
+			public const int set_password = 2130903109;
 			
 			// aapt resource value: 0x7f030046
-			public const int group_header = 2130903110;
+			public const int sftpcredentials = 2130903110;
 			
 			// aapt resource value: 0x7f030047
-			public const int group_list_entry = 2130903111;
+			public const int StartScreenButtons = 2130903111;
 			
 			// aapt resource value: 0x7f030048
-			public const int icon = 2130903112;
+			public const int text_with_help = 2130903112;
 			
 			// aapt resource value: 0x7f030049
-			public const int icon_picker = 2130903113;
+			public const int url_credentials = 2130903113;
 			
 			// aapt resource value: 0x7f03004a
-			public const int input_basic = 2130903114;
+			public const int voice_punctuation_hint = 2130903114;
 			
 			// aapt resource value: 0x7f03004b
-			public const int input_basic_highcontrast = 2130903115;
-			
-			// aapt resource value: 0x7f03004c
-			public const int input_gingerbread = 2130903116;
-			
-			// aapt resource value: 0x7f03004d
-			public const int input_stone_bold = 2130903117;
-			
-			// aapt resource value: 0x7f03004e
-			public const int input_stone_normal = 2130903118;
-			
-			// aapt resource value: 0x7f03004f
-			public const int input_stone_popup = 2130903119;
-			
-			// aapt resource value: 0x7f030050
-			public const int InViewButton = 2130903120;
-			
-			// aapt resource value: 0x7f030051
-			public const int key_preview = 2130903121;
-			
-			// aapt resource value: 0x7f030052
-			public const int keyboard_popup = 2130903122;
-			
-			// aapt resource value: 0x7f030053
-			public const int password = 2130903123;
-			
-			// aapt resource value: 0x7f030054
-			public const int QuickUnlock = 2130903124;
-			
-			// aapt resource value: 0x7f030055
-			public const int QuickUnlock_Unused = 2130903125;
-			
-			// aapt resource value: 0x7f030056
-			public const int recognition_status = 2130903126;
-			
-			// aapt resource value: 0x7f030057
-			public const int SaveButton = 2130903127;
-			
-			// aapt resource value: 0x7f030058
-			public const int search = 2130903128;
-			
-			// aapt resource value: 0x7f030059
-			public const int searchurlresults = 2130903129;
-			
-			// aapt resource value: 0x7f03005a
-			public const int searchurlresults_empty = 2130903130;
-			
-			// aapt resource value: 0x7f03005b
-			public const int set_password = 2130903131;
-			
-			// aapt resource value: 0x7f03005c
-			public const int sftpcredentials = 2130903132;
-			
-			// aapt resource value: 0x7f03005d
-			public const int StartScreenButtons = 2130903133;
-			
-			// aapt resource value: 0x7f03005e
-			public const int support_simple_spinner_dropdown_item = 2130903134;
-			
-			// aapt resource value: 0x7f03005f
-			public const int text_with_help = 2130903135;
-			
-			// aapt resource value: 0x7f030060
-			public const int url_credentials = 2130903136;
-			
-			// aapt resource value: 0x7f030061
-			public const int voice_punctuation_hint = 2130903137;
-			
-			// aapt resource value: 0x7f030062
-			public const int voice_swipe_hint = 2130903138;
+			public const int voice_swipe_hint = 2130903115;
 			
 			static Layout()
 			{
@@ -4202,740 +3353,722 @@ namespace keepass2android
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f09013c
-			public const int AboutText = 2131296572;
+			// aapt resource value: 0x7f090130
+			public const int AboutText = 2131296560;
 			
-			// aapt resource value: 0x7f090137
-			public const int AcceptAllServerCertificates_default = 2131296567;
+			// aapt resource value: 0x7f09012b
+			public const int AcceptAllServerCertificates_default = 2131296555;
 			
-			// aapt resource value: 0x7f09012c
-			public const int AcceptAllServerCertificates_key = 2131296556;
+			// aapt resource value: 0x7f090120
+			public const int AcceptAllServerCertificates_key = 2131296544;
 			
-			// aapt resource value: 0x7f09022f
-			public const int AcceptAllServerCertificates_summary = 2131296815;
+			// aapt resource value: 0x7f090226
+			public const int AcceptAllServerCertificates_summary = 2131296806;
 			
-			// aapt resource value: 0x7f09022e
-			public const int AcceptAllServerCertificates_title = 2131296814;
+			// aapt resource value: 0x7f090225
+			public const int AcceptAllServerCertificates_title = 2131296805;
 			
-			// aapt resource value: 0x7f09021c
-			public const int AddUrlToEntryDialog_text = 2131296796;
+			// aapt resource value: 0x7f090211
+			public const int AddUrlToEntryDialog_text = 2131296785;
 			
-			// aapt resource value: 0x7f09021b
-			public const int AddUrlToEntryDialog_title = 2131296795;
+			// aapt resource value: 0x7f090210
+			public const int AddUrlToEntryDialog_title = 2131296784;
 			
-			// aapt resource value: 0x7f090250
-			public const int AddingEntry = 2131296848;
+			// aapt resource value: 0x7f090247
+			public const int AddingEntry = 2131296839;
 			
-			// aapt resource value: 0x7f090251
-			public const int AddingGroup = 2131296849;
+			// aapt resource value: 0x7f090248
+			public const int AddingGroup = 2131296840;
 			
 			// aapt resource value: 0x7f090015
 			public const int ApplicationName = 2131296277;
 			
-			// aapt resource value: 0x7f090246
-			public const int AskDeletePermanentlyEntry = 2131296838;
-			
-			// aapt resource value: 0x7f090247
-			public const int AskDeletePermanentlyGroup = 2131296839;
-			
-			// aapt resource value: 0x7f090248
-			public const int AskDeletePermanently_title = 2131296840;
-			
-			// aapt resource value: 0x7f09024b
-			public const int AskDiscardChanges = 2131296843;
-			
-			// aapt resource value: 0x7f09024c
-			public const int AskDiscardChanges_title = 2131296844;
-			
-			// aapt resource value: 0x7f090240
-			public const int AskOverwriteBinary = 2131296832;
-			
-			// aapt resource value: 0x7f090243
-			public const int AskOverwriteBinary_no = 2131296835;
-			
-			// aapt resource value: 0x7f090241
-			public const int AskOverwriteBinary_title = 2131296833;
-			
-			// aapt resource value: 0x7f090242
-			public const int AskOverwriteBinary_yes = 2131296834;
-			
-			// aapt resource value: 0x7f09024a
-			public const int AskReloadFile = 2131296842;
-			
-			// aapt resource value: 0x7f090249
-			public const int AskReloadFile_title = 2131296841;
-			
-			// aapt resource value: 0x7f090244
-			public const int AttachFailed = 2131296836;
-			
-			// aapt resource value: 0x7f09011c
-			public const int BinaryDirectory_default = 2131296540;
-			
-			// aapt resource value: 0x7f09011b
-			public const int BinaryDirectory_key = 2131296539;
-			
-			// aapt resource value: 0x7f090214
-			public const int BinaryDirectory_summary = 2131296788;
-			
-			// aapt resource value: 0x7f090213
-			public const int BinaryDirectory_title = 2131296787;
-			
-			// aapt resource value: 0x7f090274
-			public const int CannotMoveGroupHere = 2131296884;
-			
-			// aapt resource value: 0x7f0902b1
-			public const int CertificateFailure = 2131296945;
-			
-			// aapt resource value: 0x7f0902b0
-			public const int CertificateWarning = 2131296944;
-			
-			// aapt resource value: 0x7f0902c2
-			public const int ChangeLog = 2131296962;
-			
-			// aapt resource value: 0x7f0902c1
-			public const int ChangeLog_0_7 = 2131296961;
-			
-			// aapt resource value: 0x7f0902bf
-			public const int ChangeLog_0_8 = 2131296959;
-			
-			// aapt resource value: 0x7f0902be
-			public const int ChangeLog_0_8_1 = 2131296958;
-			
-			// aapt resource value: 0x7f0902bd
-			public const int ChangeLog_0_8_2 = 2131296957;
-			
-			// aapt resource value: 0x7f0902bc
-			public const int ChangeLog_0_8_3 = 2131296956;
-			
-			// aapt resource value: 0x7f0902bb
-			public const int ChangeLog_0_8_4 = 2131296955;
-			
-			// aapt resource value: 0x7f0902ba
-			public const int ChangeLog_0_8_5 = 2131296954;
-			
-			// aapt resource value: 0x7f0902b9
-			public const int ChangeLog_0_8_6 = 2131296953;
-			
-			// aapt resource value: 0x7f0902b8
-			public const int ChangeLog_0_9 = 2131296952;
-			
-			// aapt resource value: 0x7f0902b7
-			public const int ChangeLog_0_9_1 = 2131296951;
-			
-			// aapt resource value: 0x7f0902b6
-			public const int ChangeLog_0_9_2 = 2131296950;
-			
-			// aapt resource value: 0x7f0902b5
-			public const int ChangeLog_0_9_3 = 2131296949;
-			
-			// aapt resource value: 0x7f0902b4
-			public const int ChangeLog_0_9_3_r5 = 2131296948;
-			
-			// aapt resource value: 0x7f0902c0
-			public const int ChangeLog_keptDonate = 2131296960;
-			
-			// aapt resource value: 0x7f0902b3
-			public const int ChangeLog_title = 2131296947;
-			
-			// aapt resource value: 0x7f09012d
-			public const int CheckForFileChangesOnSave_key = 2131296557;
-			
-			// aapt resource value: 0x7f090233
-			public const int CheckForFileChangesOnSave_summary = 2131296819;
-			
-			// aapt resource value: 0x7f090232
-			public const int CheckForFileChangesOnSave_title = 2131296818;
-			
-			// aapt resource value: 0x7f090265
-			public const int CheckingDatabaseForChanges = 2131296869;
-			
-			// aapt resource value: 0x7f090259
-			public const int CheckingTargetFileForChanges = 2131296857;
-			
-			// aapt resource value: 0x7f09015a
-			public const int ClearClipboard = 2131296602;
-			
-			// aapt resource value: 0x7f090231
-			public const int ClearOfflineCache_question = 2131296817;
-			
-			// aapt resource value: 0x7f090230
-			public const int ClearOfflineCache_title = 2131296816;
-			
-			// aapt resource value: 0x7f090131
-			public const int CopyToClipboardNotification_key = 2131296561;
-			
-			// aapt resource value: 0x7f090267
-			public const int CouldNotLoadFromRemote = 2131296871;
-			
-			// aapt resource value: 0x7f090266
-			public const int CouldNotSaveToRemote = 2131296870;
-			
-			// aapt resource value: 0x7f09029b
-			public const int CouldntLoadOtpAuxFile = 2131296923;
-			
-			// aapt resource value: 0x7f09029c
-			public const int CouldntLoadOtpAuxFile_Hint = 2131296924;
-			
-			// aapt resource value: 0x7f0902a2
-			public const int CouldntParseOtpSecret = 2131296930;
-			
-			// aapt resource value: 0x7f09013d
-			public const int CreditsText = 2131296573;
-			
-			// aapt resource value: 0x7f09013e
-			public const int CreditsTextSFTP = 2131296574;
-			
-			// aapt resource value: 0x7f090257
-			public const int DecodingDatabase = 2131296855;
-			
-			// aapt resource value: 0x7f090252
-			public const int DeletingEntry = 2131296850;
-			
-			// aapt resource value: 0x7f090253
-			public const int DeletingGroup = 2131296851;
-			
-			// aapt resource value: 0x7f090260
-			public const int DownloadingRemoteFile = 2131296864;
-			
-			// aapt resource value: 0x7f090272
-			public const int ErrorOcurred = 2131296882;
-			
-			// aapt resource value: 0x7f0902a4
-			public const int ErrorUpdatingOtpAuxFile = 2131296932;
-			
-			// aapt resource value: 0x7f090156
-			public const int FileHandling_prefs = 2131296598;
-			
-			// aapt resource value: 0x7f090121
-			public const int FileHandling_prefs_key = 2131296545;
-			
-			// aapt resource value: 0x7f09018c
-			public const int FileNotFound = 2131296652;
-			
-			// aapt resource value: 0x7f090263
-			public const int FilesInSync = 2131296867;
-			
-			// aapt resource value: 0x7f09019d
-			public const int InvalidPassword = 2131296669;
-			
-			// aapt resource value: 0x7f090128
-			public const int LastInfoVersionCode_key = 2131296552;
-			
-			// aapt resource value: 0x7f09026a
-			public const int LoadedFromRemoteInSync = 2131296874;
-			
-			// aapt resource value: 0x7f09012a
-			public const int LockWhenScreenOff_key = 2131296554;
-			
-			// aapt resource value: 0x7f09022b
-			public const int LockWhenScreenOff_summary = 2131296811;
-			
-			// aapt resource value: 0x7f09022a
-			public const int LockWhenScreenOff_title = 2131296810;
-			
-			// aapt resource value: 0x7f09012e
-			public const int MarketURL = 2131296558;
-			
-			// aapt resource value: 0x7f0901a7
-			public const int MaskedPassword = 2131296679;
-			
-			// aapt resource value: 0x7f09025b
-			public const int MessageSyncQuestion = 2131296859;
-			
-			// aapt resource value: 0x7f09025e
-			public const int NoOverwrite = 2131296862;
-			
-			// aapt resource value: 0x7f090269
-			public const int NotifyOpenFromLocalDueToConflict = 2131296873;
-			
-			// aapt resource value: 0x7f090133
-			public const int OpenKp2aKeyboardAutomatically_key = 2131296563;
-			
-			// aapt resource value: 0x7f090239
-			public const int OpenKp2aKeyboardAutomatically_summary = 2131296825;
-			
-			// aapt resource value: 0x7f090238
-			public const int OpenKp2aKeyboardAutomatically_title = 2131296824;
-			
-			// aapt resource value: 0x7f0902a3
-			public const int OtpKeyError = 2131296931;
-			
-			// aapt resource value: 0x7f090258
-			public const int ParsingDatabase = 2131296856;
-			
-			// aapt resource value: 0x7f090139
-			public const int PreloadDatabaseEnabled_key = 2131296569;
-			
-			// aapt resource value: 0x7f09023f
-			public const int PreloadDatabaseEnabled_summary = 2131296831;
+			// aapt resource value: 0x7f09023d
+			public const int AskDeletePermanentlyEntry = 2131296829;
 			
 			// aapt resource value: 0x7f09023e
-			public const int PreloadDatabaseEnabled_title = 2131296830;
+			public const int AskDeletePermanentlyGroup = 2131296830;
 			
-			// aapt resource value: 0x7f090122
-			public const int QuickUnlockDefaultEnabled_key = 2131296546;
+			// aapt resource value: 0x7f09023f
+			public const int AskDeletePermanently_title = 2131296831;
 			
-			// aapt resource value: 0x7f09020b
-			public const int QuickUnlockDefaultEnabled_summary = 2131296779;
+			// aapt resource value: 0x7f090242
+			public const int AskDiscardChanges = 2131296834;
 			
-			// aapt resource value: 0x7f09020a
-			public const int QuickUnlockDefaultEnabled_title = 2131296778;
-			
-			// aapt resource value: 0x7f090126
-			public const int QuickUnlockIconHidden16_key = 2131296550;
-			
-			// aapt resource value: 0x7f09020f
-			public const int QuickUnlockIconHidden16_summary = 2131296783;
-			
-			// aapt resource value: 0x7f09020e
-			public const int QuickUnlockIconHidden16_title = 2131296782;
-			
-			// aapt resource value: 0x7f090125
-			public const int QuickUnlockIconHidden_key = 2131296549;
-			
-			// aapt resource value: 0x7f09020d
-			public const int QuickUnlockIconHidden_summary = 2131296781;
-			
-			// aapt resource value: 0x7f09020c
-			public const int QuickUnlockIconHidden_title = 2131296780;
-			
-			// aapt resource value: 0x7f090124
-			public const int QuickUnlockLength_default = 2131296548;
-			
-			// aapt resource value: 0x7f090123
-			public const int QuickUnlockLength_key = 2131296547;
-			
-			// aapt resource value: 0x7f090211
-			public const int QuickUnlockLength_summary = 2131296785;
-			
-			// aapt resource value: 0x7f090210
-			public const int QuickUnlockLength_title = 2131296784;
-			
-			// aapt resource value: 0x7f090208
-			public const int QuickUnlock_button = 2131296776;
-			
-			// aapt resource value: 0x7f090212
-			public const int QuickUnlock_fail = 2131296786;
-			
-			// aapt resource value: 0x7f090207
-			public const int QuickUnlock_label = 2131296775;
-			
-			// aapt resource value: 0x7f090209
-			public const int QuickUnlock_lockButton = 2131296777;
-			
-			// aapt resource value: 0x7f090155
-			public const int QuickUnlock_prefs = 2131296597;
-			
-			// aapt resource value: 0x7f090120
-			public const int QuickUnlock_prefs_key = 2131296544;
-			
-			// aapt resource value: 0x7f090245
-			public const int RecycleBin = 2131296837;
-			
-			// aapt resource value: 0x7f090118
-			public const int RememberRecentFiles_key = 2131296536;
-			
-			// aapt resource value: 0x7f0901fb
-			public const int RememberRecentFiles_summary = 2131296763;
-			
-			// aapt resource value: 0x7f0901fa
-			public const int RememberRecentFiles_title = 2131296762;
-			
-			// aapt resource value: 0x7f09026c
-			public const int RemoteDatabaseUnchanged = 2131296876;
-			
-			// aapt resource value: 0x7f09026e
-			public const int ResolvedCacheConflictByUsingLocalOtpAux = 2131296878;
-			
-			// aapt resource value: 0x7f09026d
-			public const int ResolvedCacheConflictByUsingRemoteOtpAux = 2131296877;
-			
-			// aapt resource value: 0x7f090262
-			public const int RestoringRemoteFile = 2131296866;
-			
-			// aapt resource value: 0x7f090218
-			public const int SaveAttachmentDialog_open = 2131296792;
-			
-			// aapt resource value: 0x7f090217
-			public const int SaveAttachmentDialog_save = 2131296791;
-			
-			// aapt resource value: 0x7f090216
-			public const int SaveAttachmentDialog_text = 2131296790;
-			
-			// aapt resource value: 0x7f090215
-			public const int SaveAttachmentDialog_title = 2131296789;
-			
-			// aapt resource value: 0x7f09021a
-			public const int SaveAttachment_Failed = 2131296794;
-			
-			// aapt resource value: 0x7f090219
-			public const int SaveAttachment_doneMessage = 2131296793;
-			
-			// aapt resource value: 0x7f0902a5
-			public const int SavingOtpAuxFile = 2131296933;
-			
-			// aapt resource value: 0x7f090254
-			public const int SettingPassword = 2131296852;
-			
-			// aapt resource value: 0x7f090235
-			public const int ShowCopyToClipboardNotification_summary = 2131296821;
-			
-			// aapt resource value: 0x7f090234
-			public const int ShowCopyToClipboardNotification_title = 2131296820;
+			// aapt resource value: 0x7f090243
+			public const int AskDiscardChanges_title = 2131296835;
 			
 			// aapt resource value: 0x7f090237
-			public const int ShowKp2aKeyboardNotification_summary = 2131296823;
+			public const int AskOverwriteBinary = 2131296823;
 			
-			// aapt resource value: 0x7f090236
-			public const int ShowKp2aKeyboardNotification_title = 2131296822;
+			// aapt resource value: 0x7f09023a
+			public const int AskOverwriteBinary_no = 2131296826;
 			
-			// aapt resource value: 0x7f090138
-			public const int ShowUnlockedNotification_key = 2131296568;
+			// aapt resource value: 0x7f090238
+			public const int AskOverwriteBinary_title = 2131296824;
 			
-			// aapt resource value: 0x7f09023d
-			public const int ShowUnlockedNotification_summary = 2131296829;
+			// aapt resource value: 0x7f090239
+			public const int AskOverwriteBinary_yes = 2131296825;
 			
-			// aapt resource value: 0x7f09023c
-			public const int ShowUnlockedNotification_title = 2131296828;
+			// aapt resource value: 0x7f090241
+			public const int AskReloadFile = 2131296833;
 			
-			// aapt resource value: 0x7f090117
-			public const int ShowUsernameInList_key = 2131296535;
+			// aapt resource value: 0x7f090240
+			public const int AskReloadFile_title = 2131296832;
 			
-			// aapt resource value: 0x7f0901f9
-			public const int ShowUsernameInList_summary = 2131296761;
+			// aapt resource value: 0x7f09023b
+			public const int AttachFailed = 2131296827;
 			
-			// aapt resource value: 0x7f0901f8
-			public const int ShowUsernameInList_title = 2131296760;
+			// aapt resource value: 0x7f09010f
+			public const int BinaryDirectory_default = 2131296527;
 			
-			// aapt resource value: 0x7f09012f
-			public const int SuggestionsURL = 2131296559;
+			// aapt resource value: 0x7f09010e
+			public const int BinaryDirectory_key = 2131296526;
 			
-			// aapt resource value: 0x7f090264
-			public const int SynchronizedDatabaseSuccessfully = 2131296868;
+			// aapt resource value: 0x7f090209
+			public const int BinaryDirectory_summary = 2131296777;
 			
-			// aapt resource value: 0x7f09025f
-			public const int SynchronizingCachedDatabase = 2131296863;
-			
-			// aapt resource value: 0x7f09025c
-			public const int SynchronizingDatabase = 2131296860;
-			
-			// aapt resource value: 0x7f09026f
-			public const int SynchronizingOtpAuxFile = 2131296879;
-			
-			// aapt resource value: 0x7f090116
-			public const int TanExpiresOnUse_key = 2131296534;
-			
-			// aapt resource value: 0x7f0901f7
-			public const int TanExpiresOnUse_summary = 2131296759;
-			
-			// aapt resource value: 0x7f0901f6
-			public const int TanExpiresOnUse_title = 2131296758;
-			
-			// aapt resource value: 0x7f09025a
-			public const int TitleSyncQuestion = 2131296858;
-			
-			// aapt resource value: 0x7f090256
-			public const int TransformingKey = 2131296854;
-			
-			// aapt resource value: 0x7f090130
-			public const int TranslationURL = 2131296560;
-			
-			// aapt resource value: 0x7f090255
-			public const int UndoingChanges = 2131296853;
+			// aapt resource value: 0x7f090208
+			public const int BinaryDirectory_title = 2131296776;
 			
 			// aapt resource value: 0x7f09026b
-			public const int UpdatedCachedFileOnLoad = 2131296875;
+			public const int CannotMoveGroupHere = 2131296875;
 			
-			// aapt resource value: 0x7f090268
-			public const int UpdatedRemoteFileOnLoad = 2131296872;
+			// aapt resource value: 0x7f0902ac
+			public const int CertificateFailure = 2131296940;
 			
-			// aapt resource value: 0x7f090261
-			public const int UploadingFile = 2131296865;
+			// aapt resource value: 0x7f0902ab
+			public const int CertificateWarning = 2131296939;
 			
-			// aapt resource value: 0x7f090127
-			public const int UsageCount_key = 2131296551;
+			// aapt resource value: 0x7f0902bd
+			public const int ChangeLog = 2131296957;
 			
-			// aapt resource value: 0x7f090129
-			public const int UseFileTransactions_key = 2131296553;
+			// aapt resource value: 0x7f0902bc
+			public const int ChangeLog_0_7 = 2131296956;
+			
+			// aapt resource value: 0x7f0902ba
+			public const int ChangeLog_0_8 = 2131296954;
+			
+			// aapt resource value: 0x7f0902b9
+			public const int ChangeLog_0_8_1 = 2131296953;
+			
+			// aapt resource value: 0x7f0902b8
+			public const int ChangeLog_0_8_2 = 2131296952;
+			
+			// aapt resource value: 0x7f0902b7
+			public const int ChangeLog_0_8_3 = 2131296951;
+			
+			// aapt resource value: 0x7f0902b6
+			public const int ChangeLog_0_8_4 = 2131296950;
+			
+			// aapt resource value: 0x7f0902b5
+			public const int ChangeLog_0_8_5 = 2131296949;
+			
+			// aapt resource value: 0x7f0902b4
+			public const int ChangeLog_0_8_6 = 2131296948;
+			
+			// aapt resource value: 0x7f0902b3
+			public const int ChangeLog_0_9 = 2131296947;
+			
+			// aapt resource value: 0x7f0902b2
+			public const int ChangeLog_0_9_1 = 2131296946;
+			
+			// aapt resource value: 0x7f0902b1
+			public const int ChangeLog_0_9_2 = 2131296945;
+			
+			// aapt resource value: 0x7f0902b0
+			public const int ChangeLog_0_9_3 = 2131296944;
+			
+			// aapt resource value: 0x7f0902af
+			public const int ChangeLog_0_9_3_r5 = 2131296943;
+			
+			// aapt resource value: 0x7f0902bb
+			public const int ChangeLog_keptDonate = 2131296955;
+			
+			// aapt resource value: 0x7f0902ae
+			public const int ChangeLog_title = 2131296942;
+			
+			// aapt resource value: 0x7f090121
+			public const int CheckForFileChangesOnSave_key = 2131296545;
+			
+			// aapt resource value: 0x7f09022a
+			public const int CheckForFileChangesOnSave_summary = 2131296810;
 			
 			// aapt resource value: 0x7f090229
-			public const int UseFileTransactions_summary = 2131296809;
+			public const int CheckForFileChangesOnSave_title = 2131296809;
+			
+			// aapt resource value: 0x7f09025c
+			public const int CheckingDatabaseForChanges = 2131296860;
+			
+			// aapt resource value: 0x7f090250
+			public const int CheckingTargetFileForChanges = 2131296848;
+			
+			// aapt resource value: 0x7f09014f
+			public const int ClearClipboard = 2131296591;
 			
 			// aapt resource value: 0x7f090228
-			public const int UseFileTransactions_title = 2131296808;
+			public const int ClearOfflineCache_question = 2131296808;
 			
-			// aapt resource value: 0x7f090132
-			public const int UseKp2aKeyboard_key = 2131296562;
+			// aapt resource value: 0x7f090227
+			public const int ClearOfflineCache_title = 2131296807;
 			
-			// aapt resource value: 0x7f09012b
-			public const int UseOfflineCache_key = 2131296555;
+			// aapt resource value: 0x7f090125
+			public const int CopyToClipboardNotification_key = 2131296549;
 			
-			// aapt resource value: 0x7f09022d
-			public const int UseOfflineCache_summary = 2131296813;
-			
-			// aapt resource value: 0x7f09022c
-			public const int UseOfflineCache_title = 2131296812;
+			// aapt resource value: 0x7f09025e
+			public const int CouldNotLoadFromRemote = 2131296862;
 			
 			// aapt resource value: 0x7f09025d
-			public const int YesSynchronize = 2131296861;
+			public const int CouldNotSaveToRemote = 2131296861;
 			
-			// aapt resource value: 0x7f0900b7
-			public const int abc_action_bar_home_description = 2131296439;
+			// aapt resource value: 0x7f090292
+			public const int CouldntLoadOtpAuxFile = 2131296914;
 			
-			// aapt resource value: 0x7f0900b8
-			public const int abc_action_bar_up_description = 2131296440;
+			// aapt resource value: 0x7f090293
+			public const int CouldntLoadOtpAuxFile_Hint = 2131296915;
 			
-			// aapt resource value: 0x7f0900b9
-			public const int abc_action_menu_overflow_description = 2131296441;
+			// aapt resource value: 0x7f090299
+			public const int CouldntParseOtpSecret = 2131296921;
 			
-			// aapt resource value: 0x7f0900b6
-			public const int abc_action_mode_done = 2131296438;
+			// aapt resource value: 0x7f090131
+			public const int CreditsText = 2131296561;
 			
-			// aapt resource value: 0x7f0900c0
-			public const int abc_activity_chooser_view_see_all = 2131296448;
+			// aapt resource value: 0x7f090132
+			public const int CreditsTextSFTP = 2131296562;
 			
-			// aapt resource value: 0x7f0900bf
-			public const int abc_activitychooserview_choose_application = 2131296447;
+			// aapt resource value: 0x7f09024e
+			public const int DecodingDatabase = 2131296846;
 			
-			// aapt resource value: 0x7f0900bc
-			public const int abc_searchview_description_clear = 2131296444;
+			// aapt resource value: 0x7f090249
+			public const int DeletingEntry = 2131296841;
 			
-			// aapt resource value: 0x7f0900bb
-			public const int abc_searchview_description_query = 2131296443;
+			// aapt resource value: 0x7f09024a
+			public const int DeletingGroup = 2131296842;
 			
-			// aapt resource value: 0x7f0900ba
-			public const int abc_searchview_description_search = 2131296442;
+			// aapt resource value: 0x7f090257
+			public const int DownloadingRemoteFile = 2131296855;
 			
-			// aapt resource value: 0x7f0900bd
-			public const int abc_searchview_description_submit = 2131296445;
+			// aapt resource value: 0x7f090269
+			public const int ErrorOcurred = 2131296873;
 			
-			// aapt resource value: 0x7f0900be
-			public const int abc_searchview_description_voice = 2131296446;
+			// aapt resource value: 0x7f09029b
+			public const int ErrorUpdatingOtpAuxFile = 2131296923;
 			
-			// aapt resource value: 0x7f0900c2
-			public const int abc_shareactionprovider_share_with = 2131296450;
+			// aapt resource value: 0x7f09014b
+			public const int FileHandling_prefs = 2131296587;
 			
-			// aapt resource value: 0x7f0900c1
-			public const int abc_shareactionprovider_share_with_application = 2131296449;
+			// aapt resource value: 0x7f090114
+			public const int FileHandling_prefs_key = 2131296532;
 			
-			// aapt resource value: 0x7f09013a
-			public const int about_feedback = 2131296570;
+			// aapt resource value: 0x7f090181
+			public const int FileNotFound = 2131296641;
 			
-			// aapt resource value: 0x7f09013b
-			public const int about_homepage = 2131296571;
+			// aapt resource value: 0x7f09025a
+			public const int FilesInSync = 2131296858;
 			
-			// aapt resource value: 0x7f09013f
-			public const int accept = 2131296575;
+			// aapt resource value: 0x7f090192
+			public const int InvalidPassword = 2131296658;
+			
+			// aapt resource value: 0x7f09011b
+			public const int LastInfoVersionCode_key = 2131296539;
+			
+			// aapt resource value: 0x7f090261
+			public const int LoadedFromRemoteInSync = 2131296865;
+			
+			// aapt resource value: 0x7f09011e
+			public const int LockWhenNavigateBack_key = 2131296542;
 			
 			// aapt resource value: 0x7f090222
-			public const int add_binary = 2131296802;
+			public const int LockWhenNavigateBack_summary = 2131296802;
 			
-			// aapt resource value: 0x7f090140
-			public const int add_entry = 2131296576;
+			// aapt resource value: 0x7f090221
+			public const int LockWhenNavigateBack_title = 2131296801;
+			
+			// aapt resource value: 0x7f09011d
+			public const int LockWhenScreenOff_key = 2131296541;
+			
+			// aapt resource value: 0x7f090220
+			public const int LockWhenScreenOff_summary = 2131296800;
+			
+			// aapt resource value: 0x7f09021f
+			public const int LockWhenScreenOff_title = 2131296799;
+			
+			// aapt resource value: 0x7f090122
+			public const int MarketURL = 2131296546;
+			
+			// aapt resource value: 0x7f09019c
+			public const int MaskedPassword = 2131296668;
+			
+			// aapt resource value: 0x7f090252
+			public const int MessageSyncQuestion = 2131296850;
+			
+			// aapt resource value: 0x7f090255
+			public const int NoOverwrite = 2131296853;
+			
+			// aapt resource value: 0x7f090260
+			public const int NotifyOpenFromLocalDueToConflict = 2131296864;
+			
+			// aapt resource value: 0x7f090127
+			public const int OpenKp2aKeyboardAutomatically_key = 2131296551;
+			
+			// aapt resource value: 0x7f090230
+			public const int OpenKp2aKeyboardAutomatically_summary = 2131296816;
+			
+			// aapt resource value: 0x7f09022f
+			public const int OpenKp2aKeyboardAutomatically_title = 2131296815;
+			
+			// aapt resource value: 0x7f09029a
+			public const int OtpKeyError = 2131296922;
+			
+			// aapt resource value: 0x7f09024f
+			public const int ParsingDatabase = 2131296847;
+			
+			// aapt resource value: 0x7f09012d
+			public const int PreloadDatabaseEnabled_key = 2131296557;
+			
+			// aapt resource value: 0x7f090236
+			public const int PreloadDatabaseEnabled_summary = 2131296822;
+			
+			// aapt resource value: 0x7f090235
+			public const int PreloadDatabaseEnabled_title = 2131296821;
+			
+			// aapt resource value: 0x7f090115
+			public const int QuickUnlockDefaultEnabled_key = 2131296533;
+			
+			// aapt resource value: 0x7f090200
+			public const int QuickUnlockDefaultEnabled_summary = 2131296768;
+			
+			// aapt resource value: 0x7f0901ff
+			public const int QuickUnlockDefaultEnabled_title = 2131296767;
+			
+			// aapt resource value: 0x7f090119
+			public const int QuickUnlockIconHidden16_key = 2131296537;
+			
+			// aapt resource value: 0x7f090204
+			public const int QuickUnlockIconHidden16_summary = 2131296772;
+			
+			// aapt resource value: 0x7f090203
+			public const int QuickUnlockIconHidden16_title = 2131296771;
+			
+			// aapt resource value: 0x7f090118
+			public const int QuickUnlockIconHidden_key = 2131296536;
+			
+			// aapt resource value: 0x7f090202
+			public const int QuickUnlockIconHidden_summary = 2131296770;
+			
+			// aapt resource value: 0x7f090201
+			public const int QuickUnlockIconHidden_title = 2131296769;
+			
+			// aapt resource value: 0x7f090117
+			public const int QuickUnlockLength_default = 2131296535;
+			
+			// aapt resource value: 0x7f090116
+			public const int QuickUnlockLength_key = 2131296534;
+			
+			// aapt resource value: 0x7f090206
+			public const int QuickUnlockLength_summary = 2131296774;
+			
+			// aapt resource value: 0x7f090205
+			public const int QuickUnlockLength_title = 2131296773;
+			
+			// aapt resource value: 0x7f0901fd
+			public const int QuickUnlock_button = 2131296765;
+			
+			// aapt resource value: 0x7f090207
+			public const int QuickUnlock_fail = 2131296775;
+			
+			// aapt resource value: 0x7f0901fc
+			public const int QuickUnlock_label = 2131296764;
+			
+			// aapt resource value: 0x7f0901fe
+			public const int QuickUnlock_lockButton = 2131296766;
+			
+			// aapt resource value: 0x7f09014a
+			public const int QuickUnlock_prefs = 2131296586;
+			
+			// aapt resource value: 0x7f090113
+			public const int QuickUnlock_prefs_key = 2131296531;
+			
+			// aapt resource value: 0x7f09023c
+			public const int RecycleBin = 2131296828;
+			
+			// aapt resource value: 0x7f09010b
+			public const int RememberRecentFiles_key = 2131296523;
+			
+			// aapt resource value: 0x7f0901f0
+			public const int RememberRecentFiles_summary = 2131296752;
+			
+			// aapt resource value: 0x7f0901ef
+			public const int RememberRecentFiles_title = 2131296751;
+			
+			// aapt resource value: 0x7f090263
+			public const int RemoteDatabaseUnchanged = 2131296867;
+			
+			// aapt resource value: 0x7f090265
+			public const int ResolvedCacheConflictByUsingLocalOtpAux = 2131296869;
+			
+			// aapt resource value: 0x7f090264
+			public const int ResolvedCacheConflictByUsingRemoteOtpAux = 2131296868;
+			
+			// aapt resource value: 0x7f090259
+			public const int RestoringRemoteFile = 2131296857;
+			
+			// aapt resource value: 0x7f0902a9
+			public const int SCOPE_CURRENT_ENTRY_explanation = 2131296937;
+			
+			// aapt resource value: 0x7f0902a8
+			public const int SCOPE_CURRENT_ENTRY_title = 2131296936;
+			
+			// aapt resource value: 0x7f0902a7
+			public const int SCOPE_DATABASE_ACTIONS_explanation = 2131296935;
+			
+			// aapt resource value: 0x7f0902a6
+			public const int SCOPE_DATABASE_ACTIONS_title = 2131296934;
+			
+			// aapt resource value: 0x7f09020d
+			public const int SaveAttachmentDialog_open = 2131296781;
+			
+			// aapt resource value: 0x7f09020c
+			public const int SaveAttachmentDialog_save = 2131296780;
+			
+			// aapt resource value: 0x7f09020b
+			public const int SaveAttachmentDialog_text = 2131296779;
+			
+			// aapt resource value: 0x7f09020a
+			public const int SaveAttachmentDialog_title = 2131296778;
+			
+			// aapt resource value: 0x7f09020f
+			public const int SaveAttachment_Failed = 2131296783;
+			
+			// aapt resource value: 0x7f09020e
+			public const int SaveAttachment_doneMessage = 2131296782;
+			
+			// aapt resource value: 0x7f09029c
+			public const int SavingOtpAuxFile = 2131296924;
+			
+			// aapt resource value: 0x7f09024b
+			public const int SettingPassword = 2131296843;
+			
+			// aapt resource value: 0x7f09022c
+			public const int ShowCopyToClipboardNotification_summary = 2131296812;
+			
+			// aapt resource value: 0x7f09022b
+			public const int ShowCopyToClipboardNotification_title = 2131296811;
+			
+			// aapt resource value: 0x7f09022e
+			public const int ShowKp2aKeyboardNotification_summary = 2131296814;
+			
+			// aapt resource value: 0x7f09022d
+			public const int ShowKp2aKeyboardNotification_title = 2131296813;
+			
+			// aapt resource value: 0x7f09012c
+			public const int ShowUnlockedNotification_key = 2131296556;
+			
+			// aapt resource value: 0x7f090234
+			public const int ShowUnlockedNotification_summary = 2131296820;
+			
+			// aapt resource value: 0x7f090233
+			public const int ShowUnlockedNotification_title = 2131296819;
+			
+			// aapt resource value: 0x7f09010a
+			public const int ShowUsernameInList_key = 2131296522;
+			
+			// aapt resource value: 0x7f0901ee
+			public const int ShowUsernameInList_summary = 2131296750;
+			
+			// aapt resource value: 0x7f0901ed
+			public const int ShowUsernameInList_title = 2131296749;
+			
+			// aapt resource value: 0x7f090123
+			public const int SuggestionsURL = 2131296547;
+			
+			// aapt resource value: 0x7f09025b
+			public const int SynchronizedDatabaseSuccessfully = 2131296859;
+			
+			// aapt resource value: 0x7f090256
+			public const int SynchronizingCachedDatabase = 2131296854;
+			
+			// aapt resource value: 0x7f090253
+			public const int SynchronizingDatabase = 2131296851;
+			
+			// aapt resource value: 0x7f090266
+			public const int SynchronizingOtpAuxFile = 2131296870;
+			
+			// aapt resource value: 0x7f090109
+			public const int TanExpiresOnUse_key = 2131296521;
+			
+			// aapt resource value: 0x7f0901ec
+			public const int TanExpiresOnUse_summary = 2131296748;
+			
+			// aapt resource value: 0x7f0901eb
+			public const int TanExpiresOnUse_title = 2131296747;
+			
+			// aapt resource value: 0x7f090251
+			public const int TitleSyncQuestion = 2131296849;
+			
+			// aapt resource value: 0x7f09024d
+			public const int TransformingKey = 2131296845;
+			
+			// aapt resource value: 0x7f090124
+			public const int TranslationURL = 2131296548;
+			
+			// aapt resource value: 0x7f09024c
+			public const int UndoingChanges = 2131296844;
+			
+			// aapt resource value: 0x7f090262
+			public const int UpdatedCachedFileOnLoad = 2131296866;
+			
+			// aapt resource value: 0x7f09025f
+			public const int UpdatedRemoteFileOnLoad = 2131296863;
+			
+			// aapt resource value: 0x7f090258
+			public const int UploadingFile = 2131296856;
+			
+			// aapt resource value: 0x7f09011a
+			public const int UsageCount_key = 2131296538;
+			
+			// aapt resource value: 0x7f09011c
+			public const int UseFileTransactions_key = 2131296540;
+			
+			// aapt resource value: 0x7f09021e
+			public const int UseFileTransactions_summary = 2131296798;
+			
+			// aapt resource value: 0x7f09021d
+			public const int UseFileTransactions_title = 2131296797;
+			
+			// aapt resource value: 0x7f090126
+			public const int UseKp2aKeyboard_key = 2131296550;
+			
+			// aapt resource value: 0x7f09011f
+			public const int UseOfflineCache_key = 2131296543;
+			
+			// aapt resource value: 0x7f090224
+			public const int UseOfflineCache_summary = 2131296804;
 			
 			// aapt resource value: 0x7f090223
-			public const int add_extra_string = 2131296803;
+			public const int UseOfflineCache_title = 2131296803;
 			
-			// aapt resource value: 0x7f090142
-			public const int add_group = 2131296578;
+			// aapt resource value: 0x7f090254
+			public const int YesSynchronize = 2131296852;
 			
-			// aapt resource value: 0x7f090143
-			public const int add_group_title = 2131296579;
+			// aapt resource value: 0x7f09012e
+			public const int about_feedback = 2131296558;
 			
-			// aapt resource value: 0x7f090141
-			public const int add_url_entry = 2131296577;
+			// aapt resource value: 0x7f09012f
+			public const int about_homepage = 2131296559;
+			
+			// aapt resource value: 0x7f090133
+			public const int accept = 2131296563;
+			
+			// aapt resource value: 0x7f090217
+			public const int add_binary = 2131296791;
+			
+			// aapt resource value: 0x7f090135
+			public const int add_entry = 2131296565;
+			
+			// aapt resource value: 0x7f090218
+			public const int add_extra_string = 2131296792;
+			
+			// aapt resource value: 0x7f090137
+			public const int add_group = 2131296567;
+			
+			// aapt resource value: 0x7f090138
+			public const int add_group_title = 2131296568;
+			
+			// aapt resource value: 0x7f090136
+			public const int add_url_entry = 2131296566;
 			
 			// aapt resource value: 0x7f09005a
 			public const int added_word = 2131296346;
 			
-			// aapt resource value: 0x7f0900fd
-			public const int afc_bullet = 2131296509;
+			// aapt resource value: 0x7f0900f0
+			public const int afc_bullet = 2131296496;
 			
-			// aapt resource value: 0x7f0900cc
-			public const int afc_cmd_advanced_selection_all = 2131296460;
+			// aapt resource value: 0x7f0900bf
+			public const int afc_cmd_advanced_selection_all = 2131296447;
 			
-			// aapt resource value: 0x7f0900cd
-			public const int afc_cmd_advanced_selection_invert = 2131296461;
+			// aapt resource value: 0x7f0900c0
+			public const int afc_cmd_advanced_selection_invert = 2131296448;
 			
-			// aapt resource value: 0x7f0900ce
-			public const int afc_cmd_advanced_selection_none = 2131296462;
+			// aapt resource value: 0x7f0900c1
+			public const int afc_cmd_advanced_selection_none = 2131296449;
 			
-			// aapt resource value: 0x7f0900cf
-			public const int afc_cmd_grid_view = 2131296463;
-			
-			// aapt resource value: 0x7f0900d0
-			public const int afc_cmd_home = 2131296464;
-			
-			// aapt resource value: 0x7f0900d1
-			public const int afc_cmd_list_view = 2131296465;
-			
-			// aapt resource value: 0x7f0900d2
-			public const int afc_cmd_new_folder = 2131296466;
-			
-			// aapt resource value: 0x7f0900d3
-			public const int afc_cmd_select_all_files = 2131296467;
-			
-			// aapt resource value: 0x7f0900d4
-			public const int afc_cmd_select_all_folders = 2131296468;
-			
-			// aapt resource value: 0x7f0900d5
-			public const int afc_cmd_sort = 2131296469;
-			
-			// aapt resource value: 0x7f0900fe
-			public const int afc_ellipsize = 2131296510;
-			
-			// aapt resource value: 0x7f0900d6
-			public const int afc_file = 2131296470;
-			
-			// aapt resource value: 0x7f0900d7
-			public const int afc_folder = 2131296471;
-			
-			// aapt resource value: 0x7f0900d8
-			public const int afc_hint_clear = 2131296472;
-			
-			// aapt resource value: 0x7f0900d9
-			public const int afc_hint_folder_name = 2131296473;
-			
-			// aapt resource value: 0x7f0900da
-			public const int afc_hint_save_as_filename = 2131296474;
-			
-			// aapt resource value: 0x7f0900db
-			public const int afc_hint_search = 2131296475;
+			// aapt resource value: 0x7f0900c2
+			public const int afc_cmd_grid_view = 2131296450;
 			
 			// aapt resource value: 0x7f0900c3
-			public const int afc_lib_name = 2131296451;
+			public const int afc_cmd_home = 2131296451;
 			
 			// aapt resource value: 0x7f0900c4
-			public const int afc_lib_version_name = 2131296452;
-			
-			// aapt resource value: 0x7f0900dc
-			public const int afc_msg_app_doesnot_have_permission_to_create_files = 2131296476;
-			
-			// aapt resource value: 0x7f0900dd
-			public const int afc_msg_app_doesnot_have_permission_to_delete_files = 2131296477;
-			
-			// aapt resource value: 0x7f0900de
-			public const int afc_msg_cancelled = 2131296478;
-			
-			// aapt resource value: 0x7f0900df
-			public const int afc_msg_cannot_connect_to_file_provider_service = 2131296479;
-			
-			// aapt resource value: 0x7f0900e0
-			public const int afc_msg_cannot_create_new_folder_here = 2131296480;
-			
-			// aapt resource value: 0x7f0900e1
-			public const int afc_msg_cannot_save_a_file_here = 2131296481;
-			
-			// aapt resource value: 0x7f0900e2
-			public const int afc_msg_done = 2131296482;
-			
-			// aapt resource value: 0x7f0900e3
-			public const int afc_msg_empty = 2131296483;
-			
-			// aapt resource value: 0x7f0900e4
-			public const int afc_msg_failed_please_try_again = 2131296484;
-			
-			// aapt resource value: 0x7f0900e5
-			public const int afc_msg_loading = 2131296485;
-			
-			// aapt resource value: 0x7f0900e6
-			public const int afc_phone = 2131296486;
-			
-			// aapt resource value: 0x7f0900cb
-			public const int afc_pkey_display_last_location = 2131296459;
-			
-			// aapt resource value: 0x7f0900ca
-			public const int afc_pkey_display_remember_last_location = 2131296458;
-			
-			// aapt resource value: 0x7f0900c9
-			public const int afc_pkey_display_show_time_for_old_days = 2131296457;
-			
-			// aapt resource value: 0x7f0900c8
-			public const int afc_pkey_display_show_time_for_old_days_this_year = 2131296456;
-			
-			// aapt resource value: 0x7f0900c7
-			public const int afc_pkey_display_sort_ascending = 2131296455;
-			
-			// aapt resource value: 0x7f0900c6
-			public const int afc_pkey_display_sort_type = 2131296454;
+			public const int afc_cmd_list_view = 2131296452;
 			
 			// aapt resource value: 0x7f0900c5
-			public const int afc_pkey_display_view_type = 2131296453;
+			public const int afc_cmd_new_folder = 2131296453;
 			
-			// aapt resource value: 0x7f0900e7
-			public const int afc_pmsg_cannot_access_dir = 2131296487;
+			// aapt resource value: 0x7f0900c6
+			public const int afc_cmd_select_all_files = 2131296454;
 			
-			// aapt resource value: 0x7f0900e8
-			public const int afc_pmsg_cannot_create_folder = 2131296488;
+			// aapt resource value: 0x7f0900c7
+			public const int afc_cmd_select_all_folders = 2131296455;
 			
-			// aapt resource value: 0x7f0900e9
-			public const int afc_pmsg_cannot_delete_file = 2131296489;
-			
-			// aapt resource value: 0x7f0900ea
-			public const int afc_pmsg_confirm_delete_file = 2131296490;
-			
-			// aapt resource value: 0x7f0900eb
-			public const int afc_pmsg_confirm_replace_file = 2131296491;
-			
-			// aapt resource value: 0x7f0900ec
-			public const int afc_pmsg_deleting_file = 2131296492;
-			
-			// aapt resource value: 0x7f0900ed
-			public const int afc_pmsg_file_has_been_deleted = 2131296493;
-			
-			// aapt resource value: 0x7f0900ee
-			public const int afc_pmsg_filename_is_directory = 2131296494;
-			
-			// aapt resource value: 0x7f0900ef
-			public const int afc_pmsg_filename_is_invalid = 2131296495;
-			
-			// aapt resource value: 0x7f0900f0
-			public const int afc_pmsg_max_file_count_allowed = 2131296496;
+			// aapt resource value: 0x7f0900c8
+			public const int afc_cmd_sort = 2131296456;
 			
 			// aapt resource value: 0x7f0900f1
-			public const int afc_pmsg_unknown_error = 2131296497;
+			public const int afc_ellipsize = 2131296497;
 			
-			// aapt resource value: 0x7f0900f2
-			public const int afc_root = 2131296498;
+			// aapt resource value: 0x7f0900c9
+			public const int afc_file = 2131296457;
 			
-			// aapt resource value: 0x7f0900f3
-			public const int afc_title_advanced_selection = 2131296499;
+			// aapt resource value: 0x7f0900ca
+			public const int afc_folder = 2131296458;
 			
-			// aapt resource value: 0x7f0900f4
-			public const int afc_title_confirmation = 2131296500;
+			// aapt resource value: 0x7f0900cb
+			public const int afc_hint_clear = 2131296459;
 			
-			// aapt resource value: 0x7f0900f5
-			public const int afc_title_date = 2131296501;
+			// aapt resource value: 0x7f0900cc
+			public const int afc_hint_folder_name = 2131296460;
 			
-			// aapt resource value: 0x7f0900f6
-			public const int afc_title_error = 2131296502;
+			// aapt resource value: 0x7f0900cd
+			public const int afc_hint_save_as_filename = 2131296461;
 			
-			// aapt resource value: 0x7f0900f7
-			public const int afc_title_info = 2131296503;
+			// aapt resource value: 0x7f0900ce
+			public const int afc_hint_search = 2131296462;
 			
-			// aapt resource value: 0x7f0900f8
-			public const int afc_title_name = 2131296504;
+			// aapt resource value: 0x7f0900b6
+			public const int afc_lib_name = 2131296438;
 			
-			// aapt resource value: 0x7f0900f9
-			public const int afc_title_save_as = 2131296505;
+			// aapt resource value: 0x7f0900b7
+			public const int afc_lib_version_name = 2131296439;
 			
-			// aapt resource value: 0x7f0900fa
-			public const int afc_title_size = 2131296506;
+			// aapt resource value: 0x7f0900cf
+			public const int afc_msg_app_doesnot_have_permission_to_create_files = 2131296463;
 			
-			// aapt resource value: 0x7f0900fb
-			public const int afc_title_sort_by = 2131296507;
+			// aapt resource value: 0x7f0900d0
+			public const int afc_msg_app_doesnot_have_permission_to_delete_files = 2131296464;
+			
+			// aapt resource value: 0x7f0900d1
+			public const int afc_msg_cancelled = 2131296465;
+			
+			// aapt resource value: 0x7f0900d2
+			public const int afc_msg_cannot_connect_to_file_provider_service = 2131296466;
+			
+			// aapt resource value: 0x7f0900d3
+			public const int afc_msg_cannot_create_new_folder_here = 2131296467;
+			
+			// aapt resource value: 0x7f0900d4
+			public const int afc_msg_cannot_save_a_file_here = 2131296468;
+			
+			// aapt resource value: 0x7f0900d5
+			public const int afc_msg_done = 2131296469;
+			
+			// aapt resource value: 0x7f0900d6
+			public const int afc_msg_empty = 2131296470;
+			
+			// aapt resource value: 0x7f0900d7
+			public const int afc_msg_failed_please_try_again = 2131296471;
+			
+			// aapt resource value: 0x7f0900d8
+			public const int afc_msg_loading = 2131296472;
+			
+			// aapt resource value: 0x7f0900d9
+			public const int afc_phone = 2131296473;
+			
+			// aapt resource value: 0x7f0900be
+			public const int afc_pkey_display_last_location = 2131296446;
+			
+			// aapt resource value: 0x7f0900bd
+			public const int afc_pkey_display_remember_last_location = 2131296445;
+			
+			// aapt resource value: 0x7f0900bc
+			public const int afc_pkey_display_show_time_for_old_days = 2131296444;
+			
+			// aapt resource value: 0x7f0900bb
+			public const int afc_pkey_display_show_time_for_old_days_this_year = 2131296443;
+			
+			// aapt resource value: 0x7f0900ba
+			public const int afc_pkey_display_sort_ascending = 2131296442;
+			
+			// aapt resource value: 0x7f0900b9
+			public const int afc_pkey_display_sort_type = 2131296441;
+			
+			// aapt resource value: 0x7f0900b8
+			public const int afc_pkey_display_view_type = 2131296440;
+			
+			// aapt resource value: 0x7f0900da
+			public const int afc_pmsg_cannot_access_dir = 2131296474;
+			
+			// aapt resource value: 0x7f0900db
+			public const int afc_pmsg_cannot_create_folder = 2131296475;
+			
+			// aapt resource value: 0x7f0900dc
+			public const int afc_pmsg_cannot_delete_file = 2131296476;
+			
+			// aapt resource value: 0x7f0900dd
+			public const int afc_pmsg_confirm_delete_file = 2131296477;
+			
+			// aapt resource value: 0x7f0900de
+			public const int afc_pmsg_confirm_replace_file = 2131296478;
+			
+			// aapt resource value: 0x7f0900df
+			public const int afc_pmsg_deleting_file = 2131296479;
+			
+			// aapt resource value: 0x7f0900e0
+			public const int afc_pmsg_file_has_been_deleted = 2131296480;
+			
+			// aapt resource value: 0x7f0900e1
+			public const int afc_pmsg_filename_is_directory = 2131296481;
+			
+			// aapt resource value: 0x7f0900e2
+			public const int afc_pmsg_filename_is_invalid = 2131296482;
+			
+			// aapt resource value: 0x7f0900e3
+			public const int afc_pmsg_max_file_count_allowed = 2131296483;
+			
+			// aapt resource value: 0x7f0900e4
+			public const int afc_pmsg_unknown_error = 2131296484;
+			
+			// aapt resource value: 0x7f0900e5
+			public const int afc_root = 2131296485;
+			
+			// aapt resource value: 0x7f0900e6
+			public const int afc_title_advanced_selection = 2131296486;
+			
+			// aapt resource value: 0x7f0900e7
+			public const int afc_title_confirmation = 2131296487;
+			
+			// aapt resource value: 0x7f0900e8
+			public const int afc_title_date = 2131296488;
+			
+			// aapt resource value: 0x7f0900e9
+			public const int afc_title_error = 2131296489;
+			
+			// aapt resource value: 0x7f0900ea
+			public const int afc_title_info = 2131296490;
+			
+			// aapt resource value: 0x7f0900eb
+			public const int afc_title_name = 2131296491;
+			
+			// aapt resource value: 0x7f0900ec
+			public const int afc_title_save_as = 2131296492;
+			
+			// aapt resource value: 0x7f0900ed
+			public const int afc_title_size = 2131296493;
+			
+			// aapt resource value: 0x7f0900ee
+			public const int afc_title_sort_by = 2131296494;
+			
+			// aapt resource value: 0x7f0900ef
+			public const int afc_yesterday = 2131296495;
+			
+			// aapt resource value: 0x7f09013a
+			public const int algorithm = 2131296570;
+			
+			// aapt resource value: 0x7f09013b
+			public const int algorithm_colon = 2131296571;
 			
 			// aapt resource value: 0x7f0900fc
-			public const int afc_yesterday = 2131296508;
-			
-			// aapt resource value: 0x7f090145
-			public const int algorithm = 2131296581;
-			
-			// aapt resource value: 0x7f090146
-			public const int algorithm_colon = 2131296582;
-			
-			// aapt resource value: 0x7f090109
-			public const int algorithm_key = 2131296521;
+			public const int algorithm_key = 2131296508;
 			
 			// aapt resource value: 0x7f090016
 			public const int alternates_for_a = 2131296278;
@@ -5012,29 +4145,29 @@ namespace keepass2android
 			// aapt resource value: 0x7f090024
 			public const int alternates_for_z = 2131296292;
 			
-			// aapt resource value: 0x7f09010a
-			public const int app_key = 2131296522;
+			// aapt resource value: 0x7f0900fd
+			public const int app_key = 2131296509;
 			
-			// aapt resource value: 0x7f090147
-			public const int app_name = 2131296583;
+			// aapt resource value: 0x7f09013c
+			public const int app_name = 2131296572;
 			
-			// aapt resource value: 0x7f090149
-			public const int app_name_nonet = 2131296585;
+			// aapt resource value: 0x7f09013e
+			public const int app_name_nonet = 2131296574;
 			
-			// aapt resource value: 0x7f09014b
-			public const int app_timeout = 2131296587;
+			// aapt resource value: 0x7f090140
+			public const int app_timeout = 2131296576;
 			
-			// aapt resource value: 0x7f09010b
-			public const int app_timeout_key = 2131296523;
+			// aapt resource value: 0x7f0900fe
+			public const int app_timeout_key = 2131296510;
 			
-			// aapt resource value: 0x7f09014c
-			public const int app_timeout_summary = 2131296588;
+			// aapt resource value: 0x7f090141
+			public const int app_timeout_summary = 2131296577;
 			
-			// aapt resource value: 0x7f090150
-			public const int application = 2131296592;
+			// aapt resource value: 0x7f090145
+			public const int application = 2131296581;
 			
-			// aapt resource value: 0x7f090151
-			public const int application_settings = 2131296593;
+			// aapt resource value: 0x7f090146
+			public const int application_settings = 2131296582;
 			
 			// aapt resource value: 0x7f090010
 			public const int auth_client_needs_enabling_title = 2131296272;
@@ -5054,8 +4187,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f09000f
 			public const int auth_client_using_bad_version_title = 2131296271;
 			
-			// aapt resource value: 0x7f0901ee
-			public const int author = 2131296750;
+			// aapt resource value: 0x7f0901e3
+			public const int author = 2131296739;
 			
 			// aapt resource value: 0x7f090047
 			public const int auto_cap = 2131296327;
@@ -5090,8 +4223,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f090088
 			public const int auto_submit_summary = 2131296392;
 			
-			// aapt resource value: 0x7f09015f
-			public const int available_through_keyboard = 2131296607;
+			// aapt resource value: 0x7f090154
+			public const int available_through_keyboard = 2131296596;
 			
 			// aapt resource value: 0x7f090055
 			public const int bigram_suggestion = 2131296341;
@@ -5099,38 +4232,38 @@ namespace keepass2android
 			// aapt resource value: 0x7f090056
 			public const int bigram_suggestion_summary = 2131296342;
 			
-			// aapt resource value: 0x7f090159
-			public const int brackets = 2131296601;
+			// aapt resource value: 0x7f09014e
+			public const int brackets = 2131296590;
 			
-			// aapt resource value: 0x7f0902c4
-			public const int browser_intall_text = 2131296964;
+			// aapt resource value: 0x7f0902c2
+			public const int browser_intall_text = 2131296962;
 			
-			// aapt resource value: 0x7f0902c5
-			public const int building_search_idx = 2131296965;
+			// aapt resource value: 0x7f0902c3
+			public const int building_search_idx = 2131296963;
 			
-			// aapt resource value: 0x7f09028f
-			public const int button_change_location = 2131296911;
+			// aapt resource value: 0x7f090286
+			public const int button_change_location = 2131296902;
 			
 			// aapt resource value: 0x7f090081
 			public const int cancel = 2131296385;
 			
-			// aapt resource value: 0x7f0901ff
-			public const int caseSensitive = 2131296767;
+			// aapt resource value: 0x7f0901f4
+			public const int caseSensitive = 2131296756;
 			
 			// aapt resource value: 0x7f0900a5
 			public const int change_entry = 2131296421;
 			
-			// aapt resource value: 0x7f09015b
-			public const int clipboard_timeout = 2131296603;
+			// aapt resource value: 0x7f090150
+			public const int clipboard_timeout = 2131296592;
 			
-			// aapt resource value: 0x7f090134
-			public const int clipboard_timeout_default = 2131296564;
+			// aapt resource value: 0x7f090128
+			public const int clipboard_timeout_default = 2131296552;
 			
-			// aapt resource value: 0x7f09010d
-			public const int clipboard_timeout_key = 2131296525;
+			// aapt resource value: 0x7f090100
+			public const int clipboard_timeout_key = 2131296512;
 			
-			// aapt resource value: 0x7f09015c
-			public const int clipboard_timeout_summary = 2131296604;
+			// aapt resource value: 0x7f090151
+			public const int clipboard_timeout_summary = 2131296593;
 			
 			// aapt resource value: 0x7f09008a
 			public const int close_the_keyboard = 2131296394;
@@ -5180,131 +4313,134 @@ namespace keepass2android
 			// aapt resource value: 0x7f09000e
 			public const int common_signin_button_text_long = 2131296270;
 			
-			// aapt resource value: 0x7f0901f4
-			public const int contributors = 2131296756;
-			
-			// aapt resource value: 0x7f09015e
-			public const int copy_password = 2131296606;
-			
-			// aapt resource value: 0x7f09015d
-			public const int copy_username = 2131296605;
-			
-			// aapt resource value: 0x7f0901cb
-			public const int create_database = 2131296715;
-			
-			// aapt resource value: 0x7f090162
-			public const int creating_db_key = 2131296610;
-			
-			// aapt resource value: 0x7f090227
-			public const int credentials_dialog_title = 2131296807;
-			
-			// aapt resource value: 0x7f0901f1
-			public const int credit_android_filechooser = 2131296753;
-			
-			// aapt resource value: 0x7f0901f2
-			public const int credit_keyboard = 2131296754;
-			
-			// aapt resource value: 0x7f0901f0
-			public const int credit_plugin1 = 2131296752;
-			
-			// aapt resource value: 0x7f090163
-			public const int current_group = 2131296611;
-			
-			// aapt resource value: 0x7f090164
-			public const int current_group_root = 2131296612;
-			
-			// aapt resource value: 0x7f090165
-			public const int database = 2131296613;
-			
-			// aapt resource value: 0x7f090270
-			public const int database_file = 2131296880;
-			
-			// aapt resource value: 0x7f090225
-			public const int database_loaded_quickunlock_enabled = 2131296805;
-			
-			// aapt resource value: 0x7f090226
-			public const int database_loaded_unlocked = 2131296806;
-			
-			// aapt resource value: 0x7f09028c
-			public const int database_location = 2131296908;
-			
-			// aapt resource value: 0x7f0901d5
-			public const int database_name = 2131296725;
-			
-			// aapt resource value: 0x7f09011a
-			public const int database_name_key = 2131296538;
-			
-			// aapt resource value: 0x7f09010e
-			public const int db_key = 2131296526;
-			
-			// aapt resource value: 0x7f0902c6
-			public const int decrypting_db = 2131296966;
-			
-			// aapt resource value: 0x7f0902c7
-			public const int decrypting_entry = 2131296967;
-			
-			// aapt resource value: 0x7f0902c8
-			public const int default_checkbox = 2131296968;
-			
-			// aapt resource value: 0x7f090100
-			public const int default_file_path = 2131296512;
-			
-			// aapt resource value: 0x7f0901d6
-			public const int default_username = 2131296726;
-			
-			// aapt resource value: 0x7f090119
-			public const int default_username_key = 2131296537;
-			
-			// aapt resource value: 0x7f090224
-			public const int delete_extra_string = 2131296804;
-			
-			// aapt resource value: 0x7f090136
-			public const int design_default = 2131296566;
-			
-			// aapt resource value: 0x7f090114
-			public const int design_key = 2131296532;
-			
-			// aapt resource value: 0x7f0902c3
-			public const int design_title = 2131296963;
-			
-			// aapt resource value: 0x7f090166
-			public const int digits = 2131296614;
-			
-			// aapt resource value: 0x7f090167
-			public const int disclaimer_formal = 2131296615;
+			// aapt resource value: 0x7f0901e9
+			public const int contributors = 2131296745;
 			
 			// aapt resource value: 0x7f090153
-			public const int display_prefs = 2131296595;
+			public const int copy_password = 2131296595;
 			
-			// aapt resource value: 0x7f09011f
-			public const int display_prefs_key = 2131296543;
+			// aapt resource value: 0x7f090152
+			public const int copy_username = 2131296594;
 			
-			// aapt resource value: 0x7f090276
-			public const int donate_bday_question = 2131296886;
+			// aapt resource value: 0x7f0901c0
+			public const int create_database = 2131296704;
 			
-			// aapt resource value: 0x7f090277
-			public const int donate_missedbday_question = 2131296887;
+			// aapt resource value: 0x7f090157
+			public const int creating_db_key = 2131296599;
 			
-			// aapt resource value: 0x7f090275
-			public const int donate_question = 2131296885;
+			// aapt resource value: 0x7f09021c
+			public const int credentials_dialog_title = 2131296796;
+			
+			// aapt resource value: 0x7f0901e6
+			public const int credit_android_filechooser = 2131296742;
+			
+			// aapt resource value: 0x7f0901e7
+			public const int credit_keyboard = 2131296743;
+			
+			// aapt resource value: 0x7f0901e5
+			public const int credit_plugin1 = 2131296741;
+			
+			// aapt resource value: 0x7f090158
+			public const int current_group = 2131296600;
+			
+			// aapt resource value: 0x7f090159
+			public const int current_group_root = 2131296601;
+			
+			// aapt resource value: 0x7f09015a
+			public const int database = 2131296602;
+			
+			// aapt resource value: 0x7f090267
+			public const int database_file = 2131296871;
+			
+			// aapt resource value: 0x7f09021a
+			public const int database_loaded_quickunlock_enabled = 2131296794;
+			
+			// aapt resource value: 0x7f09021b
+			public const int database_loaded_unlocked = 2131296795;
+			
+			// aapt resource value: 0x7f090283
+			public const int database_location = 2131296899;
+			
+			// aapt resource value: 0x7f0901ca
+			public const int database_name = 2131296714;
+			
+			// aapt resource value: 0x7f09010d
+			public const int database_name_key = 2131296525;
 			
 			// aapt resource value: 0x7f090101
-			public const int donate_url = 2131296513;
+			public const int db_key = 2131296513;
 			
-			// aapt resource value: 0x7f090144
-			public const int edit_group_title = 2131296580;
+			// aapt resource value: 0x7f0902c4
+			public const int decrypting_db = 2131296964;
 			
-			// aapt resource value: 0x7f090168
-			public const int ellipsis = 2131296616;
+			// aapt resource value: 0x7f0902c5
+			public const int decrypting_entry = 2131296965;
 			
-			// aapt resource value: 0x7f0902a8
-			public const int enable_plugin_question = 2131296936;
+			// aapt resource value: 0x7f0902c6
+			public const int default_checkbox = 2131296966;
 			
-			// aapt resource value: 0x7f0902a7
-			public const int enable_plugin_title = 2131296935;
+			// aapt resource value: 0x7f0900f3
+			public const int default_file_path = 2131296499;
 			
-			// aapt resource value: 0x7f090206
-			public const int enable_quickunlock = 2131296774;
+			// aapt resource value: 0x7f0901cb
+			public const int default_username = 2131296715;
+			
+			// aapt resource value: 0x7f09010c
+			public const int default_username_key = 2131296524;
+			
+			// aapt resource value: 0x7f090219
+			public const int delete_extra_string = 2131296793;
+			
+			// aapt resource value: 0x7f090134
+			public const int deny = 2131296564;
+			
+			// aapt resource value: 0x7f09012a
+			public const int design_default = 2131296554;
+			
+			// aapt resource value: 0x7f090107
+			public const int design_key = 2131296519;
+			
+			// aapt resource value: 0x7f0902be
+			public const int design_title = 2131296958;
+			
+			// aapt resource value: 0x7f09015b
+			public const int digits = 2131296603;
+			
+			// aapt resource value: 0x7f09015c
+			public const int disclaimer_formal = 2131296604;
+			
+			// aapt resource value: 0x7f090148
+			public const int display_prefs = 2131296584;
+			
+			// aapt resource value: 0x7f090112
+			public const int display_prefs_key = 2131296530;
+			
+			// aapt resource value: 0x7f09026d
+			public const int donate_bday_question = 2131296877;
+			
+			// aapt resource value: 0x7f09026e
+			public const int donate_missedbday_question = 2131296878;
+			
+			// aapt resource value: 0x7f09026c
+			public const int donate_question = 2131296876;
+			
+			// aapt resource value: 0x7f0900f4
+			public const int donate_url = 2131296500;
+			
+			// aapt resource value: 0x7f090139
+			public const int edit_group_title = 2131296569;
+			
+			// aapt resource value: 0x7f09015d
+			public const int ellipsis = 2131296605;
+			
+			// aapt resource value: 0x7f0902c0
+			public const int enable_plugin_question = 2131296960;
+			
+			// aapt resource value: 0x7f0902bf
+			public const int enable_plugin_title = 2131296959;
+			
+			// aapt resource value: 0x7f0901fb
+			public const int enable_quickunlock = 2131296763;
 			
 			// aapt resource value: 0x7f0900a3
 			public const int english_ime_debug_settings = 2131296419;
@@ -5318,287 +4454,287 @@ namespace keepass2android
 			// aapt resource value: 0x7f090036
 			public const int english_ime_settings = 2131296310;
 			
-			// aapt resource value: 0x7f090169
-			public const int enter_filename = 2131296617;
+			// aapt resource value: 0x7f09015e
+			public const int enter_filename = 2131296606;
 			
-			// aapt resource value: 0x7f090205
-			public const int enter_filename_details_create_import = 2131296773;
+			// aapt resource value: 0x7f0901fa
+			public const int enter_filename_details_create_import = 2131296762;
 			
-			// aapt resource value: 0x7f090204
-			public const int enter_filename_details_url = 2131296772;
+			// aapt resource value: 0x7f0901f9
+			public const int enter_filename_details_url = 2131296761;
 			
-			// aapt resource value: 0x7f09027d
-			public const int enter_sftp_login_title = 2131296893;
+			// aapt resource value: 0x7f090274
+			public const int enter_sftp_login_title = 2131296884;
 			
-			// aapt resource value: 0x7f09016a
-			public const int entry_accessed = 2131296618;
+			// aapt resource value: 0x7f09015f
+			public const int entry_accessed = 2131296607;
 			
-			// aapt resource value: 0x7f0902c9
-			public const int entry_and_or = 2131296969;
-			
-			// aapt resource value: 0x7f09017a
-			public const int entry_binaries = 2131296634;
-			
-			// aapt resource value: 0x7f09016b
-			public const int entry_cancel = 2131296619;
-			
-			// aapt resource value: 0x7f09016c
-			public const int entry_comment = 2131296620;
+			// aapt resource value: 0x7f0902c7
+			public const int entry_and_or = 2131296967;
 			
 			// aapt resource value: 0x7f09016f
-			public const int entry_confpassword = 2131296623;
+			public const int entry_binaries = 2131296623;
 			
-			// aapt resource value: 0x7f090170
-			public const int entry_created = 2131296624;
+			// aapt resource value: 0x7f090160
+			public const int entry_cancel = 2131296608;
 			
-			// aapt resource value: 0x7f090171
-			public const int entry_expires = 2131296625;
+			// aapt resource value: 0x7f090161
+			public const int entry_comment = 2131296609;
 			
-			// aapt resource value: 0x7f090179
-			public const int entry_extra_strings = 2131296633;
+			// aapt resource value: 0x7f090164
+			public const int entry_confpassword = 2131296612;
 			
-			// aapt resource value: 0x7f090172
-			public const int entry_keyfile = 2131296626;
+			// aapt resource value: 0x7f090165
+			public const int entry_created = 2131296613;
 			
-			// aapt resource value: 0x7f090173
-			public const int entry_modified = 2131296627;
+			// aapt resource value: 0x7f090166
+			public const int entry_expires = 2131296614;
 			
 			// aapt resource value: 0x7f09016e
-			public const int entry_override_url = 2131296622;
+			public const int entry_extra_strings = 2131296622;
 			
-			// aapt resource value: 0x7f090174
-			public const int entry_password = 2131296628;
+			// aapt resource value: 0x7f090167
+			public const int entry_keyfile = 2131296615;
 			
-			// aapt resource value: 0x7f090175
-			public const int entry_save = 2131296629;
+			// aapt resource value: 0x7f090168
+			public const int entry_modified = 2131296616;
+			
+			// aapt resource value: 0x7f090163
+			public const int entry_override_url = 2131296611;
+			
+			// aapt resource value: 0x7f090169
+			public const int entry_password = 2131296617;
+			
+			// aapt resource value: 0x7f09016a
+			public const int entry_save = 2131296618;
+			
+			// aapt resource value: 0x7f090162
+			public const int entry_tags = 2131296610;
+			
+			// aapt resource value: 0x7f09016b
+			public const int entry_title = 2131296619;
+			
+			// aapt resource value: 0x7f09016c
+			public const int entry_url = 2131296620;
 			
 			// aapt resource value: 0x7f09016d
-			public const int entry_tags = 2131296621;
+			public const int entry_user_name = 2131296621;
 			
-			// aapt resource value: 0x7f090176
-			public const int entry_title = 2131296630;
+			// aapt resource value: 0x7f09028e
+			public const int error_adding_keyfile = 2131296910;
+			
+			// aapt resource value: 0x7f0902c8
+			public const int error_arc4 = 2131296968;
+			
+			// aapt resource value: 0x7f090170
+			public const int error_can_not_handle_uri = 2131296624;
+			
+			// aapt resource value: 0x7f090171
+			public const int error_could_not_create_group = 2131296625;
+			
+			// aapt resource value: 0x7f090172
+			public const int error_could_not_create_parent = 2131296626;
+			
+			// aapt resource value: 0x7f090173
+			public const int error_database_exists = 2131296627;
+			
+			// aapt resource value: 0x7f090174
+			public const int error_database_settings = 2131296628;
+			
+			// aapt resource value: 0x7f090175
+			public const int error_failed_to_launch_link = 2131296629;
 			
 			// aapt resource value: 0x7f090177
-			public const int entry_url = 2131296631;
+			public const int error_file_not_create = 2131296631;
+			
+			// aapt resource value: 0x7f090176
+			public const int error_filename_required = 2131296630;
 			
 			// aapt resource value: 0x7f090178
-			public const int entry_user_name = 2131296632;
+			public const int error_invalid_db = 2131296632;
 			
-			// aapt resource value: 0x7f090297
-			public const int error_adding_keyfile = 2131296919;
+			// aapt resource value: 0x7f090212
+			public const int error_invalid_expiry_date = 2131296786;
 			
-			// aapt resource value: 0x7f0902ca
-			public const int error_arc4 = 2131296970;
+			// aapt resource value: 0x7f090179
+			public const int error_invalid_path = 2131296633;
+			
+			// aapt resource value: 0x7f09017a
+			public const int error_no_name = 2131296634;
 			
 			// aapt resource value: 0x7f09017b
-			public const int error_can_not_handle_uri = 2131296635;
+			public const int error_nopass = 2131296635;
+			
+			// aapt resource value: 0x7f0902c9
+			public const int error_out_of_memory = 2131296969;
 			
 			// aapt resource value: 0x7f09017c
-			public const int error_could_not_create_group = 2131296636;
+			public const int error_pass_gen_type = 2131296636;
 			
 			// aapt resource value: 0x7f09017d
-			public const int error_could_not_create_parent = 2131296637;
+			public const int error_pass_match = 2131296637;
 			
 			// aapt resource value: 0x7f09017e
-			public const int error_database_exists = 2131296638;
+			public const int error_rounds_not_number = 2131296638;
+			
+			// aapt resource value: 0x7f0902ca
+			public const int error_rounds_too_large = 2131296970;
+			
+			// aapt resource value: 0x7f090213
+			public const int error_string_key = 2131296787;
 			
 			// aapt resource value: 0x7f09017f
-			public const int error_database_settings = 2131296639;
+			public const int error_title_required = 2131296639;
 			
 			// aapt resource value: 0x7f090180
-			public const int error_failed_to_launch_link = 2131296640;
+			public const int error_wrong_length = 2131296640;
+			
+			// aapt resource value: 0x7f0901f2
+			public const int excludeExpiredEntries = 2131296754;
+			
+			// aapt resource value: 0x7f0901ce
+			public const int export_database_successful = 2131296718;
+			
+			// aapt resource value: 0x7f0902ad
+			public const int export_fileformats_title = 2131296941;
+			
+			// aapt resource value: 0x7f09014d
+			public const int export_prefs = 2131296589;
+			
+			// aapt resource value: 0x7f0901cd
+			public const int exporting_database = 2131296717;
+			
+			// aapt resource value: 0x7f090214
+			public const int field_name = 2131296788;
+			
+			// aapt resource value: 0x7f090215
+			public const int field_value = 2131296789;
 			
 			// aapt resource value: 0x7f090182
-			public const int error_file_not_create = 2131296642;
-			
-			// aapt resource value: 0x7f090181
-			public const int error_filename_required = 2131296641;
-			
-			// aapt resource value: 0x7f090183
-			public const int error_invalid_db = 2131296643;
-			
-			// aapt resource value: 0x7f09021d
-			public const int error_invalid_expiry_date = 2131296797;
-			
-			// aapt resource value: 0x7f090184
-			public const int error_invalid_path = 2131296644;
-			
-			// aapt resource value: 0x7f090185
-			public const int error_no_name = 2131296645;
-			
-			// aapt resource value: 0x7f090186
-			public const int error_nopass = 2131296646;
-			
-			// aapt resource value: 0x7f0902cb
-			public const int error_out_of_memory = 2131296971;
-			
-			// aapt resource value: 0x7f090187
-			public const int error_pass_gen_type = 2131296647;
-			
-			// aapt resource value: 0x7f090188
-			public const int error_pass_match = 2131296648;
-			
-			// aapt resource value: 0x7f090189
-			public const int error_rounds_not_number = 2131296649;
-			
-			// aapt resource value: 0x7f0902cc
-			public const int error_rounds_too_large = 2131296972;
-			
-			// aapt resource value: 0x7f09021e
-			public const int error_string_key = 2131296798;
-			
-			// aapt resource value: 0x7f09018a
-			public const int error_title_required = 2131296650;
-			
-			// aapt resource value: 0x7f09018b
-			public const int error_wrong_length = 2131296651;
-			
-			// aapt resource value: 0x7f0901fd
-			public const int excludeExpiredEntries = 2131296765;
-			
-			// aapt resource value: 0x7f0901d9
-			public const int export_database_successful = 2131296729;
-			
-			// aapt resource value: 0x7f0902b2
-			public const int export_fileformats_title = 2131296946;
-			
-			// aapt resource value: 0x7f090158
-			public const int export_prefs = 2131296600;
-			
-			// aapt resource value: 0x7f0901d8
-			public const int exporting_database = 2131296728;
-			
-			// aapt resource value: 0x7f09021f
-			public const int field_name = 2131296799;
-			
-			// aapt resource value: 0x7f090220
-			public const int field_value = 2131296800;
-			
-			// aapt resource value: 0x7f09018d
-			public const int file_browser = 2131296653;
-			
-			// aapt resource value: 0x7f09028b
-			public const int filestorage_setup_title = 2131296907;
-			
-			// aapt resource value: 0x7f090287
-			public const int filestoragehelp_dropboxKP2A = 2131296903;
-			
-			// aapt resource value: 0x7f090280
-			public const int filestoragename_androidget = 2131296896;
-			
-			// aapt resource value: 0x7f090281
-			public const int filestoragename_androidsend = 2131296897;
-			
-			// aapt resource value: 0x7f090285
-			public const int filestoragename_dropbox = 2131296901;
-			
-			// aapt resource value: 0x7f090286
-			public const int filestoragename_dropboxKP2A = 2131296902;
-			
-			// aapt resource value: 0x7f09027f
-			public const int filestoragename_file = 2131296895;
+			public const int file_browser = 2131296642;
 			
 			// aapt resource value: 0x7f090282
-			public const int filestoragename_ftp = 2131296898;
+			public const int filestorage_setup_title = 2131296898;
 			
-			// aapt resource value: 0x7f090288
-			public const int filestoragename_gdrive = 2131296904;
+			// aapt resource value: 0x7f09027e
+			public const int filestoragehelp_dropboxKP2A = 2131296894;
 			
-			// aapt resource value: 0x7f090283
-			public const int filestoragename_http = 2131296899;
+			// aapt resource value: 0x7f090277
+			public const int filestoragename_androidget = 2131296887;
 			
-			// aapt resource value: 0x7f090284
-			public const int filestoragename_https = 2131296900;
+			// aapt resource value: 0x7f090278
+			public const int filestoragename_androidsend = 2131296888;
 			
-			// aapt resource value: 0x7f09028a
-			public const int filestoragename_sftp = 2131296906;
+			// aapt resource value: 0x7f09027c
+			public const int filestoragename_dropbox = 2131296892;
 			
-			// aapt resource value: 0x7f090289
-			public const int filestoragename_skydrive = 2131296905;
+			// aapt resource value: 0x7f09027d
+			public const int filestoragename_dropboxKP2A = 2131296893;
 			
-			// aapt resource value: 0x7f090104
-			public const int further_author_names = 2131296516;
+			// aapt resource value: 0x7f090276
+			public const int filestoragename_file = 2131296886;
 			
-			// aapt resource value: 0x7f0901ef
-			public const int further_authors = 2131296751;
+			// aapt resource value: 0x7f090279
+			public const int filestoragename_ftp = 2131296889;
 			
-			// aapt resource value: 0x7f09018e
-			public const int generate_password = 2131296654;
+			// aapt resource value: 0x7f09027f
+			public const int filestoragename_gdrive = 2131296895;
 			
-			// aapt resource value: 0x7f0902af
-			public const int get_regular_version = 2131296943;
+			// aapt resource value: 0x7f09027a
+			public const int filestoragename_http = 2131296890;
 			
-			// aapt resource value: 0x7f09018f
-			public const int group = 2131296655;
+			// aapt resource value: 0x7f09027b
+			public const int filestoragename_https = 2131296891;
+			
+			// aapt resource value: 0x7f090281
+			public const int filestoragename_sftp = 2131296897;
+			
+			// aapt resource value: 0x7f090280
+			public const int filestoragename_skydrive = 2131296896;
+			
+			// aapt resource value: 0x7f0900f7
+			public const int further_author_names = 2131296503;
+			
+			// aapt resource value: 0x7f0901e4
+			public const int further_authors = 2131296740;
+			
+			// aapt resource value: 0x7f090183
+			public const int generate_password = 2131296643;
+			
+			// aapt resource value: 0x7f0902aa
+			public const int get_regular_version = 2131296938;
+			
+			// aapt resource value: 0x7f090184
+			public const int group = 2131296644;
 			
 			// aapt resource value: 0x7f090096
 			public const int has_dictionary = 2131296406;
 			
-			// aapt resource value: 0x7f09028d
-			public const int help_database_location = 2131296909;
+			// aapt resource value: 0x7f090284
+			public const int help_database_location = 2131296900;
 			
-			// aapt resource value: 0x7f090294
-			public const int help_key_file = 2131296916;
+			// aapt resource value: 0x7f09028b
+			public const int help_key_file = 2131296907;
 			
-			// aapt resource value: 0x7f090291
-			public const int help_master_password = 2131296913;
+			// aapt resource value: 0x7f090288
+			public const int help_master_password = 2131296904;
 			
 			// aapt resource value: 0x7f090095
 			public const int hint_add_to_dictionary = 2131296405;
 			
+			// aapt resource value: 0x7f090185
+			public const int hint_comment = 2131296645;
+			
+			// aapt resource value: 0x7f090186
+			public const int hint_conf_pass = 2131296646;
+			
+			// aapt resource value: 0x7f090285
+			public const int hint_database_location = 2131296901;
+			
+			// aapt resource value: 0x7f090187
+			public const int hint_generated_password = 2131296647;
+			
+			// aapt resource value: 0x7f090188
+			public const int hint_group_name = 2131296648;
+			
+			// aapt resource value: 0x7f09028c
+			public const int hint_key_file = 2131296908;
+			
+			// aapt resource value: 0x7f090189
+			public const int hint_keyfile = 2131296649;
+			
+			// aapt resource value: 0x7f09018a
+			public const int hint_length = 2131296650;
+			
+			// aapt resource value: 0x7f09018c
+			public const int hint_login_pass = 2131296652;
+			
+			// aapt resource value: 0x7f090289
+			public const int hint_master_password = 2131296905;
+			
+			// aapt resource value: 0x7f09018f
+			public const int hint_override_url = 2131296655;
+			
+			// aapt resource value: 0x7f09018b
+			public const int hint_pass = 2131296651;
+			
+			// aapt resource value: 0x7f090271
+			public const int hint_sftp_host = 2131296881;
+			
+			// aapt resource value: 0x7f090272
+			public const int hint_sftp_port = 2131296882;
+			
 			// aapt resource value: 0x7f090190
-			public const int hint_comment = 2131296656;
+			public const int hint_tags = 2131296656;
+			
+			// aapt resource value: 0x7f09018d
+			public const int hint_title = 2131296653;
+			
+			// aapt resource value: 0x7f09018e
+			public const int hint_url = 2131296654;
 			
 			// aapt resource value: 0x7f090191
-			public const int hint_conf_pass = 2131296657;
-			
-			// aapt resource value: 0x7f09028e
-			public const int hint_database_location = 2131296910;
-			
-			// aapt resource value: 0x7f090192
-			public const int hint_generated_password = 2131296658;
-			
-			// aapt resource value: 0x7f090193
-			public const int hint_group_name = 2131296659;
-			
-			// aapt resource value: 0x7f090295
-			public const int hint_key_file = 2131296917;
-			
-			// aapt resource value: 0x7f090194
-			public const int hint_keyfile = 2131296660;
-			
-			// aapt resource value: 0x7f090195
-			public const int hint_length = 2131296661;
-			
-			// aapt resource value: 0x7f090197
-			public const int hint_login_pass = 2131296663;
-			
-			// aapt resource value: 0x7f090292
-			public const int hint_master_password = 2131296914;
-			
-			// aapt resource value: 0x7f09019a
-			public const int hint_override_url = 2131296666;
-			
-			// aapt resource value: 0x7f090196
-			public const int hint_pass = 2131296662;
-			
-			// aapt resource value: 0x7f09027a
-			public const int hint_sftp_host = 2131296890;
-			
-			// aapt resource value: 0x7f09027b
-			public const int hint_sftp_port = 2131296891;
-			
-			// aapt resource value: 0x7f09019b
-			public const int hint_tags = 2131296667;
-			
-			// aapt resource value: 0x7f090198
-			public const int hint_title = 2131296664;
-			
-			// aapt resource value: 0x7f090199
-			public const int hint_url = 2131296665;
-			
-			// aapt resource value: 0x7f09019c
-			public const int hint_username = 2131296668;
+			public const int hint_username = 2131296657;
 			
 			// aapt resource value: 0x7f09003b
 			public const int hit_correction = 2131296315;
@@ -5612,62 +4748,62 @@ namespace keepass2android
 			// aapt resource value: 0x7f09003c
 			public const int hit_correction_summary = 2131296316;
 			
-			// aapt resource value: 0x7f090102
-			public const int homepage = 2131296514;
+			// aapt resource value: 0x7f0900f5
+			public const int homepage = 2131296501;
 			
-			// aapt resource value: 0x7f090103
-			public const int homepage_short = 2131296515;
+			// aapt resource value: 0x7f0900f6
+			public const int homepage_short = 2131296502;
 			
-			// aapt resource value: 0x7f0900ff
-			public const int icon_info = 2131296511;
+			// aapt resource value: 0x7f0900f2
+			public const int icon_info = 2131296498;
 			
-			// aapt resource value: 0x7f090298
-			public const int init_otp = 2131296920;
+			// aapt resource value: 0x7f09028f
+			public const int init_otp = 2131296911;
 			
-			// aapt resource value: 0x7f09027c
-			public const int initial_directory = 2131296892;
+			// aapt resource value: 0x7f090273
+			public const int initial_directory = 2131296883;
 			
-			// aapt resource value: 0x7f0901e5
-			public const int insert_element_here = 2131296741;
+			// aapt resource value: 0x7f0901da
+			public const int insert_element_here = 2131296730;
 			
-			// aapt resource value: 0x7f0902cd
-			public const int install_from_market = 2131296973;
+			// aapt resource value: 0x7f0902cb
+			public const int install_from_market = 2131296971;
 			
-			// aapt resource value: 0x7f0902ce
-			public const int install_from_website = 2131296974;
+			// aapt resource value: 0x7f0902cc
+			public const int install_from_website = 2131296972;
 			
-			// aapt resource value: 0x7f09019e
-			public const int invalid_algorithm = 2131296670;
+			// aapt resource value: 0x7f090193
+			public const int invalid_algorithm = 2131296659;
 			
-			// aapt resource value: 0x7f09019f
-			public const int invalid_db_sig = 2131296671;
+			// aapt resource value: 0x7f090194
+			public const int invalid_db_sig = 2131296660;
 			
-			// aapt resource value: 0x7f090105
-			public const int issues = 2131296517;
+			// aapt resource value: 0x7f0900f8
+			public const int issues = 2131296504;
 			
-			// aapt resource value: 0x7f090293
-			public const int key_file = 2131296915;
+			// aapt resource value: 0x7f09028a
+			public const int key_file = 2131296906;
 			
 			// aapt resource value: 0x7f09009b
 			public const int keyboard_layout = 2131296411;
 			
-			// aapt resource value: 0x7f090157
-			public const int keyboard_prefs = 2131296599;
+			// aapt resource value: 0x7f09014c
+			public const int keyboard_prefs = 2131296588;
 			
 			// aapt resource value: 0x7f09008c
 			public const int keyboard_settings = 2131296396;
 			
-			// aapt resource value: 0x7f0901a0
-			public const int keyfile_does_not_exist = 2131296672;
+			// aapt resource value: 0x7f090195
+			public const int keyfile_does_not_exist = 2131296661;
 			
-			// aapt resource value: 0x7f0901a1
-			public const int keyfile_is_empty = 2131296673;
+			// aapt resource value: 0x7f090196
+			public const int keyfile_is_empty = 2131296662;
 			
-			// aapt resource value: 0x7f090110
-			public const int keyfile_key = 2131296528;
+			// aapt resource value: 0x7f090103
+			public const int keyfile_key = 2131296515;
 			
-			// aapt resource value: 0x7f09014d
-			public const int kill_app_label = 2131296589;
+			// aapt resource value: 0x7f090142
+			public const int kill_app_label = 2131296578;
 			
 			// aapt resource value: 0x7f0900ab
 			public const int kp2a_auto_fill = 2131296427;
@@ -5675,8 +4811,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f0900ac
 			public const int kp2a_auto_fill_summary = 2131296428;
 			
-			// aapt resource value: 0x7f0901fc
-			public const int kp2a_findUrl = 2131296764;
+			// aapt resource value: 0x7f0901f1
+			public const int kp2a_findUrl = 2131296753;
 			
 			// aapt resource value: 0x7f0900b1
 			public const int kp2a_lock_on_sendgodone = 2131296433;
@@ -5708,11 +4844,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f0900b4
 			public const int kp2a_switch_on_sendgodone_summary = 2131296436;
 			
-			// aapt resource value: 0x7f09023a
-			public const int kp2a_switch_rooted = 2131296826;
+			// aapt resource value: 0x7f090231
+			public const int kp2a_switch_rooted = 2131296817;
 			
-			// aapt resource value: 0x7f09023b
-			public const int kp2a_switch_rooted_summary = 2131296827;
+			// aapt resource value: 0x7f090232
+			public const int kp2a_switch_rooted_summary = 2131296818;
 			
 			// aapt resource value: 0x7f0900a8
 			public const int kp2a_user = 2131296424;
@@ -5762,152 +4898,152 @@ namespace keepass2android
 			// aapt resource value: 0x7f09009f
 			public const int layout_stone_normal = 2131296415;
 			
-			// aapt resource value: 0x7f0901a2
-			public const int length = 2131296674;
+			// aapt resource value: 0x7f090197
+			public const int length = 2131296663;
 			
 			// aapt resource value: 0x7f0900b5
 			public const int library_name = 2131296437;
 			
-			// aapt resource value: 0x7f090135
-			public const int list_size_default = 2131296565;
-			
-			// aapt resource value: 0x7f090113
-			public const int list_size_key = 2131296531;
-			
-			// aapt resource value: 0x7f0901a4
-			public const int list_size_summary = 2131296676;
-			
-			// aapt resource value: 0x7f0901a3
-			public const int list_size_title = 2131296675;
-			
-			// aapt resource value: 0x7f0902a6
-			public const int loading = 2131296934;
-			
-			// aapt resource value: 0x7f0901a5
-			public const int loading_database = 2131296677;
-			
-			// aapt resource value: 0x7f0901a6
-			public const int lowercase = 2131296678;
-			
-			// aapt resource value: 0x7f090111
-			public const int maskpass_key = 2131296529;
-			
-			// aapt resource value: 0x7f0901a9
-			public const int maskpass_summary = 2131296681;
-			
-			// aapt resource value: 0x7f0901a8
-			public const int maskpass_title = 2131296680;
-			
-			// aapt resource value: 0x7f0901c9
-			public const int master_key_type = 2131296713;
-			
-			// aapt resource value: 0x7f090290
-			public const int master_password = 2131296912;
-			
-			// aapt resource value: 0x7f0901aa
-			public const int menu_about = 2131296682;
-			
-			// aapt resource value: 0x7f0901af
-			public const int menu_app_settings = 2131296687;
-			
-			// aapt resource value: 0x7f0901bc
-			public const int menu_change_db = 2131296700;
-			
-			// aapt resource value: 0x7f0901ab
-			public const int menu_change_key = 2131296683;
-			
-			// aapt resource value: 0x7f0901ac
-			public const int menu_copy_pass = 2131296684;
-			
-			// aapt resource value: 0x7f0901ad
-			public const int menu_copy_user = 2131296685;
-			
-			// aapt resource value: 0x7f0901ae
-			public const int menu_create = 2131296686;
-			
-			// aapt resource value: 0x7f0901b0
-			public const int menu_db_settings = 2131296688;
-			
-			// aapt resource value: 0x7f0901b1
-			public const int menu_delete = 2131296689;
-			
-			// aapt resource value: 0x7f0901b3
-			public const int menu_donate = 2131296691;
-			
-			// aapt resource value: 0x7f0901b4
-			public const int menu_edit = 2131296692;
-			
-			// aapt resource value: 0x7f0901b5
-			public const int menu_hide_password = 2131296693;
-			
-			// aapt resource value: 0x7f0902cf
-			public const int menu_homepage = 2131296975;
-			
-			// aapt resource value: 0x7f0901b6
-			public const int menu_lock = 2131296694;
-			
-			// aapt resource value: 0x7f0901b2
-			public const int menu_move = 2131296690;
-			
-			// aapt resource value: 0x7f0901b7
-			public const int menu_open = 2131296695;
-			
-			// aapt resource value: 0x7f0901b8
-			public const int menu_rename = 2131296696;
-			
-			// aapt resource value: 0x7f0901b9
-			public const int menu_search = 2131296697;
-			
-			// aapt resource value: 0x7f0901ba
-			public const int menu_search_advanced = 2131296698;
-			
-			// aapt resource value: 0x7f0901bb
-			public const int menu_url = 2131296699;
-			
-			// aapt resource value: 0x7f0901bd
-			public const int minus = 2131296701;
-			
-			// aapt resource value: 0x7f0901be
-			public const int never = 2131296702;
-			
-			// aapt resource value: 0x7f0901c0
-			public const int no = 2131296704;
-			
-			// aapt resource value: 0x7f0901c1
-			public const int no_keys = 2131296705;
-			
-			// aapt resource value: 0x7f0901c2
-			public const int no_results = 2131296706;
-			
-			// aapt resource value: 0x7f090279
-			public const int no_thanks = 2131296889;
-			
-			// aapt resource value: 0x7f0901c3
-			public const int no_url_handler = 2131296707;
-			
-			// aapt resource value: 0x7f090160
-			public const int not_possible_im_picker = 2131296608;
+			// aapt resource value: 0x7f090129
+			public const int list_size_default = 2131296553;
 			
 			// aapt resource value: 0x7f090106
-			public const int oi_filemanager_market = 2131296518;
+			public const int list_size_key = 2131296518;
 			
-			// aapt resource value: 0x7f090107
-			public const int oi_filemanager_web = 2131296519;
+			// aapt resource value: 0x7f090199
+			public const int list_size_summary = 2131296665;
+			
+			// aapt resource value: 0x7f090198
+			public const int list_size_title = 2131296664;
+			
+			// aapt resource value: 0x7f09029d
+			public const int loading = 2131296925;
+			
+			// aapt resource value: 0x7f09019a
+			public const int loading_database = 2131296666;
+			
+			// aapt resource value: 0x7f09019b
+			public const int lowercase = 2131296667;
+			
+			// aapt resource value: 0x7f090104
+			public const int maskpass_key = 2131296516;
+			
+			// aapt resource value: 0x7f09019e
+			public const int maskpass_summary = 2131296670;
+			
+			// aapt resource value: 0x7f09019d
+			public const int maskpass_title = 2131296669;
+			
+			// aapt resource value: 0x7f0901be
+			public const int master_key_type = 2131296702;
+			
+			// aapt resource value: 0x7f090287
+			public const int master_password = 2131296903;
+			
+			// aapt resource value: 0x7f09019f
+			public const int menu_about = 2131296671;
+			
+			// aapt resource value: 0x7f0901a4
+			public const int menu_app_settings = 2131296676;
+			
+			// aapt resource value: 0x7f0901b1
+			public const int menu_change_db = 2131296689;
+			
+			// aapt resource value: 0x7f0901a0
+			public const int menu_change_key = 2131296672;
+			
+			// aapt resource value: 0x7f0901a1
+			public const int menu_copy_pass = 2131296673;
+			
+			// aapt resource value: 0x7f0901a2
+			public const int menu_copy_user = 2131296674;
+			
+			// aapt resource value: 0x7f0901a3
+			public const int menu_create = 2131296675;
+			
+			// aapt resource value: 0x7f0901a5
+			public const int menu_db_settings = 2131296677;
+			
+			// aapt resource value: 0x7f0901a6
+			public const int menu_delete = 2131296678;
+			
+			// aapt resource value: 0x7f0901a8
+			public const int menu_donate = 2131296680;
+			
+			// aapt resource value: 0x7f0901a9
+			public const int menu_edit = 2131296681;
+			
+			// aapt resource value: 0x7f0901aa
+			public const int menu_hide_password = 2131296682;
+			
+			// aapt resource value: 0x7f0902cd
+			public const int menu_homepage = 2131296973;
+			
+			// aapt resource value: 0x7f0901ab
+			public const int menu_lock = 2131296683;
+			
+			// aapt resource value: 0x7f0901a7
+			public const int menu_move = 2131296679;
+			
+			// aapt resource value: 0x7f0901ac
+			public const int menu_open = 2131296684;
+			
+			// aapt resource value: 0x7f0901ad
+			public const int menu_rename = 2131296685;
+			
+			// aapt resource value: 0x7f0901ae
+			public const int menu_search = 2131296686;
+			
+			// aapt resource value: 0x7f0901af
+			public const int menu_search_advanced = 2131296687;
+			
+			// aapt resource value: 0x7f0901b0
+			public const int menu_url = 2131296688;
+			
+			// aapt resource value: 0x7f0901b2
+			public const int minus = 2131296690;
+			
+			// aapt resource value: 0x7f0901b3
+			public const int never = 2131296691;
+			
+			// aapt resource value: 0x7f0901b5
+			public const int no = 2131296693;
+			
+			// aapt resource value: 0x7f0901b6
+			public const int no_keys = 2131296694;
+			
+			// aapt resource value: 0x7f0901b7
+			public const int no_results = 2131296695;
+			
+			// aapt resource value: 0x7f090270
+			public const int no_thanks = 2131296880;
+			
+			// aapt resource value: 0x7f0901b8
+			public const int no_url_handler = 2131296696;
+			
+			// aapt resource value: 0x7f090155
+			public const int not_possible_im_picker = 2131296597;
+			
+			// aapt resource value: 0x7f0900f9
+			public const int oi_filemanager_market = 2131296505;
+			
+			// aapt resource value: 0x7f0900fa
+			public const int oi_filemanager_web = 2131296506;
 			
 			// aapt resource value: 0x7f090082
 			public const int ok = 2131296386;
 			
-			// aapt resource value: 0x7f090278
-			public const int ok_donate = 2131296888;
+			// aapt resource value: 0x7f09026f
+			public const int ok_donate = 2131296879;
 			
-			// aapt resource value: 0x7f090112
-			public const int omitbackup_key = 2131296530;
+			// aapt resource value: 0x7f090105
+			public const int omitbackup_key = 2131296517;
 			
-			// aapt resource value: 0x7f0901c6
-			public const int omitbackup_summary = 2131296710;
+			// aapt resource value: 0x7f0901bb
+			public const int omitbackup_summary = 2131296699;
 			
-			// aapt resource value: 0x7f0901c5
-			public const int omitbackup_title = 2131296709;
+			// aapt resource value: 0x7f0901ba
+			public const int omitbackup_title = 2131296698;
 			
 			// aapt resource value: 0x7f0900a6
 			public const int open_entry = 2131296422;
@@ -5915,74 +5051,83 @@ namespace keepass2android
 			// aapt resource value: 0x7f0900a7
 			public const int open_entry_for_app = 2131296423;
 			
-			// aapt resource value: 0x7f0901c4
-			public const int open_recent = 2131296708;
+			// aapt resource value: 0x7f0901b9
+			public const int open_recent = 2131296697;
 			
 			// aapt resource value: 0x7f090089
 			public const int open_the_keyboard = 2131296393;
 			
-			// aapt resource value: 0x7f090271
-			public const int otp_aux_file = 2131296881;
+			// aapt resource value: 0x7f090268
+			public const int otp_aux_file = 2131296872;
 			
-			// aapt resource value: 0x7f09029f
-			public const int otp_discarded_because_db_open = 2131296927;
+			// aapt resource value: 0x7f090296
+			public const int otp_discarded_because_db_open = 2131296918;
 			
-			// aapt resource value: 0x7f09029d
-			public const int otp_discarded_because_no_db = 2131296925;
+			// aapt resource value: 0x7f090294
+			public const int otp_discarded_because_no_db = 2131296916;
 			
-			// aapt resource value: 0x7f09029e
-			public const int otp_discarded_no_space = 2131296926;
+			// aapt resource value: 0x7f090295
+			public const int otp_discarded_no_space = 2131296917;
 			
-			// aapt resource value: 0x7f090299
-			public const int otp_explanation = 2131296921;
+			// aapt resource value: 0x7f090290
+			public const int otp_explanation = 2131296912;
 			
-			// aapt resource value: 0x7f09029a
-			public const int otp_hint = 2131296922;
+			// aapt resource value: 0x7f090291
+			public const int otp_hint = 2131296913;
 			
-			// aapt resource value: 0x7f0902a0
-			public const int otps_pending = 2131296928;
+			// aapt resource value: 0x7f090297
+			public const int otps_pending = 2131296919;
+			
+			// aapt resource value: 0x7f090298
+			public const int otpsecret_hint = 2131296920;
+			
+			// aapt resource value: 0x7f0901bc
+			public const int pass_filename = 2131296700;
+			
+			// aapt resource value: 0x7f090149
+			public const int password_access_prefs = 2131296585;
+			
+			// aapt resource value: 0x7f090110
+			public const int password_access_prefs_key = 2131296528;
+			
+			// aapt resource value: 0x7f0901bd
+			public const int password_title = 2131296701;
+			
+			// aapt resource value: 0x7f0900fb
+			public const int permission_desc = 2131296507;
+			
+			// aapt resource value: 0x7f090156
+			public const int please_activate_keyboard = 2131296598;
+			
+			// aapt resource value: 0x7f0901e8
+			public const int please_note = 2131296744;
 			
 			// aapt resource value: 0x7f0902a1
-			public const int otpsecret_hint = 2131296929;
+			public const int plugin_author = 2131296929;
 			
-			// aapt resource value: 0x7f0901c7
-			public const int pass_filename = 2131296711;
+			// aapt resource value: 0x7f0902a0
+			public const int plugin_description = 2131296928;
 			
-			// aapt resource value: 0x7f090154
-			public const int password_access_prefs = 2131296596;
+			// aapt resource value: 0x7f0902a3
+			public const int plugin_disabled = 2131296931;
 			
-			// aapt resource value: 0x7f09011d
-			public const int password_access_prefs_key = 2131296541;
+			// aapt resource value: 0x7f0902a2
+			public const int plugin_enabled = 2131296930;
 			
-			// aapt resource value: 0x7f0901c8
-			public const int password_title = 2131296712;
+			// aapt resource value: 0x7f0902a5
+			public const int plugin_enabled_checkbox = 2131296933;
 			
-			// aapt resource value: 0x7f090108
-			public const int permission_desc = 2131296520;
+			// aapt resource value: 0x7f09029f
+			public const int plugin_packagename = 2131296927;
 			
-			// aapt resource value: 0x7f090161
-			public const int please_activate_keyboard = 2131296609;
+			// aapt resource value: 0x7f0902a4
+			public const int plugin_web = 2131296932;
 			
-			// aapt resource value: 0x7f0901f3
-			public const int please_note = 2131296755;
+			// aapt resource value: 0x7f09029e
+			public const int plugins = 2131296926;
 			
-			// aapt resource value: 0x7f0902ac
-			public const int plugin_author = 2131296940;
-			
-			// aapt resource value: 0x7f0902ab
-			public const int plugin_description = 2131296939;
-			
-			// aapt resource value: 0x7f0902ad
-			public const int plugin_enabled = 2131296941;
-			
-			// aapt resource value: 0x7f0902aa
-			public const int plugin_packagename = 2131296938;
-			
-			// aapt resource value: 0x7f0902a9
-			public const int plugins = 2131296937;
-			
-			// aapt resource value: 0x7f0902ae
-			public const int plugins_text = 2131296942;
+			// aapt resource value: 0x7f0902c1
+			public const int plugins_text = 2131296961;
 			
 			// aapt resource value: 0x7f09008d
 			public const int popular_domain_0 = 2131296397;
@@ -6044,14 +5189,14 @@ namespace keepass2android
 			// aapt resource value: 0x7f090051
 			public const int prefs_settings_key = 2131296337;
 			
-			// aapt resource value: 0x7f0901ca
-			public const int progress_create = 2131296714;
+			// aapt resource value: 0x7f0901bf
+			public const int progress_create = 2131296703;
 			
-			// aapt resource value: 0x7f0901cc
-			public const int progress_title = 2131296716;
+			// aapt resource value: 0x7f0901c1
+			public const int progress_title = 2131296705;
 			
-			// aapt resource value: 0x7f090221
-			public const int protection = 2131296801;
+			// aapt resource value: 0x7f090216
+			public const int protection = 2131296790;
 			
 			// aapt resource value: 0x7f09004b
 			public const int quick_fixes = 2131296331;
@@ -6059,74 +5204,74 @@ namespace keepass2android
 			// aapt resource value: 0x7f09004c
 			public const int quick_fixes_summary = 2131296332;
 			
-			// aapt resource value: 0x7f09024e
-			public const int rate_app = 2131296846;
+			// aapt resource value: 0x7f090245
+			public const int rate_app = 2131296837;
 			
-			// aapt resource value: 0x7f0901f5
-			public const int regular_expression = 2131296757;
+			// aapt resource value: 0x7f0901ea
+			public const int regular_expression = 2131296746;
 			
-			// aapt resource value: 0x7f0901cd
-			public const int remember_keyfile_summary = 2131296717;
+			// aapt resource value: 0x7f0901c2
+			public const int remember_keyfile_summary = 2131296706;
 			
-			// aapt resource value: 0x7f0901ce
-			public const int remember_keyfile_title = 2131296718;
+			// aapt resource value: 0x7f0901c3
+			public const int remember_keyfile_title = 2131296707;
 			
-			// aapt resource value: 0x7f0901cf
-			public const int remove_from_filelist = 2131296719;
+			// aapt resource value: 0x7f0901c4
+			public const int remove_from_filelist = 2131296708;
 			
-			// aapt resource value: 0x7f0901d0
-			public const int rijndael = 2131296720;
+			// aapt resource value: 0x7f0901c5
+			public const int rijndael = 2131296709;
 			
-			// aapt resource value: 0x7f0901d1
-			public const int root = 2131296721;
+			// aapt resource value: 0x7f0901c6
+			public const int root = 2131296710;
 			
-			// aapt resource value: 0x7f0901d2
-			public const int rounds = 2131296722;
+			// aapt resource value: 0x7f0901c7
+			public const int rounds = 2131296711;
 			
-			// aapt resource value: 0x7f0901d3
-			public const int rounds_explaination = 2131296723;
+			// aapt resource value: 0x7f0901c8
+			public const int rounds_explaination = 2131296712;
 			
-			// aapt resource value: 0x7f0901d4
-			public const int rounds_hint = 2131296724;
+			// aapt resource value: 0x7f0901c9
+			public const int rounds_hint = 2131296713;
 			
-			// aapt resource value: 0x7f09010f
-			public const int rounds_key = 2131296527;
+			// aapt resource value: 0x7f090102
+			public const int rounds_key = 2131296514;
+			
+			// aapt resource value: 0x7f0901cc
+			public const int saving_database = 2131296716;
+			
+			// aapt resource value: 0x7f0901d5
+			public const int search_hint = 2131296725;
 			
 			// aapt resource value: 0x7f0901d7
-			public const int saving_database = 2131296727;
+			public const int search_in = 2131296727;
 			
-			// aapt resource value: 0x7f0901e0
-			public const int search_hint = 2131296736;
+			// aapt resource value: 0x7f0901d0
+			public const int search_label = 2131296720;
 			
-			// aapt resource value: 0x7f0901e2
-			public const int search_in = 2131296738;
+			// aapt resource value: 0x7f0901f3
+			public const int search_options = 2131296755;
 			
-			// aapt resource value: 0x7f0901db
-			public const int search_label = 2131296731;
+			// aapt resource value: 0x7f0901d6
+			public const int search_results = 2131296726;
 			
-			// aapt resource value: 0x7f0901fe
-			public const int search_options = 2131296766;
+			// aapt resource value: 0x7f090147
+			public const int security_prefs = 2131296583;
 			
-			// aapt resource value: 0x7f0901e1
-			public const int search_results = 2131296737;
-			
-			// aapt resource value: 0x7f090152
-			public const int security_prefs = 2131296594;
-			
-			// aapt resource value: 0x7f09011e
-			public const int security_prefs_key = 2131296542;
+			// aapt resource value: 0x7f090111
+			public const int security_prefs_key = 2131296529;
 			
 			// aapt resource value: 0x7f090092
 			public const int selectInputMethod = 2131296402;
 			
-			// aapt resource value: 0x7f0901e4
-			public const int select_group_then_add = 2131296740;
+			// aapt resource value: 0x7f0901d9
+			public const int select_group_then_add = 2131296729;
 			
-			// aapt resource value: 0x7f0901e3
-			public const int select_other_entry = 2131296739;
+			// aapt resource value: 0x7f0901d8
+			public const int select_other_entry = 2131296728;
 			
-			// aapt resource value: 0x7f09027e
-			public const int select_storage_type = 2131296894;
+			// aapt resource value: 0x7f090275
+			public const int select_storage_type = 2131296885;
 			
 			// aapt resource value: 0x7f090030
 			public const int sentence_separators = 2131296304;
@@ -6149,23 +5294,23 @@ namespace keepass2android
 			// aapt resource value: 0x7f090052
 			public const int settings_key_mode_auto_name = 2131296338;
 			
-			// aapt resource value: 0x7f090148
-			public const int short_app_name = 2131296584;
+			// aapt resource value: 0x7f09013d
+			public const int short_app_name = 2131296573;
 			
-			// aapt resource value: 0x7f09014a
-			public const int short_app_name_nonet = 2131296586;
+			// aapt resource value: 0x7f09013f
+			public const int short_app_name_nonet = 2131296575;
 			
-			// aapt resource value: 0x7f09014e
-			public const int show_kill_app = 2131296590;
+			// aapt resource value: 0x7f090143
+			public const int show_kill_app = 2131296579;
 			
-			// aapt resource value: 0x7f09010c
-			public const int show_kill_app_key = 2131296524;
+			// aapt resource value: 0x7f0900ff
+			public const int show_kill_app_key = 2131296511;
 			
-			// aapt resource value: 0x7f09014f
-			public const int show_kill_app_summary = 2131296591;
+			// aapt resource value: 0x7f090144
+			public const int show_kill_app_summary = 2131296580;
 			
-			// aapt resource value: 0x7f0901dc
-			public const int show_password = 2131296732;
+			// aapt resource value: 0x7f0901d1
+			public const int show_password = 2131296721;
 			
 			// aapt resource value: 0x7f09004d
 			public const int show_suggestions = 2131296333;
@@ -6173,35 +5318,35 @@ namespace keepass2android
 			// aapt resource value: 0x7f09004e
 			public const int show_suggestions_summary = 2131296334;
 			
-			// aapt resource value: 0x7f0901de
-			public const int sort_db = 2131296734;
+			// aapt resource value: 0x7f0901d3
+			public const int sort_db = 2131296723;
 			
-			// aapt resource value: 0x7f090115
-			public const int sort_key = 2131296533;
+			// aapt resource value: 0x7f090108
+			public const int sort_key = 2131296520;
 			
-			// aapt resource value: 0x7f0901dd
-			public const int sort_name = 2131296733;
+			// aapt resource value: 0x7f0901d2
+			public const int sort_name = 2131296722;
 			
 			// aapt resource value: 0x7f090039
 			public const int sound_on_keypress = 2131296313;
 			
-			// aapt resource value: 0x7f0901da
-			public const int space = 2131296730;
+			// aapt resource value: 0x7f0901cf
+			public const int space = 2131296719;
 			
-			// aapt resource value: 0x7f0901df
-			public const int special = 2131296735;
+			// aapt resource value: 0x7f0901d4
+			public const int special = 2131296724;
 			
-			// aapt resource value: 0x7f090201
-			public const int start_create = 2131296769;
+			// aapt resource value: 0x7f0901f6
+			public const int start_create = 2131296758;
 			
-			// aapt resource value: 0x7f090203
-			public const int start_create_import = 2131296771;
+			// aapt resource value: 0x7f0901f8
+			public const int start_create_import = 2131296760;
 			
-			// aapt resource value: 0x7f090200
-			public const int start_open_file = 2131296768;
+			// aapt resource value: 0x7f0901f5
+			public const int start_open_file = 2131296757;
 			
-			// aapt resource value: 0x7f090202
-			public const int start_open_url = 2131296770;
+			// aapt resource value: 0x7f0901f7
+			public const int start_open_url = 2131296759;
 			
 			// aapt resource value: 0x7f0900a1
 			public const int subtype_mode_keyboard = 2131296417;
@@ -6209,14 +5354,14 @@ namespace keepass2android
 			// aapt resource value: 0x7f0900a2
 			public const int subtype_mode_voice = 2131296418;
 			
-			// aapt resource value: 0x7f09024d
-			public const int suggest_improvements = 2131296845;
+			// aapt resource value: 0x7f090244
+			public const int suggest_improvements = 2131296836;
 			
 			// aapt resource value: 0x7f090031
 			public const int suggested_punctuations = 2131296305;
 			
-			// aapt resource value: 0x7f090273
-			public const int synchronize_database_menu = 2131296883;
+			// aapt resource value: 0x7f09026a
+			public const int synchronize_database_menu = 2131296874;
 			
 			// aapt resource value: 0x7f09005d
 			public const int tip_access_symbols = 2131296349;
@@ -6257,29 +5402,29 @@ namespace keepass2android
 			// aapt resource value: 0x7f090060
 			public const int touch_to_finish = 2131296352;
 			
-			// aapt resource value: 0x7f09024f
-			public const int translate_app = 2131296847;
+			// aapt resource value: 0x7f090246
+			public const int translate_app = 2131296838;
 			
-			// aapt resource value: 0x7f0901e6
-			public const int twofish = 2131296742;
+			// aapt resource value: 0x7f0901db
+			public const int twofish = 2131296731;
 			
-			// aapt resource value: 0x7f0901e7
-			public const int underline = 2131296743;
+			// aapt resource value: 0x7f0901dc
+			public const int underline = 2131296732;
 			
-			// aapt resource value: 0x7f0901e8
-			public const int unsupported_db_version = 2131296744;
+			// aapt resource value: 0x7f0901dd
+			public const int unsupported_db_version = 2131296733;
 			
-			// aapt resource value: 0x7f0901e9
-			public const int uppercase = 2131296745;
+			// aapt resource value: 0x7f0901de
+			public const int uppercase = 2131296734;
 			
-			// aapt resource value: 0x7f090296
-			public const int use_key_file = 2131296918;
+			// aapt resource value: 0x7f09028d
+			public const int use_key_file = 2131296909;
 			
-			// aapt resource value: 0x7f0901ed
-			public const int version_history = 2131296749;
+			// aapt resource value: 0x7f0901e2
+			public const int version_history = 2131296738;
 			
-			// aapt resource value: 0x7f0901ec
-			public const int version_label = 2131296748;
+			// aapt resource value: 0x7f0901e1
+			public const int version_label = 2131296737;
 			
 			// aapt resource value: 0x7f090038
 			public const int vibrate_on_keypress = 2131296312;
@@ -6350,17 +5495,17 @@ namespace keepass2android
 			// aapt resource value: 0x7f090075
 			public const int voice_working = 2131296373;
 			
-			// aapt resource value: 0x7f0901ea
-			public const int warning_read_only = 2131296746;
+			// aapt resource value: 0x7f0901df
+			public const int warning_read_only = 2131296735;
 			
-			// aapt resource value: 0x7f0901eb
-			public const int warning_unmounted = 2131296747;
+			// aapt resource value: 0x7f0901e0
+			public const int warning_unmounted = 2131296736;
 			
 			// aapt resource value: 0x7f09002f
 			public const int word_separators = 2131296303;
 			
-			// aapt resource value: 0x7f0901bf
-			public const int yes = 2131296703;
+			// aapt resource value: 0x7f0901b4
+			public const int yes = 2131296692;
 			
 			static String()
 			{
@@ -6375,125 +5520,125 @@ namespace keepass2android
 		public partial class Style
 		{
 			
-			// aapt resource value: 0x7f0e0082
-			public const int AOSP_DialogWindowTitle = 2131624066;
+			// aapt resource value: 0x7f0e0003
+			public const int AOSP_DialogWindowTitle = 2131623939;
 			
-			// aapt resource value: 0x7f0e00bd
-			public const int AdditionalStringLayout = 2131624125;
+			// aapt resource value: 0x7f0e003b
+			public const int AdditionalStringLayout = 2131623995;
 			
-			// aapt resource value: 0x7f0e008f
-			public const int Afc_BaseTheme_Dark = 2131624079;
+			// aapt resource value: 0x7f0e0010
+			public const int Afc_BaseTheme_Dark = 2131623952;
 			
-			// aapt resource value: 0x7f0e0091
-			public const int Afc_BaseTheme_Dialog_Dark = 2131624081;
+			// aapt resource value: 0x7f0e0012
+			public const int Afc_BaseTheme_Dialog_Dark = 2131623954;
 			
-			// aapt resource value: 0x7f0e0097
-			public const int Afc_BaseTheme_Dialog_Light = 2131624087;
+			// aapt resource value: 0x7f0e0018
+			public const int Afc_BaseTheme_Dialog_Light = 2131623960;
 			
-			// aapt resource value: 0x7f0e0095
-			public const int Afc_BaseTheme_Light = 2131624085;
+			// aapt resource value: 0x7f0e0016
+			public const int Afc_BaseTheme_Light = 2131623958;
 			
-			// aapt resource value: 0x7f0e009a
-			public const int Afc_BaseTheme_Light_DarkActionBar = 2131624090;
+			// aapt resource value: 0x7f0e001b
+			public const int Afc_BaseTheme_Light_DarkActionBar = 2131623963;
 			
-			// aapt resource value: 0x7f0e0090
-			public const int Afc_BaseThemeHelper_Dark = 2131624080;
+			// aapt resource value: 0x7f0e0011
+			public const int Afc_BaseThemeHelper_Dark = 2131623953;
 			
-			// aapt resource value: 0x7f0e0092
-			public const int Afc_BaseThemeHelper_Dialog_Dark = 2131624082;
+			// aapt resource value: 0x7f0e0013
+			public const int Afc_BaseThemeHelper_Dialog_Dark = 2131623955;
 			
-			// aapt resource value: 0x7f0e0098
-			public const int Afc_BaseThemeHelper_Dialog_Light = 2131624088;
+			// aapt resource value: 0x7f0e0019
+			public const int Afc_BaseThemeHelper_Dialog_Light = 2131623961;
 			
-			// aapt resource value: 0x7f0e0096
-			public const int Afc_BaseThemeHelper_Light = 2131624086;
+			// aapt resource value: 0x7f0e0017
+			public const int Afc_BaseThemeHelper_Light = 2131623959;
 			
-			// aapt resource value: 0x7f0e009b
-			public const int Afc_BaseThemeHelper_Light_DarkActionBar = 2131624091;
+			// aapt resource value: 0x7f0e001c
+			public const int Afc_BaseThemeHelper_Light_DarkActionBar = 2131623964;
 			
-			// aapt resource value: 0x7f0e0093
-			public const int Afc_Theme_Dark = 2131624083;
+			// aapt resource value: 0x7f0e0014
+			public const int Afc_Theme_Dark = 2131623956;
 			
-			// aapt resource value: 0x7f0e0094
-			public const int Afc_Theme_Dialog_Dark = 2131624084;
+			// aapt resource value: 0x7f0e0015
+			public const int Afc_Theme_Dialog_Dark = 2131623957;
 			
-			// aapt resource value: 0x7f0e009d
-			public const int Afc_Theme_Dialog_Light = 2131624093;
+			// aapt resource value: 0x7f0e001e
+			public const int Afc_Theme_Dialog_Light = 2131623966;
 			
-			// aapt resource value: 0x7f0e0099
-			public const int Afc_Theme_Light = 2131624089;
+			// aapt resource value: 0x7f0e001a
+			public const int Afc_Theme_Light = 2131623962;
 			
-			// aapt resource value: 0x7f0e009c
-			public const int Afc_Theme_Light_DarkActionBar = 2131624092;
+			// aapt resource value: 0x7f0e001d
+			public const int Afc_Theme_Light_DarkActionBar = 2131623965;
 			
-			// aapt resource value: 0x7f0e009e
-			public const int Base = 2131624094;
+			// aapt resource value: 0x7f0e001f
+			public const int Base = 2131623967;
 			
-			// aapt resource value: 0x7f0e00be
-			public const int BaseDark = 2131624126;
+			// aapt resource value: 0x7f0e003f
+			public const int BaseDark = 2131623999;
 			
-			// aapt resource value: 0x7f0e00c0
-			public const int BaseDark_Dialog = 2131624128;
+			// aapt resource value: 0x7f0e0041
+			public const int BaseDark_Dialog = 2131624001;
 			
-			// aapt resource value: 0x7f0e00c3
-			public const int BaseLight = 2131624131;
+			// aapt resource value: 0x7f0e0044
+			public const int BaseLight = 2131624004;
 			
-			// aapt resource value: 0x7f0e00c5
-			public const int BaseLight_Dialog = 2131624133;
+			// aapt resource value: 0x7f0e0046
+			public const int BaseLight_Dialog = 2131624006;
 			
-			// aapt resource value: 0x7f0e00b5
-			public const int BottomBarActionButton = 2131624117;
+			// aapt resource value: 0x7f0e0032
+			public const int BottomBarActionButton = 2131623986;
 			
-			// aapt resource value: 0x7f0e00a0
-			public const int Dialog = 2131624096;
+			// aapt resource value: 0x7f0e0021
+			public const int Dialog = 2131623969;
 			
-			// aapt resource value: 0x7f0e00c1
-			public const int DialogDark = 2131624129;
+			// aapt resource value: 0x7f0e0042
+			public const int DialogDark = 2131624002;
 			
-			// aapt resource value: 0x7f0e00c6
-			public const int DialogLight = 2131624134;
+			// aapt resource value: 0x7f0e0047
+			public const int DialogLight = 2131624007;
 			
-			// aapt resource value: 0x7f0e00b1
-			public const int EditEntryButton = 2131624113;
+			// aapt resource value: 0x7f0e003a
+			public const int EditEntryButton = 2131623994;
 			
-			// aapt resource value: 0x7f0e00a5
-			public const int ElementText = 2131624101;
+			// aapt resource value: 0x7f0e0026
+			public const int ElementText = 2131623974;
 			
-			// aapt resource value: 0x7f0e00a6
-			public const int ElementTextLarge = 2131624102;
+			// aapt resource value: 0x7f0e0027
+			public const int ElementTextLarge = 2131623975;
 			
-			// aapt resource value: 0x7f0e00a4
-			public const int ElementTextSmall = 2131624100;
+			// aapt resource value: 0x7f0e0025
+			public const int ElementTextSmall = 2131623973;
 			
-			// aapt resource value: 0x7f0e00ad
-			public const int ElementTextTitle = 2131624109;
+			// aapt resource value: 0x7f0e002d
+			public const int ElementTextTitle = 2131623981;
 			
-			// aapt resource value: 0x7f0e00ac
-			public const int EntryFieldHeader = 2131624108;
+			// aapt resource value: 0x7f0e0030
+			public const int EntryFieldHeader = 2131623984;
 			
-			// aapt resource value: 0x7f0e00ae
-			public const int EntryItem = 2131624110;
+			// aapt resource value: 0x7f0e002e
+			public const int EntryItem = 2131623982;
 			
-			// aapt resource value: 0x7f0e00b2
-			public const int ExtraFieldHeader = 2131624114;
+			// aapt resource value: 0x7f0e003c
+			public const int ExtraFieldHeader = 2131623996;
 			
-			// aapt resource value: 0x7f0e00a9
-			public const int GroupAndEntryHeader = 2131624105;
+			// aapt resource value: 0x7f0e002a
+			public const int GroupAndEntryHeader = 2131623978;
 			
-			// aapt resource value: 0x7f0e00a7
-			public const int GroupLabel = 2131624103;
+			// aapt resource value: 0x7f0e0028
+			public const int GroupLabel = 2131623976;
 			
-			// aapt resource value: 0x7f0e00a2
-			public const int GroupText = 2131624098;
+			// aapt resource value: 0x7f0e0023
+			public const int GroupText = 2131623971;
 			
-			// aapt resource value: 0x7f0e00a3
-			public const int GroupTextLarge = 2131624099;
+			// aapt resource value: 0x7f0e0024
+			public const int GroupTextLarge = 2131623972;
 			
-			// aapt resource value: 0x7f0e00a1
-			public const int GroupTextSmall = 2131624097;
+			// aapt resource value: 0x7f0e0022
+			public const int GroupTextSmall = 2131623970;
 			
-			// aapt resource value: 0x7f0e00b0
-			public const int InfoHeader = 2131624112;
+			// aapt resource value: 0x7f0e0031
+			public const int InfoHeader = 2131623985;
 			
 			// aapt resource value: 0x7f0e0001
 			public const int KeyPreviewAnimation = 2131623937;
@@ -6504,476 +5649,95 @@ namespace keepass2android
 			// aapt resource value: 0x7f0e0002
 			public const int MiniKeyboardAnimation = 2131623938;
 			
-			// aapt resource value: 0x7f0e00af
-			public const int MinusButton = 2131624111;
-			
-			// aapt resource value: 0x7f0e009f
-			public const int NoTitleBar = 2131624095;
-			
-			// aapt resource value: 0x7f0e00bf
-			public const int NoTitleBarDark = 2131624127;
-			
-			// aapt resource value: 0x7f0e00c4
-			public const int NoTitleBarLight = 2131624132;
-			
-			// aapt resource value: 0x7f0e00b3
-			public const int PaddedContainer = 2131624115;
-			
-			// aapt resource value: 0x7f0e00b4
-			public const int PaddedElement = 2131624116;
-			
-			// aapt resource value: 0x7f0e0064
-			public const int TextAppearance_AppCompat_Base_CompactMenu_Dialog = 2131624036;
-			
-			// aapt resource value: 0x7f0e006c
-			public const int TextAppearance_AppCompat_Base_SearchResult = 2131624044;
-			
-			// aapt resource value: 0x7f0e006e
-			public const int TextAppearance_AppCompat_Base_SearchResult_Subtitle = 2131624046;
-			
-			// aapt resource value: 0x7f0e006d
-			public const int TextAppearance_AppCompat_Base_SearchResult_Title = 2131624045;
-			
-			// aapt resource value: 0x7f0e0068
-			public const int TextAppearance_AppCompat_Base_Widget_PopupMenu_Large = 2131624040;
-			
-			// aapt resource value: 0x7f0e0069
-			public const int TextAppearance_AppCompat_Base_Widget_PopupMenu_Small = 2131624041;
-			
-			// aapt resource value: 0x7f0e006f
-			public const int TextAppearance_AppCompat_Light_Base_SearchResult = 2131624047;
-			
-			// aapt resource value: 0x7f0e0071
-			public const int TextAppearance_AppCompat_Light_Base_SearchResult_Subtitle = 2131624049;
-			
-			// aapt resource value: 0x7f0e0070
-			public const int TextAppearance_AppCompat_Light_Base_SearchResult_Title = 2131624048;
-			
-			// aapt resource value: 0x7f0e006a
-			public const int TextAppearance_AppCompat_Light_Base_Widget_PopupMenu_Large = 2131624042;
-			
-			// aapt resource value: 0x7f0e006b
-			public const int TextAppearance_AppCompat_Light_Base_Widget_PopupMenu_Small = 2131624043;
-			
-			// aapt resource value: 0x7f0e0036
-			public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131623990;
-			
-			// aapt resource value: 0x7f0e0035
-			public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131623989;
-			
-			// aapt resource value: 0x7f0e0031
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623985;
-			
-			// aapt resource value: 0x7f0e0032
-			public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623986;
-			
-			// aapt resource value: 0x7f0e0034
-			public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131623988;
-			
-			// aapt resource value: 0x7f0e0033
-			public const int TextAppearance_AppCompat_SearchResult_Title = 2131623987;
-			
-			// aapt resource value: 0x7f0e001d
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623965;
-			
-			// aapt resource value: 0x7f0e0009
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623945;
-			
-			// aapt resource value: 0x7f0e000b
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623947;
-			
-			// aapt resource value: 0x7f0e0008
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623944;
-			
-			// aapt resource value: 0x7f0e000a
-			public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623946;
-			
-			// aapt resource value: 0x7f0e0021
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623969;
-			
-			// aapt resource value: 0x7f0e0023
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131623971;
+			// aapt resource value: 0x7f0e002f
+			public const int MinusButton = 2131623983;
 			
 			// aapt resource value: 0x7f0e0020
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623968;
-			
-			// aapt resource value: 0x7f0e0022
-			public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131623970;
-			
-			// aapt resource value: 0x7f0e0055
-			public const int TextAppearance_AppCompat_Widget_Base_ActionBar_Menu = 2131624021;
-			
-			// aapt resource value: 0x7f0e0057
-			public const int TextAppearance_AppCompat_Widget_Base_ActionBar_Subtitle = 2131624023;
-			
-			// aapt resource value: 0x7f0e0059
-			public const int TextAppearance_AppCompat_Widget_Base_ActionBar_Subtitle_Inverse = 2131624025;
-			
-			// aapt resource value: 0x7f0e0056
-			public const int TextAppearance_AppCompat_Widget_Base_ActionBar_Title = 2131624022;
-			
-			// aapt resource value: 0x7f0e0058
-			public const int TextAppearance_AppCompat_Widget_Base_ActionBar_Title_Inverse = 2131624024;
-			
-			// aapt resource value: 0x7f0e0052
-			public const int TextAppearance_AppCompat_Widget_Base_ActionMode_Subtitle = 2131624018;
-			
-			// aapt resource value: 0x7f0e0054
-			public const int TextAppearance_AppCompat_Widget_Base_ActionMode_Subtitle_Inverse = 2131624020;
-			
-			// aapt resource value: 0x7f0e0051
-			public const int TextAppearance_AppCompat_Widget_Base_ActionMode_Title = 2131624017;
-			
-			// aapt resource value: 0x7f0e0053
-			public const int TextAppearance_AppCompat_Widget_Base_ActionMode_Title_Inverse = 2131624019;
-			
-			// aapt resource value: 0x7f0e0062
-			public const int TextAppearance_AppCompat_Widget_Base_DropDownItem = 2131624034;
-			
-			// aapt resource value: 0x7f0e0024
-			public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131623972;
-			
-			// aapt resource value: 0x7f0e002f
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623983;
-			
-			// aapt resource value: 0x7f0e0030
-			public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623984;
-			
-			// aapt resource value: 0x7f0e0063
-			public const int TextAppearance_Widget_AppCompat_Base_ExpandedMenu_Item = 2131624035;
-			
-			// aapt resource value: 0x7f0e002b
-			public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623979;
-			
-			// aapt resource value: 0x7f0e00b8
-			public const int TextAppearance_EditEntry = 2131624120;
-			
-			// aapt resource value: 0x7f0e00b7
-			public const int TextAppearance_EditEntry_LabelSmall = 2131624119;
-			
-			// aapt resource value: 0x7f0e00b6
-			public const int TextAppearance_EditEntry_Small = 2131624118;
-			
-			// aapt resource value: 0x7f0e00b9
-			public const int TextAppearance_EditEntry_Value = 2131624121;
-			
-			// aapt resource value: 0x7f0e00bc
-			public const int TextAppearance_Help = 2131624124;
-			
-			// aapt resource value: 0x7f0e00ba
-			public const int TextAppearance_SmallHeading = 2131624122;
-			
-			// aapt resource value: 0x7f0e00bb
-			public const int TextAppearance_SubElement = 2131624123;
-			
-			// aapt resource value: 0x7f0e0076
-			public const int Theme_AppCompat = 2131624054;
-			
-			// aapt resource value: 0x7f0e0080
-			public const int Theme_AppCompat_Base_CompactMenu = 2131624064;
-			
-			// aapt resource value: 0x7f0e0081
-			public const int Theme_AppCompat_Base_CompactMenu_Dialog = 2131624065;
-			
-			// aapt resource value: 0x7f0e0079
-			public const int Theme_AppCompat_CompactMenu = 2131624057;
-			
-			// aapt resource value: 0x7f0e007a
-			public const int Theme_AppCompat_CompactMenu_Dialog = 2131624058;
-			
-			// aapt resource value: 0x7f0e0077
-			public const int Theme_AppCompat_Light = 2131624055;
-			
-			// aapt resource value: 0x7f0e0078
-			public const int Theme_AppCompat_Light_DarkActionBar = 2131624056;
-			
-			// aapt resource value: 0x7f0e007b
-			public const int Theme_Base = 2131624059;
-			
-			// aapt resource value: 0x7f0e007d
-			public const int Theme_Base_AppCompat = 2131624061;
-			
-			// aapt resource value: 0x7f0e007e
-			public const int Theme_Base_AppCompat_Light = 2131624062;
-			
-			// aapt resource value: 0x7f0e007f
-			public const int Theme_Base_AppCompat_Light_DarkActionBar = 2131624063;
-			
-			// aapt resource value: 0x7f0e007c
-			public const int Theme_Base_Light = 2131624060;
-			
-			// aapt resource value: 0x7f0e00c2
-			public const int ThemeDark = 2131624130;
-			
-			// aapt resource value: 0x7f0e00c7
-			public const int ThemeLight = 2131624135;
-			
-			// aapt resource value: 0x7f0e00a8
-			public const int WhiteOnBlack = 2131624104;
-			
-			// aapt resource value: 0x7f0e00aa
-			public const int WhiteOnBlackSmall = 2131624106;
-			
-			// aapt resource value: 0x7f0e00ab
-			public const int WhiteOnDarkSmall = 2131624107;
-			
-			// aapt resource value: 0x7f0e0003
-			public const int Widget_AppCompat_ActionBar = 2131623939;
-			
-			// aapt resource value: 0x7f0e0005
-			public const int Widget_AppCompat_ActionBar_Solid = 2131623941;
-			
-			// aapt resource value: 0x7f0e0014
-			public const int Widget_AppCompat_ActionBar_TabBar = 2131623956;
-			
-			// aapt resource value: 0x7f0e001a
-			public const int Widget_AppCompat_ActionBar_TabText = 2131623962;
-			
-			// aapt resource value: 0x7f0e0017
-			public const int Widget_AppCompat_ActionBar_TabView = 2131623959;
-			
-			// aapt resource value: 0x7f0e000e
-			public const int Widget_AppCompat_ActionButton = 2131623950;
-			
-			// aapt resource value: 0x7f0e0010
-			public const int Widget_AppCompat_ActionButton_CloseMode = 2131623952;
-			
-			// aapt resource value: 0x7f0e0012
-			public const int Widget_AppCompat_ActionButton_Overflow = 2131623954;
-			
-			// aapt resource value: 0x7f0e001e
-			public const int Widget_AppCompat_ActionMode = 2131623966;
-			
-			// aapt resource value: 0x7f0e0039
-			public const int Widget_AppCompat_ActivityChooserView = 2131623993;
-			
-			// aapt resource value: 0x7f0e0037
-			public const int Widget_AppCompat_AutoCompleteTextView = 2131623991;
-			
-			// aapt resource value: 0x7f0e003b
-			public const int Widget_AppCompat_Base_ActionBar = 2131623995;
-			
-			// aapt resource value: 0x7f0e003d
-			public const int Widget_AppCompat_Base_ActionBar_Solid = 2131623997;
-			
-			// aapt resource value: 0x7f0e0046
-			public const int Widget_AppCompat_Base_ActionBar_TabBar = 2131624006;
-			
-			// aapt resource value: 0x7f0e004c
-			public const int Widget_AppCompat_Base_ActionBar_TabText = 2131624012;
-			
-			// aapt resource value: 0x7f0e0049
-			public const int Widget_AppCompat_Base_ActionBar_TabView = 2131624009;
+			public const int NoTitleBar = 2131623968;
 			
 			// aapt resource value: 0x7f0e0040
-			public const int Widget_AppCompat_Base_ActionButton = 2131624000;
-			
-			// aapt resource value: 0x7f0e0042
-			public const int Widget_AppCompat_Base_ActionButton_CloseMode = 2131624002;
-			
-			// aapt resource value: 0x7f0e0044
-			public const int Widget_AppCompat_Base_ActionButton_Overflow = 2131624004;
-			
-			// aapt resource value: 0x7f0e004f
-			public const int Widget_AppCompat_Base_ActionMode = 2131624015;
-			
-			// aapt resource value: 0x7f0e0074
-			public const int Widget_AppCompat_Base_ActivityChooserView = 2131624052;
-			
-			// aapt resource value: 0x7f0e0072
-			public const int Widget_AppCompat_Base_AutoCompleteTextView = 2131624050;
-			
-			// aapt resource value: 0x7f0e005e
-			public const int Widget_AppCompat_Base_DropDownItem_Spinner = 2131624030;
-			
-			// aapt resource value: 0x7f0e0060
-			public const int Widget_AppCompat_Base_ListView_DropDown = 2131624032;
-			
-			// aapt resource value: 0x7f0e0065
-			public const int Widget_AppCompat_Base_ListView_Menu = 2131624037;
-			
-			// aapt resource value: 0x7f0e0066
-			public const int Widget_AppCompat_Base_PopupMenu = 2131624038;
-			
-			// aapt resource value: 0x7f0e005b
-			public const int Widget_AppCompat_Base_ProgressBar = 2131624027;
-			
-			// aapt resource value: 0x7f0e005a
-			public const int Widget_AppCompat_Base_ProgressBar_Horizontal = 2131624026;
-			
-			// aapt resource value: 0x7f0e005c
-			public const int Widget_AppCompat_Base_Spinner = 2131624028;
-			
-			// aapt resource value: 0x7f0e0027
-			public const int Widget_AppCompat_DropDownItem_Spinner = 2131623975;
-			
-			// aapt resource value: 0x7f0e0004
-			public const int Widget_AppCompat_Light_ActionBar = 2131623940;
-			
-			// aapt resource value: 0x7f0e0006
-			public const int Widget_AppCompat_Light_ActionBar_Solid = 2131623942;
-			
-			// aapt resource value: 0x7f0e0007
-			public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131623943;
-			
-			// aapt resource value: 0x7f0e0015
-			public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131623957;
-			
-			// aapt resource value: 0x7f0e0016
-			public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131623958;
-			
-			// aapt resource value: 0x7f0e001b
-			public const int Widget_AppCompat_Light_ActionBar_TabText = 2131623963;
-			
-			// aapt resource value: 0x7f0e001c
-			public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131623964;
-			
-			// aapt resource value: 0x7f0e0018
-			public const int Widget_AppCompat_Light_ActionBar_TabView = 2131623960;
-			
-			// aapt resource value: 0x7f0e0019
-			public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131623961;
-			
-			// aapt resource value: 0x7f0e000f
-			public const int Widget_AppCompat_Light_ActionButton = 2131623951;
-			
-			// aapt resource value: 0x7f0e0011
-			public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131623953;
-			
-			// aapt resource value: 0x7f0e0013
-			public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131623955;
-			
-			// aapt resource value: 0x7f0e001f
-			public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131623967;
-			
-			// aapt resource value: 0x7f0e003a
-			public const int Widget_AppCompat_Light_ActivityChooserView = 2131623994;
-			
-			// aapt resource value: 0x7f0e0038
-			public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131623992;
-			
-			// aapt resource value: 0x7f0e003c
-			public const int Widget_AppCompat_Light_Base_ActionBar = 2131623996;
-			
-			// aapt resource value: 0x7f0e003e
-			public const int Widget_AppCompat_Light_Base_ActionBar_Solid = 2131623998;
-			
-			// aapt resource value: 0x7f0e003f
-			public const int Widget_AppCompat_Light_Base_ActionBar_Solid_Inverse = 2131623999;
-			
-			// aapt resource value: 0x7f0e0047
-			public const int Widget_AppCompat_Light_Base_ActionBar_TabBar = 2131624007;
-			
-			// aapt resource value: 0x7f0e0048
-			public const int Widget_AppCompat_Light_Base_ActionBar_TabBar_Inverse = 2131624008;
-			
-			// aapt resource value: 0x7f0e004d
-			public const int Widget_AppCompat_Light_Base_ActionBar_TabText = 2131624013;
-			
-			// aapt resource value: 0x7f0e004e
-			public const int Widget_AppCompat_Light_Base_ActionBar_TabText_Inverse = 2131624014;
-			
-			// aapt resource value: 0x7f0e004a
-			public const int Widget_AppCompat_Light_Base_ActionBar_TabView = 2131624010;
-			
-			// aapt resource value: 0x7f0e004b
-			public const int Widget_AppCompat_Light_Base_ActionBar_TabView_Inverse = 2131624011;
-			
-			// aapt resource value: 0x7f0e0041
-			public const int Widget_AppCompat_Light_Base_ActionButton = 2131624001;
-			
-			// aapt resource value: 0x7f0e0043
-			public const int Widget_AppCompat_Light_Base_ActionButton_CloseMode = 2131624003;
+			public const int NoTitleBarDark = 2131624000;
 			
 			// aapt resource value: 0x7f0e0045
-			public const int Widget_AppCompat_Light_Base_ActionButton_Overflow = 2131624005;
+			public const int NoTitleBarLight = 2131624005;
 			
-			// aapt resource value: 0x7f0e0050
-			public const int Widget_AppCompat_Light_Base_ActionMode_Inverse = 2131624016;
+			// aapt resource value: 0x7f0e003d
+			public const int PaddedContainer = 2131623997;
 			
-			// aapt resource value: 0x7f0e0075
-			public const int Widget_AppCompat_Light_Base_ActivityChooserView = 2131624053;
+			// aapt resource value: 0x7f0e003e
+			public const int PaddedElement = 2131623998;
 			
-			// aapt resource value: 0x7f0e0073
-			public const int Widget_AppCompat_Light_Base_AutoCompleteTextView = 2131624051;
+			// aapt resource value: 0x7f0e0035
+			public const int TextAppearance_EditEntry = 2131623989;
 			
-			// aapt resource value: 0x7f0e005f
-			public const int Widget_AppCompat_Light_Base_DropDownItem_Spinner = 2131624031;
+			// aapt resource value: 0x7f0e0034
+			public const int TextAppearance_EditEntry_LabelSmall = 2131623988;
 			
-			// aapt resource value: 0x7f0e0061
-			public const int Widget_AppCompat_Light_Base_ListView_DropDown = 2131624033;
+			// aapt resource value: 0x7f0e0033
+			public const int TextAppearance_EditEntry_Small = 2131623987;
 			
-			// aapt resource value: 0x7f0e0067
-			public const int Widget_AppCompat_Light_Base_PopupMenu = 2131624039;
+			// aapt resource value: 0x7f0e0036
+			public const int TextAppearance_EditEntry_Value = 2131623990;
 			
-			// aapt resource value: 0x7f0e005d
-			public const int Widget_AppCompat_Light_Base_Spinner = 2131624029;
+			// aapt resource value: 0x7f0e0039
+			public const int TextAppearance_Help = 2131623993;
 			
-			// aapt resource value: 0x7f0e0028
-			public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131623976;
+			// aapt resource value: 0x7f0e0037
+			public const int TextAppearance_SmallHeading = 2131623991;
 			
-			// aapt resource value: 0x7f0e002a
-			public const int Widget_AppCompat_Light_ListView_DropDown = 2131623978;
+			// aapt resource value: 0x7f0e0038
+			public const int TextAppearance_SubElement = 2131623992;
 			
-			// aapt resource value: 0x7f0e002d
-			public const int Widget_AppCompat_Light_PopupMenu = 2131623981;
+			// aapt resource value: 0x7f0e0043
+			public const int ThemeDark = 2131624003;
 			
-			// aapt resource value: 0x7f0e0026
-			public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131623974;
+			// aapt resource value: 0x7f0e0048
+			public const int ThemeLight = 2131624008;
 			
 			// aapt resource value: 0x7f0e0029
-			public const int Widget_AppCompat_ListView_DropDown = 2131623977;
+			public const int WhiteOnBlack = 2131623977;
 			
-			// aapt resource value: 0x7f0e002e
-			public const int Widget_AppCompat_ListView_Menu = 2131623982;
+			// aapt resource value: 0x7f0e002b
+			public const int WhiteOnBlackSmall = 2131623979;
 			
 			// aapt resource value: 0x7f0e002c
-			public const int Widget_AppCompat_PopupMenu = 2131623980;
+			public const int WhiteOnDarkSmall = 2131623980;
+			
+			// aapt resource value: 0x7f0e0007
+			public const int afc_action_navi = 2131623943;
+			
+			// aapt resource value: 0x7f0e0008
+			public const int afc_action_navi_left = 2131623944;
+			
+			// aapt resource value: 0x7f0e0009
+			public const int afc_action_navi_right = 2131623945;
+			
+			// aapt resource value: 0x7f0e000a
+			public const int afc_base_button_location = 2131623946;
+			
+			// aapt resource value: 0x7f0e000b
+			public const int afc_button_location = 2131623947;
+			
+			// aapt resource value: 0x7f0e000e
+			public const int afc_button_sort = 2131623950;
+			
+			// aapt resource value: 0x7f0e000f
+			public const int afc_home_button_navigators = 2131623951;
+			
+			// aapt resource value: 0x7f0e0004
+			public const int afc_main_button_navi = 2131623940;
+			
+			// aapt resource value: 0x7f0e0005
+			public const int afc_main_button_navi_left = 2131623941;
+			
+			// aapt resource value: 0x7f0e0006
+			public const int afc_main_button_navi_right = 2131623942;
 			
 			// aapt resource value: 0x7f0e000d
-			public const int Widget_AppCompat_ProgressBar = 2131623949;
+			public const int afc_widget_search_view_button_clear = 2131623949;
 			
 			// aapt resource value: 0x7f0e000c
-			public const int Widget_AppCompat_ProgressBar_Horizontal = 2131623948;
-			
-			// aapt resource value: 0x7f0e0025
-			public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131623973;
-			
-			// aapt resource value: 0x7f0e0086
-			public const int afc_action_navi = 2131624070;
-			
-			// aapt resource value: 0x7f0e0087
-			public const int afc_action_navi_left = 2131624071;
-			
-			// aapt resource value: 0x7f0e0088
-			public const int afc_action_navi_right = 2131624072;
-			
-			// aapt resource value: 0x7f0e0089
-			public const int afc_base_button_location = 2131624073;
-			
-			// aapt resource value: 0x7f0e008a
-			public const int afc_button_location = 2131624074;
-			
-			// aapt resource value: 0x7f0e008d
-			public const int afc_button_sort = 2131624077;
-			
-			// aapt resource value: 0x7f0e008e
-			public const int afc_home_button_navigators = 2131624078;
-			
-			// aapt resource value: 0x7f0e0083
-			public const int afc_main_button_navi = 2131624067;
-			
-			// aapt resource value: 0x7f0e0084
-			public const int afc_main_button_navi_left = 2131624068;
-			
-			// aapt resource value: 0x7f0e0085
-			public const int afc_main_button_navi_right = 2131624069;
-			
-			// aapt resource value: 0x7f0e008c
-			public const int afc_widget_search_view_button_clear = 2131624076;
-			
-			// aapt resource value: 0x7f0e008b
-			public const int afc_widget_search_view_button_search = 2131624075;
+			public const int afc_widget_search_view_button_search = 2131623948;
 			
 			static Style()
 			{
@@ -7076,7 +5840,10 @@ namespace keepass2android
 			public const int searchable = 2131034140;
 			
 			// aapt resource value: 0x7f05001d
-			public const int searchable_offline = 2131034141;
+			public const int searchable_debug = 2131034141;
+			
+			// aapt resource value: 0x7f05001e
+			public const int searchable_offline = 2131034142;
 			
 			static Xml()
 			{
@@ -7091,150 +5858,12 @@ namespace keepass2android
 		public partial class Styleable
 		{
 			
-			public static int[] ActionBar = new int[] {
-					2130772031,
-					2130772032,
-					2130772033,
-					2130772034,
-					2130772035,
-					2130772036,
-					2130772037,
-					2130772038,
-					2130772039,
-					2130772040,
-					2130772041,
-					2130772042,
-					2130772043,
-					2130772044,
-					2130772045,
-					2130772046,
-					2130772047,
-					2130772048,
-					2130772049};
-			
-			// aapt resource value: 10
-			public const int ActionBar_background = 10;
-			
-			// aapt resource value: 12
-			public const int ActionBar_backgroundSplit = 12;
-			
-			// aapt resource value: 11
-			public const int ActionBar_backgroundStacked = 11;
-			
-			// aapt resource value: 13
-			public const int ActionBar_customNavigationLayout = 13;
-			
-			// aapt resource value: 3
-			public const int ActionBar_displayOptions = 3;
-			
-			// aapt resource value: 9
-			public const int ActionBar_divider = 9;
-			
-			// aapt resource value: 1
-			public const int ActionBar_height = 1;
-			
-			// aapt resource value: 14
-			public const int ActionBar_homeLayout = 14;
-			
-			// aapt resource value: 7
-			public const int ActionBar_icon = 7;
-			
-			// aapt resource value: 16
-			public const int ActionBar_indeterminateProgressStyle = 16;
-			
-			// aapt resource value: 18
-			public const int ActionBar_itemPadding = 18;
-			
-			// aapt resource value: 8
-			public const int ActionBar_logo = 8;
-			
-			// aapt resource value: 2
-			public const int ActionBar_navigationMode = 2;
-			
-			// aapt resource value: 17
-			public const int ActionBar_progressBarPadding = 17;
-			
-			// aapt resource value: 15
-			public const int ActionBar_progressBarStyle = 15;
-			
-			// aapt resource value: 4
-			public const int ActionBar_subtitle = 4;
-			
-			// aapt resource value: 6
-			public const int ActionBar_subtitleTextStyle = 6;
-			
-			// aapt resource value: 0
-			public const int ActionBar_title = 0;
-			
-			// aapt resource value: 5
-			public const int ActionBar_titleTextStyle = 5;
-			
-			public static int[] ActionBarLayout = new int[] {
-					16842931};
-			
-			// aapt resource value: 0
-			public const int ActionBarLayout_android_layout_gravity = 0;
-			
-			public static int[] ActionBarWindow = new int[] {
+			public static int[] AfcSearchView = new int[] {
 					2130771998,
 					2130771999,
-					2130772000};
-			
-			// aapt resource value: 0
-			public const int ActionBarWindow_windowActionBar = 0;
-			
-			// aapt resource value: 1
-			public const int ActionBarWindow_windowActionBarOverlay = 1;
-			
-			// aapt resource value: 2
-			public const int ActionBarWindow_windowSplitActionBar = 2;
-			
-			public static int[] ActionMenuItemView = new int[] {
-					16843071};
-			
-			// aapt resource value: 0
-			public const int ActionMenuItemView_android_minWidth = 0;
-			
-			public static int[] ActionMenuView;
-			
-			public static int[] ActionMode = new int[] {
-					2130772032,
-					2130772036,
-					2130772037,
-					2130772041,
-					2130772043};
-			
-			// aapt resource value: 3
-			public const int ActionMode_background = 3;
-			
-			// aapt resource value: 4
-			public const int ActionMode_backgroundSplit = 4;
-			
-			// aapt resource value: 0
-			public const int ActionMode_height = 0;
-			
-			// aapt resource value: 2
-			public const int ActionMode_subtitleTextStyle = 2;
-			
-			// aapt resource value: 1
-			public const int ActionMode_titleTextStyle = 1;
-			
-			public static int[] ActivityChooserView = new int[] {
-					2130772100,
-					2130772101};
-			
-			// aapt resource value: 1
-			public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
-			
-			// aapt resource value: 0
-			public const int ActivityChooserView_initialActivityCount = 0;
-			
-			public static int[] AfcSearchView = new int[] {
-					2130772104,
-					2130772105,
-					2130772106,
-					2130772107,
-					2130772108};
+					2130772000,
+					2130772001,
+					2130772002};
 			
 			// aapt resource value: 2
 			public const int AfcSearchView_closable = 2;
@@ -7251,15 +5880,9 @@ namespace keepass2android
 			// aapt resource value: 1
 			public const int AfcSearchView_iconified = 1;
 			
-			public static int[] CompatTextView = new int[] {
-					2130772103};
-			
-			// aapt resource value: 0
-			public const int CompatTextView_textAllCaps = 0;
-			
 			public static int[] Kp2aShortHelpView = new int[] {
 					16843087,
-					2130772156};
+					2130772050};
 			
 			// aapt resource value: 0
 			public const int Kp2aShortHelpView_android_text = 0;
@@ -7333,20 +5956,6 @@ namespace keepass2android
 			// aapt resource value: 9
 			public const int LatinKeyboardBaseView_verticalCorrection = 9;
 			
-			public static int[] LinearLayoutICS = new int[] {
-					2130772040,
-					2130772079,
-					2130772080};
-			
-			// aapt resource value: 0
-			public const int LinearLayoutICS_divider = 0;
-			
-			// aapt resource value: 2
-			public const int LinearLayoutICS_dividerPadding = 2;
-			
-			// aapt resource value: 1
-			public const int LinearLayoutICS_showDividers = 1;
-			
 			public static int[] MapAttrs = new int[] {
 					2130771968,
 					2130771969,
@@ -7405,203 +6014,9 @@ namespace keepass2android
 			// aapt resource value: 13
 			public const int MapAttrs_zOrderOnTop = 13;
 			
-			public static int[] MenuGroup = new int[] {
-					16842766,
-					16842960,
-					16843156,
-					16843230,
-					16843231,
-					16843232};
-			
-			// aapt resource value: 5
-			public const int MenuGroup_android_checkableBehavior = 5;
-			
-			// aapt resource value: 0
-			public const int MenuGroup_android_enabled = 0;
-			
-			// aapt resource value: 1
-			public const int MenuGroup_android_id = 1;
-			
-			// aapt resource value: 3
-			public const int MenuGroup_android_menuCategory = 3;
-			
-			// aapt resource value: 4
-			public const int MenuGroup_android_orderInCategory = 4;
-			
-			// aapt resource value: 2
-			public const int MenuGroup_android_visible = 2;
-			
-			public static int[] MenuItem = new int[] {
-					16842754,
-					16842766,
-					16842960,
-					16843014,
-					16843156,
-					16843230,
-					16843231,
-					16843233,
-					16843234,
-					16843235,
-					16843236,
-					16843237,
-					16843375,
-					2130772071,
-					2130772072,
-					2130772073,
-					2130772074};
-			
-			// aapt resource value: 14
-			public const int MenuItem_actionLayout = 14;
-			
-			// aapt resource value: 16
-			public const int MenuItem_actionProviderClass = 16;
-			
-			// aapt resource value: 15
-			public const int MenuItem_actionViewClass = 15;
-			
-			// aapt resource value: 9
-			public const int MenuItem_android_alphabeticShortcut = 9;
-			
-			// aapt resource value: 11
-			public const int MenuItem_android_checkable = 11;
-			
-			// aapt resource value: 3
-			public const int MenuItem_android_checked = 3;
-			
-			// aapt resource value: 1
-			public const int MenuItem_android_enabled = 1;
-			
-			// aapt resource value: 0
-			public const int MenuItem_android_icon = 0;
-			
-			// aapt resource value: 2
-			public const int MenuItem_android_id = 2;
-			
-			// aapt resource value: 5
-			public const int MenuItem_android_menuCategory = 5;
-			
-			// aapt resource value: 10
-			public const int MenuItem_android_numericShortcut = 10;
-			
-			// aapt resource value: 12
-			public const int MenuItem_android_onClick = 12;
-			
-			// aapt resource value: 6
-			public const int MenuItem_android_orderInCategory = 6;
-			
-			// aapt resource value: 7
-			public const int MenuItem_android_title = 7;
-			
-			// aapt resource value: 8
-			public const int MenuItem_android_titleCondensed = 8;
-			
-			// aapt resource value: 4
-			public const int MenuItem_android_visible = 4;
-			
-			// aapt resource value: 13
-			public const int MenuItem_showAsAction = 13;
-			
-			public static int[] MenuView = new int[] {
-					16842926,
-					16843052,
-					16843053,
-					16843054,
-					16843055,
-					16843056,
-					16843057,
-					16843788};
-			
-			// aapt resource value: 4
-			public const int MenuView_android_headerBackground = 4;
-			
-			// aapt resource value: 2
-			public const int MenuView_android_horizontalDivider = 2;
-			
-			// aapt resource value: 5
-			public const int MenuView_android_itemBackground = 5;
-			
-			// aapt resource value: 6
-			public const int MenuView_android_itemIconDisabledAlpha = 6;
-			
-			// aapt resource value: 1
-			public const int MenuView_android_itemTextAppearance = 1;
-			
-			// aapt resource value: 7
-			public const int MenuView_android_preserveIconSpacing = 7;
-			
-			// aapt resource value: 3
-			public const int MenuView_android_verticalDivider = 3;
-			
-			// aapt resource value: 0
-			public const int MenuView_android_windowAnimationStyle = 0;
-			
-			public static int[] SearchView = new int[] {
-					16843039,
-					16843296,
-					16843364,
-					2130772084,
-					2130772085};
-			
-			// aapt resource value: 2
-			public const int SearchView_android_imeOptions = 2;
-			
-			// aapt resource value: 1
-			public const int SearchView_android_inputType = 1;
-			
-			// aapt resource value: 0
-			public const int SearchView_android_maxWidth = 0;
-			
-			// aapt resource value: 3
-			public const int SearchView_iconifiedByDefault = 3;
-			
-			// aapt resource value: 4
-			public const int SearchView_queryHint = 4;
-			
-			public static int[] Spinner = new int[] {
-					16842927,
-					16843125,
-					16843126,
-					16843362,
-					16843436,
-					16843437,
-					2130772075,
-					2130772076,
-					2130772077,
-					2130772078};
-			
-			// aapt resource value: 4
-			public const int Spinner_android_dropDownHorizontalOffset = 4;
-			
-			// aapt resource value: 1
-			public const int Spinner_android_dropDownSelector = 1;
-			
-			// aapt resource value: 5
-			public const int Spinner_android_dropDownVerticalOffset = 5;
-			
-			// aapt resource value: 3
-			public const int Spinner_android_dropDownWidth = 3;
-			
-			// aapt resource value: 0
-			public const int Spinner_android_gravity = 0;
-			
-			// aapt resource value: 2
-			public const int Spinner_android_popupBackground = 2;
-			
-			// aapt resource value: 9
-			public const int Spinner_disableChildrenWhenDisabled = 9;
-			
-			// aapt resource value: 8
-			public const int Spinner_popupPromptView = 8;
-			
-			// aapt resource value: 6
-			public const int Spinner_prompt = 6;
-			
-			// aapt resource value: 7
-			public const int Spinner_spinnerMode = 7;
-			
 			public static int[] TextWithHelp = new int[] {
 					16843087,
-					2130772156};
+					2130772050};
 			
 			// aapt resource value: 0
 			public const int TextWithHelp_android_text = 0;
@@ -7609,46 +6024,6 @@ namespace keepass2android
 			// aapt resource value: 1
 			public const int TextWithHelp_help_text = 1;
 			
-			public static int[] Theme = new int[] {
-					2130772065,
-					2130772066,
-					2130772067,
-					2130772068,
-					2130772069,
-					2130772070};
-			
-			// aapt resource value: 0
-			public const int Theme_actionDropDownStyle = 0;
-			
-			// aapt resource value: 1
-			public const int Theme_dropdownListPreferredItemHeight = 1;
-			
-			// aapt resource value: 5
-			public const int Theme_listChoiceBackgroundIndicator = 5;
-			
-			// aapt resource value: 4
-			public const int Theme_panelMenuListTheme = 4;
-			
-			// aapt resource value: 3
-			public const int Theme_panelMenuListWidth = 3;
-			
-			// aapt resource value: 2
-			public const int Theme_popupMenuStyle = 2;
-			
-			public static int[] View = new int[] {
-					16842970,
-					2130772050,
-					2130772051};
-			
-			// aapt resource value: 0
-			public const int View_android_focusable = 0;
-			
-			// aapt resource value: 2
-			public const int View_paddingEnd = 2;
-			
-			// aapt resource value: 1
-			public const int View_paddingStart = 1;
-			
 			static Styleable()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
diff --git a/src/keepass2android/Resources/drawable-hdpi-v11/ic_launcher_gray.png b/src/keepass2android/Resources/drawable-hdpi/ic_launcher_gray.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi-v11/ic_launcher_gray.png
rename to src/keepass2android/Resources/drawable-hdpi/ic_launcher_gray.png
diff --git a/src/keepass2android/Resources/drawable-hdpi-v11/ic_launcher_gray_bday.png b/src/keepass2android/Resources/drawable-hdpi/ic_launcher_gray_bday.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi-v11/ic_launcher_gray_bday.png
rename to src/keepass2android/Resources/drawable-hdpi/ic_launcher_gray_bday.png
diff --git a/src/keepass2android/Resources/drawable-hdpi-v11/ic_unlocked_gray.png b/src/keepass2android/Resources/drawable-hdpi/ic_unlocked_gray.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi-v11/ic_unlocked_gray.png
rename to src/keepass2android/Resources/drawable-hdpi/ic_unlocked_gray.png
diff --git a/src/keepass2android/Resources/drawable-v11/EntryFieldHeaderBackground.xml b/src/keepass2android/Resources/drawable-v11/EntryFieldHeaderBackground.xml
deleted file mode 100644
index 508f0487..00000000
--- a/src/keepass2android/Resources/drawable-v11/EntryFieldHeaderBackground.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item>
-    <shape>
-    </shape>
-</item>
-</selector>
diff --git a/src/keepass2android/Resources/drawable-v11/ic_launcher_gray.png b/src/keepass2android/Resources/drawable-v11/ic_launcher_gray.png
deleted file mode 100644
index 05369fa4..00000000
Binary files a/src/keepass2android/Resources/drawable-v11/ic_launcher_gray.png and /dev/null differ
diff --git a/src/keepass2android/Resources/drawable-v11/ic_launcher_gray_bday.png b/src/keepass2android/Resources/drawable-v11/ic_launcher_gray_bday.png
deleted file mode 100644
index 53883dee..00000000
Binary files a/src/keepass2android/Resources/drawable-v11/ic_launcher_gray_bday.png and /dev/null differ
diff --git a/src/keepass2android/Resources/drawable-v11/ic_unlocked_gray.png b/src/keepass2android/Resources/drawable-v11/ic_unlocked_gray.png
deleted file mode 100644
index b85db77f..00000000
Binary files a/src/keepass2android/Resources/drawable-v11/ic_unlocked_gray.png and /dev/null differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi-v11/ic_launcher_gray.png b/src/keepass2android/Resources/drawable-xhdpi/ic_launcher_gray.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi-v11/ic_launcher_gray.png
rename to src/keepass2android/Resources/drawable-xhdpi/ic_launcher_gray.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi-v11/ic_launcher_gray_bday.png b/src/keepass2android/Resources/drawable-xhdpi/ic_launcher_gray_bday.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi-v11/ic_launcher_gray_bday.png
rename to src/keepass2android/Resources/drawable-xhdpi/ic_launcher_gray_bday.png
diff --git a/src/keepass2android/Resources/drawable-xhdpi-v11/ic_unlocked_gray.png b/src/keepass2android/Resources/drawable-xhdpi/ic_unlocked_gray.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xhdpi-v11/ic_unlocked_gray.png
rename to src/keepass2android/Resources/drawable-xhdpi/ic_unlocked_gray.png
diff --git a/src/keepass2android/Resources/drawable-xxhdpi-v11/ic_launcher_gray.png b/src/keepass2android/Resources/drawable-xxhdpi/ic_launcher_gray.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xxhdpi-v11/ic_launcher_gray.png
rename to src/keepass2android/Resources/drawable-xxhdpi/ic_launcher_gray.png
diff --git a/src/keepass2android/Resources/drawable-xxhdpi-v11/ic_launcher_gray_bday.png b/src/keepass2android/Resources/drawable-xxhdpi/ic_launcher_gray_bday.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xxhdpi-v11/ic_launcher_gray_bday.png
rename to src/keepass2android/Resources/drawable-xxhdpi/ic_launcher_gray_bday.png
diff --git a/src/keepass2android/Resources/drawable-xxhdpi-v11/ic_unlocked_gray.png b/src/keepass2android/Resources/drawable-xxhdpi/ic_unlocked_gray.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-xxhdpi-v11/ic_unlocked_gray.png
rename to src/keepass2android/Resources/drawable-xxhdpi/ic_unlocked_gray.png
diff --git a/src/keepass2android/Resources/drawable/EntryFieldHeaderBackground.xml b/src/keepass2android/Resources/drawable/EntryFieldHeaderBackground.xml
index 058b5119..508f0487 100644
--- a/src/keepass2android/Resources/drawable/EntryFieldHeaderBackground.xml
+++ b/src/keepass2android/Resources/drawable/EntryFieldHeaderBackground.xml
@@ -1,12 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 <item>
     <shape>
-        <gradient
-            android:angle="45"
-            android:startColor="#FF000030"
-            android:endColor="#FF000000"
-            android:type="linear" />
     </shape>
 </item>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/src/keepass2android/Resources/drawable/ic_launcher_gray.png b/src/keepass2android/Resources/drawable/ic_launcher_gray.png
index 710baa01..05369fa4 100644
Binary files a/src/keepass2android/Resources/drawable/ic_launcher_gray.png and b/src/keepass2android/Resources/drawable/ic_launcher_gray.png differ
diff --git a/src/keepass2android/Resources/drawable/ic_launcher_gray_bday.png b/src/keepass2android/Resources/drawable/ic_launcher_gray_bday.png
index a6ac3338..53883dee 100644
Binary files a/src/keepass2android/Resources/drawable/ic_launcher_gray_bday.png and b/src/keepass2android/Resources/drawable/ic_launcher_gray_bday.png differ
diff --git a/src/keepass2android/Resources/drawable/ic_menu_copy_holo_light.png b/src/keepass2android/Resources/drawable/ic_menu_copy_holo_light.png
new file mode 100644
index 00000000..0dd8865f
Binary files /dev/null and b/src/keepass2android/Resources/drawable/ic_menu_copy_holo_light.png differ
diff --git a/src/keepass2android/Resources/drawable/ic_unlocked_gray.png b/src/keepass2android/Resources/drawable/ic_unlocked_gray.png
index 3a0ca74b..b85db77f 100644
Binary files a/src/keepass2android/Resources/drawable/ic_unlocked_gray.png and b/src/keepass2android/Resources/drawable/ic_unlocked_gray.png differ
diff --git a/src/keepass2android/Resources/drawable-v11/old_ic_launcher_gray.png b/src/keepass2android/Resources/drawable/old_ic_launcher_gray.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-v11/old_ic_launcher_gray.png
rename to src/keepass2android/Resources/drawable/old_ic_launcher_gray.png
diff --git a/src/keepass2android/Resources/drawable/vdots.png b/src/keepass2android/Resources/drawable/vdots.png
new file mode 100644
index 00000000..503e890d
Binary files /dev/null and b/src/keepass2android/Resources/drawable/vdots.png differ
diff --git a/src/keepass2android/Resources/drawable/vdots_holodark.png b/src/keepass2android/Resources/drawable/vdots_holodark.png
new file mode 100644
index 00000000..8178f1bd
Binary files /dev/null and b/src/keepass2android/Resources/drawable/vdots_holodark.png differ
diff --git a/src/keepass2android/Resources/layout-v14/entry_view_contents.xml b/src/keepass2android/Resources/layout-v14/entry_view_contents.xml
deleted file mode 100644
index e3ff7bcc..00000000
--- a/src/keepass2android/Resources/layout-v14/entry_view_contents.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/entry_table"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="vertical">
-
-<!-- Username -->
-    <TextView
-        android:id="@+id/entry_user_name_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_user_name"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_user_name"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textIsSelectable="true"
-        style="@style/EntryItem" />
-<!--  URL -->
-    <TextView
-        android:id="@+id/entry_url_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_url"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_url"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:autoLink="all"
-        android:textIsSelectable="true"
-        style="@style/EntryItem" />
-<!-- Password -->
-    <TextView
-        android:id="@+id/entry_password_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_password"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_password"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:password="true"
-        android:textIsSelectable="true"
-        android:typeface="monospace"
-        style="@style/EntryItem" />
-<!-- Comment -->
-    <TextView
-        android:id="@+id/entry_comment_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_comment"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_comment"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textIsSelectable="true"
-        style="@style/EntryItem" />
-    
-    
-    <TextView
-        android:id="@+id/entry_extra_strings_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_extra_strings"
-        style="@style/EntryFieldHeader"
-         />
-    <LinearLayout
-        android:id="@+id/extra_strings"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
-        android:orientation="vertical" />
-	<!-- file attachments -->
-    <TextView
-        android:id="@+id/entry_binaries_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_binaries"
-        style="@style/EntryFieldHeader"
-         />
-    <LinearLayout
-        android:id="@+id/binaries"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />		
-<!--Tags -->
-    <TextView
-        android:id="@+id/entry_tags_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_tags"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_tags"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textIsSelectable="true"
-        style="@style/EntryItem" />
-<!--Override URL-->
-    <TextView
-        android:id="@+id/entry_override_url_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_override_url"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_override_url"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:autoLink="all"
-        android:textIsSelectable="true"
-        style="@style/EntryItem" />
-        
-<!-- Created -->
-    <TextView
-        android:id="@+id/entry_created_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_created"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_created"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!-- Modified -->
-    <TextView
-        android:id="@+id/entry_modified_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_modified"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_modified"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!-- Expires -->
-    <TextView
-        android:id="@+id/entry_expires_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_expires"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_expires"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!-- Property Change Conflict | id:@+id/entry_url_label -->
-</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/generate_password.xml b/src/keepass2android/Resources/layout-v14/generate_password.xml
deleted file mode 100644
index ba091eb2..00000000
--- a/src/keepass2android/Resources/layout-v14/generate_password.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-        android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:divider="?android:attr/dividerVertical"
-        android:showDividers="middle"
-        android:layout_alignParentBottom="true"
-        android:dividerPadding="12dp"
-        android:baselineAligned="false">
-        <FrameLayout
-            android:id="@+id/accept_button"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:drawableLeft="?attr/NavigationAcceptDrawable"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:text="@string/accept" />
-        </FrameLayout>
-        <FrameLayout
-            android:id="@+id/cancel_button"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:drawableLeft="?attr/CancelDrawable"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:text="@android:string/cancel" />
-        </FrameLayout>
-    </LinearLayout>
-    <ScrollView
-        android:id="@+id/ScrollView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/bottom_bar"
-        android:layout_marginBottom="12dip"
-        android:layout_marginLeft="12dip"
-        android:layout_marginRight="12dip"
-        android:layout_marginTop="12dip">
-        <RelativeLayout
-            android:id="@+id/RelativeLayout"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content">
-            <EditText
-                android:id="@+id/password"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:singleLine="true"
-                android:typeface="monospace"
-                android:hint="@string/hint_generated_password" />
-            <Button
-                android:id="@+id/generate_password_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/password"
-                android:text="@string/generate_password" />
-            <TextView
-                android:id="@+id/length_label"
-                android:text="@string/length"
-                style="@style/TextAppearance_SmallHeading"
-                android:layout_height="fill_parent"
-                android:layout_width="fill_parent"
-                android:layout_below="@id/generate_password_button" />
-            <Button
-                android:id="@+id/btn_length16"
-                android:text="16"
-                android:layout_alignParentRight="true"
-                android:layout_width="60sp"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/length_label" />
-            <Button
-                android:id="@+id/btn_length12"
-                android:text="12"
-                android:layout_toLeftOf="@id/btn_length16"
-                android:layout_height="wrap_content"
-                android:layout_width="60sp"
-                android:layout_alignTop="@id/btn_length16" />
-            <Button
-                android:id="@+id/btn_length8"
-                android:text="8"
-                android:layout_toLeftOf="@id/btn_length12"
-                android:layout_height="wrap_content"
-                android:layout_width="60sp"
-                android:layout_alignTop="@id/btn_length16" />
-            <Button
-                android:id="@+id/btn_length6"
-                android:text="6"
-                android:layout_toLeftOf="@id/btn_length8"
-                android:layout_height="wrap_content"
-                android:layout_width="60sp"
-                android:layout_alignTop="@id/btn_length16" />
-            <EditText
-                android:id="@+id/length"
-                android:layout_width="fill_parent"
-                android:layout_toLeftOf="@id/btn_length6"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/btn_length16"
-                android:singleLine="true"
-                android:text="12"
-                android:hint="@string/hint_length" />
-            <CheckBox
-                android:id="@+id/cb_uppercase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/uppercase"
-                android:checked="true"
-                android:layout_below="@id/length" />
-            <CheckBox
-                android:id="@+id/cb_lowercase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/lowercase"
-                android:checked="true"
-                android:layout_below="@id/cb_uppercase" />
-            <CheckBox
-                android:id="@+id/cb_digits"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/digits"
-                android:checked="true"
-                android:layout_below="@id/cb_lowercase" />
-            <CheckBox
-                android:id="@+id/cb_minus"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/minus"
-                android:layout_below="@id/cb_digits" />
-            <CheckBox
-                android:id="@+id/cb_underline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/underline"
-                android:layout_below="@id/cb_minus" />
-            <CheckBox
-                android:id="@+id/cb_space"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/space"
-                android:layout_below="@id/cb_underline" />
-            <CheckBox
-                android:id="@+id/cb_specials"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/special"
-                android:layout_below="@id/cb_space" />
-            <CheckBox
-                android:id="@+id/cb_brackets"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/brackets"
-                android:layout_below="@id/cb_specials" />
-        </RelativeLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/group_add_entry.xml b/src/keepass2android/Resources/layout-v14/group_add_entry.xml
deleted file mode 100644
index 6222cccb..00000000
--- a/src/keepass2android/Resources/layout-v14/group_add_entry.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-        android:id="@+id/top"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:orientation="horizontal" />
-    <LinearLayout
-        android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:divider="?android:attr/dividerVertical"
-        android:showDividers="middle"
-        android:layout_alignParentBottom="true"
-        android:dividerPadding="12dp"
-        android:baselineAligned="false">
-        <FrameLayout
-            android:id="@+id/add_group"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:drawableLeft="?attr/NewGroupDrawable"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:text="@string/add_group" />
-        </FrameLayout>
-        <FrameLayout
-            android:id="@+id/add_entry"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-			android:background="?android:attr/selectableItemBackground"
-			android:clickable="true"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:drawableLeft="?attr/NewEntryDrawable"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:text="@string/add_entry" />
-        </FrameLayout>
-		<FrameLayout
-            android:id="@+id/insert_element"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-			<TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:drawableLeft="?attr/NewGroupDrawable"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:text="@string/insert_element_here" />
-		</FrameLayout>
-		<FrameLayout
-            android:id="@+id/cancel_insert_element"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-			<TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:text="@string/cancel" />
-		</FrameLayout>
-    </LinearLayout>
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:layout_above="@id/bottom_bar"
-        android:background="#b8b8b8" />
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/divider2"
-        android:layout_below="@id/top"
-        android:paddingRight="8dp"
-        android:paddingLeft="8dp" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/password.xml b/src/keepass2android/Resources/layout-v14/password.xml
deleted file mode 100644
index 483f3dd5..00000000
--- a/src/keepass2android/Resources/layout-v14/password.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:tools="http://schemas.android.com/tools"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
->
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="match_parent"
-		android:layout_marginLeft="12dip"
-		android:layout_marginRight="12dip"
-		android:layout_marginBottom="12dip"
-		android:orientation="vertical"
-			  >
-		<RelativeLayout
-			android:id="@+id/filename_group"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content">
-			<TextView
-				android:id="@+id/filename_label"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				style="@style/TextAppearance_SmallHeading"
-				android:text="@string/pass_filename" />
-			<ImageView
-				android:id="@+id/divider1"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/filename_label"
-				android:scaleType="fitXY"
-				android:src="@android:drawable/divider_horizontal_dark" />
-			<HorizontalScrollView
-				android:id="@+id/filenamescroll"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/divider1">
-				<TextView
-					android:id="@+id/filename"
-					style="@style/GroupText"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content"
-					android:singleLine="true"
-					android:ellipsize="none"
-					android:focusable="true"
-					android:focusableInTouchMode="true" />
-			</HorizontalScrollView>
-			<ImageView
-				android:id="@+id/divider2"
-				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
-				android:layout_below="@id/filenamescroll"
-				android:scaleType="fitXY"
-				android:src="@android:drawable/divider_horizontal_dark" />
-		</RelativeLayout>
-		<TextView
-			android:id="@+id/password_label"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginTop="20dip"
-			android:text="@string/master_key_type" />
-		<Spinner
-		android:id="@+id/password_mode_spinner"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:entries="@array/password_modes"
-	/>
-
-		<LinearLayout
-			android:id="@+id/passwordLine"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:baselineAligned="false"
-			android:orientation="horizontal">
-			<EditText
-				android:id="@+id/password"
-				android:layout_width="0px"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:inputType="textPassword"
-				android:layout_weight="1"
-				android:layout_gravity="bottom"
-				android:hint="@string/hint_login_pass" />
-			<ImageButton
-				android:id="@+id/toggle_password"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/ic_menu_view" />
-		</LinearLayout>
-		<LinearLayout
-			android:id="@+id/keyfileLine"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:baselineAligned="false"
-			android:orientation="horizontal">
-			<EditText
-				android:id="@+id/pass_keyfile"
-				android:layout_width="0px"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:layout_weight="1"
-				android:layout_gravity="bottom"
-				android:hint="@string/entry_keyfile" />
-			<ImageButton
-				android:id="@+id/browse_button"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:src="@drawable/ic_launcher_folder_small" />
-		</LinearLayout>
-		<LinearLayout
-			android:id="@+id/otpView"
-			android:layout_marginLeft="12dip"
-			android:layout_marginRight="12dip"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-		>
-			<LinearLayout
-			android:id="@+id/otpInitView"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:orientation="vertical"
-		>
-				<Button
-				android:id="@+id/init_otp"
-				android:text="@string/init_otp"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"/>
-				<TextView
-					android:id="@+id/otps_pending"
-				android:text="@string/otps_pending"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content" />
-			</LinearLayout>
-			<LinearLayout
-			android:id="@+id/otpEntry"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:visibility="gone"
-			android:orientation="vertical"
-		>
-				<TextView
-			android:id="@+id/otp_expl"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/otp_explanation" />
-
-				<EditText
-							android:id="@+id/otp1"
-							android:layout_width="fill_parent"
-							android:layout_height="wrap_content"
-							android:text="93317749"
-							android:singleLine="true" />
-				<EditText
-							android:id="@+id/otp2"
-							android:text="54719327"
-							android:layout_width="fill_parent"
-							android:layout_height="wrap_content"
-							android:singleLine="true" />
-				<EditText
-							android:id="@+id/otp3"
-							android:text="49844651"
-							android:layout_width="fill_parent"
-							android:layout_height="wrap_content"
-							android:singleLine="true" />
-				<EditText
-							android:id="@+id/otp4"
-							android:layout_width="fill_parent"
-							android:layout_height="wrap_content"
-							android:singleLine="true" />
-				<EditText
-							android:id="@+id/otp5"
-							android:layout_width="fill_parent"
-							android:layout_height="wrap_content"
-							android:singleLine="true" />
-				<EditText
-							android:id="@+id/otp6"
-							android:layout_width="fill_parent"
-							android:layout_height="wrap_content"
-							android:singleLine="true" />
-
-			</LinearLayout>
-
-		</LinearLayout>
-		<LinearLayout
-			android:id="@+id/otpSecretLine"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal">
-			<EditText
-				android:id="@+id/pass_otpsecret"
-				android:layout_width="0px"
-				android:layout_height="wrap_content"
-				android:singleLine="true"
-				android:layout_weight="1"
-				android:hint="@string/otpsecret_hint" />
-			<Spinner
-		android:id="@+id/otpsecret_format_spinner"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		/>
-		</LinearLayout>
-		<Button
-			android:id="@+id/pass_ok"
-			android:text="@android:string/ok"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"/>
-		<Button
-			android:id="@+id/kill_app"
-			android:text="@string/kill_app_label"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content" />
-		<CheckBox
-			android:id="@+id/enable_quickunlock"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/enable_quickunlock" />
-	</LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/searchurlresults.xml b/src/keepass2android/Resources/layout-v14/searchurlresults.xml
deleted file mode 100644
index 1165b132..00000000
--- a/src/keepass2android/Resources/layout-v14/searchurlresults.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-        android:id="@+id/top"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:orientation="horizontal" />
-    <LinearLayout
-        android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:divider="?android:attr/dividerVertical"
-        android:showDividers="middle"
-        android:layout_alignParentBottom="true"
-        android:dividerPadding="12dp"
-        android:baselineAligned="false">
-        <FrameLayout
-            android:id="@+id/select_other_entry"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/select_other_entry" />
-        </FrameLayout>
-        <FrameLayout
-            android:id="@+id/add_url_entry"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/add_url_entry" />
-        </FrameLayout>
-    </LinearLayout>
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:layout_above="@id/bottom_bar"
-        android:background="#b8b8b8" />
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/divider2"
-        android:layout_below="@id/top"
-        android:paddingRight="8dp"
-        android:paddingLeft="8dp" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/searchurlresults_empty.xml b/src/keepass2android/Resources/layout-v14/searchurlresults_empty.xml
deleted file mode 100644
index 5bd65218..00000000
--- a/src/keepass2android/Resources/layout-v14/searchurlresults_empty.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <LinearLayout
-        android:id="@+id/top"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:orientation="horizontal" />
-    <LinearLayout
-        android:id="@+id/bottom_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:divider="?android:attr/dividerVertical"
-        android:showDividers="middle"
-        android:layout_alignParentBottom="true"
-        android:dividerPadding="12dp"
-        android:baselineAligned="false">
-        <FrameLayout
-            android:id="@+id/select_other_entry"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/select_other_entry" />
-        </FrameLayout>
-        <FrameLayout
-            android:id="@+id/add_url_entry"
-            style="?android:attr/actionButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-            <TextView
-                style="?android:actionBarTabTextStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/add_url_entry" />
-        </FrameLayout>
-    </LinearLayout>
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:layout_above="@id/bottom_bar"
-        android:background="#b8b8b8" />
-    <TextView
-        android:id="@+id/no_results"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-		android:layout_margin="12dp"
-        android:layout_below="@id/top"
-        android:text="@string/no_results" />
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/divider2"
-        android:layout_below="@id/no_results"
-        android:paddingRight="8dp"
-        android:paddingLeft="8dp" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/Kopie von donate.xml b/src/keepass2android/Resources/layout/Kopie von donate.xml
new file mode 100644
index 00000000..78d29fac
--- /dev/null
+++ b/src/keepass2android/Resources/layout/Kopie von donate.xml	
@@ -0,0 +1,45 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+>
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:paddingBottom="@dimen/activity_vertical_margin"
+		android:paddingLeft="@dimen/activity_horizontal_margin"
+		android:paddingRight="@dimen/activity_horizontal_margin"
+		android:paddingTop="@dimen/activity_vertical_margin"
+>
+		<TextView
+			android:id="@+id/donate_question"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="20sp"
+			android:text="@string/donate_question" />
+		<ImageView
+			android:id="@+id/imgoktfest"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_below="@id/donate_question"
+			android:adjustViewBounds="true"
+			android:scaleType="fitCenter"
+			android:src="@drawable/oktoberfest" />
+		<Button 
+			 android:text="@string/ok_donate"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+			 android:layout_below="@id/imgoktfest"
+        android:id="@+id/ok_donate"
+         />
+
+		<Button
+			 android:text="@string/no_thanks"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+			 android:layout_below="@id/ok_donate"
+        android:id="@+id/no_donate"
+         />
+	</RelativeLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/ListViewPluginRow.xml b/src/keepass2android/Resources/layout/ListViewPluginRow.xml
new file mode 100644
index 00000000..159c425c
--- /dev/null
+++ b/src/keepass2android/Resources/layout/ListViewPluginRow.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp">
+    <ImageView
+        android:id="@+id/imgIcon"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp" />
+    <TextView
+        android:id="@+id/txtLabel"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/imgIcon"
+        android:textSize="22dp"
+         />
+    <TextView
+        android:id="@+id/txtVersion"
+        android:text="0.9.3"
+        android:textSize="14dp"
+        android:textColor="#888888"
+        android:layout_toRightOf="@id/imgIcon"
+        android:layout_below="@id/txtLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <TextView
+        android:id="@+id/txtStatus"
+        android:textSize="14dp"
+        android:textColor="#888888"
+        android:layout_toRightOf="@id/imgIcon"
+        android:gravity="right"
+        android:layout_below="@id/txtVersion"
+        android:layout_alignRight="@id/txtLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout-v14/QuickUnlock_Unused.xml b/src/keepass2android/Resources/layout/QuickUnlock_Unused.xml
similarity index 100%
rename from src/keepass2android/Resources/layout-v14/QuickUnlock_Unused.xml
rename to src/keepass2android/Resources/layout/QuickUnlock_Unused.xml
diff --git a/src/keepass2android/Resources/layout-v14/SaveButton.xml b/src/keepass2android/Resources/layout/SaveButton.xml
similarity index 100%
rename from src/keepass2android/Resources/layout-v14/SaveButton.xml
rename to src/keepass2android/Resources/layout/SaveButton.xml
diff --git a/src/keepass2android/Resources/layout/entry_edit.xml b/src/keepass2android/Resources/layout/entry_edit.xml
index ecb0a26f..f75b8fa8 100644
--- a/src/keepass2android/Resources/layout/entry_edit.xml
+++ b/src/keepass2android/Resources/layout/entry_edit.xml
@@ -2,98 +2,59 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content">
-    <LinearLayout
-        android:id="@+id/entry_save_header"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:padding="2sp"
-        style="@style/GroupAndEntryHeader">
-        <Button
-            android:id="@+id/entry_save"
-            android:text="@string/entry_save"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left|center_vertical"
-            android:textIsSelectable="false"
-            android:editable="false"
-            android:longClickable="false"
-            android:clickable="true"
-            android:minHeight="32dp"
-            android:gravity="left|center_vertical"
-            android:drawableLeft="@drawable/navigation_accept_dark"
-            style="@style/GroupAndEntryHeader"
-            android:background="@drawable/HeaderButtonBackground" />
-    </LinearLayout>
     <ScrollView
         android:id="@+id/entry_scroll"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@id/entry_save_header">
+        android:layout_height="fill_parent">
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
-        <!--  Title -->
-            <TextView
-                android:id="@+id/entry_title_label"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/entry_title"
-                style="@style/EntryFieldHeader" />
+        <!-- Title -->
             <ImageButton
                 android:id="@+id/icon_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic00"
                 android:layout_alignParentRight="true"
-                android:layout_below="@id/entry_title_label" />
+                android:src="@drawable/ic00" />
             <EditText
                 android:id="@+id/entry_title"
-                android:layout_width="fill_parent"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="4dip"
+                android:capitalize="sentences"
                 android:layout_toLeftOf="@+id/icon_button"
-                android:singleLine="true"
-                android:layout_below="@id/entry_title_label"
-                android:hint="@string/hint_title" />
+                android:hint="@string/hint_title"
+                android:singleLine="true" />
         <!-- Username -->
-            <TextView
-                android:id="@+id/entry_user_name_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/icon_button"
-                style="@style/EntryFieldHeader"
-                android:text="@string/entry_user_name" />
             <EditText
                 android:id="@+id/entry_user_name"
-                android:layout_width="fill_parent"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:layout_marginTop="4dip"
+                android:layout_below="@id/icon_button"
+                android:hint="@string/hint_username"
                 android:inputType="textEmailAddress"
-                android:layout_below="@id/entry_user_name_label"
-                android:hint="@string/hint_username" />
-        <!--  URL -->
-            <TextView
-                android:id="@+id/entry_url_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_user_name"
-                style="@style/EntryFieldHeader"
-                android:text="@string/entry_url" />
+                android:singleLine="true" />
+        <!-- URL -->
             <EditText
                 android:id="@+id/entry_url"
-                android:layout_width="fill_parent"
+                style="@style/TextAppearance_EditEntry_Value"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
+                android:layout_marginTop="4dip"
+                android:layout_below="@id/entry_user_name"
+                android:hint="@string/hint_url"
                 android:inputType="textUri"
-                android:layout_below="@id/entry_url_label"
-                android:hint="@string/hint_url" />
+                android:singleLine="true" />
         <!-- Password -->
             <TextView
                 android:id="@+id/entry_password_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/entry_url"
-                style="@style/EntryFieldHeader"
                 android:text="@string/entry_password" />
              <RelativeLayout
 			android:id="@+id/password_section"
@@ -142,47 +103,43 @@
         <!-- Comment -->
             <TextView
                 android:id="@+id/entry_comment_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/password_section"
-                style="@style/EntryFieldHeader"
                 android:text="@string/entry_comment" />
             <EditText
                 android:id="@+id/entry_comment"
-                android:inputType="textMultiLine"
+                style="@style/TextAppearance_EditEntry_Value"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/entry_comment_label"
-                android:hint="@string/hint_comment" />
+                android:hint="@string/hint_comment"
+                android:inputType="textMultiLine" />
         <!-- Extra strings -->
-            <TextView
-                android:id="@+id/entry_extra_strings_label"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/entry_comment"
-                android:text="@string/entry_extra_strings"
-                style="@style/EntryFieldHeader" />
             <LinearLayout
                 android:id="@+id/advanced_container"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/entry_extra_strings_label"
+                android:layout_below="@id/entry_comment"
                 android:orientation="vertical" />
             <Button
                 android:id="@+id/add_advanced"
+                style="@style/EditEntryButton"
+                android:layout_marginTop="-4dp"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/advanced_container"
-                android:drawableLeft="@android:drawable/ic_menu_add"
+                android:drawableLeft="?attr/ic_menu_add_field"
                 android:text="@string/add_extra_string" />
         <!-- file attachments -->
             <TextView
                 android:id="@+id/entry_binaries_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/entry_binaries"
                 android:layout_below="@id/add_advanced"
-                style="@style/EntryFieldHeader" />
+                android:text="@string/entry_binaries" />
             <LinearLayout
                 android:id="@+id/binaries"
                 android:layout_width="fill_parent"
@@ -192,54 +149,59 @@
         <!-- Tags -->
             <TextView
                 android:id="@+id/entry_tags_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/entry_tags"
                 android:layout_below="@id/binaries"
-                style="@style/EntryFieldHeader" />
+                android:text="@string/entry_tags" />
             <EditText
                 android:id="@+id/entry_tags"
+                style="@style/TextAppearance_EditEntry_Value"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="text"
                 android:layout_below="@id/entry_tags_label"
-                android:hint="@string/hint_tags" />
+                android:hint="@string/hint_tags"
+                android:inputType="text"
+                android:singleLine="true" />
         <!-- Override URL -->
             <TextView
                 android:id="@+id/entry_override_url_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/entry_tags"
-                style="@style/EntryFieldHeader"
                 android:text="@string/entry_override_url" />
             <EditText
                 android:id="@+id/entry_override_url"
+                style="@style/TextAppearance_EditEntry_Value"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="textUri"
                 android:layout_below="@id/entry_override_url_label"
-                android:hint="@string/hint_override_url" />
+                android:hint="@string/hint_override_url"
+                android:inputType="textUri"
+                android:singleLine="true" />
         <!-- Expires -->
             <TextView
                 android:id="@+id/entry_expires_label"
+                style="@style/TextAppearance_EditEntry_LabelSmall"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/entry_expires"
-                style="@style/EntryFieldHeader"
-                android:layout_below="@id/entry_override_url" />
+                android:layout_below="@id/entry_override_url"
+                android:text="@string/entry_expires" />
             <CheckBox
                 android:id="@+id/entry_expires_checkbox"
-                android:layout_below="@id/entry_expires_label"
+                android:layout_marginLeft="16dip"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_below="@id/entry_expires_label" />
             <EditText
                 android:id="@+id/entry_expires"
+                android:layout_marginLeft="-12dip"
+                android:layout_marginRight="12dip"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/entry_expires_checkbox"
-                android:layout_below="@id/entry_expires_label" />
+                android:layout_below="@id/entry_expires_label"
+                android:layout_toRightOf="@id/entry_expires_checkbox" />
         </RelativeLayout>
     </ScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/entry_extrastring_title.xml b/src/keepass2android/Resources/layout/entry_extrastring_title.xml
index 4f0b2bb7..a7e21d98 100644
--- a/src/keepass2android/Resources/layout/entry_extrastring_title.xml
+++ b/src/keepass2android/Resources/layout/entry_extrastring_title.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:text="Title"
-    android:layout_marginLeft="10dp"
-    style="@style/ExtraFieldHeader" />
\ No newline at end of file
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:id="@+id/extra_title_container"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content">
+	<TextView
+		android:id="@+id/entry_title"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:text="Title"
+		style="@style/EntryFieldHeader" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/entry_extrastring_value.xml b/src/keepass2android/Resources/layout/entry_extrastring_value.xml
index 12d7a0ef..1e5349d9 100644
--- a/src/keepass2android/Resources/layout/entry_extrastring_value.xml
+++ b/src/keepass2android/Resources/layout/entry_extrastring_value.xml
@@ -1,8 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:typeface="monospace"
-    android:text="Value"
-    android:layout_marginLeft="30dp"
-    style="@style/EntryItem" />
\ No newline at end of file
+<RelativeLayout 
+			xmlns:android="http://schemas.android.com/apk/res/android"
+			android:id="@+id/extra_container"
+			android:layout_height="wrap_content"	
+			android:layout_width="fill_parent"
+			android:orientation="horizontal"
+			android:clickable="true"
+			android:background="?android:attr/selectableItemBackground">
+	<ImageView
+		android:id="@+id/extra_vdots"
+		android:layout_width="wrap_content"
+		android:layout_height="15dp"
+			   android:src="@drawable/vdots"
+			   android:gravity="right|bottom"
+			   android:layout_alignParentRight="true"
+				   />
+	<TextView
+		android:id="@+id/entry_extra"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:typeface="monospace"
+		android:layout_toLeftOf="@id/extra_vdots"
+		style="@style/EntryItem" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/entry_view.xml b/src/keepass2android/Resources/layout/entry_view.xml
index ba510e96..06518d82 100644
--- a/src/keepass2android/Resources/layout/entry_view.xml
+++ b/src/keepass2android/Resources/layout/entry_view.xml
@@ -1,72 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-<!--  Title -->
-    <LinearLayout
-        android:id="@+id/title_block"
-        android:layout_alignParentTop="true"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:padding="2dp"
-        style="@style/GroupAndEntryHeader">
-        <Button
-            android:id="@+id/entry_title"
-            style="@style/GroupAndEntryHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left|center_vertical"
-            android:layout_weight="1"
-            android:textIsSelectable="false"
-            android:editable="false"
-            android:longClickable="false"
-            android:clickable="true"
-            android:minHeight="32dp"
-            android:gravity="left|center_vertical"
-            android:drawableLeft="@drawable/navigation_previous_item_dark"
-            android:background="@drawable/HeaderButtonBackground" />
-        <ImageView
-            android:id="@+id/entry_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right|center_vertical"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic99_blank" />
-    </LinearLayout>
-    <LinearLayout
+	<LinearLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="horizontal" />
+	<LinearLayout
         android:id="@+id/bottom_bar"
-        android:layout_alignParentBottom="true"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="2dp"
-        style="@style/GroupAndEntryHeader">
-        <Button
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:layout_alignParentBottom="true"
+        android:dividerPadding="12dp">
+
+		<FrameLayout
+            style="?android:attr/actionButtonStyle"
             android:id="@+id/entry_edit"
-            android:text="@string/menu_edit"
             android:layout_width="fill_parent"
-            android:drawableLeft="@android:drawable/ic_menu_edit"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentBottom="true" />
-    </LinearLayout>
-    <ImageView
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="@android:drawable/ic_menu_edit"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/menu_edit" />
+		</FrameLayout>
+
+	</LinearLayout>
+
+	<ImageView
         android:id="@+id/entry_divider2"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/bottom_bar"
         android:scaleType="fitXY"
-        android:src="@android:drawable/divider_horizontal_dark" />
-    <ScrollView
+        android:tint="@color/blue_highlight"
+        android:src="@android:drawable/divider_horizontal_bright" />
+	<ScrollView
         android:id="@+id/entry_scroll"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_above="@id/entry_divider2"
-        android:layout_below="@id/title_block"
         android:fillViewport="true"
         android:scrollbarStyle="insideOverlay">
-        <keepass2android.view.EntryContentsView
+		<keepass2android.view.EntryContentsView
             android:id="@+id/entry_contents"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent" />
-    </ScrollView>
+	</ScrollView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/entry_view_contents.xml b/src/keepass2android/Resources/layout/entry_view_contents.xml
index d1cafa68..a4494375 100644
--- a/src/keepass2android/Resources/layout/entry_view_contents.xml
+++ b/src/keepass2android/Resources/layout/entry_view_contents.xml
@@ -1,154 +1,261 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/entry_table"
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     android:orientation="vertical">
-<!-- Username -->
-    <TextView
-        android:id="@+id/entry_user_name_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_user_name"
-        style="@style/EntryFieldHeader"
+
+
+	<LinearLayout android:id="@+id/entryfield_container_username"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/entry_user_name_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_user_name"
+			
+			style="@style/EntryFieldHeader"
          />
-    <keepass2android.view.TextViewSelect
-        android:id="@+id/entry_user_name"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!--  URL -->
-    <TextView
-        android:id="@+id/entry_url_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_url"
-        style="@style/EntryFieldHeader"
+
+		<!-- Username -->
+		<RelativeLayout android:id="@+id/username_container"
+					  android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="horizontal"
+		android:clickable="true"
+		android:background="?android:attr/selectableItemBackground">
+
+
+			<ImageView
+				android:id="@+id/username_vdots"
+				android:layout_width="wrap_content"
+				android:layout_height="15dp"
+					   android:src="@drawable/vdots"
+					   android:gravity="right|bottom"
+					   android:layout_alignParentRight="true"
+				   />
+			<TextView
+				android:id="@+id/entry_user_name"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_toLeftOf="@id/username_vdots"
+				style="@style/EntryItem" />
+		</RelativeLayout>
+	</LinearLayout>
+
+	<LinearLayout android:id="@+id/entryfield_container_url"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!--  URL -->
+		<TextView
+			android:id="@+id/entry_url_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_url"
+			style="@style/EntryFieldHeader"
+			/>
+		<RelativeLayout android:id="@+id/url_container"
+						  android:layout_height="wrap_content"
+				android:layout_width="fill_parent"
+				android:orientation="horizontal"
+				android:clickable="true"
+				android:background="?android:attr/selectableItemBackground">
+			<ImageView
+				android:id="@+id/url_vdots"
+				android:layout_width="wrap_content"
+				android:layout_height="15dp"
+					   android:src="@drawable/vdots"
+					   android:gravity="right|bottom"
+					   android:layout_alignParentRight="true"
+				   />
+			<TextView
+				android:id="@+id/entry_url"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:autoLink="all"
+				android:layout_toLeftOf="@id/url_vdots"
+				style="@style/EntryItem" />
+		</RelativeLayout>
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_password"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!-- Password -->
+		<TextView
+			android:id="@+id/entry_password_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_password"
+			style="@style/EntryFieldHeader"
          />
-    <keepass2android.view.TextViewSelect
-        android:id="@+id/entry_url"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:autoLink="all"
-        style="@style/EntryItem" />
-<!-- Password -->
-    <TextView
-        android:id="@+id/entry_password_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_password"
-        style="@style/EntryFieldHeader"
+		<RelativeLayout android:id="@+id/password_container"
+						  android:layout_height="wrap_content"
+				android:layout_width="fill_parent"
+				android:orientation="horizontal"
+				android:clickable="true"
+				android:background="?android:attr/selectableItemBackground">
+			<ImageView
+				android:id="@+id/password_vdots"
+				android:layout_width="wrap_content"
+				android:layout_height="15dp"
+					   android:src="@drawable/vdots"
+					   android:gravity="right|bottom"
+					   android:layout_alignParentRight="true"
+				   />
+			<TextView
+				android:id="@+id/entry_password"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:password="true"
+				android:typeface="monospace"
+				android:layout_toLeftOf="@id/password_vdots"
+				style="@style/EntryItem" />
+		</RelativeLayout>
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_comment"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!-- Comment -->
+		<TextView
+			android:id="@+id/entry_comment_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_comment"
+			style="@style/EntryFieldHeader"
          />
-    <keepass2android.view.TextViewSelect
-        android:id="@+id/entry_password"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:password="true"
-        android:typeface="monospace"
-        style="@style/EntryItem" />
-<!-- Comment -->
-    <TextView
-        android:id="@+id/entry_comment_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_comment"
-        android:autoLink="all"
-        style="@style/EntryFieldHeader"
+		<TextView
+			android:id="@+id/entry_comment"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textIsSelectable="true"
+			style="@style/EntryItem" />
+	</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/extra_strings"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="8dp"
+			android:orientation="vertical" />
+		<!-- file attachments -->
+		<TextView
+			android:id="@+id/entry_binaries_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_binaries"
+			style="@style/EntryFieldHeader"
          />
-    <keepass2android.view.TextViewSelect
-        android:id="@+id/entry_comment"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!-- Extra strings -->
-    <TextView
-        android:id="@+id/entry_extra_strings_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_extra_strings"
-        style="@style/EntryFieldHeader"
+		<LinearLayout
+			android:id="@+id/binaries"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical" />
+		<!--Tags -->
+	<LinearLayout android:id="@+id/entryfield_container_tags"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/entry_tags_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_tags"
+			style="@style/EntryFieldHeader"
          />
-    <LinearLayout
-        android:id="@+id/extra_strings"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
-<!-- file attachments -->
-    <TextView
-        android:id="@+id/entry_binaries_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_binaries"
-        style="@style/EntryFieldHeader"
+		<TextView
+			android:id="@+id/entry_tags"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textIsSelectable="true"
+			style="@style/EntryItem" />
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_overrideurl"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!--Override URL-->
+		<TextView
+			android:id="@+id/entry_override_url_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_override_url"
+			style="@style/EntryFieldHeader"
          />
-    <LinearLayout
-        android:id="@+id/binaries"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />		        
-<!--Tags -->
-    <TextView
-        android:id="@+id/entry_tags_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_tags"
-        style="@style/EntryFieldHeader"
+		<TextView
+			android:id="@+id/entry_override_url"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:autoLink="all"
+			android:textIsSelectable="true"
+			style="@style/EntryItem" />
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_created"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+
+		<!-- Created -->
+		<TextView
+			android:id="@+id/entry_created_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_created"
+			style="@style/EntryFieldHeader"
          />
-    <keepass2android.view.TextViewSelect
-        android:id="@+id/entry_tags"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!--Override URL-->
-    <TextView
-        android:id="@+id/entry_override_url_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_override_url"
-        style="@style/EntryFieldHeader"
+		<TextView
+			android:id="@+id/entry_created"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			style="@style/EntryItem" />
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_modified"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!-- Modified -->
+		<TextView
+			android:id="@+id/entry_modified_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_modified"
+			style="@style/EntryFieldHeader"
          />
-    <keepass2android.view.TextViewSelect
-        android:id="@+id/entry_override_url"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!-- Created -->
-    <TextView
-        android:id="@+id/entry_created_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_created"
-        style="@style/EntryFieldHeader"
+		<TextView
+			android:id="@+id/entry_modified"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			style="@style/EntryItem" />
+	</LinearLayout>
+	<LinearLayout android:id="@+id/entryfield_container_expires"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:orientation="vertical">
+
+		<!-- Expires -->
+		<TextView
+			android:id="@+id/entry_expires_label"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/entry_expires"
+			style="@style/EntryFieldHeader"
          />
-    <TextView
-        android:id="@+id/entry_created"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!-- Modified -->
-    <TextView
-        android:id="@+id/entry_modified_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_modified"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_modified"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
-<!-- Expires -->
-    <TextView
-        android:id="@+id/entry_expires_label"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/entry_expires"
-        style="@style/EntryFieldHeader"
-         />
-    <TextView
-        android:id="@+id/entry_expires"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="@style/EntryItem" />
+		<TextView
+			android:id="@+id/entry_expires"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			style="@style/EntryItem" />
+	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/generate_password.xml b/src/keepass2android/Resources/layout/generate_password.xml
index 67930f56..ba091eb2 100644
--- a/src/keepass2android/Resources/layout/generate_password.xml
+++ b/src/keepass2android/Resources/layout/generate_password.xml
@@ -2,24 +2,60 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <Button
-        android:id="@+id/accept_button"
+    <LinearLayout
+        android:id="@+id/bottom_bar"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@string/accept"
-        android:layout_alignParentBottom="true" />
-    <Button
-        android:id="@+id/cancel_button"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:text="@android:string/cancel"
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
         android:layout_alignParentBottom="true"
-        android:layout_toRightOf="@id/accept_button" />
+        android:dividerPadding="12dp"
+        android:baselineAligned="false">
+        <FrameLayout
+            android:id="@+id/accept_button"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="?attr/NavigationAcceptDrawable"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/accept" />
+        </FrameLayout>
+        <FrameLayout
+            android:id="@+id/cancel_button"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="?attr/CancelDrawable"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@android:string/cancel" />
+        </FrameLayout>
+    </LinearLayout>
     <ScrollView
         android:id="@+id/ScrollView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@id/cancel_button">
+        android:layout_above="@id/bottom_bar"
+        android:layout_marginBottom="12dip"
+        android:layout_marginLeft="12dip"
+        android:layout_marginRight="12dip"
+        android:layout_marginTop="12dip">
         <RelativeLayout
             android:id="@+id/RelativeLayout"
             android:layout_height="wrap_content"
@@ -41,6 +77,7 @@
             <TextView
                 android:id="@+id/length_label"
                 android:text="@string/length"
+                style="@style/TextAppearance_SmallHeading"
                 android:layout_height="fill_parent"
                 android:layout_width="fill_parent"
                 android:layout_below="@id/generate_password_button" />
diff --git a/src/keepass2android/Resources/layout/group_add_entry.xml b/src/keepass2android/Resources/layout/group_add_entry.xml
index 7968d106..6222cccb 100644
--- a/src/keepass2android/Resources/layout/group_add_entry.xml
+++ b/src/keepass2android/Resources/layout/group_add_entry.xml
@@ -2,70 +2,104 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <keepass2android.view.GroupHeaderView
-        android:id="@+id/group_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <LinearLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="horizontal" />
     <LinearLayout
         android:id="@+id/bottom_bar"
-        android:layout_alignParentBottom="true"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="2dp"
-        style="@style/GroupAndEntryHeader">
-        <Button
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
+        android:layout_alignParentBottom="true"
+        android:dividerPadding="12dp"
+        android:baselineAligned="false">
+        <FrameLayout
             android:id="@+id/add_group"
-            android:layout_width="0px"
-            android:layout_weight="1"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:text="@string/add_group"
-            android:drawableLeft="@drawable/btn_new_group"
-            />
-        <Button
+            android:layout_weight="1">
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="?attr/NewGroupDrawable"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/add_group" />
+        </FrameLayout>
+        <FrameLayout
             android:id="@+id/add_entry"
-            android:layout_width="0px"
-            android:layout_weight="1"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/add_group"
-            android:layout_alignParentBottom="true"
-            android:text="@string/add_entry"
-            android:drawableLeft="@drawable/device_access_new_account"
-             />
-		<Button
+			android:background="?android:attr/selectableItemBackground"
+			android:clickable="true"
+            android:layout_weight="1">
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="?attr/NewEntryDrawable"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/add_entry" />
+        </FrameLayout>
+		<FrameLayout
             android:id="@+id/insert_element"
-            android:layout_width="0px"
-            android:layout_weight="1"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:text="@string/insert_element_here"
-			android:visibility="gone"
-            android:drawableLeft="@drawable/btn_new_group"
-            />
-        <Button
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="?attr/NewGroupDrawable"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/insert_element_here" />
+		</FrameLayout>
+		<FrameLayout
             android:id="@+id/cancel_insert_element"
-            android:layout_width="0px"
-            android:layout_weight="1"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/insert_element"
-            android:layout_alignParentBottom="true"
-            android:text="@string/cancel"
-			android:visibility="gone"
-            android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
-             />
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="@android:drawable/ic_menu_close_clear_cancel"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/cancel" />
+		</FrameLayout>
     </LinearLayout>
-    <ImageView
+    <View
         android:id="@+id/divider2"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="2dp"
         android:layout_above="@id/bottom_bar"
-        android:scaleType="fitXY"
-        android:tint="@color/blue_highlight"
-        android:src="@android:drawable/divider_horizontal_dark" />
+        android:background="#b8b8b8" />
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/divider2"
-        android:layout_below="@id/group_header" />
+        android:layout_below="@id/top"
+        android:paddingRight="8dp"
+        android:paddingLeft="8dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/group_empty.xml b/src/keepass2android/Resources/layout/group_empty.xml
index 848284c8..93c0d58f 100644
--- a/src/keepass2android/Resources/layout/group_empty.xml
+++ b/src/keepass2android/Resources/layout/group_empty.xml
@@ -20,14 +20,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="fill_parent"
   android:layout_height="fill_parent">
-	<keepass2android.view.GroupHeaderView
-	  android:id="@+id/group_header"
-	  android:layout_width="wrap_content"
-	  android:layout_height="wrap_content"/>
 	<ListView android:id="@android:id/list"
       android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:layout_below="@id/group_header"/>
+      android:layout_height="wrap_content"/>
 	<TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
diff --git a/src/keepass2android/Resources/layout/group_header.xml b/src/keepass2android/Resources/layout/group_header.xml
deleted file mode 100644
index a2ce046a..00000000
--- a/src/keepass2android/Resources/layout/group_header.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:padding="2sp"
-    style="@style/GroupAndEntryHeader">
-    <Button
-        android:id="@+id/group_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="left|center_vertical"
-        android:layout_weight="1"
-        android:text="@string/root"
-        style="@style/GroupAndEntryHeader"
-        android:textIsSelectable="false"
-        android:editable="false"
-        android:longClickable="false"
-        android:clickable="true"
-        android:gravity="left|center_vertical"
-        android:drawableLeft="@drawable/navigation_previous_item_dark"
-        android:background="@drawable/HeaderButtonBackground" />
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right|center_vertical"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic99_blank" />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/icon_picker.xml b/src/keepass2android/Resources/layout/icon_picker.xml
index a009ea20..fbe37174 100644
--- a/src/keepass2android/Resources/layout/icon_picker.xml
+++ b/src/keepass2android/Resources/layout/icon_picker.xml
@@ -21,7 +21,7 @@
    android:id="@+id/IconGridView" 
    android:layout_width="fill_parent"
    android:layout_height="fill_parent" 
-   android:background="@color/icon_background"
+   android:background="@android:color/background_light"
    android:verticalSpacing="5dp"
    android:horizontalSpacing="5dp"
    android:columnWidth="60dp" 
diff --git a/src/keepass2android/Resources/layout/plugin_details.xml b/src/keepass2android/Resources/layout/plugin_details.xml
new file mode 100644
index 00000000..2790151a
--- /dev/null
+++ b/src/keepass2android/Resources/layout/plugin_details.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+	<LinearLayout
+        android:id="@+id/bottom_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
+        android:layout_alignParentBottom="true"
+        android:dividerPadding="12dp"
+        android:baselineAligned="false">
+		<FrameLayout
+            android:id="@+id/accept_button"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawablePadding="8dp"
+				android:drawableLeft="?attr/NavigationAcceptDrawable"
+                android:gravity="center_vertical"
+                android:text="@string/accept" />
+		</FrameLayout>
+		<FrameLayout
+            android:id="@+id/deny_button"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+			<TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:drawableLeft="?attr/CancelDrawable"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:text="@string/deny" />
+		</FrameLayout>
+	</LinearLayout>
+	<ScrollView
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:app="http://schemas.android.com/apk/res-auto"
+			android:id="@+id/plugin_scroll"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:padding="12dp"
+			android:scrollbarStyle="insideOverlay">
+		<LinearLayout android:id="@+id/scopes_list"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical">
+			<RelativeLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:padding="4dp">
+				<ImageView
+					android:id="@+id/imgIcon"
+					android:layout_width="64dp"
+					android:layout_height="64dp"
+					android:layout_alignParentTop="true"
+					android:layout_marginRight="15dp"
+					android:layout_marginTop="5dp"
+					android:layout_marginBottom="5dp" />
+				<TextView
+					android:id="@+id/txtLabel"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:layout_toRightOf="@id/imgIcon"
+					android:textSize="22dp"
+         />
+				<TextView
+					android:id="@+id/txtVersion"
+					android:text="0.9.3"
+					android:textSize="14dp"
+					android:textColor="#888888"
+					android:layout_toRightOf="@id/imgIcon"
+					android:layout_below="@id/txtLabel"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content" />
+				<TextView
+					android:id="@+id/txtAuthor"
+					android:text=""
+					android:textSize="14dp"
+					android:textColor="#888888"
+					android:layout_below="@id/txtVersion"
+					android:layout_toRightOf="@id/imgIcon"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content" />
+			</RelativeLayout>
+
+			<TextView
+					android:id="@+id/txtShortDesc"
+					android:text=""
+					android:textSize="14dp"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content" />
+
+			<CheckBox
+					android:id="@+id/cb_enabled"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/plugin_enabled_checkbox"
+					android:checked="true"
+                 />
+
+			<TextView
+				android:id="@+id/scopes_title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="Scopes"
+				android:layout_marginLeft="10dp"
+				android:layout_marginTop="18dp"
+				style="@style/ExtraFieldHeader" />
+			<LinearLayout android:id="@+id/scopes_list"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical">
+			</LinearLayout>
+		</LinearLayout>
+	</ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/plugin_list.xml b/src/keepass2android/Resources/layout/plugin_list.xml
new file mode 100644
index 00000000..3a776f89
--- /dev/null
+++ b/src/keepass2android/Resources/layout/plugin_list.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+		android:padding="12dp">
+        <Button
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/plugin_web"
+            style="@style/PaddedElement"
+            android:id="@+id/btnPluginsOnline"
+            android:layout_gravity="left|center_vertical" />
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:padding="8dp" />
+    </LinearLayout>
+</merge>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/searchurlresults.xml b/src/keepass2android/Resources/layout/searchurlresults.xml
index 12d66b79..1165b132 100644
--- a/src/keepass2android/Resources/layout/searchurlresults.xml
+++ b/src/keepass2android/Resources/layout/searchurlresults.xml
@@ -2,47 +2,64 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <keepass2android.view.GroupHeaderView
-        android:id="@+id/group_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <LinearLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="horizontal" />
     <LinearLayout
         android:id="@+id/bottom_bar"
-        android:layout_alignParentBottom="true"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="2dp"
-        style="@style/GroupAndEntryHeader">
-        <Button
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
+        android:layout_alignParentBottom="true"
+        android:dividerPadding="12dp"
+        android:baselineAligned="false">
+        <FrameLayout
             android:id="@+id/select_other_entry"
-            android:layout_width="0px"
-            android:layout_weight="1"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:text="@string/select_other_entry"
-            />
-        <Button
+            android:layout_weight="1">
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:gravity="center_vertical"
+                android:text="@string/select_other_entry" />
+        </FrameLayout>
+        <FrameLayout
             android:id="@+id/add_url_entry"
-            android:layout_width="0px"
-            android:layout_weight="1"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/select_other_entry"
-            android:layout_alignParentBottom="true"
-            android:text="@string/add_url_entry"
-             />
+            android:layout_weight="1">
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:gravity="center_vertical"
+                android:text="@string/add_url_entry" />
+        </FrameLayout>
     </LinearLayout>
-    <ImageView
+    <View
         android:id="@+id/divider2"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="2dp"
         android:layout_above="@id/bottom_bar"
-        android:scaleType="fitXY"
-        android:tint="@color/blue_highlight"
-        android:src="@android:drawable/divider_horizontal_dark" />
+        android:background="#b8b8b8" />
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/divider2"
-        android:layout_below="@id/group_header" />
+        android:layout_below="@id/top"
+        android:paddingRight="8dp"
+        android:paddingLeft="8dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/searchurlresults_empty.xml b/src/keepass2android/Resources/layout/searchurlresults_empty.xml
index 58a4e19b..5bd65218 100644
--- a/src/keepass2android/Resources/layout/searchurlresults_empty.xml
+++ b/src/keepass2android/Resources/layout/searchurlresults_empty.xml
@@ -2,50 +2,71 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-    <keepass2android.view.GroupHeaderView
-        android:id="@+id/group_header"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+    <LinearLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:orientation="horizontal" />
     <LinearLayout
         android:id="@+id/bottom_bar"
-        android:layout_alignParentBottom="true"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="2dp"
-        style="@style/GroupAndEntryHeader">
-        <Button
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
+        android:layout_alignParentBottom="true"
+        android:dividerPadding="12dp"
+        android:baselineAligned="false">
+        <FrameLayout
             android:id="@+id/select_other_entry"
-            android:layout_width="0px"
-            android:layout_weight="1"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:text="@string/select_other_entry" />
-        <Button
+            android:layout_weight="1">
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:gravity="center_vertical"
+                android:text="@string/select_other_entry" />
+        </FrameLayout>
+        <FrameLayout
             android:id="@+id/add_url_entry"
-            android:layout_width="0px"
-            android:layout_weight="1"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_toRightOf="@id/select_other_entry"
-            android:layout_alignParentBottom="true"
-            android:text="@string/add_url_entry" />
+            android:layout_weight="1">
+            <TextView
+                style="?android:actionBarTabTextStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:paddingRight="20dp"
+                android:gravity="center_vertical"
+                android:text="@string/add_url_entry" />
+        </FrameLayout>
     </LinearLayout>
-    <ImageView
+    <View
         android:id="@+id/divider2"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="2dp"
         android:layout_above="@id/bottom_bar"
-        android:scaleType="fitXY"
-        android:tint="@color/blue_highlight"
-        android:src="@android:drawable/divider_horizontal_dark" />
+        android:background="#b8b8b8" />
+    <TextView
+        android:id="@+id/no_results"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+		android:layout_margin="12dp"
+        android:layout_below="@id/top"
+        android:text="@string/no_results" />
     <ListView
         android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/divider2"
-        android:layout_below="@id/group_header" />
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@android:id/list"
-        android:text="@string/no_results" />
+        android:layout_below="@id/no_results"
+        android:paddingRight="8dp"
+        android:paddingLeft="8dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/text_with_help.xml b/src/keepass2android/Resources/layout/text_with_help.xml
index ceb8ad69..15c6e8d1 100644
--- a/src/keepass2android/Resources/layout/text_with_help.xml
+++ b/src/keepass2android/Resources/layout/text_with_help.xml
@@ -14,6 +14,7 @@
 		style="@style/TextAppearance_Help"
 		android:textColor="@color/light_gray"
 		android:layout_alignParentRight="true"
+		android:background="?android:attr/selectableItemBackground"
 				 />
 
 
@@ -23,6 +24,7 @@
 		android:layout_height="wrap_content"
 		android:layout_toLeftOf="@id/help"
 		style="@style/TextAppearance_SubElement"
+		android:paddingTop="0dp"
 		
 			 />
 
diff --git a/src/keepass2android/Resources/menu-v11/entry_edit.xml b/src/keepass2android/Resources/menu-v11/entry_edit.xml
deleted file mode 100644
index 169c1fc8..00000000
--- a/src/keepass2android/Resources/menu-v11/entry_edit.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android 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 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_donate"
-        android:title="@string/menu_donate"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/menu_suggest_improvements"
-        android:icon="@android:drawable/ic_menu_directions"
-        android:title="@string/suggest_improvements"
-        android:showAsAction="never"
-    />
-    <item android:id="@+id/menu_rate"
-        android:icon="@android:drawable/star_off"
-        android:title="@string/rate_app"
-        android:showAsAction="never"
-    />
-    <item android:id="@+id/menu_translate"
-        android:title="@string/translate_app"
-        android:showAsAction="never"
-    />
-</menu>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/menu-v11/fileselect.xml b/src/keepass2android/Resources/menu-v11/fileselect.xml
deleted file mode 100644
index c21896fd..00000000
--- a/src/keepass2android/Resources/menu-v11/fileselect.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android 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 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    
-    <item android:id="@+id/menu_about"
-        android:title="@string/menu_about"
-        android:icon="@android:drawable/ic_menu_help"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/menu_app_settings"
-        android:title="@string/menu_app_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction="ifRoom"
-        
-    />
-    <item android:id="@+id/menu_donate"
-        android:title="@string/menu_donate"
-        android:showAsAction="ifRoom"
-    />
-</menu>
diff --git a/src/keepass2android/Resources/menu-v11/group.xml b/src/keepass2android/Resources/menu-v11/group.xml
deleted file mode 100644
index 91a020ca..00000000
--- a/src/keepass2android/Resources/menu-v11/group.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android 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 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_search"
-        android:icon="@android:drawable/ic_menu_search"
-        android:title="@string/menu_search"
-        android:showAsAction="ifRoom"
-        android:actionViewClass="android.widget.SearchView" 
-    />
-    <item android:id="@+id/menu_search_advanced"
-        android:icon="@android:drawable/ic_menu_search"
-        android:title="@string/menu_search_advanced"
-        android:showAsAction="never"
-    />
-    <item android:id="@+id/menu_lock"
-        android:icon="@android:drawable/ic_lock_lock"
-        android:title="@string/menu_lock"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/menu_donate"
-        android:title="@string/menu_donate"
-        android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/menu_app_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:title="@string/menu_app_settings"
-        android:showAsAction="ifRoom"
-    />
-	<item android:id="@+id/menu_change_master_key"
-        android:title="@string/menu_change_key"
-        android:showAsAction="never"
-    />
-	<item android:id="@+id/menu_sync"
-		  android:icon="@android:drawable/ic_popup_sync"
-			android:title="@string/synchronize_database_menu"
-			android:showAsAction="never"
-    />
-
-	<item android:id="@+id/menu_sort"
-        android:icon="@android:drawable/ic_menu_sort_by_size"
-        android:title="@string/sort_name"
-        android:showAsAction="never"
-    />
-    
-    <item android:id="@+id/menu_suggest_improvements"
-        android:icon="@android:drawable/ic_menu_directions"
-        android:title="@string/suggest_improvements"
-        android:showAsAction="never"
-    />
-    <item android:id="@+id/menu_translate"
-        android:title="@string/translate_app"
-        android:showAsAction="never"
-    />
-</menu>
diff --git a/src/keepass2android/Resources/menu-v11/password.xml b/src/keepass2android/Resources/menu-v11/password.xml
deleted file mode 100644
index 6c726f8b..00000000
--- a/src/keepass2android/Resources/menu-v11/password.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android 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 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_about"
-        android:title="@string/menu_about"
-        android:icon="@android:drawable/ic_menu_help"
-        android:showAsAction="ifRoom"
-    />
-	<item android:id="@+id/menu_change_db"
-        android:icon="?attr/OpenFileDrawable"
-        android:title="@string/menu_change_db"
-		android:showAsAction="ifRoom"
-    />
-    <item android:id="@+id/menu_app_settings"
-        android:title="@string/menu_app_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction="ifRoom"
-    />
-</menu>
diff --git a/src/keepass2android/Resources/menu/entry.xml b/src/keepass2android/Resources/menu/entry.xml
index 85137873..e061a0ab 100644
--- a/src/keepass2android/Resources/menu/entry.xml
+++ b/src/keepass2android/Resources/menu/entry.xml
@@ -16,39 +16,44 @@
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_donate"
-        android:icon="@android:drawable/ic_menu_share"
-        android:title="@string/menu_donate"
-    />
-    <item android:id="@+id/menu_toggle_pass"
-        android:icon="@android:drawable/ic_menu_view"
-        android:title="@string/show_password"
-    />
-    <item android:id="@+id/menu_goto_url"
-        android:icon="@android:drawable/ic_menu_upload"
-        android:title="@string/menu_url"
-    />
-    <!--<item android:id="@+id/menu_copy_user"
-        android:icon="@android:drawable/ic_menu_set_as"
-        android:title="@string/menu_copy_user"
-    />
-    <item android:id="@+id/menu_copy_pass"
-        android:icon="@android:drawable/ic_menu_agenda"
-        android:title="@string/menu_copy_pass"
-    />-->
     <item android:id="@+id/menu_lock"
         android:icon="@android:drawable/ic_lock_lock"
         android:title="@string/menu_lock"
+        android:showAsAction="ifRoom"
     />
+    <item android:id="@+id/menu_toggle_pass"
+        android:title="@string/show_password"
+        android:icon="@android:drawable/ic_menu_view"
+        android:showAsAction="ifRoom"
+    />
+    <item android:id="@+id/menu_donate"
+        android:title="@string/menu_donate"
+        android:showAsAction="ifRoom"
+    />
+    <item android:id="@+id/menu_goto_url"
+        android:title="@string/menu_url"
+        android:showAsAction="ifRoom"
+    />
+    <!--item android:id="@+id/menu_copy_user"
+        android:title="@string/menu_copy_user"
+        android:showAsAction="ifRoom"
+    />
+    <item android:id="@+id/menu_copy_pass"
+        android:title="@string/menu_copy_pass"
+        android:showAsAction="ifRoom"
+    /-->
     <item android:id="@+id/menu_suggest_improvements"
         android:icon="@android:drawable/ic_menu_directions"
         android:title="@string/suggest_improvements"
+        android:showAsAction="never"
     />
     <item android:id="@+id/menu_rate"
         android:icon="@android:drawable/star_off"
         android:title="@string/rate_app"
+        android:showAsAction="never"
     />
     <item android:id="@+id/menu_translate"
         android:title="@string/translate_app"
-       />
+        android:showAsAction="never"
+    />
 </menu>
diff --git a/src/keepass2android/Resources/menu/entry_edit.xml b/src/keepass2android/Resources/menu/entry_edit.xml
index a21d3a69..169c1fc8 100644
--- a/src/keepass2android/Resources/menu/entry_edit.xml
+++ b/src/keepass2android/Resources/menu/entry_edit.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     
  This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
 
   Keepass2Android is free software: you can redistribute it and/or modify
@@ -17,23 +16,22 @@
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_cancel_edit"
-        android:title="@string/entry_cancel"
-    />
     <item android:id="@+id/menu_donate"
-        android:icon="@android:drawable/ic_menu_share"
         android:title="@string/menu_donate"
+        android:showAsAction="ifRoom"
     />
     <item android:id="@+id/menu_suggest_improvements"
         android:icon="@android:drawable/ic_menu_directions"
         android:title="@string/suggest_improvements"
+        android:showAsAction="never"
     />
     <item android:id="@+id/menu_rate"
         android:icon="@android:drawable/star_off"
         android:title="@string/rate_app"
+        android:showAsAction="never"
     />
     <item android:id="@+id/menu_translate"
         android:title="@string/translate_app"
-       />
-</menu>
-
+        android:showAsAction="never"
+    />
+</menu>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/menu/fileselect.xml b/src/keepass2android/Resources/menu/fileselect.xml
index 5be1106e..c21896fd 100644
--- a/src/keepass2android/Resources/menu/fileselect.xml
+++ b/src/keepass2android/Resources/menu/fileselect.xml
@@ -16,16 +16,20 @@
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_donate"
-        android:icon="@android:drawable/ic_menu_share"
-        android:title="@string/menu_donate"
+    
+    <item android:id="@+id/menu_about"
+        android:title="@string/menu_about"
+        android:icon="@android:drawable/ic_menu_help"
+        android:showAsAction="ifRoom"
     />
     <item android:id="@+id/menu_app_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
         android:title="@string/menu_app_settings"
+        android:icon="@android:drawable/ic_menu_preferences"
+        android:showAsAction="ifRoom"
+        
     />
-    <item android:id="@+id/menu_about"
-        android:icon="@android:drawable/ic_menu_help"
-        android:title="@string/menu_about"
+    <item android:id="@+id/menu_donate"
+        android:title="@string/menu_donate"
+        android:showAsAction="ifRoom"
     />
 </menu>
diff --git a/src/keepass2android/Resources/menu/group.xml b/src/keepass2android/Resources/menu/group.xml
index a2d74cac..91a020ca 100644
--- a/src/keepass2android/Resources/menu/group.xml
+++ b/src/keepass2android/Resources/menu/group.xml
@@ -16,42 +16,54 @@
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_donate"
-        android:icon="@android:drawable/ic_menu_share"
-        android:title="@string/menu_donate"
+    <item android:id="@+id/menu_search"
+        android:icon="@android:drawable/ic_menu_search"
+        android:title="@string/menu_search"
+        android:showAsAction="ifRoom"
+        android:actionViewClass="android.widget.SearchView" 
+    />
+    <item android:id="@+id/menu_search_advanced"
+        android:icon="@android:drawable/ic_menu_search"
+        android:title="@string/menu_search_advanced"
+        android:showAsAction="never"
     />
     <item android:id="@+id/menu_lock"
         android:icon="@android:drawable/ic_lock_lock"
         android:title="@string/menu_lock"
+        android:showAsAction="ifRoom"
     />
-	 <item android:id="@+id/menu_search"
-			 android:icon="@android:drawable/ic_menu_search"
-			 android:title="@string/menu_search"
-			 android:showAsAction="ifRoom"
-			 android:actionViewClass="android.widget.SearchView"
+    <item android:id="@+id/menu_donate"
+        android:title="@string/menu_donate"
+        android:showAsAction="ifRoom"
     />
-	
     <item android:id="@+id/menu_app_settings"
         android:icon="@android:drawable/ic_menu_preferences"
         android:title="@string/menu_app_settings"
+        android:showAsAction="ifRoom"
     />
-    <item android:id="@+id/menu_change_master_key"
-        android:icon="@android:drawable/ic_menu_manage"
+	<item android:id="@+id/menu_change_master_key"
         android:title="@string/menu_change_key"
+        android:showAsAction="never"
     />
 	<item android:id="@+id/menu_sync"
+		  android:icon="@android:drawable/ic_popup_sync"
 			android:title="@string/synchronize_database_menu"
+			android:showAsAction="never"
     />
-    <item android:id="@+id/menu_sort"
+
+	<item android:id="@+id/menu_sort"
         android:icon="@android:drawable/ic_menu_sort_by_size"
         android:title="@string/sort_name"
+        android:showAsAction="never"
     />
+    
     <item android:id="@+id/menu_suggest_improvements"
         android:icon="@android:drawable/ic_menu_directions"
         android:title="@string/suggest_improvements"
+        android:showAsAction="never"
     />
     <item android:id="@+id/menu_translate"
         android:title="@string/translate_app"
-       />
-    
+        android:showAsAction="never"
+    />
 </menu>
diff --git a/src/keepass2android/Resources/menu/password.xml b/src/keepass2android/Resources/menu/password.xml
index 8902e395..6c726f8b 100644
--- a/src/keepass2android/Resources/menu/password.xml
+++ b/src/keepass2android/Resources/menu/password.xml
@@ -16,16 +16,19 @@
   along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_app_settings"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:title="@string/menu_app_settings"
+    <item android:id="@+id/menu_about"
+        android:title="@string/menu_about"
+        android:icon="@android:drawable/ic_menu_help"
+        android:showAsAction="ifRoom"
     />
 	<item android:id="@+id/menu_change_db"
-        android:icon="@drawable/collections_collection"
+        android:icon="?attr/OpenFileDrawable"
         android:title="@string/menu_change_db"
+		android:showAsAction="ifRoom"
     />
-    <item android:id="@+id/menu_about"
-        android:icon="@android:drawable/ic_menu_help"
-        android:title="@string/menu_about"
+    <item android:id="@+id/menu_app_settings"
+        android:title="@string/menu_app_settings"
+        android:icon="@android:drawable/ic_menu_preferences"
+        android:showAsAction="ifRoom"
     />
 </menu>
diff --git a/src/keepass2android/Resources/values-v14/styles.xml b/src/keepass2android/Resources/values-v14/styles.xml
deleted file mode 100644
index 632a0294..00000000
--- a/src/keepass2android/Resources/values-v14/styles.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android 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 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="GroupTextSmall">
-        <item name="@android:textColor">?android:attr/textColorPrimary</item>
-		
-	</style>
-	<style name="GroupText">
-		<item name="@android:textColor">?android:attr/textColorPrimary</item>
-		<item name="@android:textSize">20sp</item>
-	</style>
-	<style name="GroupTextLarge">
-		<item name="@android:textColor">?android:attr/textColorPrimary</item>
-		<item name="@android:textSize">28sp</item>
-	</style>
-	<style name="ElementTextSmall">
-		<item name="@android:textSize">15sp</item>
-	</style>
-	<style name="ElementText">
-		<item name="@android:textSize">20sp</item>
-	</style>
-	<style name="ElementTextLarge">
-		<item name="@android:textSize">28sp</item>
-	</style>
-
-	<style name="GroupLabel">
-	</style>
-	<style name="WhiteOnBlack">
-	</style>
-	<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
-	</style>
-	<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
-	</style>
-	<style name="ElementTextTitle" parent="WhiteOnBlack">
-	</style>
-	<style name="EntryItem">
-        <item name="android:layout_marginLeft">12dip</item>
-        <item name="android:layout_marginRight">12dip</item>
-        <item name="android:paddingLeft">4dp</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textSize">18sp</item>
-    
-	</style>
-	<style name="EntryFieldHeader">
-        <item name="android:drawableBottom">@drawable/section_header</item>
-        <item name="android:drawablePadding">2dp</item>
-        <item name="android:layout_marginLeft">12dip</item>
-        <item name="android:layout_marginRight">12dip</item>
-        <item name="android:layout_marginBottom">3dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:paddingLeft">4dp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-   
-	<style name="InfoHeader">
-		<item name="android:drawableBottom">@drawable/section_header</item>
-		<item name="android:drawablePadding">2dp</item>
-		<item name="android:layout_marginLeft">0dip</item>
-		<item name="android:layout_marginRight">12dip</item>
-		<item name="android:layout_marginBottom">3dp</item>
-		<item name="android:layout_marginTop">8dp</item>
-		<item name="android:paddingLeft">4dp</item>
-		<item name="android:textAllCaps">true</item>
-		<item name="android:textColor">?android:attr/textColorPrimary</item>
-		<item name="android:textSize">14sp</item>
-		<item name="android:textStyle">bold</item>
-	</style>
-    
-	<style name="BottomBarActionButton">
-	    <item name="android:background">?android:attr/selectableItemBackground</item>
-	</style>
-    
-	<style name="TextAppearance_EditEntry_Small">
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textAllCaps">true</item>
-    </style>
-	
-	
-    <style name="TextAppearance_EditEntry_LabelSmall" parent="TextAppearance_EditEntry_Small">
-        <item name="android:minHeight">24dip</item>
-        <item name="android:layout_width">144dip</item>
-        <item name="android:layout_marginTop">12dip</item>
-        <item name="android:layout_marginLeft">16dip</item>
-        <item name="android:layout_marginRight">16dip</item>
-        <item name="android:paddingLeft">8dip</item>
-        <item name="android:paddingRight">8dip</item>
-        <item name="android:layout_marginBottom">-12dip</item>
-    </style>
-
-    <style name="TextAppearance_EditEntry">
-        <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="TextAppearance_EditEntry_Value" parent="TextAppearance_EditEntry">
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:layout_marginRight">12dip</item>
-        <item name="android:layout_marginLeft">12dip</item>
-    </style>
-    
-    <style name="TextAppearance_SmallHeading" parent="TextAppearance_EditEntry_Small">
-        <item name="android:minHeight">24dip</item>
-        <item name="android:layout_width">144dip</item>
-        <item name="android:layout_marginTop">12dip</item>
-        <item name="android:layout_marginRight">16dip</item>
-        <item name="android:paddingRight">8dip</item>
-        <item name="android:layout_marginBottom">-12dip</item>
-    </style>
-
-	<style name="TextAppearance_SubElement">
-		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-		<item name="android:textSize">18sp</item>
-		<item name="android:textColor">?android:attr/textColorPrimary</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:layout_gravity">center_vertical</item>
-		<item name="android:layout_marginRight">12dip</item>
-		<item name="android:layout_marginLeft">12dip</item>
-	</style>
-
-	<style name="TextAppearance_Help">
-		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-		<item name="android:textSize">24sp</item>
-		<item name="android:padding">12sp</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:layout_gravity">center_vertical</item>
-		<item name="android:layout_marginRight">12dip</item>
-		<item name="android:layout_marginLeft">12dip</item>
-	</style>
-    
-    
-    <style name="EditEntryButton">
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:layout_marginTop">12dip</item>
-        <item name="android:layout_marginLeft">24dip</item>
-        <item name="android:layout_marginRight">24dip</item>
-        <item name="android:paddingLeft">8dip</item>
-        <item name="android:paddingRight">8dip</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
-    </style>
-    
-    <style name="AdditionalStringLayout">
-        <item name="android:layout_marginLeft">24dip</item>
-        <item name="android:layout_marginRight">24dip</item>
-      </style>
-    
-
-    <style name="MinusButton">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
-        <item name="android:src">@drawable/ic_menu_remove_field_holo_light</item>
-    </style>
-    
-	<style name="ExtraFieldHeader" parent="android:Widget.Holo.Light.TextView">
-		<item name="android:layout_marginLeft">16dip</item>
-        <item name="android:layout_marginRight">12dip</item>
-        <item name="android:layout_marginBottom">3dp</item>
-        <item name="android:layout_marginTop">4dp</item>
-        <item name="android:paddingLeft">4dp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>    
-    </style>
-</resources>
diff --git a/src/keepass2android/Resources/values/colors.xml b/src/keepass2android/Resources/values/colors.xml
index 12c7c1d9..d244d4ea 100644
--- a/src/keepass2android/Resources/values/colors.xml
+++ b/src/keepass2android/Resources/values/colors.xml
@@ -19,16 +19,15 @@
 -->
 <resources>
 	<color name="blue_highlight">#0000dd</color>
-	<color name="group">#ffffff</color>
-	<color name="icon_background">#555555</color>
+	<color name="group">#333333</color>
+	<color name="icon_background">#00555555</color>
 	<color name="icon_text">#000000</color>
-	<color name="group_header_button_pressed">#101080</color>
-	
-	<color name="emphasis">#31b6e7</color>
-    <color name="emphasis2">#4f7a8a</color>
-    <color name="bg_gray">#cecbce</color>
-    <color name="light_gray">#a8a8a8</color>
+	<color name="light_gray">#a8a8a8</color>
+	<color name="dark_gray">#303030</color>
 
 	<color name="element_being_moved">#a8a8a8</color>
-    
+
+	<color name="emphasis">#31b6e7</color>
+	<color name="emphasis2">#4f7a8a</color>
+	
 </resources>    
diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml
index 24402e9d..43be789a 100644
--- a/src/keepass2android/Resources/values/config.xml
+++ b/src/keepass2android/Resources/values/config.xml
@@ -90,6 +90,8 @@
 	
 	<string name="UseFileTransactions_key">UseFileTransactions</string>
 	<string name="LockWhenScreenOff_key">LockWhenScreenOff</string>
+	<string name="LockWhenNavigateBack_key">LockWhenNavigateBack</string>
+	
 	<string name="UseOfflineCache_key">UseOfflineCache</string>
 	<string name="AcceptAllServerCertificates_key">AcceptAllServerCertificates</string>
 	<string name="CheckForFileChangesOnSave_key">CheckForFileChangesOnSave</string>
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index e8bce0a5..776971fb 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -7,6 +7,7 @@
   <string name="CreditsText">The User Interface is based on a port of KeepassDroid developed by Brian Pellin. Code for database operations is based on KeePass by Dominik Reichl. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.</string>
   <string name="CreditsTextSFTP">SFTP support is implemented using the JSch library under BSD licence, created by JCraft, Inc.</string>
   <string name="accept">Accept</string>
+  <string name="deny">Deny</string>
   <string name="add_entry">Add entry</string>
   <string name="add_url_entry">Create entry for URL</string>
   <string name="add_group">Add group</string>
@@ -79,7 +80,7 @@
   <string name="error_invalid_db">Invalid database.</string>
   <string name="error_invalid_path">Invalid path.</string>
   <string name="error_no_name">A name is required.</string>
-  <string name="error_nopass">A password or a keyfile is required.</string>
+  <string name="error_nopass">A password or a key file is required.</string>
   <string name="error_pass_gen_type">At least one password generation type must be selected</string>
   <string name="error_pass_match">Passwords do not match.</string>
   <string name="error_rounds_not_number">Rounds must be a number.</string>
@@ -150,8 +151,8 @@
   <string name="progress_create">Creating new database…</string>
   <string name="create_database">Create database</string>
   <string name="progress_title">Working…</string>
-  <string name="remember_keyfile_summary">Remembers the location of keyfiles</string>
-  <string name="remember_keyfile_title">Save keyfile</string>
+  <string name="remember_keyfile_summary">Remembers the location of key files</string>
+  <string name="remember_keyfile_title">Save key file</string>
   <string name="remove_from_filelist">Remove</string>
   <string name="rijndael">Rijndael (AES)</string>
   <string name="root">Root</string>
@@ -250,6 +251,11 @@
   <string name="UseFileTransactions_summary">Use file transactions for writing databases</string>
 	<string name="LockWhenScreenOff_title">Lock when screen off</string>
   <string name="LockWhenScreenOff_summary">Lock the database when screen is switched off.</string>
+	
+	<string name="LockWhenNavigateBack_title">Lock when leaving app</string>
+	<string name="LockWhenNavigateBack_summary">Lock the database when leaving the app by pressing the back button.</string>
+
+	
 	<string name="UseOfflineCache_title">Database caching</string>
 	<string name="UseOfflineCache_summary">Keep a copy of remote database files in the application cache directory. This allows to use remote databases even when offline.</string>
 
@@ -383,7 +389,7 @@
 	<string name="hint_key_file">Choose if you want to use a key file in addition to your master password:</string>
 	<string name="use_key_file">Use key file</string>
 
-	<string name="error_adding_keyfile">Error while adding the keyfile!</string>
+	<string name="error_adding_keyfile">Error while adding the key file!</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>
@@ -401,16 +407,23 @@
 	<string name="SavingOtpAuxFile">Saving auxiliary OTP file…</string>
 
 	<string name="loading">Loading…</string>
-	
-	<string name="enable_plugin_title">Enable plug-in?</string>
-	<string name="enable_plugin_question">Keepass2Android detected a plug-in with name: %1$s from package name: %2$s. Do you want to enable this plug-in? It will have access to the data stored in your Keepass databases.</string>
-	
+		
 	<string name="plugins">Plug-ins</string>
 	<string name="plugin_packagename">Package name:</string>
 	<string name="plugin_description">Description (not verified):</string>
 	<string name="plugin_author">Author (not verified):</string>
-	<string name="plugin_enabled">Enabled</string>
-	<string name="plugins_text">Click plug-in to enable/disable</string>
+	<string name="plugin_enabled">enabled</string>
+	<string name="plugin_disabled">disabled</string>
+	<string name="plugin_web">Find plug-ins online</string>
+	
+	<string name="plugin_enabled_checkbox">Enabled</string>
+
+	<string name="SCOPE_DATABASE_ACTIONS_title">Database action notifications</string>
+	<string name="SCOPE_DATABASE_ACTIONS_explanation">Plugin will be notified when a database is opened, closed or saved.</string>
+
+	<string name="SCOPE_CURRENT_ENTRY_title">Current entry data</string>
+	<string name="SCOPE_CURRENT_ENTRY_explanation">Plugin will receive all data about the current database entry and will be allowed to offer actions and modify the display of it.</string>
+
 
 	<string name="get_regular_version">Get more storage types</string>
 
diff --git a/src/keepass2android/Resources/values/styles.xml b/src/keepass2android/Resources/values/styles.xml
index 3becb33f..5e577d56 100644
--- a/src/keepass2android/Resources/values/styles.xml
+++ b/src/keepass2android/Resources/values/styles.xml
@@ -19,24 +19,19 @@
 -->
 <resources>
 	<style name="Base">
-		<item name="OpenFileDrawable">@drawable/collections_collection</item>
-		<item name="CreateDbDrawable">@drawable/collections_new_label</item>
-		<item name="OpenUrlDrawable">@drawable/location_web_site</item>
-		<item name="ic_action_search_drawable">@drawable/ic_action_search_holodark</item>
-		<item name="ic_launcher_folder_small">@drawable/ic_launcher_folder_small</item>
 	</style>
 	<style name="NoTitleBar"></style>
-    <style name="Dialog" parent="android:Theme.Dialog"></style>
+	<style name="Dialog" parent="android:Theme.Dialog"></style>
 	<style name="GroupTextSmall" parent="android:Theme">
-		<item name="@android:textColor">@color/group</item>
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
 		<item name="@android:textSize">15sp</item>
 	</style>
 	<style name="GroupText" parent="android:Theme">
-		<item name="@android:textColor">@color/group</item>
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
 		<item name="@android:textSize">20sp</item>
 	</style>
 	<style name="GroupTextLarge" parent="android:Theme">
-		<item name="@android:textColor">@color/group</item>
+		<item name="@android:textColor">?android:attr/textColorPrimary</item>
 		<item name="@android:textSize">28sp</item>
 	</style>
 	<style name="ElementTextSmall">
@@ -68,58 +63,149 @@
 		<item name="@android:textSize">12sp</item>
 		<item name="@android:background">#222222</item>
 	</style>
-	<style name="EntryFieldHeader" parent="WhiteOnDarkSmall">
-		<item name="@android:textSize">12sp</item>
-	</style>
 	<style name="ElementTextTitle" parent="WhiteOnBlack">
 		<item name="@android:textColor">@color/group</item>
 		<item name="@android:background">@android:color/transparent</item>
 	</style>
 	<style name="EntryItem">
-		<item name="@android:padding">5sp</item>
+		<item name="android:layout_marginLeft">12dip</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="android:textColor">?android:attr/textColorSecondary</item>
+		<item name="android:textSize">18sp</item>
 	</style>
 	<style name="MinusButton">
-        <item name="android:src">@drawable/ic_menu_remove_field_holo_light</item>
-    </style>
+		<item name="android:src">@drawable/ic_menu_remove_field_holo_light</item>
+	</style>
 	<style name="EntryFieldHeader">
-        <item name="android:drawableBottom">@drawable/section_header</item>
-        <item name="android:drawablePadding">1dp</item>
-        <item name="android:layout_marginBottom">3dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:paddingLeft">4dp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/emphasis</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="@android:background">@android:color/transparent</item>
-    </style>
-	<style name="InfoHeader">
 		<item name="android:drawableBottom">@drawable/section_header</item>
-		<item name="android:drawablePadding">1dp</item>
+		<item name="android:drawablePadding">2dp</item>
+		<item name="android:layout_marginLeft">12dip</item>
+		<item name="android:layout_marginRight">12dip</item>
 		<item name="android:layout_marginBottom">3dp</item>
 		<item name="android:layout_marginTop">8dp</item>
-		<item name="android:paddingLeft">0dp</item>
+		<item name="android:paddingLeft">4dp</item>
 		<item name="android:textAllCaps">true</item>
-		<item name="android:textColor">@color/emphasis</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:textSize">18sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
+	<style name="InfoHeader">
+		<item name="android:drawableBottom">@drawable/section_header</item>
+		<item name="android:drawablePadding">2dp</item>
+		<item name="android:layout_marginLeft">0dip</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginBottom">3dp</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
 		<item name="android:textSize">14sp</item>
 		<item name="android:textStyle">bold</item>
-		<item name="@android:background">@android:color/transparent</item>
 	</style>
-    
-    <style name="EditEntryButton">
-    </style>
 
-	<style name="ExtraFieldHeader">
-        <item name="android:drawablePadding">1dp</item>
-        <item name="android:layout_marginBottom">3dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:paddingLeft">4dp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/emphasis2</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="@android:background">@android:color/transparent</item>
-    </style>
+	<style name="BottomBarActionButton">
+		<item name="android:background">?android:attr/selectableItemBackground</item>
+	</style>
+
+	<style name="TextAppearance_EditEntry_Small">
+		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+		<item name="android:textSize">14sp</item>
+		<item name="android:textColor">?android:attr/textColorSecondary</item>
+		<item name="android:textAllCaps">true</item>
+	</style>
+
+
+	<style name="TextAppearance_EditEntry_LabelSmall" parent="TextAppearance_EditEntry_Small">
+		<item name="android:minHeight">24dip</item>
+		<item name="android:layout_width">144dip</item>
+		<item name="android:layout_marginTop">12dip</item>
+		<item name="android:layout_marginLeft">16dip</item>
+		<item name="android:layout_marginRight">16dip</item>
+		<item name="android:paddingLeft">8dip</item>
+		<item name="android:paddingRight">8dip</item>
+		<item name="android:layout_marginBottom">-12dip</item>
+	</style>
+
+	<style name="TextAppearance_EditEntry">
+		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+		<item name="android:textSize">18sp</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+	</style>
+
+	<style name="TextAppearance_EditEntry_Value" parent="TextAppearance_EditEntry">
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginLeft">12dip</item>
+	</style>
+
+	<style name="TextAppearance_SmallHeading" parent="TextAppearance_EditEntry_Small">
+		<item name="android:minHeight">24dip</item>
+		<item name="android:layout_width">144dip</item>
+		<item name="android:layout_marginTop">12dip</item>
+		<item name="android:layout_marginRight">16dip</item>
+		<item name="android:paddingRight">8dip</item>
+		<item name="android:layout_marginBottom">-12dip</item>
+	</style>
+
+	<style name="TextAppearance_SubElement">
+		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+		<item name="android:textSize">18sp</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginLeft">12dip</item>
+	</style>
+
+	<style name="TextAppearance_Help">
+		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+		<item name="android:textSize">24sp</item>
+		<item name="android:paddingLeft">12sp</item>
+		<item name="android:paddingRight">12sp</item>
+		<item name="android:paddingBottom">12sp</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:layout_gravity">center_vertical</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginLeft">12dip</item>
+	</style>
+
+
+	<style name="EditEntryButton">
+		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+		<item name="android:layout_marginTop">12dip</item>
+		<item name="android:layout_marginLeft">24dip</item>
+		<item name="android:layout_marginRight">24dip</item>
+		<item name="android:paddingLeft">8dip</item>
+		<item name="android:paddingRight">8dip</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:background">?android:attr/selectableItemBackground</item>
+	</style>
+
+	<style name="AdditionalStringLayout">
+		<item name="android:layout_marginLeft">24dip</item>
+		<item name="android:layout_marginRight">24dip</item>
+	</style>
+
+
+	<style name="MinusButton">
+		<item name="android:background">?android:attr/selectableItemBackground</item>
+		<item name="android:src">@drawable/ic_menu_remove_field_holo_light</item>
+	</style>
+
+	<style name="ExtraFieldHeader" parent="android:Widget.Holo.Light.TextView">
+		<item name="android:layout_marginLeft">16dip</item>
+		<item name="android:layout_marginRight">12dip</item>
+		<item name="android:layout_marginBottom">3dp</item>
+		<item name="android:layout_marginTop">4dp</item>
+		<item name="android:paddingLeft">4dp</item>
+		<item name="android:textAllCaps">true</item>
+		<item name="android:textColor">?android:attr/textColorPrimary</item>
+		<item name="android:textSize">14sp</item>
+		<item name="android:textStyle">bold</item>
+	</style>
 
 	<style name="PaddedContainer">
 		<item name="android:layout_width">match_parent</item>
diff --git a/src/keepass2android/Resources/values-v14/styles_dark.xml b/src/keepass2android/Resources/values/styles_dark.xml
similarity index 100%
rename from src/keepass2android/Resources/values-v14/styles_dark.xml
rename to src/keepass2android/Resources/values/styles_dark.xml
diff --git a/src/keepass2android/Resources/values-v14/styles_light.xml b/src/keepass2android/Resources/values/styles_light.xml
similarity index 100%
rename from src/keepass2android/Resources/values-v14/styles_light.xml
rename to src/keepass2android/Resources/values/styles_light.xml
diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android/Resources/xml/preferences.xml
index b304e05a..673eb6ca 100644
--- a/src/keepass2android/Resources/xml/preferences.xml
+++ b/src/keepass2android/Resources/xml/preferences.xml
@@ -88,6 +88,14 @@
 				 android:title="@string/LockWhenScreenOff_title"
 				 android:key="@string/LockWhenScreenOff_key" />
 
+			<CheckBoxPreference
+			   android:enabled="true"
+				 android:persistent="true"
+				 android:summary="@string/LockWhenNavigateBack_summary"
+				 android:defaultValue="false"
+				 android:title="@string/LockWhenNavigateBack_title"
+				 android:key="@string/LockWhenNavigateBack_key" />
+
 			<CheckBoxPreference
 				android:key="@string/RememberRecentFiles_key"
 				android:title="@string/RememberRecentFiles_title"
@@ -284,4 +292,8 @@
 		
 
 	</PreferenceScreen>
+
+	<PreferenceScreen android:key="plugin_key" android:title="@string/plugins">
+		<intent android:action="keepass2android.PluginListActivity"/>
+	</PreferenceScreen>
 </PreferenceScreen>
diff --git a/src/keepass2android/Resources/layout-v14/icon_picker.xml b/src/keepass2android/Resources/xml/searchable_debug.xml
similarity index 61%
rename from src/keepass2android/Resources/layout-v14/icon_picker.xml
rename to src/keepass2android/Resources/xml/searchable_debug.xml
index 7c6d2090..2d7c017b 100644
--- a/src/keepass2android/Resources/layout-v14/icon_picker.xml
+++ b/src/keepass2android/Resources/xml/searchable_debug.xml
@@ -1,30 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
-     
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android 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 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-   android:id="@+id/IconGridView" 
-   android:layout_width="fill_parent"
-   android:layout_height="fill_parent" 
-   android:background="@android:color/background_light"
-   android:verticalSpacing="5dp"
-   android:horizontalSpacing="5dp"
-   android:columnWidth="60dp" 
-   android:numColumns="auto_fit"
-   android:stretchMode="columnWidth">
-</GridView>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 
+     
+ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
+
+  Keepass2Android 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 2 of the License, or
+  (at your option) any later version.
+
+  Keepass2Android 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 Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/search_label"
+    android:hint="@string/search_hint" 
+    android:searchMode="showSearchLabelAsBadge"
+    android:searchSuggestAuthority="keepass2android.keepass2android_debug.SearchProvider"
+    android:searchSuggestSelection=" ?"
+    android:searchSuggestThreshold="2"
+    android:searchSuggestIntentAction="android.intent.action.VIEW"
+    android:searchSuggestIntentData="content://keepass2android.EntryActivity"
+ />
\ No newline at end of file
diff --git a/src/keepass2android/ShareUrlResults.cs b/src/keepass2android/ShareUrlResults.cs
index feed86fd..81974719 100644
--- a/src/keepass2android/ShareUrlResults.cs
+++ b/src/keepass2android/ShareUrlResults.cs
@@ -62,27 +62,12 @@ namespace keepass2android
 			SetResult(KeePass.ExitCloseAfterTaskComplete);
 
 			_db = App.Kp2a.GetDb();
-
-			String searchUrl = ((SearchUrlTask)AppTask).UrlToSearchFor;
-			
-			if (!_db.Loaded)
+			if (App.Kp2a.DatabaseIsUnlocked)
 			{
-				Intent intent = new Intent(this, typeof(FileSelectActivity));
-				AppTask.ToIntent(intent);
-				intent.AddFlags(ActivityFlags.ClearTask | ActivityFlags.NewTask);
-				StartActivityForResult(intent, 0);
-
-				Finish();
-			}
-			else if (App.Kp2a.QuickLocked)
-			{
-				PasswordActivity.Launch(this,_db.Ioc, AppTask);
-				Finish();
-			}
-			else
-			{
-				Query(searchUrl);
+				String searchUrl = ((SearchUrlTask)AppTask).UrlToSearchFor;
+				Query(searchUrl);	
 			}
+			// else: LockCloseListActivity.OnResume will trigger a broadcast (LockDatabase) which will cause the activity to be finished.
 			
 		}
 
@@ -99,8 +84,7 @@ namespace keepass2android
 		}
 		
 		private void Query(String url)
-		{
-			
+		{	
 			try
 			{
 				//first: search for exact url
@@ -180,7 +164,8 @@ namespace keepass2android
 			{
 				Finish();
 				return true;
-			} else
+			} 
+			else
 			{
 				return false;
 			}
diff --git a/src/keepass2android/Utils/Util.cs b/src/keepass2android/Utils/Util.cs
index 8e37af0a..71214d6f 100644
--- a/src/keepass2android/Utils/Util.cs
+++ b/src/keepass2android/Utils/Util.cs
@@ -322,7 +322,13 @@ namespace keepass2android
 			((Spinner)dialog.FindViewById(Resource.Id.cred_remember_mode)).SetSelection((int)ioc.CredSaveMode);
 		}
 
-		
+
+		public static void FinishAndForward(Activity activity, Intent i)
+		{
+			i.SetFlags(ActivityFlags.ForwardResult);
+			activity.StartActivity(i);
+			activity.Finish();
+		}
 	}
 }
 
diff --git a/src/keepass2android/app/App.cs b/src/keepass2android/app/App.cs
index f76f3610..1a9fa809 100644
--- a/src/keepass2android/app/App.cs
+++ b/src/keepass2android/app/App.cs
@@ -67,15 +67,17 @@ namespace keepass2android
 #endif
 
 		public const int AppNameResource = Resource.String.app_name;
-		public const string AppNameShort = "@string/short_app_name";
-		public const string AppLauncherTitle = "@string/app_name";
+		public const string AppNameShort = "@string/short_app_name" + "DBG";
+		public const string AppLauncherTitle = "@string/app_name" + " Debug";
 #if DEBUG
 		public const string PackagePart = "keepass2android_debug";
+		public const string Searchable = "@xml/searchable_debug";
 #else
 		public const string PackagePart = "keepass2android";
+		public const string Searchable = "@xml/searchable";
 #endif
 		public const int LauncherIcon = Resource.Drawable.ic_launcher;
-		public const string Searchable = "@xml/searchable";
+		
 	}
 #endif
 	/// <summary>
diff --git a/src/keepass2android/app/AppTask.cs b/src/keepass2android/app/AppTask.cs
index 1961a432..c1161cd4 100644
--- a/src/keepass2android/app/AppTask.cs
+++ b/src/keepass2android/app/AppTask.cs
@@ -48,6 +48,29 @@ namespace keepass2android
 		#endregion
 	}
 
+	/// <summary>
+	/// represents data stored in an intent or bundle as extra string array
+	/// </summary>
+	public class StringArrayExtra : IExtra
+	{
+		public string Key { get; set; }
+		public string[] Value { get; set; }
+
+		#region IExtra implementation
+
+		public void ToBundle(Bundle b)
+		{
+			b.PutStringArray(Key, Value);
+		}
+
+		public void ToIntent(Intent i)
+		{
+			i.PutExtra(Key, Value);
+		}
+
+		#endregion
+	}
+
 	/// <summary>
 	/// base class for "tasks": these are things the user wants to do and which require several activities
 	/// </summary>
@@ -82,11 +105,6 @@ namespace keepass2android
 		{
 		}
 
-		public virtual bool CloseEntryActivityAfterCreate
-		{
-			get { return false;}
-		}
-
 		
 		public virtual void PrepareNewEntry(PwEntry newEntry)
 		{
@@ -210,7 +228,10 @@ namespace keepass2android
 		public static bool TryGetFromActivityResult(Intent data, ref AppTask task)
 		{
 			if (data == null)
+			{
+				Kp2aLog.Log("TryGetFromActivityResult: no data");
 				return false;
+			}
 			AppTask tempTask = CreateFromBundle(data.Extras, null);
 			if (tempTask == null)
 			{
@@ -230,9 +251,9 @@ namespace keepass2android
 
 		}
 
-		public virtual void OnCompleteCreateEntryActivity(EntryActivity entryActivity)
+		public virtual void CompleteOnCreateEntryActivity(EntryActivity activity)
 		{
-			entryActivity.CompleteOnCreate();
+			activity.StartNotificationsService(false);
 		}
 	}
 
@@ -271,14 +292,30 @@ namespace keepass2android
 		public override void AfterUnlockDatabase(PasswordActivity act)
 		{
 			ShareUrlResults.Launch(act, this);
-			RemoveTaskFromIntent(act);
-			act.AppTask = new NullTask();
+
+			//removed. this causes an issue in the following workflow:
+			//When the user wants to find an entry for a URL but has the wrong database open he needs 
+			//to switch to another database. But the Task is removed already the first time when going through PasswordActivity 
+			// (with the wrong db).
+			//Then after switching to the right database, the task is gone.
+
+			//A reason this code existed was the following workflow:
+			//Using Chrome browser (with NEW_TASK flag for ActionSend): Share URL -> KP2A.
+			//Now the AppTask was in PasswordActivity and didn't get out of it.
+			//This is now solved by returning new tasks in ActivityResult.
+
+			//RemoveTaskFromIntent(act);
+			//act.AppTask = new NullTask();
 		}
 
-		public override bool CloseEntryActivityAfterCreate
+		public override void CompleteOnCreateEntryActivity(EntryActivity activity)
 		{
-			get { return true;}
+			//show the notifications
+			activity.StartNotificationsService(true);
+			//close
+			activity.CloseAfterTaskComplete();
 		}
+
 	}
 
 	
@@ -287,11 +324,12 @@ namespace keepass2android
 	/// </summary>
 	public class SelectEntryTask: AppTask
 	{
-
-		public override bool CloseEntryActivityAfterCreate
+		public override void CompleteOnCreateEntryActivity(EntryActivity activity)
 		{
-			//keypoint here: close the app after selecting the entry
-			get { return true;}
+			//show the notifications
+			activity.StartNotificationsService(true);
+			//close
+			activity.CloseAfterTaskComplete();
 		}
 	}
 
@@ -334,17 +372,49 @@ namespace keepass2android
 			}
 		}
 
-		public override bool CloseEntryActivityAfterCreate
-		{
-			get { return true; }
-		}
-
-		public override void OnCompleteCreateEntryActivity(EntryActivity entryActivity)
+		public override void CompleteOnCreateEntryActivity(EntryActivity activity)
 		{
 			//if the database is readonly, don't offer to modify the URL
 			if (App.Kp2a.GetDb().CanWrite == false)
-				base.OnCompleteCreateEntryActivity(entryActivity);
-			entryActivity.AskAddUrlThenCompleteCreate(UrlToSearchFor);
+			{
+				ShowNotificationsAndClose(activity);
+				return;
+			}
+
+
+			AskAddUrlThenCompleteCreate(activity, UrlToSearchFor);
+
+		}
+
+		private static void ShowNotificationsAndClose(EntryActivity activity)
+		{
+			activity.StartNotificationsService(true);
+			activity.CloseAfterTaskComplete();
+		}
+
+		/// <summary>
+		/// brings up a dialog asking the user whether he wants to add the given URL to the entry for automatic finding
+		/// </summary>
+		public void AskAddUrlThenCompleteCreate(EntryActivity activity, string url)
+		{
+			AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+			builder.SetTitle(activity.GetString(Resource.String.AddUrlToEntryDialog_title));
+
+			builder.SetMessage(activity.GetString(Resource.String.AddUrlToEntryDialog_text, new Java.Lang.Object[] { url }));
+
+			builder.SetPositiveButton(activity.GetString(Resource.String.yes), (dlgSender, dlgEvt) =>
+			{
+				activity.AddUrlToEntry(url, () => ShowNotificationsAndClose(activity));
+			});
+
+			builder.SetNegativeButton(activity.GetString(Resource.String.no), (dlgSender, dlgEvt) =>
+			{
+				ShowNotificationsAndClose(activity);
+			});
+
+			Dialog dialog = builder.Create();
+			dialog.Show();
+
 		}
 		
 	}
@@ -390,45 +460,85 @@ namespace keepass2android
 	/// </summary>
 	public class CreateEntryThenCloseTask: AppTask
 	{
+		/// <summary>
+		/// extra key if only a URL is passed. optional.
+		/// </summary>
 		public const String UrlKey = "CreateEntry_Url";
+		
+		/// <summary>
+		/// extra key if a json serialized key/value mapping is passed. optional.
+		/// </summary>
+		/// Uses the PluginSDKs keys because this is mainly used for communicating with plugins.
+		/// Of course the data might also contain "non-output-data" (e.g. placeholders), but usually won't.
+		public const String AllFieldsKey = Keepass2android.Pluginsdk.Strings.ExtraEntryOutputData;
 
-		public string Url
-		{
-			get;
-			set;
-		}
+		/// <summary>
+		/// extra key to specify a list of protected field keys in AllFieldsKey. Passed as StringArrayExtra. optional.
+		/// </summary>
+		public const String ProtectedFieldsListKey = Keepass2android.Pluginsdk.Strings.ExtraProtectedFieldsList;
+
+		public string Url { get; set; }
+
+		public string AllFields { get; set; }
+
+		public string[] ProtectedFieldsList { get; set; }
 
 		public override void Setup(Bundle b)
 		{
 			Url = b.GetString(UrlKey);
+			AllFields = b.GetString(AllFieldsKey);
+			ProtectedFieldsList = b.GetStringArray(ProtectedFieldsListKey);
 		}
 		public override IEnumerable<IExtra> Extras 
 		{ 
 			get
 			{
-				yield return new StringExtra { Key = UrlKey, Value = Url };
+				if (Url != null)
+					yield return new StringExtra { Key = UrlKey, Value = Url };
+				if (AllFields != null)
+					yield return new StringExtra { Key = AllFieldsKey, Value = AllFields };
+				if (ProtectedFieldsList != null)
+					yield return new StringArrayExtra { Key = ProtectedFieldsListKey, Value = ProtectedFieldsList };
 			}
 		}
 		
 		
 		public override void PrepareNewEntry(PwEntry newEntry)
 		{
-			newEntry.Strings.Set(PwDefs.UrlField, new ProtectedString(false, Url));
+			if (Url != null)
+			{
+				newEntry.Strings.Set(PwDefs.UrlField, new ProtectedString(false, Url));
+			}
+			if (AllFields != null)
+			{
+				IList<string> protectedFieldsKeys = new List<string>();
+				if (ProtectedFieldsList != null)
+				{
+					protectedFieldsKeys = new Org.Json.JSONArray(ProtectedFieldsList).ToArray<string>();
+				}
+				var allFields = new Org.Json.JSONObject(AllFields);
+				for (var iter = allFields.Keys(); iter.HasNext; )
+				{
+					string key = iter.Next().ToString();
+					string value = allFields.Get(key).ToString();
+					bool isProtected = protectedFieldsKeys.Contains(key) || key == PwDefs.PasswordField;
+					newEntry.Strings.Set(key, new ProtectedString(isProtected, value));
+				}
+				
+			}
 					
 		}
 
 		public override void AfterAddNewEntry(EntryEditActivity entryEditActivity, PwEntry newEntry)
 		{
-			EntryActivity.Launch(entryEditActivity, newEntry, -1, new SelectEntryTask());
-			entryEditActivity.SetResult
-				(KeePass.ExitCloseAfterTaskComplete);
+			EntryActivity.Launch(entryEditActivity, newEntry, -1, new SelectEntryTask(), ActivityFlags.ForwardResult);
 			//no need to call Finish here, that's done in EntryEditActivity ("closeOrShowError")	
 		}
 		
-		public override bool CloseEntryActivityAfterCreate
+		public override void CompleteOnCreateEntryActivity(EntryActivity activity)
 		{
 			//if the user selects an entry before creating the new one, we're not closing the app
-			get { return false;}
+			base.CompleteOnCreateEntryActivity(activity);
 		}
 	}
 }
diff --git a/src/keepass2android/fileselect/FileSelectActivity.cs b/src/keepass2android/fileselect/FileSelectActivity.cs
index 88d0cf96..4dedb38c 100644
--- a/src/keepass2android/fileselect/FileSelectActivity.cs
+++ b/src/keepass2android/fileselect/FileSelectActivity.cs
@@ -44,7 +44,7 @@ namespace keepass2android
 		DataMimeType="text/plain")]
 	public class FileSelectActivity : ListActivity
 	{
-		private ActivityDesign _design;
+		private readonly ActivityDesign _design;
 		public FileSelectActivity (IntPtr javaReference, JniHandleOwnership transfer)
 			: base(javaReference, transfer)
 		{
@@ -83,7 +83,15 @@ namespace keepass2android
 			}
 			else
 			{
-				AppTask = AppTask.CreateFromIntent(Intent);
+				//see PasswordActivity for an explanation
+				if ((savedInstanceState == null) && (Intent.Flags.HasFlag(ActivityFlags.LaunchedFromHistory)))
+				{
+					AppTask = new NullTask();
+				}
+				else
+				{
+					AppTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);
+				}
 			}
 
 
@@ -136,7 +144,9 @@ namespace keepass2android
 			EventHandler createNewButtonClick = (sender, e) =>
 				{
 					//ShowFilenameDialog(false, true, true, Android.OS.Environment.ExternalStorageDirectory + GetString(Resource.String.default_file_path), "", Intents.RequestCodeFileBrowseForCreate)
-					StartActivityForResult(typeof (CreateDatabaseActivity), 0);
+					Intent i = new Intent(this, typeof (CreateDatabaseActivity));
+					this.AppTask.ToIntent(i);
+					StartActivityForResult(i, 0);
 				};
 			createNewButton.Click += createNewButtonClick;
 
@@ -193,11 +203,11 @@ namespace keepass2android
 		
 		class MyViewBinder: Java.Lang.Object, SimpleCursorAdapter.IViewBinder
 		{
-			private Kp2aApp app;
+			private readonly Kp2aApp _app;
 
 			public MyViewBinder(Kp2aApp app)
 			{
-				this.app = app;
+				_app = app;
 			}
 
 			public bool SetViewValue(View view, ICursor cursor, int columnIndex)
@@ -207,7 +217,7 @@ namespace keepass2android
 					String path = cursor.GetString(columnIndex);
 					TextView textView = (TextView)view;
 					IOConnectionInfo ioc = new IOConnectionInfo {Path = path};
-					textView.Text = app.GetFileStorage(ioc).GetDisplayName(ioc);
+					textView.Text = _app.GetFileStorage(ioc).GetDisplayName(ioc);
 					textView.Tag = ioc.Path;
 					return true;
 				}
@@ -299,8 +309,14 @@ namespace keepass2android
 		{
 			base.OnActivityResult(requestCode, resultCode, data);
 
+			//update app task.
+			//this is important even if we're about to close, because then we should get a NullTask here 
+			//in order not to do the same task next time again!
+			AppTask.TryGetFromActivityResult(data, ref AppTask);
+
 			if (resultCode == KeePass.ExitCloseAfterTaskComplete)
 			{
+				//no need to set the result ExitCloseAfterTaskComplete here, there's no parent Activity on the stack
 				Finish();
 				return;
 			}
@@ -421,9 +437,7 @@ namespace keepass2android
 			if (ShowRecentFiles() != _recentMode)
 			{
 				// Restart the activity
-				Intent intent = Intent;
-				StartActivity(intent);
-				Finish();
+				Recreate();
 				return;
 			}
 
diff --git a/src/keepass2android/intents/Intents.cs b/src/keepass2android/intents/Intents.cs
index 0b57d5df..888e455c 100644
--- a/src/keepass2android/intents/Intents.cs
+++ b/src/keepass2android/intents/Intents.cs
@@ -25,6 +25,7 @@ namespace keepass2android
 	public class Intents 
 	{
 		
+
 		/// <summary>Broadcast this intent to lock the database (with quick unlock if enabled)</summary>
 		public const String LockDatabase = "keepass2android.lock_database";
 		/// <summary>Broadcast this intent to close the database (no quick unlock, full close)</summary>
@@ -50,6 +51,8 @@ namespace keepass2android
 		public const int RequestCodeFileBrowseForKeyfile = 987324;
 
 		public const String ShowNotification = "keepass2android.show_notification";
+		public const String UpdateKeyboard = "keepass2android.update_keyboard";
+		public const String CopyStringToClipboard = "keepass2android.copy_string_to_clipboard";
 	}
 
 }
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 62735481..c48bae4a 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -30,7 +30,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;EXCLUDE_TWOFISH;INCLUDE_KEYBOARD;INCLUDE_FILECHOOSER;INCLUDE_JAVAFILESTORAGE;INCLUDE_KEYTRANSFORM</DefineConstants>
+    <DefineConstants>DEBUG;EXCLUDE_TWOFISH;EXCLUDE_KEYBOARD;EXCLUDE_FILECHOOSER;EXCLUDE_JAVAFILESTORAGE;EXCLUDE_KEYTRANSFORM</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
@@ -99,6 +99,17 @@
     <Compile Include="app\OtpAuxCacheSupervisor.cs" />
     <Compile Include="CreateDatabaseActivity.cs" />
     <Compile Include="CreateNewFilename.cs" />
+    <Compile Include="EntryActivityClasses\CopyToClipboardPopupMenuIcon.cs" />
+    <Compile Include="EntryActivityClasses\ExtraStringView.cs" />
+    <Compile Include="EntryActivityClasses\GotoUrlMenuItem.cs" />
+    <Compile Include="EntryActivityClasses\IPopupMenuItem.cs" />
+    <Compile Include="EntryActivityClasses\IStringView.cs" />
+    <Compile Include="EntryActivityClasses\OpenBinaryPopupItem.cs" />
+    <Compile Include="EntryActivityClasses\PluginMenuOption.cs" />
+    <Compile Include="EntryActivityClasses\PluginPopupMenuItem.cs" />
+    <Compile Include="EntryActivityClasses\StandardStringView.cs" />
+    <Compile Include="EntryActivityClasses\ToggleVisibilityPopupMenuItem.cs" />
+    <Compile Include="EntryActivityClasses\WriteBinaryToFilePopupItem.cs" />
     <Compile Include="ExportDatabaseActivity.cs" />
     <Compile Include="fileselect\FileChooserFileProvider.cs" />
     <Compile Include="fileselect\FileStorageSetupActivity.cs" />
@@ -110,6 +121,11 @@
     <Compile Include="icons\DrawableFactory.cs" />
     <Compile Include="icons\Icons.cs" />
     <Compile Include="NfcOtpActivity.cs" />
+    <Compile Include="pluginhost\PluginArrayAdapter.cs" />
+    <Compile Include="pluginhost\PluginDatabase.cs" />
+    <Compile Include="pluginhost\PluginDetailsActivity.cs" />
+    <Compile Include="pluginhost\PluginHost.cs" />
+    <Compile Include="pluginhost\PluginListActivity.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="KeePass.cs" />
@@ -138,7 +154,6 @@
     <Compile Include="views\PwGroupView.cs" />
     <Compile Include="settings\PrefsUtil.cs" />
     <Compile Include="views\PwEntryView.cs" />
-    <Compile Include="views\GroupHeaderView.cs" />
     <Compile Include="GroupEditActivity.cs" />
     <Compile Include="EntryEditActivity.cs" />
     <Compile Include="LockCloseActivity.cs" />
@@ -183,6 +198,11 @@
     <None Include="filelist.txt">
       <Visible>False</Visible>
     </None>
+    <AndroidResource Include="Resources\drawable-ldpi\Thumbs.db" />
+    <AndroidResource Include="Resources\drawable-mdpi\Thumbs.db" />
+    <AndroidResource Include="Resources\drawable-xhdpi\Thumbs.db" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\Thumbs.db" />
+    <AndroidResource Include="Resources\drawable-hdpi\Thumbs.db" />
     <None Include="Resources\drawable\launcher.png">
       <Visible>False</Visible>
     </None>
@@ -210,6 +230,7 @@
     <AndroidResource Include="Resources\layout\sftpcredentials.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
+    <AndroidResource Include="Resources\drawable\Thumbs.db" />
     <None Include="settings\RoundsPreference %28Kopie%29.cs">
       <Visible>False</Visible>
     </None>
@@ -219,7 +240,6 @@
     <None Include="Resources\drawable\new_group_dark.xcf">
       <Visible>False</Visible>
     </None>
-    <None Include="Resources\drawable-v11\EntryFieldHeaderBackground.xml" />
     <None Include="todos.cs">
       <Visible>False</Visible>
     </None>
@@ -340,11 +360,12 @@
     <AndroidResource Include="Resources\layout\file_selection.xml" />
     <AndroidResource Include="Resources\layout\file_selection_filename.xml" />
     <AndroidResource Include="Resources\layout\file_selection_no_recent.xml" />
-    <AndroidResource Include="Resources\layout\generate_password.xml" />
+    <AndroidResource Include="Resources\layout\generate_password.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\layout\group_add_entry.xml" />
     <AndroidResource Include="Resources\layout\group_edit.xml" />
     <AndroidResource Include="Resources\layout\group_empty.xml" />
-    <AndroidResource Include="Resources\layout\group_header.xml" />
     <AndroidResource Include="Resources\layout\group_list_entry.xml" />
     <AndroidResource Include="Resources\layout\icon.xml" />
     <AndroidResource Include="Resources\layout\icon_picker.xml" />
@@ -368,13 +389,6 @@
     <AndroidResource Include="Resources\values\strings.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
-    <AndroidResource Include="Resources\menu-v11\entry.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-    <AndroidResource Include="Resources\menu-v11\password.xml" />
-    <AndroidResource Include="Resources\menu-v11\entry_edit.xml" />
-    <AndroidResource Include="Resources\menu-v11\group.xml" />
-    <AndroidResource Include="Resources\menu-v11\fileselect.xml" />
     <AndroidResource Include="Resources\drawable\ic_launcher.png" />
     <AndroidResource Include="Resources\drawable-hdpi\ic00.png" />
     <AndroidResource Include="Resources\drawable-hdpi\ic01.png" />
@@ -533,7 +547,6 @@
     <AndroidResource Include="Resources\drawable-mdpi\navigation_previous_item.png" />
     <AndroidResource Include="Resources\drawable-hdpi\navigation_previous_item.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\navigation_previous_item.png" />
-    <AndroidResource Include="Resources\drawable\HeaderButtonBackground.xml" />
     <AndroidResource Include="Resources\drawable\EntryFieldHeaderBackground.xml" />
     <AndroidResource Include="Resources\drawable\navigation_accept.png" />
     <AndroidResource Include="Resources\drawable-hdpi\navigation_accept.png" />
@@ -605,20 +618,6 @@
     <AndroidResource Include="Resources\drawable\ic_menu_add_field_holo_light.png" />
     <AndroidResource Include="Resources\drawable\ic_menu_remove_field_holo_light.png" />
     <AndroidResource Include="Resources\drawable\navigation_cancel.png" />
-    <AndroidResource Include="Resources\values-v14\styles.xml" />
-    <AndroidResource Include="Resources\values-v14\colors.xml" />
-    <AndroidResource Include="Resources\layout-v14\entry_view_contents.xml" />
-    <AndroidResource Include="Resources\layout-v14\group_add_entry.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-    <AndroidResource Include="Resources\layout-v14\entry_view.xml" />
-    <AndroidResource Include="Resources\layout-v14\entry_edit.xml" />
-    <AndroidResource Include="Resources\layout-v14\SaveButton.xml" />
-    <AndroidResource Include="Resources\layout-v14\generate_password.xml" />
-    <AndroidResource Include="Resources\layout-v14\icon_picker.xml" />
-    <AndroidResource Include="Resources\layout-v14\password.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
     <AndroidResource Include="Resources\layout\InViewButton.xml" />
     <AndroidResource Include="Resources\drawable\collections_collection.png" />
     <AndroidResource Include="Resources\drawable\collections_new_label.png" />
@@ -639,11 +638,9 @@
     <AndroidResource Include="Resources\drawable-ldpi\device_access_not_secure.png" />
     <AndroidResource Include="Resources\drawable-ldpi\ic_menu_remove_field_holo_light.png" />
     <AndroidResource Include="Resources\drawable-mdpi\device_access_not_secure.png" />
-    <AndroidResource Include="Resources\layout-v14\QuickUnlock_Unused.xml" />
     <AndroidResource Include="Resources\layout\entry_view_test.xml" />
     <AndroidResource Include="Resources\layout\entry_extrastring_title.xml" />
     <AndroidResource Include="Resources\layout\entry_extrastring_value.xml" />
-    <AndroidResource Include="Resources\drawable-v11\ic_launcher_gray.png" />
     <AndroidResource Include="Resources\values-nb\strings.xml" />
     <AndroidResource Include="Resources\anim\anim_enter.xml" />
     <AndroidResource Include="Resources\anim\anim_leave.xml" />
@@ -651,8 +648,6 @@
     <AndroidResource Include="Resources\anim\anim_leave_back.xml" />
     <AndroidResource Include="Resources\layout\searchurlresults.xml" />
     <AndroidResource Include="Resources\layout\searchurlresults_empty.xml" />
-    <AndroidResource Include="Resources\layout-v14\searchurlresults.xml" />
-    <AndroidResource Include="Resources\layout-v14\searchurlresults_empty.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
@@ -665,10 +660,6 @@
       <Project>{3c0f7fe5-639f-4422-a087-8b26cf862d1b}</Project>
       <Name>AndroidFileChooserBinding</Name>
     </ProjectReference>
-    <ProjectReference Include="..\AppCompatV7Binding\AppCompatV7Binding.csproj">
-      <Project>{23233a28-d74f-4bf8-b4d8-834060840bd7}</Project>
-      <Name>AppCompatV7Binding</Name>
-    </ProjectReference>
     <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj">
       <Project>{48574278-4779-4b3a-a9e4-9cf1bc285d0b}</Project>
       <Name>JavaFileStorageBindings</Name>
@@ -689,6 +680,10 @@
       <Project>{a8779d4d-7c49-4c2f-82bd-2cdc448391da}</Project>
       <Name>Kp2aKeyboardBinding</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PluginSdkBinding\PluginSdkBinding.csproj">
+      <Project>{3da3911e-36de-465e-8f15-f1991b6437e5}</Project>
+      <Name>PluginSdkBinding</Name>
+    </ProjectReference>
     <ProjectReference Include="..\TwofishCipher\TwofishCipher.csproj">
       <Project>{5cf675a5-9bee-4720-bed9-d5bf14a2ebf9}</Project>
       <Name>TwofishCipher</Name>
@@ -726,9 +721,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\ic_unlocked_gray.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-v11\ic_unlocked_gray.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-mdpi\ic_launcher_red.png" />
   </ItemGroup>
@@ -747,15 +739,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\values\dimens.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi-v11\ic_launcher_gray.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi-v11\ic_launcher_gray.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi-v11\ic_launcher_gray.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\transparent.png" />
   </ItemGroup>
@@ -774,15 +757,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\donate_cake.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi-v11\ic_unlocked_gray.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi-v11\ic_unlocked_gray.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi-v11\ic_unlocked_gray.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\filestorage_selection.xml" />
   </ItemGroup>
@@ -857,9 +831,6 @@
       <Visible>False</Visible>
     </XamarinComponentReference>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout-v14\text_with_help.xml" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\ic_storage_skydrive.png" />
   </ItemGroup>
@@ -911,16 +882,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\location_web_site_holodark.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values-v14\styles_dark.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values-v14\styles_light.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\attrs.xml" />
   </ItemGroup>
@@ -939,22 +900,73 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\ic_launcher_gray_bday.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi-v11\ic_launcher_gray_bday.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-v11\ic_launcher_gray_bday.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi-v11\ic_launcher_gray_bday.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi-v11\ic_launcher_gray_bday.png" />
-  </ItemGroup>
   <ItemGroup>
     <TransformFile Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\collections_new_label_holodark.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_launcher_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_launcher_gray_bday.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_unlocked_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\ic_launcher_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\ic_launcher_gray_bday.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\ic_unlocked_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\ListViewPluginRow.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\plugin_details.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\plugin_list.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\QuickUnlock_Unused.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\SaveButton.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\styles_dark.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\styles_light.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\old_ic_launcher_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\ic_launcher_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\ic_launcher_gray_bday.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\ic_unlocked_gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\vdots_holodark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\vdots.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\ic_menu_copy_holo_light.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\xml\searchable_debug.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/keepass2android/password/PasswordGenerator.cs b/src/keepass2android/password/PasswordGenerator.cs
index dcace1cc..43e0dd20 100644
--- a/src/keepass2android/password/PasswordGenerator.cs
+++ b/src/keepass2android/password/PasswordGenerator.cs
@@ -16,6 +16,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
   */
 
 using System;
+using System.Security.Cryptography;
 using System.Text;
 using Android.Content;
 
@@ -35,6 +36,47 @@ namespace keepass2android
 		private const String BracketChars 	= "[]{}()<>";
 		
 		private readonly Context _cxt;
+
+		public sealed class SecureRandom : Random
+		{
+
+			private readonly RandomNumberGenerator _rng = new RNGCryptoServiceProvider();
+
+
+			public override int Next()
+			{
+				var data = new byte[sizeof(int)];
+				_rng.GetBytes(data);
+				return BitConverter.ToInt32(data, 0) & (int.MaxValue - 1);
+			}
+
+			public override int Next(int maxValue)
+			{
+				return Next(0, maxValue);
+			}
+
+			public override int Next(int minValue, int maxValue)
+			{
+				if (minValue > maxValue)
+				{
+					throw new ArgumentOutOfRangeException();
+				}
+				return (int)Math.Floor((minValue + (maxValue - minValue) * NextDouble()));
+			}
+
+			public override double NextDouble()
+			{
+				var data = new byte[sizeof(uint)];
+				_rng.GetBytes(data);
+				var randUint = BitConverter.ToUInt32(data, 0);
+				return randUint / (uint.MaxValue + 1.0);
+			}
+
+			public override void NextBytes(byte[] data)
+			{
+				_rng.GetBytes(data);
+			}
+		}
 		
 		public PasswordGenerator(Context cxt) {
 			_cxt = cxt;
@@ -52,11 +94,12 @@ namespace keepass2android
 			int size = characterSet.Length;
 			
 			StringBuilder buffer = new StringBuilder();
-			
-			Random random = new Random();
-			if (size > 0) {
-				
-				for (int i = 0; i < length; i++) {
+
+			Random random = new SecureRandom();
+			if (size > 0) 
+			{
+				for (int i = 0; i < length; i++) 
+				{
 					char c = characterSet[random.Next(size)];
 					
 					buffer.Append(c);
diff --git a/src/keepass2android/pluginhost/PluginArrayAdapter.cs b/src/keepass2android/pluginhost/PluginArrayAdapter.cs
new file mode 100644
index 00000000..953fa198
--- /dev/null
+++ b/src/keepass2android/pluginhost/PluginArrayAdapter.cs
@@ -0,0 +1,126 @@
+using Android.Content.PM;
+using Android.Content.Res;
+using Android.Graphics.Drawables;
+using Android.Widget;
+using Android.Content;
+using Android.Views;
+using System.Collections.Generic;
+using Android.App;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Represents information about a plugin for display in the plugin list activity
+	/// </summary>
+	public class PluginItem
+	{
+		private readonly string _package;
+		private readonly Context _ctx;
+		private readonly Resources _pluginRes;
+
+		public PluginItem(string package, string enabledStatus, Context ctx)
+		{
+			_package = package;
+			_ctx = ctx;
+			EnabledStatus = enabledStatus;
+			_pluginRes = _ctx.PackageManager.GetResourcesForApplication(_package);
+		}
+
+		public string Label
+		{
+			get
+			{
+				return PluginDetailsActivity.GetStringFromPlugin(_pluginRes, _package, "kp2aplugin_title");
+			}
+			
+		}
+
+		public string Version
+		{
+			get
+			{
+				return _ctx.PackageManager.GetPackageInfo(_package, 0).VersionName;
+			}
+		}
+
+		public string EnabledStatus
+		{
+			get;
+			set;
+		}
+
+		public Drawable Icon
+		{
+			get
+			{
+				return _ctx.PackageManager.GetApplicationIcon(_package);
+			}
+		}
+
+		public string Package
+		{
+			get { return _package; }
+		}
+	}
+
+
+	public class PluginArrayAdapter : ArrayAdapter<PluginItem>
+	{
+
+		class PluginViewHolder : Java.Lang.Object
+		{
+			public ImageView imgIcon;
+			public TextView txtTitle;
+			public TextView txtVersion;
+
+			public TextView txtEnabledStatus;
+		}
+
+		Context context;
+		int layoutResourceId;
+		IList<PluginItem> data = null;
+
+		public PluginArrayAdapter(Context context, int layoutResourceId, IList<PluginItem> data) :
+			base(context, layoutResourceId, data)
+		{
+
+			this.layoutResourceId = layoutResourceId;
+			this.context = context;
+			this.data = data;
+		}
+
+		public override View GetView(int position, View convertView, ViewGroup parent)
+		{
+			View row = convertView;
+			PluginViewHolder holder = null;
+
+			if (row == null)
+			{
+				LayoutInflater inflater = ((Activity)context).LayoutInflater;
+				row = inflater.Inflate(layoutResourceId, parent, false);
+
+				holder = new PluginViewHolder();
+				holder.imgIcon = (ImageView)row.FindViewById(Resource.Id.imgIcon);
+				holder.txtTitle = (TextView)row.FindViewById(Resource.Id.txtLabel);
+				holder.txtVersion = (TextView)row.FindViewById(Resource.Id.txtVersion);
+				holder.txtEnabledStatus = (TextView)row.FindViewById(Resource.Id.txtStatus);
+
+				row.Tag = holder;
+			}
+			else
+			{
+				holder = (PluginViewHolder)row.Tag;
+			}
+
+			var item = data[position];
+			holder.txtTitle.Text = item.Label;
+			holder.txtVersion.Text = item.Version;
+			holder.txtEnabledStatus.Text = item.EnabledStatus;
+			holder.imgIcon.SetImageDrawable(item.Icon);
+
+			return row;
+		}
+	}
+
+}
diff --git a/src/keepass2android/pluginhost/PluginDatabase.cs b/src/keepass2android/pluginhost/PluginDatabase.cs
new file mode 100644
index 00000000..0c339848
--- /dev/null
+++ b/src/keepass2android/pluginhost/PluginDatabase.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Android.Content;
+using Android.Content.PM;
+using Android.Util;
+using Keepass2android.Pluginsdk;
+
+namespace keepass2android
+{
+	public class PluginDatabase
+	{
+		private const string _tag = "KP2A_PluginDatabase";
+		private readonly Context _ctx;
+		private const string _accessToken = "accessToken";
+		private const string _scopes = "scopes";
+		private const string _requesttoken = "requestToken";
+
+
+
+		public PluginDatabase(Context ctx)
+		{
+			_ctx = ctx;
+		}
+
+		private ISharedPreferences GetPreferencesForPlugin(string packageName)
+		{
+			var prefs = _ctx.GetSharedPreferences("KP2A.Plugin." + packageName, FileCreationMode.Private);
+			if (prefs.GetString(_requesttoken, null) == null)
+			{
+				var editor = prefs.Edit();
+				editor.PutString(_requesttoken, Guid.NewGuid().ToString());
+				editor.Commit();
+			}
+			
+			return prefs;
+		}
+
+		/// <summary>
+		/// Returns the request token for the plugin. Request token is created of not yet available.
+		/// </summary>
+		/// <returns>Request token. Never null or empty.</returns>
+		public string GetRequestToken(string pkgName)
+		{
+			return GetPreferencesForPlugin(pkgName).GetString(_requesttoken, null);
+		}
+
+		public IList<string> GetPluginScopes(string pluginPackage)
+		{
+			var prefs = GetPreferencesForPlugin(pluginPackage);
+			return AccessManager.StringToStringArray(prefs.GetString(_scopes, ""));
+		}
+
+		public IEnumerable<String> GetAllPluginPackages()
+		{
+			return PluginHost.GetAllPlugins(_ctx);
+		}
+
+		public bool IsPackageInstalled(string targetPackage)
+		{
+			try
+			{
+				PackageInfo info = _ctx.PackageManager.GetPackageInfo(targetPackage, PackageInfoFlags.MetaData);
+			}
+			catch (PackageManager.NameNotFoundException e)
+			{
+				return false;
+			}
+			return true;
+		}
+
+		public bool IsEnabled(string pluginPackage)
+		{
+			return GetPreferencesForPlugin(pluginPackage).GetString(_accessToken, null) != null;
+		}
+
+
+		public void StorePlugin(string pluginPackage, string accessToken, IList<string> requestedScopes)
+		{
+			ISharedPreferences pluginPrefs = GetPreferencesForPlugin(pluginPackage);
+
+			pluginPrefs.Edit()
+					   .PutString(_scopes, AccessManager.StringArrayToString(requestedScopes))
+					   .PutString(_accessToken, accessToken)
+					   .Commit();
+		}
+
+		public void SetEnabled(string pluginPackage, bool enabled)
+		{
+			if (enabled)
+			{
+				string accessToken = Guid.NewGuid().ToString();
+
+				Intent i = new Intent(Strings.ActionReceiveAccess);
+				i.SetPackage(pluginPackage);
+
+				i.PutExtra(Strings.ExtraSender, _ctx.PackageName);
+				i.PutExtra(Strings.ExtraRequestToken, GetPreferencesForPlugin(pluginPackage).GetString(_requesttoken, null));
+				i.PutExtra(Strings.ExtraAccessToken, accessToken);
+				_ctx.SendBroadcast(i);
+
+				StorePlugin(pluginPackage, accessToken, GetPluginScopes(pluginPackage));
+			}
+			else
+			{
+				Intent i = new Intent(Strings.ActionRevokeAccess);
+				i.SetPackage(pluginPackage);
+				i.PutExtra(Strings.ExtraSender, _ctx.PackageName);
+				i.PutExtra(Strings.ExtraRequestToken, GetPreferencesForPlugin(pluginPackage).GetString(_requesttoken, null));
+				_ctx.SendBroadcast(i);
+				StorePlugin(pluginPackage, null, GetPluginScopes(pluginPackage));
+			}
+		}
+
+		public bool IsValidAccessToken(string pluginPackage, string accessToken, string scope)
+		{
+			if (pluginPackage == null)
+			{
+				Log.Warn(_tag, "No pluginPackage specified!");
+				return false;
+			}
+
+			if (accessToken == null)
+			{
+				Log.Warn(_tag, "No accessToken specified!");
+				return false;
+			}
+
+			var prefs = GetPreferencesForPlugin(pluginPackage);
+			if (prefs.GetString(_accessToken, null) != accessToken)
+			{
+				Log.Warn(_tag, "Invalid access token for " + pluginPackage);
+				return false;
+			}
+			if (!AccessManager.StringToStringArray(prefs.GetString(_scopes, "")).Contains(scope))
+			{
+				Log.Warn(_tag, "Scope " + scope + " not granted for " + pluginPackage);
+				return false;
+			}
+			return true;
+		}
+
+		public string GetAccessToken(string pluginPackage)
+		{
+			return GetPreferencesForPlugin(pluginPackage).GetString(_accessToken, null);
+		}
+
+		public void Clear()
+		{
+			foreach (string plugin in GetAllPluginPackages())
+			{
+				GetPreferencesForPlugin(plugin).Edit().Clear().Commit();
+			}
+		}
+
+
+		public IEnumerable<string> GetPluginsWithAcceptedScope(string scope)
+		{
+			return GetAllPluginPackages().Where(plugin =>
+			{
+				var prefs = GetPreferencesForPlugin(plugin);
+				return (prefs.GetString(_accessToken, null) != null)
+					 && AccessManager.StringToStringArray(prefs.GetString(_scopes, "")).Contains(scope);
+
+			});
+		}
+
+		public void ClearPlugin(string plugin)
+		{
+			var prefs = _ctx.GetSharedPreferences("KP2A.Plugin." + plugin, FileCreationMode.Private);
+			prefs.Edit().Clear().Commit();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/pluginhost/PluginDetailsActivity.cs b/src/keepass2android/pluginhost/PluginDetailsActivity.cs
new file mode 100644
index 00000000..fb574e11
--- /dev/null
+++ b/src/keepass2android/pluginhost/PluginDetailsActivity.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.Content.Res;
+using Android.Graphics.Drawables;
+using Android.OS;
+using Android.Runtime;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+using Java.Util;
+using Keepass2android.Pluginsdk;
+using keepass2android;
+using keepass2android.views;
+
+namespace PluginHostTest
+{
+	[Activity(Label = AppNames.AppName)]
+	[IntentFilter(new[] { Strings.ActionEditPluginSettings },
+		Label = AppNames.AppName,
+		Categories = new[] { Intent.CategoryDefault })]
+	public class PluginDetailsActivity : Activity
+	{
+		private CheckBox _checkbox;
+		private string _pluginPackageName;
+
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+			new ActivityDesign(this).ApplyTheme();
+
+			_pluginPackageName = Intent.GetStringExtra(Strings.ExtraPluginPackage);
+
+			var pluginRes = PackageManager.GetResourcesForApplication(_pluginPackageName);
+			var title = GetStringFromPlugin(pluginRes, _pluginPackageName, "kp2aplugin_title");
+			var author = GetStringFromPlugin(pluginRes, _pluginPackageName, "kp2aplugin_author");
+			var shortDesc = GetStringFromPlugin(pluginRes, _pluginPackageName, "kp2aplugin_shortdesc");
+			var version = PackageManager.GetPackageInfo(_pluginPackageName, 0).VersionName;
+
+			SetContentView(Resource.Layout.plugin_details);
+			if (title != null)
+				FindViewById<TextView>(Resource.Id.txtLabel).Text = title;
+			FindViewById<TextView>(Resource.Id.txtVersion).Text = version;
+			SetTextOrHide(Resource.Id.txtAuthor, author);
+			SetTextOrHide(Resource.Id.txtShortDesc, shortDesc);
+
+			_checkbox = FindViewById<CheckBox>(Resource.Id.cb_enabled);
+			_checkbox.CheckedChange += delegate
+			{
+				new PluginDatabase(this).SetEnabled(_pluginPackageName, _checkbox.Checked);
+			};
+
+			Drawable d = PackageManager.GetApplicationIcon(_pluginPackageName);
+			FindViewById<ImageView>(Resource.Id.imgIcon).SetImageDrawable(d);
+
+			FindViewById<TextView>(Resource.Id.txtVersion).Text = version;
+
+			//cannot be wrong to update the view when we received an update
+			PluginHost.OnReceivedRequest += OnPluginHostOnOnReceivedRequest;
+
+			if (Intent.Action == Strings.ActionEditPluginSettings)
+			{
+				//this action can be triggered by external apps so we don't know if anybody has ever triggered
+				//the plugin to request access. Do this now, don't set the view right now
+				PluginHost.TriggerRequest(this, _pluginPackageName, new PluginDatabase(this));
+				//show the buttons instead of the checkbox
+				_checkbox.Visibility = ViewStates.Invisible;
+				FindViewById(Resource.Id.accept_button).Visibility = ViewStates.Visible;
+				FindViewById(Resource.Id.deny_button).Visibility = ViewStates.Visible;
+
+				FindViewById(Resource.Id.accept_button).Click += delegate(object sender, EventArgs args)
+				{
+					new PluginDatabase(this).SetEnabled(_pluginPackageName, true);
+					SetResult(Result.Ok);
+					Finish();
+				};
+
+				FindViewById(Resource.Id.deny_button).Click += delegate(object sender, EventArgs args)
+				{
+					new PluginDatabase(this).SetEnabled(_pluginPackageName, false);
+					SetResult(Result.Canceled);
+					Finish();
+				};
+			}
+			else
+			{
+				UpdateView();
+				_checkbox.Visibility = ViewStates.Visible;
+				FindViewById(Resource.Id.accept_button).Visibility = ViewStates.Gone;
+				FindViewById(Resource.Id.deny_button).Visibility = ViewStates.Gone;
+			}
+		}
+
+		private void OnPluginHostOnOnReceivedRequest(object sender, PluginHost.PluginHostEventArgs args)
+		{
+			if (args.Package == _pluginPackageName)
+			{
+				UpdateView();
+			}
+		}
+
+		protected override void OnDestroy()
+		{
+			PluginHost.OnReceivedRequest -= OnPluginHostOnOnReceivedRequest;
+			base.OnDestroy();
+		}
+
+		private void UpdateView()
+		{
+			var scopesContainer = FindViewById<LinearLayout>(Resource.Id.scopes_list);
+			//scopesContainer.RemoveAllViews();
+
+			var pluginDb = new PluginDatabase(this);
+			_checkbox.Checked = pluginDb.IsEnabled(_pluginPackageName);
+			foreach (string scope in pluginDb.GetPluginScopes(_pluginPackageName))
+			{
+				string scopeId = scope.Substring("keepass2android.".Length);
+
+				TextWithHelp help = new TextWithHelp(this,
+													 GetString(Resources.GetIdentifier(scopeId + "_title", "string", PackageName)),
+													 GetString(Resources.GetIdentifier(scopeId + "_explanation", "string", PackageName)));
+				LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FillParent,
+																					   ViewGroup.LayoutParams.WrapContent);
+				help.LayoutParameters = layoutParams;
+				scopesContainer.AddView(help);
+			}
+		}
+
+		private void SetTextOrHide(int resourceId, string text)
+		{
+			if (text != null)
+			{
+				FindViewById<TextView>(resourceId).Text = text;
+				FindViewById<TextView>(resourceId).Visibility = ViewStates.Visible;
+			}
+			else
+				FindViewById<TextView>(resourceId).Visibility = ViewStates.Gone;
+		}
+
+		public static string GetStringFromPlugin(Resources pluginRes, string pluginPackage, string stringId)
+		{
+			int titleId = pluginRes.GetIdentifier(pluginPackage + ":string/" + stringId, null, null);
+			string title = null;
+			if (titleId != 0)
+				title = pluginRes.GetString(titleId);
+			return title;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/pluginhost/PluginHost.cs b/src/keepass2android/pluginhost/PluginHost.cs
new file mode 100644
index 00000000..e709f3e6
--- /dev/null
+++ b/src/keepass2android/pluginhost/PluginHost.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.Util;
+using KeePassLib.Utility;
+using Keepass2android.Pluginsdk;
+using Org.Json;
+
+namespace keepass2android
+{
+	/// <summary>
+	/// Class which manages plugins inside the app
+	/// </summary>
+	[BroadcastReceiver]
+	[IntentFilter(new[] { Strings.ActionRequestAccess })]
+	public class PluginHost : BroadcastReceiver
+	{
+
+		private const string _tag = "KP2A_PluginHost";
+
+
+		private static readonly string[] _validScopes = { Strings.ScopeDatabaseActions, Strings.ScopeCurrentEntry };
+
+		public static IEnumerable<string> GetAllPlugins(Context ctx)
+		{
+			Intent accessIntent = new Intent(Strings.ActionTriggerRequestAccess);
+			PackageManager packageManager = ctx.PackageManager;
+			IList<ResolveInfo> dictPacks = packageManager.QueryBroadcastReceivers(
+				accessIntent, PackageInfoFlags.Receivers);
+			
+			return dictPacks.Select(ri => ri.ActivityInfo.ApplicationInfo).Select(appInfo => appInfo.PackageName);
+			
+		}
+
+		/// <summary>
+		/// Sends a broadcast to all potential plugins prompting them to request access to our app.
+		/// </summary>
+		public static void TriggerRequests(Context ctx)
+		{
+			PluginDatabase pluginDatabase = new PluginDatabase(ctx);
+			foreach (string pkg in GetAllPlugins(ctx))
+				TriggerRequest(ctx, pkg, pluginDatabase);
+
+		}
+
+		public static void TriggerRequest(Context ctx, string pkgName, PluginDatabase pluginDatabase)
+		{
+			try
+			{
+				Intent triggerIntent = new Intent(Strings.ActionTriggerRequestAccess);
+				triggerIntent.SetPackage(pkgName);
+				triggerIntent.PutExtra(Strings.ExtraSender, ctx.PackageName);
+
+				triggerIntent.PutExtra(Strings.ExtraRequestToken, pluginDatabase.GetRequestToken(pkgName));
+				ctx.SendBroadcast(triggerIntent);
+			}
+			catch (Exception e)
+			{
+			}
+		}
+
+
+		public override void OnReceive(Context context, Intent intent)
+		{
+			PluginDatabase pluginDb = new PluginDatabase(context);
+			if (intent.Action == Strings.ActionRequestAccess)
+			{
+				var senderPackage = intent.GetStringExtra(Strings.ExtraSender);
+				var requestToken = intent.GetStringExtra(Strings.ExtraRequestToken);
+
+				var requestedScopes = intent.GetStringArrayListExtra(Strings.ExtraScopes);
+
+				if (!AreScopesValid(requestedScopes))
+				{
+					return;
+				}
+
+				if (pluginDb.GetRequestToken(senderPackage) != requestToken)
+				{
+					Log.Warn(_tag, "Invalid requestToken!");
+					return;
+				}
+				string currentAccessToken = pluginDb.GetAccessToken(senderPackage);
+				if ((currentAccessToken != null)
+					&& (AccessManager.IsSubset(requestedScopes,
+										   pluginDb.GetPluginScopes(senderPackage))))
+				{
+					//permission already there.
+					var i = new Intent(Strings.ActionReceiveAccess);
+					i.PutExtra(Strings.ExtraSender, context.PackageName);
+					i.PutExtra(Strings.ExtraAccessToken, currentAccessToken);
+					//TODO: Plugin should verify requestToken to make sure it doesn't receive accessTokens from malicious apps
+					i.PutExtra(Strings.ExtraRequestToken, requestToken);
+					i.SetPackage(senderPackage);
+					context.SendBroadcast(i);
+
+					Log.Debug(_tag, "Plugin " + senderPackage + " enabled.");
+				}
+				else
+				{
+					//store that scope was requested but not yet approved (=> accessToken = null)
+					pluginDb.StorePlugin(senderPackage, null, requestedScopes);
+
+					Log.Debug(_tag, "Plugin " + senderPackage + " not enabled.");
+
+					//see if the plugin has an access token
+					string accessToken = intent.GetStringExtra(Strings.ExtraAccessToken);
+					if (accessToken != null)
+					{
+						//notify plugin that access token is no longer valid or sufficient
+						Intent i = new Intent(Strings.ActionRevokeAccess);
+						i.PutExtra(Strings.ExtraSender, context.PackageName);
+						i.PutExtra(Strings.ExtraAccessToken, accessToken);
+						i.SetPackage(senderPackage);
+						context.SendBroadcast(i);
+						Log.Warn(_tag, "Access token of plugin " + senderPackage + " not (or no more) valid.");
+					}
+
+				}
+				if (OnReceivedRequest != null)
+					OnReceivedRequest(this, new PluginHostEventArgs() { Package = senderPackage });
+
+			}
+		}
+
+		private bool AreScopesValid(IList<string> requestedScopes)
+		{
+			foreach (string scope in requestedScopes)
+			{
+				if (!_validScopes.Contains(scope))
+				{
+					Log.Warn(_tag, "invalid scope: " + scope);
+					return false;
+				}
+			}
+			return true;
+		}
+
+		/// <summary>
+		/// adds the entry output data to the intent to be sent to a plugin
+		/// </summary>
+		public static void AddEntryToIntent(Intent intent, PwEntryOutput entry)
+		{
+			/*//add the entry XML
+			not yet implemented. What to do with attachments?
+			MemoryStream memStream = new MemoryStream();
+			KdbxFile.WriteEntries(memStream, new[] {entry});
+			string entryData = StrUtil.Utf8.GetString(memStream.ToArray());
+			intent.PutExtra(Strings.ExtraEntryData, entryData);
+			*/
+			//add the output string array (placeholders replaced taking into account the db context)
+			Dictionary<string, string> outputFields = entry.OutputStrings.ToDictionary(pair => StrUtil.SafeXmlString(pair.Key), pair => pair.Value.ReadString());
+
+			JSONObject json = new JSONObject(outputFields);
+			var jsonStr = json.ToString();
+			intent.PutExtra(Strings.ExtraEntryOutputData, jsonStr);
+
+			intent.PutExtra(Strings.ExtraEntryId, entry.Uuid.ToHexString());
+
+		}
+
+		public class PluginHostEventArgs
+		{
+			public string Package { get; set; }
+		}
+		public static event EventHandler<PluginHostEventArgs> OnReceivedRequest;
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/pluginhost/PluginListActivity.cs b/src/keepass2android/pluginhost/PluginListActivity.cs
new file mode 100644
index 00000000..7b5a20ba
--- /dev/null
+++ b/src/keepass2android/pluginhost/PluginListActivity.cs
@@ -0,0 +1,64 @@
+using System.Collections.Generic;
+using System.Linq;
+using Android.App;
+using Android.Content;
+using Android.Content.PM;
+using Android.OS;
+using Android.Widget;
+using Keepass2android.Pluginsdk;
+using PluginHostTest;
+
+namespace keepass2android
+{
+	[Activity(Label = "@string/plugins", ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden)]
+	[IntentFilter(new[] { "keepass2android.PluginListActivity" }, Categories = new[] { Intent.CategoryDefault })]
+	public class PluginListActivity : ListActivity
+	{
+		private PluginArrayAdapter _pluginArrayAdapter;
+		private List<PluginItem> _items;
+
+		protected override void OnCreate(Bundle bundle)
+		{
+			base.OnCreate(bundle);
+
+			new ActivityDesign(this).ApplyTheme();
+
+			SetContentView(Resource.Layout.plugin_list);
+
+			PluginHost.TriggerRequests(this);
+
+			ListView listView = FindViewById<ListView>(Android.Resource.Id.List);
+			listView.ItemClick +=
+				(sender, args) =>
+				{
+					Intent i = new Intent(this, typeof(PluginDetailsActivity));
+					i.PutExtra(Strings.ExtraPluginPackage, _items[args.Position].Package);
+					StartActivity(i);
+				};
+
+			FindViewById<Button>(Resource.Id.btnPluginsOnline).Click += delegate
+				{
+					Util.GotoUrl(this, "https://keepass2android.codeplex.com/wikipage?title=Available%20Plug-ins");
+				};
+
+		}
+		protected override void OnResume()
+		{
+			base.OnResume();
+			PluginDatabase pluginDb = new PluginDatabase(this);
+
+			_items = (from pluginPackage in pluginDb.GetAllPluginPackages()
+					  let version = PackageManager.GetPackageInfo(pluginPackage, 0).VersionName
+					  let enabledStatus = pluginDb.IsEnabled(pluginPackage) ? GetString(Resource.String.plugin_enabled) : GetString(Resource.String.plugin_disabled)
+					  select new PluginItem(pluginPackage, enabledStatus, this)).ToList();
+			/*
+				{
+					new PluginItem("PluginA", Resource.Drawable.Icon, "keepass2android.plugina", "connected"),
+					new PluginItem("KeepassNFC", Resource.Drawable.Icon, "com.bla.blubb.plugina", "disconnected")
+				};
+			 * */
+			_pluginArrayAdapter = new PluginArrayAdapter(this, Resource.Layout.ListViewPluginRow, _items);
+			ListAdapter = _pluginArrayAdapter;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/keepass2android/search/SearchActivity.cs b/src/keepass2android/search/SearchActivity.cs
index 0e0240b7..ae9e54cc 100644
--- a/src/keepass2android/search/SearchActivity.cs
+++ b/src/keepass2android/search/SearchActivity.cs
@@ -36,9 +36,12 @@ namespace keepass2android
 			return ((CheckBox)FindViewById(resId)).Checked;
 		}
 
+		private AppTask _appTask;
+
 		protected override void OnCreate(Bundle bundle)
 		{
 			base.OnCreate(bundle);
+			_appTask = AppTask.GetTaskInOnCreate(bundle, Intent);
 			SetContentView(Resource.Layout.search);
 			SearchParameters sp = new SearchParameters();
 			PopulateCheckBox(Resource.Id.cbSearchInTitle, sp.SearchInTitles);
@@ -92,8 +95,11 @@ namespace keepass2android
 			searchIntent.PutExtra("CaseSensitive", GetCheckBoxValue(Resource.Id.cbCaseSensitive));
 			searchIntent.PutExtra("ExcludeExpired", GetCheckBoxValue(Resource.Id.cbExcludeExpiredEntries));
 			searchIntent.PutExtra(SearchManager.Query, searchString);
-			StartActivityForResult(searchIntent, 0);
-			Finish();
+			//forward appTask:
+			_appTask.ToIntent(searchIntent);
+
+			Util.FinishAndForward(this, searchIntent);
+
 		}
 	}
 }
diff --git a/src/keepass2android/search/SearchResults.cs b/src/keepass2android/search/SearchResults.cs
index f2784a13..6d2926e6 100644
--- a/src/keepass2android/search/SearchResults.cs
+++ b/src/keepass2android/search/SearchResults.cs
@@ -64,7 +64,7 @@ namespace keepass2android.search
 			{
 				var entryIntent = new Intent(this, typeof(EntryActivity));
 				entryIntent.PutExtra(EntryActivity.KeyEntry, intent.Data.LastPathSegment);
-
+				entryIntent.AddFlags(ActivityFlags.ForwardResult);
 				Finish(); // Close this activity so that the entry activity is navigated to from the main activity, not this one.
 				StartActivity(entryIntent);
 			}
diff --git a/src/keepass2android/services/CopyToClipboardService.cs b/src/keepass2android/services/CopyToClipboardService.cs
index fbb95fef..5e820760 100644
--- a/src/keepass2android/services/CopyToClipboardService.cs
+++ b/src/keepass2android/services/CopyToClipboardService.cs
@@ -49,6 +49,13 @@ namespace keepass2android
 		public const int NotifyKeyboard = 3;
 		public const int ClearClipboard = 4;
 
+		static public void CopyValueToClipboardWithTimeout(Context ctx, string text)
+		{
+			Intent i = new Intent(ctx, typeof(CopyToClipboardService));
+			i.SetAction(Intents.CopyStringToClipboard);
+			i.PutExtra(_stringtocopy, text);
+			ctx.StartService(i);
+		}
 
 		public CopyToClipboardService (IntPtr javaReference, JniHandleOwnership transfer)
 			: base(javaReference, transfer)
@@ -79,27 +86,55 @@ namespace keepass2android
 			filter.AddAction(Intents.DatabaseLocked);
 			RegisterReceiver(_stopOnLockBroadcastReceiver, filter);
 
-			String uuidBytes =  intent.GetStringExtra(EntryActivity.KeyEntry);
-			bool closeAfterCreate = intent.GetBooleanExtra(EntryActivity.KeyCloseAfterCreate, false);
-			
-			PwUuid entryId = PwUuid.Zero;
-			if (uuidBytes != null)
-				entryId = new PwUuid(MemUtil.HexStringToByteArray(uuidBytes));
-			
-			PwEntry entry;
-			try
+			if ((intent.Action == Intents.ShowNotification) || (intent.Action == Intents.UpdateKeyboard))
 			{
-				entry = App.Kp2a.GetDb().Entries[entryId];
-			}
-			catch(Exception)
-			{
-				//seems like restarting the service happened after closing the DB
-				StopSelf();
-				return StartCommandResult.NotSticky;
-			}
-			
-			DisplayAccessNotifications(entry, closeAfterCreate);
+				String uuidBytes = intent.GetStringExtra(EntryActivity.KeyEntry);
 
+				PwUuid entryId = PwUuid.Zero;
+				if (uuidBytes != null)
+					entryId = new PwUuid(MemUtil.HexStringToByteArray(uuidBytes));
+
+				PwEntryOutput entry;
+				try
+				{
+					if ((App.Kp2a.GetDb().LastOpenedEntry != null)
+					    && (entryId.Equals(App.Kp2a.GetDb().LastOpenedEntry.Uuid)))
+					{
+						entry = App.Kp2a.GetDb().LastOpenedEntry;
+					}
+					else
+					{
+						entry = new PwEntryOutput(App.Kp2a.GetDb().Entries[entryId], App.Kp2a.GetDb().KpDatabase);
+					}
+					
+				}
+				catch (Exception)
+				{
+					//seems like restarting the service happened after closing the DB
+					StopSelf();
+					return StartCommandResult.NotSticky;
+				}
+
+				if (intent.Action == Intents.ShowNotification)
+				{
+					//first time opening the entry -> bring up the notifications
+					bool closeAfterCreate = intent.GetBooleanExtra(EntryActivity.KeyCloseAfterCreate, false);
+					DisplayAccessNotifications(entry, closeAfterCreate);
+				}
+				else
+				{
+					//this action is received when the data in the entry has changed (e.g. by plugins)
+					//update the keyboard data.
+					//Check if keyboard is (still) available
+					if (Keepass2android.Kbbridge.KeyboardData.EntryId == entry.Uuid.ToHexString())
+						MakeAccessibleForKeyboard(entry);
+				}
+			}
+			if (intent.Action == Intents.CopyStringToClipboard)
+			{
+				
+				TimeoutCopyToClipboard(intent.GetStringExtra(_stringtocopy));
+			}
 
 			return StartCommandResult.RedeliverIntent;
 		}
@@ -164,7 +199,7 @@ namespace keepass2android
 			return PendingIntent.GetBroadcast(this, requestCode, intent, PendingIntentFlags.CancelCurrent);
 		}
 
-		public void DisplayAccessNotifications(PwEntry entry, bool closeAfterCreate)
+		public void DisplayAccessNotifications(PwEntryOutput entry, bool closeAfterCreate)
 		{
 			// Notification Manager
 			_notificationManager = (NotificationManager)GetSystemService(NotificationService);
@@ -175,13 +210,13 @@ namespace keepass2android
 			_numElementsToWaitFor = 0;
 			bool hadKeyboardData = ClearKeyboard(false); //do not broadcast if the keyboard was changed
 
-			String entryName = entry.Strings.ReadSafe(PwDefs.TitleField);
+			String entryName = entry.OutputStrings.ReadSafe(PwDefs.TitleField);
 
 			ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(this);
 			if (prefs.GetBoolean(GetString(Resource.String.CopyToClipboardNotification_key), Resources.GetBoolean(Resource.Boolean.CopyToClipboardNotification_default)))
 			{
 
-				if (GetStringAndReplacePlaceholders(entry, PwDefs.PasswordField).Length > 0)
+				if (entry.OutputStrings.ReadSafe(PwDefs.PasswordField).Length > 0)
 				{
 					// only show notification if password is available
 					Notification password = GetNotification(Intents.CopyPassword, Resource.String.copy_password, Resource.Drawable.notify, entryName);
@@ -191,8 +226,8 @@ namespace keepass2android
 					_numElementsToWaitFor++;
 
 				}
-				
-				if (GetStringAndReplacePlaceholders(entry, PwDefs.UserNameField).Length > 0)
+
+				if (entry.OutputStrings.ReadSafe(PwDefs.UserNameField).Length > 0)
 				{
 					// only show notification if username is available
 					Notification username = GetNotification(Intents.CopyUsername, Resource.String.copy_username, Resource.Drawable.notify, entryName);
@@ -220,7 +255,7 @@ namespace keepass2android
                     // automatically bring up the Keyboard selection dialog
 					if ((closeAfterCreate) && prefs.GetBoolean(GetString(Resource.String.OpenKp2aKeyboardAutomatically_key), Resources.GetBoolean(Resource.Boolean.OpenKp2aKeyboardAutomatically_default)))
                     {
-                        ActivateKp2aKeyboard(this);        
+                        ActivateKp2aKeyboard(this);
                     }
 				}
 
@@ -252,7 +287,7 @@ namespace keepass2android
 			RegisterReceiver(_notificationDeletedBroadcastReceiver, deletefilter);
 		}
 
-		bool MakeAccessibleForKeyboard(PwEntry entry)
+		bool MakeAccessibleForKeyboard(PwEntryOutput entry)
 		{
 #if EXCLUDE_KEYBOARD
 			return false;
@@ -276,7 +311,7 @@ namespace keepass2android
 			int i=0;
 			foreach (string key in keys)
 			{
-				String value = GetStringAndReplacePlaceholders(entry, key);
+				String value = entry.OutputStrings.ReadSafe(key);
 
 				if (value.Length > 0)
 				{
@@ -286,12 +321,10 @@ namespace keepass2android
 				i++;
 			}
 			//add additional fields:
-			foreach (var pair in entry.Strings)
+			foreach (var pair in entry.OutputStrings)
 			{
-				String key = pair.Key;
-
-				var value = GetStringAndReplacePlaceholders(entry, key);
-
+				var key = pair.Key;
+				var value = pair.Value.ReadString();
 
 				if (!PwDefs.IsStandardField(key)) {
 					kbdataBuilder.AddString(pair.Key, pair.Key, value);
@@ -301,20 +334,14 @@ namespace keepass2android
 
 
 			kbdataBuilder.Commit();
-			Keepass2android.Kbbridge.KeyboardData.EntryName = entry.Strings.ReadSafe(PwDefs.TitleField);
+			Keepass2android.Kbbridge.KeyboardData.EntryName = entry.OutputStrings.ReadSafe(PwDefs.TitleField);
 			Keepass2android.Kbbridge.KeyboardData.EntryId = entry.Uuid.ToHexString();
 
 			return hasData;
 #endif
 		}
 
-		static string GetStringAndReplacePlaceholders(PwEntry entry, string key)
-		{
-			String value = entry.Strings.ReadSafe(key);
-			value = SprEngine.Compile(value, new SprContext(entry, App.Kp2a.GetDb().KpDatabase, SprCompileFlags.All));
-			return value;
-		}
-
+		
 		public void OnWaitElementDeleted(int itemId)
 		{
 			_numElementsToWaitFor--;
@@ -392,6 +419,9 @@ namespace keepass2android
 		// Setup to allow the toast to happen in the foreground
 		readonly Handler _uiThreadCallback = new Handler();
 		private ClearClipboardTask _clearClipboardTask;
+		private const string _stringtocopy = "StringToCopy";
+
+
 
 		private Notification GetNotification(String intentText, int descResId, int drawableResId, String entryName) {
 			String desc = GetString(descResId);
@@ -433,9 +463,9 @@ namespace keepass2android
 		class CopyToClipboardBroadcastReceiver: BroadcastReceiver
 		{
 			readonly CopyToClipboardService _service;
-			readonly PwEntry _entry;
+			readonly PwEntryOutput _entry;
 			
-			public CopyToClipboardBroadcastReceiver(PwEntry entry, CopyToClipboardService service)
+			public CopyToClipboardBroadcastReceiver(PwEntryOutput entry, CopyToClipboardService service)
 			{
 				_entry = entry;
 				_service = service;
@@ -448,14 +478,14 @@ namespace keepass2android
 				
 				if (action.Equals(Intents.CopyUsername))
 				{
-					String username = GetStringAndReplacePlaceholders(_entry, PwDefs.UserNameField);
+					String username = _entry.OutputStrings.ReadSafe(PwDefs.UserNameField);
 					if (username.Length > 0)
 					{
 						_service.TimeoutCopyToClipboard(username);
 					}
 				} else if (action.Equals(Intents.CopyPassword))
 				{
-					String password = GetStringAndReplacePlaceholders(_entry, PwDefs.PasswordField);
+					String password = _entry.OutputStrings.ReadSafe(PwDefs.PasswordField);
 					if (password.Length > 0)
 					{
 						_service.TimeoutCopyToClipboard(password);
diff --git a/src/keepass2android/views/TextWithHelp.cs b/src/keepass2android/views/TextWithHelp.cs
index f6573f15..ba1d511d 100644
--- a/src/keepass2android/views/TextWithHelp.cs
+++ b/src/keepass2android/views/TextWithHelp.cs
@@ -24,6 +24,13 @@ namespace keepass2android.views
 			Initialize(attrs);
 		}
 
+		public TextWithHelp(Context context, string text, string helpText) :
+			base(context, null)
+		{
+			Initialize(text, helpText);
+		}
+
+
 		public TextWithHelp(Context context, IAttributeSet attrs, int defStyle) :
 			base(context, attrs, defStyle)
 		{
@@ -31,19 +38,26 @@ namespace keepass2android.views
 		}
 
 		private void Initialize(IAttributeSet attrs)
+		{
+
+			TypedArray a = Context.ObtainStyledAttributes(attrs, Resource.Styleable.TextWithHelp);
+
+			string helpText = a.GetString(Resource.Styleable.TextWithHelp_help_text);
+
+			const string xmlns = "http://schemas.android.com/apk/res/android";
+			string text = Context.GetString(attrs.GetAttributeResourceValue(xmlns, "text", Resource.String.ellipsis));
+			Initialize(text, helpText);
+		}
+
+		private void Initialize(string text, string helpText)
 		{
 			LayoutInflater inflater = (LayoutInflater)Context.GetSystemService(Context.LayoutInflaterService);
 			inflater.Inflate(Resource.Layout.text_with_help, this);
 
-			TypedArray a = Context.ObtainStyledAttributes(
-	 attrs,
-	 Resource.Styleable.TextWithHelp);
 			_kp2AShortHelpView = ((Kp2aShortHelpView)FindViewById(Resource.Id.help));
-			_kp2AShortHelpView.HelpText = a.GetString(Resource.Styleable.TextWithHelp_help_text);
-
-			const string xmlns = "http://schemas.android.com/apk/res/android";
-			((TextView)FindViewById(Resource.Id.text)).Text = Context.GetString(attrs.GetAttributeResourceValue(xmlns, "text", Resource.String.ellipsis));
+			_kp2AShortHelpView.HelpText = helpText;
 
+			((TextView)FindViewById(Resource.Id.text)).Text = text;
 		}
 
 		public string HelpText