manifest and changelog for 1.12-r1

Bugfix: Webdav username and password could got lost during file selection

crowdin.yml

@@ -1,7 +1,7 @@
 files:
-  - source: src/keepass2android/Resources/values/strings.xml
+  - source: src/keepass2android-app/Resources/values/strings.xml
     translation: >-
-      /src/keepass2android/Resources/values-%two_letters_code%/%original_file_name%
+      /src/keepass2android-app/Resources/values-%two_letters_code%/%original_file_name%
     translate_attributes: '0'
     content_segmentation: '0'
     languages_mapping:

src/DropboxBinding/Additions/AboutAdditions.txt

@@ -0,0 +1,48 @@
+Additions allow you to add arbitrary C# to the generated classes
+before they are compiled.  This can be helpful for providing convenience
+methods or adding pure C# classes.
+
+== Adding Methods to Generated Classes ==
+
+Let's say the library being bound has a Rectangle class with a constructor
+that takes an x and y position, and a width and length size.  It will look like
+this:
+
+public partial class Rectangle
+{
+    public Rectangle (int x, int y, int width, int height)
+    {
+        // JNI bindings
+    }
+}
+
+Imagine we want to add a constructor to this class that takes a Point and
+Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
+with a partial class containing our new method:
+
+public partial class Rectangle
+{
+    public Rectangle (Point location, Size size) :
+        this (location.X, location.Y, size.Width, size.Height)
+    {
+    }
+}
+
+At compile time, the additions class will be added to the generated class
+and the final assembly will a Rectangle class with both constructors.
+
+
+== Adding C# Classes ==
+
+Another thing that can be done is adding fully C# managed classes to the
+generated library.  In the above example, let's assume that there isn't a
+Point class available in Java or our library.  The one we create doesn't need
+to interact with Java, so we'll create it like a normal class in C#.
+
+By adding a Point.cs file with this class, it will end up in the binding library:
+
+public class Point
+{
+    public int X { get; set; }
+    public int Y { get; set; }
+}

src/DropboxBinding/DropboxBinding.csproj

@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0-android</TargetFramework>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+</Project>

src/DropboxBinding/Transforms/EnumFields.xml

@@ -0,0 +1,14 @@
+<enum-field-mappings>
+  <!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
+    <field jni-name="Fragment_name" clr-name="Name" value="0" />
+    <field jni-name="Fragment_id" clr-name="Id" value="1" />
+    <field jni-name="Fragment_tag" clr-name="Tag" value="2" />
+  </mapping>
+  -->
+</enum-field-mappings>

src/DropboxBinding/Transforms/EnumMethods.xml

@@ -0,0 +1,13 @@
+<enum-method-mappings>
+  <!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+  
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+  -->
+</enum-method-mappings>

src/DropboxBinding/Transforms/Metadata.xml

@@ -0,0 +1,35 @@
+<metadata>
+
+  <remove-node path="/api/package[@name='com.dropbox.core']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.http']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.json']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.oauth']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.sdk.android']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.stone']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.util']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v1']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.account']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.callbacks']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.check']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.seenstate']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.teamcommon']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.secondaryemails']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.async']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.auth']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.common']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.contacts']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.fileproperties']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.filerequests']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.files']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.paper']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.openid']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.sharing']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.team']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.teamlog']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.teampolicies']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.users']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.v2.userscommon']" />
+  <remove-node path="/api/package[@name='com.dropbox.android']" />
+  <remove-node path="/api/package[@name='com.dropbox.core.android']" />
+</metadata>

src/KeePass.sln

@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCloudBindings", "PCloudBin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kp2aAutofillParser.Tests", "Kp2aAutofillParser.Tests\Kp2aAutofillParser.Tests.csproj", "{F5A2A8F9-C084-498F-9603-9D927BA5C626}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DropboxBinding", "DropboxBinding\DropboxBinding.csproj", "{2FE6E335-E834-4F86-AB83-2C5D225DA929}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -369,6 +371,30 @@ Global
 		{F5A2A8F9-C084-498F-9603-9D927BA5C626}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
 		{F5A2A8F9-C084-498F-9603-9D927BA5C626}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{F5A2A8F9-C084-498F-9603-9D927BA5C626}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|Win32.Build.0 = Debug|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Debug|x64.Build.0 = Debug|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Win32.ActiveCfg = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|Win32.Build.0 = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|x64.ActiveCfg = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.Release|x64.Build.0 = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
+		{2FE6E335-E834-4F86-AB83-2C5D225DA929}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Kp2aAutofillParser/AutofillParser.cs

@@ -730,7 +730,7 @@ namespace Kp2aAutofillParser
     {
         public List<TField> InputFields { get; set; } = new List<TField>();
 
-        public string PackageId { get; set; } = null;
+        public string? PackageId { get; set; } = null;
         public string WebDomain { get; set; } = null;
     }
 

src/Kp2aBusinessLogic/Kp2aBusinessLogic.csproj

@@ -12,7 +12,6 @@
     <PackageReference Include="FluentFTP" Version="51.1.0" />
     <PackageReference Include="MegaApiClient" Version="1.10.4" />
     <PackageReference Include="Microsoft.Graph" Version="5.68.0" />
-	<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.7" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.67.1" />
     <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0" />
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.13.1.5" />

src/Kp2aBusinessLogic/SearchDbHelper.cs

@@ -138,7 +138,8 @@ namespace keepass2android
 				{
 					continue;
 				}
-				if (host.IndexOf(otherHost, StringComparison.InvariantCultureIgnoreCase) > -1)
+				if (string.Equals(host, otherHost, StringComparison.OrdinalIgnoreCase) ||
+					host.EndsWith("." + otherHost, StringComparison.OrdinalIgnoreCase))
 				{
 					pgResults.AddEntry(entry, false);
 				}

src/java/JavaFileStorage/app/build.gradle

@@ -41,7 +41,8 @@ dependencies {
         exclude group: 'com.google.android.google-play-services'
     }
     implementation 'com.google.apis:google-api-services-drive:v2-rev102-1.16.0-rc'
-    implementation 'com.dropbox.core:dropbox-core-sdk:5.4.6'
+    implementation 'com.dropbox.core:dropbox-core-sdk:7.0.0'
+    implementation 'com.dropbox.core:dropbox-android-sdk:7.0.0'
     implementation 'com.google.api-client:google-api-client:1.30.5'
     implementation 'com.google.api-client:google-api-client-android:1.30.5'
 

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/DropboxV2Storage.java

@@ -7,6 +7,7 @@ import com.dropbox.core.DbxOAuth1Upgrader;
 import com.dropbox.core.DbxRequestConfig;
 import com.dropbox.core.InvalidAccessTokenException;
 import com.dropbox.core.android.Auth;
+
 import com.dropbox.core.json.JsonReadException;
 import com.dropbox.core.oauth.DbxCredential;
 import com.dropbox.core.v2.DbxClientV2;
@@ -154,7 +155,7 @@ public class DropboxV2Storage extends JavaFileStorageBase
     {
         if ((previousFileVersion == null) || (previousFileVersion.equals("")))
             return false;
-            path = removeProtocol(path);
+        path = removeProtocol(path);
         try {
             Metadata entry = dbxClient.files().getMetadata(path);
             return !String.valueOf(entry.hashCode()) .equals(previousFileVersion);

src/java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/WebDavStorage.java

@@ -304,6 +304,11 @@ public class WebDavStorage extends JavaFileStorageBase {
                         //relative path:
                         e.path = buildPathFromHref(parentPath, r.href);
                     }
+                    if ( (parentPath.indexOf("@") != -1) && (e.path.indexOf("@") == -1))
+                    {
+                        //username/password not contained in .href response. Add it back from parentPath:
+                        e.path = parentPath.substring(0, parentPath.indexOf("@")+1) + e.path.substring(e.path.indexOf("://")+3);
+                    }
 
                     if ((depth == 1) && e.isDirectory)
                     {

src/java/KP2ASoftkeyboard_AS/app/src/main/java/keepass2android/softkeyboard/KP2AKeyboard.java

@@ -356,7 +356,13 @@ public class KP2AKeyboard extends InputMethodService
         pFilter.addAction("android.intent.action.PACKAGE_ADDED");
         pFilter.addAction("android.intent.action.PACKAGE_REPLACED");
         pFilter.addAction("android.intent.action.PACKAGE_REMOVED");
-        registerReceiver(mPluginManager, pFilter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(mPluginManager, pFilter, RECEIVER_EXPORTED);
+        }
+        else
+        {
+            registerReceiver(mPluginManager, pFilter);
+        }
 
 
         LatinIMEUtil.GCUtils.getInstance().reset();
@@ -375,16 +381,28 @@ public class KP2AKeyboard extends InputMethodService
 
         // register to receive ringer mode changes for silent mode
         IntentFilter filter = new IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION);
-        registerReceiver(mSilentModeReceiver, filter);
-       
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(mSilentModeReceiver, filter, RECEIVER_EXPORTED);
+        }
+        else
+        {
+            registerReceiver(mSilentModeReceiver, filter);
+        }
+
         prefs.registerOnSharedPreferenceChangeListener(this);
         
         //check if we have KP2A data available:
-        mHadKp2aData = mShowKp2aKeyboard = keepass2android.kbbridge.KeyboardData.hasData();
+        mHadKp2aData = mShowKp2aKeyboard = KeyboardData.hasData();
         
         mClearKeyboardReceiver = new ClearKeyboardBroadcastReceiver();
-        registerReceiver(mClearKeyboardReceiver, new IntentFilter(get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this)));
-        android.util.Log.d("KP2AK", "registered receiver for clear keyboard broadcast: "+get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(mClearKeyboardReceiver, new IntentFilter(get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this)), RECEIVER_EXPORTED);
+        }
+        else
+        {
+            registerReceiver(mClearKeyboardReceiver, new IntentFilter(get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this)));
+        }
+        Log.d("KP2AK", "registered receiver for clear keyboard broadcast: "+get_KEEPASS2ANDROID_KEYBOARD_CLEARED(this));
         
     }
 

src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-be/strings.xml

@@ -164,7 +164,7 @@
     <!-- Short message to tell the user the system is ready for them to speak. -->
     <string name="voice_listening">Гаварыце</string>
     <!-- Short message shown after the user finishes speaking. -->
-    <string name="voice_working">Апрацоўванне</string>
+    <string name="voice_working">Апрацоўка</string>
     <!-- Short message shown before the user should speak. -->
     <!-- Short message shown when a generic error occurs. -->
     <string name="voice_error">Памылка. Паўтарыце спробу.</string>

src/java/KP2ASoftkeyboard_AS/app/src/main/res/values-de/strings.xml

@@ -19,7 +19,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Title for Latin keyboard  -->
-    <string name="english_ime_name">KeePass2Android-Tastatur</string>
+    <string name="english_ime_name">Keepass2Android-Tastatur</string>
     <!-- Title for Latin keyboard settings activity / dialog -->
     <string name="english_ime_settings">Android-Tastatureinstellungen</string>
     <!-- Title for Latin keyboard input options dialog -->
@@ -49,7 +49,7 @@
     <!-- Description for text prediction -->
     <string name="prediction_summary">Automatische Vervollständigung während der Eingabe aktivieren</string>
     <!-- Dialog title for auto complete choices -->
-    <string name="auto_complete_dialog_title">Automatische. Vervollständigung </string>
+    <string name="auto_complete_dialog_title">Autovervollständigung</string>
     <!-- Option to enable text prediction in landscape -->
     <string name="prediction_landscape">Textfeld vergrößern</string>
     <!-- Description for text prediction -->
@@ -62,7 +62,7 @@
     <string name="auto_punctuate">Autom. Zeichensetzung</string>
     <!-- Description for auto punctuate -->
     <!-- Option to enable quick fixes -->
-    <string name="quick_fixes">Schnelle Fixierung</string>
+    <string name="quick_fixes">Schnelle Korrektur</string>
     <!-- Description for quick fixes -->
     <string name="quick_fixes_summary">Korrigiert gängige Tippfehler</string>
     <!-- Option to enable showing suggestions -->
@@ -112,7 +112,7 @@
     <!-- Tip to long press on typed word to add to dictionary -->
     <string name="tip_add_to_dictionary">Lange auf das Wort ganz links außen drücken, um es zum Wörterbuch hinzuzufügen</string>
     <!-- Instruction to touch the bubble to continue -->
-    <string name="touch_to_continue">Diesen Hinweis berühren, um fortzufahren.»</string>
+    <string name="touch_to_continue">Diesen Hinweis antippen, um fortzufahren.»</string>
     <!-- Instruction to touch the bubble to start typing -->
     <string name="touch_to_finish">Hier berühren, um diesen Hinweis zu schließen und mit dem Tippen zu beginnen!</string>
     <!-- Tutorial tip 1 - The keyboard opens any time you touch a text field -->
@@ -138,7 +138,7 @@
     <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
     <string name="label_symbol_key">\?123</string>
     <!-- Label for "switch to numeric" key.  Must be short to fit on key! -->
-    <string name="label_phone_key">Nummer</string>
+    <string name="label_phone_key">123</string>
     <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
     <string name="label_alpha_key">ABC</string>
     <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -161,7 +161,7 @@
         "Swipe across keyboard to speak"). Also shown when enabling settings. -->
     <string name="voice_hint_dialog_message">Um die Spracheingabe zu verwenden, drücken Sie die Mikrofontaste oder ziehen Sie Ihren Finger über die Bildschirmtastatur.</string>
     <!-- Short message to tell the user the system is ready for them to speak. -->
-    <string name="voice_listening">Sprechen Sie jetzt</string>
+    <string name="voice_listening">Jetzt sprechen</string>
     <!-- Short message shown after the user finishes speaking. -->
     <string name="voice_working">Vorgang läuft</string>
     <!-- Short message shown before the user should speak. -->
