From a672e9bbd2082c74958567a23f4d64f07fa62173 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@gmail.com>
Date: Tue, 7 Jan 2025 10:22:19 +0100
Subject: [PATCH] reactivate QR scanning capabilities by using GMS CodeScanner
 (instead of ZXing which is no longer compatible with new .net Android); copy
 resource string from KP2AKeyboard project to app such that it can be used in
 the manifest.

---
 .../EntryEditActivity.cs                      | 101 ++++++++++++++----
 .../Manifests/AndroidManifest_debug.xml       |   5 +-
 .../Manifests/AndroidManifest_net.xml         |   6 +-
 .../Manifests/AndroidManifest_nonet.xml       |   5 +
 .../Resources/values-ar/strings.xml           |   7 +-
 .../Resources/values-az/strings.xml           |   7 +-
 .../Resources/values-be/strings.xml           |   7 +-
 .../Resources/values-bg/strings.xml           |   7 +-
 .../Resources/values-ca/strings.xml           |   7 +-
 .../Resources/values-cs/strings.xml           |  11 +-
 .../Resources/values-da/strings.xml           |   7 +-
 .../Resources/values-de/strings.xml           |  11 +-
 .../Resources/values-el/strings.xml           |  11 +-
 .../Resources/values-es/strings.xml           |  15 +--
 .../Resources/values-eu/strings.xml           |   7 +-
 .../Resources/values-fa/strings.xml           |   7 +-
 .../Resources/values-fi/strings.xml           |   7 +-
 .../Resources/values-fr/strings.xml           |   7 +-
 .../Resources/values-hr/strings.xml           |   7 +-
 .../Resources/values-hu/strings.xml           |   7 +-
 .../Resources/values-in/strings.xml           |  47 ++++----
 .../Resources/values-it/strings.xml           |   7 +-
 .../Resources/values-iw/strings.xml           |  11 +-
 .../Resources/values-ja/strings.xml           |  25 ++---
 .../Resources/values-ko/strings.xml           |   7 +-
 .../Resources/values-ml/strings.xml           |  85 ++++++++++++++-
 .../Resources/values-nb/strings.xml           |   7 +-
 .../Resources/values-nl/strings.xml           |  21 ++--
 .../Resources/values-pl/strings.xml           |  23 ++--
 .../Resources/values-pt-rBR/strings.xml       |  23 ++--
 .../Resources/values-pt/strings.xml           |   7 +-
 .../Resources/values-ro/strings.xml           |   7 +-
 .../Resources/values-ru/strings.xml           |   7 +-
 .../Resources/values-sk/strings.xml           |   7 +-
 .../Resources/values-sl/strings.xml           |  23 ++--
 .../Resources/values-sr/strings.xml           |   7 +-
 .../Resources/values-sv/strings.xml           |   7 +-
 .../Resources/values-tr/strings.xml           |   7 +-
 .../Resources/values-uk/strings.xml           |   7 +-
 .../Resources/values-vi/strings.xml           |   7 +-
 .../Resources/values-zh-rTW/strings.xml       |   7 +-
 .../Resources/values-zh/strings.xml           |  23 ++--
 .../Resources/values/strings.xml              |  23 ++--
 .../keepass2android-appSdkStyle.csproj        |   1 +
 44 files changed, 418 insertions(+), 227 deletions(-)

diff --git a/src/keepass2android-appSdkStyle/EntryEditActivity.cs b/src/keepass2android-appSdkStyle/EntryEditActivity.cs
index d96959c7..af159e15 100644
--- a/src/keepass2android-appSdkStyle/EntryEditActivity.cs
+++ b/src/keepass2android-appSdkStyle/EntryEditActivity.cs
@@ -37,6 +37,7 @@ using System.Net;
 using System.Text;
 using Android.Content.Res;
 using Android.Database;
+using Android.Gms.Tasks;
 using Android.Graphics;
 using Android.Graphics.Drawables;
 using Android.Runtime;
@@ -53,6 +54,10 @@ using Object = Java.Lang.Object;
 using Uri = Android.Net.Uri;
 using Resource = keepass2android_appSdkStyle.Resource;
 using Google.Android.Material.TextField;
+using Xamarin.Google.MLKit.Vision.Barcode.Common;
+using Xamarin.Google.MLKit.Vision.CodeScanner;
+using Console = System.Console;
+using Task = Android.Gms.Tasks.Task;
 
 namespace keepass2android
 {
@@ -1150,25 +1155,30 @@ namespace keepass2android
 
             dlgView.FindViewById<Button>(Resource.Id.totp_scan).Click += async (object o, EventArgs args) =>
             {
-				/*TODO Restore this
-                var scanner = new ZXing..MobileBarcodeScanner();
-                var options = new ZXing.Mobile.MobileBarcodeScanningOptions();
-                options.PossibleFormats = new List<ZXing.BarcodeFormat>() { ZXing.BarcodeFormat.QR_CODE };
-
-                var result = await scanner.Scan(options);
-                if (result?.Text?.StartsWith("otpauth://") == true)
-                {
-                    dialog.Dismiss();
-                    var targetField = ((TextView)((View)sender.Parent).FindViewById(Resource.Id.value));
-                    targetField.Text = result.Text;
-                }
-                else
-                {
-                    Toast.MakeText(this, "Scanned code should contain an otpauth:// text.", ToastLength.Long).Show();
-				}
-				*/
-                Toast.MakeText(this, "QR Scanner must be restored", ToastLength.Long).Show();
+				GmsBarcodeScannerOptions options = new GmsBarcodeScannerOptions.Builder()
+                    .SetBarcodeFormats(Barcode.FormatQrCode)
+                    .Build();
+                var scanner = GmsBarcodeScanning.GetClient(this, options);
                 
+                scanner.StartScan()
+                    .AddOnSuccessListener(new SuccessListener((barcode) =>
+                    {
+                        if (barcode.RawValue?.StartsWith("otpauth://") == true)
+                        {
+                            dialog.Dismiss();
+                            var targetField = ((TextView)((View)sender.Parent).FindViewById(Resource.Id.value));
+                            targetField.Text = barcode.RawValue;
+                        }
+                        else
+                        {
+                            Toast.MakeText(this, "Scanned code should contain an otpauth:// text.", ToastLength.Long).Show();
+                        }
+                    }))
+                    .AddOnFailureListener(new FailureListener((e) =>
+                    {
+                        Console.WriteLine($"Scan failed: {e.Message}");
+                    }));
+
 
             };
 
@@ -1550,6 +1560,61 @@ namespace keepass2android
 		}
 	}
 
