Merge branch 'master' of https://git01.codeplex.com/keepass2android

src/KeePass.sln

@@ -96,8 +96,8 @@ Global
 		{A57B3ACE-5634-469A-88C4-858BB409F356}.Release|x64.Build.0 = Release|Any CPU
 		{A57B3ACE-5634-469A-88C4-858BB409F356}.ReleaseNoNet|Any CPU.ActiveCfg = Debug|Any CPU
 		{A57B3ACE-5634-469A-88C4-858BB409F356}.ReleaseNoNet|Any CPU.Build.0 = Debug|Any CPU
-		{A57B3ACE-5634-469A-88C4-858BB409F356}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A57B3ACE-5634-469A-88C4-858BB409F356}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{A57B3ACE-5634-469A-88C4-858BB409F356}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{A57B3ACE-5634-469A-88C4-858BB409F356}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{A57B3ACE-5634-469A-88C4-858BB409F356}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{A57B3ACE-5634-469A-88C4-858BB409F356}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -118,8 +118,8 @@ Global
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.Release|x64.Build.0 = Release|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Any CPU.Build.0 = Debug|Any CPU
-		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{A8779D4D-7C49-4C2F-82BD-2CDC448391DA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -136,8 +136,8 @@ Global
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.Release|x64.ActiveCfg = Release|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{53A9CB7F-6553-4BC0-B56B-9410BB2E59AA}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -154,8 +154,8 @@ Global
 		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.Release|x64.ActiveCfg = Release|Any CPU
 		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
 		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
 		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{A5F8FB02-00E0-4335-91EF-AEAA2C2F3C48}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -177,9 +177,9 @@ Global
 		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
 		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
 		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.ActiveCfg = ReleaseNoNet|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Build.0 = ReleaseNoNet|Any CPU
-		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Mixed Platforms.Deploy.0 = ReleaseNoNet|Any CPU
 		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
 		{46B769B8-2C58-4138-9CC0-70E3AE3C9A3A}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection

src/KeePassLib2Android/Resources/Resource.designer.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.18046
+//     Laufzeitversion:4.0.30319.18051
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.

src/Kp2aBusinessLogic/IKp2aApp.cs

@@ -50,6 +50,16 @@ namespace keepass2android
             EventHandler<DialogClickEventArgs> yesHandler, 
             EventHandler<DialogClickEventArgs> noHandler, 
             EventHandler<DialogClickEventArgs> cancelHandler, 
+            Context ctx);
+
+		/// <summary>
+		/// Asks the user the question "messageKey" with the options Yes/No/Cancel, but the yes/no strings can be selected freely, calls the handler corresponding to the answer.
+		/// </summary>
+		void AskYesNoCancel(UiStringKey titleKey, UiStringKey messageKey,
+			UiStringKey yesString, UiStringKey noString,
+			EventHandler<DialogClickEventArgs> yesHandler,
+            EventHandler<DialogClickEventArgs> noHandler,
+            EventHandler<DialogClickEventArgs> cancelHandler,
             Context ctx);
 
 		/// <summary>

src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj

@@ -32,6 +32,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
+    <OutputPath>bin\ReleaseNoNet\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />

src/Kp2aBusinessLogic/Properties/AssemblyInfo.cs

@@ -30,5 +30,4 @@ using Android.App;
 [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)]

src/Kp2aBusinessLogic/UiStringKey.cs

@@ -30,6 +30,10 @@ namespace keepass2android
 		CheckingTargetFileForChanges,
 		TitleSyncQuestion,
 		MessageSyncQuestion,
-		SynchronizingDatabase
+		SynchronizingDatabase,
+		yes,
+		no,
+		YesSynchronize, 
+		NoOverwrite
     }
 }

src/Kp2aBusinessLogic/database/Database.cs

@@ -15,14 +15,16 @@ 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 System.Collections.Generic;
 using System.IO;
 using Android.Content;
+using Java.Lang;
 using KeePassLib;
 using KeePassLib.Keys;
 using KeePassLib.Serialization;
 using keepass2android.Io;