@@ -186,7 +186,7 @@
     <!-- Short hint shown in candidate view to explain voice input. -->
     <string name="voice_swipe_hint"><b>„Hinweis:“</b>„ Ziehen Sie zum Sprechen den Finger über die Tastatur.“</string>
     <!-- Short hint shown in candidate view to explain that user can speak punctuation. -->
-    <string name="voice_punctuation_hint"><b>„Hinweis: “</b>„ Versuchen Sie beim nächsten Mal, Satzzeichen wie „Punkt“, „Komma“ oder „Fragezeichen“ per Sprachbefehl einzugeben.“</string>
+    <string name="voice_punctuation_hint"><b>Hinweis: </b>Versuche beim nächsten Mal, Satzzeichen wie „Punkt“, „Komma“ oder „Fragezeichen“ per Sprachbefehl einzugeben.</string>
     <!-- Label on button to stop recognition. Must be short to fit on button. -->
     <string name="cancel">Abbrechen</string>
     <!-- Label on button when an error occurs -->
@@ -216,7 +216,7 @@
     <!-- appears above image showing the user to click on a TextView to show the IME -->
     <string name="open_the_keyboard"><font size="17"><b>„Tastatur öffnen“\n</b></font><font size="3">\n</font>„Berühren Sie ein beliebiges Textfeld.“</string>
     <!-- appears above the image showing the back button used to close the keyboard -->
-    <string name="close_the_keyboard"><font size="17"><b>„Tastatur schließen“\n</b></font><font size="3">\n</font>„Drücken Sie die Zurück-Taste.“</string>
+    <string name="close_the_keyboard"><font size="17"><b>Tastatur schließen\n</b></font><font size="3">\n</font>Drücken die Zurück-Taste.</string>
     <!-- appears above image showing how to use touch and hold -->
     <string name="touch_and_hold"><font size="17"><b>„Für Optionen eine Taste berühren und gedrückt halten“\n</b></font><font size="3">\n</font>„Greifen Sie auf Satzzeichen und Akzente zu.“</string>
     <!-- appears above image showing how to access keyboard settings -->

src/java/android-filechooser-AS/app/src/main/res/values-de/strings.xml

@@ -56,7 +56,7 @@
     <string name="afc_title_sort_by">Sortieren nach…</string>
     <string name="afc_yesterday">Gestern</string>
     <plurals name="afc_title_choose_directories">
-        <item quantity="one">Ordner wählen …</item>
+        <item quantity="one">Ordner wählen…</item>
         <item quantity="other">Verzeichnisse wählen</item>
     </plurals>
     <plurals name="afc_title_choose_files">
@@ -64,7 +64,7 @@
         <item quantity="other">Dateien wählen …</item>
     </plurals>
     <plurals name="afc_title_choose_files_directories">
-        <item quantity="one">Datei/Ordner wählen …</item>
+        <item quantity="one">Datei/Ordner wählen…</item>
         <item quantity="other">Dateien/Ordner wählen …</item>
     </plurals>
 </resources>

src/keepass2android-app/ChangeLog.cs

@@ -14,9 +14,11 @@ using Android.Runtime;
 using Android.Text;
 using Android.Text.Method;
 using Android.Text.Util;
+using Android.Util;
 using Android.Views;
 using Android.Webkit;
 using Android.Widget;
+using AndroidX.Core.Content;
 using Google.Android.Material.Dialog;
 using keepass2android;
 
@@ -29,7 +31,16 @@ namespace keepass2android
 			MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ctx);
 			builder.SetTitle(ctx.GetString(Resource.String.ChangeLog_title));
 			List<string> changeLog = new List<string>{
-                BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_11,Resource.Array.ChangeLog_1_11_net}, "1.11"),
+                BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_12
+#if !NoNet
+					,Resource.Array.ChangeLog_1_12_net
+#endif
+                }, "1.12"),
+                BuildChangelogString(ctx, new List<int>{Resource.Array.ChangeLog_1_11
+#if !NoNet
+                    ,Resource.Array.ChangeLog_1_11_net
+#endif
+                }, "1.11"),
                 BuildChangelogString(ctx, Resource.Array.ChangeLog_1_10, "1.10"),
                 BuildChangelogString(ctx, Resource.Array.ChangeLog_1_09e, "1.09e"),
 				BuildChangelogString(ctx, Resource.Array.ChangeLog_1_09d, "1.09d"),
@@ -99,32 +110,28 @@ namespace keepass2android
 				warning = ctx.GetString(Resource.String.PreviewWarning);
 			}
 
-			builder.SetPositiveButton(Android.Resource.String.Ok, (dlgSender, dlgEvt) => {((AlertDialog)dlgSender).Dismiss(); });
+			builder.SetPositiveButton(Android.Resource.String.Ok, (dlgSender, dlgEvt) => {((AndroidX.AppCompat.App.AlertDialog)dlgSender).Dismiss(); });
 			builder.SetCancelable(false);
 
 			WebView wv = new WebView(ctx);
 
-			wv.SetBackgroundColor(Color.White);
-			wv.LoadDataWithBaseURL(null, GetLog(changeLog, warning, ctx), "text/html", "UTF-8", null);
+			
+            
+            
 
-
-			//builder.SetMessage("");
 			builder.SetView(wv);
 			Dialog dialog = builder.Create();
-			dialog.DismissEvent += (sender, e) =>
+            dialog.DismissEvent += (sender, e) =>
 			{
 				onDismiss();
 			};
-			dialog.Show();
-			/*TextView message = (TextView)dialog.FindViewById(Android.Resource.Id.Message);
-
-			
-			message.TextFormatted = Html.FromHtml(ConcatChangeLog(ctx, changeLog.ToArray()));
-			message.AutoLinkMask=MatchOptions.WebUrls;*/
+            wv.SetBackgroundColor(Color.Transparent);
+            wv.LoadDataWithBaseURL(null, GetLog(changeLog, warning, dialog.Context), "text/html", "UTF-8", null);
 
+            dialog.Show();
 		}
 
-	    private static string BuildChangelogString(Context ctx, int changeLogResId, string version)
+        private static string BuildChangelogString(Context ctx, int changeLogResId, string version)
         {
             return BuildChangelogString(ctx, new List<int>() { changeLogResId }, version);
 
@@ -150,32 +157,44 @@ namespace keepass2android
 
         }
 