+    internal class BarcodeScanningFailureListener : Java.Lang.Object, IOnFailureListener
+    {
+        public BarcodeScanningFailureListener(Activity activity)
+        {
+        
+        }
+
+        public void OnFailure(Java.Lang.Exception e)
+        {
+            Toast.MakeText(Application.Context, "Barcode scanning failed", ToastLength.Long).Show();
+        }
+    }
+
+    internal class BarcodeScanningCancelledListener : Java.Lang.Object, IOnCanceledListener
+    {
+        public BarcodeScanningCancelledListener(Activity activity)
+        {
+            
+        }
+
+        public void OnCanceled()
+        {
+            Toast.MakeText(Application.Context, "Barcode scanning cancelled", ToastLength.Long).Show();
+        }
+    }
+    public class SuccessListener : Object, IOnSuccessListener
+    {
+        private readonly Action<Barcode> _onSuccess;
+
+        public SuccessListener(Action<Barcode> onSuccess)
+        {
+            _onSuccess = onSuccess;
+        }
+
+        public void OnSuccess(Object result)
+        {
+            _onSuccess?.Invoke((Barcode)result);
+        }
+    }
+
+    public class FailureListener : Java.Lang.Object, IOnFailureListener
+    {
+        private readonly Action<Exception> _onFailure;
+
+        public FailureListener(Action<Exception> onFailure)
+        {
+            _onFailure = onFailure;
+        }
+
+        public void OnFailure(Java.Lang.Exception e)
+        {
+            _onFailure?.Invoke(e);
+        }
+    }
+
     public class DefaultEdit : EditModeBase
 	{
 		
diff --git a/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_debug.xml b/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_debug.xml
index 22d4e019..2edff61b 100644
--- a/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_debug.xml
+++ b/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_debug.xml
@@ -51,6 +51,9 @@
 	android:roundIcon="@mipmap/ic_launcher_online_round"
 	android:networkSecurityConfig="@xml/network_security_config"
 	>
+    <meta-data
+      android:name="com.google.mlkit.vision.DEPENDENCIES"
+      android:value="barcode_ui"/>
 
     <uses-library
               android:name="org.apache.http.legacy"
@@ -89,7 +92,7 @@
       </intent-filter>
       <meta-data android:name="android.view.im" android:resource="@xml/method" />
     </service>
-    <activity android:name="keepass2android.softkeyboard.LatinIMESettings" android:label="english_ime_settings" android:exported="true">
+    <activity android:name="keepass2android.softkeyboard.LatinIMESettings" android:label="@string/english_ime_settings" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
       </intent-filter>
diff --git a/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_net.xml b/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_net.xml
index 812fadf1..a3e913fa 100644
--- a/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_net.xml
+++ b/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_net.xml
@@ -54,6 +54,10 @@
 
 	>
 
+    <meta-data
+      android:name="com.google.mlkit.vision.DEPENDENCIES"
+      android:value="barcode_ui"/>
+
     <uses-library
             android:name="org.apache.http.legacy"
             android:required="false"/>
@@ -93,7 +97,7 @@
       </intent-filter>
       <meta-data android:name="android.view.im" android:resource="@xml/method" />
     </service>
-    <activity android:name="keepass2android.softkeyboard.LatinIMESettings" android:label="english_ime_settings" android:exported="true">
+    <activity android:name="keepass2android.softkeyboard.LatinIMESettings" android:label="@string/english_ime_settings" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
       </intent-filter>
diff --git a/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_nonet.xml b/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_nonet.xml
index ce9e2f9c..3fce187d 100644
--- a/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_nonet.xml
+++ b/src/keepass2android-appSdkStyle/Manifests/AndroidManifest_nonet.xml
@@ -48,6 +48,11 @@
 		android:icon="@mipmap/ic_launcher_offline"
 		android:networkSecurityConfig="@xml/network_security_config"
 	>
+
+    <meta-data
+      android:name="com.google.mlkit.vision.DEPENDENCIES"
+      android:value="barcode_ui"/>
+
 		<uses-library
             android:name="org.apache.http.legacy"
             android:required="false"/>
diff --git a/src/keepass2android-appSdkStyle/Resources/values-ar/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-ar/strings.xml
index ab9997e7..1a538775 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-ar/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-ar/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">التعليقات</string>
   <string name="AboutText">Keepass2Android هو مدير كلمات سر يتيح القراءة والكتابة على قواعد بيانات KeePass 2.x على نظام الـAndroid.</string>
@@ -753,4 +752,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">إعدادات لوحة مفاتيح Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-az/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-az/strings.xml
index 241b4bca..1fc9ddfb 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-az/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-az/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Əks əlaqə</string>
   <string name="accept">Qəbul et</string>
@@ -83,4 +82,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Android klaviatura tənzimləmələri</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-be/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-be/strings.xml
index c3d986ea..32cfb552 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-be/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-be/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Зваротная сувязь</string>
   <string name="AboutText">Keepass2Android - кіраўнік пароляў для Android з паўнавартаснай падтрымкай базаў даных KeePass 2.x.</string>
@@ -812,4 +811,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Налады клавіятуры Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-bg/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-bg/strings.xml
index a6314278..b51d6728 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-bg/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-bg/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Отзив</string>
   <string name="AboutText">Keepass2Android е мениджър за пароли който осигурява достъп четене/записване до KeePass 2.x база данни на Android.</string>
@@ -464,4 +463,6 @@
     <item>KP2A Private/Public key</item>
     <item>Custom Private key</item>
   </string-array>
-</resources>
+<string name="english_ime_settings">Настройки на клавиатурата на Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-ca/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-ca/strings.xml
index a3bcf49c..f060143e 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-ca/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-ca/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -721,4 +720,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Configuració del teclat d\'Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-cs/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-cs/strings.xml
index 80752596..2be7ad54 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-cs/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-cs/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -679,9 +678,9 @@
    • Ujistěte se, že jste použili správný typ hesla. Ujistěte se, že tento typ odpovídá typu použitému při vytváření databáze.\n
    • Ujistěte se, že jste použili správný soubor databáze.</string>
   <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; Nápověda: Pokud si myslíte že by soubor databáze mohl být poškozený, nebo si nepamatujete hlavní klíč, můžete zkusit poslední úspěšně otevřenou verzi souboru kliknutím \"%1$s\" a zvolením místní zálohy.</string>
+    • Nápověda: Pokud si myslíte že by soubor databáze mohl být poškozený, nebo si nepamatujete hlavní klíč, můžete zkusit poslední úspěšně otevřenou verzi souboru kliknutím \"%1$s\" a zvolením místní zálohy.</string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; Nápověda: Keepass2Android uložil poslední úspěšně otevřenou verzi souboru do interního úložiště. Můžete ji otevřít klepnutím na \"%1$s\" a výběrem místní zálohy.
+    • Nápověda: Keepass2Android uložil poslední úspěšně otevřenou verzi souboru do interního úložiště. Můžete ji otevřít klepnutím na \"%1$s\" a výběrem místní zálohy.
   </string>
   <string name="CorruptDatabaseHelp">    Soubor je poškozený. \n
     Zde je několik rad, které vám mohou pomoci zjistit příčinu problému:\n
@@ -1151,4 +1150,6 @@ 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>
-</resources>
+<string name="english_ime_settings">Nastavení klávesnice Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-da/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-da/strings.xml
index 1c512b05..0d7b3f32 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-da/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-da/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -819,4 +818,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Indstillinger for Keepass2Android-tastatur</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-de/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-de/strings.xml
index 78d9248b..652acc29 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-de/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-de/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -681,9 +680,9 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
    • Sicherstellen, dass die richtige Datenbankdatei gewählt wurde.
  </string>
   <string name="HintLocalBackupInvalidCompositeKey">   \n
-   &#8226; Tipp: Wenn die Vermutung besteht, die eigene Datenbankdatei könnte beschädigt sein oder sich nach einer Änderung nicht mehr an den Hauptschlüssel erinnern wird, kann man es mit der zuletzt erfolgreich geöffnete Dateiversion versuchen, indem auf „%1$s“ getippt und die lokale Sicherung ausgewählt wird.</string>
+   • Tipp: Wenn die Vermutung besteht, die eigene Datenbankdatei könnte beschädigt sein oder sich nach einer Änderung nicht mehr an den Hauptschlüssel erinnern wird, kann man es mit der zuletzt erfolgreich geöffnete Dateiversion versuchen, indem auf „%1$s“ getippt und die lokale Sicherung ausgewählt wird.</string>
   <string name="HintLocalBackupOtherError">\n
-&#8226; Tipp: Keepass2Android hat die zuletzt erfolgreich geöffnete Dateiversion im internen Speicher gesichert. Diese kann geöffnet werden, indem „%1$s“ angetippt und das lokale Backup gewählte wird.</string>
+• Tipp: Keepass2Android hat die zuletzt erfolgreich geöffnete Dateiversion im internen Speicher gesichert. Diese kann geöffnet werden, indem „%1$s“ angetippt und das lokale Backup gewählte wird.</string>
   <string name="CorruptDatabaseHelp">Die Datei ist beschädigt.\n
 Anbei einige Tipps, die bei der Diagnose des Problems helfen können:\n
 
@@ -1145,4 +1144,6 @@ 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>
-</resources>
+<string name="english_ime_settings">Keepass2Android-Tastatureinstellungen</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-el/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-el/strings.xml
index 88c16596..35a05ead 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-el/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-el/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Σχόλια</string>
   <string name="AboutText">Το KP2A είναι ένας διαχειριστής συνθηματικών, που παρέχει την δυνατότητα ανάγνωσης/εγγραφής σε βάσεις δεδομένων του KeePass 2.x στο Android.</string>
@@ -670,9 +669,9 @@
 * Βεβαιωθείτε ότι έχετε επιλέξει σωστό τύπο συνθηματικού. Βεβαιωθείτε ότι ταιριάζει με τον τύπο που χρησιμοποιήθηκε κατά τη δημιουργία της βάσης δεδομένων. \n
 * Βεβαιωθείτε ότι έχετε επιλέξει το σωστό αρχείο βάσης δεδομένων.</string>
   <string name="HintLocalBackupInvalidCompositeKey">    \n
-   &#8226; Υπόδειξη: Αν νομίζεις ότι η βάση δεδομένων σου έχει καταστραφεί, ή δεν θυμάσαι το κύριο κλειδί μετά την αλλαγή του, μπορείς να δοκιμάσεις την τελευταία έκδοση του αρχείου που άνοιξες με επιτυχία πατώντας \"%1$s\" και επιλέγοντας το τοπικό αντίγραφο.</string>
+   • Υπόδειξη: Αν νομίζεις ότι η βάση δεδομένων σου έχει καταστραφεί, ή δεν θυμάσαι το κύριο κλειδί μετά την αλλαγή του, μπορείς να δοκιμάσεις την τελευταία έκδοση του αρχείου που άνοιξες με επιτυχία πατώντας \"%1$s\" και επιλέγοντας το τοπικό αντίγραφο.</string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; Υπόδειξη: Το Keepass2Android έχει αποθηκεύσει την τελευταία έκδοση του αρχείου που ανοίχτηκε στην εσωτερική μνήμη. Μπορείς να την ανοίξεις πατώντας \"%1$s\" και επιλέγοντας το τοπικό αντίγραφο.  </string>
+    • Υπόδειξη: Το Keepass2Android έχει αποθηκεύσει την τελευταία έκδοση του αρχείου που ανοίχτηκε στην εσωτερική μνήμη. Μπορείς να την ανοίξεις πατώντας \"%1$s\" και επιλέγοντας το τοπικό αντίγραφο.  </string>
   <string name="CorruptDatabaseHelp">Το αρχείο είναι κατεστραμμένο. \n
 Ακολουθούν υποδείξεις για τη διάγνωση του προβλήματος: \n
 
@@ -866,4 +865,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Ρυθμίσεις πληκτρολογίου Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-es/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-es/strings.xml
index a987cd30..5fa79a85 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-es/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-es/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -666,12 +665,12 @@
   <string name="FirstInvalidCompositeKeyError">Clave compuesta no válida! Por favor, inténtelo de nuevo.</string>
   <string name="RepeatedInvalidCompositeKeyHelp">¡Clave compuesta incorrecta! Por favor, sigue los siguientes pasos para desbloquear la Base de Datos:\n
 
-    &#8226; Asegúrate de haber puesto la contraseña correcta. Utiliza el icono del ojo para ver la contraseña.\n
-    &#8226; Asegúrate de haber seleccionado el tipo de contraseña correcta. Debe coincidir con el tipo usado al crear la Base de Datos.\n
-    &#8226; Asegúrate de haber seleccionado la Base de Datos correcta.
+    • Asegúrate de haber puesto la contraseña correcta. Utiliza el icono del ojo para ver la contraseña.\n
+    • Asegúrate de haber seleccionado el tipo de contraseña correcta. Debe coincidir con el tipo usado al crear la Base de Datos.\n
+    • Asegúrate de haber seleccionado la Base de Datos correcta.
   </string>
   <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.
+    • 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="open_other_db">Abrir otrar base de datos…</string>
   <string name="select_database">Seleccione base de datos</string>
@@ -856,4 +855,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Ajustes del teclado de Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-eu/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-eu/strings.xml
index 993dcc44..176bd3df 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-eu/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-eu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -436,4 +435,6 @@
     <item>Ohartarazi balidazioak huts egitean</item>
     <item>Do not accept invalid certificates</item>
   </string-array>
-</resources>
+<string name="english_ime_settings">Android teklatuaren ezarpenak</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-fa/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-fa/strings.xml
index abfbc345..46cee3ab 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-fa/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-fa/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">ﺑﺎﺯﺧﻮﺭﺩ</string>
   <string name="AboutText">برنامهٔ Keepass2Android یک برنامهٔ مدیریت گذرواژه است که دسترسی خواندنی/نوشتنی به پایگاه‌داده‌های KeePass 2.x را در اندروید فراهم می‌کند.</string>
@@ -773,4 +772,6 @@ 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>
-</resources>
+<string name="english_ime_settings">تنظیمات صفحه کلید Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-fi/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-fi/strings.xml
index dcbefe92..49b2b997 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-fi/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-fi/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -764,4 +763,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Keepass2Android-näppäimistön asetukset</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-fr/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-fr/strings.xml
index ced8144e..7b8f4bf7 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-fr/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-fr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -847,4 +846,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Paramètres du clavier Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-hr/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-hr/strings.xml
index dd6a9e8f..af1bb30d 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-hr/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-hr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -756,4 +755,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Postavke tipkovnice za Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-hu/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-hu/strings.xml
index 5c8099d7..03982ff8 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-hu/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-hu/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -767,4 +766,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Keepass2Android billentyűzetbeállítások</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-in/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-in/strings.xml
index 26ab0843..a843ae4d 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-in/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-in/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Umpan balik</string>
   <string name="about_homepage">Laman</string>
@@ -67,7 +65,7 @@
   <string name="entry_is_available">tersedia</string>
   <string name="not_possible_im_picker">Tidak bisa membuka dialog untuk memilih metode masukan. Harap aktifkan keyboard secara manual.</string>
   <string name="please_activate_keyboard">Harap aktifkan papan ketik Keepass2Android dalam pengaturan sistem Anda.</string>
-  <string name="creating_db_key">Menciptakan kunci database&#8230;</string>
+  <string name="creating_db_key">Menciptakan kunci database…</string>
   <string name="current_group">Grup saat ini</string>
   <string name="current_group_root">Grup saat ini: Root</string>
   <string name="database">Database</string>
@@ -154,7 +152,7 @@
   <string name="length">Panjang</string>
   <string name="list_size_title">Ukuran daftar Grup</string>
   <string name="list_size_summary">Ukuran teks dalam daftar Grup</string>
-  <string name="loading_database">Memuat database&#8230;</string>
+  <string name="loading_database">Memuat database…</string>
   <string name="lowercase">Huruf kecil</string>
   <string name="MaskedPassword">*****</string>
   <string name="maskpass_title">Kata sandi ditutup</string>
@@ -196,9 +194,9 @@
   <string name="pass_filename">Nama berkas KeePass basis data</string>
   <string name="password_title">Masukkan kata kunci basis data</string>
   <string name="master_key_type">Pilih jenis kunci master:</string>
-  <string name="progress_create">Menciptakan basis data baru&#8230;</string>
+  <string name="progress_create">Menciptakan basis data baru…</string>
   <string name="create_database">Menciptakan basis data</string>
-  <string name="progress_title">Bekerja&#8230;</string>
+  <string name="progress_title">Bekerja…</string>
   <string name="remember_keyfile_summary">Mengingat lokasi file kunci</string>
   <string name="remember_keyfile_title">Simpan file kunci</string>
   <string name="remove_from_filelist">Hapus</string>
@@ -364,34 +362,34 @@ Hati-hati terhadap pengintip kata sandi!</string>
   <string name="suggest_improvements">Menyarankan atau memilih untuk perbaikan</string>
   <string name="rate_app">Menilai app ini</string>
   <string name="translate_app">Menerjemahkan KP2A</string>
-  <string name="AddingEntry">Menambahkan entri&#8230;</string>
-  <string name="AddingGroup">Menambahkan grup&#8230;</string>
-  <string name="DeletingEntry">Menghapus entri&#8230;</string>
-  <string name="DeletingGroup">Menghapus grup&#8230;</string>
-  <string name="DeletingItems">Menghapus elemen&#8230;</string>
+  <string name="AddingEntry">Menambahkan entri…</string>
+  <string name="AddingGroup">Menambahkan grup…</string>
+  <string name="DeletingEntry">Menghapus entri…</string>
+  <string name="DeletingGroup">Menghapus grup…</string>
+  <string name="DeletingItems">Menghapus elemen…</string>
   <string name="SettingPassword">Menetapkan kata kunci...</string>
-  <string name="UndoingChanges">Membatalkan perubahan&#8230;</string>
-  <string name="TransformingKey">Mengubah kunci master&#8230;</string>
+  <string name="UndoingChanges">Membatalkan perubahan…</string>
+  <string name="TransformingKey">Mengubah kunci master…</string>
   <string name="DecodingDatabase">Decoding database...</string>
   <string name="ParsingDatabase">Parsing database...</string>
-  <string name="CheckingTargetFileForChanges">Memeriksa file target untuk perubahan&#8230;</string>
+  <string name="CheckingTargetFileForChanges">Memeriksa file target untuk perubahan…</string>
   <string name="TitleSyncQuestion">Menggabungkan perubahan?</string>
   <string name="MessageSyncQuestion">Berkas database diubah di luar aplikasi. Apakah anda ingin memuat dan menggabungkan perubahan sebelum disimpan? Pilih Tidak jika anda ingin menimpa perubahan luar.</string>
-  <string name="SynchronizingDatabase">Menggabungkan perubahan&#8230;</string>
+  <string name="SynchronizingDatabase">Menggabungkan perubahan…</string>
   <string name="YesSynchronize">Ya, gabungkan</string>
   <string name="NoOverwrite">Tidak, timpa</string>
-  <string name="SynchronizingCachedDatabase">Menyelaraskan database cache&#8230;</string>
+  <string name="SynchronizingCachedDatabase">Menyelaraskan database cache…</string>
   <string name="FilesInSync">Berkas sudah selaras.</string>
   <string name="SynchronizedDatabaseSuccessfully">Berkas sukses diselaraskan!</string>
-  <string name="CheckingDatabaseForChanges">Memeriksa perubahan pada database&#8230;</string>
+  <string name="CheckingDatabaseForChanges">Memeriksa perubahan pada database…</string>
   <string name="RemoteDatabaseUnchanged">Tidak ada perubahan terdeteksi.</string>
-  <string name="SynchronizingOtpAuxFile">Menyelarasjan berkas auxiliary OTP&#8230;</string>
+  <string name="SynchronizingOtpAuxFile">Menyelarasjan berkas auxiliary OTP…</string>
   <string name="database_file">berkas database</string>
   <string name="otp_aux_file">berkas auxiliary OTP</string>
   <string name="ErrorOcurred">Terjadi sebuah kesalahan:</string>
   <string name="DuplicateUuidsError">Database korup: ditemukan ID duplikat. (Apakah anda menyimpan dengan Minikeepass?) Mohon impor ulang ke database baru dengan Keepass 2 untuk PC dan pilih \'Create new IDs\'.</string>
   <string name="DuplicateUuidsErrorAdditional">Anda bisa menonaktifkan pesan kesalahan ini pada Pengaturan/Pengaturan aplikasi/Penanganan Berkas/Periksa UUID duplikat. Harap dicatat bahwa anda mungkin mengalami kejadian tidak terduga. Disarankan untuk memperbaiki database.</string>
-  <string name="synchronize_database_menu">Menyelaraskan database&#8230;</string>
+  <string name="synchronize_database_menu">Menyelaraskan database…</string>
   <string name="CannotMoveGroupHere">Tidak bisa memindah grup ke dalam grup ini.</string>
   <string name="donate_question">Hari ini adalah Oktoberfest! Jika anda menyukai Keepass2Android: bukankah hari ini hari yang baik untuk membelikan saya sebotol bir?</string>
   <string name="donate_bday_question">10 Mei? Ini hari ulang tahun saya! Jika anda menyukai aplikasi ini, mengapa anda tidak mengirimkan saya ucapan ulang tahun bersamaan dengan hadiah? Ini benar-benar akan membuat saya bahagia! :-)</string>