+using Exception = System.Exception;
+using String = System.String;
 
 namespace keepass2android
 {
@@ -35,7 +37,13 @@ namespace keepass2android
 		public HashSet<PwGroup> Dirty = new HashSet<PwGroup>(new PwGroupEqualityFromIdComparer());
 		public PwGroup Root;
 		public PwDatabase KpDatabase;
-		public IOConnectionInfo Ioc { get { return KpDatabase.IOConnectionInfo; } }
+		public IOConnectionInfo Ioc 
+		{
+			get
+			{
+				return KpDatabase == null ? null : KpDatabase.IOConnectionInfo;
+			}
+		}
 		public string LastFileVersion;
 		public SearchDbHelper SearchHelper;
 		

src/Kp2aBusinessLogic/database/edit/SaveDB.cs

@@ -55,7 +55,8 @@ namespace keepass2android
 		public override void Run ()
 		{
 
-			if (! _dontSave) {
+			if (!_dontSave)
+			{
 				try
 				{
 					StatusLogger.UpdateMessage(UiStringKey.saving_database);
@@ -78,6 +79,8 @@ namespace keepass2android
 
 						//ask user...
 						_app.AskYesNoCancel(UiStringKey.TitleSyncQuestion, UiStringKey.MessageSyncQuestion, 
+							UiStringKey.YesSynchronize,
+							UiStringKey.NoOverwrite,
 							//yes = sync
 							(sender, args) =>
 							{
@@ -115,7 +118,9 @@ namespace keepass2android
 						Finish(true);
 					}
 
-				} catch (Exception e) {
+				}
+				catch (Exception e)
+				{
 					/* TODO KPDesktop:
 					 * catch(Exception exSave)
 			{
@@ -128,7 +133,10 @@ namespace keepass2android
 					return;
 				}
 			}
-			
+			else
+			{
+				Finish(true);
+			}
 			
 		}
 

src/Kp2aKeyboardBinding/Kp2aKeyboardBinding.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -34,6 +34,13 @@
     <ConsolePause>False</ConsolePause>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
+    <OutputPath>bin\ReleaseNoNet\</OutputPath>
+    <Optimize>true</Optimize>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

src/Kp2aUnitTests/Kp2aUnitTests.csproj

@@ -37,6 +37,16 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
+    <OutputPath>bin\ReleaseNoNet\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />

src/Kp2aUnitTests/Resources/Resource.Designer.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.18046
+//     Laufzeitversion:4.0.30319.18051
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.

src/Kp2aUnitTests/TestKp2aApp.cs

@@ -59,8 +59,23 @@ namespace Kp2aUnitTests
 
 		public UiStringKey? LastYesNoCancelQuestionTitle { get; set; }
 
-		public void AskYesNoCancel(UiStringKey titleKey, UiStringKey messageKey, EventHandler<DialogClickEventArgs> yesHandler, EventHandler<DialogClickEventArgs> noHandler,
+
-		                           EventHandler<DialogClickEventArgs> cancelHandler, Context ctx)
+		public void AskYesNoCancel(UiStringKey titleKey, UiStringKey messageKey,
+			EventHandler<DialogClickEventArgs> yesHandler,
+			EventHandler<DialogClickEventArgs> noHandler,
+			EventHandler<DialogClickEventArgs> cancelHandler,
+			Context ctx)
+		{
+			AskYesNoCancel(titleKey, messageKey, UiStringKey.yes, UiStringKey.no,
+				yesHandler, noHandler, cancelHandler, ctx);
+		}
+
+		public void AskYesNoCancel(UiStringKey titleKey, UiStringKey messageKey,
+			UiStringKey yesString, UiStringKey noString,
+			EventHandler<DialogClickEventArgs> yesHandler,
+			EventHandler<DialogClickEventArgs> noHandler,
+			EventHandler<DialogClickEventArgs> cancelHandler,
+			Context ctx)
 		{
 			LastYesNoCancelQuestionTitle = titleKey;
 			switch (_yesNoCancelResult)

src/java/KP2ASoftKeyboard/res/values-it/strings.xml

@@ -1,3 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
-<resources/>
+<resources>
+  <string name="word_separators">\u0020.,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\"</string>
+  <string name="change_entry">Selezionare un\'altra voce</string>
+  <string name="open_entry">Selezionare la voce</string>
+  <string name="open_entry_for_app">Cercare la voce \"%1$ s\"</string>
+  <string name="label_go_key">Vai</string>
+  <string name="label_next_key">Avanti</string>
+  <string name="label_send_key">Invia</string>
+</resources>

src/java/KP2ASoftKeyboard/res/values-nb/strings.xml

@@ -4,6 +4,7 @@
   <string name="word_separators">\u0020.,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\"</string>
   <string name="change_entry">Velg en annen oppføring</string>
   <string name="open_entry">Velg oppføring</string>
+  <string name="open_entry_for_app">Søke etter oppføringen med \"%1$s\"</string>
   <string name="label_go_key">Kjør</string>
   <string name="label_next_key">Neste</string>
   <string name="label_send_key">Send</string>

src/java/KP2ASoftKeyboard/res/values-pt-rBR/strings.xml

@@ -1,3 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
-<resources/>
+<resources>
+  <string name="word_separators">\u0020.,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\"</string>
+  <string name="change_entry">Selecione outra entrada</string>
+  <string name="open_entry">Selecione uma entrada</string>
+  <string name="open_entry_for_app">Localizar entrada com \"%1$s\"</string>
+  <string name="label_go_key">Ir</string>
+  <string name="label_next_key">Próximo</string>
+  <string name="label_send_key">Enviar</string>
+</resources>

src/java/KP2ASoftKeyboard/res/values-sv/strings.xml

@@ -1,3 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
-<resources/>
+<resources>
+  <string name="word_separators">\u0020.,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\"</string>
+  <string name="change_entry">Välj en annan post</string>
+  <string name="open_entry">Välj post</string>
+  <string name="open_entry_for_app">Sök efter post med \"%1$s\"</string>
+  <string name="label_go_key">Gå</string>
+  <string name="label_next_key">Nästa</string>
+  <string name="label_send_key">Skicka</string>
+</resources>

src/java/KP2ASoftKeyboard/res/values-zh-rCN/strings.xml

@@ -1,3 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
-<resources/>
+<resources>
+  <string name="word_separators">\u0020.,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\"</string>
+  <string name="change_entry">选择另一条目</string>
+  <string name="open_entry">选择条目</string>
+  <string name="open_entry_for_app">搜索带有\"%1$ s\" 的条目</string>
+  <string name="label_go_key">转到</string>
+  <string name="label_next_key">下一步</string>
+  <string name="label_send_key">发送</string>
+</resources>

src/keepass2android/GroupBaseActivity.cs

@@ -194,12 +194,13 @@ namespace keepass2android
 			
 			MenuInflater inflater = MenuInflater;
 			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;
 
 				searchView.SetSearchableInfo(searchManager.GetSearchableInfo(ComponentName));
-
+			}
 			return true;
 		}
 		

src/keepass2android/Properties/AndroidManifest_net.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="16" 
+			android:versionCode="19" 
-			android:versionName="0.8.4 preview 2" 
+			android:versionName="0.8.4c" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />

src/keepass2android/Properties/AndroidManifest_nonet.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="14" 
+			android:versionCode="19" 
-			android:versionName="0.8.3" 
+			android:versionName="0.8.4c" 
 			package="keepass2android.keepass2android_nonet"
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14" />
-	<application android:label="keepass2android" android:icon="@drawable/ic_launcher">
+	<application android:label="keepass2android" android:icon="@drawable/ic_launcher_offline">
 		<activity android:configChanges="keyboardHidden|orientation" android:label="@string/app_name_nonet" android:theme="@style/Base" android:name="keepass2android.PasswordActivity" >
 		  <intent-filter android:label="@string/app_name">
 		  <action android:name="android.intent.action.VIEW" />

src/keepass2android/Resources/Resource.designer.cs

@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.18046
+//     Laufzeitversion:4.0.30319.18051
 //
 //     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 //     der Code erneut generiert wird.
@@ -477,70 +477,73 @@ namespace keepass2android
 			public const int ic_launcher_gray = 2130837590;
 			
 			// aapt resource value: 0x7f020057
-			public const int ic_menu_add_field_holo_light = 2130837591;
+			public const int ic_launcher_offline = 2130837591;
 			
 			// aapt resource value: 0x7f020058
-			public const int ic_menu_remove_field_holo_light = 2130837592;
+			public const int ic_menu_add_field_holo_light = 2130837592;
 			
 			// aapt resource value: 0x7f020059
-			public const int ic_menu_view = 2130837593;
+			public const int ic_menu_remove_field_holo_light = 2130837593;
 			
 			// aapt resource value: 0x7f02005a
-			public const int location_web_site = 2130837594;
+			public const int ic_menu_view = 2130837594;
 			
 			// aapt resource value: 0x7f02005b
-			public const int navigation_accept = 2130837595;
+			public const int location_web_site = 2130837595;
 			
 			// aapt resource value: 0x7f02005c
-			public const int navigation_accept_dark = 2130837596;
+			public const int navigation_accept = 2130837596;
 			
 			// aapt resource value: 0x7f02005d
-			public const int navigation_cancel = 2130837597;
+			public const int navigation_accept_dark = 2130837597;
 			
 			// aapt resource value: 0x7f02005e
-			public const int navigation_previous_item = 2130837598;
+			public const int navigation_cancel = 2130837598;
 			
 			// aapt resource value: 0x7f02005f
-			public const int navigation_previous_item_dark = 2130837599;
+			public const int navigation_previous_item = 2130837599;
 			
 			// aapt resource value: 0x7f020060
-			public const int notify = 2130837600;
+			public const int navigation_previous_item_dark = 2130837600;
 			
 			// aapt resource value: 0x7f020061
-			public const int notify_keyboard = 2130837601;
+			public const int notify = 2130837601;
 			
 			// aapt resource value: 0x7f020062
-			public const int RedButton = 2130837602;
+			public const int notify_keyboard = 2130837602;
 			
 			// aapt resource value: 0x7f020063
-			public const int section_header = 2130837603;
+			public const int RedButton = 2130837603;
 			
 			// aapt resource value: 0x7f020064
-			public const int sym_keyboard = 2130837604;
+			public const int section_header = 2130837604;
 			
 			// aapt resource value: 0x7f020065
-			public const int sym_keyboard_delete = 2130837605;
+			public const int sym_keyboard = 2130837605;
 			
 			// aapt resource value: 0x7f020066
-			public const int sym_keyboard_done = 2130837606;
+			public const int sym_keyboard_delete = 2130837606;
 			
 			// aapt resource value: 0x7f020067
-			public const int sym_keyboard_kp2a = 2130837607;
+			public const int sym_keyboard_done = 2130837607;
 			
 			// aapt resource value: 0x7f020068
-			public const int sym_keyboard_return = 2130837608;
+			public const int sym_keyboard_kp2a = 2130837608;
 			
 			// aapt resource value: 0x7f020069
-			public const int sym_keyboard_search = 2130837609;
+			public const int sym_keyboard_return = 2130837609;
 			
 			// aapt resource value: 0x7f02006a
-			public const int sym_keyboard_shift = 2130837610;
+			public const int sym_keyboard_search = 2130837610;
 			
 			// aapt resource value: 0x7f02006b
-			public const int sym_keyboard_space = 2130837611;
+			public const int sym_keyboard_shift = 2130837611;
 			
 			// aapt resource value: 0x7f02006c
-			public const int YellowButton = 2130837612;
+			public const int sym_keyboard_space = 2130837612;
+			
+			// aapt resource value: 0x7f02006d
+			public const int YellowButton = 2130837613;
 			
 			static Drawable()
 			{
@@ -942,8 +945,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f0d00a5
 			public const int menu_cancel_edit = 2131558565;
 			
-			// aapt resource value: 0x7f0d00aa
+			// aapt resource value: 0x7f0d00a9
-			public const int menu_change_master_key = 2131558570;
+			public const int menu_change_master_key = 2131558569;
 			
 			// aapt resource value: 0x7f0d009e
 			public const int menu_donate = 2131558558;
@@ -960,11 +963,11 @@ namespace keepass2android
 			// aapt resource value: 0x7f0d00a8
 			public const int menu_search = 2131558568;
 			
-			// aapt resource value: 0x7f0d00a9
-			public const int menu_search_advanced = 2131558569;
-			
 			// aapt resource value: 0x7f0d00ab
-			public const int menu_sort = 2131558571;
+			public const int menu_search_advanced = 2131558571;
+			
+			// aapt resource value: 0x7f0d00aa
+			public const int menu_sort = 2131558570;
 			
 			// aapt resource value: 0x7f0d00a2
 			public const int menu_suggest_improvements = 2131558562;
@@ -1296,32 +1299,32 @@ namespace keepass2android
 			// aapt resource value: 0x7f0800f7
 			public const int BinaryDirectory_title = 2131230967;
 			
-			// aapt resource value: 0x7f080138
+			// aapt resource value: 0x7f08013a
-			public const int ChangeLog = 2131231032;
+			public const int ChangeLog = 2131231034;
+			
+			// aapt resource value: 0x7f080139
+			public const int ChangeLog_0_7 = 2131231033;
 			
 			// aapt resource value: 0x7f080137
-			public const int ChangeLog_0_7 = 2131231031;
+			public const int ChangeLog_0_8 = 2131231031;
-			
-			// aapt resource value: 0x7f080135
-			public const int ChangeLog_0_8 = 2131231029;
-			
-			// aapt resource value: 0x7f080134
-			public const int ChangeLog_0_8_1 = 2131231028;
-			
-			// aapt resource value: 0x7f080133
-			public const int ChangeLog_0_8_2 = 2131231027;
-			
-			// aapt resource value: 0x7f080132
-			public const int ChangeLog_0_8_3 = 2131231026;
-			
-			// aapt resource value: 0x7f080131
-			public const int ChangeLog_0_8_4 = 2131231025;
 			
 			// aapt resource value: 0x7f080136
-			public const int ChangeLog_keptDonate = 2131231030;
+			public const int ChangeLog_0_8_1 = 2131231030;
 			
-			// aapt resource value: 0x7f080130
+			// aapt resource value: 0x7f080135
-			public const int ChangeLog_title = 2131231024;
+			public const int ChangeLog_0_8_2 = 2131231029;
+			
+			// aapt resource value: 0x7f080134
+			public const int ChangeLog_0_8_3 = 2131231028;
+			
+			// aapt resource value: 0x7f080133
+			public const int ChangeLog_0_8_4 = 2131231027;
+			
+			// aapt resource value: 0x7f080138
+			public const int ChangeLog_keptDonate = 2131231032;
+			
+			// aapt resource value: 0x7f080132
+			public const int ChangeLog_title = 2131231026;
 			
 			// aapt resource value: 0x7f080029
 			public const int CheckForFileChangesOnSave_key = 2131230761;
@@ -1371,6 +1374,9 @@ namespace keepass2android
 			// aapt resource value: 0x7f08012e
 			public const int MessageSyncQuestion = 2131231022;
 			
+			// aapt resource value: 0x7f080131
+			public const int NoOverwrite = 2131231025;
+			
 			// aapt resource value: 0x7f08002f
 			public const int OpenKp2aKeyboardAutomatically_key = 2131230767;
 			
@@ -1503,6 +1509,9 @@ namespace keepass2android
 			// aapt resource value: 0x7f08002e
 			public const int UseKp2aKeyboard_key = 2131230766;
 			
+			// aapt resource value: 0x7f080130
+			public const int YesSynchronize = 2131231024;
+			
 			// aapt resource value: 0x7f080032
 			public const int about_feedback = 2131230770;
 			
@@ -2298,10 +2307,13 @@ namespace keepass2android
 			public const int searchable = 2131034115;
 			
 			// aapt resource value: 0x7f050004
-			public const int symbols = 2131034116;
+			public const int searchable_offline = 2131034116;
 			
 			// aapt resource value: 0x7f050005
-			public const int symbols_shift = 2131034117;
+			public const int symbols = 2131034117;
+			
+			// aapt resource value: 0x7f050006
+			public const int symbols_shift = 2131034118;
 			
 			static Xml()
 			{

src/keepass2android/Resources/menu/group.xml

@@ -30,11 +30,7 @@
 			 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_app_settings"
         android:icon="@android:drawable/ic_menu_preferences"
         android:title="@string/menu_app_settings"

src/keepass2android/Resources/values-cs/strings.xml

@@ -5,8 +5,8 @@
   <string name="about_homepage">Domovská stránka</string>
   <string name="AboutText">Keepass2Android je Android implementace správce hesel KeePass.</string>
   <string name="CreditsText">Uživatelské rozhraní je založeno na portu KeepassDroid (vyvinul Brian Pellin). Kód pro databázové operace je vychází z kódu pro KeePass (napsal Dominik Reichl). Logo Android robota vychází z verze sdílené Googlem a je upraveno a použito dle podmínek popsaných v licenci Creative Commons 3.0.</string>
-  <string name="accept">Přijat</string>
+  <string name="accept">Přijmout</string>
-  <string name="add_entry">Přidat záznam</string>
+  <string name="add_entry">Přidat položku</string>
   <string name="add_url_entry">Vytvořit položku pro adresu URL</string>
   <string name="add_group">Přidat skupinu</string>
   <string name="add_group_title">Přidat skupinu</string>
@@ -30,17 +30,17 @@
   <string name="copy_username">Kopírovat uživatelské jméno do schránky</string>
   <string name="copy_password">Kopírovat heslo do schránky</string>
   <string name="available_through_keyboard">Vstup je k dispozici prostřednictvím KP2A klávesnice</string>
-  <string name="not_possible_im_picker">Nepodařilo se otevřít dialog pro výběr vstupní metody. Aktivujte klávesnici ručně.</string>
+  <string name="not_possible_im_picker">Nepodařilo se otevřít dialog pro výběr způsobu vkládání. Aktivujte klávesnici ručně.</string>
   <string name="please_activate_keyboard">Prosím, povolte Keepass2Android klávesnici v nastavení systému.</string>
   <string name="creating_db_key">Vytvářím databázový klíč…</string>
   <string name="current_group">Aktuální skupina</string>
   <string name="current_group_root">Aktuální skupina: Kořen</string>
   <string name="database">Databáze</string>
   <string name="decrypting_db">Dešifruji obsah databáze…</string>
-  <string name="decrypting_entry">Dešifruji záznam</string>
+  <string name="decrypting_entry">Dešifruji položku</string>
   <string name="default_checkbox">Použít jako výchozí databázi</string>
-  <string name="digits">Čísla</string>
+  <string name="digits">Číslice</string>
-  <string name="disclaimer_formal">Keepass2Android dodáván BEZ JAKÉKOLIV ZÁRUKY; Toto je free software zdarma, a je možná jeho redistribuce pod podmínkou licence GPL verze 2 nebo novější.</string>
+  <string name="disclaimer_formal">Keepass2Android dodáván BEZ JAKÉKOLIV ZÁRUKY; Toto je svobodný software, a můžete jej šířit pod licencí GPL verze 2 nebo novější.</string>
   <string name="ellipsis">\u2026</string>
   <string name="enter_filename">Zadejte názvev souboru databáze</string>
   <string name="entry_accessed">Poslední přístup</string>
@@ -52,7 +52,7 @@
   <string name="entry_confpassword">Potvrďte heslo</string>
   <string name="entry_created">Vytvořeno</string>
   <string name="entry_expires">Vyprší</string>
-  <string name="entry_keyfile">Klíčový soubor (nepovinné)</string>
+  <string name="entry_keyfile">Soubor s klíčem (volitelný)</string>
   <string name="entry_modified">Změněno</string>
   <string name="entry_password">Heslo</string>
   <string name="entry_save">Uložit</string>
@@ -87,7 +87,7 @@
   <string name="group">Skupina</string>
   <string name="hint_comment">poznámka</string>
   <string name="hint_conf_pass">potvrdit heslo</string>
-  <string name="hint_generated_password">generované heslo</string>
+  <string name="hint_generated_password">vygenerované heslo</string>
   <string name="hint_group_name">Název skupiny</string>
   <string name="hint_keyfile">klíčový soubor</string>
   <string name="hint_length">délka</string>
@@ -98,8 +98,8 @@
   <string name="hint_override_url">přepsat adresu url</string>
   <string name="hint_tags">štítek1, štítek2</string>
   <string name="hint_username">uživatelské jméno</string>
-  <string name="install_from_market">Instalovat z Play</string>
+  <string name="install_from_market">Instalace z Play Store</string>
-  <string name="install_from_website">Instalovat z webu</string>
+  <string name="install_from_website">Instalace z webu</string>
   <string name="InvalidPassword">Chybné heslo nebo klíčový soubor.</string>
   <string name="invalid_algorithm">Neplatný algoritmus.</string>
   <string name="invalid_db_sig">Databázový formát nelze rozpoznat.</string>
@@ -124,18 +124,19 @@
   <string name="menu_donate">Přispějte na pivo...</string>
   <string name="menu_edit">Změnit</string>
   <string name="menu_hide_password">Skrýt heslo</string>
-  <string name="menu_homepage">Jít na domovskou stránku</string>
+  <string name="menu_homepage">Přejít na domovskou stránku</string>
   <string name="menu_lock">Zamknout databázi</string>
   <string name="menu_open">Otevřít</string>
   <string name="menu_rename">Přejmenovat</string>
   <string name="menu_search">Hledat</string>
-  <string name="menu_url">Jdi na URL</string>
+  <string name="menu_search_advanced">Pokročilé vyhledávání</string>
+  <string name="menu_url">Přejít na adresu URL</string>
   <string name="minus">Mínus</string>
   <string name="never">Nikdy</string>
   <string name="yes">Ano</string>
   <string name="no">Ne</string>
   <string name="no_keys">Žádný záznam v databázi nebo ve skupině.</string>
-  <string name="no_results">žádný výsledek hledání</string>
+  <string name="no_results">Nenalezeno</string>
   <string name="no_url_handler">Žádný handler pro toto url.</string>
   <string name="open_recent">Otevřít poslední databázi (kliknout pro otevření)</string>
   <string name="omitbackup_title">Neprohledávat zálohy a koš</string>
@@ -159,7 +160,7 @@
   <string name="search_label">Hledat</string>
   <string name="show_password">Zobrazit heslo</string>
   <string name="sort_name">Seřadit podle jména</string>
-  <string name="sort_db">Seřadit podle DB</string>
+  <string name="sort_db">Seřadit podle data vytvoření</string>
   <string name="special">Speciální</string>
   <string name="search_hint">Co najít</string>
   <string name="search_results">Výsledky hledání</string>
@@ -167,23 +168,23 @@
   <string name="select_other_entry">Vyberte další položku</string>
   <string name="select_group_then_add">Otevřete požadovanou skupinu a poté stiskněte \"%1$s\"!</string>
   <string name="twofish">Twofish</string>
-  <string name="underline">Podtrženo</string>
+  <string name="underline">Podtrhnout</string>
   <string name="unsupported_db_version">Nepodporovaná verze databáze.</string>
   <string name="uppercase">Velká písmena</string>
   <string name="warning_read_only">Vaše SD karta je v módu jen pro čtení. Nebudete moct ukládat změny v databázi.</string>
-  <string name="warning_unmounted">Vaše SD karta není momentálně připojena v zařízení. Nebudete moct načíst nebo vytvořit databázi.</string>
+  <string name="warning_unmounted">SD karta není momentálně vložena do zařízení. Nebudete moci načíst nebo vytvořit databázi.</string>
   <string name="version_label">Verze</string>
   <string name="regular_expression">Regulární výraz</string>
   <string name="TanExpiresOnUse_title">Tan vyprší při použití</string>
   <string name="TanExpiresOnUse_summary">Při použití označovat vypršelé TAN položky</string>
   <string name="ShowUsernameInList_title">Zobrazit uživatelské jméno v seznamu</string>
-  <string name="ShowUsernameInList_summary">Zobrazit uživatelská jména pod titulky položek . Užitečné pro vícenásobné účty nebo TANy.</string>
+  <string name="ShowUsernameInList_summary">Zobrazovat uživatelská jména pod názvy položek. Užitečné pro vícenásobné účty nebo TANy.</string>
   <string name="kp2a_findUrl">Keepass2Android: Najít heslo</string>
   <string name="excludeExpiredEntries">Vyloučit neplatné položky</string>
   <string name="search_options">Možnosti</string>
-  <string name="caseSensitive">Malá a velká písmena</string>
+  <string name="caseSensitive">Rozlišování malých a velkých písmen</string>
   <string name="start_open_file">Otevřít soubor...</string>
-  <string name="start_create">Vytvořte novou databázi...</string>
+  <string name="start_create">Vytvořit novou databázi...</string>
   <string name="start_open_url">Otevřít adresu URL...</string>
   <string name="start_create_import">Importovat soubor do nové databáze...</string>
   <string name="enter_filename_details_url">Úplná adresa URL musí obsahovat protokol, např. http://.</string>
@@ -200,24 +201,27 @@
   <string name="BinaryDirectory_title">Adresář souborů s přílohami</string>
   <string name="BinaryDirectory_summary">Adresář,  do kterého jsou ukládány přílohy souborů.</string>
   <string name="SaveAttachmentDialog_title">Uložit přílohu</string>
-  <string name="SaveAttachmentDialog_text">Prosím vyberte, kam chcete přílohu uložit.</string>
+  <string name="SaveAttachmentDialog_text">Prosím vyberte, kam chcete uložit přílohu.</string>
   <string name="SaveAttachmentDialog_save">Uložit na SD kartu</string>
   <string name="SaveAttachmentDialog_open">Uložit do mezipaměti a otevřít</string>
-  <string name="SaveAttachment_doneMessage">Uložit soubor do %1$ .</string>
+  <string name="SaveAttachment_doneMessage">Uložit soubor do %1$s.</string>
-  <string name="SaveAttachment_Failed">Nelze uložit přílohu do %1$ .</string>
+  <string name="SaveAttachment_Failed">Nelze uložit přílohu do %1$s.</string>
-  <string name="error_invalid_expiry_date">Neplatný formát datumu a času pro datum vypršení!</string>
+  <string name="error_invalid_expiry_date">Neplatný formát data a času pro datum expirace!</string>
-  <string name="error_string_key">Název pole je vyžadována pro každý řetězec.</string>
+  <string name="error_string_key">Název pole je vyžadován pro každý řetězec.</string>
   <string name="field_name">Název pole</string>
   <string name="field_value">Hodnota pole</string>
-  <string name="protection">Ochrana paměti</string>
+  <string name="protection">Chráněné pole</string>
-  <string name="add_binary">Přidáte soubor jako přílohu...</string>
+  <string name="add_binary">Přidat soubor jako přílohu...</string>
-  <string name="add_extra_string">Přidat další řetězec</string>
+  <string name="add_extra_string">Přidat doplňkový text</string>
+  <string name="delete_extra_string">Smazat doplňkový text</string>
   <string name="database_loaded_quickunlock_enabled">Databáze načtena, RychléOdemknutí povoleno.</string>
   <string name="credentials_dialog_title">Zadejte pověření pro server</string>
   <string name="UseFileTransactions_title">Transakce souboru</string>
   <string name="UseFileTransactions_summary">Použít transakční metodu zápisu do databáze</string>
+  <string name="CheckForFileChangesOnSave_title">Kontrola změn</string>
+  <string name="CheckForFileChangesOnSave_summary">Před uložením zkontrolovat, zda byl soubor změněn na jiném zařízení.</string>
   <string name="ShowCopyToClipboardNotification_title">Upozornění schránky</string>
-  <string name="ShowCopyToClipboardNotification_summary">Zpřístupnění uživatelského jména a hesla prostřednictvím oznamovacího oblasti a schránky. Pozor na skenery hesel!</string>
+  <string name="ShowCopyToClipboardNotification_summary">Zpřístupnění uživatelského jména a hesla prostřednictvím oznamovací oblasti a schránky. Pozor na skenery hesel!</string>
   <string name="ShowKp2aKeyboardNotification_title">Oznámení klávesnice KP2A</string>
   <string name="ShowKp2aKeyboardNotification_summary">Zpřístupněte celý záznam prostřednictvím klávesnice KP2A (doporučeno).</string>
   <string name="OpenKp2aKeyboardAutomatically_title">Dialog pro výběr klávesnice</string>
@@ -230,15 +234,41 @@
   <string name="RecycleBin">Koš</string>
   <string name="AskDeletePermanentlyEntry">Chcete trvale odstranit tuto položku? Stisk Ne ji znovu obnoví.</string>
   <string name="AskDeletePermanentlyGroup">Chcete trvale odstranit tuto skupinu? Stisk Ne ji znovu obnoví.</string>
-  <string name="AskDeletePermanently_title">Natrvalo odstranit?</string>
+  <string name="AskDeletePermanently_title">Trvale odstranit?</string>
   <string name="AskReloadFile_title">Znovu načíst soubor?</string>
   <string name="AskReloadFile">Soubor, který je v současné době otevřen byl změněn jiným programem. Přejete si jej znovu načíst?</string>
   <string name="AskDiscardChanges">Opravdu chcete zrušit provedené změny? (Tlačítko Uložit je v horní části formuláře.)</string>
-  <string name="AskDiscardChanges_title">Chcete zahodit změny?</string>
+  <string name="AskDiscardChanges_title">Zahodit změny?</string>
   <string name="suggest_improvements">Navrhnout nebo hlasovat pro vylepšení</string>
   <string name="rate_app">Ohodnoťte tuto aplikaci</string>
   <string name="translate_app">Přeložit KP2A</string>
+  <string name="AddingEntry">Přidávám položku…</string>
+  <string name="AddingGroup">Přidávám skupinu…</string>
+  <string name="DeletingEntry">Mažu položku…</string>
+  <string name="DeletingGroup">Mažu skupinu…</string>
+  <string name="SettingPassword">Nastavuji heslo…</string>
+  <string name="UndoingChanges">Vracím změny…</string>
+  <string name="TransformingKey">Transformace hlavního klíče…</string>
+  <string name="DecodingDatabase">Dekóduji databázi…</string>
+  <string name="ParsingDatabase">Analýza databáze…</string>
+  <string name="CheckingTargetFileForChanges">Kontroluji změny v cílovém souboru…</string>
+  <string name="TitleSyncQuestion">Sloučit změny?</string>
+  <string name="MessageSyncQuestion">Databáze byla změněna z jiného zařízení. Chcete nahrát a sloučit změny před uložením? Vyberte možnost Ne, pokud chcete přepsat změny z jiného zařízení.</string>
+  <string name="SynchronizingDatabase">Slučování změn…</string>
+  <string name="YesSynchronize">Ano, sloučit</string>
+  <string name="NoOverwrite">Ne, přepsat</string>
   <string name="ChangeLog_title">Protokol změn</string>
+  <string name="ChangeLog_0_8_4">
+		<b>Verze 0.8.4</b>\n
+		* Detekce a uložení změn v externích databázích při ukládání\n
+		* Zrychlení načítání\n
+		* Vylepšený nástroj hledání s doporučeními\n
+		* Nové App logo!
+		* Přidána podpora pro formát .kdbp pro rychlejší otvírání/ukládání\n
+		* Vylepšená editace doplňujících textů  a skrytý disple v chráněném móodu\n
+		Díky Alex Vallatza příspěvky v kódu!\n
+		Díky Niki Hüttner (www.close-cut.de) za nové logo!\n
+	</string>
   <string name="ChangeLog_0_8_3"><b>Verze 0.8.3</b>\n
 * Uživatelské jméno/TAN index je zobrazen v seznamu položek (viz nastavení)\n
 * Pokud hledání z prohlížeče nenalezne žádný záznam, je možno vytvořit nové polžky\n
@@ -263,7 +293,7 @@
 * opraveny chyby v Editaci aktivit\n
 * pravděpodobně zaneseny nové chyby  :-)
 </string>
-  <string name="ChangeLog_keptDonate">Rozšíření možnosti darovat pivo nebo něco jiného</string>
+  <string name="ChangeLog_keptDonate">Rozšířené možnosti přispět na pivo nebo něco jiného</string>
   <string name="ChangeLog_0_7"><b>Verze 0.7</b>\n
 * Zrychlení načítání: klíčové transformace jsou nyní 10x rychlejší!\n
 * Přidán Keepass2Android soft-keyboard: Přepněte se na tuto klávesnici pro vložení údajů pověření. Ochraňuje před útoky založenými na skenování schránky (vypněte starý systém upozornění  v nastavení)\n
@@ -291,7 +321,7 @@ První veřejné vydání
   <string-array name="list_size_options">
     <item>Malý</item>
     <item>Střední</item>
-    <item>Velký</item>
+    <item>Velké</item>
   </string-array>
   <string-array name="cred_remember_modes">
     <item>Nepamatovat si uživatelské jméno a heslo</item>

src/keepass2android/Resources/values-de/strings.xml

@@ -130,6 +130,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="menu_open">Öffnen</string>
   <string name="menu_rename">Umbenennen</string>
   <string name="menu_search">Suchen</string>
+  <string name="menu_search_advanced">Erweiterte Suche</string>
   <string name="menu_url">URL öffnen</string>
   <string name="minus">Bindestrich</string>
   <string name="never">Nie</string>
@@ -210,13 +211,16 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="error_string_key">Ein Feldname ist für jeden Eintrag erforderlich.</string>
   <string name="field_name">Feldname</string>
   <string name="field_value">Feldwert</string>
-  <string name="protection">Speicherschutz</string>
+  <string name="protection">Geschütztes Feld</string>
   <string name="add_binary">Dateianhang hinzufügen...</string>
   <string name="add_extra_string">Zusätzliches Feld hinzufügen</string>
+  <string name="delete_extra_string">Zusätzliches Feld löschen</string>
   <string name="database_loaded_quickunlock_enabled">Datenbank geladen, QuickUnlock aktiviert.</string>
   <string name="credentials_dialog_title">Serverzugangsdaten eingeben</string>
   <string name="UseFileTransactions_title">Dateitransaktionen</string>
   <string name="UseFileTransactions_summary">Dateitransaktionen beim Schreiben von Datenbank-Dateien verwenden</string>
+  <string name="CheckForFileChangesOnSave_title">Auf Änderungen prüfen</string>
+  <string name="CheckForFileChangesOnSave_summary">Vor dem Speichern prüfen, ob die Datei von außerhalb geändert wurde.</string>
   <string name="ShowCopyToClipboardNotification_title">Zwischenablage-Benachrichtigungen</string>
   <string name="ShowCopyToClipboardNotification_summary">Benutzername und Passwort über die Benachrichtigungsleiste und die Zwischenablage verfügbar machen. Achtung vor Passwort-Sniffern!</string>
   <string name="ShowKp2aKeyboardNotification_title">KP2A-Tastatur Benachrichtigung</string>
@@ -239,7 +243,31 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="suggest_improvements">Verbesserungen vorschlagen</string>
   <string name="rate_app">Diese App bewerten</string>
   <string name="translate_app">KP2A übersetzen</string>
+  <string name="AddingEntry">Füge Eintrag hinzu…</string>
+  <string name="AddingGroup">Füge Gruppe hinzu…</string>
+  <string name="DeletingEntry">Lösche Eintrag…</string>
+  <string name="DeletingGroup">Lösche Gruppe…</string>
+  <string name="SettingPassword">Setze Passwort…</string>
+  <string name="UndoingChanges">Nehme Änderungen zurück…</string>
+  <string name="TransformingKey">Führe Schlüsseltransformationen durch…</string>
+  <string name="DecodingDatabase">Entschlüssele Datenbank…</string>
+  <string name="ParsingDatabase">Lese Datenbank ein…</string>
+  <string name="CheckingTargetFileForChanges">Prüfe ob Zieldatei geändert wurde…</string>
+  <string name="TitleSyncQuestion">Änderungen zusammenführen?</string>
+  <string name="MessageSyncQuestion">Die Datenbankdatei wurde von außerhalb geändert. Sollen diese Änderungen geladen und mit den in Keepass2Android gemachten Änderungen zusammengeführt werden, bevor die Datenbank gespeichert wird? Wähle Nein, um die externen Änderungen zu überschreiben.</string>
+  <string name="SynchronizingDatabase">Führe Änderungen zusammen…</string>
+  <string name="YesSynchronize">Ja, zusammenführen</string>
+  <string name="NoOverwrite">Nein, überschreiben</string>
   <string name="ChangeLog_title">Neuigkeiten</string>
+  <string name="ChangeLog_0_8_4"><b>Version 0.8.4</b>\n 
+* Externe Datenbankänderungen werden beim Speichern erkannt und zusammengeführt\n 
+* Gesteigerte Geschwindigkeit beim Laden\n 
+* Suchleiste mit Vorschlägen\n 
+* Neues App Logo!\n 
+* Unterstützung für das .kdbp-Format für schnelleres Laden/Speichern\n 
+* Verbesserte Bearbeitung von zusätzlichen Feldern und versteckte Darstellung von geschützten Feldern\n 
+Danke an Alex Vallat für seinen Beitrag zum Programm!\n 
+Danke an Niki Hüttner (www.close-cut.de) für das neue Logo!\n</string>
   <string name="ChangeLog_0_8_3"><b>Version 0.8.3</b>\n
 * Benutzername/TAN index wird in Liste der Einträge angezeigt (s. Einstellungen)\n
 * Einträge können neu angelegt werden, wenn Suche aus Browser kein Ergebnis gebracht hat\n

src/keepass2android/Resources/values-es/strings.xml

@@ -204,7 +204,6 @@
   <string name="error_string_key">Se requiere un nombre en cada entrada.</string>
   <string name="field_name">Nombre del campo</string>
   <string name="field_value">Valor del campo</string>
-  <string name="protection">Protección de memoria</string>
   <string name="add_binary">Agregar archivo adjunto...</string>
   <string name="add_extra_string">Agregar una cadena</string>
   <string name="database_loaded_quickunlock_enabled">Base de datos cargada, Desbloqueo Rápido habilitado.</string>

src/keepass2android/Resources/values-fr/strings.xml

@@ -129,6 +129,7 @@
   <string name="menu_open">Ouvrir</string>
   <string name="menu_rename">Renommer</string>
   <string name="menu_search">Rechercher</string>
+  <string name="menu_search_advanced">Recherche avancée</string>
   <string name="menu_url">Aller à l\'adresse URL</string>
   <string name="minus">Moins</string>
   <string name="never">Jamais</string>
@@ -209,13 +210,16 @@
   <string name="error_string_key">Un nom de champ est requis pour chaque chaîne de caractères.</string>
   <string name="field_name">Nom du champ</string>
   <string name="field_value">Valeur du champ</string>
-  <string name="protection">Protection de la mémoire</string>
+  <string name="protection">Champ protégé</string>
   <string name="add_binary">Ajouter une pièce jointe...</string>
   <string name="add_extra_string">Ajouter une chaîne de caractère supplémentaire</string>
+  <string name="delete_extra_string">Supprimer la chaîne additionnelle</string>
   <string name="database_loaded_quickunlock_enabled">Base de donnée chargée, QuickUnlock activé.</string>
   <string name="credentials_dialog_title">Entrez vos identifiants pour le serveur</string>
   <string name="UseFileTransactions_title">File transactions</string>
   <string name="UseFileTransactions_summary">Utiliser les opérations sur les fichiers pour écrire les bases de données</string>
+  <string name="CheckForFileChangesOnSave_title">Rechercher des modifications</string>
+  <string name="CheckForFileChangesOnSave_summary">Vérifie si le fichier a été modifié par ailleurs avant d\'enregistrer les modifications.</string>
   <string name="ShowCopyToClipboardNotification_title">Barre de notification et presse-papiers</string>
   <string name="ShowCopyToClipboardNotification_summary">Rend le nom d\'utilisateur et le mot de passe accessibles via la barre de notification et le presse-papiers. Attention au sniffers de mot de passes !</string>
   <string name="ShowKp2aKeyboardNotification_title">Barre de notification et clavier KP2A</string>
@@ -238,7 +242,31 @@
   <string name="suggest_improvements">Faire des suggestions ou votez pour des améliorations</string>
   <string name="rate_app">Noter cette application</string>
   <string name="translate_app">Traduire KP2A</string>
+  <string name="AddingEntry">Ajout de l\'entrée en cours…</string>
+  <string name="AddingGroup">Ajout du groupe en cours…</string>
+  <string name="DeletingEntry">Suppression de l\'entrée…</string>
+  <string name="DeletingGroup">Suppression du groupe…</string>
+  <string name="SettingPassword">Prise en compte du mot de passe…</string>
+  <string name="UndoingChanges">Annulation de modifications…</string>
+  <string name="TransformingKey">Changement de la clé principale…</string>
+  <string name="DecodingDatabase">Décodage de la base de données…</string>
+  <string name="ParsingDatabase">Analyse de la base de données…</string>
+  <string name="CheckingTargetFileForChanges">Vérification des modifications dans le fichier…</string>
+  <string name="TitleSyncQuestion">Fusionner les modifications ?</string>
+  <string name="MessageSyncQuestion">La base de données a été modifiée par une source tierce. Voulez-vous charger et fusionner les changements avant de sauvegarder ? Sélectionnez \"Non\" si vous voulez écraser les changements externes.</string>
+  <string name="SynchronizingDatabase">Importation des modifications…</string>
+  <string name="YesSynchronize">Oui, fusionne</string>
+  <string name="NoOverwrite">Non, l\'écraser</string>
   <string name="ChangeLog_title">Journal des modifications</string>
+  <string name="ChangeLog_0_8_4"><b>Version 0.8.4</b>\n 
+* Modifications tierces de la base de données détectées et fusionnées à la sauvegarde\n 
+* Chargement optimisé\n 
+* Amélioration de la barre de recherche (suggestions)\n 
+* Nouveau logo pour l\'application ! \n
+* Support des fichiers .kdbp pour des chargements/enregistrements plus rapides\n 
+* Édition des chaînes additionnelles améliorée et interface cachée lorsque protégée\n 
+Merci à Alex Vallat pour ses contributions au code !\n 
+Merci à Niki Hüttner (www.close-cut.de) pour le nouveau logo !\n</string>
   <string name="ChangeLog_0_8_3"><b>Version 0.8.3</b>\n
 * Nom d\'utilisateur/TAN affiché dans la liste des entrées (voir les préférences)\n
 * Les entrées peuvent être créées lorsqu\'elles ne sont pas trouvées\n

src/keepass2android/Resources/values-it/strings.xml

@@ -7,6 +7,7 @@
   <string name="CreditsText">L\'interfaccia utente è basata su di un riporto di KeepassDroid sviluppato da Brian Pellin. Il codice per le operazioni del database si basa su KeePass da Dominik Reichl. Il robot Android è riprodotto o modificato dal lavoro creato e condiviso da Google e utilizzato secondo i termini descritti in Creative Commons Attribution 3.0 License.</string>
   <string name="accept">Accetto</string>
   <string name="add_entry">Aggiungi voce</string>
+  <string name="add_url_entry">Creare la voce per l\'URL</string>
   <string name="add_group">Aggiungi gruppo</string>
   <string name="add_group_title">Aggiungi Gruppo</string>
   <string name="algorithm">Algoritmo</string>
@@ -28,6 +29,7 @@
   <string name="clipboard_timeout_summary">Tempo prima di eliminare gli appunti dopo la copia del nome file o password</string>
   <string name="copy_username">Copia nome utente negli appunti</string>
   <string name="copy_password">Copia password negli appunti</string>
+  <string name="available_through_keyboard">La voceè disponibile attraverso la tastiera KP2A</string>
   <string name="not_possible_im_picker">Impossibile aprire la finestra di selezione del metodo di input. Si prega di attivare manualmente la tastiera.</string>
   <string name="please_activate_keyboard">Si prega di abilitare la tastiera Keepass2Android nelle impostazioni del tuo sistema.</string>
   <string name="creating_db_key">Creazione file chiave database…</string>
@@ -46,6 +48,7 @@
   <string name="entry_cancel">Annulla</string>
   <string name="entry_comment">Commento</string>
   <string name="entry_tags">Tags</string>
+  <string name="entry_override_url">Sovrascivere l\'URL</string>
   <string name="entry_confpassword">Conferma password</string>
   <string name="entry_created">Creato</string>
   <string name="entry_expires">Scade</string>
@@ -92,6 +95,8 @@
   <string name="hint_login_pass">Password</string>
   <string name="hint_title">nome</string>
   <string name="hint_url">url</string>
+  <string name="hint_override_url">sovrascrivere l\'URL</string>
+  <string name="hint_tags">tag1, tag2</string>
   <string name="hint_username">nome utente</string>
   <string name="install_from_market">Installa dal Market</string>
   <string name="install_from_website">Installa dal Web</string>
@@ -124,6 +129,7 @@
   <string name="menu_open">Apri</string>
   <string name="menu_rename">Rinomina</string>
   <string name="menu_search">Cerca</string>
+  <string name="menu_search_advanced">Ricerca Avanzata</string>
   <string name="menu_url">Vai all\'URL</string>
   <string name="minus">Meno</string>
   <string name="never">Mai</string>
@@ -148,6 +154,7 @@
   <string name="rounds_explaination">Un livello di cifratura elevato fornisce una protezione maggiore contro attacchi di tipo \"forza brutta\", ma può veramente rallentare il caricamento e il salvataggio.</string>
   <string name="rounds_hint">livello</string>
   <string name="database_name">Nome del database</string>
+  <string name="default_username">Nome utente predefinito per le nuove voci</string>
   <string name="saving_database">Salvataggio database…</string>
   <string name="space">Spazio</string>
   <string name="search_label">Cerca</string>
@@ -155,7 +162,11 @@
   <string name="sort_name">Ordina per nome</string>
   <string name="sort_db">Ordinamento DB</string>
   <string name="special">Speciale</string>
+  <string name="search_hint">Cerca</string>
+  <string name="search_results">Risultati della ricerca</string>
   <string name="search_in">Cerca in</string>
+  <string name="select_other_entry">Selezionare un\'altra voce</string>
+  <string name="select_group_then_add">Open the desired group, then press \"%1$s\"!</string>
   <string name="twofish">Twofish</string>
   <string name="underline">Sottolinea</string>
   <string name="unsupported_db_version">Versione database non supportata.</string>
@@ -164,6 +175,11 @@
   <string name="warning_unmounted">Attualmente la scheda SD non è montata nel dispositivo. Non sarai in grado di caricare o creare un nuovo database.</string>
   <string name="version_label">Versione</string>
   <string name="regular_expression">Espressione regolare</string>
+  <string name="TanExpiresOnUse_title">Tan scade con l\'uso</string>
+  <string name="TanExpiresOnUse_summary">Segna i TAN come scaduti quando usati</string>
+  <string name="ShowUsernameInList_title">Visualizza il nome utente nella lista</string>
+  <string name="ShowUsernameInList_summary">Visualizza il nome utente sotto i titoli delle voci. Utile per account multipli o TAN multipli.</string>
+  <string name="kp2a_findUrl">Keepass2Android: Trova una password</string>
   <string name="excludeExpiredEntries">Escludere voci scadute</string>
   <string name="search_options">Opzioni</string>
   <string name="caseSensitive">Maiuscole e minuscole</string>
@@ -177,11 +193,47 @@
   <string name="QuickUnlock_label">Inserisci gli ultimi %1$d caratteri della tua password:</string>
   <string name="QuickUnlock_button">QuickUnlock!</string>
   <string name="QuickUnlock_lockButton">Chiudi database</string>
+  <string name="QuickUnlockDefaultEnabled_title">Abilita QuickUnlock per impostazione predefinita</string>
+  <string name="QuickUnlockDefaultEnabled_summary">Definisce se QuickUnlock è attivato per impostazione predefinita o no.</string>
+  <string name="QuickUnlockLength_title">Lunghezza della chiave QuickUnlock</string>
+  <string name="QuickUnlockLength_summary">Numero massimo di caratteri utilizzati come QuickUnlock password.</string>
+  <string name="QuickUnlock_fail">QuickUnlock fallito: password errata!</string>
+  <string name="BinaryDirectory_title">Directory dei file allegati</string>
+  <string name="BinaryDirectory_summary">Directory in cui vengono salvati i file allegati.</string>
+  <string name="SaveAttachmentDialog_title">Salva allegato</string>
+  <string name="SaveAttachmentDialog_text">Si prega di scegliere dove salvare l\'allegato.</string>
+  <string name="SaveAttachmentDialog_save">Salva su scheda SD</string>
+  <string name="SaveAttachmentDialog_open">Salva sulla cache e apri</string>
+  <string name="SaveAttachment_doneMessage">File salvato in %1$s.</string>
+  <string name="SaveAttachment_Failed">Impossibile salvare l\'allegatto in %1$s.</string>
+  <string name="error_invalid_expiry_date">Formato data/ora non valido per la data di scadenza!</string>
+  <string name="error_string_key">Un nome di campo è richiesto per ogni stringa.</string>
+  <string name="field_name">Nome del campo</string>
+  <string name="field_value">Valore del campo</string>
+  <string name="protection">Campo protetto</string>
+  <string name="add_binary">Aggiungere il file allegato...</string>
+  <string name="add_extra_string">Aggiungere la stringa aggiuntiva</string>
+  <string name="delete_extra_string">Eliminare la stringa aggiuntiva</string>
+  <string name="database_loaded_quickunlock_enabled">Database caricato, QuickUnlock abilitato.</string>
+  <string name="credentials_dialog_title">Immettere le credenziali del server</string>
+  <string name="UseFileTransactions_title">Operazioni di file</string>
+  <string name="UseFileTransactions_summary">Utilizzare le transazioni file per la scrittura di database</string>
+  <string name="CheckForFileChangesOnSave_title">Controlla per modifiche</string>
+  <string name="CheckForFileChangesOnSave_summary">Controlla se il file è stato modificato esternamente prima di salvare le modifiche.</string>
+  <string name="ShowCopyToClipboardNotification_title">Notifiche degli Appunti</string>
+  <string name="ShowCopyToClipboardNotification_summary">Rendere accessibili attraverso la barra di notifica e appunti username e password. Fare attenzione agli sniffer di password!</string>
+  <string name="ShowKp2aKeyboardNotification_title">Notifica di tastiera KP2A</string>
+  <string name="ShowKp2aKeyboardNotification_summary">Rendi accessibile dalla tastiera KP2A (raccomandato).</string>
+  <string name="OpenKp2aKeyboardAutomatically_title">Finestra di dialogo Selezione tastiera</string>
+  <string name="OpenKp2aKeyboardAutomatically_summary">Apri la selezione tastiera quando è disponibile la tastiera KP2A dopo una ricerca.</string>
+  <string name="AskOverwriteBinary">Si desidera sovrascrivere il file binario esistente con lo stesso nome?</string>
   <string name="AskOverwriteBinary_title">Sovrascrivere il file binario esistente?</string>
   <string name="AskOverwriteBinary_yes">Sovrascrivi</string>
   <string name="AskOverwriteBinary_no">Rinomina</string>
   <string name="AttachFailed">Impossibile aggiungere il file allegato.</string>
   <string name="RecycleBin">Cestino</string>
+  <string name="AskDeletePermanentlyEntry">Si desidera eliminare definitivamente questa voce? Premere No per riciclare.</string>
+  <string name="AskDeletePermanentlyGroup">Si desidera eliminare definitivamente questo gruppo? Premere No per riciclare.</string>
   <string name="AskDeletePermanently_title">Elimina definitivamente?</string>
   <string name="AskReloadFile_title">Ricaricare il file?</string>
   <string name="AskReloadFile">Il file attualmente aperto è stato modificato da un altro programma. Si desidera ricaricarlo?</string>
@@ -190,6 +242,34 @@
   <string name="suggest_improvements">Suggerire o valutare miglioramenti</string>
   <string name="rate_app">Valuta questa app</string>
   <string name="translate_app">Traduci KP2A</string>
+  <string name="AddingEntry">Aggiunta della voce…</string>
+  <string name="AddingGroup">Aggiunta del gruppo…</string>
+  <string name="DeletingEntry">Eliminazione della voce...</string>
+  <string name="DeletingGroup">Eliminazione del gruppo...</string>
+  <string name="SettingPassword">Impostazione della password…</string>
+  <string name="UndoingChanges">Annullare le modifiche...</string>
+  <string name="TransformingKey">Trasformazione  della chiave master...</string>
+  <string name="DecodingDatabase">Decodifica database...</string>
+  <string name="ParsingDatabase">Analisi del database...</string>
+  <string name="CheckingTargetFileForChanges">Controllo file di destinazione per le modifiche...</string>
+  <string name="TitleSyncQuestion">Unire le modifiche?</string>
+  <string name="MessageSyncQuestion">Il file di database è stato modificato esternamente. Si desidera caricare e unire le modifiche prima di salvare? Selezionare No se si desidera sovrascrivere le modifiche esterne.</string>
+  <string name="SynchronizingDatabase">Unisco le modifiche...</string>
+  <string name="YesSynchronize">Sì, unire</string>
+  <string name="NoOverwrite">No, sovrascrivere</string>
+  <string name="ChangeLog_title">log delle modifiche</string>
+  <string name="ChangeLog_0_8_4">
+		<b>Version 0.8.4</b>\n
+		* Combiamenti al database esterno vengono rilevate ed unite durante il salvataggio\n
+		* Migliorate le performence in caricamento\n
+		* Migliorata la toolbar di ricerca con suggerimenti\n
+		* Nuovo logo dell\'App!
+		*Aggiunto supporto al formato .kdbp per apertura e salvataggio più veloci\n
+		* Migliorato l\'editing delle stringe aggiuntive e del display nascosto quando protetto\n
+		Grazie a Alex Vallat per il suo contributo al codice!\n
+		Grazie a Niki Hüttner (www.close-cut.de) per il logo!\n
+	</string>
+  <string name="ChangeLog_keptDonate">Aggiunta la possibilità di donare una birra o qualcos\'altro</string>
   <string-array name="clipboard_timeout_options">
     <item>30 secondi</item>
     <item>1 minuto</item>
@@ -202,8 +282,8 @@
     <item>Grande</item>
   </string-array>
   <string-array name="cred_remember_modes">
-    <item>Do not remember username and password</item>
+    <item>Non ricordare username e password</item>
-    <item>Remember username only</item>
+    <item>Ricorda solo il nome utente</item>
-    <item>Remember username and password</item>
+    <item>Ricorda username e password</item>
   </string-array>
 </resources>

src/keepass2android/Resources/values-nb/strings.xml

@@ -7,6 +7,7 @@
   <string name="CreditsText">Brukergrensesnittet er basert på en port av KeepassDroid utviklet av Brian Pellin. Kildekode til databaseoperasjoner er basert på KeePass av Dominik Reichl. Android roboten, laget og delt av Google, er reprodusert og modifisert i henhold til Creative Commons 3.0 Navngivelse Lisensen.</string>
   <string name="accept">Godta</string>
   <string name="add_entry">Legg til post</string>
+  <string name="add_url_entry">Lag oppføring for URL</string>
   <string name="add_group">Legg til gruppe</string>
   <string name="add_group_title">Legg til gruppe</string>
   <string name="algorithm">Algoritme</string>
@@ -128,6 +129,7 @@
   <string name="menu_open">Åpne</string>
   <string name="menu_rename">Gi nytt navn</string>
   <string name="menu_search">Søk</string>
+  <string name="menu_search_advanced">Avansert søk</string>
   <string name="menu_url">Gå til URL</string>
   <string name="minus">Minus</string>
   <string name="never">Aldri</string>
@@ -163,6 +165,8 @@
   <string name="search_hint">Søk etter</string>
   <string name="search_results">Søkeresultater</string>
   <string name="search_in">Søk i</string>
+  <string name="select_other_entry">Velg en annen oppføring</string>
+  <string name="select_group_then_add">Åpne ønsket gruppe, og trykk deretter \"%1$s\"!</string>
   <string name="twofish">Twofish</string>
   <string name="underline">Understreking</string>
   <string name="unsupported_db_version">Ikke-støttet databaseversjon.</string>
@@ -173,6 +177,8 @@
   <string name="regular_expression">Regulært uttrykk</string>
   <string name="TanExpiresOnUse_title">TAN utløper ved bruk</string>
   <string name="TanExpiresOnUse_summary">Marker TAN oppføringer som utløpt når du bruker dem</string>
+  <string name="ShowUsernameInList_title">Vis brukernavn i listen</string>
+  <string name="ShowUsernameInList_summary">Vis brukernavn under oppføringstitler. Nyttig for flere kontoer eller TANs.</string>
   <string name="kp2a_findUrl">Keepass2Android: Finn passord</string>
   <string name="excludeExpiredEntries">Utelukk utløpte oppføringer</string>
   <string name="search_options">Alternativer</string>
@@ -204,7 +210,7 @@
   <string name="error_string_key">Et feltnavn kreves for hver streng.</string>
   <string name="field_name">Feltnavn</string>
   <string name="field_value">Feltverdi</string>
-  <string name="protection">Minnebeskyttelse</string>
+  <string name="protection">Beskyttet felt</string>
   <string name="add_binary">Legg til filvedlegg...</string>
   <string name="add_extra_string">Legg til ekstra streng</string>
   <string name="database_loaded_quickunlock_enabled">Databasen er lastet, QuickUnlock er aktivert.</string>
@@ -215,6 +221,8 @@
   <string name="ShowCopyToClipboardNotification_summary">Gjør brukernavn og passord er tilgjengelig gjennom varslingslinjen og utklippstavle. Vokt deg for passordsniffere!</string>
   <string name="ShowKp2aKeyboardNotification_title">KP2A tastatur varsel</string>
   <string name="ShowKp2aKeyboardNotification_summary">Gjør hele oppføringen tilgjengelig gjennom KP2A tastaturet (anbefales).</string>
+  <string name="OpenKp2aKeyboardAutomatically_title">Dialogboks for valg av tastatur</string>
+  <string name="OpenKp2aKeyboardAutomatically_summary">Åpne tastatur dialog når en oppføring er tilgjengelig gjennom KP2A tastaturet etter søk.</string>
   <string name="AskOverwriteBinary">Vil du overskrive den eksisterende binærfilen med samme navn?</string>
   <string name="AskOverwriteBinary_title">Overskrive eksisterende binærfil?</string>
   <string name="AskOverwriteBinary_yes">Overskriv</string>
@@ -232,6 +240,7 @@
   <string name="rate_app">Vurder denne appen</string>
   <string name="translate_app">Oversett KP2A</string>
   <string name="ChangeLog_title">Endringslogg</string>
+  <string name="ChangeLog_keptDonate">Utvidet mulighet til å donere en øl, eller noe annet</string>
   <string-array name="clipboard_timeout_options">
     <item>30 sekunder</item>
     <item>1 minutt</item>

src/keepass2android/Resources/values-pl/strings.xml

@@ -205,7 +205,6 @@ Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej i/
   <string name="error_string_key">Nazwa pola jest wymagana dla każdego ciągu znaków.</string>
   <string name="field_name">Nazwa pola</string>
   <string name="field_value">Wartość pola</string>
-  <string name="protection">Ochrona pamięci</string>
   <string name="add_binary">Dodaj załącznik...</string>
   <string name="add_extra_string">Dodać dodatkowy ciąg znaków</string>
   <string name="database_loaded_quickunlock_enabled">Baza załadowana, Szybkie_Odblokowanie włączone.</string>

src/keepass2android/Resources/values-pt-rBR/strings.xml

@@ -4,12 +4,18 @@
   <string name="about_feedback">Comentários</string>
   <string name="about_homepage">Página inicial</string>
   <string name="AboutText">Keepass2Android é uma implementação do gerenciador de senhas KeePass.</string>
+  <string name="CreditsText">A Interface do usuário baseia-se no KeepassDroid desenvolvido por Brian Pellin. Código para manipulação do banco de dados baseia-se no KeePass por Dominik Reichl. O robô Android é reproduzido ou modificado do trabalho criado e compartilhado pelo Google e utilizado de acordo com os termos descritos na licença Creative Commons 3.0 Attribution License.</string>
   <string name="accept">Aceitar</string>
   <string name="add_entry">Adicionar entrada</string>
+  <string name="add_url_entry">Criar entrada para URL</string>
   <string name="add_group">Adicionar grupo</string>
   <string name="add_group_title">Adicionar Grupo</string>
   <string name="algorithm">Algoritmo</string>
   <string name="algorithm_colon">Algoritmo</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">Tempo limite para o aplicativo</string>
   <string name="app_timeout_summary">Tempo até que o banco de dados seja travado quando o aplicativo estiver inativo.</string>
   <string name="application">Aplicação</string>
@@ -23,6 +29,9 @@
   <string name="clipboard_timeout_summary">Tempo até limpar o clipboard após copiar usuário ou senha.</string>
   <string name="copy_username">Copiar usuário para o clipboard</string>
   <string name="copy_password">Copiar senha para o clipboard</string>
+  <string name="available_through_keyboard">Entrada está disponível através do teclado KP2A</string>
+  <string name="not_possible_im_picker">Não foi possível abrir a caixa de diálogo para selecionar o método de entrada. Por favor, ative o teclado manualmente.</string>
+  <string name="please_activate_keyboard">Por favor habilite o teclado do Keepass2Android nas configurações do seu sistema.</string>
   <string name="creating_db_key">Criando a chave do banco de dados…</string>
   <string name="current_group">Grupo atual</string>
   <string name="current_group_root">Grupo atual: Raiz</string>
@@ -30,22 +39,28 @@
   <string name="decrypting_db">Decifrando conteúdo do banco de dados…</string>
   <string name="decrypting_entry">Decifrando entrada</string>
   <string name="default_checkbox">Usar este banco de dados como padrão</string>
-  <string name="digits">Digitos</string>
+  <string name="digits">Dígitos</string>
   <string name="disclaimer_formal">Keepass2Android vem com ABSOLUTAMENTE NENHUMA GARANTIA; Este é um software livre, e você está convidado a redistribui-lo sob as condições da GPL versão 2 ou posterior.</string>
+  <string name="ellipsis">\u2026</string>
   <string name="enter_filename">Digite o nome do arquivo de banco de dados</string>
   <string name="entry_accessed">Acessado</string>
-  <string name="entry_and_or">Digite uma senha e/ ou entre com o caminho para o arquivo de chaves do banco de dados</string>
+  <string name="entry_and_or">Digite uma senha e/ou entre com o caminho para o arquivo chave do banco de dados</string>
   <string name="entry_cancel">Cancelar</string>
   <string name="entry_comment">Comentários</string>
+  <string name="entry_tags">Etiquetas</string>
+  <string name="entry_override_url">Substituir URL</string>
   <string name="entry_confpassword">Confirmar senha</string>
   <string name="entry_created">Criado</string>
   <string name="entry_expires">Expira</string>
-  <string name="entry_keyfile">Arquivo de chave (opcional)</string>
+  <string name="entry_keyfile">Arquivo chave (opcional)</string>
   <string name="entry_modified">Modificado</string>
   <string name="entry_password">Senha</string>
   <string name="entry_save">Salvar</string>
   <string name="entry_title">Nome</string>
+  <string name="entry_url">URL</string>
   <string name="entry_user_name">Nome de usuário</string>
+  <string name="entry_extra_strings">Campos de texto extra</string>
+  <string name="entry_binaries">Anexos</string>
   <string name="error_arc4">A cifra de fluxo ArcFour não é suportada.</string>
   <string name="error_can_not_handle_uri">Keepass2Android não pôde tratar esta uri.</string>
   <string name="error_could_not_create_group">Erro ao criar grupo.</string>
@@ -58,7 +73,7 @@
   <string name="error_invalid_db">Banco de dados inválido.</string>
   <string name="error_invalid_path">Caminho inválido.</string>
   <string name="error_no_name">É necessário um nome.</string>
-  <string name="error_nopass">São necessários uma senha ou um arquivo de chaves.</string>
+  <string name="error_nopass">É necessário uma senha ou um arquivo chave.</string>
   <string name="error_out_of_memory">Foi atingida a capacidade máxima de memória do seu dispositivo ao carregar o banco de dados. O banco de dados pode ser muito grande para este dispositivo.</string>
   <string name="error_pass_gen_type">Pelo menos um tipo de geração de senhas deve ser selecionado</string>
   <string name="error_pass_match">As senhas não combinam.</string>
@@ -73,22 +88,29 @@
   <string name="hint_comment">comentário</string>
   <string name="hint_conf_pass">confirmar senha</string>
   <string name="hint_generated_password">senha gerada</string>
-  <string name="hint_group_name">Nome do Grupo</string>
+  <string name="hint_group_name">Nome do grupo</string>
-  <string name="hint_keyfile">arquivo de chave</string>
+  <string name="hint_keyfile">arquivo chave</string>
   <string name="hint_length">tamanho</string>
   <string name="hint_pass">senha</string>
   <string name="hint_login_pass">Senha</string>
   <string name="hint_title">nome</string>
+  <string name="hint_url">url</string>
+  <string name="hint_override_url">substituir url</string>
+  <string name="hint_tags">tag1, tag2</string>
   <string name="hint_username">nome de usuário</string>
   <string name="install_from_market">Instalar a partir do Google Play</string>
   <string name="install_from_website">Instalar a partir da Web</string>
-  <string name="InvalidPassword">Senha ou arquivo de chaves inválidos.</string>
+  <string name="InvalidPassword">Senha ou arquivo chave inválidos.</string>
+  <string name="invalid_algorithm">Algoritmo inválido.</string>
   <string name="invalid_db_sig">O formato do banco de dados não foi reconhecido.</string>
+  <string name="keyfile_does_not_exist">Arquivo chave não existe.</string>
+  <string name="keyfile_is_empty">Arquivo chave está vazio.</string>
   <string name="length">Tamanho</string>
   <string name="list_size_title">Tamanho da lista de grupos</string>
   <string name="list_size_summary">Tamanho do texto na lista de grupos</string>
   <string name="loading_database">Carregando banco de dados…</string>
   <string name="lowercase">Letras minúsculas</string>
+  <string name="MaskedPassword">*****</string>
   <string name="maskpass_title">Esconder senha</string>
   <string name="maskpass_summary">Esconder senha por padrão</string>
   <string name="menu_about">Sobre</string>
@@ -98,7 +120,8 @@
   <string name="menu_create">Criar</string>
   <string name="menu_app_settings">Configurações</string>
   <string name="menu_db_settings">Configurações do banco de dados</string>
-  <string name="menu_delete">Deletar</string>
+  <string name="menu_delete">Excluir</string>
+  <string name="menu_donate">Doe uma cerveja...</string>
   <string name="menu_edit">Editar</string>
   <string name="menu_hide_password">Esconder Senha</string>
   <string name="menu_homepage">Ir para a página inicial</string>
@@ -106,9 +129,12 @@
   <string name="menu_open">Abrir</string>
   <string name="menu_rename">Renomear</string>
   <string name="menu_search">Procurar</string>
+  <string name="menu_search_advanced">Pesquisa avançada</string>
   <string name="menu_url">Ir para URL</string>
   <string name="minus">Menos</string>
   <string name="never">Nunca</string>
+  <string name="yes">Sim</string>
+  <string name="no">Não</string>
   <string name="no_keys">Nenhuma entrada no grupo.</string>
   <string name="no_results">Sem resultados na busca.</string>
   <string name="no_url_handler">Erro ao tratar url.</string>
@@ -119,25 +145,40 @@
   <string name="password_title">Digite a senha do banco de dados</string>
   <string name="progress_create">Criando novo banco de dados…</string>
   <string name="progress_title">Trabalhando…</string>
-  <string name="remember_keyfile_summary">Lembrar o local dos arquivos de chave</string>
+  <string name="remember_keyfile_summary">Lembrar o local dos arquivos chave</string>
-  <string name="remember_keyfile_title">Salvar arquivo de chave</string>
+  <string name="remember_keyfile_title">Salvar arquivo chave</string>
   <string name="remove_from_filelist">Remover</string>
+  <string name="rijndael">Rijndael (AES)</string>
   <string name="root">Raiz</string>
   <string name="rounds">Rodadas de criptografia</string>
   <string name="rounds_explaination">Maior número de rodadas de criptografia adiciona mais proteção contra ataques de força bruta, porém pode tornar o processo de carregar e salvar mais lentos.</string>
   <string name="rounds_hint">rodadas</string>
+  <string name="database_name">Nome do banco de dados</string>
+  <string name="default_username">Nome de usuário padrão para novas entradas</string>
   <string name="saving_database">Salvando banco de dados…</string>
-  <string name="space">Spaço</string>
+  <string name="space">Espaço</string>
   <string name="search_label">Busca</string>
   <string name="show_password">Mostrar senha</string>
   <string name="sort_name">Ordenar por nome</string>
-  <string name="sort_db">Ordenação do banco de dados</string>
+  <string name="sort_db">Ordenar por data de criação</string>
   <string name="special">Caracteres Especiais</string>
+  <string name="search_results">Resultado da busca</string>
+  <string name="search_in">Procurar em</string>
+  <string name="select_other_entry">Selecionar outra entrada</string>
+  <string name="select_group_then_add">Abra o grupo desejado e, em seguida, pressione \"%1$s\"!</string>
+  <string name="twofish">Twofish</string>
+  <string name="underline">Sublinhado</string>
   <string name="unsupported_db_version">Versão de banco de dados não suportada.</string>
   <string name="uppercase">Letras maiúsculas</string>
   <string name="warning_read_only">Seu cartão SD está no modo de somente leitura. Talvez não seja possível salvar modificações ao banco de dados.</string>
   <string name="warning_unmounted">Seu cartão SD não está montado no dispositivo. Não será possível carregar ou criar um banco de dados.</string>
   <string name="version_label">Versão</string>
+  <string name="regular_expression">Expressão regular</string>
+  <string name="ShowUsernameInList_title">Mostrar nome de usuário na lista</string>
+  <string name="ShowUsernameInList_summary">Mostrar nome de usuário abaixo dos títulos das entradas. Útil para várias contas ou TANs.</string>
+  <string name="kp2a_findUrl">Keepass2Android: Buscar senha</string>
+  <string name="search_options">Opções</string>
+  <string name="start_open_file">Abrir arquivo...</string>
   <string-array name="clipboard_timeout_options">
     <item>30 segundos</item>
     <item>1 minuto</item>

src/keepass2android/Resources/values-ro/strings.xml

@@ -129,6 +129,7 @@
   <string name="menu_open">Deschide</string>
   <string name="menu_rename">Redenumește</string>
   <string name="menu_search">Căutare</string>
+  <string name="menu_search_advanced">Căutare avansată</string>
   <string name="menu_url">Du-te la URL-ul</string>
   <string name="minus">Minus</string>
   <string name="never">Niciodată</string>
@@ -210,13 +211,16 @@
   <string name="error_string_key">Este necesar un nume câmp pentru fiecare string.</string>
   <string name="field_name">Numele câmpului</string>
   <string name="field_value">Valoarea câmpului</string>
-  <string name="protection">Protecție memorie</string>
+  <string name="protection">Câmp protejat</string>
   <string name="add_binary">Ataşează fişier...</string>
   <string name="add_extra_string">Adaugă string adiţional</string>
+  <string name="delete_extra_string">Şterge string adiţional</string>
   <string name="database_loaded_quickunlock_enabled">Baza de date încărcată, QuickUnlock activat.</string>
   <string name="credentials_dialog_title">Introduceți datele conectare la server</string>
   <string name="UseFileTransactions_title">Tranzacții fișier</string>
   <string name="UseFileTransactions_summary">Foloseşte tranzacţii pentru a scrie bazele de date</string>
+  <string name="CheckForFileChangesOnSave_title">Verifică modificări</string>
+  <string name="CheckForFileChangesOnSave_summary">Verifică dacă nu s-a modificat extern fişierul înainte de a salva.</string>
   <string name="ShowCopyToClipboardNotification_title">Notificări clipboard</string>
   <string name="ShowCopyToClipboardNotification_summary">Oferă utilizatorul şi parolă folosind bara de notificări şi clipboard-ul. Atenţie la \"password sniffers\"!</string>
   <string name="ShowKp2aKeyboardNotification_title">Notificare tastatură KP2A</string>
@@ -239,7 +243,31 @@
   <string name="suggest_improvements">Propuneți sau votați pentru îmbunătățiri</string>
   <string name="rate_app">Evaluează această aplicație</string>
   <string name="translate_app">Traduce KP2A</string>
+  <string name="AddingEntry">Se adaugă înregistrarea…</string>
+  <string name="AddingGroup">Se adaugă grup…</string>
+  <string name="DeletingEntry">Se şterge înregistrarea…</string>
+  <string name="DeletingGroup">Se şterge grupul…</string>
+  <string name="SettingPassword">Se setează parola…</string>
+  <string name="UndoingChanges">Se anulează modificările…</string>
+  <string name="TransformingKey">Se transformă cheia principală…</string>
+  <string name="DecodingDatabase">Se decodează baza de date…</string>
+  <string name="ParsingDatabase">Se parsează baza de date…</string>
+  <string name="CheckingTargetFileForChanges">Se verifică fişierul ţintă pentru modificări…</string>
+  <string name="TitleSyncQuestion">Combinare modificări?</string>
+  <string name="MessageSyncQuestion">Fişierul bazei de date a fost modificat extern. Doriţi să încărcaţi şi să combinaţi modificările înainte de salvare. Selectaţi Nu dacă doriţi să suprascrieţi modificările externe.</string>
+  <string name="SynchronizingDatabase">Se combină modificările…</string>
+  <string name="YesSynchronize">Da, combină</string>
+  <string name="NoOverwrite">Nu, suprascrie</string>
   <string name="ChangeLog_title">Change log</string>
+  <string name="ChangeLog_0_8_4"><b>Versiunea 0.8.4</b>\n 
+* Modificările externe ale bazei de date sunt detectate şi combinate la salvare\n 
+* S-a îmbunătăţit performanţa la încărcare\n 
+* Bară de căutare îmbunătăţită cu sugestii\n 
+* Logo nou pentru aplicaţie!\n 
+* Adăugat suport pentru formatul .kdbp pentru încărcare/salvare rapidă\n 
+* S-a îmbunătăţit editarea câmpurilor extra şi s-a ascuns afişarea dacă sunt protejate\n 
+Mulţumiri lui Alex Vallat pentru contribuţiile sale la cod!\n 
+Mulţumiri lui Niki Hüttner (www.close-cut.de) pentru noul logo!\n</string>
   <string name="ChangeLog_0_8_3"><b>Versiunea 0.8.3</b>\n
 * index utilizator/TAN afişat în lista de înregistrări (vezi setări)\n
 * Înregistrările pot fi create dacă o căutare din browser nu găseşte rezultate\n

src/keepass2android/Resources/values-ru/strings.xml

@@ -129,6 +129,7 @@
   <string name="menu_open">Открыть</string>
   <string name="menu_rename">Новое имя</string>
   <string name="menu_search">Поиск</string>
+  <string name="menu_search_advanced">Расширенный поиск</string>
   <string name="menu_url">Ссылка</string>
   <string name="minus">-Дефис-</string>
   <string name="never">Никогда</string>
@@ -209,13 +210,16 @@
   <string name="error_string_key">Имя поля обязательно для каждой строки.</string>
   <string name="field_name">Имя поля</string>
   <string name="field_value">Значение поля</string>
-  <string name="protection">Защита памяти</string>
+  <string name="protection">Защищённое поле</string>
   <string name="add_binary">Добавьте вложенный файл...</string>
   <string name="add_extra_string">Добавить дополнительную строку</string>
+  <string name="delete_extra_string">Удалить дополнительную строку</string>
   <string name="database_loaded_quickunlock_enabled">База данных загружен, БыстраяРазблокировка включена.</string>
   <string name="credentials_dialog_title">Введите учетные данные сервера</string>
   <string name="UseFileTransactions_title">Файловые транзакции</string>
   <string name="UseFileTransactions_summary">Использовать файловые транзакции для записи баз данных</string>
+  <string name="CheckForFileChangesOnSave_title">Проверить на наличие изменений</string>
+  <string name="CheckForFileChangesOnSave_summary">Проверка был ли файл изменен извне до сохранения изменений.</string>
   <string name="ShowCopyToClipboardNotification_title">Уведомления буфера обмена</string>
   <string name="ShowCopyToClipboardNotification_summary">Сделать имя пользователя и пароль доступными через панель уведомлений и буфер обмена. Остерегайтесь перехватчиков паролей!</string>
   <string name="ShowKp2aKeyboardNotification_title">Уведомления клавиатуры KP2A</string>
@@ -238,7 +242,31 @@
   <string name="suggest_improvements">Предложить или голосовать за улучшение</string>
   <string name="rate_app">Оцените это приложение</string>
   <string name="translate_app">Переведите KP2A</string>
+  <string name="AddingEntry">Добавление записи…</string>
+  <string name="AddingGroup">Добавление группы…</string>
+  <string name="DeletingEntry">Удаление записи…</string>
+  <string name="DeletingGroup">Удаление группы…</string>
+  <string name="SettingPassword">Установка пароля…</string>
+  <string name="UndoingChanges">Отмена изменений…</string>
+  <string name="TransformingKey">Преобразование мастер-ключа…</string>
+  <string name="DecodingDatabase">Декодирование базы данных…</string>
+  <string name="ParsingDatabase">Анализ базы данных…</string>
+  <string name="CheckingTargetFileForChanges">Проверка целевого файла на наличие изменений…</string>
+  <string name="TitleSyncQuestion">Слить изменения?</string>
+  <string name="MessageSyncQuestion">Файл базы данных был изменен извне. Вы хотите загрузить и выполнить слияние изменений перед сохранением? Выберите Нет, если вы хотите перезаписать внешние изменения.</string>
+  <string name="SynchronizingDatabase">Слияние изменений…</string>
+  <string name="YesSynchronize">Да, объединить</string>
+  <string name="NoOverwrite">Нет, перезаписать</string>
   <string name="ChangeLog_title">Список изменений</string>
+  <string name="ChangeLog_0_8_4"><b>Версия 0.8.4</b>\n 
+* Внешние модификации базы данных обнаруживаются и объединяются при сохранении\n 
+* Улучшена скорость загрузки\n 
+* Улучшенная панель поиска с подсказками\n 
+* Новый логотип приложения! \n
+* Добавлена поддержка формата .kdbp для более быстрого чтения/записи\n 
+* Улучшено редактирование дополнительных записей и скрытие защищённых\n 
+Благодарю Alex Vallat за вклад в развитие кода!\n 
+Благодарю Niki Hüttner (www.close-cut.de) за новый логотип!\</string>
   <string name="ChangeLog_0_8_3"><b>Версия 0.8.3</b>\n
 * Отображение имени пользователя/TAN в списке записей (см. в настройках)\n
 * Записи могут быть созданы, если поиск из браузера ничего не вернул\n

src/keepass2android/Resources/values-sv/strings.xml

@@ -1,20 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
+  <string name="about_feedback">Återkoppling</string>
+  <string name="about_homepage">Hemsida</string>
+  <string name="accept">Godkänn</string>
+  <string name="add_entry">Ny post</string>
+  <string name="add_group">Ny grupp</string>
+  <string name="add_group_title">Ny grupp</string>
+  <string name="algorithm">Algoritm</string>
+  <string name="algorithm_colon">Algoritm</string>
+  <string name="app_name">Keepass2Android</string>
+  <string name="short_app_name">KP2A</string>
+  <string name="app_name_nonet">Keepass2Android är nedkopplad</string>
+  <string name="short_app_name_nonet">KP2A är nedkopplad</string>
+  <string name="app_timeout">Tidsgräns för applikationen</string>
+  <string name="app_timeout_summary">Tid innan låsning av databasen när applikationen är inaktiv.</string>
+  <string name="application">Applikation</string>
+  <string name="application_settings">Applikationsinställningar</string>
+  <string name="brackets">Paranteser</string>
+  <string name="building_search_idx">Bygger sökindex...</string>
+  <string name="cancel">Avbryt</string>
+  <string name="ClearClipboard">Urklippshanteraren rensad.</string>
+  <string name="clipboard_timeout">Tidsgräns för utklipp</string>
+  <string name="copy_username">Kopiera användarnamnet till urklipp</string>
+  <string name="copy_password">Kopiera lösenordet till urklipp</string>
+  <string name="creating_db_key">Skapar databasnyckel...</string>
+  <string name="current_group">Aktuell grupp</string>
+  <string name="current_group_root">Aktuell grupp: Root</string>
+  <string name="database">Databas</string>
+  <string name="decrypting_db">Dekrypterar databasinnehåll...</string>
+  <string name="decrypting_entry">Dekryptera post</string>
+  <string name="default_checkbox">Använd detta som som standarddatabas</string>
+  <string name="digits">Siffror</string>
+  <string name="disclaimer_formal">Keepass2Android kommer HELT UTAN GARANTIER; Detta är fri programvara och du är välkommen att distribuera den utifrån villkoren i GPL version 2 eller senare.</string>
+  <string name="ellipsis">\u2026</string>
+  <string name="entry_cancel">Avbryt</string>
+  <string name="entry_comment">Kommentarer</string>
+  <string name="entry_tags">Taggar</string>
+  <string name="entry_confpassword">Bekräfta lösenord</string>
+  <string name="entry_created">Skapad</string>
+  <string name="entry_expires">Upphör</string>
+  <string name="entry_keyfile">Nyckelfil (valfri)</string>
+  <string name="entry_modified">Ändrad</string>
+  <string name="entry_password">Lösenord</string>
+  <string name="entry_save">Spara</string>
+  <string name="entry_title">Namn</string>
+  <string name="entry_url">URL</string>
+  <string name="entry_user_name">Användarnamn</string>
+  <string name="entry_binaries">Bifogade filer</string>
+  <string name="error_could_not_create_group">Fel vid skapande av grupp.</string>
+  <string name="error_database_exists">Filen finns redan.</string>
+  <string name="error_invalid_db">Ogiltig databas.</string>
+  <string name="error_invalid_path">Ogiltig sökväg.</string>
+  <string name="error_nopass">Det krävs ett lösenord eller en nyckelfil.</string>
+  <string name="error_pass_match">Lösenorden stämmer inte överrens.</string>
+  <string name="error_rounds_not_number">Antalet rundor måste vara en siffra.</string>
+  <string name="error_rounds_too_large">Antalet rundor är för stort. Sätter värdet till 2147483648.</string>
+  <string name="FileNotFound">Hittar inte filen.</string>
+  <string name="group">Grupp</string>
+  <string name="hint_comment">kommentar</string>
+  <string name="hint_group_name">Gruppnamn</string>
+  <string name="hint_length">längd</string>
+  <string name="hint_pass">lösenord</string>
+  <string name="hint_login_pass">Lösenord</string>
+  <string name="hint_title">namn</string>
+  <string name="hint_url">url</string>
+  <string name="hint_username">användarnamn</string>
+  <string name="install_from_market">Installera från Play Store</string>
+  <string name="length">Längd</string>
+  <string name="MaskedPassword">*****</string>
+  <string name="menu_about">Om</string>
+  <string name="menu_copy_pass">Kopiera lösenord</string>
+  <string name="menu_copy_user">Kopiera användarnamn</string>
+  <string name="menu_create">Skapa</string>
+  <string name="menu_app_settings">Inställningar</string>
+  <string name="menu_db_settings">Databasinställningar</string>
+  <string name="menu_delete">Radera</string>
+  <string name="menu_donate">Donera en öl...</string>
+  <string name="menu_edit">Ändra</string>
+  <string name="menu_hide_password">Dölj lösenord</string>
+  <string name="menu_homepage">Gå till hemsida</string>
+  <string name="menu_lock">Lås databasen</string>
+  <string name="menu_open">Öppna</string>
+  <string name="menu_rename">Byt namn</string>
+  <string name="menu_search">Sök</string>
+  <string name="menu_url">Gå till URL</string>
+  <string name="minus">Minus</string>
+  <string name="never">Aldrig</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nej</string>
+  <string name="progress_title">Arbetar...</string>
+  <string name="root">Root</string>
+  <string name="rounds_hint">rundor</string>
+  <string name="saving_database">Sparar databasen...</string>
+  <string name="space">Utrymme</string>
+  <string name="search_label">Sök</string>
+  <string name="sort_name">Sortera efter namn</string>
+  <string name="sort_db">Sortera efter datum</string>
+  <string name="search_results">Sökresultat</string>
+  <string name="search_in">Sök i</string>
+  <string name="select_other_entry">Välj en annan post</string>
+  <string name="twofish">Twofish</string>
+  <string name="underline">Understruken</string>
+  <string name="uppercase">Versaler</string>
+  <string name="version_label">Version</string>
+  <string name="search_options">Alternativ</string>
+  <string name="start_open_url">Öppna URL...</string>
+  <string name="enable_quickunlock">Aktivera QuickUnlock</string>
+  <string name="QuickUnlock_button">QuickUnlock!</string>
+  <string name="SaveAttachmentDialog_title">Spara bilaga</string>
+  <string name="SaveAttachmentDialog_save">Spara till SD-kort</string>
+  <string name="field_name">Fältnamn</string>
+  <string name="field_value">Värdet i fältet</string>
+  <string name="translate_app">Översätt KP2A</string>
+  <string name="ChangeLog_title">Ändringslogg</string>
   <string-array name="clipboard_timeout_options">
-    <item>30 seconds</item>
+    <item>30 sekunder</item>
-    <item>1 minute</item>
+    <item>1 minut</item>
-    <item>5 minutes</item>
+    <item>5 minuter</item>
-    <item>Never</item>
+    <item>Aldrig</item>
   </string-array>
   <string-array name="list_size_options">
-    <item>Small</item>
+    <item>Liten</item>
     <item>Medium</item>
-    <item>Large</item>
+    <item>Stor</item>
   </string-array>
   <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>
+    <item>Kom ihåg användarnamn och lösenord</item>
   </string-array>
 </resources>

src/keepass2android/Resources/values-zh-rCN/strings.xml

@@ -7,6 +7,7 @@
   <string name="CreditsText">用户界面基于由 Brian Pellin 开发的 KeepassDroid 移植过来的。数据库操作的代码基于Dominik Reichl的KeePass。Android 机器人是转载或修改从工作创建和共享的谷歌和使用根据创作共用 3.0 归属许可证中所述的条款。</string>
   <string name="accept">接受</string>
   <string name="add_entry">添加条目</string>
+  <string name="add_url_entry">为 URL 创建条目</string>
   <string name="add_group">添加群组</string>
   <string name="add_group_title">添加群组</string>
   <string name="algorithm">算法</string>
@@ -28,6 +29,9 @@
   <string name="clipboard_timeout_summary">复制用户名或密码到剪贴板后清除的时间</string>
   <string name="copy_username">复制用户名到剪贴板</string>
   <string name="copy_password">复制密码到剪贴板</string>
+  <string name="available_through_keyboard">可通过 KP2A 键盘获得条目</string>
+  <string name="not_possible_im_picker">无法打开输入法选择对话框，请手动激活键盘</string>
+  <string name="please_activate_keyboard">请在系统设置中启用Keepass2Android 键盘</string>
   <string name="creating_db_key">创建数据库密钥…</string>
   <string name="current_group">当前群组：</string>
   <string name="current_group_root">当前群组：Root</string>
@@ -37,6 +41,7 @@
   <string name="default_checkbox">使用这做为我的默认数据库</string>
   <string name="digits">数字</string>
   <string name="disclaimer_formal">Keepass2Android版权归Philipp Crocoll；软件不带有绝对担保；是自由软件，您可在遵循GPL 2或者更高版本的情况下重新发布。</string>
+  <string name="ellipsis">\u2026</string>
   <string name="enter_filename">输入数据库名：</string>
   <string name="entry_accessed">访问时间：</string>
   <string name="entry_and_or">输入密码和/或一个密钥文件来解锁你的数据库：</string>
@@ -116,6 +121,7 @@
   <string name="menu_app_settings">设置</string>
   <string name="menu_db_settings">数据库设置</string>
   <string name="menu_delete">删除</string>
+  <string name="menu_donate">捐出一瓶啤酒钱......</string>
   <string name="menu_edit">编辑</string>
   <string name="menu_hide_password">隐藏密码</string>
   <string name="menu_homepage">到主页</string>
@@ -123,6 +129,7 @@
   <string name="menu_open">打开</string>
   <string name="menu_rename">重命名</string>
   <string name="menu_search">搜索</string>
+  <string name="menu_search_advanced">高级搜索</string>
   <string name="menu_url">到网址</string>
   <string name="minus">减</string>
   <string name="never">从不</string>
@@ -146,6 +153,7 @@
   <string name="rounds">加密次数</string>
   <string name="rounds_explaination">更高级的加密次数对暴力攻击能提供额外保护，但也会增加加载和保存的时间。</string>
   <string name="rounds_hint">次数</string>
+  <string name="database_name">数据库名称</string>
   <string name="default_username">新条目的默认用户名</string>
   <string name="saving_database">正在保存数据库…</string>
   <string name="space">空格</string>
@@ -157,6 +165,8 @@
   <string name="search_hint">查找内容</string>
   <string name="search_results">搜索结果</string>
   <string name="search_in">在...中搜索</string>
+  <string name="select_other_entry">选择另一条目</string>
+  <string name="select_group_then_add">打开所需的组，然后按\"%1$ s\"！</string>
   <string name="twofish">Twofish算法</string>
   <string name="underline">下划线</string>
   <string name="unsupported_db_version">不支持的数据库版本</string>
@@ -166,6 +176,9 @@
   <string name="version_label">版本</string>
   <string name="regular_expression">正则表达式</string>
   <string name="TanExpiresOnUse_title">TAN  使用到期</string>
+  <string name="TanExpiresOnUse_summary">标记TAN条目过期当使用它们时</string>
+  <string name="ShowUsernameInList_title">在列表中显示用户名</string>
+  <string name="ShowUsernameInList_summary">在条目标题下方显示用户名，对多账户或TANs 很有用</string>
   <string name="kp2a_findUrl">Keepass2Android： 查找密码</string>
   <string name="excludeExpiredEntries">排除过期的条目</string>
   <string name="search_options">选项</string>
@@ -187,20 +200,33 @@
   <string name="QuickUnlock_fail">解锁失败:密码错误！</string>
   <string name="BinaryDirectory_title">文件附件目录</string>
   <string name="BinaryDirectory_summary">附件所保存到的目录位置</string>
+  <string name="SaveAttachmentDialog_title">保存附件</string>
+  <string name="SaveAttachmentDialog_text">请选择保存该附件的位置。</string>
+  <string name="SaveAttachmentDialog_save">保存到 SD 卡</string>
+  <string name="SaveAttachmentDialog_open">保存到缓存并打开</string>
   <string name="SaveAttachment_doneMessage">保存文件到 %1$ s。</string>
   <string name="SaveAttachment_Failed">无法保存附件到  %1$s </string>
   <string name="error_invalid_expiry_date">有效期限日期/时间格式有误！</string>
   <string name="error_string_key">每个字符串的字段名称是必需的</string>
   <string name="field_name">字段名</string>
   <string name="field_value">字段值</string>
-  <string name="protection">记忆保护</string>
+  <string name="protection">受保护的字段</string>
   <string name="add_binary">添加附件...</string>
   <string name="add_extra_string">添加额外的字符串</string>
+  <string name="delete_extra_string">删除额外的字符串</string>
   <string name="database_loaded_quickunlock_enabled">数据库载入，快速解锁启用。</string>
   <string name="credentials_dialog_title">输入服务器的证书</string>
   <string name="UseFileTransactions_title">文件交易记录</string>
   <string name="UseFileTransactions_summary">使用 file transactions 来写数据库
 </string>
+  <string name="CheckForFileChangesOnSave_title">检查修改</string>
+  <string name="CheckForFileChangesOnSave_summary">检查文件是否在保存变更之前被外部修改</string>
+  <string name="ShowCopyToClipboardNotification_title">剪贴板的通知</string>
+  <string name="ShowCopyToClipboardNotification_summary">使用户名和密码可通过通知栏和剪贴板访问。谨防密码嗅探器 ！</string>
+  <string name="ShowKp2aKeyboardNotification_title">KP2A 键盘通知</string>
+  <string name="ShowKp2aKeyboardNotification_summary">使整个条目可通过 KP2A 键盘获取 （推荐）。</string>
+  <string name="OpenKp2aKeyboardAutomatically_title">键盘选择对话框</string>
+  <string name="OpenKp2aKeyboardAutomatically_summary">在搜索之后打开键盘对话框当条目对KP2A 键盘可用</string>
   <string name="AskOverwriteBinary">是否要以相同的名字覆盖现有的文件？</string>
   <string name="AskOverwriteBinary_title">覆盖已存在的文件？</string>
   <string name="AskOverwriteBinary_yes">覆盖</string>
@@ -217,7 +243,33 @@
   <string name="suggest_improvements">建议或投票改进</string>
   <string name="rate_app">评价这款应用</string>
   <string name="translate_app">翻译 KP2A</string>
+  <string name="AddingEntry">添加条目...</string>
+  <string name="AddingGroup">添加组...</string>
+  <string name="DeletingEntry">删除条目...</string>
+  <string name="DeletingGroup">删除组...</string>
+  <string name="SettingPassword">设置密码...</string>
+  <string name="UndoingChanges">撤消更改...</string>
+  <string name="TransformingKey">变更主键...</string>
+  <string name="DecodingDatabase">解码数据库...</string>
+  <string name="ParsingDatabase">解析数据库...</string>
+  <string name="CheckingTargetFileForChanges">检查目标文件的更改...</string>
+  <string name="TitleSyncQuestion">合并更改吗？</string>
+  <string name="MessageSyncQuestion">数据库文件被外目修改.你想在保存之前载入并合并已有的更改吗？如果你想覆盖外部更改选择\"不\"</string>
+  <string name="SynchronizingDatabase">合并更改...</string>
+  <string name="YesSynchronize">是的,合并</string>
+  <string name="NoOverwrite">不,覆盖</string>
   <string name="ChangeLog_title">更新记录</string>
+  <string name="ChangeLog_0_8_4"><b>版本 0.8.4 </b>
+*当数据库被外部更改时可被检测与合并\n
+*提高载入性能\n
+*搜索工具栏补全建议\n
+*新logo
+*添加 .kdbp 格式更快的载入/保存支持\n
+*提高额外字符串的编辑，当被保护时可隐藏显示\n
+*感谢Alex Vallat的代码贡献\n
+*感谢Niki Hüttner(www.close-cut.de) 的新logo\n
+*感谢lucifineil 的中文翻译
+</string>
   <string name="ChangeLog"><b>Version 0.6.2</b>\n
 * Google Drive/Dropbox/... 集成: 使用官方 Google Drive or Dropbox 程序并打开任何 .kdbx-file. 将在将来的版本出现.\n
 * 改善搜索对话框 \n

src/keepass2android/Resources/values/strings.xml

@@ -258,6 +258,8 @@
 	<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="ChangeLog_title">Change log</string>
 	<string name="ChangeLog_0_8_4">
@@ -265,9 +267,11 @@
 		* External database changes are detected and merged when saving\n
 		* Improved loading performance\n
 		* Improved search toolbar with suggestions\n
+		* New App logo!
 		* 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

src/keepass2android/Resources/xml/searchable.xml

@@ -21,7 +21,7 @@
     android:label="@string/search_label"
     android:hint="@string/search_hint" 
     android:searchMode="showSearchLabelAsBadge"
-    android:searchSuggestAuthority="keepass2android.search.SearchProvider"
+    android:searchSuggestAuthority="keepass2android.keepass2android.SearchProvider"
     android:searchSuggestSelection=" ?"
     android:searchSuggestThreshold="2"
     android:searchSuggestIntentAction="android.intent.action.VIEW"

src/keepass2android/Resources/xml/searchable_offline.xml

@@ -0,0 +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/>.
+-->
+<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_nonet.SearchProvider"
+    android:searchSuggestSelection=" ?"
+    android:searchSuggestThreshold="2"
+    android:searchSuggestIntentAction="android.intent.action.VIEW"
+    android:searchSuggestIntentData="content://keepass2android.EntryActivity"
+ />

src/keepass2android/app/App.cs

@@ -36,6 +36,9 @@ namespace keepass2android
 		public const string AppNameShort = "@string/short_app_name_nonet";
 		public const string AppLauncherTitle = "@string/short_app_name_nonet";
 		public const string PackagePart = "keepass2android_nonet";
+		public const int LauncherIcon = Resource.Drawable.ic_launcher_offline;
+
+		public const string Searchable = "@xml/searchable_offline";
 	}
 #else
 	/// <summary>
@@ -47,6 +50,8 @@ namespace keepass2android
 		public const string AppNameShort = "@string/short_app_name";
 		public const string AppLauncherTitle = "@string/app_name";
 		public const string PackagePart = "keepass2android";
+		public const int LauncherIcon = Resource.Drawable.ic_launcher;
+		public const string Searchable = "@xml/searchable";
 	}
 #endif
 	/// <summary>
@@ -164,6 +169,17 @@ namespace keepass2android
 			EventHandler<DialogClickEventArgs> noHandler,
 			EventHandler<DialogClickEventArgs> cancelHandler,
 			Context ctx)
+		{
+			AskYesNoCancel(titleKey, messageKey, UiStringKey.yes, UiStringKey.no,
+				yesHandler, noHandler, cancelHandler, ctx);
+		}
+
+        public void AskYesNoCancel(UiStringKey titleKey, UiStringKey messageKey,
+			UiStringKey yesString, UiStringKey noString,
+			EventHandler<DialogClickEventArgs> yesHandler,
+            EventHandler<DialogClickEventArgs> noHandler,
+            EventHandler<DialogClickEventArgs> cancelHandler,
+            Context ctx)
         {
 	        Handler handler = new Handler(Looper.MainLooper);
 			handler.Post(() =>
@@ -173,9 +189,9 @@ namespace keepass2android
 
 					builder.SetMessage(GetResourceString(messageKey));
 
-					builder.SetPositiveButton(Resource.String.yes, yesHandler);
+					builder.SetPositiveButton(GetResourceString(yesString), yesHandler);
 
-					builder.SetNegativeButton(Resource.String.no, noHandler);
+					builder.SetNegativeButton(GetResourceString(noString), noHandler);
 
 					builder.SetNeutralButton(ctx.GetString(Android.Resource.String.Cancel),
 											 cancelHandler);
@@ -295,7 +311,21 @@ namespace keepass2android
 			Kp2aLog.Log("Creating application "+PackageName+". Version=" + PackageManager.GetPackageInfo(PackageName, 0).VersionCode);
 
             Kp2a.OnCreate(this);
+			AndroidEnvironment.UnhandledExceptionRaiser += MyApp_UnhandledExceptionHandler;
+		}
 
+
+		void MyApp_UnhandledExceptionHandler(object sender, RaiseThrowableEventArgs e)
+		{
+			Kp2aLog.Log(e.Exception.ToString());
+			// Do your error handling here.
+			throw e.Exception;
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			AndroidEnvironment.UnhandledExceptionRaiser -= MyApp_UnhandledExceptionHandler;
+			base.Dispose(disposing);
 		}
 
 		public override void OnTerminate() {

src/keepass2android/keepass2android.csproj

@@ -145,6 +145,7 @@
     <Compile Include="Utils\EntryUtil.cs" />
   </ItemGroup>
   <ItemGroup>
+    <AndroidResource Include="Resources\xml\searchable.xml" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Resources\drawable\Thumbs.db">
       <Visible>False</Visible>
@@ -372,7 +373,6 @@
       <SubType>Designer</SubType>
     </AndroidResource>
     <AndroidResource Include="Resources\xml\preferences.xml" />
-    <AndroidResource Include="Resources\xml\searchable.xml" />
     <AndroidResource Include="Resources\values\strings.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
@@ -683,4 +683,24 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </AndroidNativeLibrary>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-mdpi\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\ic_launcher_offline.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\xml\searchable_offline.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
 </Project>

src/keepass2android/search/SearchProvider.cs

@@ -41,7 +41,7 @@ namespace keepass2android.search
 			GetIcon,
 			GetSuggestions
 		}
-		public const string Authority = "keepass2android.search.SearchProvider";
+		public const String Authority = "keepass2android." + AppNames.PackagePart + ".SearchProvider";
 		
 		private const string GetIconPathQuery = "get_icon";
 		private const string IconIdParameter = "IconId";

src/keepass2android/search/SearchResults.cs

@@ -30,7 +30,7 @@ namespace keepass2android.search
 	/// Activity to show search results
 	/// </summary>
 	[Activity (Label = "@string/app_name", Theme="@style/NoTitleBar", LaunchMode=Android.Content.PM.LaunchMode.SingleTop)]
-	[MetaData("android.app.searchable",Resource="@xml/searchable")]
+	[MetaData("android.app.searchable",Resource=AppNames.Searchable)]
 	[IntentFilter(new[]{Intent.ActionSearch}, Categories=new[]{Intent.CategoryDefault})]
 	public class SearchResults : GroupBaseActivity
 	{

src/keepass2android/services/QuickUnlockForegroundService.cs

@@ -45,7 +45,7 @@ namespace keepass2android
 			NotificationCompat.Builder mBuilder =
 				new NotificationCompat.Builder(this)
 					.SetSmallIcon(Resource.Drawable.ic_launcher_gray)
-					.SetLargeIcon(BitmapFactory.DecodeResource(Resources,  Resource.Drawable.ic_launcher))
+					.SetLargeIcon(BitmapFactory.DecodeResource(Resources,  AppNames.LauncherIcon))
  					.SetContentTitle(GetText(Resource.String.app_name))
 					.SetContentText(GetText(Resource.String.database_loaded_quickunlock_enabled));
 

src/keepass2android/timeout/TimeoutHelper.cs

@@ -29,11 +29,10 @@ namespace keepass2android
 	/// </summary>
 	public class TimeoutHelper {
 
-		class Timeout
+		private static class Timeout
 		{
 			private const int RequestId = 0;
 			private const long DefaultTimeout = 5 * 60 * 1000;  // 5 minutes
-			private const String Tag = "Keepass2Android Timeout";
 			
 			private static PendingIntent BuildIntent(Context ctx)
 			{
@@ -67,7 +66,7 @@ namespace keepass2android
 				long triggerTime = Java.Lang.JavaSystem.CurrentTimeMillis() + timeout;
 				AlarmManager am = (AlarmManager)ctx.GetSystemService(Context.AlarmService);
 
-				Log.Debug(Tag, "Timeout start");
+				Kp2aLog.Log("Timeout start");
 				am.Set(AlarmType.Rtc, triggerTime, BuildIntent(ctx));
 			}
 
@@ -75,7 +74,7 @@ namespace keepass2android
 			{
 				AlarmManager am = (AlarmManager)ctx.GetSystemService(Context.AlarmService);
 
-				Log.Debug(Tag, "Timeout cancel");
+				Kp2aLog.Log("Timeout cancel");
 				am.Cancel(BuildIntent(ctx));
 
 				ctx.StopService(new Intent(ctx, typeof(TimeoutService)));
@@ -92,6 +91,8 @@ namespace keepass2android
 			ISharedPreferencesEditor edit = prefs.Edit();
 			edit.PutLong(act.GetString(Resource.String.timeout_key), time);
 
+			Kp2aLog.Log("Pause: start at " + time);
+			
 			EditorCompat.Apply(edit);
 			
 			if ( App.Kp2a.GetDb().Open ) {
@@ -111,6 +112,7 @@ namespace keepass2android
 			
 			ISharedPreferences prefs = PreferenceManager.GetDefaultSharedPreferences(act);
 			long timeoutStart = prefs.GetLong(act.GetString(Resource.String.timeout_key), -1);
+			Kp2aLog.Log("timeoutStart=" + timeoutStart);
 			// The timeout never started
 			if (timeoutStart == -1) {
 				return;
@@ -119,17 +121,24 @@ namespace keepass2android
 			
 			String sTimeout = prefs.GetString(act.GetString(Resource.String.app_timeout_key), act.GetString(Resource.String.clipboard_timeout_default));
 			long timeout;
-			if (!long.TryParse(sTimeout, out timeout))
+			if (!long.TryParse(sTimeout, out timeout) || (timeout == -1))
 			{
+				Kp2aLog.Log("exit with timeout=" + timeout + "/"+sTimeout);
 				// We are set to never timeout
 				return;
 			}
 
 			long diff = curTime - timeoutStart;
-			if (diff >= timeout) {
+			if (diff >= timeout)
+			{
 				// We have timed out
+				Kp2aLog.Log("Shutdown due to " + diff + ">=" + timeout);
 				App.Kp2a.SetShutdown();
 			}
+			else
+			{
+				Kp2aLog.Log("No shutdown due to " + diff + "<" + timeout);
+			}
 		}
 
 		static bool IocChanged(IOConnectionInfo ioc, IOConnectionInfo other)

src/kp2akeytransform/kp2akeytransform.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -34,6 +34,13 @@
     <ConsolePause>False</ConsolePause>
     <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
+    <OutputPath>bin\ReleaseNoNet\</OutputPath>
+    <Optimize>true</Optimize>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
@@ -62,12 +69,7 @@
     <TransformFile Include="Transforms\Metadata.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Xamarin.Android.Bindings.targets" />
-  <ItemGroup>
+  <ItemGroup />
-    <Folder Include="libs\" />
-    <Folder Include="libs\armeabi\" />
-    <Folder Include="libs\armeabi-v7a\" />
-    <Folder Include="libs\mips\" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedJar Include="..\java\kp2akeytransform\bin\kp2akeytransform.jar">
       <Link>Jars\kp2akeytransform.jar</Link>

src/monodroid-unittesting/MonoDroidUnitTesting/MonoDroidUnitTesting.csproj

@@ -35,6 +35,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU'">
+    <OutputPath>bin\ReleaseNoNet\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
     <Reference Include="System" />