-        private const string HtmlStart = @"<html>
+		private const string HtmlEnd = @"</body>
+</html>";
+    
+		private static string GetLog(List<string> changeLog, string warning, Context ctx)
+        {
+            string secondaryColor = "31628D";
+            string onSurfaceColor = "171D1E";
+            if (((int)ctx.Resources.Configuration.UiMode & (int)UiMode.NightMask) == (int)UiMode.NightYes)
+            {
+                secondaryColor = "99CBFF";
+                onSurfaceColor = "E1E4D6";
+            }
+                
+
+            string HtmlStart = @"<html>
   <head>
     <style type='text/css'>
-      a            { color:#000000 }
+      a            { color:#"+ onSurfaceColor + @" }
       div.title    { 
-          color:287AA9; 
+          color:"+ secondaryColor+@"; 
           font-size:1.2em; 
           font-weight:bold; 
           margin-top:1em; 
           margin-bottom:0.5em; 
           text-align:center }
       div.subtitle { 
-          color:287AA9; 
+          color:"+ secondaryColor+@"; 
           font-size:0.8em; 
           margin-bottom:1em; 
           text-align:center }
-      div.freetext { color:#000000 }
-      div.list     { color:#000000 }
+      div.freetext { color:#"+ onSurfaceColor + @" }
+      div.list     { color:#"+ onSurfaceColor + @" }
     </style>
   </head>
   <body>";
-		private const string HtmlEnd = @"</body>
-</html>";
-		private static string GetLog(List<string> changeLog, string warning, Context ctx)
-		{
-			StringBuilder sb = new StringBuilder(HtmlStart);
+
+
+            StringBuilder sb = new StringBuilder(HtmlStart);
 			if (!string.IsNullOrEmpty(warning))
 			{
 				sb.Append(warning);

src/keepass2android-app/EntryActivity.cs

@@ -53,6 +53,7 @@ using keepass2android.fileselect;
 using KeeTrayTOTP.Libraries;
 using Boolean = Java.Lang.Boolean;
 using Android.Util;
+using AndroidX.Core.Content;
 using Google.Android.Material.Dialog;
 using keepass2android;
 
@@ -491,9 +492,9 @@ namespace keepass2android
 			App.Kp2a.LastOpenedEntry = new PwEntryOutput(Entry, App.Kp2a.CurrentDb);
 
 			_pluginActionReceiver = new PluginActionReceiver(this);
-			RegisterReceiver(_pluginActionReceiver, new IntentFilter(Strings.ActionAddEntryAction), ReceiverFlags.Exported);
+			ContextCompat.RegisterReceiver(this, _pluginActionReceiver, new IntentFilter(Strings.ActionAddEntryAction), (int)ReceiverFlags.Exported);
 			_pluginFieldReceiver = new PluginFieldReceiver(this);
-			RegisterReceiver(_pluginFieldReceiver, new IntentFilter(Strings.ActionSetEntryField), ReceiverFlags.Exported);
+            ContextCompat.RegisterReceiver(this, _pluginFieldReceiver, new IntentFilter(Strings.ActionSetEntryField), (int)ReceiverFlags.Exported);
 
             var notifyPluginsOnOpenThread = new Thread(NotifyPluginsOnOpen);
             notifyPluginsOnOpenThread.Start();

src/keepass2android-app/LockCloseActivity.cs

@@ -21,6 +21,7 @@ using Android.OS;
 using Android.Preferences;
 using Android.Runtime;
 using Android.Views;
+using AndroidX.Core.Content;
 using KeePassLib.Serialization;
 
 namespace keepass2android
@@ -69,7 +70,7 @@ namespace keepass2android
 			IntentFilter filter = new IntentFilter();
 			filter.AddAction(Intents.DatabaseLocked);
 			filter.AddAction(Intent.ActionScreenOff);
-			RegisterReceiver(_intentReceiver, filter, ReceiverFlags.Exported);
+            ContextCompat.RegisterReceiver(this, _intentReceiver, filter, (int)ReceiverFlags.Exported);
 		}
 
 		protected override void OnDestroy()

src/keepass2android-app/LockCloseListActivity.cs

@@ -21,6 +21,7 @@ using Android.OS;
 using Android.Preferences;
 using Android.Runtime;
 using Android.Views;
+using AndroidX.Core.Content;
 using KeePassLib.Serialization;
 
 namespace keepass2android
@@ -55,7 +56,7 @@ namespace keepass2android
 
 			filter.AddAction(Intents.DatabaseLocked);
 			filter.AddAction(Intent.ActionScreenOff);
-			RegisterReceiver(_intentReceiver, filter, ReceiverFlags.Exported);
+            ContextCompat.RegisterReceiver(this, _intentReceiver, filter, (int)ReceiverFlags.Exported);
 
 		}
 		

src/keepass2android-app/LockingClosePreferenceActivity.cs

@@ -18,6 +18,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
 using System;
 using Android.Content;
 using Android.OS;
+using AndroidX.Core.Content;
 using KeePassLib.Serialization;
 
 namespace keepass2android
@@ -39,7 +40,7 @@ namespace keepass2android
 			_intentReceiver = new LockCloseActivityBroadcastReceiver(this);
 			IntentFilter filter = new IntentFilter();
 			filter.AddAction(Intents.DatabaseLocked);
-			RegisterReceiver(_intentReceiver, filter, ReceiverFlags.Exported);
+            ContextCompat.RegisterReceiver(this, _intentReceiver, filter, (int)ReceiverFlags.Exported);
 		}
 
 		protected override void OnResume() {

src/keepass2android-app/Manifests/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="200"
-			android:versionName="1.11-r0"
+			android:versionCode="202"
+			android:versionName="1.12-r1"
 			package="keepass2android.keepass2android"
 			xmlns:tools="http://schemas.android.com/tools"
 			android:installLocation="auto">

src/keepass2android-app/PasswordActivity.cs

@@ -65,6 +65,7 @@ using Enum = System.Enum;
 using Exception = System.Exception;
 using String = System.String;
 using Toolbar = AndroidX.AppCompat.Widget.Toolbar;
+using AndroidX.Core.Content;
 
 namespace keepass2android
 {
@@ -647,7 +648,7 @@ namespace keepass2android
 		    _intentReceiver = new PasswordActivityBroadcastReceiver(this);
 			IntentFilter filter = new IntentFilter();
 			filter.AddAction(Intent.ActionScreenOff);
-			RegisterReceiver(_intentReceiver, filter, ReceiverFlags.Exported);
+            ContextCompat.RegisterReceiver(this, _intentReceiver, filter, (int)ReceiverFlags.Exported);
 
 
             //use FlagSecure to make sure the last (revealed) character of the master password is not visible in recent apps

src/keepass2android-app/QuickUnlock.cs

@@ -34,6 +34,7 @@ using keepass2android;
 using KeePassLib;
 using KeePassLib.Serialization;
 using Toolbar = AndroidX.AppCompat.Widget.Toolbar;
+using AndroidX.Core.Content;
 
 namespace keepass2android
 {
@@ -153,7 +154,7 @@ namespace keepass2android
 			_intentReceiver = new QuickUnlockBroadcastReceiver(this);
 			IntentFilter filter = new IntentFilter();
 			filter.AddAction(Intents.DatabaseLocked);
-			RegisterReceiver(_intentReceiver, filter, ReceiverFlags.Exported);
+            ContextCompat.RegisterReceiver(this, _intentReceiver, filter, (int)ReceiverFlags.Exported);
 
             Util.SetNoPersonalizedLearning(FindViewById<EditText>(Resource.Id.QuickUnlock_password));
 

src/keepass2android-app/Resources/layout/entry_edit.xml

@@ -69,6 +69,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <LinearLayout
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
                     <com.google.android.material.textfield.TextInputLayout
@@ -82,7 +83,7 @@
                             android:layout_height="wrap_content"
                             android:singleLine="true"
                             android:inputType="textPassword"
-                            android:hint="password"
+                            android:hint="@string/hint_pass"
                           android:importantForAccessibility="no"/>
                     </com.google.android.material.textfield.TextInputLayout>
                     <LinearLayout
@@ -135,6 +136,7 @@
             </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
       <LinearLayout
+        android:orientation="vertical"
             android:id="@+id/entry_extras_container"
             style="@style/EntryEditSingleLine_container">
             <ImageView
@@ -173,6 +175,7 @@
         </LinearLayout>
     <!-- file attachments -->
         <LinearLayout
+          android:orientation="vertical"
             android:id="@+id/entry_binaries_container"
             style="@style/EntryEditSingleLine_container">
             <ImageView
@@ -228,6 +231,7 @@
         </LinearLayout>
     <!--expires-->
       <LinearLayout
+        android:orientation="vertical"
         android:id="@+id/expires_section"
             style="@style/EntryEditSingleLine_container">
             <ImageView

src/keepass2android-app/Resources/values-ar/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">التعليقات</string>
   <string name="AboutText">Keepass2Android هو مدير كلمات سر يتيح القراءة والكتابة على قواعد بيانات KeePass 2.x على نظام الـAndroid.</string>
@@ -754,6 +754,5 @@
   <string name="AutofillWarning_Intro">أنت على وشك إدراج بيانات اعتماد للنطاق \"%1$s\" في التطبيق \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">إذا كنت تثق في \"%2$s\" بالانتماء إلى \"%1$s\" أو كنت تثق في التطبيق \"%2$s\" لعدم إساءة استخدام بيانات الاعتماد (e. . لأنه تطبيق متصفح موثوق به)، من المفضل المتابعة. إذا لم يكن الأمر كذلك ، يرجى الإلغاء .</string>
   <string name="AutofillWarning_trustAsBrowser">قبول دائمًا في \"%1$s\"</string>
-<string name="english_ime_settings">إعدادات لوحة مفاتيح Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">إعدادات لوحة مفاتيح Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-az/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Əks əlaqə</string>
   <string name="CreditsTextSFTP">SFTP dəstəyi, JCraft, Inc. tərəfindən yaradılmış JSch kitabxanası altında BSD lisenziyası ilə həyata keçirilmişdir.</string>
@@ -84,6 +84,5 @@
   <string name="AutofillWarning_title">Təhlükəsizlik xəbərdarlığı: Tanınmayan domen/tətbiq bağlantısı</string>
   <string name="AutofillWarning_Intro">\"%2$s\" tətbiqinə \"%1$s\" domeni üçün kimlik məlumatlarını daxil edirsiniz.</string>
   <string name="AutofillWarning_trustAsBrowser">\"%1$s\" səyyahında həmişə qəbul et</string>
-<string name="english_ime_settings">Android klaviatura tənzimləmələri</string>
-    
-    </resources>
+  <string name="english_ime_settings">Android klaviatura tənzimləmələri</string>
+</resources>

src/keepass2android-app/Resources/values-be/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Зваротная сувязь</string>
   <string name="AboutText">Keepass2Android - кіраўнік пароляў для Android з паўнавартаснай падтрымкай базаў даных KeePass 2.x.</string>
@@ -28,7 +28,7 @@
   <string name="application_settings">Налады праграмы</string>
   <string name="ShowGroupnameInSearchResult_title">Паказваць назву групы ў выніках пошуку</string>
   <string name="ShowGroupnameInSearchResult_resume">Паказваць пад назвай запісу ў выніках пошуку назву групы. Будзе карысна, калі ў запісаў аднолькавыя назвы.</string>
-  <string name="NavigationToGroupCompleted_message">Зараз паказваецца група: %1$s</string>
+  <string name="NavigationToGroupCompleted_message">Адлюстраванне групы зараз: %1$s</string>
   <string name="AutofillDisabledQueriesPreference_title">Адключаныя мэты аўтазапаўнення</string>
   <string name="AutofillDisabledQueriesPreference_summary">Прагляд спіса праграм і сайтаў, для якіх аўтазапаўненне адключана</string>
   <string name="OfferSaveCredentials_summary">Калі ўключана, сістэма будзе пытацца, ці захоўваць уліковыя даныя пасля таго, як вы ўвялі даныя ў палі аўтазапаўнення.</string>
@@ -40,10 +40,10 @@
   <string name="IconSet_title">Набор значкоў</string>
   <string name="IconSet_install">Шукаць яшчэ…</string>
   <string name="security_prefs">Бяспека</string>
-  <string name="display_prefs">Паказ элементаў</string>
+  <string name="display_prefs">Адлюстраванне</string>
   <string name="password_access_prefs">Доступ да пароляў</string>
   <string name="QuickUnlock_prefs">Хуткае разблакаванне</string>
-  <string name="FileHandling_prefs">Апрацоўванне файлаў</string>
+  <string name="FileHandling_prefs">Апрацоўка файлаў</string>
   <string name="keyboard_prefs">Клавіятура</string>
   <string name="export_prefs">Экспарт базы даных…</string>
   <string name="fingerprint_prefs">Разблакаванне з дапамогай біяметрычных даных</string>
@@ -216,7 +216,7 @@
   <string name="master_key_type">Абярыце тып галоўнага ключа:</string>
   <string name="progress_create">Стварэнне базы даных…</string>
   <string name="create_database">Стварыць базу даных</string>
-  <string name="progress_title">Апрацоўванне…</string>
+  <string name="progress_title">Апрацоўка…</string>
   <string name="remember_keyfile_summary">Памятаць шлях да файлаў ключоў</string>
   <string name="remember_keyfile_title">Захаванне файла ключа</string>
   <string name="remove_from_filelist">Выдаліць</string>
@@ -493,7 +493,7 @@
   <string name="otp_aux_file">Дапаможны файл OTP (аднаразовых пароляў) </string>
   <string name="ErrorOcurred">Адбылася памылка:</string>
   <string name="DuplicateUuidsError">База даных пашкоджаная: выяўлены паўторныя ідэнтыфікатары. (Вы захавалі базу ў Minikeepass?) Імпартуйце новую базу даных з дапамогай Keepass 2 для ПК і абярыце \"Стварыць новыя ідэнтыфікатары\".</string>
-  <string name="DuplicateUuidsErrorAdditional">Вы можаце адключыць паведамленне пра памылку ў \"Налады / Налады праграмы / Апрацоўванне файлаў / Праверка на наяўнасць дублікатаў ідэнтыфікатараў\". Рэкамендуецца выправіць базу даных.</string>
+  <string name="DuplicateUuidsErrorAdditional">Вы можаце адключыць паведамленне пра памылку ў \"Налады / Налады праграмы / Апрацоўка файлаў / Праверка на наяўнасць дублікатаў ідэнтыфікатараў\". Рэкамендуецца выправіць базу даных.</string>
   <string name="synchronize_database_menu">Сінхранізаваць базу даных…</string>
   <string name="CannotMoveGroupHere">Немагчыма перамясціць групу ў гэтую групу.</string>
   <string name="donate_question">Сёння Актобэрфэст! Калі вам падабаецца Keepass2Android, ці не найлепшы гэта дзень, каб купіць мне піва?</string>
@@ -601,11 +601,11 @@
   <string name="TrayTotp_SettingsField_title">Назва поля налад TOTP</string>
   <string name="TrayTotp_SettingsField_summary">Увядзіце сюды назву поля для налад TrayTotp.</string>
   <string name="TrayTotp_prefs">TrayTotp</string>
-  <string name="DebugLog_prefs_prefs">Файл журнала для адладжвання</string>
+  <string name="DebugLog_prefs_prefs">Файл журнала для адладкі</string>
   <string name="DebugLog_title">Выкарыстоўваць файл журнала</string>
   <string name="FtpDebug_title">Журнал адладжвання FTP/SFTP</string>
   <string name="DebugLog_summary">Запісваць выходныя даныя праграмы ў лакальны файл журнала</string>
-  <string name="DebugLog_send">Адправіць журнал адладжвання…</string>
+  <string name="DebugLog_send">Адправіць журнал адладкі…</string>
   <string name="loading">Загрузка…</string>
   <string name="plugins">Убудовы</string>
   <string name="plugin_packagename">Назва пакунка:</string>
@@ -672,25 +672,6 @@
   <string name="Continue">Працягнуць</string>
   <string name="NoFilenameWarning">Не падобна, каб URI-адрас сканчаўся назвай файла. Вы ўвялі правільны адрас?</string>
   <string name="FirstInvalidCompositeKeyError">Хібны складаны ключ! Паспрабуйце яшчэ раз.</string>
-  <string name="RepeatedInvalidCompositeKeyHelp">Хібны складаны ключ! Каб разблакаваць базу даных, паспрабуйце выканаць наступныя дзеянні:\n
-  
-    &#8226; Пераканайцеся, што ўводзіце правільны пароль. Націсніце значок вока, каб праверыць пароль.\n
-   &#8226; Пераканайцеся, што абралі правільны тып пароля. Пераканайцеся, што абралі гэты тып падчас стварэння базы даных.\n
-   &#8226; Пераканайцеся, што абралі правільны файл базы даных.
- </string>
-  <string name="HintLocalBackupInvalidCompositeKey">    \n
-   &#8226; Падказка: калі вы думаеце, што ваша база даных пашкоджаная або забыліся на галоўны пароль пасля яго змены, вы можаце паспрабаваць адкрыць апошнюю паспяхова адкрытую версію файла, націснуўшы \"%1$s\" і абраўшы лакальную рэзервовую копію.</string>
-  <string name="HintLocalBackupOtherError">    \n
-    &#8226; Падказка: Keepass2Android захоўвае ва ўнутраным сховішчы апошнюю паспяхова адкрытую версію файла. Яе можна адкрыць, націснуўшы \"%1$s\" і абраўшы лакальную рэзервовую копію.
-  </string>
-  <string name="CorruptDatabaseHelp">    Файл пашкоджаны. \n
-    Тут пададзена некалькі падказак, якія могуць дапамагчы развязаць гэтую праблему:\n
-    
-    &#8226; Калі вы скапіявалі файл праз USB (Рэжым MTP), паспрабуйце яшчэ раз з дапамогай інструмента кшталту MyPhoneExplorer. MTP можа абразаць файлы.\n
-    &#8226; Калі вы не можаце адкрыць файл нават з камп\'ютара, то хутчэй за ўсё файл пашкоджаны. Паспрабуйце адкрыць рэзервовую копію. Калі ёсць нагода вінаваціць у гэтым Keepass2Android, звяжыцеся з намі.\n
-    &#8226; Калі файл адкрываецца з камп\'ютара, звяжыцеся з намі. Вы можаце захаваць файл з рознымі параметрамі і паспрабаваць адкрыць яго ў Keepass2Android.
-
-  </string>
   <string name="open_other_db">Адкрыць іншую базу даных…</string>
   <string name="select_database">Абраць базу даных</string>
   <string name="configure_child_dbs">Наладжванне даччыных базаў даных…</string>
@@ -863,6 +844,5 @@
   <string name="AutofillWarning_Intro">Вы хочаце ўставіць уліковыя даныя для дамена \"%1$s\" у праграму \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Калі ёсць упэўненасць, што \"%2$s\" належыць \"%1$s\" або вы давяраеце \"%2$s\", не злоўжывайце ўліковымі данымі (напрыклад, гэта давераная праграма браўзера). Калі ўсё добра, можна працягнуць. Калі не, скасуйце.</string>
   <string name="AutofillWarning_trustAsBrowser">Заўсёды ўхваляць у \"%1$s\"</string>
-<string name="english_ime_settings">Налады клавіятуры Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Налады клавіятуры Android</string>
+</resources>

src/keepass2android-app/Resources/values-bg/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Отзив</string>
   <string name="AboutText">Keepass2Android е мениджър за пароли който осигурява достъп четене/записване до KeePass 2.x база данни на Android.</string>
@@ -463,6 +463,5 @@
     <item>KP2A Private/Public key</item>
     <item>Custom Private key</item>
   </string-array>
-<string name="english_ime_settings">Настройки на клавиатурата на Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Настройки на клавиатурата на Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-ca/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Suggeriments</string>
   <string name="AboutText">Keepass2Android és una implementació per Android de KeePass password manager.</string>
@@ -755,6 +755,5 @@
   <string name="switch_ime_text">Si us plau, activa el teclat Keepass2Android.</string>
   <string name="switch_ime_reopen">Reintenta</string>
   <string name="AutofillWarning_trustAsBrowser">Acceptar sempre en \"%1$s\"</string>
-<string name="english_ime_settings">Configuració del teclat d\'Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Configuració del teclat d\'Keepass2Android</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Zpětná vazba</string>
   <string name="AboutText">Keepass2Android je správce hesel pro práci se soubory KeePass 2.x. na platformě Android.</string>
@@ -1150,6 +1150,5 @@ První veřejné vydání
   <string name="AutofillWarning_Intro">Chystáte se vložit přihlašovací údaje pro doménu \"%1$s\" do aplikace \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Pokud věříte že \"%2$s\" patří k \"%1$s\", nebo důvěřujete \"%2$s\" že nezneužije přihlašovací údaje (např. pokud se jedná o důvěryhodný prohlížeč), můžete pokračovat. Pokud tomu tak není, zrušte prosím tuto akci.</string>
   <string name="AutofillWarning_trustAsBrowser">Přijmout vždy v \"%1$s\"</string>
-<string name="english_ime_settings">Nastavení klávesnice Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Nastavení klávesnice Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-da/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Tilbagemelding</string>
   <string name="AboutText">Keepass2Android er en adgangskodehåndterings-app, der giver læse-/skriveadgang til KeePass 2.x-databaser på Android.</string>
@@ -818,6 +818,5 @@
   <string name="AutofillWarning_Intro">Du er ved at indsætte legitimationsoplysninger for domæne \"%1$s\" i appen \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Hvis du stoler på at \"%2$s\" tilhører \"%1$s\", eller du stoler på at app\'en \"%2$s\" ikke misbruger legitimationsoplysningerne (f.eks. fordi det er en betroet browser app), er det ok at fortsætte. Ellers bedes du annullere.</string>
   <string name="AutofillWarning_trustAsBrowser">Accepter altid i \"%1$s\"</string>
-<string name="english_ime_settings">Indstillinger for Keepass2Android-tastatur</string>
-    
-    </resources>
+  <string name="english_ime_settings">Indstillinger for Keepass2Android-tastatur</string>
+</resources>

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

@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Feedback</string>
-  <string name="AboutText">Keepass2Android ist ein Passwortmanager mit Lese- und Schreib-Zugriff auf KeePass 2.x Datenbanken.</string>
+  <string name="AboutText">Keepass2Android ist ein Passwortmanager, der KeePass 2.x-Datenbanken verwalten kann.</string>
   <string name="CreditsText">Die Benutzeroberfläche basiert auf einem Port von Keepassdroid (entwickelt von Brian Pellin) nach Mono for Android. Der Code für die Datenbank-Operationen nutzt eine angepasste Version einer Bibliothek aus KeePass (entwickelt von Dominik Reichl).
 Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die Google durchgeführt und zur Verfügung gestellt hat; er wird nach den Bedingungen der Creative Commons 3.0 Attribution License genutzt.</string>
-  <string name="CreditsTextSFTP">SFTP-Unterstützung ist implementiert unter Nutzung der JSch-Bibliothek (BSD-Lizenz), erstellt durch JCraft, Inc.</string>
+  <string name="CreditsTextSFTP">SFTP-Unterstützung ist implementiert unter Verwendung der JSch-Bibliothekvmit BSD-Lizenz der Fa. JCraft Inc.</string>
   <string name="CreditsIcons">Das Hammer-Icon wurde von John Caserta (Noun Project) erstellt. Das Pinguin-Icon wurde von Adriano Emerick (Noun Project) erstellt. Das Feder-Icon wurde von Jon Testa (Noun Project) erstellt. Das Apfel-Icon wurde von Ava Rowell (Noun Project) erstellt. Das Bild-Icon stammt von https://icons8.com/icon/5570/Picture.</string>
   <string name="accept">Akzeptieren</string>
   <string name="deny">Verweigern</string>
@@ -28,7 +28,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="application">Anwendung</string>
   <string name="application_settings">Anwendungseinstellungen</string>
   <string name="ShowGroupnameInSearchResult_title">Gruppennamen im Suchergebnis anzeigen</string>
-  <string name="ShowGroupnameInSearchResult_resume">Gruppennamen unter den Eintragstiteln im Suchergebnis anzeigen. Nützlich, wenn es mehrere Einträge mit dem selben Namen gibt.</string>
+  <string name="ShowGroupnameInSearchResult_resume">Gruppennamen unter den Eintragstiteln im Suchergebnis anzeigen. Nützlich, wenn es mehrere Einträge mit demselben Namen gibt.</string>
   <string name="NavigationToGroupCompleted_message">Angezeigte Gruppe ist jetzt: %1$s</string>
   <string name="AutofillDisabledQueriesPreference_title">Deaktivierte AutoFill-Ziele</string>
   <string name="AutofillDisabledQueriesPreference_summary">Zeigt eine Liste von Apps und Webseiten, für die AutoFill deaktiviert ist.</string>
@@ -123,7 +123,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="entry_extra_strings">Zusätzliche Felder</string>
   <string name="entry_binaries">Datei-Anhänge</string>
   <string name="entry_history">Vorherige Versionen</string>
-  <string name="error_can_not_handle_uri">Keepass2Android kann diese Adresse nicht verarbeiten.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android kann diese URI nicht verarbeiten.</string>
   <string name="error_could_not_create_group">Fehler beim Erstellen der Gruppe.</string>
   <string name="error_could_not_create_parent">Verzeichnis konnte nicht erstellt werden.</string>
   <string name="error_database_exists">Diese Datei existiert bereits.</string>
@@ -295,7 +295,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="TanExpiresOnUse_title">TAN verfällt bei Verwendung</string>
   <string name="TanExpiresOnUse_summary">TAN-Einträge als abgelaufen markieren, wenn sie verwendet werden</string>
   <string name="ShowUsernameInList_title">Benutzernamen in Liste anzeigen</string>
-  <string name="ShowUsernameInList_summary">Zeige Benutzernamen unter den Titeln der Einträge. Hilfreich bei mehreren Accounts für einen Dienst oder bei TANs.</string>
+  <string name="ShowUsernameInList_summary">Benutzernamen unter den Eintragstiteln anzeigen. Nützlich für mehrere Konten bei einem Dienst oder für TANs.</string>
   <string name="RememberRecentFiles_title">Datenbanken merken</string>
   <string name="RememberRecentFiles_summary">Dateinamen der bisher geöffneten Datenbanken speichern und im Bildschirm zum Öffnen der Datenbank anzeigen.</string>
   <string name="NoDalVerification_title">Keine Digital-Asset-Link-Verifikation</string>
@@ -1134,8 +1134,8 @@ Erstes öffentliches Release</string>
   <string name="backup_infotext_head">Gibt es eine Sicherung der Datenbank?</string>
   <string name="backup_infotext_main">Keepass2Android speichert die Passwörter in einer Datei an einem frei wählbarem Speicherort.Ist sichergestellt, dass die Datei auch dann noch verfügbar ist, wenn das Telefon verloren geht oder gestohlen wird, oder wenn die Datei zerstört oder gelöscht wird? Bitte sicherstellen, dass immer eine aktuelle Kopie an einem sichern Ort aufbewahrt wird!</string>
   <string name="backup_infotext_note">Um jetzt eine Sicherung zu erstellen, nach %1$s &gt; %2$s &gt; %3$s gehen.</string>
-  <string name="emergency_infotext_head">Ist man auf Notfälle vorbereitet?</string>
-  <string name="emergency_infotext_main">Wurde schon einmal darüber nachgedacht, was passiert, wenn man keinen Zugriff mehr zu seiner Passwortdatenbank hat? Was ist, wenn man einen Unfall hat? Es ist eine vernünftige Maßnahme, den Hauptschlüssel für Notfälle an eine vertrauenswürdige Person weiterzugeben. Andernfalls hat niemand Zugang zu den Passwörtern.</string>
+  <string name="emergency_infotext_head">Hast du für Notfälle vorgesorgt?</string>
+  <string name="emergency_infotext_main">Hast du je darüber nachgedacht, was passiert, wenn du nicht mehr auf deine Passwort-Datenbank zugreifen kannst? Was, wenn du einen Unfall hast? Ein bewährtes Verfahren ist, einer vertrauenswürdigen Person dein Masterpasswort für Notfälle mitzuteilen. Ansonsten wird niemand auf deine Passwörter Zugriff haben.</string>
   <string name="no_secure_display">Der aktuell gültige Bildschirm ist nicht als sicher eingestuft. Das bedeutet, dass Bildschirmfotos von anderen Anwendungen erstellt werden könnten. Keepass2Android ist so konfiguriert, dass sensible Informationen nur auf sicheren Bildschirmen angezeigt werden. Bitte zu einem sicheren Bildschirm wechseln (z. B. durch Abklemmen eines HDMI-Monitors) oder die App-Einstellungen ändern.</string>
   <string name="disable_secure_screen_check">Diese Nachricht deaktivieren</string>
   <string name="switch_ime_text">Bitte die Keepass2Android-Tastatur aktivieren.</string>
@@ -1144,6 +1144,7 @@ Erstes öffentliches Release</string>
   <string name="AutofillWarning_Intro">Hiermit werden Anmeldeinformationen für die Domäne „%1$s“ in die Anwendung „%2$s“ eingefügt.</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Wenn darauf vertraut wird, dass „%2$s“ zu „%1$s“ gehört, oder wenn darauf vertraut wird, dass die App „%2$s“ die Anmeldeinformationen nicht missbraucht (z. B. weil es sich um eine vertrauenswürdige Browser-App handelt), kann fortgefahren werden. Falls nicht, bitte abbrechen.</string>
   <string name="AutofillWarning_trustAsBrowser">Für „%1$s“ immer akzeptieren</string>
-<string name="english_ime_settings">Keepass2Android-Tastatureinstellungen</string>
-    
-    </resources>
+  <string name="kp2a_switch_on_sendgodone">Tastatur zurückwechseln wenn fertig</string>
+  <string name="kp2a_switch_on_sendgodone_summary">Beim Drücken von Senden/Los/Fertig zurückschalten</string>
+  <string name="english_ime_settings">Android-Tastatureinstellungen</string>
+</resources>

src/keepass2android-app/Resources/values-el/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Σχόλια</string>
   <string name="AboutText">Το KP2A είναι ένας διαχειριστής συνθηματικών, που παρέχει την δυνατότητα ανάγνωσης/εγγραφής σε βάσεις δεδομένων του KeePass 2.x στο Android.</string>
@@ -865,6 +865,5 @@
   <string name="AutofillWarning_Intro">Πρόκειται να εισάγετε διαπιστευτήρια για τον τομέα \"%1$s\" στην εφαρμογή \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Εάν εμπιστεύεστε ότι το \"%2$s\" ανήκει στο \"%1$s\" ή εμπιστεύεστε ότι η εφαρμογή \"%2$s\" δεν καταχράται τα διαπιστευτήρια (πχ. επειδή είναι μια αξιόπιστη εφαρμογή περιήγησης), είναι εντάξει να συνεχίσετε. Αν όχι, ακυρώστε.</string>
   <string name="AutofillWarning_trustAsBrowser">Αποδοχή πάντα στο \"%1$s\"</string>
-<string name="english_ime_settings">Ρυθμίσεις πληκτρολογίου Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Ρυθμίσεις πληκτρολογίου Android</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Sugerencias</string>
   <string name="AboutText">Keepass2Android es una implementación completa para Android del gestor de contraseñas KeePass 2.x.</string>
@@ -681,14 +681,15 @@
   <string name="HintLocalBackupInvalidCompositeKey">    \n
     &#8226; Sugerencia: Si piensas que la Base de Datos está dañada o no recuerdas la contraseña maestra después de cambiarla, inténtalo con la última versión de la Base de Datos abierta con éxito pulsando en \"%1$s\" y seleccionando la copia local.
   </string>
-  <string name="HintLocalBackupOtherError">\n
-Consejo: Keepass2Android ha guardado la última versión de la base de datos que abriste con éxito en la memoria interna. Puedes abrirlo tocando \"%1$s\" y seleccionando la copia de seguridad local.</string>
-  <string name="CorruptDatabaseHelp">    El Archivo está dañado. \n
-    Estas son algunas sugerencias que pueden ayudarle a diagnosticar el problema:\n
+  <string name="HintLocalBackupOtherError">    \n
+    • Sugerencia: Keepass2Android ha almacenado la última versión del archivo abierto con éxito en el almacenamiento interno. Puedes abrirlo tocando \"%1$s\" y seleccionando la copia de seguridad local.
+  </string>
+  <string name="CorruptDatabaseHelp">    El archivo está corrupto. \n
+    Aquí hay algunas sugerencias que podrían ayudar a diagnosticar el problema:\n
 
-    &#8226; Si usted copió el archivo por medio de USB (Modo MTP), por favor inténtelo de nuevo con herramientas como MyPhoneExplorer. MTP trunca archivos en algunas ocasiones.\n
-    &#8226; Si usted no puede abrir el archivo desde la misma ubicación en su PC, es muy probable que el archivo esté dañado. Por favor use un respaldo de la base de datos. Si usted cree que Keepass2Android ha dañado el archivo, por favor contacte a soporte.\n
-    &#8226; Si usted aún puede abrir el archivo en su PC, por favor contacte a soporte. Intente guardar el archivo con una configuración distinta (por ejemplo, descomprimido) en la PC y vuelva a intentar abrirlo en Keepass2Android.
+    • Si copiaste el archivo a través de USB ( modo MTP), por favor inténtalo de nuevo usando una herramienta como MyPhoneExplorer. MTP trunca los archivos en ciertos casos.\n
+    • Si no puedes abrir el archivo desde la misma localización en tu PC, es muy probable que el archivo en realidad esté corrupto. En ese caso, por favor usa una copia de seguridad de la base de datos. Si asumes que Keepass2Android ha corrompido el archivo, por favor contacta con el equipo de soporte.\n
+    • Si aún puedes abrir el archivo en tu PC, por favor contacta con el equipo de soporte. Podrías intentar guardarlo con una configuración diferente (p.ej. descomprimido) en el PC y volver a intentar abrirlo en Keepass2Android.
 
   </string>
   <string name="open_other_db">Abrir otrar base de datos…</string>
@@ -1174,6 +1175,7 @@ Consejo: Keepass2Android ha guardado la última versión de la base de datos que
   <string name="AutofillWarning_Intro">Está a punto de insertar credenciales para el dominio \"%1$s\" en la aplicación \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Si confía en que \"%2$s\" pertenece a \"%1$s\", o confía en que la aplicación \"%2$s\" no utilizará mal las credenciales (p. e. porque es una aplicación de navegador de confianza), está bien continuar. Si no, por favor cancele.</string>
   <string name="AutofillWarning_trustAsBrowser">Aceptar siempre en \"%1$s\"</string>
-<string name="english_ime_settings">Ajustes del teclado de Keepass2Android</string>
-    
-    </resources>
+  <string name="kp2a_switch_on_sendgodone">Volver cuando termine</string>
+  <string name="kp2a_switch_on_sendgodone_summary">Volver cuando se presione enviar/ir/finalizado</string>
+  <string name="english_ime_settings">Ajustes del teclado de Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-eu/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Iruzkinak</string>
   <string name="AboutText">Keepass2Android pasahitz kudeatzaile bat da, Androiden KeePass 2.x datu-baseetan irakurketa/idazketa ahalbideratzen duena. </string>
@@ -435,6 +435,5 @@
     <item>Ohartarazi balidazioak huts egitean</item>
     <item>Do not accept invalid certificates</item>
   </string-array>
-<string name="english_ime_settings">Android teklatuaren ezarpenak</string>
-    
-    </resources>
+  <string name="english_ime_settings">Android teklatuaren ezarpenak</string>
+</resources>

src/keepass2android-app/Resources/values-fa/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">ﺑﺎﺯﺧﻮﺭﺩ</string>
   <string name="AboutText">برنامهٔ Keepass2Android یک برنامهٔ مدیریت گذرواژه است که دسترسی خواندنی/نوشتنی به پایگاه‌داده‌های KeePass 2.x را در اندروید فراهم می‌کند.</string>
@@ -788,6 +788,5 @@ mycloud.me.com/webdav/‎ )</string>
   <string name="AutofillWarning_Intro">در حال واردکردن اطلاعات شناسایی برای دامنهٔ «%1$s» در برنامهٔ «%2$s» هستید.</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">اگر اعتماد دارید که «%2$s» به «%1$s» تعلق دارد یا اعتماد دارید که برنامهٔ «%2$s» از اطلاعات شناسایی سوءاستفاده نمی‌کند (مثلاً مرورگری قابل‌اعتماد است)، بدون نگرانی ادامه دهید، در غیر این صورت لغو کنید.</string>
   <string name="AutofillWarning_trustAsBrowser">در «%1$s» همیشه بپذیر</string>
-<string name="english_ime_settings">تنظیمات صفحه کلید Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">تنظیمات صفحه کلید Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-fi/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Palaute</string>
   <string name="AboutText">Keepass2Android on salasanojen hallintaohjelma, jolla voit katsella ja muokata KeePass 2.x tietokantoja Androidilla.</string>
@@ -763,6 +763,5 @@
   <string name="no_secure_display">Nykyistä näyttöä ei ole merkitty turvalliseksi. Tämä tarkoittaa sitä että muut sovellukset voivat tehdä kuvankaappauksen. Keepass2Android on näyttää arkaluontoisia tietoja vain suojatuissa näytöissä. Vaihda suojattuun näyttöön (esimerkiksi irrottamalla HDMI-näyttö) tai muuta sovelluksen asetuksia.</string>
   <string name="disable_secure_screen_check">Poista tämä viesti käytöstä</string>
   <string name="switch_ime_reopen">Yritä uudelleen</string>
-<string name="english_ime_settings">Keepass2Android-näppäimistön asetukset</string>
-    
-    </resources>
+  <string name="english_ime_settings">Keepass2Android-näppäimistön asetukset</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Commentaires </string>
   <string name="AboutText">Keepass2Android est un gestionnaire de mot de passe pour Android permettant de lire et écrire des bases de données KeePass 2.x.</string>
@@ -672,26 +672,6 @@
   <string name="Continue">Suivant</string>
   <string name="NoFilenameWarning">L\'URI que vous avez entré ne ressemble pas à un nom de fichier. Etes-vous sûr qu\'il s\'agit d\'un fichier valide ?</string>
   <string name="FirstInvalidCompositeKeyError">Clé composite invalide ! S\'il vous plaît essayez encore.</string>
-  <string name="RepeatedInvalidCompositeKeyHelp">Clé composite invalide ! Veuillez essayer les étapes suivantes pour déverrouiller votre base de données :\n
-
-    &#8226; Assurez-vous d\'avoir saisi le bon mot de passe. Utilisez l\'icône de l\'œil pour révéler le mot de passe saisi.\n
-    &#8226; Assurez-vous d\'avoir sélectionné le bon type de mot de passe. Assurez-vous qu\'il correspond au type utilisé lors de la création de la base de données.\n
-    &#8226; Assurez-vous d\'avoir sélectionné le bon fichier de base de données.
-  </string>
-  <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; Astuce : si vous pensez que votre fichier de base de données est corrompu ou que vous ne vous souvenez pas de la clé principale après l\'avoir modifiée, vous pouvez essayer avec la dernière version du fichier ouverte avec succès en appuyant sur \"%1$s\" et en sélectionnant la sauvegarde locale.
-  </string>
-  <string name="HintLocalBackupOtherError">    \n
-    &#8226; Astuce : Keepass2Android a stocké la dernière version du fichier ouvert avec succès sur le stockage interne. Vous pouvez l\'ouvrir en appuyant sur \"%1$s\" et en sélectionnant la sauvegarde locale.
-  </string>
-  <string name="CorruptDatabaseHelp">    Le fichier est corrompu. \n
-    Voici quelques conseils qui pourraient vous aider à diagnostiquer le problème :\n
-
-    &#8226; Si vous avez copié le fichier via USB (mode MTP), essayez à nouveau en utilisant un outil comme MyPhoneExplorer. Le mode MTP tronque les fichiers dans certains cas.\n
-    &#8226; Si vous ne pouvez pas ouvrir le fichier à partir du même emplacement sur votre PC, il est très probable que le fichier soit corrompu. Veuillez alors utiliser une sauvegarde de la base de données. Si vous pensez que Keepass2Android a corrompu le fichier, veuillez contacter le support.\n
-    &#8226; Si vous pouvez toujours ouvrir le fichier sur votre PC, veuillez contacter le support. Vous pouvez essayer de le sauvegarder avec des paramètres différents (ex. le décompresser) sur le PC et réessayer de l\'ouvrir dans Keepass2Android.
-
-  </string>
   <string name="open_other_db">Ouvrir une autre base de données…</string>
   <string name="select_database">Sélectionner une base de données</string>
   <string name="configure_child_dbs">Configurer les bases de données filles…</string>
@@ -904,6 +884,5 @@
   <string name="AutofillWarning_Intro">Vous êtes sur le point d\'insérer des identifiants pour le domaine \"%1$s\" dans l\'application \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Si vous faites confiance à \"%2$s\" pour appartenir à \"%1$s\" ou que vous faites confiance à l\'application \"%2$s\" pour ne pas abuser des identifiants (ex. parce que c\'est une application de navigateur de confiance), il est possible de continuer. Si ce n\'est pas le cas, veuillez annuler.</string>
   <string name="AutofillWarning_trustAsBrowser">Accepter toujours dans \"%1$s\"</string>
-<string name="english_ime_settings">Paramètres du clavier Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Paramètres du clavier Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-gl/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
 <resources>
   <string name="about_feedback">Suxestións (feedback)</string>
   <string name="AboutText">Keepass2Andoird é un xestor de contrasinais que aporta acceso de lectura/escritura ás bases de datos KeePass 2.x de Android.</string>

src/keepass2android-app/Resources/values-he/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
 <resources>
   <string name="about_feedback">משוב</string>
   <string name="AboutText">Keepass2Android הוא מנהל סיסמאות המאפשר לקרוא/לכתוב מסדי נתונים של KeePass2 באנדרואיד.</string>
@@ -270,4 +269,5 @@
     <item>KP2A Private/Public key</item>
     <item>Custom Private key</item>
   </string-array>
+  <string name="english_ime_settings">הגדרות של מקלדת אנדרואיד</string>
 </resources>

src/keepass2android-app/Resources/values-hr/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Povratna informacija</string>
   <string name="AboutText">Keepass2Android je upravitelj lozinki koji pruža pregled i uređivanje KeePass 2.x baza podataka na Android uređajima.</string>
@@ -755,6 +755,5 @@
   <string name="switch_ime_reopen">Pokušaj ponovno</string>
   <string name="AutofillWarning_title">Upozorenje Sigurnosti: Nepoznata domena/veza aplikacije</string>
   <string name="AutofillWarning_trustAsBrowser">Prehvati uvijek u \"%1$s\"</string>
-<string name="english_ime_settings">Postavke tipkovnice za Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Postavke tipkovnice za Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-hu/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Visszajelzés</string>
   <string name="AboutText">Keepass2Android egy jelszókezelő alkalmazás, amely KeePass 2.x adatbázisokhoz írás-olvasási hozzáférést biztosít Android eszközökön.</string>
@@ -766,6 +766,5 @@
   <string name="AutofillWarning_Intro">A(z) \"%1$s\" tartományhoz tartozó azonosítókat készül a(z) \"%2$s\" alkalmazás számára elérhetővé tenni.</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Ha megbízik abban, hogy a(z) \"%1$s\" tartomány a(z) \"%2$s\" alkalmazáshoz tartozik, vagy megbízik abban, hogy az alkalmazás nem él vissza a titkos adatokkal (mert például egy megbízható böngészőprogram), folytassa.  Ha nem, szakítsa meg a folyamatot.</string>
   <string name="AutofillWarning_trustAsBrowser">Mindig fogadja el itt: \"%1$s\"</string>
-<string name="english_ime_settings">Keepass2Android billentyűzetbeállítások</string>
-    
-    </resources>
+  <string name="english_ime_settings">Keepass2Android billentyűzetbeállítások</string>
+</resources>

src/keepass2android-app/Resources/values-id/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
 <resources>
   <string name="about_feedback">Umpan balik</string>
   <string name="AboutText">Keepass2Android adalah pengelola sandi yang menyediakan akses baca/tulis ke basis data KeePass 2.x pada Android.</string>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Commenti</string>
   <string name="AboutText">Keepass2Android è un gestore di password per Android che supporta l\'accesso in lettura/scrittura ai database di KeePass 2.x.</string>
@@ -672,26 +672,6 @@
   <string name="Continue">Continua</string>
   <string name="NoFilenameWarning">L\'URI inserito non sembra il nome di un file. Sei sicuro che sia un file valido?</string>
   <string name="FirstInvalidCompositeKeyError">Chiave composita non valida! Riprova.</string>
-  <string name="RepeatedInvalidCompositeKeyHelp">    Chiave composita non valida! Prova i seguenti passaggi per sbloccare il database:\n
-
-    &#8226; Assicurati di aver inserito la password corretta. Usa l\'icona occhio per rivelare la password inserita.\n
-    &#8226; Assicurati di aver selezionato il tipo di password corretto. Assicurarsi che questo corrisponda al tipo usato durante la creazione del database.\n
-    &#8226; Assicurati di aver selezionato il file database corretto.
-  </string>
-  <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; Dritta: Se pensi che il tuo file di database possa essere danneggiato o non ricordi la chiave principale dopo averla modificata, puoi provare con l\'ultima versione del file aperta correttamente toccando \"%1$s\" e selezionando il backup locale.
-  </string>
-  <string name="HintLocalBackupOtherError">    \n
-    &#8226; Dritta: Keepass2Android ha memorizzato l\'ultima versione del file aperta crrettamente nella memoria interna. Puoi aprirla toccando \"%1$s\" e selezionando il backup locale.
-  </string>
-  <string name="CorruptDatabaseHelp">Il file è danneggiato. \n
-    Ecco alcune dritte che potrebbero aiutare a diagnosticare il problema:\n
-
-    &#8226; Se hai copiato il file su USB (in modo MTP), per favore riprova usando uno strumento come MyPhoneExplorer. MTP in alcuni casi tronca i file.\n
-    &#8226; Se non puoi aprire il file dalla stessa posizione sul tuo PC, è molto probabile che il file sia in realtà danneggiato. Usare un backup del database. Se si assume che Keepass2Android abbia corrotto il file, contattare il gruppo di assistenza.\n
-    &#8226; Se puoi ancora aprire il file sul tuo PC, contatta il gruppo di assistenza. Potresti provare a salvarlo con diverse impostazioni (ad esempio non compresso) sul PC e riprovare ad aprire in Keepass2Android.
-
-  </string>
   <string name="open_other_db">Apri un altro database…</string>
   <string name="select_database">Seleziona il database</string>
   <string name="configure_child_dbs">Configura i database figli…</string>
@@ -1009,6 +989,5 @@
   <string name="AutofillWarning_Intro">Stai per inserire le credenziali per il dominio \"%1$s\" nell\'app \"%2$s\"</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Se ti fidi di \"%2$s\" ad appartenere a \"%1$s\" o se ti fidi dell\'app \"%2$s\" a non abusare delle credenziali (es. perché si tratta di un\'applicazione sicura), è possibile continuare. Altrimenti si prega di annullare.</string>
   <string name="AutofillWarning_trustAsBrowser">Accetta sempre in \"%1$s\"</string>
-<string name="english_ime_settings">Impostazioni tastiera Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Impostazioni tastiera Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-ja/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">フィードバック</string>
   <string name="AboutText">Keepass2Android は Android で KeePass 2.x データベースを読み書きするパスワードマネージャーです。</string>
@@ -643,7 +643,7 @@
   <string name="ReadOnlyReason_PreKitKat">外部アプリからファイルを開いたようです。ファイルへの書き込みはできません。データベースを編集する場合は、データベースを閉じて「データベースを変更」を選択してください。対応している場合は、いずれかのオプションからファイルを開くことができます。</string>
   <string name="ReadOnlyReason_ReadOnlyFlag">読み取り専用フラグが設定されます。データベースを編集する場合は、このフラグを削除してください。</string>
   <string name="ReadOnlyReason_ReadOnlyKitKat">Android KitKat で導入された制限のため、書き込みは不可能です。データベースを編集する場合は、データベースを閉じて「データベースを変更」を選択してください。その後、システムのファイル選択を使用してファイルを開いてください。</string>
-  <string name="ReadOnlyReason_LocalBackup">ローカルバックアップは変更できません。[データベースの設定] > [データベースをエクスポート] から、この自由に開ける場所へエクスポートしてください。その後、再び書き込み可能になります。</string>
+  <string name="ReadOnlyReason_LocalBackup">ローカルバックアップは変更できません。[データベースの設定] &gt; [データベースをエクスポート] から、この自由に開ける場所へエクスポートしてください。その後、再び書き込み可能になります。</string>
   <string name="AddCustomIcon">ファイルからアイコンを追加...</string>
   <string name="CopyingFile">ファイルをコピーしています...</string>
   <string name="DuplicateTitle">コピー</string>
@@ -1181,6 +1181,5 @@
   <string name="AutofillWarning_Intro">ドメイン「%1$s」のアカウント情報をアプリ「%2$s」に挿入しようとしています。</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">「%2$s」が信頼できて「%1$s」に属するか、アプリ「%2$s」を信頼していて、アカウント情報の誤用ではない場合 (信頼できるブラウザアプリなど) であれば続行しても問題ありません。そうでない場合はキャンセルしてください。</string>
   <string name="AutofillWarning_trustAsBrowser">常に「%1$s」に同意</string>
-<string name="english_ime_settings">Keepass2Android キーボードの設定</string>
-    
-    </resources>
+  <string name="english_ime_settings">Keepass2Android キーボードの設定</string>
+</resources>

src/keepass2android-app/Resources/values-ko/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">의견 보내기</string>
   <string name="AboutText">Keepass2Android는 Android에서 KeePass 2.x 데이터베이스에 대한 읽기/쓰기 액세스를 제공하는 암호 관리자입니다.</string>
@@ -745,6 +745,5 @@ Keepass2Android는 오프라인에서도 데이터베이스 파일의 사용이
   <string name="AutofillWarning_Intro">\"%2$s\" 앱을 통해 \"%1$s\" 도메인에 신용 정보를 입력하려고 합니다</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">\"%1$s\"를 통해서 \"%2$s\"를 사용 하는 것에 대해 신뢰하시거나 \"%2$s\" 앱이 신용 정보를 남용하지 않을 것이라고 신뢰하신다면 (예: 검증된 브라우저 앱의 경우), 계속 하셔도 괜찮습니다. 그렇지 않다면 취소해 주십시오.</string>
   <string name="AutofillWarning_trustAsBrowser">항상 \"%1$s\" 앱을 쓰는 경우를 제외함</string>
-<string name="english_ime_settings">Keepass2Android 키보드 설정</string>
-    
-    </resources>
+  <string name="english_ime_settings">Keepass2Android 키보드 설정</string>
+</resources>

src/keepass2android-app/Resources/values-ml/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">അഭിപ്രായം</string>
   <string name="accept">അംഗീകരിക്കുക</string>
@@ -221,5 +221,5 @@
   </string-array>
   <string name="understand">എനിക്ക് മനസിലായി</string>
   <string name="dont_show_again">വീണ്ടും കാണിക്കരുത്</string>
-<string name="english_ime_settings">ആൻഡ്രോയിഡ് കീബോർഡ് ക്രമീകരണങ്ങൾ</string>
-</resources>
+  <string name="english_ime_settings">ആൻഡ്രോയിഡ് കീബോർഡ് ക്രമീകരണങ്ങൾ</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Tilbakemelding</string>
   <string name="AboutText">Keepass2Android er en android-utgave av KeePass passordbestyrer.</string>
@@ -589,6 +589,5 @@
   <string name="backup_infotext_note">For å opprette en sikkerhetskopi nå, gå til %1$s &gt; %2$s &gt; %3$s.</string>
   <string name="emergency_infotext_head">Er du forberedt på nødssituasjoner?</string>
   <string name="emergency_infotext_main">Har du noen gang vurdert hva som skjer dersom du ikke lenger har tilgang til passorddatabasen? Hva om du blir utsatt for en ulykke? Det er god praksis å overlate hovednøkkelen til en person du stoler helt på i tilfelle en nødssituasjon. Ellers vil ingen ha tilgang til dine passord.</string>
-<string name="english_ime_settings">Innstillinger for Keepass2Android tastatur</string>
-    
-    </resources>
+  <string name="english_ime_settings">Innstillinger for Keepass2Android tastatur</string>
+</resources>

src/keepass2android-app/Resources/values-nl/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Terugkoppeling</string>
   <string name="AboutText">Keepass2Android is een wachtwoordbeheerder die lees-/schrijftoegang biedt tot KeePass 2.x-databases op Android.</string>
@@ -977,6 +977,5 @@ ChangeLog_1_05  </string>
   <string name="AutofillWarning_Intro">Je staat op het punt, om inloggegevens voor domein \"%1$s\" in te voegen in de app \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Als je vertrouwt dat \"%2$s\" tot \"%1$s\" behoort, of je vertrouwt dat app \"%2$s\" de inloggegevens niet misbruikt (bijvoorbeeld omdat het een vertrouwde browser-app is), kun je doorgaan. Anders annuleren.</string>
   <string name="AutofillWarning_trustAsBrowser">Altijd accepteren in \"%1$s\"</string>
-<string name="english_ime_settings">Instellingen voor Keepass2Android-toetsenbord</string>
-    
-    </resources>
+  <string name="english_ime_settings">Instellingen voor Keepass2Android-toetsenbord</string>
+</resources>

src/keepass2android-app/Resources/values-nn/strings.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
 <resources>
   <string name="about_feedback">Tilbakemelding</string>
   <string name="AboutText">Keepass2Android er ei android-utgåve av KeePass passordstyrar.</string>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Opinie</string>
   <string name="AboutText">Keepass2Android to menedżer haseł umożliwiający odczyt i zapis baz danych programu KeePass 2.x w systemie Android.</string>
@@ -900,6 +900,5 @@
   <string name="AutofillWarning_Intro">Zamierzasz wstawić poświadczenia dla domeny \"%1$s\" do aplikacji \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Jeśli ufasz \"%2$s\" należącym do \"%1$s\" lub ufasz aplikacji \"%2$s\", aby nie używać danych logowania (np. ponieważ jest to zaufana aplikacja przeglądarki), jest w porządku, aby kontynuować. Jeśli nie, proszę anulować.</string>
   <string name="AutofillWarning_trustAsBrowser">Akceptuj zawsze w \"%1$s\"</string>
-<string name="english_ime_settings">Ustawienia klawiatury Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Ustawienia klawiatury Keepass2Android</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Comentários</string>
   <string name="AboutText">Keepass2Android é uma implementação do gerenciador de senhas KeePass.</string>
@@ -1184,6 +1184,7 @@
   <string name="AutofillWarning_Intro">Você esta prestes a inserir credenciais do domínio \"%1$s\" no app \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Se você confia em \"%2$s\" para pertencer \"%1$s\" ou se você confia no app \"%2$s\" a não mal-usar as credenciais (ex. por causa de um app de navegador confiável), é ok para continuar. Se não, por favor cancele.</string>
   <string name="AutofillWarning_trustAsBrowser">Aceitar sempre em \"%1$s\"</string>
-<string name="english_ime_settings">Configurações do teclado Android</string>
-    
-    </resources>
+  <string name="kp2a_switch_on_sendgodone">Voltar quando terminar</string>
+  <string name="kp2a_switch_on_sendgodone_summary">Voltar ao pressionar enviar/ir/concluído</string>
+  <string name="english_ime_settings">Configurações do teclado Android</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Opinião</string>
   <string name="AboutText">Keepass2Android é um gestor de palavras-passe, que fornece acesso de leitura/gravação às bases de dados do KeePass 2.x em Android.</string>
@@ -672,26 +672,6 @@
   <string name="Continue">Continuar</string>
   <string name="NoFilenameWarning">A URI inserida não parece ser um nome de ficheiro. Tem a certeza que este é um ficheiro válido?</string>
   <string name="FirstInvalidCompositeKeyError">Chave composta inválida! Por favor, tente novamente.</string>
-  <string name="RepeatedInvalidCompositeKeyHelp">    Chave composta inválida! Tente os seguintes passos para desbloquear a sua base de dados:\n
-
-    &#8226; Certifique-se que introduziu a palavra-passe correta. Utilize o ícone do olho para ver a palavra-passe introduzida.\n
-    &#8226; Certifique-se que selecionou o tipo de palavra-passe correto. Certifique-se que este corresponde ao tipo utilizado quando criou a base de dados.\n
-    &#8226; Certifique-se que selecionou o ficheiro da base de dados correto.
-  </string>
-  <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; Dica: se pensa que o ficheiro da base de dados pode estar corrompido ou se não se lembra da chave-mestra depois de o alterar, pode tentar com a última versão do ficheiro aberta com êxito tocando em \"%1$s\" e selecionar a cópia de segurança local.
-  </string>
-  <string name="HintLocalBackupOtherError">    \n
-    &#8226; Sugestão: o Keepass2Android guardou a última versão do ficheiro aberta com êxito no armazenamento interno. Pode abri-la tocando em \"%1$s\" e selecionar a cópia de segurança local.
-  </string>
-  <string name="CorruptDatabaseHelp">    O ficheiro está corrompido. \n
-    Eis algumas sugestões para ajudar a diagnosticar o problema:\n
-
-    &#8226; Se tiver copiado o ficheiro através de USB (modo MTP), tente novamente utilizando uma ferramenta como o MyPhoneExplorer. O MTP trunca os ficheiros em determinados casos.\n
-    &#8226; Se não conseguir abrir o ficheiro a partir da mesma localização no seu PC, é muito provável que o ficheiro esteja realmente corrompido. Por favor, use uma cópia de segurança da base de dados. Se acha que o Keepass2Android corrompeu o ficheiro, entre em contacto com a equipa de suporte.\n
-    &#8226; Se ainda conseguir abrir o ficheiro no seu PC, contacte a equipa de apoio. Pode tentar gurdá-lo com configurações diferentes (por exemplo, descompactado) no PC e tentar abrir novamente no Keepass2Android.
-
-  </string>
   <string name="open_other_db">Abrir outra base de dados…</string>
   <string name="select_database">Escolher a base de dados</string>
   <string name="configure_child_dbs">Configurar bases de dados filhas…</string>
@@ -1172,6 +1152,5 @@ Não há forma de fazer \"reset\" à chave mestra.</string>
   <string name="AutofillWarning_Intro">Está prestes a inserir credenciais para o domínio \"%1$s\" na aplicação \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Se confia em \"%2$s\" para pertencer a \"%1$s\" ou confia na aplicação \"%2$s\" para que esta não utilize indevidamente as credenciais (por ex. por ser uma aplicação de navegação confiável), pode continuar. Caso contrário cancele.</string>
   <string name="AutofillWarning_trustAsBrowser">Aceitar sempre em \"%1$s\"</string>
-<string name="english_ime_settings">Configurações de teclado Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Configurações de teclado Keepass2Android</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Feedback</string>
   <string name="AboutText">Keepass2Android este un manager de parole ce oferă citire/scriere la baze de date KeePass 2.x pe Android.</string>
@@ -151,6 +151,7 @@
   <string name="hint_keyfile">fişier cheie</string>
   <string name="hint_length">lungime</string>
   <string name="hint_pass">parola</string>
+  <string name="hint_keyfile_path">Calea cheii private SSH</string>
   <string name="hint_login_pass">Parolă</string>
   <string name="hint_title">nume</string>
   <string name="hint_url">URL</string>
@@ -649,6 +650,5 @@
   <string name="AutofillWarning_Intro">Sunteți pe cale de a insera datele de autentificare pentru domeniul \"%1$s\" în aplicația \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Dacă aveți încredere că \"%2$s\" aparține la \"%1$s\" sau dacă aveți încredere în aplicația \"%2$s\" să nu abuzeze de datele de autentificare (de ex. deoarece este o aplicație de încredere pentru browser), este in regulă să continuați. Dacă nu, vă rugăm să anulați.</string>
   <string name="AutofillWarning_trustAsBrowser">Acceptați întotdeauna în \"%1$s\"</string>
-<string name="english_ime_settings">Setările tastaturii Keepass2Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Setările tastaturii Keepass2Android</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Оставить отзыв</string>
   <string name="AboutText">Keepass2Android — это менеджер паролей, обеспечивающий полноценную работу с базами KeePass 2.x на Android.</string>
@@ -672,23 +672,6 @@
   <string name="Continue">Продолжить</string>
   <string name="NoFilenameWarning">URI, который Вы ввели, не похож на имя файла. Вы уверены, что это правильно?</string>
   <string name="FirstInvalidCompositeKeyError">Неверный составной ключ! Пожалуйста, попробуйте еще раз.</string>
-  <string name="RepeatedInvalidCompositeKeyHelp">Неправильный составной ключ! Пожалуйста, попробуйте следующие шаги для разблокировки вашей базы данных:\n
-  
-   • Убедитесь, что вы вводите правильный пароль. Используйте значок \"глаз\" для проверки вводимого пароля.\n
-   • Убедитесь, что вы выбрали правильный тип пароля. Убедитесь, что он совпадает с тем типом, который вы указывали при создании базы данных.\n
-   • Убедитесь, что вы выбрали правильный файл с базой данных.</string>
-  <string name="HintLocalBackupInvalidCompositeKey">    \n
- &#8226; подсказка: если вы считаете, что файл базы данных может быть поврежден или не помните главный ключ после его изменения, вы можете попробовать с последней успешно открытой версией файла, нажав \"%1$s\" и выбрав локальную резервную копию.</string>
-  <string name="HintLocalBackupOtherError">    \n
- &amp;#82Подсказка: Keepass2Android сохранил последнюю успешно открытую версию файла во внутренней памяти. Его можно открыть, нажав \"%1$s\" и выбрав локальную резервную копию.</string>
-  <string name="CorruptDatabaseHelp">    Файл поврежден. \n
-    Тут приведены несколько подсказок, которые могут помочь в решении этой проблемы:\n
-    
-    • Если вы скопировали файл через USB (MTP-Mode), попробуйте еще раз при помощи утилиты \"MyPhoneExplorer\". MTP-режим иногда обрезает файлы.\n
-    • Если не удается открыть файл даже в вашем персональном компьютере, очень вероятно, что файл действительно поврежден. Пожалуйста, используйте резервную копию вашей базы данных. Если есть предположение, что в этом виноват \"Keepass2Android\", то свяжитесь с нами.\n
-    • Если файл открывается с вашего персонального компьютера, свяжитесь с нами. Вы можете сохранить его с разными параметрами (например, в распакованном виде) и попробовать открыть его снова в \"Keepass2Android\".
-
-  </string>
   <string name="open_other_db">Открыть другую базу данных…</string>
   <string name="select_database">Выбрать базу данных</string>
   <string name="configure_child_dbs">Настройка дочерних баз данных…</string>
@@ -885,6 +868,5 @@
   <string name="AutofillWarning_Intro">Вы собираетесь вставить учётные данные для домена \"%1$s\" в приложение \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Если вы уверены, что \"%2$s\" принадлежит к \"%1$s\" или доверяете приложению \"%2$s\" не злоупотребляйте учётными данными (например, потому что это доверенное приложение браузера), если всё хорошо можно продолжить. Если нет, пожалуйста, отмените.</string>
   <string name="AutofillWarning_trustAsBrowser">Всегда принимать в \"%1$s\"</string>
-<string name="english_ime_settings">Настройки клавиатуры \"Keepass2Android\"</string>
-    
-    </resources>
+  <string name="english_ime_settings">Настройки клавиатуры \"Keepass2Android\"</string>
+</resources>

src/keepass2android-app/Resources/values-si/strings.xml

@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
 <resources></resources>

src/keepass2android-app/Resources/values-sk/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Spätná odozva</string>
   <string name="AboutText">Keepass2Android je správca hesiel umožňujúci čítanie/zápis do databáz KeePass 2.x, v systéme Android.</string>
@@ -672,24 +672,24 @@
   <string name="Continue">Pokračovať</string>
   <string name="NoFilenameWarning">Zadaná URI pravdepodobne nie je názvom súboru. Ste si istí, že ide o platný súbor?</string>
   <string name="FirstInvalidCompositeKeyError">Neplatný kompozitný kľúč! Prosím skúste to ešte raz.</string>
-  <string name="RepeatedInvalidCompositeKeyHelp">    Neplatný kompozitný kľúč! Na odomknutie databázy vyskúšajte tieto kroky:\n
+  <string name="RepeatedInvalidCompositeKeyHelp">    Neplatný kompozitný kľúč! Na odomknutie databázy skúste urobiť toto:\n
 
-    &#8226; Uistite sa, že ste zadali správne heslo. Na zobrazenie hesla použite ikonu s okom.\n
-    &#8226; Uistite sa, že ste vybrali správny typ hesla. Uistite sa, že zodpovedá typu použitému pri vytváraní databázy.\n
-    &#8226; Uistite sa, že ste vybrali správny súbor s databázou.
+    • Uistite sa, že ste zadali správne heslo. Na zobrazenie zadaného hesla kliknite na ikonu s okom.\n
+    • Uistite sa, že je vybraný správny typ hesla a že sa zhoduje s typom použitým pri vytváraní databázy.\n
+    • Uistite sa, že ste vybrali správny databázový súbor.
   </string>
   <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; Pomôcka: Ak sa nazdávate, že súbor s databázou je poškodený, alebo si nepamätáte primárny kľúč po jeho zmene, môžete to skúsiť s poslednou úspešne otvorenou verziou súboru, stlačením \"%1$s\" a vybraním lokálnej zálohy.
+    • Pomôcka: Ak si myslíte, že je súbor s databázou poškodený alebo si nepamätáte primárny kľúč po jeho úprave, môžete skúsiť použiť poslednú úspešne otvorenú verziu súboru (ťuknite na \"%1$s\") a vybrať lokálnu zálohu.
   </string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; Pomôcka: Keepass2Android uložil poslednú úspešne otvorenú verziu súboru na interné úložisko. Môžete ju otvoriť stlačením \"%1$s\" a vybraním lokálnej zálohy.
+    • Pomôcka: Keepass2Android uložil poslednú úspešne otvorenú verziu súboru do interného úložiska. Môžete ju otvoriť ťuknutím na \"%1$s\" a výberom lokálnej zálohy.
   </string>
   <string name="CorruptDatabaseHelp">    Súbor je poškodený. \n
-    Tu je niekoľko tipov, ktoré vám môžu pomôcť zistiť príčinu tohto problému:\n
+    Tu je niekoľko tipov, ktoré vám môžu pomôcť odhaliť problém:\n
 
-    &#8226; Ak ste súbor kopírovali cez USB (v režime MTP), prosím skúste to znovu, pomocou nástroja ako je napr. MyPhoneExplorer. MTP môže v určitých prípadoch skracovať súbory.\n
-    &#8226; Ak nemôžete otvoriť súbor z rovnakého umiestnenia vo svojom PC, je veľmi pravdepodobné, že je súbor poškodený. V takom prípade použite zálohu databázy. Ak predpokladáte, že súbor poškodenia aplikácia Keepass2Android, prosím informujte tím podpory.\n
-    &#8226; Ak ešte dokážete otvoriť súbor na PC, prosím kontaktujte tím podpory. Môžete sa pokúsiť o jeho uloženie s inými nastaveniami (napr. v rozbalenom stave) na PC a zopakovať otvorenie v aplikácii Keepass2Android.
+    • ak ste súbor skopírovali cez USB (režim MTP), skúste to ešte raz s použitím takého nástroja, ako je napr. MyPhoneExplorer. Režim MTP v niektorých prípadoch skracuje súbory.\n
+    • Ak nemôžete otvoriť súbor z rovnakého umiestnenia vo svojom PC, je veľmi pravdepodobné, že je poškodený. V takom prípade použite zálohu databázy. Ak predpokladáte, že súbor porušila aplikácia Keepass2Android, prosím kontaktujte tím podpory.\n
+    • Ak sa dá súbor otvoriť v PC, kontaktujte tím podpory. Môžete tiež skúsiť uložiť ho s odlišnými nastaveniami (napríklad nekomprimovane) na PC a potom ho opäť skúsiť otvoriť v aplikácii Keepass2Android.
 
   </string>
   <string name="open_other_db">Otvoriť inú databázu…</string>
@@ -1184,6 +1184,7 @@
   <string name="AutofillWarning_Intro">Chcete vložiť prihlas. údaje pre doménu \"%1$s\" do aplikácie \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Ak dôverujete aplikácii \"%2$s\", že patrí \"%1$s\" alebo ak dôverujete, že aplikácia \"%2$s\" nezneužíva prihlasovacie údaje (ak je to napríklad dôveryhodný prehliadač), môžete pokračovať. Ak nie, prosím zrušte túto akciu.</string>
   <string name="AutofillWarning_trustAsBrowser">Vždy súhlasiť v \"%1$s\"</string>
-<string name="english_ime_settings">Nastavenia klávesnice Keepass2Android</string>
-    
-    </resources>
+  <string name="kp2a_switch_on_sendgodone">Po dokončení prepnúť späť</string>
+  <string name="kp2a_switch_on_sendgodone_summary">Po stlačení Odoslať/Prejsť/Hotovo prejsť späť</string>
+  <string name="english_ime_settings">Nastavenia klávesnice Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-sl/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Povratna informacija</string>
   <string name="AboutText">Keepass2Android je upravitelj gesel, ki omogoča branje/pisanje podatkovnih zbirk KeePass 2.x na Androidu.</string>
@@ -1182,6 +1182,7 @@
   <string name="AutofillWarning_Intro">V aplikacijo \"%2$s\" vstavite poverilnice za domeno \"%1$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Če zaupate, da \"%2$s\" pripada \"%1$s\" ali da zaupate aplikaciji \"%2$s\" in ne boste zlorabljali poverilnic (npr. ker gre za zaupanja vredno aplikacijo brskalnika), je v redu, če nadaljujete . V nasprotnem primeru prekličite postopek.</string>
   <string name="AutofillWarning_trustAsBrowser">Sprejmi vedno v \"%1$s\"</string>
-<string name="english_ime_settings">Nastavitve tipkovnice Keepass2Android</string>
-    
-    </resources>
+  <string name="kp2a_switch_on_sendgodone">Preklopi nazaj, ko je končano</string>
+  <string name="kp2a_switch_on_sendgodone_summary">Preklopi nazaj, ko pritisnete gumb za pošiljanje/prehajanje/končano</string>
+  <string name="english_ime_settings">Nastavitve tipkovnice Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-sr/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Повратне информације</string>
   <string name="AboutText">Keepass2Android је управљач лозинкама који пружа читање и уписивање у KeePass 2.x базе података на Android-у.</string>
@@ -308,6 +308,5 @@
     <item>KP2A Private/Public key</item>
     <item>Custom Private key</item>
   </string-array>
-<string name="english_ime_settings">Подешавања Keepass2Android тастатуре</string>
-    
-    </resources>
+  <string name="english_ime_settings">Подешавања Keepass2Android тастатуре</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Feedback</string>
   <string name="AboutText">Keepass2Android är en lösenordshanterare som tillhandahåller läs- och skrivåtkomst för KeePass 2.x-databaser på Android.</string>
@@ -810,6 +810,5 @@
   <string name="AutofillWarning_Intro">Du är på väg att mata in inloggnings-uppgifter för domänen \"%1$s\" i appen \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Om du litar på \"%2$s\" att tillhöra \"%1$s\" eller du litar på appen \"%2$s\" att inte missbruka autentiseringsuppgifterna (t.ex. om det är en betrodd webbläsarapp) är det okej att fortsätta. Om inte, vänligen avbryt.</string>
   <string name="AutofillWarning_trustAsBrowser">Acceptera alltid i \"%1$s\"</string>
-<string name="english_ime_settings">Inställningar för Keepass2Androids tangentbord</string>
-    
-    </resources>
+  <string name="english_ime_settings">Inställningar för Keepass2Androids tangentbord</string>
+</resources>

src/keepass2android-app/Resources/values-tr/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Geri bildirim</string>
   <string name="AboutText">Keepass2Android Android üzerinde KeePass 2.x veritabanları için okuma/yazma erişimi sağlayan bir şifre yöneticisidir.</string>
@@ -811,6 +811,5 @@
   <string name="AutofillWarning_Intro">\"%1$s\" alanı için kimlik bilgilerini \"%2$s\" uygulamasına eklemek üzeresiniz.</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">\"%2$s\" öğesinin \"%1$s\" öğesine ait olduğuna veya \"%2$s\" uygulamasının kimlik bilgilerini kötüye kullanmayacağına (örneğin, güvenilir bir tarayıcı uygulaması olduğu için) güveniyorsanız, devam edebilirsiniz. Değilse, lütfen iptal edin.</string>
   <string name="AutofillWarning_trustAsBrowser">Her zaman kabul et</string>
-<string name="english_ime_settings">Keepass2Android klavye ayarları</string>
-    
-    </resources>
+  <string name="english_ime_settings">Keepass2Android klavye ayarları</string>
+</resources>

src/keepass2android-app/Resources/values-uk/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Залишити відгук</string>
   <string name="AboutText">Keepass2Android - це менеджер паролів, який забезпечує читання/запис баз даних KeePass 2.x на Android.</string>
@@ -843,6 +843,5 @@
   <string name="AutofillWarning_Intro">Ви збираєтеся вставити облікові дані для домену \"%1$s\" в програму \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Якщо ви впевнені, що домен \"%2$s\" належить \"%1$s\", або якщо ви впевнені, що програма \"%2$s\" не скомпрометує облікові дані (наприклад, якщо це довірений веббраузер), тоді немає чого хвилюватися. Якщо ви не впевнені, скасуйте цю дію.</string>
   <string name="AutofillWarning_trustAsBrowser">Завжди схвалювати в \"%1$s\"</string>
-<string name="english_ime_settings">Налаштування клавіатури Android</string>
-    
-    </resources>
+  <string name="english_ime_settings">Налаштування клавіатури Android</string>
+</resources>

src/keepass2android-app/Resources/values-vi/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">Thông tin phản hồi</string>
   <string name="AboutText">Keepass2Android là một ứng dụng quản lý mật khẩu cung cấp quyền truy cập đọc/ghi vào cơ sở dữ liệu KeePass 2.x trên Android.</string>
@@ -672,24 +672,6 @@
   <string name="Continue">Tiếp tục</string>
   <string name="NoFilenameWarning">URI bạn đã nhập không có dạng tên tập tin. Bạn có chắc chắn đây là tập tin hợp lệ không?</string>
   <string name="FirstInvalidCompositeKeyError">Khoá hỗn hợp không hợp lệ. Xin thử lại.</string>
-  <string name="RepeatedInvalidCompositeKeyHelp">    Khóa tổng hợp không hợp lệ! Vui lòng thử các bước sau để mở khóa cơ sở dữ liệu của bạn:\n
-
-    &#8226; Hãy chắc chắn rằng bạn đã nhập đúng mật khẩu. Sử dụng biểu tượng con mắt để hiển thị mật khẩu đã nhập.\n
-    &#8226; Hãy chắc chắn rằng bạn đã chọn đúng loại mật khẩu. Hãy đảm bảo rằng loại này khớp với loại được sử dụng khi tạo cơ sở dữ liệu.\n
-    &#8226; Hãy chắc chắn rằng bạn đã chọn đúng tệp cơ sở dữ liệu.
-  </string>
-  <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; Gợi ý: Nếu bạn cho rằng tệp cơ sở dữ liệu của mình có thể bị hỏng hoặc bạn không nhớ khóa chính sau khi sửa đổi nó, bạn có thể thử với phiên bản tệp được mở thành công gần đây nhất bằng cách nhấn vào \"%1$s\" và chọn bản sao lưu cục bộ.
-  </string>
-  <string name="HintLocalBackupOtherError">    \n
-    &#8226; Gợi ý: Keepass2Android đã lưu trữ phiên bản tệp được mở thành công gần đây nhất trên bộ nhớ trong. Bạn có thể mở nó bằng cách nhấn vào \"%1$s\" và chọn bản sao lưu cục bộ.
-  </string>
-  <string name="CorruptDatabaseHelp">Tập tin bị hỏng. \N
-    Dưới đây là một số gợi ý có thể giúp chẩn đoán sự cố:\n
-
-    &#8226; Nếu bạn đã sao chép tệp qua USB (Chế độ MTP), vui lòng thử lại bằng công cụ như MyPhoneExplorer. MTP cắt bớt tệp trong một số trường hợp nhất định.\n
-    &#8226; Nếu bạn không thể mở tệp từ cùng một vị trí trên PC, rất có thể tệp đó thực sự bị hỏng. Vui lòng sử dụng bản sao lưu cơ sở dữ liệu sau đó. Nếu bạn cho rằng Keepass2Android đã làm hỏng tệp, vui lòng liên hệ với nhóm hỗ trợ.\n
-    &#8226; Nếu bạn vẫn có thể mở tệp trên PC, vui lòng liên hệ với nhóm hỗ trợ. Bạn có thể thử lưu nó bằng các cài đặt khác (ví dụ: đã giải nén) trên PC và thử mở lại trong Keepass2Android.</string>
   <string name="open_other_db">Mở cơ sở dữ liệu khác…</string>
   <string name="select_database">Chọn cơ sở dữ liệu</string>
   <string name="configure_child_dbs">Định cấu hình cơ sở dữ liệu con…</string>
@@ -869,9 +851,7 @@
   <string name="autofill_disable">Tắt tính năng Tự động điền cho %1$s</string>
   <string name="autofill_enable_for">Bật Tự động điền cho %1$s</string>
   <string name="invalid_link_association">Không thể liên kết tên miền trang web %1$s với ứng dụng %2$s</string>
-<string name="english_ime_settings">Cài đặt bàn phím Keepass2Android</string>
-    
-      <string name="enable_fingerprint_hint">Keepass2Android đã phát hiện phần cứng sinh trắc học. Bạn có muốn bật Mở khóa sinh trắc học cho cơ sở dữ liệu này không?</string>
+  <string name="enable_fingerprint_hint">Keepass2Android đã phát hiện phần cứng sinh trắc học. Bạn có muốn bật Mở khóa sinh trắc học cho cơ sở dữ liệu này không?</string>
   <string name="post_notifications_dialog_title">Cho phép thông báo</string>
   <string name="post_notifications_dialog_message">Keepass2Android có thể hiển thị thông báo bằng các nút để sao chép các giá trị như mật khẩu và TOTP vào khay nhớ tạm hoặc để hiển thị bàn phím tích hợp. Điều này rất hữu ích để chuyển các giá trị sang các ứng dụng khác mà không cần chuyển sang Keepass2Android nhiều lần. Bạn có muốn kích hoạt các thông báo như vậy không?</string>
   <string name="post_notifications_dialog_allow">Cho phép thông báo</string>
@@ -895,4 +875,5 @@
   <string name="AutofillWarning_Intro">Bạn sắp chèn thông tin đăng nhập của miền \"%1$s\" vào ứng dụng \"%2$s\".</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">Nếu bạn tin tưởng \"%2$s\" thuộc về \"%1$s\" hoặc bạn tin tưởng ứng dụng \"%2$s\" không sử dụng sai thông tin xác thực (ví dụ: vì đây là ứng dụng trình duyệt đáng tin cậy), bạn có thể tiếp tục. Nếu không, xin vui lòng hủy bỏ.</string>
   <string name="AutofillWarning_trustAsBrowser">Luôn chấp nhận trong \"%1$s\"</string>
-</resources>
+  <string name="english_ime_settings">Cài đặt bàn phím Keepass2Android</string>
+</resources>

src/keepass2android-app/Resources/values-yo/strings.xml

@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
 <resources></resources>

src/keepass2android-app/Resources/values-zh-rTW/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">意見回饋：</string>
   <string name="AboutText">Keepass2Android 是 Android 的 KeePass 2.x 密碼資料庫管理軟體。</string>
@@ -819,6 +819,5 @@
   <string name="AutofillWarning_Intro">你正將「%1$s」網域的憑證輸入到「%2$s」應用程式。</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">如你相信「%2$s」屬於「%1$s」，或「%2$s」應用程式不會誤用憑證（例如這是可信的瀏覽器）時，請繼續。反之請取消。</string>
   <string name="AutofillWarning_trustAsBrowser">一律接受「%1$s」</string>
-<string name="english_ime_settings">Keepass2Android 鍵盤設定</string>
-    
-    </resources>
+  <string name="english_ime_settings">Keepass2Android 鍵盤設定</string>
+</resources>

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

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="about_feedback">反馈</string>
   <string name="AboutText">Keepass2Android 是一款支持 Keepass 2.x 数据库读写的密码管理应用。</string>
@@ -1156,6 +1156,7 @@ Initial public release
   <string name="AutofillWarning_Intro">您将要将域名\"%1$s\"的凭据插入应用“%2$s”。</string>
   <string name="AutofillWarning_FillDomainInUntrustedApp">如果你相信“%2$s”属于\"%1$s\"，或者你相信应用“%2$s”不会滥用凭据（例如，它是受信任的浏览器应用），所以可以继续。如果不是，请取消。</string>
   <string name="AutofillWarning_trustAsBrowser">总是在 \"%1$s 中接受</string>
-<string name="english_ime_settings">键盘设置</string>
-    
-    </resources>
+  <string name="kp2a_switch_on_sendgodone">完成后切换回来</string>
+  <string name="kp2a_switch_on_sendgodone_summary">按下发送/转到/完成时切换回来</string>
+  <string name="english_ime_settings">键盘设置</string>
+</resources>

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

@@ -726,6 +726,20 @@
   <string name="CloseDbAfterFailedAttempts">Close database after three failed biometric unlock attempts.</string>
   <string name="WarnFingerprintInvalidated">Warning! Biometric authentication can be invalidated by Android, e.g. after adding a new fingerprint in your device settings. Make sure you always know how to unlock with your master password!</string>
 
+  <string-array name="ChangeLog_1_12">
+    <item>Upgraded from Xamarin Android to .net 8</item>
+    <item>Upgraded to Target SDK 34</item>
+    <item>Upgraded to Material 3 user interface</item>
+    <item>Improve autofill to work with Compose apps</item>
+    <item>Fix hostname matching in autofill and search</item>
+  </string-array>
+  <string-array name="ChangeLog_1_12_net">
+    <item>Upgraded OneDrive SDK to version 5.68</item>
+    <item>Upgraded Dropbox SDK to version 7.0.0</item>
+    <item>Upgraded Gradle, NewtonsoftJson, FluentFTP, MegaApiClient and okhttp</item>
+    <item>Bugfix in WebDav file selection</item>
+  </string-array>
+
 
   <string-array name="ChangeLog_1_11">
     <item>Added floating action buttons for search and TOTP overview (if TOTP entries are present).</item>

src/keepass2android-app/SelectCurrentDbActivity.cs

@@ -26,6 +26,7 @@ using KeePassLib.Keys;
 using KeePassLib.Serialization;
 using Console = System.Console;
 using Object = Java.Lang.Object;
+using AndroidX.Core.Content;
 
 namespace keepass2android
 {
@@ -343,7 +344,7 @@ namespace keepass2android
                 IntentFilter filter = new IntentFilter();
                 filter.AddAction(Intents.DatabaseLocked);
                 filter.AddAction(Intent.ActionScreenOff);
-                RegisterReceiver(_intentReceiver, filter, ReceiverFlags.Exported);
+                ContextCompat.RegisterReceiver(this, _intentReceiver, filter, (int)ReceiverFlags.Exported);
             }
         }
 

src/keepass2android-app/SelectStorageLocationActivity.cs

@@ -12,7 +12,7 @@ using keepass2android;
 
 namespace keepass2android
 {
-	[Activity(Label = "")]
+	[Activity(Label = "", Theme = "@style/Kp2aTheme_BlueActionBar")]
 	public class SelectStorageLocationActivity : SelectStorageLocationActivityBase, IDialogInterfaceOnDismissListener
 	{
 		private ActivityDesign _design;

src/keepass2android-app/app/App.cs

@@ -1342,7 +1342,7 @@ namespace keepass2android
 		    intentFilter.AddAction(Intents.LockDatabase);
             intentFilter.AddAction(Intents.LockDatabaseByTimeout);
 			intentFilter.AddAction(Intents.CloseDatabase);
-            Context.RegisterReceiver(broadcastReceiver, intentFilter, ReceiverFlags.Exported);
+			ContextCompat.RegisterReceiver(Context, broadcastReceiver, intentFilter, (int)ReceiverFlags.Exported);
 
             //ZXing.Net.Mobile.Forms.Android.Platform.Init();
 		}

src/keepass2android-app/keepass2android-app.csproj

@@ -748,6 +748,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AndroidFileChooserBinding\AndroidFileChooserBinding.csproj" />
+    <ProjectReference Include="..\DropboxBinding\DropboxBinding.csproj" />
     <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj" />
     <ProjectReference Include="..\Kp2aAutofillParser\Kp2aAutofillParser.csproj" />
     <ProjectReference Include="..\KP2AKdbLibraryBinding\KP2AKdbLibraryBinding.csproj" />

src/keepass2android-app/services/AutofillBase/StructureParser.cs

@@ -86,6 +86,8 @@ namespace keepass2android.services.AutofillBase
                 ParseRecursive(autofillView, view, isManualRequest);
             }
 
+            autofillView.PackageId = autofillView.PackageId ?? _structure.ActivityComponent.PackageName;
+
             return autofillView;
 
         }
@@ -122,7 +124,6 @@ namespace keepass2android.services.AutofillBase
             }
 
             autofillView.InputFields.Add(new ViewNodeInputField(viewNode));
-          
             var childrenSize = viewNode.ChildCount;
             if (childrenSize > 0)
             {

src/keepass2android-app/services/CopyToClipboardService.cs

@@ -39,6 +39,7 @@ using KeePass.Util.Spr;
 using keepass2android;
 using KeePassLib.Serialization;
 using PluginTOTP;
+using AndroidX.Core.Content;
 
 namespace keepass2android
 {
@@ -322,7 +323,8 @@ namespace keepass2android
                 _stopOnLockBroadcastReceiver = new StopOnLockBroadcastReceiver(this);
                 IntentFilter filter = new IntentFilter();
                 filter.AddAction(Intents.DatabaseLocked);
-                RegisterReceiver(_stopOnLockBroadcastReceiver, filter, ReceiverFlags.Exported);
+
+                ContextCompat.RegisterReceiver(this, _stopOnLockBroadcastReceiver, filter, (int)ReceiverFlags.Exported);
             }
 
             if ((intent.Action == Intents.ShowNotification) || (intent.Action == Intents.UpdateKeyboard))
@@ -529,7 +531,7 @@ namespace keepass2android
                 _notificationDeletedBroadcastReceiver = new NotificationDeletedBroadcastReceiver(this);
                 IntentFilter deletefilter = new IntentFilter();
                 deletefilter.AddAction(ActionNotificationCancelled);
-                RegisterReceiver(_notificationDeletedBroadcastReceiver, deletefilter, ReceiverFlags.Exported);
+                ContextCompat.RegisterReceiver(this, _notificationDeletedBroadcastReceiver, deletefilter, (int)ReceiverFlags.Exported);
             }
             
         }

src/keepass2android-app/services/OngoingNotificationsService.cs

@@ -23,6 +23,7 @@ using Android.Graphics;
 using Android.OS;
 using Android.Preferences;
 using AndroidX.Core.App;
+using AndroidX.Core.Content;
 using keepass2android;
 using KeePassLib.Utility;
 
@@ -60,8 +61,8 @@ namespace keepass2android
 			_screenOffReceiver = new ScreenOffReceiver();
 			IntentFilter filter = new IntentFilter();
 			filter.AddAction(Intent.ActionScreenOff);
-			RegisterReceiver(_screenOffReceiver, filter, ReceiverFlags.Exported);
-		}
+            ContextCompat.RegisterReceiver(this, _screenOffReceiver, filter, (int)ReceiverFlags.Exported);
+        }
 
 
 		public override StartCommandResult OnStartCommand(Intent intent, StartCommandFlags flags, int startId)