@@ -436,7 +434,7 @@ Hati-hati terhadap pengintip kata sandi!</string>
   <string name="hint_key_file">Pilih apakah Anda ingin menggunakan berkas kunci selain kata sandi utama Anda:</string>
   <string name="use_key_file">Gunakan berkas kunci</string>
   <string name="error_adding_keyfile">Kesalahan saat menambahkan berkas kunci!</string>
-  <string name="init_otp">Memuat berkas bantu OTP&#8230;</string>
+  <string name="init_otp">Memuat berkas bantu OTP…</string>
   <string name="otp_explanation">Masukkan kata sandi One-time-password berikutnya (OTPs). Gesek NEO Yubikey Anda di bagian belakang perangkat Anda untuk masuk melalui NFC.</string>
   <string name="otp_hint">OTP%1$d</string>
   <string name="CouldntLoadOtpAuxFile">Tidak bisa memuat file OTP tambahan!</string>
@@ -449,7 +447,7 @@ Hati-hati terhadap pengintip kata sandi!</string>
   <string name="CouldntParseOtpSecret">Kesalahan mengurai rahasia OTP!</string>
   <string name="OtpKeyError">Gagal membuat kunci OTP! Pastikan Anda telah memasukkan OTPs yang benar.</string>
   <string name="ErrorUpdatingOtpAuxFile">Kesalahan memperbarui file bantu OTP!</string>
-  <string name="SavingOtpAuxFile">Menyimpan file OTP tambahan&#8230;</string>
+  <string name="SavingOtpAuxFile">Menyimpan file OTP tambahan…</string>
   <string name="bad_resp">Respons tantangannya salah.</string>
   <string name="CouldntLoadChalAuxFile">Tidak dapat memuat berkas tantangan tambahan!</string>
   <string name="CouldntLoadChalAuxFile_Hint">Silakan gunakan plugin KeeChallenge di KeePass 2.x (PC) untuk mengkonfigurasi database Anda untuk digunakan dengan respon tantangan!</string>
@@ -463,7 +461,7 @@ Hati-hati terhadap pengintip kata sandi!</string>
   <string name="DebugLog_title">Gunakan berkas log</string>
   <string name="DebugLog_summary">Tuliskan hasil aplikasi ke berkas log lokal</string>
   <string name="DebugLog_send">Kirim log debug...</string>
-  <string name="loading">Memuat&#8230;</string>
+  <string name="loading">Memuat…</string>
   <string name="plugins">Plug-ins</string>
   <string name="plugin_packagename">Nama paket:</string>
   <string name="plugin_description">Deskripsi (tidak diverifikasi):</string>
@@ -837,4 +835,5 @@ Rilis publik awal  </string>
   </string-array>
   <string name="ClearClipboardWarning">Pastikan ini bekerja pada sistem anda dan pertimbangkan jika tidak untuk menggunakan built-in keyboard.</string>
   <string name="PluginDescription">Deskripsi disediakan oleh plugin:</string>
-</resources>
+<string name="english_ime_settings" msgid="6661589557206947774">"Setelan Keepass2Android Android"</string>
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-it/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-it/strings.xml
index c096f0e1..0706f0a0 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-it/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-it/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -819,4 +818,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Impostazioni tastiera Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-iw/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-iw/strings.xml
index 7517b0fb..326d2c5b 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-iw/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-iw/strings.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">משוב</string>
   <string name="about_homepage">עמוד הבית</string>
@@ -67,7 +65,7 @@
   <string name="entry_is_available">זמינה</string>
   <string name="not_possible_im_picker">לא ניתן לפתוח תפריט לבחירת מקלדת. יש להפעיל את המקלדת ידנית.</string>
   <string name="please_activate_keyboard">נא לאפשר את מקלדת Keepass2Android בהגדרות המערכת שלך.</string>
-  <string name="creating_db_key">יוצר מפתח למסד הנתונים&#8230;</string>
+  <string name="creating_db_key">יוצר מפתח למסד הנתונים…</string>
   <string name="current_group">קבוצה נוכחית</string>
   <string name="current_group_root">קבוצה נוכחית: שורש</string>
   <string name="database">מסד נתונים</string>
@@ -158,7 +156,7 @@
   <string name="length">אורך</string>
   <string name="list_size_title">גודל רשימת הקבוצות</string>
   <string name="list_size_summary">גודל הטקסט ברשימת הקבוצות</string>
-  <string name="loading_database">טוען מסד נתונים&#8230;</string>
+  <string name="loading_database">טוען מסד נתונים…</string>
   <string name="lowercase">אותיות קטנות באנגלית</string>
   <string name="MaskedPassword">*****</string>
   <string name="maskpass_title">הסתרת סיסמא</string>
@@ -243,4 +241,5 @@
   <string name="SaveAttachment_Failed">לא הייתה אפשרות לשמור את הקובץ ב-%1$s.</string>
   <string name="AddUrlToEntryDialog_title">שמירת טקסט החיפוש?</string>
   <string name="AddUrlToEntryDialog_text">תרצו לשמור את הטקסט \"%1$s\" ברשומה הנבחרת על מנת למצוא את הרשומה אוטומטית בפעם הבאה?</string>
-</resources>
+<string name="english_ime_settings" msgid="6661589557206947774">"הגדרות מקלדת של Keepass2Android"</string>
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-ja/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-ja/strings.xml
index eb915181..eab507a1 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-ja/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-ja/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">フィードバック</string>
   <string name="AboutText">Keepass2Android は Android で KeePass 2.x データベースを読み書きするパスワードマネージャーです。</string>
@@ -644,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>
@@ -675,21 +674,21 @@
   <string name="FirstInvalidCompositeKeyError">複合マスターキーが無効です！ もう一度やり直してください。</string>
   <string name="RepeatedInvalidCompositeKeyHelp">    複合マスターキーが無効です！ 次の手順を試してデータベースのロックを解除してください:\n
 
-    &#8226; 正しいパスワードを入力したことを確認してください。目のアイコンを使用すると、入力したパスワードを表示できます。\n
-    &#8226; 正しいパスワードタイプを選択したことを確認してください。データベースを作成するときに使用したタイプと一致することを確認してください。\n
-    &#8226; 正しいデータベースファイルを選択していることを確認してください。
+    • 正しいパスワードを入力したことを確認してください。目のアイコンを使用すると、入力したパスワードを表示できます。\n
+    • 正しいパスワードタイプを選択したことを確認してください。データベースを作成するときに使用したタイプと一致することを確認してください。\n
+    • 正しいデータベースファイルを選択していることを確認してください。
   </string>
   <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; ヒント: データベースファイルが破損した疑いのある場合、または、変更したマスターキーを忘れてしまった場合は「%1$s」をタップしてローカルバックアップを選択すると、最後に開けたバージョンのファイルを試せます。</string>
+    • ヒント: データベースファイルが破損した疑いのある場合、または、変更したマスターキーを忘れてしまった場合は「%1$s」をタップしてローカルバックアップを選択すると、最後に開けたバージョンのファイルを試せます。</string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; ヒント: Keepass2Android は、内部ストレージに最後に開けたバージョンのファイルを保持しています。「%1$s」をタップして、ローカルバックアップを選択すると開けます。
+    • ヒント: Keepass2Android は、内部ストレージに最後に開けたバージョンのファイルを保持しています。「%1$s」をタップして、ローカルバックアップを選択すると開けます。
   </string>
   <string name="CorruptDatabaseHelp">    ファイルが破損しています。\n
     問題を診断するのに以下のヒントが役立つかもしれません:\n
     
-    &#8226; USB ケーブルを接続して (MTP モードで) ファイルをコピーした場合、MyPhoneExplorer のようなツールでもう一度やり直してください。MTP の仕様でファイルが切り捨てられる場合があります。\n
-    &#8226; お使いの PC で同じ場所からファイルを開くことができない場合、ファイルが実際に破損している可能性が高いです。その場合は、データベースのバックアップを使用してください。Keepass2Android が原因でファイルが破損していると思われる場合は、サポートチームにお問い合わせください。\n
-    &#8226; お使いの PC でファイルを開くことができる場合は、サポートチームにお問い合わせください。PC で、(ZIP を解凍するなど) 異なる設定で保存して、Keepass2Android で再度開いてみると問題が解消する場合があります。
+    • USB ケーブルを接続して (MTP モードで) ファイルをコピーした場合、MyPhoneExplorer のようなツールでもう一度やり直してください。MTP の仕様でファイルが切り捨てられる場合があります。\n
+    • お使いの PC で同じ場所からファイルを開くことができない場合、ファイルが実際に破損している可能性が高いです。その場合は、データベースのバックアップを使用してください。Keepass2Android が原因でファイルが破損していると思われる場合は、サポートチームにお問い合わせください。\n
+    • お使いの PC でファイルを開くことができる場合は、サポートチームにお問い合わせください。PC で、(ZIP を解凍するなど) 異なる設定で保存して、Keepass2Android で再度開いてみると問題が解消する場合があります。
 
   </string>
   <string name="open_other_db">別のデータベースを開く…</string>
@@ -1169,4 +1168,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Keepass2Android キーボードの設定</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-ko/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-ko/strings.xml
index 242aad99..aa7815d3 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-ko/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-ko/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">의견 보내기</string>
   <string name="AboutText">Keepass2Android는 Android에서 KeePass 2.x 데이터베이스에 대한 읽기/쓰기 액세스를 제공하는 암호 관리자입니다.</string>
@@ -746,4 +745,6 @@ 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>
-</resources>
+<string name="english_ime_settings">Keepass2Android 키보드 설정</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-ml/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-ml/strings.xml
index 8d951cc5..a8d9dae8 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-ml/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-ml/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">അഭിപ്രായം</string>
   <string name="accept">അംഗീകരിക്കുക</string>
@@ -222,4 +221,84 @@
   </string-array>
   <string name="understand">എനിക്ക് മനസിലായി</string>
   <string name="dont_show_again">വീണ്ടും കാണിക്കരുത്</string>
-</resources>
+<string name="english_ime_settings">ആൻഡ്രോയിഡ് കീബോർഡ് ക്രമീകരണങ്ങൾ</string>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-nb/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-nb/strings.xml
index 4d54ad99..5fe29367 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-nb/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-nb/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -590,4 +589,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Innstillinger for Keepass2Android tastatur</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-nl/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-nl/strings.xml
index cbdbe9ea..b21ba0f8 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-nl/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-nl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -675,20 +674,20 @@
   <string name="FirstInvalidCompositeKeyError">Ongeldige sleutelcombinatie! Probeer het opnieuw.</string>
   <string name="RepeatedInvalidCompositeKeyHelp">    Ongeldige samengestelde sleutel! Probeer de volgende stappen om uw database te ontgrendelen:\n
 
-    &#8226; Controleer of het juiste wachtwoord is ingevuld. Gebruik het oogsymbool om het ingevoerde wachtwoord te onthullen.\n
-    &#8226; Controleer of het juiste wachtwoordtype is gebruikt. Let erop dat dit overeenkomt met het type dat is gekozen bij het aanmaken van de database.\n
-    &#8226; Controleer of de juiste database is gekozen.
+    • Controleer of het juiste wachtwoord is ingevuld. Gebruik het oogsymbool om het ingevoerde wachtwoord te onthullen.\n
+    • Controleer of het juiste wachtwoordtype is gebruikt. Let erop dat dit overeenkomt met het type dat is gekozen bij het aanmaken van de database.\n
+    • Controleer of de juiste database is gekozen.
   </string>
   <string name="HintLocalBackupInvalidCompositeKey">Tip: Als de database mogelijk corrupt is of na het wijzigen de hoofdsleutel niet meer bekend is, kunt u het proberen met de laatst geopende versie van het bestand door op \"%1$s\" te tikken en de lokale back-up te selecteren.</string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; Tip: Keepass2Android heeft de laatst succesvol geopende bestandsversie opgeslagen op de interne opslag. U kunt deze openen door op \"%1$s\" te tikken en de lokale back-up te selecteren.
+    • Tip: Keepass2Android heeft de laatst succesvol geopende bestandsversie opgeslagen op de interne opslag. U kunt deze openen door op \"%1$s\" te tikken en de lokale back-up te selecteren.
   </string>
   <string name="CorruptDatabaseHelp">    Bestand is beschadigd. \n
     Hier zijn enkele tips die kunnen helpen bij het opsporen van het probleem:\n
 
-    &#8226; Als het bestand via USB (MTP-modus) is gekopieerd, probeer het dan opnieuw met een programma zoals MyPhoneExplorer. MTP kort bestanden in bepaalde gevallen in.\n
-    &#8226; Als het bestand niet vanaf dezelfde locatie op je pc kan worden geopend, is het waarschijnlijk beschadigd. Gebruik dan een database back-up. Als je vermoedt dat Keepass2Android het bestand heeft beschadigd, raadpleeg dan het ondersteuningsteam.\n
-    &#8226; Kunt u het bestand nog steeds openen op uw pc, neem dan contact op met het ondersteuningsteam. U kunt proberen het bestand op te slaan met andere instellingen ( bijv. uitgepakt) op de pc en opnieuw proberen te openen in Keepass2Android.
+    • Als het bestand via USB (MTP-modus) is gekopieerd, probeer het dan opnieuw met een programma zoals MyPhoneExplorer. MTP kort bestanden in bepaalde gevallen in.\n
+    • Als het bestand niet vanaf dezelfde locatie op je pc kan worden geopend, is het waarschijnlijk beschadigd. Gebruik dan een database back-up. Als je vermoedt dat Keepass2Android het bestand heeft beschadigd, raadpleeg dan het ondersteuningsteam.\n
+    • Kunt u het bestand nog steeds openen op uw pc, neem dan contact op met het ondersteuningsteam. U kunt proberen het bestand op te slaan met andere instellingen ( bijv. uitgepakt) op de pc en opnieuw proberen te openen in Keepass2Android.
 
   </string>
   <string name="open_other_db">Een andere database openen…</string>
@@ -978,4 +977,6 @@ 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>
-</resources>
+<string name="english_ime_settings">Instellingen voor Keepass2Android-toetsenbord</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-pl/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-pl/strings.xml
index e18fc84e..c3286eb4 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-pl/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-pl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -675,21 +674,21 @@
   <string name="FirstInvalidCompositeKeyError">Błędny klucz zbiorowy! Spróbuj ponownie.</string>
   <string name="RepeatedInvalidCompositeKeyHelp">Błędny klucz zbiorowy! Spróbuj następujących kroków, by odblokować swoją bazę danych:\n
 
-&#8226; Upewnij się, że wprowadziłeś poprawne hasło. Użyj ikony oka, by odsłonić wprowadzone hasło.\n
-&#8226;Upewnij się, że wybrałeś właściwy typ hasła. Upewnij się, że pasuje do typu użytego podczas tworzenia bazy danych.\n
-&#8226;Upewnij się, że wybrałeś odpowiedni plik bazy danych.
+• Upewnij się, że wprowadziłeś poprawne hasło. Użyj ikony oka, by odsłonić wprowadzone hasło.\n
+•Upewnij się, że wybrałeś właściwy typ hasła. Upewnij się, że pasuje do typu użytego podczas tworzenia bazy danych.\n
+•Upewnij się, że wybrałeś odpowiedni plik bazy danych.
  </string>
   <string name="HintLocalBackupInvalidCompositeKey">    \n
-   &#8226; Wskazówka: Jeśli sądzisz, że Twoja baza danych mogła zostać uszkodzona lub nie pamiętasz klucza głównego po jego zmodyfikowaniu, możesz spróbować z ostatnio pomyślnie otwartą wersją pliku, klikając \"%1$s\" i wybierając lokalną kopię zapasową.</string>
+   • Wskazówka: Jeśli sądzisz, że Twoja baza danych mogła zostać uszkodzona lub nie pamiętasz klucza głównego po jego zmodyfikowaniu, możesz spróbować z ostatnio pomyślnie otwartą wersją pliku, klikając \"%1$s\" i wybierając lokalną kopię zapasową.</string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; Wskazówka: Keepass2Android zachował ostatnią poprawnie otwartą wersję pliku w swojej wewnętrznej pamięci. Możesz ją otworzyć, klikając w \"%1$s\" i wybierając lokalną kopię zapasową.
+    • Wskazówka: Keepass2Android zachował ostatnią poprawnie otwartą wersję pliku w swojej wewnętrznej pamięci. Możesz ją otworzyć, klikając w \"%1$s\" i wybierając lokalną kopię zapasową.
   </string>
   <string name="CorruptDatabaseHelp">    Plik jest uszkodzony. \n
     Tu są wskazówki, które mogą pomóc zdiagnozować problem:\n
     
-    &#8226;Jeśli skopiowałeś plik przez USB (w trybie MTP), proszę spróbuj ponownie używając narzędzia takiego jak MyPhoneExplorer. MTP obcina pliki w pewnych przypadkach.\n
-    &#8226;Jeśli nie możesz otworzyć pliku z tej samej lokalizacji na swoim PC, to bardzo prawdopodobne, że plik jest rzeczywiście uszkodzony. W takim wypadku użyj kopii zapasowej bazy danych. Jeśli przypuszczasz, że to Keepass2Android uszkodził plik, skontaktuj się z pomocą.\n
-    &#8226;Jeśli możesz otworzyć plik na swoim komputerze, skontaktuj się z pomocą. Możesz spróbować zapisać go z innymi ustawieniami (np. rozpakowany) na komputerze i spróbować ponownie otworzyć w Keepass2Android.
+    •Jeśli skopiowałeś plik przez USB (w trybie MTP), proszę spróbuj ponownie używając narzędzia takiego jak MyPhoneExplorer. MTP obcina pliki w pewnych przypadkach.\n
+    •Jeśli nie możesz otworzyć pliku z tej samej lokalizacji na swoim PC, to bardzo prawdopodobne, że plik jest rzeczywiście uszkodzony. W takim wypadku użyj kopii zapasowej bazy danych. Jeśli przypuszczasz, że to Keepass2Android uszkodził plik, skontaktuj się z pomocą.\n
+    •Jeśli możesz otworzyć plik na swoim komputerze, skontaktuj się z pomocą. Możesz spróbować zapisać go z innymi ustawieniami (np. rozpakowany) na komputerze i spróbować ponownie otworzyć w Keepass2Android.
 
   </string>
   <string name="open_other_db">Otwórz inną bazę danych</string>
@@ -891,4 +890,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Ustawienia klawiatury Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-pt-rBR/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-pt-rBR/strings.xml
index 1616c3e6..30807288 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-pt-rBR/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-pt-rBR/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -677,22 +676,22 @@
   <string name="FirstInvalidCompositeKeyError">Chave composta inválida! Por favor, tente novamente.</string>
   <string name="RepeatedInvalidCompositeKeyHelp">    Chave composta inválida! Por favor, tente as seguintes etapas para desbloquear seu banco de dados:\n
 
-    &#8226; Certifique-se de ter digitado a senha correta. Use o ícone de olho para revelar a senha digitada.\n
-    &#8226; Certifique-se de ter selecionado o tipo de senha correto. Certifique-se de que corresponda ao tipo usado ao criar o banco de dados.\n
-    &#8226; Certifique-se de ter selecionado o arquivo de banco de dados correto.
+    • Certifique-se de ter digitado a senha correta. Use o ícone de olho para revelar a senha digitada.\n
+    • Certifique-se de ter selecionado o tipo de senha correto. Certifique-se de que corresponda ao tipo usado ao criar o banco de dados.\n
+    • Certifique-se de ter selecionado o arquivo de banco de dados correto.
   </string>
   <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; Dica: Se você acha que seu arquivo de banco de dados pode estar corrompido ou não se lembra da chave mestra após modificá-lo, você pode tentar com a última versão do arquivo aberto com sucesso tocando em \"%1$s\" e selecionando o backup local.
+    • Dica: Se você acha que seu arquivo de banco de dados pode estar corrompido ou não se lembra da chave mestra após modificá-lo, você pode tentar com a última versão do arquivo aberto com sucesso tocando em \"%1$s\" e selecionando o backup local.
   </string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; Dica: Keepass2Android armazenou a última versão do arquivo aberto com sucesso no armazenamento interno. Você pode abri-lo tocando em \"%1$s\" e selecionando o backup local.
+    • Dica: Keepass2Android armazenou a última versão do arquivo aberto com sucesso no armazenamento interno. Você pode abri-lo tocando em \"%1$s\" e selecionando o backup local.
   </string>
   <string name="CorruptDatabaseHelp">    O arquivo está corrompido. \n
     Aqui estão algumas dicas que podem ajudar a diagnosticar o problema:\n
 
-    &#8226; Se você copiou o arquivo por USB (modo MTP), tente novamente usando uma ferramenta como MyPhoneExplorer. O MTP trunca arquivos em certos casos.\n
-    &#8226; Se você não conseguir abrir o arquivo no mesmo local em seu PC, é muito provável que o arquivo esteja realmente corrompido. Por favor, use um backup de banco de dados então. Se você presumir que Keepass2Android corrompeu o arquivo, entre em contato com a equipe de suporte.\n
-    &#8226; Se você ainda conseguir abrir o arquivo no seu PC, entre em contato com a equipe de suporte. Você pode tentar salvá-lo com configurações diferentes (por exemplo, descompactado) no PC e tentar abrir novamente no Keepass2Android.
+    • Se você copiou o arquivo por USB (modo MTP), tente novamente usando uma ferramenta como MyPhoneExplorer. O MTP trunca arquivos em certos casos.\n
+    • Se você não conseguir abrir o arquivo no mesmo local em seu PC, é muito provável que o arquivo esteja realmente corrompido. Por favor, use um backup de banco de dados então. Se você presumir que Keepass2Android corrompeu o arquivo, entre em contato com a equipe de suporte.\n
+    • Se você ainda conseguir abrir o arquivo no seu PC, entre em contato com a equipe de suporte. Você pode tentar salvá-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>
@@ -1185,4 +1184,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Configurações do teclado Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-pt/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-pt/strings.xml
index 40538cb9..034113ed 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-pt/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-pt/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -812,4 +811,6 @@ 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>
-</resources>
+<string name="english_ime_settings">Configurações de teclado Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-ro/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-ro/strings.xml
index ab6802ea..812cbe56 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-ro/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-ro/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -649,4 +648,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Setările tastaturii Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-ru/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-ru/strings.xml
index 774b00f9..9c2accbd 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-ru/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-ru/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Оставить отзыв</string>
   <string name="AboutText">Keepass2Android — это менеджер паролей, обеспечивающий полноценную работу с базами KeePass 2.x на Android.</string>
@@ -819,4 +818,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Настройки клавиатуры \"Keepass2Android\"</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-sk/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-sk/strings.xml
index 1260d37e..44f2316e 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-sk/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-sk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -843,4 +842,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Nastavenia klávesnice Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-sl/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-sl/strings.xml
index 6b6fa0ca..2041ec81 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-sl/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-sl/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -675,22 +674,22 @@
   <string name="FirstInvalidCompositeKeyError">Neveljaven sestavljen ključ! Poizkusite znova.</string>
   <string name="RepeatedInvalidCompositeKeyHelp">    Neveljaven sestavljen ključ! Za odklepanje podatkovne zbirke poizkusite z naslednjimi koraki:\n
 
-    &#8226; Prepričajte se, da ste vnesli pravilno geslo. Uporabite ikono očesa, da prikažete vneseno geslo.\n
-    &#8226;• Prepričajte se, da ste izbrali pravo vrsto gesla. Prepričajte se, da se ujema z vrsto gesla, ki ste ga uporabili ob ustvarjanju podatkovne zbirke.\n
-    &#8226;• Prepričajte se, da izbrali pravo datoteko podatkovne zbirke.
+    • Prepričajte se, da ste vnesli pravilno geslo. Uporabite ikono očesa, da prikažete vneseno geslo.\n
+    •• Prepričajte se, da ste izbrali pravo vrsto gesla. Prepričajte se, da se ujema z vrsto gesla, ki ste ga uporabili ob ustvarjanju podatkovne zbirke.\n
+    •• Prepričajte se, da izbrali pravo datoteko podatkovne zbirke.
   </string>
   <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; Namig: Če menite, da je vaš baza podatkov poškodovana ali se ne spomnite po spremembi ne spomnite glavnega gesla, lahko poskusite z odpiranjem odprte različice datoteke s klikom na \"%1$s\" in izbiro lokalne varnostne kopije.
+    • Namig: Če menite, da je vaš baza podatkov poškodovana ali se ne spomnite po spremembi ne spomnite glavnega gesla, lahko poskusite z odpiranjem odprte različice datoteke s klikom na \"%1$s\" in izbiro lokalne varnostne kopije.
   </string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; Namig: Keepass2Android je shranil zadnjo uspešno odprto različico datoteke v notranjem pomnilniku. Odprete ga lahko tako, da kliknete \"%1$s\" in izberete lokalno varnostno kopijo.
+    • Namig: Keepass2Android je shranil zadnjo uspešno odprto različico datoteke v notranjem pomnilniku. Odprete ga lahko tako, da kliknete \"%1$s\" in izberete lokalno varnostno kopijo.
   </string>
   <string name="CorruptDatabaseHelp">    Datoteka je pokvarjena. \n
     Tukaj je nekaj nasvetov, ki vam lahko pomagajo pri prepoznavanju težave:\n
     
-     &#8226; Če ste datoteko kopirali preko USB-ja (v načinu MTP), poizkusite znova z orodji, kot je npr. MyPhoneExplorer. MTP v nekaterih primerih prireže datoteke.\n
-     &#8226; Če datoteke ne morete odpreti iz istega mesta na računalniku, je zelo verjetno, da je datoteka pokvarjena. Uporabite varnostno kopijo podatkovne zbirke. Če sumite, da je datoteko pokvaril Keepass2Android, navežite stik s podporo.\n
-     &#8226; Če datoteko lahko še vedno odprete na računalniku, navežite stik s podporo. Lahko jo poizkusite na računalniku shraniti z drugačnimi nastavitvami (npr. nestisnjeno) in jo ponovno odpreti v Keepass2Androidu.
+     • Če ste datoteko kopirali preko USB-ja (v načinu MTP), poizkusite znova z orodji, kot je npr. MyPhoneExplorer. MTP v nekaterih primerih prireže datoteke.\n
+     • Če datoteke ne morete odpreti iz istega mesta na računalniku, je zelo verjetno, da je datoteka pokvarjena. Uporabite varnostno kopijo podatkovne zbirke. Če sumite, da je datoteko pokvaril Keepass2Android, navežite stik s podporo.\n
+     • Če datoteko lahko še vedno odprete na računalniku, navežite stik s podporo. Lahko jo poizkusite na računalniku shraniti z drugačnimi nastavitvami (npr. nestisnjeno) in jo ponovno odpreti v Keepass2Androidu.
 
   </string>
   <string name="open_other_db">Odpri drugo bazo podatkov …</string>
@@ -1183,4 +1182,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Nastavitve tipkovnice Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-sr/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-sr/strings.xml
index 0f61d53f..b71d3109 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-sr/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-sr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Повратне информације</string>
   <string name="AboutText">Keepass2Android је управљач лозинкама који пружа читање и уписивање у KeePass 2.x базе података на Android-у.</string>
@@ -309,4 +308,6 @@
     <item>KP2A Private/Public key</item>
     <item>Custom Private key</item>
   </string-array>
-</resources>
+<string name="english_ime_settings">Подешавања Keepass2Android тастатуре</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-sv/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-sv/strings.xml
index d9b0e85d..9c47a140 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-sv/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-sv/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -811,4 +810,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Inställningar för Keepass2Androids tangentbord</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-tr/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-tr/strings.xml
index 51295ca0..cfbd2d6d 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-tr/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-tr/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -812,4 +811,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Keepass2Android klavye ayarları</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-uk/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-uk/strings.xml
index d6db76d6..a76b735e 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-uk/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-uk/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Залишити відгук</string>
   <string name="AboutText">Keepass2Android - це менеджер паролів, який забезпечує читання/запис баз даних KeePass 2.x на Android.</string>
@@ -819,4 +818,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Налаштування клавіатури Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-vi/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-vi/strings.xml
index 39c8205e..56d39476 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-vi/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-vi/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?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>
@@ -584,4 +583,6 @@
   <string name="show_autofill_help">Xem trợ giúp về Tự động điền</string>
   <string name="autofill_sign_in_prompt">Điền vào với Keepass2Android</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>
-</resources>
+<string name="english_ime_settings">Cài đặt bàn phím Keepass2Android</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-zh-rTW/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-zh-rTW/strings.xml
index 65a1f6d1..60097d7d 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-zh-rTW/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-zh-rTW/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">意見回饋：</string>
   <string name="AboutText">Keepass2Android 是 Android 的 KeePass 2.x 密碼資料庫管理軟體。</string>
@@ -819,4 +818,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">Keepass2Android 鍵盤設定</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values-zh/strings.xml b/src/keepass2android-appSdkStyle/Resources/values-zh/strings.xml
index 4241cd9a..b558a02d 100644
--- a/src/keepass2android-appSdkStyle/Resources/values-zh/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values-zh/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">反馈</string>
   <string name="AboutText">Keepass2Android 是一款支持 Keepass 2.x 数据库读写的密码管理应用。</string>
@@ -675,22 +674,22 @@
   <string name="FirstInvalidCompositeKeyError">复合密钥无效！请重试。</string>
   <string name="RepeatedInvalidCompositeKeyHelp">    无效的数据库密钥! 请尝试以下步骤解锁你的数据库:\n
 
-    &#8226; 确保你输入了正确的密码。 使用眼睛图标揭示输入的密码。\n
-    &#8226; 确保你选择了正确的密码类型。确保此类型匹配创建数据库时所用的类型。\n
-    &#8226; 确保你选择了正确的数据库文件。
+    • 确保你输入了正确的密码。 使用眼睛图标揭示输入的密码。\n
+    • 确保你选择了正确的密码类型。确保此类型匹配创建数据库时所用的类型。\n
+    • 确保你选择了正确的数据库文件。
   </string>
   <string name="HintLocalBackupInvalidCompositeKey">    \n
-    &#8226; 提示：如果你认为数据库文件可能损坏或你更改了主密钥之后却忘记了新的主密钥，你可以试试上次成功打开的文件版本，办法：轻按 \"%1$s\" 并选择本地备份。
+    • 提示：如果你认为数据库文件可能损坏或你更改了主密钥之后却忘记了新的主密钥，你可以试试上次成功打开的文件版本，办法：轻按 \"%1$s\" 并选择本地备份。
   </string>
   <string name="HintLocalBackupOtherError">    \n
-    &#8226; 提示：Keepass2Android 已经在内部存储保存了上次成功打开的文件版本 。要打开，请轻按\"%1$s\" 并选择本地备份。
+    • 提示：Keepass2Android 已经在内部存储保存了上次成功打开的文件版本 。要打开，请轻按\"%1$s\" 并选择本地备份。
   </string>
   <string name="CorruptDatabaseHelp">    文件已损坏。\n
     以下是一些可能有助诊断问题的提示:\n
 
-    &#8226; 如果你通过 USB (MTP-Mode) 复制文件，请使用类似 MyPhoneExplorer 这样的工具重试一次。某些情况下，MTP 会截断文件。\n
-    &#8226;如果你在桌面计算机上同样打不开来自同一位置的文件，那么很有可能这个文件真的坏了。 接下去，请使用数据库备份。如果你假设 Keepass2Android 破坏了文件，请联系支持团队。\n
-    &#8226; 如果你仍可以在桌面计算机上打开文件，请联系支持团队。你可以试着用不同设置在桌面计算机上保存文件 (如，未压缩) 并在 Keepass2Android 试着重新打开它。
+    • 如果你通过 USB (MTP-Mode) 复制文件，请使用类似 MyPhoneExplorer 这样的工具重试一次。某些情况下，MTP 会截断文件。\n
+    •如果你在桌面计算机上同样打不开来自同一位置的文件，那么很有可能这个文件真的坏了。 接下去，请使用数据库备份。如果你假设 Keepass2Android 破坏了文件，请联系支持团队。\n
+    • 如果你仍可以在桌面计算机上打开文件，请联系支持团队。你可以试着用不同设置在桌面计算机上保存文件 (如，未压缩) 并在 Keepass2Android 试着重新打开它。
 
   </string>
   <string name="open_other_db">打开另一个数据库…</string>
@@ -892,4 +891,6 @@
   <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>
-</resources>
+<string name="english_ime_settings">键盘设置</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/Resources/values/strings.xml b/src/keepass2android-appSdkStyle/Resources/values/strings.xml
index 876b43c1..5301473e 100644
--- a/src/keepass2android-appSdkStyle/Resources/values/strings.xml
+++ b/src/keepass2android-appSdkStyle/Resources/values/strings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.net-->
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
   <string name="about_feedback">Feedback</string>
   <string name="AboutText">Keepass2Android is a password manager providing read/write access to KeePass 2.x databases on Android.</string>
@@ -678,25 +677,25 @@
   <string name="RepeatedInvalidCompositeKeyHelp">
     Invalid composite key! Please try the following steps to unlock your database:\n
 
-    &#8226; Make sure you have entered the correct password. Use the eye icon to reveal the entered password.\n
-    &#8226; Make sure you have selected the correct password type. Make sure this matches the type used when creating the database.\n
-    &#8226; Make sure you have selected the correct database file.
+    • Make sure you have entered the correct password. Use the eye icon to reveal the entered password.\n
+    • Make sure you have selected the correct password type. Make sure this matches the type used when creating the database.\n
+    • Make sure you have selected the correct database file.
   </string>
   <string name="HintLocalBackupInvalidCompositeKey">
     \n
-    &#8226; Hint: If you think your database file might be corrupt or you do not remember the master key after modifying it, you can try with the last successfully opened file version by tapping "%1$s" and selecting the local backup.
+    • Hint: If you think your database file might be corrupt or you do not remember the master key after modifying it, you can try with the last successfully opened file version by tapping "%1$s" and selecting the local backup.
   </string>
   <string name="HintLocalBackupOtherError">
     \n
-    &#8226; Hint: Keepass2Android has stored the last successfully opened file version on internal storage. You can open it by tapping "%1$s" and selecting the local backup.
+    • Hint: Keepass2Android has stored the last successfully opened file version on internal storage. You can open it by tapping "%1$s" and selecting the local backup.
   </string>
   <string name="CorruptDatabaseHelp">
     File is corrupted. \n
     Here are some hints which might help to diagnose the issue:\n
 
-    &#8226; If you copied the file over USB (MTP-Mode), please try again using a tool like MyPhoneExplorer. MTP truncates files in certain cases.\n
-    &#8226; If you cannot open the file from the same location on your PC, it is very likely that the file is actually corrupted. Please use a database backup then. If you assume that Keepass2Android has corrupted the file, please contact the support team.\n
-    &#8226; If you can still open the file on your PC, please contact the support team. You might try to save it with different settings (e.g. unzipped) on the PC and retry to open in Keepass2Android.
+    • If you copied the file over USB (MTP-Mode), please try again using a tool like MyPhoneExplorer. MTP truncates files in certain cases.\n
+    • If you cannot open the file from the same location on your PC, it is very likely that the file is actually corrupted. Please use a database backup then. If you assume that Keepass2Android has corrupted the file, please contact the support team.\n
+    • If you can still open the file on your PC, please contact the support team. You might try to save it with different settings (e.g. unzipped) on the PC and retry to open in Keepass2Android.
 
   </string>
   <string name="open_other_db">Open another database…</string>
@@ -1232,4 +1231,6 @@
   <string name="AutofillWarning_trustAsBrowser">Accept always in "%1$s"</string>
   <string name="kp2a_switch_on_sendgodone">Switch back when done</string>
   <string name="kp2a_switch_on_sendgodone_summary">Switch back when pressing send/go/done</string>
-</resources>
+<string name="english_ime_settings">Android keyboard settings</string>
+    
+    </resources>
\ No newline at end of file
diff --git a/src/keepass2android-appSdkStyle/keepass2android-appSdkStyle.csproj b/src/keepass2android-appSdkStyle/keepass2android-appSdkStyle.csproj
index 8171cd97..11ed0444 100644
--- a/src/keepass2android-appSdkStyle/keepass2android-appSdkStyle.csproj
+++ b/src/keepass2android-appSdkStyle/keepass2android-appSdkStyle.csproj
@@ -740,6 +740,7 @@
     <PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1.10" />
     <PackageReference Include="Xamarin.Google.Android.Material" Version="1.11.0.3" />
     <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.5.0.2" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AndroidFileChooserBindingSdkStyle\AndroidFileChooserBindingSdkStyle.csproj" />