Merge branch 'release/2.5.0.0beta18'

Currently translated at 33.7% (110 of 326 strings)

Translation: KeePass DX/Strings
Translate-URL: https://hosted.weblate.org/projects/keepass-dx/strings/he/

CHANGELOG

@@ -1,4 +1,13 @@
-KeepassDX (2.5.0.0beta16)
+KeepassDX (2.5.0.0beta18)
+ * New recent databases views
+ * New information dialog
+ * Custom fields for the Magikeyboard
+ * Timeout for the Magikeyboard
+ * Long press for keyboard selection
+ * Fix memory when opening the database
+ * Memory management for attachments
+
+KeepassDX (2.5.0.0beta17)
  * Fix font and search
 
 KeepassDX (2.5.0.0beta16)

FAQ.md

@@ -1,55 +0,0 @@
-# F.A.Q.
-
-## Why KeePass DX?
-
-KeePass DX is an **Android password manager** implemented from Keepass password manager.
-
-KeePass DX was created to meet the security and usability needs of a KeePass application on Android :
-
- - To be easy to use with **secure password management and form filling tools**.
- - To use only tools under **open source license** to guarantee the security of the application (With [open source store](https://f-droid.org/en/) and no closed API).
- - To be in a **native langage** (java) for weight, security and a better integration of the application.
- - To respect **Android design, architecture and ergonomic**.
-
-## What makes KeePass DX stand out from other password managers?
-
- - We **do not recover your sensitive data** on a private server or a closed cloud, you have control of your passwords.
- - We respect **KeePass file standards** to maintain compatibility and data porting on different devices (computers and portable devices with different operating system).
- - The code is **open source**, which implies increased **security**, you can check how the encryption algorithms are implemented.
- - We remain attentive to **your needs** and we can even integrate the features that you have defined.
- - We **do not put advertising** even in the free version.
-
-## How am I sure my passwords are safely stored on the application?
-
-- We allow users to save and use passwords, keys and digital identities in a secure way by **integrating the last encryption algorithms** and **Android architecture standards**.
-- You can increase the security of your database by increasing the rounds of encryption keys. *(In Settings -> Database Settings when your database is open)* **Warning**: *Increase the number of rounds sparingly to have a reasonable opening time.*
-
-## Can I store my data on a cloud storage?
-
-**Yes** this is possible. Otherwise, we **recommend using cloud with personal server and open source license**, like [NextCloud](https://f-droid.org/en/packages/com.nextcloud.client/) to be sure how your databases are stored.
-
-## Can I recover my passwords on another device if I loose my main device?
-
-**Yes** you can, but you **must first save the .kdb or .kdbx file from your database to an external storage** *(like a hardrive or a cloud)*.
-We recommend you save your data after each modification so incase you loose your android device you could retrieve the data and import it into the new KeePass DX installed on the new android device. 
-
-## Why are updates not available at the same time on all stores?
-
-- **PlayStore** only needs an APK generated and manually signed to be available on the store, it usually takes **20 minutes** to be available because it is deployed with fastlane. But the management of the APK and its data by the google servers is obscure.
-- **F-Droid**, to **ensure that the code is open source**, checks the sources directly on git repository (by checking the presence of new tags) and builds itself the APK that the server signs during the compilation of code and dependencies. Updating the project will take **1-10 days** for F-Droid to analyze all available repositories, build sources and deploy the generated APK. So F-Droid is slower for deployment but it is run by **volunteers** and guaranteed a **clean APK**. :)
-
-## Why not an online version?
-
-The offline and online client concepts only exists with Keepass2Android because the file access network tools are directly integrated into the code of the main application. Which is a very dubious choice knowing that **it is not normally the purpose of a password management application to take care of external file synchronization on clouds** (which can be under closed licensed and recover your data base), it is rather the purpose of the [file management application](https://developer.android.com/guide/topics/providers/document-provider).
-
-## Can I open my database easily other than with a password?
-
-**Yes**, we have integrated a secure openning option of fingerprint for android devices that support this feature, so no one can access the application without scanning his/her fingerprint or fill a master key.
-
-## Can I open my database without my master key (master password and/or key file)?
-
-**No**, you can not open a database file without the master password (and / or) the associated key file. Be sure to remember your master password and save the key file in a safe place.
-
-## Can I suggest features and report bugs for the application?
-**Yes**, we welcome this you could go ahead and do that on our github: 
-https://github.com/Kunzisoft/KeePassDX

ReadMe.md

@@ -53,7 +53,7 @@ You can contribute in different ways to help us on our work.
 	
 ## F.A.Q.
 
-Other questions? You can read the [F.A.Q.](https://github.com/Kunzisoft/KeePassDX/blob/master/FAQ.md) 
+Other questions? You can read the [F.A.Q.](https://www.keepassdx.com/FAQ) 
 	
 ## Other devices
 
@@ -67,7 +67,7 @@ Other questions? You can read the [F.A.Q.](https://github.com/Kunzisoft/KeePassD
 
  This file is part of KeePass DX.
 
-  KeePass DX is free software: you can redistribute it and/or modify
+  [KeePass DX](https://www.keepassdx.com) is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.2'
 
     defaultConfig {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode = 17
+        versionCode = 18
-        versionName = "2.5.0.0beta17"
+        versionName = "2.5.0.0beta18"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"
@@ -39,7 +39,7 @@ android {
     productFlavors {
         libre {
             applicationIdSuffix = ".libre"
-            versionNameSuffix "-libre"
+            buildConfigField "String", "BUILD_VERSION", "\"libre\""
             buildConfigField "boolean", "FULL_VERSION", "true"
             buildConfigField "boolean", "CLOSED_STORE", "false"
             buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
@@ -48,7 +48,7 @@ android {
         }
         pro {
             applicationIdSuffix = ".pro"
-            versionNameSuffix "-pro"
+            buildConfigField "String", "BUILD_VERSION", "\"pro\""
             buildConfigField "boolean", "FULL_VERSION", "true"
             buildConfigField "boolean", "CLOSED_STORE", "true"
             buildConfigField "String[]", "STYLES_DISABLED", "{}"
@@ -56,7 +56,7 @@ android {
         }
         free {
             applicationIdSuffix = ".free"
-            versionNameSuffix "-free"
+            buildConfigField "String", "BUILD_VERSION", "\"free\""
             buildConfigField "boolean", "FULL_VERSION", "false"
             buildConfigField "boolean", "CLOSED_STORE", "true"
             buildConfigField "String[]", "STYLES_DISABLED", "{\"KeepassDXStyle_Dark\",\"KeepassDXStyle_Blue\",\"KeepassDXStyle_Red\",\"KeepassDXStyle_Purple\"}"
@@ -103,13 +103,14 @@ dependencies {
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionDispatcherVersion"
     // Apache Commons Collections
     implementation 'commons-collections:commons-collections:3.2.1'
+    implementation 'org.apache.commons:commons-io:1.3.2'
     // Base64
     implementation 'biz.source_code:base64coder:2010-12-19'
+    // IO-Extras
+    implementation 'com.github.davidmoten:io-extras:0.1'
     implementation 'com.google.code.gson:gson:2.8.4'
     implementation 'com.google.guava:guava:23.0-android'
-    // Icon pack, classic for all, material for libre and pro
+    // Icon pack
     implementation project(path: ':icon-pack-classic')
     implementation project(path: ':icon-pack-material')
-    implementation project(path: ':magikeyboard')
-    implementation project(path: ':keepass-model')
 }

app/src/main/AndroidManifest.xml

@@ -20,8 +20,7 @@
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup"
         android:backupAgent="com.kunzisoft.keepass.backup.SettingsBackupAgent"
-        android:theme="@style/KeepassDXStyle.Night"
+        android:theme="@style/KeepassDXStyle.Night">
-        tools:replace="android:theme">
         <!-- TODO backup API Key -->
         <meta-data
             android:name="com.google.android.backup.api_key"
@@ -132,7 +131,22 @@
         <activity android:name="com.kunzisoft.keepass.selection.EntrySelectionAuthActivity"
             android:configChanges="orientation|keyboardHidden" />
         <activity android:name="com.kunzisoft.keepass.settings.SettingsAutofillActivity" />
+        <activity android:name="com.kunzisoft.keepass.magikeyboard.EntryRetrieverActivity"
+            android:label="@string/keyboard_name">
+        </activity>
+        <activity android:name="com.kunzisoft.keepass.settings.MagikIMESettings"
+            android:label="@string/keyboard_setting_label">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
 
+
+        <!-- Receiver for Keyboard -->
+        <receiver
+            android:name="com.kunzisoft.keepass.magikeyboard.receiver.NotificationDeleteBroadcastReceiver"
+            android:exported="false" >
+        </receiver>
         <service
             android:name="com.kunzisoft.keepass.notifications.NotificationCopyingService"
             android:enabled="true"
@@ -149,6 +163,17 @@
                 <action android:name="android.service.autofill.AutofillService" />
             </intent-filter>
         </service>
+        <service
+            android:name="com.kunzisoft.keepass.magikeyboard.MagikIME"
+            android:label="@string/keyboard_label"
+            android:permission="android.permission.BIND_INPUT_METHOD" >
+            <meta-data android:name="android.view.im"
+                android:resource="@xml/keyboard_method"/>
+            <intent-filter>
+                <action android:name="android.view.InputMethod" />
+            </intent-filter>
+        </service>
+        <service android:name="com.kunzisoft.keepass.magikeyboard.KeyboardEntryNotificationService" />
 
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
     </application>

app/src/main/java/com/kunzisoft/keepass/activities/AboutActivity.java

@@ -19,7 +19,6 @@
  */
 package com.kunzisoft.keepass.activities;
 
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
@@ -27,6 +26,7 @@ import android.util.Log;
 import android.view.MenuItem;
 import android.widget.TextView;
 
+import com.kunzisoft.keepass.BuildConfig;
 import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.stylish.StylishActivity;
 
@@ -40,7 +40,7 @@ public class AboutActivity extends StylishActivity {
 
         setContentView(R.layout.about);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         toolbar.setTitle(getString(R.string.menu_about));
         setSupportActionBar(toolbar);
         assert getSupportActionBar() != null;
@@ -48,18 +48,25 @@ public class AboutActivity extends StylishActivity {
         getSupportActionBar().setDisplayShowHomeEnabled(true);
 
         String version;
+        String build;
         try {
-            PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+            version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
-            version = packageInfo.versionName;
+            build = BuildConfig.BUILD_VERSION;
         } catch (NameNotFoundException e) {
-            Log.w(getClass().getSimpleName(), "Unable to get application version", e);
+            Log.w(getClass().getSimpleName(), "Unable to get the app or the build version", e);
-            version = "Unable to get application version.";
+            version = "Unable to get the app version";
+            build = "Unable to get the build version";
         }
-        version = getString(R.string.version_label) + " " + version;
+        version = getString(R.string.version_label, version);
-        TextView versionText = (TextView) findViewById(R.id.activity_about_version);
+        TextView versionTextView = findViewById(R.id.activity_about_version);
-        versionText.setText(version);
+        versionTextView.setText(version);
 
-        TextView disclaimerText = (TextView) findViewById(R.id.disclaimer);
+        build = getString(R.string.build_label, build);
+        TextView buildTextView = findViewById(R.id.activity_about_build);
+        buildTextView.setText(build);
+
+
+        TextView disclaimerText = findViewById(R.id.disclaimer);
         disclaimerText.setText(getString(R.string.disclaimer_formal, new DateTime().getYear()));
     }
 

app/src/main/java/com/kunzisoft/keepass/app/App.java

@@ -92,7 +92,7 @@ public class App extends MultiDexApplication {
 	@Override
 	public void onTerminate() {
 		if ( db != null ) {
-			db.clear();
+			db.clear(getApplicationContext());
 		}
 		super.onTerminate();
 	}

app/src/main/java/com/kunzisoft/keepass/database/BinaryPool.java

@@ -51,6 +51,8 @@ public class BinaryPool {
 	}
 
 	public void clear() {
+		for (Entry<Integer, ProtectedBinary> entry: pool.entrySet())
+			entry.getValue().clear();
 		pool.clear();
 	}
 
@@ -63,30 +65,36 @@ public class BinaryPool {
 		@Override
 		public boolean operate(PwEntryV4 entry) {
 			for (PwEntryV4 histEntry : entry.getHistory()) {
-				poolAdd(histEntry.getBinaries());
+				add(histEntry.getBinaries());
 			}
-			poolAdd(entry.getBinaries());
+			add(entry.getBinaries());
 			return true;
 		}
 		
 	}
 	
-	private void poolAdd(Map<String, ProtectedBinary> dict) {
+	private void add(Map<String, ProtectedBinary> dict) {
 		for (ProtectedBinary pb : dict.values()) {
-			poolAdd(pb);
+			add(pb);
 		}
 		
 	}
 	
-	public void poolAdd(ProtectedBinary pb) {
+	public void add(ProtectedBinary pb) {
-		assert(pb != null);
+        assert(pb != null);
+		if (findKey(pb) != -1) return;
 		
-		if (poolFind(pb) != -1) return;
+		pool.put(findUnusedKey(), pb);
-		
-		pool.put(pool.size(), pb);
 	}
+
+	public int findUnusedKey() {
+	    int unusedKey = pool.size();
+	    while(get(unusedKey) != null)
+            unusedKey++;
+	    return unusedKey;
+    }
 	
-	public int poolFind(ProtectedBinary pb) {
+	public int findKey(ProtectedBinary pb) {
 		for (Entry<Integer, ProtectedBinary> pair : pool.entrySet()) {
 			if (pair.getValue().equals(pb)) return pair.getKey();
 		}

app/src/main/java/com/kunzisoft/keepass/database/Database.java

@@ -39,6 +39,8 @@ import com.kunzisoft.keepass.icons.IconDrawableFactory;
 import com.kunzisoft.keepass.tasks.ProgressTaskUpdater;
 import com.kunzisoft.keepass.utils.UriUtil;
 
+import org.apache.commons.io.FileUtils;
+
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -58,7 +60,7 @@ public class Database {
 
     private static final String TAG = Database.class.getName();
 
-    private PwDatabase pm;
+    private PwDatabase pwDatabase;
     private Uri mUri;
     private SearchDbHelper searchHelper;
     private boolean readOnly = false;
@@ -69,11 +71,11 @@ public class Database {
     private boolean loaded = false;
 
     public PwDatabase getPwDatabase() {
-        return pm;
+        return pwDatabase;
     }
 
     public void setPwDatabase(PwDatabase pm) {
-        this.pm = pm;
+        this.pwDatabase = pm;
     }
 
     public void setUri(Uri mUri) {
@@ -151,24 +153,25 @@ public class Database {
         // We'll end up reading 8 bytes to identify the header. Might as well use two extra.
         bis.mark(10);
 
-        Importer databaseImporter = ImporterFactory.createImporter(bis, debug);
+        // Get the file directory to save the attachments
+        Importer databaseImporter = ImporterFactory.createImporter(bis, ctx.getFilesDir(), debug);
 
         bis.reset();  // Return to the start
 
-        pm = databaseImporter.openDatabase(bis, password, keyFileInputStream, progressTaskUpdater);
+        pwDatabase = databaseImporter.openDatabase(bis, password, keyFileInputStream, progressTaskUpdater);
-        if ( pm != null ) {
+        if ( pwDatabase != null ) {
             try {
-                switch (pm.getVersion()) {
+                switch (pwDatabase.getVersion()) {
                     case V3:
-                        PwGroupV3 rootV3 = ((PwDatabaseV3) pm).getRootGroup();
+                        PwGroupV3 rootV3 = ((PwDatabaseV3) pwDatabase).getRootGroup();
-                        ((PwDatabaseV3) pm).populateGlobals(rootV3);
+                        ((PwDatabaseV3) pwDatabase).populateGlobals(rootV3);
-                        passwordEncodingError = !pm.validatePasswordEncoding(password);
+                        passwordEncodingError = !pwDatabase.validatePasswordEncoding(password);
                         searchHelper = new SearchDbHelper.SearchDbHelperV3(ctx);
                         break;
                     case V4:
-                        PwGroupV4 rootV4 = ((PwDatabaseV4) pm).getRootGroup();
+                        PwGroupV4 rootV4 = ((PwDatabaseV4) pwDatabase).getRootGroup();
-                        ((PwDatabaseV4) pm).populateGlobals(rootV4);
+                        ((PwDatabaseV4) pwDatabase).populateGlobals(rootV4);
-                        passwordEncodingError = !pm.validatePasswordEncoding(password);
+                        passwordEncodingError = !pwDatabase.validatePasswordEncoding(password);
                         searchHelper = new SearchDbHelper.SearchDbHelperV4(ctx);
                         break;
                 }
@@ -187,11 +190,11 @@ public class Database {
     public PwGroup search(String str, int max) {
         if (searchHelper == null) { return null; }
         try {
-            switch (pm.getVersion()) {
+            switch (pwDatabase.getVersion()) {
                 case V3:
-                    return ((SearchDbHelper.SearchDbHelperV3) searchHelper).search(((PwDatabaseV3) pm), str, max);
+                    return ((SearchDbHelper.SearchDbHelperV3) searchHelper).search(((PwDatabaseV3) pwDatabase), str, max);
                 case V4:
-                    return ((SearchDbHelper.SearchDbHelperV4) searchHelper).search(((PwDatabaseV4) pm), str, max);
+                    return ((SearchDbHelper.SearchDbHelperV4) searchHelper).search(((PwDatabaseV4) pwDatabase), str, max);
             }
         } catch (Exception e) {
             Log.e(TAG, "Search can't be performed with this SearchHelper", e);
@@ -261,7 +264,7 @@ public class Database {
             FileOutputStream fos = null;
             try {
                 fos = new FileOutputStream(tempFile);
-                PwDbOutput pmo = PwDbOutput.getInstance(pm, fos);
+                PwDbOutput pmo = PwDbOutput.getInstance(pwDatabase, fos);
                 if (pmo != null)
                     pmo.output();
             } catch (Exception e) {
@@ -289,7 +292,7 @@ public class Database {
             OutputStream os = null;
             try {
                 os = ctx.getContentResolver().openOutputStream(uri);
-                PwDbOutput pmo = PwDbOutput.getInstance(pm, os);
+                PwDbOutput pmo = PwDbOutput.getInstance(pwDatabase, os);
                 if (pmo != null)
                     pmo.output();
             } catch (Exception e) {
@@ -304,10 +307,19 @@ public class Database {
     }
 
     // TODO Clear database when lock broadcast is receive in backstage
-    public void clear() {
+    public void clear(Context context) {
         drawFactory.clearCache();
+        // Delete the cache of the database if present
+        if (pwDatabase != null)
+            pwDatabase.clearCache();
+        // In all cases, delete all the files in the temp dir
+        try {
+            FileUtils.cleanDirectory(context.getFilesDir());
+        } catch (IOException e) {
+            Log.e(TAG, "Unable to clear the directory cache.", e);
+        }
 
-        pm = null;
+        pwDatabase = null;
         mUri = null;
         loaded = false;
         passwordEncodingError = false;
@@ -545,7 +557,7 @@ public class Database {
                 case V4:
                     newPwGroup = new PwGroupV4((PwGroupV4) parent);
             }
-            newPwGroup.setId(pm.newGroupId());
+            newPwGroup.setId(pwDatabase.newGroupId());
         } catch (Exception e) {
             Log.e(TAG, "This version of PwGroup can't be created", e);
         }

app/src/main/java/com/kunzisoft/keepass/database/PwDatabase.java

@@ -21,7 +21,7 @@ package com.kunzisoft.keepass.database;
 
 import com.kunzisoft.keepass.database.exception.InvalidKeyFileException;
 import com.kunzisoft.keepass.database.exception.KeyFileEmptyException;
-import com.kunzisoft.keepass.utils.Util;
+import com.kunzisoft.keepass.utils.MemUtil;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -128,7 +128,7 @@ public abstract class PwDatabase<PwGroupDB extends PwGroup<PwGroupDB, PwEntryDB>
                 assert(keyInputStream != null);
 
                 ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                Util.copyStream(keyInputStream, bos);
+                MemUtil.copyStream(keyInputStream, bos);
                 byte[] keyData = bos.toByteArray();
 
                 ByteArrayInputStream bis = new ByteArrayInputStream(keyData);
@@ -430,4 +430,6 @@ public abstract class PwDatabase<PwGroupDB extends PwGroup<PwGroupDB, PwEntryDB>
      */
     public abstract void initNew(String dbPath);
 
+    public abstract void clearCache();
+
 }

app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV3.java

@@ -376,4 +376,7 @@ public class PwDatabaseV3 extends PwDatabase<PwGroupV3, PwEntryV3> {
 		
 		return !(omitBackup && isBackup(group));
 	}
+
+	@Override
+	public void clearCache() {}
 }

app/src/main/java/com/kunzisoft/keepass/database/PwDatabaseV4.java

@@ -754,4 +754,8 @@ public class PwDatabaseV4 extends PwDatabase<PwGroupV4, PwEntryV4> {
 		return filename.substring(0, lastExtDot);
 	}
 
+    @Override
+    public void clearCache() {
+        binPool.clear();
+    }
 }

app/src/main/java/com/kunzisoft/keepass/database/PwEntryV4.java

@@ -93,8 +93,7 @@ public class PwEntryV4 extends PwEntry<PwGroupV4> implements ITimeLogger {
 		parentGroupLastMod = in.readParcelable(PwDate.class.getClassLoader());
 		customData = MemUtil.readStringParcelableMap(in);
 		fields = in.readParcelable(ExtraFields.class.getClassLoader());
-		// TODO binaries takes too much memory for parcelable
+		binaries = MemUtil.readStringParcelableMap(in, ProtectedBinary.class);
-		// binaries = MemUtil.readStringParcelableMap(in, ProtectedBinary.class);
 		foregroundColor = in.readString();
 		backgroupColor = in.readString();
 		overrideURL = in.readString();

app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.java

@@ -74,7 +74,7 @@ public class LoadDatabaseRunnable extends RunnableOnFinish {
             catchError(e, R.string.error_arc4);
             return;
         } catch (InvalidPasswordException e) {
-            catchError(e, R.string.InvalidPassword);
+            catchError(e, R.string.invalid_password);
             return;
         } catch (ContentFileNotFoundException e) {
             catchError(e, R.string.file_not_found_content);

app/src/main/java/com/kunzisoft/keepass/database/load/ImporterFactory.java

@@ -24,15 +24,16 @@ import com.kunzisoft.keepass.database.PwDbHeaderV4;
 import com.kunzisoft.keepass.database.exception.InvalidDBSignatureException;
 import com.kunzisoft.keepass.stream.LEDataInputStream;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
 public class ImporterFactory {
-	public static Importer createImporter(InputStream is) throws InvalidDBSignatureException, IOException {
+	public static Importer createImporter(InputStream is, File streamDir) throws InvalidDBSignatureException, IOException {
-		return createImporter(is, false);
+		return createImporter(is, streamDir,false);
 	}
 
-	public static Importer createImporter(InputStream is, boolean debug) throws InvalidDBSignatureException, IOException {
+	public static Importer createImporter(InputStream is, File streamDir, boolean debug) throws InvalidDBSignatureException, IOException {
 		int sig1 = LEDataInputStream.readInt(is);
 		int sig2 = LEDataInputStream.readInt(is);
 		
@@ -43,7 +44,7 @@ public class ImporterFactory {
 			
 			return new ImporterV3();
 		} else if ( PwDbHeaderV4.matchesHeader(sig1, sig2) ) {
-			return new ImporterV4();
+			return new ImporterV4(streamDir);
 		}
 
 		throw new InvalidDBSignatureException();

app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java

@@ -156,7 +156,7 @@ public class ImporterV3 extends Importer {
 		}
 
 		if (progressTaskUpdater != null)
-            progressTaskUpdater.updateMessage(R.string.creating_db_key);
+            progressTaskUpdater.updateMessage(R.string.retrieving_db_key);
 		databaseToOpen = createDB();
 		databaseToOpen.retrieveMasterKey(password, kfIs);
 

app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java

@@ -54,6 +54,8 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -62,10 +64,8 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Stack;
-import java.util.TimeZone;
 import java.util.UUID;
 import java.util.zip.GZIPInputStream;
 
@@ -80,12 +80,11 @@ public class ImporterV4 extends Importer {
 	private PwDatabaseV4 db;
 
     private byte[] hashOfHeader = null;
-	private byte[] pbHeader = null;
 	private long version;
-	Calendar utcCal;
+	private File streamDir;
 
-	public ImporterV4() {
+	public ImporterV4(File streamDir) {
-		utcCal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+        this.streamDir = streamDir;
 	}
 
 	@Override
@@ -101,7 +100,7 @@ public class ImporterV4 extends Importer {
             InvalidDBException {
 
 		if (progressTaskUpdater != null)
-			progressTaskUpdater.updateMessage(R.string.creating_db_key);
+			progressTaskUpdater.updateMessage(R.string.retrieving_db_key);
 		db = new PwDatabaseV4();
 		
 		PwDbHeaderV4 header = new PwDbHeaderV4(db);
@@ -111,7 +110,7 @@ public class ImporterV4 extends Importer {
         version = header.getVersion();
 
 		hashOfHeader = hh.hash;
-		pbHeader = hh.header;
+		byte[] pbHeader = hh.header;
 
 		db.retrieveMasterKey(password, keyInputStream);
 		db.makeFinalKey(header.masterSeed);
@@ -185,7 +184,6 @@ public class ImporterV4 extends Importer {
 		}
 		
 		if ( header.innerRandomStreamKey == null ) {
-			assert(false);
 			throw new IOException("Invalid stream key.");
 		}
 		
@@ -212,7 +210,10 @@ public class ImporterV4 extends Importer {
 		while(true) {
 			if (!ReadInnerHeader(lis, header)) break;
 		}
+	}
 
+	private String getUnusedCacheFileName() {
+		return String.valueOf(db.getBinPool().findUnusedKey());
 	}
 
 	private boolean ReadInnerHeader(LEDataInputStream lis, PwDbHeaderV4 header) throws IOException {
@@ -223,7 +224,8 @@ public class ImporterV4 extends Importer {
 
 		byte[] data = new byte[0];
 		if (size > 0) {
-			data = lis.readBytes(size);
+		    if (fieldId != PwDbHeaderV4.PwDbInnerHeaderV4Fields.Binary)
+			    data = lis.readBytes(size);
 		}
 
 		boolean result = true;
@@ -238,22 +240,20 @@ public class ImporterV4 extends Importer {
 			    header.innerRandomStreamKey = data;
 				break;
 			case PwDbHeaderV4.PwDbInnerHeaderV4Fields.Binary:
-			    if (data.length < 1) throw new IOException("Invalid binary format");
+                byte flag = lis.readBytes(1)[0];
-				byte flag = data[0];
+                boolean protectedFlag = (flag & PwDbHeaderV4.KdbxBinaryFlags.Protected) !=
-				boolean prot = (flag & PwDbHeaderV4.KdbxBinaryFlags.Protected) !=
+                        PwDbHeaderV4.KdbxBinaryFlags.None;
-						PwDbHeaderV4.KdbxBinaryFlags.None;
+                int byteLength = size - 1;
-
+                // Read in a file
-				byte[] bin = new byte[data.length - 1];
+                File file = new File(streamDir, getUnusedCacheFileName());
-				System.arraycopy(data, 1, bin, 0, data.length-1);
+				try (FileOutputStream outputStream = new FileOutputStream(file)) {
-				ProtectedBinary pb = new ProtectedBinary(prot, bin);
+					lis.readBytes(byteLength, outputStream::write);
-				db.getBinPool().poolAdd(pb);
-
-				if (prot) {
-					Arrays.fill(data, (byte)0);
 				}
+                ProtectedBinary protectedBinary = new ProtectedBinary(protectedFlag, file, byteLength);
+				db.getBinPool().add(protectedBinary);
 				break;
+
 			default:
-				assert(false);
 				break;
 		}
 
@@ -289,9 +289,9 @@ public class ImporterV4 extends Importer {
 	}
 
     private static final long DEFAULT_HISTORY_DAYS = 365;
-	
+
 	private boolean readNextNode = true;
-	private Stack<PwGroupV4> ctxGroups = new Stack<PwGroupV4>();
+	private Stack<PwGroupV4> ctxGroups = new Stack<>();
 	private PwGroupV4 ctxGroup = null;
 	private PwEntryV4 ctxEntry = null;
 	private String ctxStringName = null;
@@ -337,7 +337,7 @@ public class ImporterV4 extends Importer {
 		ctxGroups.clear();
 		
 		KdbContext ctx = KdbContext.Null;
-		
+
 		readNextNode = true;
 		
 		while (true) {
@@ -348,20 +348,17 @@ public class ImporterV4 extends Importer {
 			}
 			
 			switch ( xpp.getEventType() ) {
-			case XmlPullParser.START_TAG:
+				case XmlPullParser.START_TAG:
-				ctx = ReadXmlElement(ctx, xpp);
+					ctx = ReadXmlElement(ctx, xpp);
-				break;
+					break;
-				
-			case XmlPullParser.END_TAG:
-				ctx = EndXmlElement(ctx, xpp);
-				break;
 
-			default:
+				case XmlPullParser.END_TAG:
-				assert(false);
+					ctx = EndXmlElement(ctx, xpp);
-				break;
+					break;
-					
+
+				default:
+					break;
 			}
-			
 		}
 		
 		// Error checks
@@ -533,8 +530,8 @@ public class ImporterV4 extends Importer {
 			
 		case Root:
 			if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemGroup) ) {
-				assert(ctxGroups.size() == 0);
+				if ( ctxGroups.size() != 0 )
-				if ( ctxGroups.size() != 0 ) throw new IOException("Group list should be empty.");
+					throw new IOException("Group list should be empty.");
 				
 				db.setRootGroup(new PwGroupV4());
 				ctxGroups.push(db.getRootGroup());
@@ -633,8 +630,6 @@ public class ImporterV4 extends Importer {
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemCustomData)) {
 				return SwitchContext(ctx, KdbContext.EntryCustomData, xpp);
 			} else if ( name.equalsIgnoreCase(PwDatabaseV4XML.ElemHistory) ) {
-				assert(!entryInHistory);
-				
 				if ( ! entryInHistory ) {
 					ctxHistoryBase = ctxEntry;
 					return SwitchContext(ctx, KdbContext.EntryHistory, xpp);
@@ -774,8 +769,8 @@ public class ImporterV4 extends Importer {
 	}
 
 	private KdbContext EndXmlElement(KdbContext ctx, XmlPullParser xpp) throws XmlPullParserException {
-		assert(xpp.getEventType() == XmlPullParser.END_TAG);
+		// (xpp.getEventType() == XmlPullParser.END_TAG);
-		
+
 		String name = xpp.getName();
 		if ( ctx == KdbContext.KeePassFile && name.equalsIgnoreCase(PwDatabaseV4XML.ElemDocNode) ) {
 			return KdbContext.Null;
@@ -792,7 +787,7 @@ public class ImporterV4 extends Importer {
 				PwIconCustom icon = new PwIconCustom(customIconID, customIconData);
 				db.addCustomIcon(icon);
 				db.getIconFactory().put(icon);
-			} else assert(false);
+			}
 			
 			customIconID = PwDatabase.UUID_ZERO;
 			customIconData = null;
@@ -805,7 +800,7 @@ public class ImporterV4 extends Importer {
 		} else if ( ctx == KdbContext.CustomDataItem && name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem) ) {
 			if ( customDataKey != null && customDataValue != null) {
 				db.putCustomData(customDataKey, customDataValue);
-			} else assert(false);
+			}
 			
 			customDataKey = null;
 			customDataValue = null;
@@ -832,8 +827,6 @@ public class ImporterV4 extends Importer {
 		} else if ( ctx == KdbContext.GroupCustomDataItem && name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem)) {
 			if (groupCustomDataKey != null && groupCustomDataValue != null) {
 				ctxGroup.putCustomData(groupCustomDataKey, groupCustomDataKey);
-			} else {
-				assert(false);
 			}
 
 			groupCustomDataKey = null;
@@ -879,8 +872,6 @@ public class ImporterV4 extends Importer {
 		} else if ( ctx == KdbContext.EntryCustomDataItem && name.equalsIgnoreCase(PwDatabaseV4XML.ElemStringDictExItem)) {
 			if (entryCustomDataKey != null && entryCustomDataValue != null) {
 				ctxEntry.putCustomData(entryCustomDataKey, entryCustomDataValue);
-			} else {
-				assert(false);
 			}
 
 			entryCustomDataKey = null;
@@ -896,8 +887,6 @@ public class ImporterV4 extends Importer {
 			ctxDeletedObject = null;
 			return KdbContext.RootDeletedObjects;
 		} else {
-			assert(false);
-
 			String contextName = "";
 			if (ctx != null) {
 				contextName = ctx.name();
@@ -943,35 +932,24 @@ public class ImporterV4 extends Importer {
 	}
 
 	private void ReadUnknown(XmlPullParser xpp) throws XmlPullParserException, IOException {
-		assert(false);
-		
 		if ( xpp.isEmptyElementTag() ) return;
-		
+
-		String unknownName = xpp.getName();
 		ProcessNode(xpp);
-		
 		while (xpp.next() != XmlPullParser.END_DOCUMENT ) {
 			if ( xpp.getEventType() == XmlPullParser.END_TAG ) break;
 			if ( xpp.getEventType() == XmlPullParser.START_TAG ) continue;
 			
 			ReadUnknown(xpp);
 		}
-		
-		assert(xpp.getName().equals(unknownName));
-		
 	}
 	
 	private boolean ReadBool(XmlPullParser xpp, boolean bDefault) throws IOException, XmlPullParserException {
-		String str = ReadString(xpp);
+        String str = ReadString(xpp);
-		
+
-		if ( str.equalsIgnoreCase("true") ) {
+        return str.equalsIgnoreCase("true")
-			return true;
+                || !str.equalsIgnoreCase("false")
-		} else if ( str.equalsIgnoreCase("false") ) {
+                && bDefault;
-			return false;
+    }
-		} else {
-			return bDefault;
-		}
-	}
 	
 	private UUID ReadUuid(XmlPullParser xpp) throws IOException, XmlPullParserException {
 		String encoded = ReadString(xpp);
@@ -1050,7 +1028,19 @@ public class ImporterV4 extends Importer {
 		
 		return new ProtectedString(false, ReadString(xpp));
 	}
-	
+
+	private ProtectedBinary createProtectedBinaryFromData(boolean protection, byte[] data) throws IOException {
+		if (data.length > MemUtil.BUFFER_SIZE_BYTES) {
+			File file = new File(streamDir, getUnusedCacheFileName());
+			try (FileOutputStream outputStream = new FileOutputStream(file)) {
+				outputStream.write(data);
+			}
+			return new ProtectedBinary(protection, file, data.length);
+		} else {
+			return new ProtectedBinary(protection, data);
+		}
+	}
+
 	private ProtectedBinary ReadProtectedBinary(XmlPullParser xpp) throws XmlPullParserException, IOException {
 		String ref = xpp.getAttributeValue(null, PwDatabaseV4XML.AttrRef);
 		if (ref != null) {
@@ -1068,10 +1058,13 @@ public class ImporterV4 extends Importer {
 		
 		byte[] buf = ProcessNode(xpp);
 		
-		if ( buf != null ) return new ProtectedBinary(true, buf);
+		if ( buf != null ) {
+			createProtectedBinaryFromData(true, buf);
+		}
 		
 		String base64 = ReadString(xpp);
-		if ( base64.length() == 0 ) return ProtectedBinary.EMPTY;
+		if ( base64.length() == 0 )
+			return ProtectedBinary.EMPTY;
 		
 		byte[] data = Base64Coder.decode(base64);
 		
@@ -1079,7 +1072,7 @@ public class ImporterV4 extends Importer {
 			data = MemUtil.decompress(data);
 		}
 		
-		return new ProtectedBinary(false, data);
+		return createProtectedBinaryFromData(false, data);
 	}
 	
 	private String ReadString(XmlPullParser xpp) throws IOException, XmlPullParserException {
@@ -1105,13 +1098,14 @@ public class ImporterV4 extends Importer {
 	}
 
 	private byte[] ProcessNode(XmlPullParser xpp) throws XmlPullParserException, IOException {
-		assert(xpp.getEventType() == XmlPullParser.START_TAG);
+		//(xpp.getEventType() == XmlPullParser.START_TAG);
-		
+
 		byte[] buf = null;
 		
 		if ( xpp.getAttributeCount() > 0 ) {
 			String protect = xpp.getAttributeValue(null, PwDatabaseV4XML.AttrProtected);
 			if ( protect != null && protect.equalsIgnoreCase(PwDatabaseV4XML.ValTrue) ) {
+			    // TODO stream for encrypted data
 				String encrypted = ReadStringRaw(xpp);
 				
 				if ( encrypted.length() > 0 ) {

app/src/main/java/com/kunzisoft/keepass/database/save/PwDbInnerHeaderOutputV4.java

@@ -23,10 +23,10 @@ import com.kunzisoft.keepass.database.PwDatabaseV4;
 import com.kunzisoft.keepass.database.PwDbHeaderV4;
 import com.kunzisoft.keepass.database.security.ProtectedBinary;
 import com.kunzisoft.keepass.stream.LEDataOutputStream;
+import com.kunzisoft.keepass.utils.MemUtil;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Arrays;
 
 public class PwDbInnerHeaderOutputV4 {
     private PwDatabaseV4 db;
@@ -50,19 +50,18 @@ public class PwDbInnerHeaderOutputV4 {
         los.writeInt(streamKeySize);
         los.write(header.innerRandomStreamKey);
 
-        for (ProtectedBinary bin : db.getBinPool().binaries()) {
+        for (ProtectedBinary protectedBinary : db.getBinPool().binaries()) {
             byte flag = PwDbHeaderV4.KdbxBinaryFlags.None;
-            if (bin.isProtected()) {
+            if (protectedBinary.isProtected()) {
                 flag |= PwDbHeaderV4.KdbxBinaryFlags.Protected;
             }
 
-            byte[] binData = bin.getData();
             los.write(PwDbHeaderV4.PwDbInnerHeaderV4Fields.Binary);
-            los.writeInt(bin.length() + 1);
+            los.writeInt((int) protectedBinary.length() + 1); // TODO verify
             los.write(flag);
-            los.write(binData);
 
-            Arrays.fill(binData, (byte)0);
+            MemUtil.readBytes(protectedBinary.getData(),
+                    buffer -> los.write(buffer));
         }
 
         los.write(PwDbHeaderV4.PwDbInnerHeaderV4Fields.EndOfHeader);

app/src/main/java/com/kunzisoft/keepass/database/save/PwDbV4Output.java

@@ -394,15 +394,14 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		
 		if (!isHistory) {
 			writeList(PwDatabaseV4XML.ElemHistory, entry.getHistory(), true);
-		} else {
-			assert(entry.sizeOfHistory() == 0);
 		}
+		// else entry.sizeOfHistory() == 0
 		
 		xml.endTag(null, PwDatabaseV4XML.ElemEntry);
 	}
 	
 
-	private void writeObject(String key, ProtectedBinary value, boolean allowRef) throws IllegalArgumentException, IllegalStateException, IOException {
+	private void writeObject(String key, ProtectedBinary value) throws IllegalArgumentException, IllegalStateException, IOException {
 		assert(key != null && value != null);
 		
 		xml.startTag(null, PwDatabaseV4XML.ElemBinary);
@@ -411,11 +410,8 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		xml.endTag(null, PwDatabaseV4XML.ElemKey);
 		
 		xml.startTag(null, PwDatabaseV4XML.ElemValue);
-		String strRef = null;
+		int ref = mPM.getBinPool().findKey(value);
-		if (allowRef) {
+		String strRef = Integer.toString(ref);
-			int ref = mPM.getBinPool().poolFind(value);
-			strRef = Integer.toString(ref);
-		}
 		
 		if (strRef != null) {
 			xml.attribute(null, PwDatabaseV4XML.AttrRef, strRef);
@@ -427,33 +423,85 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		
 		xml.endTag(null, PwDatabaseV4XML.ElemBinary);
 	}
-	
+
+	/*
+	TODO Make with pipe
 	private void subWriteValue(ProtectedBinary value) throws IllegalArgumentException, IllegalStateException, IOException {
-		if (value.isProtected()) {
+        try (InputStream inputStream = value.getData()) {
-			xml.attribute(null, PwDatabaseV4XML.AttrProtected, PwDatabaseV4XML.ValTrue);
+            if (inputStream == null) {
-			
+                Log.e(TAG, "Can't write a null input stream.");
-			int valLength = value.length();
+                return;
-			if (valLength > 0) {
+            }
-				byte[] encoded = new byte[valLength];
+
-				randomStream.processBytes(value.getData(), 0, valLength, encoded, 0);
+            if (value.isProtected()) {
-				
+                xml.attribute(null, PwDatabaseV4XML.AttrProtected, PwDatabaseV4XML.ValTrue);
-				xml.text(String.valueOf(Base64Coder.encode(encoded)));
+
-			}
+                try (InputStream cypherInputStream =
-			
+                             IOUtil.pipe(inputStream,
-		} else {
+                                     o -> new org.spongycastle.crypto.io.CipherOutputStream(o, randomStream))) {
-			if (mPM.getCompressionAlgorithm() == PwCompressionAlgorithm.Gzip) {
+                    writeInputStreamInBase64(cypherInputStream);
-				xml.attribute(null, PwDatabaseV4XML.AttrCompressed, PwDatabaseV4XML.ValTrue);
+                }
-				byte[] raw = value.getData();
+
-				byte[] compressed = MemUtil.compress(raw);
+            } else {
-				xml.text(String.valueOf(Base64Coder.encode(compressed)));
+                if (mPM.getCompressionAlgorithm() == PwCompressionAlgorithm.Gzip) {
-			} else {
+
-				byte[] raw = value.getData();
+                    xml.attribute(null, PwDatabaseV4XML.AttrCompressed, PwDatabaseV4XML.ValTrue);
-				xml.text(String.valueOf(Base64Coder.encode(raw)));
+
-			}
+                    try (InputStream gZipInputStream =
-			
+                                 IOUtil.pipe(inputStream, GZIPOutputStream::new, (int) value.length())) {
-		}
+                        writeInputStreamInBase64(gZipInputStream);
+                    }
+
+                } else {
+                    writeInputStreamInBase64(inputStream);
+                }
+            }
+        }
 	}
-	
+
+	private void writeInputStreamInBase64(InputStream inputStream) throws IOException {
+        try (InputStream base64InputStream =
+                     IOUtil.pipe(inputStream,
+                             o -> new Base64OutputStream(o, DEFAULT))) {
+            MemUtil.readBytes(base64InputStream,
+                    buffer -> xml.text(Arrays.toString(buffer)));
+        }
+    }
+    //*/
+
+    //*
+    private void subWriteValue(ProtectedBinary value) throws IllegalArgumentException, IllegalStateException, IOException {
+
+        int valLength = (int) value.length();
+        if (valLength > 0) {
+            byte[] buffer = new byte[valLength];
+            if (valLength == value.getData().read(buffer, 0, valLength)) {
+
+                if (value.isProtected()) {
+                    xml.attribute(null, PwDatabaseV4XML.AttrProtected, PwDatabaseV4XML.ValTrue);
+
+                    byte[] encoded = new byte[valLength];
+                    randomStream.processBytes(buffer, 0, valLength, encoded, 0);
+                    xml.text(String.valueOf(Base64Coder.encode(encoded)));
+
+                } else {
+                    if (mPM.getCompressionAlgorithm() == PwCompressionAlgorithm.Gzip) {
+                        xml.attribute(null, PwDatabaseV4XML.AttrCompressed, PwDatabaseV4XML.ValTrue);
+
+                        byte[] compressData = MemUtil.compress(buffer);
+                        xml.text(String.valueOf(Base64Coder.encode(compressData)));
+
+                    } else {
+                        xml.text(String.valueOf(Base64Coder.encode(buffer)));
+                    }
+                }
+            } else {
+                Log.e(TAG, "Unable to read the stream of the protected binary");
+            }
+        }
+    }
+    //*/
+
 	private void writeObject(String name, String value, boolean filterXmlChars) throws IllegalArgumentException, IllegalStateException, IOException {
 		assert(name != null && value != null);
 		
@@ -616,7 +664,7 @@ public class PwDbV4Output extends PwDbOutput<PwDbHeaderV4> {
 		assert(binaries != null);
 		
 		for (Entry<String, ProtectedBinary> pair : binaries.entrySet()) {
-			writeObject(pair.getKey(), pair.getValue(), true);
+			writeObject(pair.getKey(), pair.getValue());
 		}
 	}
 

app/src/main/java/com/kunzisoft/keepass/database/security/ProtectedBinary.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
+ * Copyright 2018 Jeremy Jamet / Kunzisoft.
  *     
  * This file is part of KeePass DX.
  *
@@ -21,52 +21,107 @@ package com.kunzisoft.keepass.database.security;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.util.Log;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 
 public class ProtectedBinary implements Parcelable {
-	
+
+    private static final String TAG = ProtectedBinary.class.getName();
 	public final static ProtectedBinary EMPTY = new ProtectedBinary();
 
 	private boolean protect;
 	private byte[] data;
-	
+	private File dataFile;
+	private int size;
+
 	public boolean isProtected() {
 		return protect;
 	}
 	
-	public int length() {
+	public long length() {
-		if (data == null) {
+        if (data != null)
-			return 0;
+            return data.length;
-		}
+        if (dataFile != null)
-		return data.length;
+            return size;
+        return 0;
 	}
 	
-	public ProtectedBinary() {
+	private ProtectedBinary() {
-		this(false, new byte[0]);
+        this.protect = false;
+        this.data = null;
+        this.dataFile = null;
+        this.size = 0;
 	}
 	
 	public ProtectedBinary(boolean enableProtection, byte[] data) {
 		this.protect = enableProtection;
 		this.data = data;
+		this.dataFile = null;
+		if (data != null)
+		    this.size = data.length;
+		else
+		    this.size = 0;
 	}
 
-	public ProtectedBinary(Parcel in) {
+    public ProtectedBinary(boolean enableProtection, File dataFile, int size) {
+        this.protect = enableProtection;
+        this.data = null;
+        this.dataFile = dataFile;
+        this.size = size;
+    }
+
+	private ProtectedBinary(Parcel in) {
 		protect = in.readByte() != 0;
 		in.readByteArray(data);
-	}
+        dataFile = new File(in.readString());
-	
+        size = in.readInt();
-	// TODO: replace the byte[] with something like ByteBuffer to make the return
-	// value immutable, so we don't have to worry about making deep copies
-	public byte[] getData() {
-		return data;
-	}
-	
-	public boolean equals(ProtectedBinary rhs) {
-		return (protect == rhs.protect) && Arrays.equals(data, rhs.data);
 	}
 
-	@Override
+    public InputStream getData() throws IOException {
+        if (data != null)
+        	return new ByteArrayInputStream(data);
+	    else if (dataFile != null)
+            return new FileInputStream(dataFile);
+        else
+        	return null;
+    }
+
+    public void clear() {
+		data = null;
+		if (dataFile != null && !dataFile.delete())
+		    Log.e(TAG, "Unable to delete temp file " + dataFile.getAbsolutePath());
+	}
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ProtectedBinary that = (ProtectedBinary) o;
+        return protect == that.protect &&
+                size == that.size &&
+                Arrays.equals(data, that.data) &&
+                dataFile != null &&
+                dataFile.equals(that.dataFile);
+    }
+
+    @Override
+    public int hashCode() {
+
+        int result = 0;
+        result = 31 * result + (protect ? 1 : 0);
+        result = 31 * result + dataFile.hashCode();
+        result = 31 * result + Integer.valueOf(size).hashCode();
+        result = 31 * result + Arrays.hashCode(data);
+        return result;
+    }
+
+    @Override
 	public int describeContents() {
 		return 0;
 	}
@@ -75,6 +130,8 @@ public class ProtectedBinary implements Parcelable {
 	public void writeToParcel(Parcel dest, int flags) {
 		dest.writeByte((byte) (protect ? 1 : 0));
 		dest.writeByteArray(data);
+		dest.writeString(dataFile.getAbsolutePath());
+		dest.writeInt(size);
 	}
 
 	public static final Creator<ProtectedBinary> CREATOR = new Creator<ProtectedBinary>() {

app/src/main/java/com/kunzisoft/keepass/dialogs/KeyboardExplanationDialogFragment.java

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.keyboard;
+package com.kunzisoft.keepass.dialogs;
 
 import android.app.Dialog;
 import android.content.Intent;
@@ -28,16 +28,14 @@ import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 
 import com.kunzisoft.keepass.BuildConfig;
 import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.utils.Util;
 
-import static android.content.Context.INPUT_METHOD_SERVICE;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 
-public class KeyboardExplanationDialog extends DialogFragment {
+public class KeyboardExplanationDialogFragment extends DialogFragment {
 
     @NonNull
 	@Override

app/src/main/java/com/kunzisoft/keepass/fileselect/FileInformationDialogFragment.java

@@ -20,7 +20,6 @@
 package com.kunzisoft.keepass.fileselect;
 
 import android.app.Dialog;
-import android.content.DialogInterface;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -38,6 +37,9 @@ public class FileInformationDialogFragment extends DialogFragment {
 
     private static final String FILE_SELECT_BEEN_ARG = "FILE_SELECT_BEEN_ARG";
 
+    private View fileSizeContainerView;
+    private View fileModificationContainerView;
+
     public static FileInformationDialogFragment newInstance(FileSelectBean fileSelectBean) {
         FileInformationDialogFragment fileInformationDialogFragment =
                 new FileInformationDialogFragment();
@@ -53,38 +55,44 @@ public class FileInformationDialogFragment extends DialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         LayoutInflater inflater = getActivity().getLayoutInflater();
         View root = inflater.inflate(R.layout.file_selection_information, null);
+        TextView fileNameView = root.findViewById(R.id.file_filename);
+        TextView filePathView = root.findViewById(R.id.file_path);
+        fileSizeContainerView = root.findViewById(R.id.file_size_container);
+        TextView fileSizeView = root.findViewById(R.id.file_size);
+        fileModificationContainerView = root.findViewById(R.id.file_modification_container);
+        TextView fileModificationView = root.findViewById(R.id.file_modification);
 
         if (getArguments() != null && getArguments().containsKey(FILE_SELECT_BEEN_ARG)) {
             FileSelectBean fileSelectBean = (FileSelectBean) getArguments().getSerializable(FILE_SELECT_BEEN_ARG);
-            TextView fileWarningView = (TextView) root.findViewById(R.id.file_warning);
             if(fileSelectBean != null) {
-                TextView fileNameView = (TextView) root.findViewById(R.id.file_filename);
+
-                TextView filePathView = (TextView) root.findViewById(R.id.file_path);
-                TextView fileSizeView = (TextView) root.findViewById(R.id.file_size);
-                TextView fileModificationView = (TextView) root.findViewById(R.id.file_modification);
-                fileWarningView.setVisibility(View.GONE);
-                fileNameView.setText(fileSelectBean.getFileName());
                 filePathView.setText(Uri.decode(fileSelectBean.getFileUri().toString()));
-                fileSizeView.setText(String.valueOf(fileSelectBean.getSize()));
+                fileNameView.setText(fileSelectBean.getFileName());
-                fileModificationView.setText(DateFormat.getDateTimeInstance()
+
-                        .format(fileSelectBean.getLastModification()));
+                if(fileSelectBean.notFound()) {
-                if(fileSelectBean.notFound())
+                    hideFileInfo();
-                    showFileNotFound(fileWarningView);
+                } else {
+                    showFileInfo();
+                    fileSizeView.setText(String.valueOf(fileSelectBean.getSize()));
+                    fileModificationView.setText(DateFormat.getDateTimeInstance()
+                            .format(fileSelectBean.getLastModification()));
+                }
             } else
-                showFileNotFound(fileWarningView);
+                hideFileInfo();
         }
 
         builder.setView(root);
-        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(android.R.string.ok, (dialog, id) -> {});
-            public void onClick(DialogInterface dialog, int id) {
-
-            }
-        });
         return builder.create();
     }
 
-    private void showFileNotFound(TextView fileWarningView) {
+    private void showFileInfo() {
-        fileWarningView.setVisibility(View.VISIBLE);
+        fileSizeContainerView.setVisibility(View.VISIBLE);
-        fileWarningView.setText(R.string.file_not_found);
+        fileModificationContainerView.setVisibility(View.VISIBLE);
+    }
+
+    private void hideFileInfo() {
+        fileSizeContainerView.setVisibility(View.GONE);
+        fileModificationContainerView.setVisibility(View.GONE);
     }
 }

app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectActivity.java

@@ -94,7 +94,7 @@ public class FileSelectActivity extends StylishActivity implements
     private static final String EXTRA_STAY = "EXTRA_STAY";
 
     private FileSelectAdapter mAdapter;
-	private View fileListTitle;
+	private View fileListContainer;
 	private View createButtonView;
 	private View browseButtonView;
 	private View openButtonView;
@@ -148,7 +148,7 @@ public class FileSelectActivity extends StylishActivity implements
 		fileHistory = App.getFileHistory();
 
         setContentView(R.layout.file_selection);
-        fileListTitle = findViewById(R.id.file_list_title);
+        fileListContainer = findViewById(R.id.container_file_list);
 
 		Toolbar toolbar = findViewById(R.id.toolbar);
 		toolbar.setTitle("");
@@ -284,7 +284,7 @@ public class FileSelectActivity extends StylishActivity implements
         int warning = -1;
         String state = Environment.getExternalStorageState();
         if (state.equals(Environment.MEDIA_MOUNTED_READ_ONLY)) {
-            warning = R.string.warning_read_only;
+            warning = R.string.read_only_warning;
         } else if (!state.equals(Environment.MEDIA_MOUNTED)) {
             warning = R.string.warning_unmounted;
         }
@@ -303,7 +303,7 @@ public class FileSelectActivity extends StylishActivity implements
         super.onResume();
 
         updateExternalStorageWarning();
-        updateTitleFileListView();
+        updateFileListVisibility();
         mAdapter.notifyDataSetChanged();
     }
 
@@ -434,11 +434,11 @@ public class FileSelectActivity extends StylishActivity implements
         createFileDialogFragment.show(getSupportFragmentManager(), "createFileDialogFragment");
     }
 
-	private void updateTitleFileListView() {
+	private void updateFileListVisibility() {
 	    if(mAdapter.getItemCount() == 0)
-            fileListTitle.setVisibility(View.INVISIBLE);
+            fileListContainer.setVisibility(View.INVISIBLE);
 	    else
-            fileListTitle.setVisibility(View.VISIBLE);
+            fileListContainer.setVisibility(View.VISIBLE);
     }
 
     /**
@@ -593,7 +593,7 @@ public class FileSelectActivity extends StylishActivity implements
                     // Add to recent files
                     fileHistory.createFile(mUri, getFilename());
                     mAdapter.notifyDataSetChanged();
-                    updateTitleFileListView();
+                    updateFileListVisibility();
                     GroupActivity.launch(FileSelectActivity.this);
                 });
 			}
@@ -629,7 +629,7 @@ public class FileSelectActivity extends StylishActivity implements
                         R.string.file_not_found, Toast.LENGTH_LONG)
                         .show();
             }
-            updateTitleFileListView();
+            updateFileListVisibility();
         }, fileHistory).execute(itemPosition);
 	}
 
@@ -647,7 +647,7 @@ public class FileSelectActivity extends StylishActivity implements
         new DeleteFileHistoryAsyncTask(() -> {
             fileHistory.deleteFile(fileSelectBean.getFileUri());
             mAdapter.notifyDataSetChanged();
-            updateTitleFileListView();
+            updateFileListVisibility();
         }, fileHistory, mAdapter).execute(fileSelectBean);
         return true;
     }

app/src/main/java/com/kunzisoft/keepass/fileselect/FileSelectAdapter.java

@@ -88,16 +88,6 @@ public class FileSelectAdapter extends RecyclerView.Adapter<FileSelectViewHolder
         else
             holder.fileName.setText(fileSelectBean.getFileName());
         holder.fileName.setTextSize(PreferencesUtil.getListTextSize(context));
-        // Set warning
-        if (fileSelectBean.notFound()) {
-            holder.fileInformation.setColorFilter(
-                    warningColor,
-                    android.graphics.PorterDuff.Mode.MULTIPLY);
-        } else {
-            holder.fileInformation.setColorFilter(
-                    defaultColor,
-                    android.graphics.PorterDuff.Mode.MULTIPLY);
-        }
         // Click on information
         if (fileInformationShowListener != null)
             holder.fileInformation.setOnClickListener(new FileInformationClickListener(fileSelectBean));

app/src/main/java/com/kunzisoft/keepass/magikeyboard/EntryRetrieverActivity.java

@@ -1,4 +1,4 @@
-package com.kunzisoft.magikeyboard;
+package com.kunzisoft.keepass.magikeyboard;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -9,7 +9,8 @@ import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
-import com.kunzisoft.keepass_model.Entry;
+import com.kunzisoft.keepass.R;
+import com.kunzisoft.keepass.model.Entry;
 
 public class EntryRetrieverActivity extends AppCompatActivity {
 
@@ -43,8 +44,8 @@ public class EntryRetrieverActivity extends AppCompatActivity {
 
                 // Show the notification if allowed in Preferences
                 SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-                if (sharedPreferences.getBoolean(getString(R.string.notification_entry_key),
+                if (sharedPreferences.getBoolean(getString(R.string.keyboard_notification_entry_key),
-                        getResources().getBoolean(R.bool.notification_entry_default))) {
+                        getResources().getBoolean(R.bool.keyboard_notification_entry_default))) {
                     Intent notificationIntent = new Intent(this, KeyboardEntryNotificationService.class);
                     startService(notificationIntent);
                 }

app/src/main/java/com/kunzisoft/keepass/magikeyboard/KeyboardEntryNotificationService.java

@@ -1,4 +1,4 @@
-package com.kunzisoft.magikeyboard;
+package com.kunzisoft.keepass.magikeyboard;
 
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -7,19 +7,24 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.IBinder;
 import android.support.v4.app.NotificationCompat;
+import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 
-import com.kunzisoft.magikeyboard.receiver.LockBroadcastReceiver;
+import com.kunzisoft.keepass.R;
-import com.kunzisoft.magikeyboard.receiver.NotificationDeleteBroadcastReceiver;
+import com.kunzisoft.keepass.magikeyboard.receiver.LockBroadcastReceiver;
+import com.kunzisoft.keepass.magikeyboard.receiver.NotificationDeleteBroadcastReceiver;
+import com.kunzisoft.keepass.timeout.TimeoutHelper;
 
-import static android.content.ContentValues.TAG;
+import static com.kunzisoft.keepass.magikeyboard.receiver.LockBroadcastReceiver.LOCK_ACTION;
-import static com.kunzisoft.magikeyboard.receiver.LockBroadcastReceiver.LOCK_ACTION;
 
 public class KeyboardEntryNotificationService extends Service {
 
+    private static final String TAG = KeyboardEntryNotificationService.class.getName();
+
     private static final String CHANNEL_ID_KEYBOARD = "com.kunzisoft.keyboard.notification.entry.channel";
     private static final String CHANNEL_NAME_KEYBOARD = "Magikeyboard notification";
 
@@ -80,7 +85,7 @@ public class KeyboardEntryNotificationService extends Service {
                 PendingIntent.getBroadcast(getApplicationContext(), 0, deleteIntent, 0);
 
         if (MagikIME.getEntryKey() != null) {
-            String entryTitle = getString(R.string.notification_entry_content_title_text);
+            String entryTitle = getString(R.string.keyboard_notification_entry_content_title_text);
             String entryUsername = "";
             if (!MagikIME.getEntryKey().getTitle().isEmpty())
                 entryTitle = MagikIME.getEntryKey().getTitle();
@@ -89,40 +94,55 @@ public class KeyboardEntryNotificationService extends Service {
 
             NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_ID_KEYBOARD)
                     .setSmallIcon(R.drawable.ic_vpn_key_white_24dp)
-                    .setContentTitle(getString(R.string.notification_entry_content_title, entryTitle))
+                    .setContentTitle(getString(R.string.keyboard_notification_entry_content_title, entryTitle))
                     .setPriority(NotificationCompat.PRIORITY_DEFAULT)
                     .setVisibility(NotificationCompat.VISIBILITY_SECRET)
-                    .setContentText(getString(R.string.notification_entry_content_text, entryUsername))
+                    .setContentText(getString(R.string.keyboard_notification_entry_content_text, entryUsername))
                     .setAutoCancel(false)
                     .setContentIntent(null)
                     .setDeleteIntent(pendingDeleteIntent);
 
             notificationManager.cancel(notificationId);
             notificationManager.notify(notificationId, builder.build());
-        }
 
-        // TODO Get timeout
-        /*
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        notificationTimeoutMilliSecs = prefs.getInt(getString(R.string.entry_timeout_key), 100000);
-        */
 
-        /*
+
-        stopTask(cleanNotificationTimer);
+            // Timeout only if notification clear is available
-        cleanNotificationTimer = new Thread(new Runnable() {
+            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-            @Override
+            if (sharedPreferences.getBoolean(getString(R.string.keyboard_notification_entry_clear_close_key),
-            public void run() {
+                    getResources().getBoolean(R.bool.keyboard_notification_entry_clear_close_default))) {
+                String keyboardTimeout = sharedPreferences.getString(getString(R.string.keyboard_entry_timeout_key),
+                        getString(R.string.timeout_default));
                 try {
-                    Thread.sleep(notificationTimeoutMilliSecs);
+                    notificationTimeoutMilliSecs = Long.parseLong(keyboardTimeout);
-                } catch (InterruptedException e) {
+                } catch (NumberFormatException e) {
-                    cleanNotificationTimer = null;
+                    notificationTimeoutMilliSecs = TimeoutHelper.DEFAULT_TIMEOUT;
-                    return;
+                }
+
+                if (notificationTimeoutMilliSecs != TimeoutHelper.TIMEOUT_NEVER) {
+                    stopTask(cleanNotificationTimer);
+                    cleanNotificationTimer = new Thread(() -> {
+                        int maxPos = 100;
+                        long posDurationMills = notificationTimeoutMilliSecs / maxPos;
+                        for (int pos = maxPos; pos > 0; --pos) {
+                            builder.setProgress(maxPos, pos, false);
+                            notificationManager.notify(notificationId, builder.build());
+                            try {
+                                Thread.sleep(posDurationMills);
+                            } catch (InterruptedException e) {
+                                break;
+                            }
+                        }
+                        try {
+                            pendingDeleteIntent.send();
+                        } catch (PendingIntent.CanceledException e) {
+                            Log.e(TAG, e.getLocalizedMessage());
+                        }
+                    });
+                    cleanNotificationTimer.start();
                 }
-                notificationManager.cancel(notificationId);
             }
-        });
+        }
-        cleanNotificationTimer.start();
-        */
     }
 
     private void stopTask(Thread task) {
@@ -130,12 +150,19 @@ public class KeyboardEntryNotificationService extends Service {
             task.interrupt();
     }
 
-    @Override
+    private void destroyKeyboardNotification() {
-    public void onDestroy() {
+        stopTask(cleanNotificationTimer);
+        cleanNotificationTimer = null;
         unregisterReceiver(lockBroadcastReceiver);
         pendingDeleteIntent.cancel();
 
         notificationManager.cancel(notificationId);
+    }
+
+    @Override
+    public void onDestroy() {
+
+        destroyKeyboardNotification();
 
         super.onDestroy();
     }

app/src/main/java/com/kunzisoft/keepass/magikeyboard/MagikIME.java

@@ -17,7 +17,7 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.magikeyboard;
+package com.kunzisoft.keepass.magikeyboard;
 
 import android.content.Context;
 import android.content.Intent;
@@ -28,24 +28,35 @@ import android.inputmethodservice.Keyboard;
 import android.inputmethodservice.KeyboardView;
 import android.media.AudioManager;
 import android.support.v7.preference.PreferenceManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.FrameLayout;
+import android.widget.PopupWindow;
 
-import com.kunzisoft.keepass_model.Entry;
+import com.kunzisoft.keepass.R;
-import com.kunzisoft.magikeyboard.receiver.LockBroadcastReceiver;
+import com.kunzisoft.keepass.magikeyboard.adapter.FieldsAdapter;
+import com.kunzisoft.keepass.magikeyboard.receiver.LockBroadcastReceiver;
+import com.kunzisoft.keepass.magikeyboard.view.MagikeyboardView;
+import com.kunzisoft.keepass.model.Entry;
 
-import static com.kunzisoft.magikeyboard.receiver.LockBroadcastReceiver.LOCK_ACTION;
+import static com.kunzisoft.keepass.magikeyboard.receiver.LockBroadcastReceiver.LOCK_ACTION;
 
 public class MagikIME extends InputMethodService
         implements KeyboardView.OnKeyboardActionListener {
     private static final String TAG = MagikIME.class.getName();
 
-    private static final int KEY_CHANGE_KEYBOARD = 600;
+    public static final int KEY_BACK_KEYBOARD = 600;
+    public static final int KEY_CHANGE_KEYBOARD = 601;
     private static final int KEY_UNLOCK = 610;
     private static final int KEY_LOCK = 611;
     private static final int KEY_ENTRY = 620;
@@ -59,6 +70,9 @@ public class MagikIME extends InputMethodService
     private KeyboardView keyboardView;
     private Keyboard keyboard;
     private Keyboard keyboard_entry;
+    private PopupWindow popupCustomKeys;
+    private FieldsAdapter fieldsAdapter;
+    private boolean playSoundDuringCLick;
 
     private LockBroadcastReceiver lockBroadcastReceiver;
 
@@ -77,22 +91,48 @@ public class MagikIME extends InputMethodService
         registerReceiver(lockBroadcastReceiver, new IntentFilter(LOCK_ACTION));
     }
 
-    @Override
-    public void onDestroy() {
-        unregisterReceiver(lockBroadcastReceiver);
-        super.onDestroy();
-    }
-
     @Override
     public View onCreateInputView() {
-        keyboardView = (KeyboardView) getLayoutInflater().inflate(R.layout.keyboard, null);
+        keyboardView = (MagikeyboardView) getLayoutInflater().inflate(R.layout.keyboard_view, null);
         keyboard = new Keyboard(this, R.xml.keyboard_password);
         keyboard_entry = new Keyboard(this, R.xml.keyboard_password_entry);
 
         assignKeyboardView();
         keyboardView.setOnKeyboardActionListener(this);
         keyboardView.setPreviewEnabled(false);
-        keyboardView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
+
+		Context context = getBaseContext();
+		View popupFieldsView = LayoutInflater.from(context)
+				.inflate(R.layout.keyboard_popup_fields, new FrameLayout(context));
+
+		if (popupCustomKeys != null)
+            popupCustomKeys.dismiss();
+
+		popupCustomKeys = new PopupWindow(context);
+		popupCustomKeys.setWidth(WindowManager.LayoutParams.WRAP_CONTENT);
+		popupCustomKeys.setHeight(WindowManager.LayoutParams.WRAP_CONTENT);
+		popupCustomKeys.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+		popupCustomKeys.setInputMethodMode(PopupWindow.INPUT_METHOD_NEEDED);
+		popupCustomKeys.setContentView(popupFieldsView);
+
+        RecyclerView recyclerView = popupFieldsView.findViewById(R.id.keyboard_popup_fields_list);
+        fieldsAdapter = new FieldsAdapter(this);
+        fieldsAdapter.setOnItemClickListener(item -> getCurrentInputConnection().commitText(item.getValue(), 1));
+        recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, true));
+        recyclerView.setAdapter(fieldsAdapter);
+
+        View closeView = popupFieldsView.findViewById(R.id.keyboard_popup_close);
+        closeView.setOnClickListener(v -> popupCustomKeys.dismiss());
+
+        // Define preferences
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        keyboardView.setHapticFeedbackEnabled(
+                sharedPreferences.getBoolean(
+                        getString(R.string.keyboard_key_vibrate_key),
+                        getResources().getBoolean(R.bool.keyboard_key_vibrate_default)));
+        playSoundDuringCLick = sharedPreferences.getBoolean(
+                getString(R.string.keyboard_key_sound_key),
+                getResources().getBoolean(R.bool.keyboard_key_sound_default));
 
         return keyboardView;
     }
@@ -103,8 +143,10 @@ public class MagikIME extends InputMethodService
                 if (keyboard_entry != null)
                     keyboardView.setKeyboard(keyboard_entry);
             } else {
-                if (keyboard != null)
+                if (keyboard != null) {
+                    dismissCustomKeys();
                     keyboardView.setKeyboard(keyboard);
+                }
             }
         }
     }
@@ -131,9 +173,16 @@ public class MagikIME extends InputMethodService
 
     @Override
     public void onKey(int primaryCode, int[] keyCodes) {
-        InputConnection ic = getCurrentInputConnection();
+        InputConnection inputConnection = getCurrentInputConnection();
+
+        // Vibrate
+        keyboardView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY);
+        // Play a sound
+        if (playSoundDuringCLick)
+            playClick(primaryCode);
+
         switch(primaryCode){
-            case KEY_CHANGE_KEYBOARD:
+            case KEY_BACK_KEYBOARD:
                 try {
                     InputMethodManager imeManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
                     assert imeManager != null;
@@ -145,99 +194,74 @@ public class MagikIME extends InputMethodService
                     if (imeManager != null)
                         imeManager.showInputMethodPicker();
                 }
-                // TODO Add a long press to choose the keyboard
                 break;
+			case KEY_CHANGE_KEYBOARD:
+				InputMethodManager imeManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+				if (imeManager != null)
+					imeManager.showInputMethodPicker();
+				break;
             case KEY_UNLOCK:
                 // TODO Unlock key
                 break;
             case KEY_ENTRY:
+                deleteEntryKey(this);
                 Intent intent = new Intent(this, EntryRetrieverActivity.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 startActivity(intent);
                 break;
             case KEY_LOCK:
                 deleteEntryKey(this);
+                dismissCustomKeys();
                 break;
             case KEY_USERNAME:
                 if (entryKey != null) {
-                    InputConnection inputConnection = getCurrentInputConnection();
                     inputConnection.commitText(entryKey.getUsername(), 1);
                 }
                 break;
             case KEY_PASSWORD:
                 if (entryKey != null) {
-                    InputConnection inputConnection = getCurrentInputConnection();
                     inputConnection.commitText(entryKey.getPassword(), 1);
                 }
                 break;
             case KEY_URL:
                 if (entryKey != null) {
-                    InputConnection inputConnection = getCurrentInputConnection();
                     inputConnection.commitText(entryKey.getUrl(), 1);
                 }
                 break;
             case KEY_FIELDS:
-                // TODO Fields key
+                fieldsAdapter.setFields(entryKey.getCustomFields());
+                popupCustomKeys.showAtLocation(keyboardView,  Gravity.END | Gravity.TOP, 0, 0);
+                break;
             case Keyboard.KEYCODE_DELETE :
-                ic.deleteSurroundingText(1, 0);
+                inputConnection.deleteSurroundingText(1, 0);
                 break;
             case Keyboard.KEYCODE_DONE:
-                ic.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
+                inputConnection.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
                 break;
             default:
         }
-
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-
-        if (sharedPreferences.getBoolean(getString(R.string.key_vibrate_key), getResources().getBoolean(R.bool.key_vibrate_default)))
-            vibrate();
-
-        if (sharedPreferences.getBoolean(getString(R.string.key_sound_key), getResources().getBoolean(R.bool.key_sound_default)))
-            playClick(primaryCode);
-
     }
 
     @Override
-    public void onPress(int primaryCode) {
+    public void onPress(int primaryCode) {}
-    }
+
+	@Override
+    public void onRelease(int primaryCode) {}
 
     @Override
-    public void onRelease(int primaryCode) {
+    public void onText(CharSequence text) {}
-    }
 
     @Override
-    public void onText(CharSequence text) {
+    public void swipeDown() {}
-    }
 
     @Override
-    public void swipeDown() {
+    public void swipeLeft() {}
-    }
 
     @Override
-    public void swipeLeft() {
+    public void swipeRight() {}
-    }
 
     @Override
-    public void swipeRight() {
+    public void swipeUp() {}
-    }
-
-    @Override
-    public void swipeUp() {
-    }
-
-    private void vibrate() {
-        // TODO better vibration
-        /*
-        Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
-        if (vibrator != null) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                vibrator.vibrate(VibrationEffect.createOneShot(50, VibrationEffect.DEFAULT_AMPLITUDE));
-            } else {
-                vibrator.vibrate(50);
-            }
-        }
-        */
-    }
 
     private void playClick(int keyCode){
         AudioManager am = (AudioManager)getSystemService(AUDIO_SERVICE);
@@ -253,4 +277,18 @@ public class MagikIME extends InputMethodService
                 default: am.playSoundEffect(AudioManager.FX_KEYPRESS_STANDARD);
             }
     }
+
+    private void dismissCustomKeys() {
+        if (popupCustomKeys != null)
+            popupCustomKeys.dismiss();
+        if (fieldsAdapter != null)
+            fieldsAdapter.clear();
+    }
+
+    @Override
+    public void onDestroy() {
+        dismissCustomKeys();
+        unregisterReceiver(lockBroadcastReceiver);
+        super.onDestroy();
+    }
 }

app/src/main/java/com/kunzisoft/keepass/magikeyboard/adapter/FieldsAdapter.java

@@ -0,0 +1,76 @@
+package com.kunzisoft.keepass.magikeyboard.adapter;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.kunzisoft.keepass.R;
+import com.kunzisoft.keepass.model.Field;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FieldsAdapter extends RecyclerView.Adapter<FieldsAdapter.FieldViewHolder> {
+
+    private LayoutInflater inflater;
+    private List<Field> fields;
+    private OnItemClickListener listener;
+
+    public FieldsAdapter(Context context) {
+        this.inflater = LayoutInflater.from(context);
+        this.fields = new ArrayList<>();
+    }
+
+    public void setFields(List<Field> fields) {
+        this.fields = fields;
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.listener = listener;
+    }
+
+    @NonNull
+    @Override
+    public FieldViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = inflater.inflate(R.layout.keyboard_popup_fields_item, parent, false);
+        return new FieldViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull FieldViewHolder holder, int position) {
+        Field field = fields.get(position);
+        holder.name.setText(field.getName());
+        holder.bind(field, listener);
+    }
+
+    @Override
+    public int getItemCount() {
+        return fields.size();
+    }
+
+    public void clear() {
+        fields.clear();
+    }
+
+    public interface OnItemClickListener {
+        void onItemClick(Field item);
+    }
+
+    class FieldViewHolder extends RecyclerView.ViewHolder {
+
+        TextView name;
+
+        FieldViewHolder(View itemView) {
+            super(itemView);
+            name = itemView.findViewById(R.id.keyboard_popup_field_item_name);
+        }
+
+        void bind(final Field item, final OnItemClickListener listener) {
+            itemView.setOnClickListener(v -> listener.onItemClick(item));
+        }
+    }
+}

app/src/main/java/com/kunzisoft/keepass/magikeyboard/receiver/LockBroadcastReceiver.java

@@ -1,4 +1,4 @@
-package com.kunzisoft.magikeyboard.receiver;
+package com.kunzisoft.keepass.magikeyboard.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

app/src/main/java/com/kunzisoft/keepass/magikeyboard/receiver/NotificationDeleteBroadcastReceiver.java

@@ -1,13 +1,13 @@
-package com.kunzisoft.magikeyboard.receiver;
+package com.kunzisoft.keepass.magikeyboard.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 
-import com.kunzisoft.magikeyboard.KeyboardEntryNotificationService;
+import com.kunzisoft.keepass.R;
-import com.kunzisoft.magikeyboard.MagikIME;
+import com.kunzisoft.keepass.magikeyboard.KeyboardEntryNotificationService;
-import com.kunzisoft.magikeyboard.R;
+import com.kunzisoft.keepass.magikeyboard.MagikIME;
 
 public class NotificationDeleteBroadcastReceiver extends BroadcastReceiver {
 
@@ -15,8 +15,8 @@ public class NotificationDeleteBroadcastReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         // Clear the entry if define in preferences
         SharedPreferences sharedPreferences = android.preference.PreferenceManager.getDefaultSharedPreferences(context);
-        if (sharedPreferences.getBoolean(context.getString(R.string.notification_entry_clear_close_key),
+        if (sharedPreferences.getBoolean(context.getString(R.string.keyboard_notification_entry_clear_close_key),
-                context.getResources().getBoolean(R.bool.notification_entry_clear_close_default))) {
+                context.getResources().getBoolean(R.bool.keyboard_notification_entry_clear_close_default))) {
             MagikIME.deleteEntryKey(context);
         }
 

app/src/main/java/com/kunzisoft/keepass/magikeyboard/view/MagikeyboardView.java

@@ -0,0 +1,39 @@
+package com.kunzisoft.keepass.magikeyboard.view;
+
+import android.content.Context;
+import android.inputmethodservice.Keyboard;
+import android.inputmethodservice.KeyboardView;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.util.AttributeSet;
+
+import static com.kunzisoft.keepass.magikeyboard.MagikIME.KEY_BACK_KEYBOARD;
+import static com.kunzisoft.keepass.magikeyboard.MagikIME.KEY_CHANGE_KEYBOARD;
+
+public class MagikeyboardView extends KeyboardView {
+
+	public MagikeyboardView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public MagikeyboardView(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+
+	@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+	public MagikeyboardView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+	}
+
+	@Override
+	protected boolean onLongPress(Keyboard.Key key) {
+		// TODO Action on long press
+		if (key.codes[0] == KEY_BACK_KEYBOARD) {
+			getOnKeyboardActionListener().onKey(KEY_CHANGE_KEYBOARD, null);
+			return true;
+		} else {
+			//Log.d("LatinKeyboardView", "KEY: " + key.codes[0]);
+			return super.onLongPress(key);
+		}
+	}
+}

app/src/main/java/com/kunzisoft/keepass/model/Entry.java

@@ -1,11 +1,10 @@
-package com.kunzisoft.keepass_model;
+package com.kunzisoft.keepass.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import java.util.HashMap;
+import java.util.ArrayList;
-import java.util.Map;
+import java.util.List;
-import java.util.Set;
 
 public class Entry implements Parcelable {
 
@@ -13,14 +12,14 @@ public class Entry implements Parcelable {
     private String username;
     private String password;
     private String url;
-    private Map<String, String> customFields;
+    private List<Field> customFields;
 
     public Entry() {
         this.title = "";
         this.username = "";
         this.password = "";
         this.url = "";
-        this.customFields = new HashMap<>();
+        this.customFields = new ArrayList<>();
     }
 
     protected Entry(Parcel in) {
@@ -29,7 +28,7 @@ public class Entry implements Parcelable {
         password = in.readString();
         url = in.readString();
         //noinspection unchecked
-        customFields = in.readHashMap(String.class.getClassLoader());
+        customFields = in.readArrayList(Field.class.getClassLoader());
     }
 
     public static final Creator<Entry> CREATOR = new Creator<Entry>() {
@@ -76,16 +75,12 @@ public class Entry implements Parcelable {
         this.url = url;
     }
 
-    public Set<String> getCustomFieldsKeys() {
+    public List<Field> getCustomFields() {
-        return customFields.keySet();
+        return customFields;
     }
 
-    public String getCustomField(String key) {
+    public void addCustomField(Field field) {
-        return customFields.get(key);
+        this.customFields.add(field);
-    }
-
-    public void setCustomField(String key, String value) {
-        this.customFields.put(key, value);
     }
 
     @Override
@@ -99,6 +94,6 @@ public class Entry implements Parcelable {
         parcel.writeString(username);
         parcel.writeString(password);
         parcel.writeString(url);
-        parcel.writeMap(customFields);
+        parcel.writeArray(customFields.toArray());
     }
 }

app/src/main/java/com/kunzisoft/keepass/model/Field.java

@@ -0,0 +1,59 @@
+package com.kunzisoft.keepass.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class Field implements Parcelable {
+
+    private String name;
+    private String value;
+
+    public Field(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public Field(Parcel in) {
+        this.name = in.readString();
+        this.value = in.readString();
+    }
+
+    public static final Creator<Field> CREATOR = new Creator<Field>() {
+        @Override
+        public Field createFromParcel(Parcel in) {
+            return new Field(in);
+        }
+
+        @Override
+        public Field[] newArray(int size) {
+            return new Field[size];
+        }
+    };
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(name);
+        dest.writeString(value);
+    }
+}

app/src/main/java/com/kunzisoft/keepass/password/PasswordActivity.java

@@ -252,7 +252,7 @@ public class PasswordActivity extends StylishActivity
                 case LockingActivity.RESULT_EXIT_LOCK:
                 case Activity.RESULT_CANCELED:
                     setEmptyViews();
-                    App.getDB().clear();
+                    App.getDB().clear(getApplicationContext());
                     break;
             }
         }
@@ -938,7 +938,7 @@ public class PasswordActivity extends StylishActivity
     private void loadDatabase(String password, Uri keyfile) {
         // Clear before we load
         Database database = App.getDB();
-        database.clear();
+        database.clear(getApplicationContext());
         // Clear the shutdown flag
         App.clearShutdown();
 

app/src/main/java/com/kunzisoft/keepass/selection/EntrySelectionHelper.java

@@ -5,7 +5,8 @@ import android.content.Intent;
 import android.util.Log;
 
 import com.kunzisoft.keepass.database.PwEntry;
-import com.kunzisoft.keepass_model.Entry;
+import com.kunzisoft.keepass.model.Entry;
+import com.kunzisoft.keepass.model.Field;
 
 public class EntrySelectionHelper {
 
@@ -37,9 +38,11 @@ public class EntrySelectionHelper {
             entryModel.setUsername(entry.getUsername());
             entryModel.setPassword(entry.getPassword());
             entryModel.setUrl(entry.getUrl());
-            // TODO Fields
             if (entry.containsCustomFields()) {
-                //entryModel.setCustomField(entry.getFields());
+                entry.getFields()
+                        .doActionToAllCustomProtectedField(
+                                (key, value) -> entryModel.addCustomField(
+                                        new Field(key, value.toString())));
             }
 
             mReplyIntent.putExtra(

app/src/main/java/com/kunzisoft/keepass/settings/MagikIMESettings.java

@@ -17,21 +17,16 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.magikeyboard.settings;
+package com.kunzisoft.keepass.settings;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
-import com.kunzisoft.magikeyboard.R;
+import com.kunzisoft.keepass.R;
+import com.kunzisoft.keepass.lock.LockingActivity;
 
-import java.lang.reflect.Constructor;
+public class MagikIMESettings extends LockingActivity {
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class MagikIMESettings extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,26 +44,6 @@ public class MagikIMESettings extends AppCompatActivity {
                     .replace(R.id.fragment_container, new MagikIMESettingsFragment())
                     .commit();
         }
-
-        // TODO Remove after all dev
-        try {
-            Class<?> underDevClass = Class.forName("com.kunzisoft.keepass.dialogs.UnderDevelopmentFeatureDialogFragment");
-            Constructor<?> constructor = underDevClass.getConstructor();
-            Object object = constructor.newInstance();
-            Method showMethod = underDevClass.getMethod("show", FragmentManager.class, String.class);
-            showMethod.invoke(object, getSupportFragmentManager(), "magikeyboard_dev_dialog");
-
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        }
     }
 
     @Override

app/src/main/java/com/kunzisoft/keepass/settings/MagikIMESettingsFragment.java

@@ -1,15 +1,15 @@
-package com.kunzisoft.magikeyboard.settings;
+package com.kunzisoft.keepass.settings;
 
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;
 
-import com.kunzisoft.magikeyboard.R;
+import com.kunzisoft.keepass.R;
 
 public class MagikIMESettingsFragment extends PreferenceFragmentCompat {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         // Load the preferences from an XML resource
-        setPreferencesFromResource(R.xml.ime_preferences, rootKey);
+        setPreferencesFromResource(R.xml.keyboard_preferences, rootKey);
     }
 }

app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.java

@@ -51,7 +51,7 @@ import com.kunzisoft.keepass.dialogs.UnavailableFeatureDialogFragment;
 import com.kunzisoft.keepass.dialogs.UnderDevelopmentFeatureDialogFragment;
 import com.kunzisoft.keepass.fingerprint.FingerPrintHelper;
 import com.kunzisoft.keepass.icons.IconPackChooser;
-import com.kunzisoft.keepass.keyboard.KeyboardExplanationDialog;
+import com.kunzisoft.keepass.dialogs.KeyboardExplanationDialogFragment;
 import com.kunzisoft.keepass.settings.preferenceDialogFragment.DatabaseDescriptionPreferenceDialogFragmentCompat;
 import com.kunzisoft.keepass.settings.preferenceDialogFragment.DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat;
 import com.kunzisoft.keepass.settings.preferenceDialogFragment.DatabaseKeyDerivationPreferenceDialogFragmentCompat;
@@ -60,7 +60,6 @@ import com.kunzisoft.keepass.settings.preferenceDialogFragment.MemoryUsagePrefer
 import com.kunzisoft.keepass.settings.preferenceDialogFragment.ParallelismPreferenceDialogFragmentCompat;
 import com.kunzisoft.keepass.settings.preferenceDialogFragment.RoundsPreferenceDialogFragmentCompat;
 import com.kunzisoft.keepass.stylish.Stylish;
-import com.kunzisoft.magikeyboard.settings.MagikIMESettings;
 
 public class NestedSettingsFragment extends PreferenceFragmentCompat
         implements Preference.OnPreferenceClickListener {
@@ -303,8 +302,8 @@ public class NestedSettingsFragment extends PreferenceFragmentCompat
                 Preference keyboardPreference = findPreference(getString(R.string.magic_keyboard_key));
                 keyboardPreference.setOnPreferenceClickListener(preference -> {
                     if (getFragmentManager() != null) {
-                        KeyboardExplanationDialog fingerPrintDialog = new KeyboardExplanationDialog();
+                        KeyboardExplanationDialogFragment keyboardDialog = new KeyboardExplanationDialogFragment();
-                        fingerPrintDialog.show(getFragmentManager(), "keyboardExplanationDialog");
+                        keyboardDialog.show(getFragmentManager(), "keyboardExplanationDialog");
                     }
                     return false;
                 });

app/src/main/java/com/kunzisoft/keepass/stream/ActionReadBytes.java

@@ -0,0 +1,11 @@
+package com.kunzisoft.keepass.stream;
+
+import java.io.IOException;
+
+public interface ActionReadBytes {
+    /**
+     * Called after each buffer fill
+     * @param buffer filled
+     */
+    void doAction(byte[] buffer) throws IOException;
+}

app/src/main/java/com/kunzisoft/keepass/stream/LEDataInputStream.java

@@ -19,11 +19,9 @@
  */
 package com.kunzisoft.keepass.stream;
 
-import com.kunzisoft.keepass.utils.Types;
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.UUID;
+import java.util.Arrays;
 
 
 /** Little endian version of the DataInputStream
@@ -32,7 +30,7 @@ import java.util.UUID;
  */
 public class LEDataInputStream extends InputStream {
 
-	public static final long INT_TO_LONG_MASK = 0xffffffffL;
+	private static final long INT_TO_LONG_MASK = 0xffffffffL;
 	
 	private InputStream baseStream;
 
@@ -106,8 +104,9 @@ public class LEDataInputStream extends InputStream {
 	}
 
 	public byte[] readBytes(int length) throws IOException {
+	    // TODO Exception max length < buffer size
 		byte[] buf = new byte[length];
-		
+
 		int count = 0;
 		while ( count < length ) {
 			int read = read(buf, count, length - count);
@@ -126,6 +125,33 @@ public class LEDataInputStream extends InputStream {
 		return buf;
 	}
 
+    public void readBytes(int length, ActionReadBytes actionReadBytes) throws IOException {
+        int bufferSize = 256 * 3; // TODO Buffer size
+        byte[] buffer = new byte[bufferSize];
+
+        int offset = 0;
+        int read = 0;
+        while ( offset < length && read != -1) {
+
+            // To reduce the buffer for the last bytes reads
+            if (length - offset < bufferSize) {
+                bufferSize = length - offset;
+                buffer = new byte[bufferSize];
+            }
+            read = read(buffer, 0, bufferSize);
+
+            // To get only the bytes read
+            byte[] optimizedBuffer;
+            if (read >= 0 && buffer.length > read) {
+                optimizedBuffer = Arrays.copyOf(buffer, read);
+            } else {
+                optimizedBuffer = buffer;
+            }
+            actionReadBytes.doAction(optimizedBuffer);
+            offset += read;
+        }
+    }
+
 	public static int readUShort(InputStream is) throws IOException {
 		  byte[] buf = new byte[2];
 		  
@@ -146,11 +172,11 @@ public class LEDataInputStream extends InputStream {
 	   * @return
 	   */
 	  public static int readUShort( byte[] buf, int offset ) {
-	    return (buf[offset + 0] & 0xFF) + ((buf[offset + 1] & 0xFF) << 8);
+	    return (buf[offset] & 0xFF) + ((buf[offset + 1] & 0xFF) << 8);
 	  }
 
 	public static long readLong( byte buf[], int offset ) {
-		return ((long)buf[offset + 0] & 0xFF) + (((long)buf[offset + 1] & 0xFF) << 8) 
+		return ((long)buf[offset] & 0xFF) + (((long)buf[offset + 1] & 0xFF) << 8)
 		+ (((long)buf[offset + 2] & 0xFF) << 16) + (((long)buf[offset + 3] & 0xFF) << 24) 
 		+ (((long)buf[offset + 4] & 0xFF) << 32) + (((long)buf[offset + 5] & 0xFF) << 40) 
 		+ (((long)buf[offset + 6] & 0xFF) << 48) + (((long)buf[offset + 7] & 0xFF) << 56);
@@ -180,14 +206,8 @@ public class LEDataInputStream extends InputStream {
 	   * @return
 	   */
 	  public static int readInt( byte buf[], int offset ) {
-	    return (buf[offset + 0] & 0xFF) + ((buf[offset + 1] & 0xFF) << 8) + ((buf[offset + 2] & 0xFF) << 16)
+	    return (buf[offset] & 0xFF) + ((buf[offset + 1] & 0xFF) << 8) + ((buf[offset + 2] & 0xFF) << 16)
 	           + ((buf[offset + 3] & 0xFF) << 24);
 	  }
 
-	  public UUID readUUID() throws IOException {
-		  byte[] buf = readBytes(16);
-
-		  return Types.bytestoUUID(buf);
-	  }
-
 }

app/src/main/java/com/kunzisoft/keepass/timeout/TimeoutHelper.java

@@ -31,8 +31,9 @@ public class TimeoutHelper {
 
 	private static final String TAG = "TimeoutHelper";
 
-	private static final long DEFAULT_TIMEOUT = 5 * 60 * 1000;  // 5 minutes
+	public static final long DEFAULT_TIMEOUT = 5 * 60 * 1000;  // 5 minutes
-	
+	public static final long TIMEOUT_NEVER = -1;  // Infinite
+
 	public static void recordTime(Activity act) {
 		// Record timeout time in case timeout service is killed
 		long time = System.currentTimeMillis();
@@ -56,9 +57,9 @@ public class TimeoutHelper {
 		long cur_time = System.currentTimeMillis();
 		
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(act);
-		long timeout_start = prefs.getLong(act.getString(R.string.timeout_key), -1);
+		long timeout_start = prefs.getLong(act.getString(R.string.timeout_key), TIMEOUT_NEVER);
 		// The timeout never started
-		if (timeout_start == -1) {
+		if (timeout_start == TIMEOUT_NEVER) {
 			return true;
 		}
 
@@ -71,7 +72,7 @@ public class TimeoutHelper {
 		}
 		
 		// We are set to never timeout
-		if (timeout == -1) {
+		if (timeout == TIMEOUT_NEVER) {
 			return true;
 		}
 		

app/src/main/java/com/kunzisoft/keepass/utils/MemUtil.java

@@ -21,38 +21,132 @@ package com.kunzisoft.keepass.utils;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import com.kunzisoft.keepass.stream.ActionReadBytes;
+
+import org.apache.commons.io.IOUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 public class MemUtil {
+
+    private static final String TAG = MemUtil.class.getName();
+    public static final int BUFFER_SIZE_BYTES = 3 * 128;
+
+    public static void copyStream(InputStream in, OutputStream out) throws IOException {
+        byte[] buf = new byte[BUFFER_SIZE_BYTES];
+        int read;
+        try {
+            while ((read = in.read(buf)) != -1) {
+                out.write(buf, 0, read);
+            }
+        } catch (OutOfMemoryError error) {
+            throw new IOException(error);
+        }
+    }
+
+    public static void readBytes(@NonNull InputStream inputStream, ActionReadBytes actionReadBytes)
+            throws IOException {
+        byte[] buffer = new byte[MemUtil.BUFFER_SIZE_BYTES];
+        int read = 0;
+        while (read != -1) {
+            read = inputStream.read(buffer, 0, buffer.length);
+            if (read != -1) {
+                byte[] optimizedBuffer;
+                if (buffer.length == read) {
+                    optimizedBuffer = buffer;
+                } else {
+                    optimizedBuffer = Arrays.copyOf(buffer, read);
+                }
+                actionReadBytes.doAction(optimizedBuffer);
+            }
+        }
+
+        /*
+        byte[] buffer = new byte[BUFFER_SIZE_BYTES];
+        // To create the last buffer who is smaller
+        long numberOfFullBuffer = length / buffer.length;
+        long sizeOfFullBuffers = numberOfFullBuffer * buffer.length;
+        int read = 0;
+        //if (protectedBinary.length() > 0) {
+        while (read < length) {
+            // Create the last smaller buffer
+            if (read >= sizeOfFullBuffers)
+                buffer = new byte[(int) (length % buffer.length)];
+            read += inputStream.read(buffer, 0, buffer.length);
+            actionReadBytes.doAction(buffer);
+        }
+        //*/
+    }
+
 	public static byte[] decompress(byte[] input) throws IOException {
 		ByteArrayInputStream bais = new ByteArrayInputStream(input);
 		GZIPInputStream gzis = new GZIPInputStream(bais);
 		
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		Util.copyStream(gzis, baos);
+		copyStream(gzis, baos);
-		
-		return baos.toByteArray();
-	}
-	
-	public static byte[] compress(byte[] input) throws IOException {		
-		ByteArrayInputStream bais = new ByteArrayInputStream(input);
-		
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		GZIPOutputStream gzos = new GZIPOutputStream(baos);
-		Util.copyStream(bais, gzos);
-		gzos.close();
 		
 		return baos.toByteArray();
 	}
 
-	// For writing to a Parcel
+    public static byte[] compress(byte[] input) throws IOException {
+        ByteArrayInputStream bais = new ByteArrayInputStream(input);
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        GZIPOutputStream gzos = new GZIPOutputStream(baos);
+        copyStream(bais, gzos);
+        gzos.close();
+
+        return baos.toByteArray();
+    }
+
+    /**
+     * Compresses the input data using GZip and outputs the compressed data.
+     *
+     * @param input
+     *         An {@link InputStream} containing the input raw data.
+     *
+     * @return An {@link InputStream} to the compressed data.
+     */
+    public static InputStream compress(final InputStream input) {
+        final PipedInputStream compressedDataStream = new PipedInputStream(3 * 128);
+        Log.d(TAG, "About to compress input data using gzip asynchronously...");
+        PipedOutputStream compressionOutput;
+        GZIPOutputStream gzipCompressedDataStream = null;
+        try {
+            compressionOutput = new PipedOutputStream(compressedDataStream);
+            gzipCompressedDataStream = new GZIPOutputStream(compressionOutput);
+            IOUtils.copy(input, gzipCompressedDataStream);
+            Log.e(TAG, "Successfully compressed input data using gzip.");
+        } catch (IOException e) {
+            Log.e(TAG, "Failed to compress input data.", e);
+        } finally {
+            if (gzipCompressedDataStream != null) {
+                try {
+                    gzipCompressedDataStream.close();
+                } catch (IOException e) {
+                    Log.e(TAG, "Failed to close gzip output stream.", e);
+                }
+            }
+        }
+        return compressedDataStream;
+    }
+
+
+    // For writing to a Parcel
 	public static <K extends Parcelable,V extends Parcelable> void writeParcelableMap(
 			Parcel parcel, int flags, Map<K, V > map) {
 		parcel.writeInt(map.size());

app/src/main/java/com/kunzisoft/keepass/utils/Util.java

@@ -27,16 +27,11 @@ import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Typeface;
 import android.net.Uri;
-import android.util.TypedValue;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import com.kunzisoft.keepass.R;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 public class Util {
 
 	public static void gotoUrl(Context context, String url) throws ActivityNotFoundException {
@@ -49,20 +44,8 @@ public class Util {
 	public static void gotoUrl(Context context, int resId) throws ActivityNotFoundException {
 		gotoUrl(context, context.getString(resId));
 	}
-	
-	public static void copyStream(InputStream in, OutputStream out) throws IOException {
-		byte[] buf = new byte[1024];
-		int read;
-		try {
-            while ((read = in.read(buf)) != -1) {
-                out.write(buf, 0, read);
-            }
-        } catch (OutOfMemoryError error) {
-		    throw new IOException(error);
-        }
-	}
 
-    /**
+	/**
      * Replace font by monospace, must be called after seText()
      */
     public static void applyFontVisibilityTo(final Context context, final TextView textView) {

app/src/main/res/layout/about.xml

@@ -75,6 +75,12 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textAppearance="@android:style/TextAppearance.Small" />
+
+                    <TextView
+                        android:id="@+id/activity_about_build"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@android:style/TextAppearance.Small" />
                 </LinearLayout>
             </RelativeLayout>
 

app/src/main/res/layout/entry_edit.xml

@@ -110,6 +110,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textPassword"
+                        android:importantForAccessibility="no"
                         android:maxLines="1"
                         android:hint="@string/entry_password" />
                 </android.support.design.widget.TextInputLayout>
@@ -130,6 +131,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textPassword"
+                        android:importantForAccessibility="no"
                         android:maxLines="1"
                         android:hint="@string/entry_confpassword" />
                 </android.support.design.widget.TextInputLayout>

app/src/main/res/layout/entry_view_contents.xml

@@ -80,6 +80,7 @@
                 android:layout_height="wrap_content"
                 android:scrollHorizontally="true"
                 android:inputType="textPassword"
+				android:importantForAccessibility="no"
                 android:focusable="false"
                 android:lines="1"
                 style="@style/KeepassDXStyle.TextAppearance.TextEntryItem" />

app/src/main/res/layout/file_row.xml

@@ -24,10 +24,10 @@
     android:layout_height="wrap_content"
     android:paddingTop="12dp"
     android:paddingBottom="12dp"
-    android:paddingEnd="24dp"
+    android:paddingEnd="12dp"
-    android:paddingLeft="24dp"
+    android:paddingLeft="12dp"
-    android:paddingRight="24dp"
+    android:paddingRight="12dp"
-    android:paddingStart="24dp"
+    android:paddingStart="12dp"
     android:background="?android:attr/selectableItemBackground">
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/file_filename"
@@ -51,5 +51,5 @@
         android:src="@drawable/ic_info_white_24dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:tint="?attr/textColorInverse"/>
+        android:tint="?android:attr/textColorHintInverse"/>
 </RelativeLayout>

app/src/main/res/layout/file_selection.xml

@@ -49,20 +49,58 @@
                 android:paddingTop="48dp"
                 android:paddingBottom="24dp"
                 android:layout_marginBottom="36dp">
-                <TextView
+                <LinearLayout
-                    android:id="@+id/file_selection_title"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
-                    android:textSize="32sp"
-                    android:textStyle="bold"
-                    android:shadowColor="#393939"
-                    android:shadowDx="2"
-                    android:shadowDy="2"
-                    android:shadowRadius="4"
-                    android:paddingTop="?attr/actionBarSize"
-                    android:textColor="?attr/textColorInverse"
                     android:gravity="center"
-                    android:text="@string/app_name"/>
+                    android:orientation="horizontal">
+                    <TextView
+                        android:id="@+id/file_selection_title_part_1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="32sp"
+                        android:textStyle="bold"
+                        android:shadowColor="#393939"
+                        android:shadowDx="2"
+                        android:shadowDy="2"
+                        android:shadowRadius="4"
+                        android:paddingTop="?attr/actionBarSize"
+                        android:textColor="?attr/textColorInverse"
+                        android:gravity="center"
+                        android:text="@string/app_name_part1"/>
+                    <TextView
+                        android:id="@+id/file_selection_title_part_2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginLeft="12dp"
+                        android:textSize="32sp"
+                        android:textStyle="bold"
+                        android:shadowColor="#393939"
+                        android:shadowDx="2"
+                        android:shadowDy="2"
+                        android:shadowRadius="4"
+                        android:paddingTop="?attr/actionBarSize"
+                        android:textColor="?attr/colorAccentCompat"
+                        android:gravity="center"
+                        android:text="@string/app_name_part2"/>
+                    <TextView
+                        android:id="@+id/file_selection_title_part_3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginLeft="12dp"
+                        android:textSize="32sp"
+                        android:textStyle="bold"
+                        android:shadowColor="#393939"
+                        android:shadowDx="2"
+                        android:shadowDy="2"
+                        android:shadowRadius="4"
+                        android:paddingTop="?attr/actionBarSize"
+                        android:textColor="?android:attr/textColorHintInverse"
+                        android:gravity="center"
+                        android:text="@string/app_name_part3"/>
+                </LinearLayout>
             </FrameLayout>
 
             <TextView android:id="@+id/label_warning"
@@ -78,26 +116,36 @@
                 android:layout_below="@+id/file_selection_title_container"
                 android:visibility="gone" />
 
-            <TextView android:id="@+id/file_list_title"
+            <android.support.v7.widget.CardView
-                android:layout_marginLeft="@dimen/default_margin"
+                android:id="@+id/container_file_list"
-                android:layout_marginStart="@dimen/default_margin"
-                android:layout_marginRight="@dimen/default_margin"
-                android:layout_marginEnd="@dimen/default_margin"
-                android:gravity="center"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
+                android:backgroundTint="?attr/colorPrimary"
-                android:layout_below="@+id/label_warning"
+                android:layout_margin="12dp"
-                style="@style/KeepassDXStyle.TextAppearance.Title"
+                android:layout_below="@+id/label_warning">
-                android:textColor="?attr/colorAccentCompat"
+
-                android:text="@string/open_recent" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+                    <TextView android:id="@+id/file_list_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="12dp"
+                        style="@style/KeepassDXStyle.TextAppearance.Title"
+                        android:textColor="?android:attr/textColorHintInverse"
+                        android:text="@string/open_recent" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:background="?android:attr/textColorHintInverse"/>
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/file_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
 
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/file_list"
-                android:layout_alignParentBottom="true"
-                android:layout_below="@+id/file_list_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
 
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>

app/src/main/res/layout/file_selection_information.xml

@@ -14,6 +14,7 @@
 
     <android.support.v7.widget.AppCompatTextView
         android:id="@+id/file_path"
+        android:textIsSelectable="true"
         android:layout_margin="8dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -21,6 +22,7 @@
         android:textStyle="italic"/>
 
     <LinearLayout
+        android:id="@+id/file_modification_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="end">
@@ -39,6 +41,7 @@
     </LinearLayout>
 
     <RelativeLayout
+        android:id="@+id/file_size_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dp">
@@ -61,12 +64,4 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true" />
     </RelativeLayout>
-
-    <android.support.v7.widget.AppCompatTextView
-        android:id="@+id/file_warning"
-        android:layout_margin="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        style="@style/KeepassDXStyle.TextAppearance.WarningTextStyle"/>
 </LinearLayout>

app/src/main/res/layout/keyboard_popup_fields.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="@color/keyboard_background"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/keyboard_popup_fields_list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_toStartOf="@+id/keyboard_popup_close"
+        android:layout_toLeftOf="@+id/keyboard_popup_close" />
+
+    <ImageButton
+        android:id="@+id/keyboard_popup_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginStart="5dp"
+        android:layout_marginLeft="5dp"
+        android:background="@drawable/key_background"
+        android:src="@drawable/ic_close_white_24dp" />
+</RelativeLayout>

app/src/main/res/layout/keyboard_popup_fields_item.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <TextView
+        android:id="@+id/keyboard_popup_field_item_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/key_background"
+        android:layout_margin="5dp"
+        android:paddingStart="5dp"
+        android:paddingEnd="5dp"
+        android:text="qsjdbhqsdv"
+        android:textColor="@color/white"/>
+</RelativeLayout>

app/src/main/res/layout/keyboard_view.xml

@@ -17,16 +17,16 @@
   You should have received a copy of the GNU General Public License
   along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<android.inputmethodservice.KeyboardView
+<com.kunzisoft.keepass.magikeyboard.view.MagikeyboardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/keyboard"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_alignParentBottom="true"
-    android:keyPreviewLayout ="@layout/key_preview"
     android:background="@color/keyboard_background"
     android:keyBackground="@drawable/key_background"
     android:keyTextColor="#ffff"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
+    android:popupLayout="@layout/keyboard_popup_fields"
     />

app/src/main/res/layout/password.xml

@@ -135,6 +135,7 @@
                             android:layout_height="wrap_content"
                             android:hint="@string/password"
                             android:inputType="textPassword"
+                            android:importantForAccessibility="no"
                             android:imeOptions="actionDone"
                             android:maxLines="1"/>
                     </android.support.design.widget.TextInputLayout>

app/src/main/res/layout/set_password.xml

@@ -60,6 +60,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textPassword"
+                        android:importantForAccessibility="no"
                         android:maxLines="1"
                         android:hint="@string/hint_pass"/>
                 </android.support.design.widget.TextInputLayout>
@@ -73,6 +74,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="textPassword"
+                        android:importantForAccessibility="no"
                         android:maxLines="1"
                         android:hint="@string/hint_conf_pass"/>
                 </android.support.design.widget.TextInputLayout>

app/src/main/res/values-ar/strings.xml

@@ -49,12 +49,12 @@
     <string name="entry_url">عنوان الرابط</string>
     <string name="entry_user_name">إسم المستخدم</string>
     <string name="error_database_exists">هذا الملف موجود مِن قَبل.</string>
-    <string name="error_failed_to_launch_link">فشل في إطلاق الرابط.</string>
+    <string name="error_failed_to_launch_link">تعذر فتح الرابط.</string>
     <string name="error_filename_required">إسم الملف مطلوب.</string>
     <string name="error_file_not_create">تعذر إنشاء الملف :</string>
     <string name="error_invalid_path">مسار غير صالح.</string>
     <string name="error_no_name">الإسم لازم.</string>
-    <string name="error_pass_match">إنّ الكلمتان السريتان غير متطابقتين.</string>
+    <string name="error_pass_match">الكلمات السرية غير متطابقة.</string>
     <string name="error_title_required">العنوان مطلوب.</string>
     <string name="field_name">اسم الحقل</string>
     <string name="field_value">قيمة الحقل</string>
@@ -89,7 +89,7 @@
     <string name="minus">ناقص</string>
     <string name="never">أبداً</string>
     <string name="no_results">لا توجد نتائج للبحث</string>
-    <string name="no_url_handler">لا يوجد معالج لهذا العنوان.</string>
+    <string name="no_url_handler">لا يوجد عنوان لهذا الرابط.</string>
     <string name="progress_create">إنشاء قاعدة بيانات جديدة …</string>
     <string name="protection">الحماية</string>
     <string name="read_only">للقراءة فقط</string>
@@ -103,19 +103,19 @@
     <string name="search_label">البحث</string>
     <string name="sort_menu">الفرز</string>
     <string name="sort_ascending">تصاعدياً</string>
-    <string name="sort_title">فرز حسب العنوان</string>
+    <string name="sort_title">العنوان</string>
-    <string name="sort_username">فرز حسب اسم المستخدم</string>
+    <string name="sort_username">اسم المستخدِم</string>
-    <string name="sort_creation_time">فرز حسب تاريخ الإنشاء</string>
+    <string name="sort_creation_time">حسب تاريخ الإنشاء</string>
-    <string name="sort_last_modify_time">فرز حسب تاريخ آخر تعديل</string>
+    <string name="sort_last_modify_time">حسب تاريخ آخر تعديل</string>
     <string name="special">خاصّ</string>
     <string name="search">البحث</string>
     <string name="search_results">نتائج البحث</string>
     <string name="underline">تسطير</string>
     <string name="uppercase">حروف كبيرة</string>
     <string name="warning">تحذير</string>
-    <string name="warning_empty_password">هل تريد حقاً استخدام سلسلة فارغة ككلمة مرور ؟</string>
+    <string name="warning_empty_password">هل تريد حقاً استخدام سلسلة فارغة ككلمة سرية ؟</string>
     <string name="warning_no_encryption_key">هل أنت متأكد من أنك لا تريد استخدام أي مفتاح تشفير ؟</string>
-    <string name="version_label">الإصدار :</string>
+    <string name="version_label">الإصدار %1$s</string>
     <string name="education_new_node_title">أضف عناصر جديدة إلى قاعدتك</string>
     <string name="education_fingerprint_title">قم بفتح قاعدة بياناتك ببصمتك</string>
     <string name="education_entry_new_field_title">إضافة حقول مخصصة</string>
@@ -123,4 +123,36 @@
     <string name="education_lock_title">تأمين قاعدة البيانات</string>
     <string name="about_feedback">الملاحظات :</string>
 
-</resources>
+<string name="about_description">KeePass DX تنفيذ الروبوت مدير KeePass كلمة المرور.</string>
+    <string name="add_entry">إضافة كلمة للقاموس</string>
+    <string name="edit_entry">دخول فقط</string>
+    <string name="key_derivation_function">وظيفة اشتقاق المفتاح</string>
+    <string name="app_timeout">مهلة التطبيق</string>
+    <string name="app_timeout_summary">الوقت قبل قفل قاعدة البيانات عندما يكون التطبيق غير نشط</string>
+    <string name="browser_intall_text">تصفح الملف يتطلب إدارة الملف أوبينينتينتس لتثبيت، انقر فوق أدناه للقيام بذلك. بسبب بعض المراوغات في إدارة الملفات، التصفح قد لا تعمل بشكل صحيح في المرة الأولى.</string>
+    <string name="clipboard_error">بعض الهواتف الروبوت سامسونج يكون خلل في تنفيذ حافظة تسبب نسخ من تطبيقات إلى فشل. مزيد من التفاصيل:</string>
+    <string name="clipboard_timeout">مهلة الحافظة</string>
+    <string name="clipboard_timeout_summary">الوقت قبل مسح الحافظة بعد نسخ اسم المستخدم أو كلمة المرور</string>
+    <string name="select_to_copy">نسخ صورة رمز QR الى الحافظة</string>
+    <string name="retrieving_db_key">إنشاء مفتاح قاعدة البيانات…</string>
+    <string name="default_checkbox">استخدام هذا كقاعدة البيانات الافتراضية</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d د $ %1 كونزيسوفت تأتي مع \"الضمان لا على الإطلاق\"؛ هذا هو البرمجيات الحرة، وكنت أهلا إعادة توزيعه تحت شروط إصدار الترخيص 3 أو في وقت لاحق.</string>
+    <string name="entry_accessed">الوصول إلى</string>
+    <string name="entry_expires">انتهاء صلاحية</string>
+    <string name="entry_keyfile">مفتاح الملف</string>
+    <string name="error_arc4">تشفير دفق أركفوور غير معتمد.</string>
+    <string name="error_can_not_handle_uri">KeePass DX تنفيذ الروبوت مدير KeePass كلمة المرور.</string>
+    <string name="error_could_not_create_parent">تعذر إنشاء الدليل الأصل.</string>
+    <string name="error_invalid_db">كلمة محجوزة غير معروفة.</string>
+    <string name="error_nokeyfile">فشل في إنشاء ملف مفاتيح الرموز.</string>
+    <string name="error_out_of_memory">الجهاز نفدت الذاكرة أثناء تحليل قاعدة البيانات الخاصة بك.</string>
+    <string name="error_load_database">لا يمكن أن تكون قاعدة البيانات تحميل</string>
+    <string name="error_load_database_KDF_memory">غير قادر على تحميل المفتاح، في محاولة لتقليل الذاكرة المستخدمة من قبل KDF.</string>
+    <string name="error_pass_gen_type">يجب تحديد كلمة مرور واحد على الأقل نوع الجيل</string>
+    <string name="error_rounds_not_number">يجب أن تكون \"جولات\" عددا.</string>
+    <string name="error_rounds_too_large">\"جولات\" كبيرة جداً. الإعداد إلى 2147483648.</string>
+    <string name="error_string_key">يجب أن يكون لكل سلسلة اسم حقل.</string>
+    <string name="error_wrong_length">قم بإدخال عدد صحيح موجب في الحقل \"المدة\"</string>
+    <string name="error_autofill_enable_service">لا يمكن تمكين خدمة الملء التلقائي.</string>
+    <string name="error_move_folder_in_itself">غير قادر على نقل مجموعة إلى نفسه.</string>
+    </resources>

app/src/main/res/values-ca/strings.xml

@@ -39,7 +39,7 @@
     <string name="clipboard_timeout">Temps d\'espera del porta-retalls</string>
     <string name="clipboard_timeout_summary">Temps abans de netejar el porta-retalls després de copiar un usuari o contrasenya</string>
     <string name="select_to_copy">Selecciona per copiar %1$s al porta-retalls</string>
-    <string name="creating_db_key">Creant clau de base de dades&#8230;</string>
+    <string name="retrieving_db_key">Creant clau de base de dades&#8230;</string>
     <string name="database">Base de dades</string>
     <string name="decrypting_db">Desencriptant continguts de la base de dades&#8230;</string>
     <string name="default_checkbox">Utilitza aquesta com a base de dades per defecte</string>
@@ -89,7 +89,7 @@
     <string name="password">Contrasenya</string>
     <string name="install_from_play_store">Instal·la de la Play Store</string>
     <string name="install_from_f_droid">Instal·la de la F-Droid</string>
-    <string name="InvalidPassword">Contrasenya o arxiu clau invàlids.</string>
+    <string name="invalid_password">Contrasenya o arxiu clau invàlids.</string>
     <string name="invalid_db_sig">Format de base de dades desconegut.</string>
     <string name="length">Longitud</string>
     <string name="list_size_title">Mida de la llista de grups</string>
@@ -139,9 +139,8 @@
     <string name="underline">Subratllat</string>
     <string name="unsupported_db_version">Versió de la base de dades no suportada.</string>
     <string name="uppercase">Majúscules</string>
-    <string name="warning_read_only">La teva tarja SD és de només lectura. No podràs guardar canvis a la teva base de dades.</string>
     <string name="warning_unmounted">La teva tarja SD no està muntada al teu dispositiu. No podràs carregar ni guardar una base de dades.</string>
-    <string name="version_label">Versió:</string>
+    <string name="version_label">Versió %1$s</string>
 
     <string name="education_unlock_summary">Introdueix una contrasenya i/o un arxiu clau per desbloquejar la base de dades.</string>
 

app/src/main/res/values-cs/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
  Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
      
@@ -24,142 +24,143 @@
     <string name="about_feedback">Připomínky:</string>
     <string name="about_homepage">Domovská stránka:</string>
     <string name="about_description">KeePass DX je Android implementace správce hesel KeePass.</string>
-    <string name="accept">Přijat</string>
+    <string name="accept">Přijmout</string>
     <string name="add_entry">Přidat záznam</string>
     <string name="add_group">Přidat skupinu</string>
-    <string name="encryption_algorithm">Algoritmus</string>
+    <string name="encryption_algorithm">Šifrovací algoritmus</string>
     <string name="app_timeout">Časový limit aplikace</string>
-    <string name="app_timeout_summary">Čas před zamknutím databáze, když je aplikace neaktivní.</string>
+    <string name="app_timeout_summary">Doba nečinnosti v aplikaci, po které uzamknout databázi</string>
     <string name="application">Aplikace</string>
     <string name="menu_app_settings">Nastavení aplikace</string>
     <string name="beta_dontask">Znovu nezobrazovat</string>
     <string name="brackets">Závorky</string>
-    <string name="browser_intall_text">Procházení souborů vyžaduje Open Intents File Manager, klikněte níže pro jeho nainstalování. Kvůli zvláštnostem ve správci souborů, nemusí procházení správně fungovat při prvním spuštění.</string>
+    <string name="browser_intall_text">"Procházení souborů využívá  správce souborů Open Intents – ten nainstalujete ťuknutím níže. Kvůli zvláštnostem ve správci souborů se může stát, že procházení při prvním spuštění nezafunguje správně."</string>
     <string name="cancel">Storno</string>
-    <string name="clipboard_cleared">Schránka vyčištěna.</string>
+    <string name="clipboard_cleared">Schránka vyčištěna</string>
-    <string name="clipboard_error_title">Chyba schránkyr</string>
+    <string name="clipboard_error_title">Chyba schránky</string>
-    <string name="clipboard_error">Některé Samsung Android telefony mají chybu v implementaci schránky, která způsobuje chybu při kopírování z aplikací. Pro více detailů jdi na:</string>
+    <string name="clipboard_error">Některé Android telefony od Samsung mají chybu v implementaci schránky, která způsobuje chybu při kopírování z aplikací. Další podrobnosti naleznete na:</string>
-    <string name="clipboard_error_clear">Vyčištění schránky selhalo</string>
+    <string name="clipboard_error_clear">Vyčištění schránky se nezdařilo</string>
     <string name="clipboard_timeout">Časový limit schránky</string>
-    <string name="clipboard_timeout_summary">Čas před vyčištěním schránky po zkopírování jména nebo hesla</string>
+    <string name="clipboard_timeout_summary">Doba po zkopírování jména nebo heslo po které vyčistit chránku</string>
-    <string name="select_to_copy">Kopírovat %1$s do schránky</string>
+    <string name="select_to_copy">Vyberte zkopírovat %1$s do schránky</string>
-    <string name="creating_db_key">Vytvářím databázový klíč&#8230;</string>
+    <string name="retrieving_db_key">Vytváření klíče databáze…</string>
     <string name="database">Databáze</string>
-    <string name="decrypting_db">Dešifruji obsah databáze&#8230;</string>
+    <string name="decrypting_db">Rozšifrování obsahu databáze…</string>
-    <string name="default_checkbox">Použít jako výchozí databázi</string>
+    <string name="default_checkbox">Použít tuto databázi jako výchozí</string>
-    <string name="digits">Čísla</string>
+    <string name="digits">Číslice</string>
-    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft dodáván BEZ JAKÉKOLIV ZÁRUKY; Toto je free software zdarma, a je možná jeho redistribuce pod podmínkou licence GPL verze 3 nebo novější.</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft přichází BEZ JAKÉKOLIV ZÁRUKY; Toto je svobodný software a je možné ho šířit dál za dodržení podmínek licence GPL verze 3 nebo novější.</string>
-    <string name="select_database_file">Zadejte názvev souboru databáze</string>
+    <string name="select_database_file">Vyberte existující databázi</string>
     <string name="entry_accessed">Poslední přístup</string>
     <string name="entry_cancel">Storno</string>
     <string name="entry_comment">Poznámky</string>
     <string name="entry_confpassword">Potvrďte heslo</string>
     <string name="entry_created">Vytvořeno</string>
-    <string name="entry_expires">Vyprší</string>
+    <string name="entry_expires">Platnost skončí</string>
-    <string name="entry_keyfile">Klíčový soubor</string>
+    <string name="entry_keyfile">Soubor s klíčem</string>
     <string name="entry_modified">Změněno</string>
     <string name="entry_not_found">Vstupní data nenalezena.</string>
     <string name="entry_password">Heslo</string>
     <string name="entry_save">Uložit</string>
     <string name="entry_title">Název</string>
-    <string name="entry_url">URL</string>
+    <string name="entry_url">URL adresa</string>
     <string name="entry_user_name">Uživatelské jméno</string>
-    <string name="error_arc4">ArcFour stream šifra není podporována.</string>
+    <string name="error_arc4">ARCFOUR proudová šifra není podporována.</string>
-    <string name="error_can_not_handle_uri">KeePass DX nemůže zpracovat tuto uri.</string>
+    <string name="error_can_not_handle_uri">KeePass DX se nedaří tuto URI zpracovat.</string>
-    <string name="error_could_not_create_parent">Nelze vyvořit nadřazený adresář.</string>
+    <string name="error_could_not_create_parent">Nedaří se vytvořit nadřazenou složku.</string>
-    <string name="error_database_exists">Tento soubor již existuje.</string>
+    <string name="error_database_exists">Tento soubor už existuje.</string>
-    <string name="error_failed_to_launch_link">Nelze spustit odkaz.</string>
+    <string name="error_failed_to_launch_link">Odkaz se nedaří otevřít.</string>
-    <string name="error_filename_required">Je požadováno jméno souboru.</string>
+    <string name="error_filename_required">Je vyžadován název souboru.</string>
-    <string name="error_file_not_create">Nelze vytvořit soubor:</string>
+    <string name="error_file_not_create">Soubor se nedaří vytvořit:</string>
-    <string name="error_invalid_db">Chybná databáze.</string>
+    <string name="error_invalid_db">Chybná databáze nebo nerozpoznaný hlavní klíč.</string>
-    <string name="error_invalid_path">Chybná cesta.</string>
+    <string name="error_invalid_path">Neplatný popis umístění.</string>
-    <string name="error_no_name">Jméno je povinné.</string>
+    <string name="error_no_name">Je vyžadován název.</string>
-    <string name="error_nokeyfile">Heslo nebo klíčový soubor jsou povinné.</string>
+    <string name="error_nokeyfile">Je vyžadováno heslo nebo soubor s klíčem.</string>
-    <string name="error_out_of_memory">Přístroj má málo paměti pro zpracování databáze. Možná je příliš velká pro Váš přístroj.</string>
+    <string name="error_out_of_memory">Přístroji došla při zpracovávání databáze kapacita operační paměti.</string>
-    <string name="error_pass_gen_type">Minimálně jeden typ generování hesla musí být zvolen</string>
+    <string name="error_pass_gen_type">Je třeba zvolit alespoň jeden typ vytváření hesla</string>
-    <string name="error_pass_match">Hesla se neshodují.</string>
+    <string name="error_pass_match">Zadání hesla se neshodují.</string>
-    <string name="error_rounds_not_number">Opakování musí být číslo.</string>
+    <string name="error_rounds_not_number">Je třeba, aby „Počet průchodů“ bylo číslo.</string>
-    <string name="error_rounds_too_large">Opakování příliš mnoho.  Nastavuji na 2147483648.</string>
+    <string name="error_rounds_too_large">Příliš mnoho „průchodů“. Bude nastaveno na 2147483648.</string>
-    <string name="error_string_key">Pro každou hodnotu je vyžadován název pole.</string>
+    <string name="error_string_key">Je třeba, aby každý řetězec měl název kolonky.</string>
-    <string name="error_title_required">Název je povinný.</string>
+    <string name="error_title_required">Je vyžadován název.</string>
-    <string name="error_wrong_length">Zadejte celé kladné číslo do délky pole</string>
+    <string name="error_wrong_length">Do kolonky „Délka“ zadejte celé kladné číslo</string>
-    <string name="field_name">Název pole</string>
+    <string name="field_name">Název kolonky</string>
-    <string name="field_value">Hodnota pole</string>
+    <string name="field_value">Hodnota v kolonce</string>
     <string name="file_not_found">Soubor nenalezen.</string>
     <string name="file_browser">Správce souborů</string>
-    <string name="generate_password">Generovat heslo</string>
+    <string name="generate_password">Vytvořit heslo</string>
-    <string name="hint_conf_pass">potvrdit heslo</string>
+    <string name="hint_conf_pass">zopakujte zadání hesla</string>
-    <string name="hint_generated_password">generované heslo</string>
+    <string name="hint_generated_password">vytvořené heslo</string>
     <string name="hint_group_name">Název skupiny</string>
-    <string name="hint_keyfile">klíčový soubor</string>
+    <string name="hint_keyfile">soubor s klíčem</string>
     <string name="hint_length">délka</string>
     <string name="hint_pass">heslo</string>
     <string name="password">Heslo</string>
-    <string name="install_from_play_store">Instalovat z Play</string>
+    <string name="install_from_play_store">Nainstalovat z katalogu Play</string>
-    <string name="install_from_f_droid">Instalovat z F-Droid</string>
+    <string name="install_from_f_droid">Nainstalovat z katalogu F-Droid</string>
-    <string name="InvalidPassword">Chybné heslo nebo klíčový soubor.</string>
+    <string name="invalid_password">Nesprávné heslo nebo soubor s klíčem.</string>
-    <string name="invalid_algorithm">Chybný algoritmus.</string>
+    <string name="invalid_algorithm">Nesprávný algoritmus.</string>
-    <string name="invalid_db_sig">Databázový formát nelze rozpoznat.</string>
+    <string name="invalid_db_sig">Nedaří se rozpoznat formát databáze.</string>
-    <string name="keyfile_does_not_exist">Klíčový soubor neexistuje.</string>
+    <string name="keyfile_does_not_exist">Soubor s klíčem neexistuje.</string>
-    <string name="keyfile_is_empty">Klíčový soubor je prázdný.</string>
+    <string name="keyfile_is_empty">Soubor s klíčem je prázdný.</string>
     <string name="length">Délka</string>
-    <string name="list_size_title">Velikost seznamu skupin</string>
+    <string name="list_size_title">Velikost položek seznamu</string>
-    <string name="list_size_summary">Velikost textu v seznamu skupin</string>
+    <string name="list_size_summary">Velikost textu v seznamu prvků</string>
-    <string name="loading_database">Načítám databázi&#8230;</string>
+    <string name="loading_database">Načítání databáze…</string>
     <string name="lowercase">Malá písmena</string>
     <string name="maskpass_title">Skrýt heslo</string>
-    <string name="maskpass_summary">Skrýt heslo jako výchozí</string>
+    <string name="maskpass_summary">Ve výchozím stavu skrývat heslo</string>
     <string name="menu_about">O aplikaci</string>
     <string name="menu_change_key">Změnit hlavní klíč</string>
     <string name="settings">Nastavení</string>
     <string name="menu_db_settings">Nastavení databáze</string>
     <string name="menu_delete">Smazat</string>
-    <string name="menu_donate">Přispět</string>
+    <string name="menu_donate">Podpořit vývoj darem</string>
-    <string name="menu_edit">Změnit</string>
+    <string name="menu_edit">Upravit</string>
     <string name="menu_hide_password">Skrýt heslo</string>
     <string name="menu_lock">Zamknout databázi</string>
     <string name="menu_open">Otevřít</string>
     <string name="menu_search">Hledat</string>
     <string name="menu_showpass">Zobrazit heslo</string>
-    <string name="menu_url">Jdi na URL</string>
+    <string name="menu_url">Jít na URL</string>
     <string name="minus">Mínus</string>
     <string name="never">Nikdy</string>
-    <string name="no_results">žádný výsledek hledání</string>
+    <string name="no_results">Žádné výsledky hledání</string>
-    <string name="no_url_handler">Žádný handler pro toto url.</string>
+    <string name="no_url_handler">Žádná obsluha pro tuto URL adresu.</string>
-    <string name="open_recent">Otevřít poslední databázi :</string>
+    <string name="open_recent">Nedávné databáze:</string>
-    <string name="omitbackup_title">Neprohledávat zálohy a koš</string>
+    <string name="omitbackup_title">Neprohledávat položky v záloze</string>
-    <string name="omitbackup_summary">Vynechat skupiny Záloha a Koš ve výsledcích hledání</string>
+    <string name="omitbackup_summary">Vynechat z výsledků vyhledávání skupinu „Záloha“ (platí pouze pro .kdb soubory)</string>
-    <string name="progress_create">Vytvářím novou databázi&#8230;</string>
+    <string name="progress_create">Vytváření nové databáze…</string>
-    <string name="progress_title">Zpracovávám&#8230;</string>
+    <string name="progress_title">Zpracování…</string>
-    <string name="protection">Protection</string>
+    <string name="protection">Ochrana</string>
-    <string name="read_only_warning">KeePass DX nemá právo pro zápis do místa umístění databáze, proto bude databáze otevřena jen pro čtení.</string>
+    <string name="read_only_warning">KeePass DX nemá oprávnění pro zápis do místa uložení databáze, ta proto bude otevřena pouze pro čtení.</string>
-    <string name="read_only_kitkat_warning">Od verze Android KitKat některá zařízení neumožňují aplikacím zápis na SD kartu.</string>
+    <string name="read_only_kitkat_warning">S Android od verze KitKat neumožňují některá zařízení aplikacím zápis na SD kartu.</string>
-    <string name="recentfile_title">Historie posledních souborů</string>
+    <string name="recentfile_title">Historie nedávných souborů</string>
-    <string name="recentfile_summary">Pamatovat si naposledy použité soubory</string>
+    <string name="recentfile_summary">Pamatovat si nedávno otevřené soubory</string>
-    <string name="remember_keyfile_summary">Pamatovat si umístění klíčového souboru</string>
+    <string name="remember_keyfile_summary">Pamatovat si umístění souborů s klíči</string>
-    <string name="remember_keyfile_title">Uložit klíčový soubor</string>
+    <string name="remember_keyfile_title">Uložit soubor s klíčem</string>
     <string name="remove_from_filelist">Odstranit</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Kořen</string>
-    <string name="rounds">Počet zašifrování</string>
+    <string name="rounds">Počet šifrovacích průchodů</string>
-    <string name="rounds_explanation">Vyšší počet opakování šifrování zvýší bezpečnost proti hrubému útoku, ale může výrazně zpomalit načítání a ukládání.</string>
+    <string name="rounds_explanation">Vyšší počet šifrovacích průchodů zvýší odolnost proti útoku zkoušením všech možných hesel, ale může výrazně zpomalit načítání a ukládání.</string>
-    <string name="rounds_hint">opakování</string>
+    <string name="rounds_hint">průchody</string>
-    <string name="saving_database">Ukládám databázi&#8230;</string>
+    <string name="saving_database">Ukládání databáze…</string>
     <string name="space">Místo</string>
     <string name="search_label">Hledat</string>
-    <string name="sort_db">Seřadit podle DB</string>
+    <string name="sort_db">Pořadí řazení databáze</string>
     <string name="special">Speciální</string>
-    <string name="search">Zadejte název/popis</string>
+    <string name="search">Hledat</string>
     <string name="search_results">Výsledky hledání</string>
     <string name="encryption_twofish">Twofish</string>
-    <string name="underline">Podtrženo</string>
+    <string name="underline">Podtržítko</string>
     <string name="unsupported_db_version">Nepodporovaná verze databáze.</string>
     <string name="uppercase">Velká písmena</string>
-    <string name="warning_read_only">Vaše SD karta je v módu jen pro čtení. Nebudete moct ukládat změny v databázi.</string>
+    <string name="version_label">Verze %1$s</string>
-    <string name="warning_unmounted">Vaše SD karta není momentálně připojena v zařízení. Nebudete moct načíst nebo vytvořit databázi.</string>
+    <string name="warning_read_only">Vaše SD karta je nyní v režimu pouze pro čtení. Nebude možné ukládat změny v databázi.</string>
-    <string name="version_label">Verze:</string>
+    <string name="warning_unmounted">Souborový systém na SD kartě momentálně není v systému zařízení připojený. Nebude možné načítat ani vytvářet databáze.</string>
-
+    <string name="education_unlock_summary">Databázi odemknete zadáním hesla a/nebo souboru s klíčem.
-    <string name="education_unlock_summary">Zadejte heslo a/nebo soubor s klíčem pro odemknutí databáze.</string>
+\n
+\nNezapomeňte si po každé úpravě zazálohovat kopii svého .kdbx souboru na bezpečné místo.</string>
 
     <string-array name="timeout_options">
     	<item>5 sekund</item>
@@ -177,4 +178,210 @@
     	<item>Střední</item>
     	<item>Velký</item>
     </string-array>
+<string name="edit_entry">Upravit záznam</string>
+    <string name="add_string">Přidat řetězec</string>
+    <string name="encryption">Šifrování</string>
+    <string name="key_derivation_function">Funkce pro odvozování klíče</string>
+    <string name="extended_ASCII">Rozšířené ASCII</string>
+    <string name="allow">Umožnit</string>
+    <string name="clipboard_swipe_clean">Schránku vymažete přejetím</string>
+    <string name="error_load_database">Databázi se nedaří načíst</string>
+    <string name="error_load_database_KDF_memory">Klíč se nedaří načíst, zkuste snížit množství paměti, využívané funkcí pro odvození klíče.</string>
+    <string name="error_autofill_enable_service">Službu automatického vyplňování se nedaří zapnout.</string>
+    <string name="error_move_folder_in_itself">Není možné přesunout skupinu do ní samotné.</string>
+    <string name="file_not_found_content">Soubor nenalezen. Zkuste ho znovu otevřít ze svého poskytovatele obsahu.</string>
+    <string name="list_entries_show_username_title">Zobrazovat uživatelská jména</string>
+    <string name="list_entries_show_username_summary">V seznamech položek zobrazovat uživatelská jména</string>
+    <string name="copy_field">Kopie %1$s</string>
+    <string name="menu_form_filling_settings">Vyplňování formulářů</string>
+    <string name="menu_copy">Zkopírovat</string>
+    <string name="menu_move">Přesunout</string>
+    <string name="menu_paste">Vložit</string>
+    <string name="menu_cancel">Storno</string>
+    <string name="menu_fingerprint_remove_key">Odebrat otisk prstu</string>
+    <string name="menu_file_selection_read_only">Pouze pro čtení</string>
+    <string name="menu_open_file_read_and_write">Čtení a zápis</string>
+    <string name="read_only">Pouze pro čtení</string>
+    <string name="encryption_explanation">Algoritmus pro šifrování celé databáze. (Hesla, uživatelská jména, poznámky a všechna data v databázi jsou šifrována vybraným algoritmem)</string>
+    <string name="kdf_explanation">Klíč pro šifrovací algoritmus je vytvořen přetvořením zkomprimovaného hlavního klíče (SHA-256) pomocí náhodně proložené funkce pro odvození klíče.</string>
+    <string name="memory_usage">Využití paměti</string>
+    <string name="memory_usage_explanation">Množství paměti (v binárních bajtech) které použít funkcí pro odvození klíče.</string>
+    <string name="parallelism">Souběžné zpracovávání</string>
+    <string name="parallelism_explanation">Stupeň souběžného zpracovávání (tj. počet vláken) použitý funkcí pro odvození klíče.</string>
+    <string name="sort_menu">Seřadit</string>
+    <string name="sort_ascending">Nejnižší první ↓</string>
+    <string name="sort_groups_before">Skupiny první</string>
+    <string name="sort_recycle_bin_bottom">Koš jako poslední</string>
+    <string name="sort_title">Nadpis</string>
+    <string name="sort_username">Uživatelské jméno</string>
+    <string name="sort_creation_time">Okamžik vytvoření</string>
+    <string name="sort_last_modify_time">Okamžik poslední úpravy</string>
+    <string name="sort_last_access_time">Okamžik posledního přístupu</string>
+    <string name="use_saf_summary">Použít pro procházení souborů aplikační rámec pro přístup k úložišti z Android (SAF) – k dispozici v KitKat a novějším</string>
+    <string name="use_saf_title">Aplikační rámec přístupu k úložišti</string>
+    <string name="warning">Varování</string>
+    <string name="warning_password_encoding">Vaše heslo nejspíš obsahuje znaky nepodporované znakovou sadou Latin-1, která je používaná v .kdb souborech. Protože jsou převedeny na stejné písmeno, je doporučeno heslo změnit, aby bylo bezpečnější.</string>
+    <string name="warning_empty_password">Opravdu chcete ponechat databázi nechráněnou (bez hesla)?</string>
+    <string name="warning_no_encryption_key">Opravdu nechcete používat šifrovací klíč?</string>
+    <string name="configure_fingerprint">Otisk prstu je zařízením podporován, ale není nastavený</string>
+    <string name="scanning_fingerprint">Očekávání otisků prstů</string>
+    <string name="encrypted_value_stored">Šifrované heslo uloženo</string>
+    <string name="fingerprint_invalid_key">Problém s neplatným otiskem prstu. Obnovte své heslo.</string>
+    <string name="fingerprint_not_recognized">Otisk prstu není rozpoznán</string>
+    <string name="fingerprint_error">Problém s otiskem prstu: %1$s</string>
+    <string name="store_with_fingerprint">Použít pro uložení tohoto hesla otisk prstu</string>
+    <string name="no_password_stored">Pro tuto databázi zatím není uloženo žádné heslo</string>
+    <string name="history">Historie</string>
+    <string name="appearance">Vzhled</string>
+    <string name="general">Obecné</string>
+    <string name="autofill">Automatické vyplnění</string>
+    <string name="autofill_service_name">KeePass DX služba automatického vyplňování</string>
+    <string name="autofill_sign_in_prompt">Přihlašovat se pomocí KeePass DX</string>
+    <string name="set_autofill_service_title">Nastavit výchozí službu automatického vyplňování</string>
+    <string name="set_autofill_service_summary">Zapnutím této služby se vám budou snáze vyplňovat formuláře z ostatních aplikacích</string>
+    <string name="password_size_title">Délka hesla</string>
+    <string name="password_size_summary">Nastavit výchozí délku vytvářených hesel</string>
+    <string name="list_password_generator_options_title">Znaků hesla</string>
+    <string name="list_password_generator_options_summary">Nastavit výchozí počet znaků pro vytváření hesel</string>
+    <string name="clipboard">Schránka</string>
+    <string name="clipboard_notifications_title">Oznamování schránky</string>
+    <string name="clipboard_notifications_summary">Zapnout oznamování schránky o kopírování kolonek položky</string>
+    <string name="clipboard_warning">Pokud vaše zařízení není schopné automaticky mazat výstřižky ze schránky, smažte zkopírovanou položku z historie schránky ručně.</string>
+    <string name="lock">Zamknout</string>
+    <string name="lock_database_screen_off_title">Zamknout obrazovku</string>
+    <string name="lock_database_screen_off_summary">Při zhasnutí obrazovky uzamknout databázi</string>
+    <string name="fingerprint_quick_unlock_title">Jak nastavit rychlé odemykání otiskem prstu?</string>
+    <string name="fingerprint_setting_text">Nastavte svůj otisk prstu pro své zařízení v</string>
+    <string name="fingerprint_setting_way_text">„Nastavení“ → „Zabezpečení“ → „Otisk prstu“</string>
+    <string name="fingerprint_type_password_text">Zadejte své heslo v Keepass DX</string>
+    <string name="fingerprint_scan_to_store">Naskenujte otisk prstu a ukládejte tak hlavní heslo zabezpečeně</string>
+    <string name="fingerprint_scan_to_open">Pro otevření databáze při odškrtnuté volbě heslo, naskenujte otisk svého prstu</string>
+    <string name="usage">Použítí</string>
+    <string name="fingerprint">Otisk</string>
+    <string name="fingerprint_enable_title">Skenování otisků prstů</string>
+    <string name="fingerprint_enable_summary">Otevírat databáze otiskem prstu</string>
+    <string name="fingerprint_delete_all_title">Smazat šifrovací klíče</string>
+    <string name="fingerprint_delete_all_summary">Smazat všechny šifrovací klíče související s rozpoznáváním otisku prstu</string>
+    <string name="fingerprint_delete_all_warning">Opravdu chcete smazat všechny klíče související s otisky prstů?</string>
+    <string name="unavailable_feature_text">Toto funkci se nedaří spustit.</string>
+    <string name="unavailable_feature_version">Verze %1$s vámi používaného systému Android je starší, než minimální požadovaná %2$s.</string>
+    <string name="unavailable_feature_hardware">Hardware nebyl rozpoznán.</string>
+    <string name="file_name">Název souboru</string>
+    <string name="path">Popis umístění</string>
+    <string name="assign_master_key">Přiřadit hlavní klíč</string>
+    <string name="create_keepass_file">Vytvořit KeePass soubor</string>
+    <string name="bytes">Bajtů</string>
+    <string name="full_file_path_enable_title">Popis umístění souboru</string>
+    <string name="full_file_path_enable_summary">Zobrazit úplný popis umístění souboru</string>
+    <string name="recycle_bin_title">Použít Koš</string>
+    <string name="recycle_bin_summary">Namísto smazání, přesunout skupinu či položku nejprve do „Koše“</string>
+    <string name="permission_external_storage_rationale_write_database">Pro zápis do databáze potřebuje KeePass DX oprávnění na externí úložiště</string>
+    <string name="permission_external_storage_rationale_read_database">Aby bylo možné načítat URI adresy, které nepocházejí z poskytování obsahu, potřebuje KeePass DX oprávnění k přístupu na externí úložiště</string>
+    <string name="permission_external_storage_denied">Oprávnění k externímu úložišti odepřeno</string>
+    <string name="permission_external_storage_never_ask">Akci nelze bez oprávnění k externímu úložišti provést</string>
+    <string name="monospace_font_fields_enable_title">Písmo kolonky</string>
+    <string name="monospace_font_fields_enable_summary">Čitelnost znaků v kolonkách můžete přizpůsobit změnou písma</string>
+    <string name="auto_open_file_uri_title">Automaticky otevřít označený soubor</string>
+    <string name="auto_open_file_uri_summary">Po označení ve správci souborů na obrazovce pro výběr soubor automaticky otevřít</string>
+    <string name="allow_copy_password_title">Zkopírovat heslo</string>
+    <string name="allow_copy_password_summary">Umožnit kopírovat heslo a chráněné kolonky do schránky</string>
+    <string name="allow_copy_password_warning">VAROVÁNÍ: Schránka je sdílena všemi aplikacemi. Pokud jsou do ní zkopírovány citlivé údaje, může se k nim dostat další software.</string>
+    <string name="warning_disabling_storage_access_framework">VAROVÁNÍ: Vypnutí této funkce může vést k nemožnosti otevírat nebo ukládat databáze</string>
+    <string name="open_link_database">Odkaz na KDBX soubor který otevřít</string>
+    <string name="database_name_title">Název databáze</string>
+    <string name="database_description_title">Popis databáze</string>
+    <string name="database_version_title">Verze databáze</string>
+    <string name="text_appearance">Vzhled textu</string>
+    <string name="application_appearance">Vzhled aplikace</string>
+    <string name="other">Ostatní</string>
+
+    <string name="keyboard">Klávesnice</string>
+    <string name="magic_keyboard_title">Magikeyboard</string>
+    <string name="magic_keyboard_summary">Aktivovat vlastní klávesnici která snadno vyplní hesla a identitu</string>
+    <string name="magic_keyboard_preference_title">Nastavení Magikeyboard</string>
+    <string name="magic_keyboard_configure_title">Jak nastavit klávesnici pro zabezpečené vyplňování formulářů?</string>
+    <string name="magic_keyboard_activate_setting_text">Zapněte Magikeyboard v nastavení zařízení.</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">„Nastavení“ → „Jazyk a vstup“ → „Stávající klávesnice“ a zvolte nějakou.</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">nebo („Nastavení“ → „Jazyk a vstup“ → „Virtuální klávesnice“ a zvolte nějakou.)</string>
+    <string name="keyboards_choose_magikeyboard_text">Když potřebujete vyplnit formulář, zvolte Magikeyboard.</string>
+    <string name="keyboards_swicth_magikeyboard_text">Na Magikeyboard můžete snadno přepnout ze své hlavní klávesnice a to stisknutím jazykového tlačítka na své klávesnici, dlouhým podržením mezerníku, nebo (pokud není k dispozici) pomocí:</string>
+    <string name="keyboard_select_entry_text">Vyberte položku klávesou.</string>
+    <string name="keyboard_fill_field_text">Vyplnit kolonky pomocí prvků položky.</string>
+    <string name="keyboard_lock_database_text">Zamknout databázi.</string>
+    <string name="keyboard_back_main_keyboard_text">Vrátit se zpět k hlavní klávesnici.</string>
+
+    <string name="allow_no_password_title">Umožnit nevyplněné heslo</string>
+    <string name="allow_no_password_summary">Zpřístupnit otevírací tlačítko pokud není vybrána žádná identifikace hesla</string>
+    <string name="enable_read_only_title">Pouze pro čtení</string>
+    <string name="enable_read_only_summary">Ve výchozím stavu otevírat databáze pouze pro čtení</string>
+
+    <string name="enable_education_screens_title">Výukové obrazovky</string>
+    <string name="enable_education_screens_summary">Zvýraznit prvky a naučit se jak aplikace funguje</string>
+    <string name="reset_education_screens_title">Resetovat výukové obrazovky</string>
+    <string name="reset_education_screens_summary">Resetovat zobrazení výukových položek</string>
+    <string name="reset_education_screens_text">Reset výukových obrazovek</string>
+    <string name="education_create_database_title">Vytvořte svůj databázový soubor</string>
+    <string name="education_create_database_summary">Zatím ještě KeePass DX neznáte, vytvořte svůj první soubor pro správu hesel.</string>
+    <string name="education_select_database_title">Otevřít existující databázi</string>
+    <string name="education_select_database_summary">Správce KeePass jste už používali. Stačí jen otevřít KDBX soubor z prohlížeče souborů.</string>
+    <string name="education_open_link_database_title">Postačí odkaz na umístění souboru</string>
+    <string name="education_open_link_database_summary">Databázi také můžete otevírat pomocí fyzického odkazu (se file:// a content:// například).</string>
+    <string name="education_new_node_title">Přidejte nové položky do databáze</string>
+    <string name="education_new_node_summary">Přidat položky pro správu vašich digitálních identit.
+\n
+\nPřidat skupiny (ekvivalent složek) pro uspořádávání položek a databáze.</string>
+    <string name="education_search_title">Snadno hledejte položky</string>
+    <string name="education_search_summary">Hledejte položky podle názvu, uživatelského jméno nebo dalších kolonek a snadno se tak dostávejte ke svým heslům.</string>
+    <string name="education_fingerprint_title">Odemkněte databázi pomocí otisku prstu</string>
+    <string name="education_fingerprint_summary">Propojte své heslo a otisk prstu pro snadné odemykání databáze.</string>
+    <string name="education_entry_edit_title">Upravit položku</string>
+    <string name="education_entry_edit_summary">Upravte svou položku pomocí vlastních kolonek, odkazy na data fondu je možné přidat mezi kolonky různých položek.</string>
+    <string name="education_generate_password_title">Vytvořit silné heslo</string>
+    <string name="education_generate_password_summary">Vytvořit odolné heslo které přiřadit položce, snadno ji určit dle kritérií formuláře a nezapomenout bezpečné heslo které si můžete zapamatovat.</string>
+    <string name="education_entry_new_field_title">Přidat vlastní kolonky</string>
+    <string name="education_entry_new_field_summary">Pokud chcete zaregistrovat základní kolonku, která není ve výchozím stavu k dispozici, jednoduše vyplňte novou. Také ji můžete vizuálně chránit.</string>
+    <string name="education_unlock_title">Odemknout databázi</string>
+    <string name="education_read_only_title">Povolit pouze čtení</string>
+    <string name="education_read_only_summary">Změnit režim otevírání pro dané sezení.
+\n
+\nV režimu pouze pro čtení zabráníte nechtěným změnám do databáze.
+\n
+\nV režimu zápisu je možné přidávat, mazat nebo měnit všechny prvky dle libosti.</string>
+    <string name="education_field_copy_title">Zkopírujte kolonku</string>
+    <string name="education_field_copy_summary">Zkopírujte kolonku a snadno ji vkládejte kam chcete
+\n
+\nJe možné použít vícero metod vyplňování formulářů. Použijte svou oblíbenou.</string>
+    <string name="education_lock_title">Uzamčení databáze</string>
+    <string name="education_lock_summary">Rychle uzamkněte databázi. Je možné nastavit, aby se aplikace zamkla – po chvíli a po zhasnutí obrazovky.</string>
+    <string name="education_sort_title">Řaďte položky</string>
+    <string name="education_sort_summary">Řaďte položky a skupiny podle konkrétních parametrů.</string>
+    <string name="education_donation_title">Zapojit se</string>
+    <string name="education_donation_summary">Zapojte se a pomozte zvýšit stabilitu, zabezpečení a přidávat více funkcí.</string>
+
+    <string name="html_text_ad_free">Narozdíl od mnoha aplikací pro správu hesel, tato je <strong>bez reklam</strong>, <strong>svobodný software</strong> a neodesílá nikam žádné osobní údaje a to ani ve své variantě zdarma.</string>
+    <string name="html_text_buy_pro">Zakoupením varianty „pro“ získáte přístup k této <strong>vizuální funkci</strong> a hlavně pomůžete <strong>uskutečnění komunitních projektů.</strong></string>
+    <string name="html_text_feature_generosity">Tato <strong>vizuální funkce</strong> je k dispozici díky vaší štědrosti.</string>
+    <string name="html_text_donation">Pro zajištění svobody nás všech a pokračování aktivity, počítáme s vaším <strong>přispěním.</strong></string>
+
+    <string name="html_text_dev_feature">Tato funkce je <strong>ve vývoji</strong> a potřebuje váš <strong>příspěvek</strong> aby byla brzy k dispozici.</string>
+    <string name="html_text_dev_feature_buy_pro">Zakoupením <strong>pro</strong> varianty,</string>
+    <string name="html_text_dev_feature_contibute"><strong>Zapojením se</strong>,</string>
+    <string name="html_text_dev_feature_encourage">povzbudíte vývojáře k přidávání <strong>nových funkcí</strong> a <strong>opravování chyb</strong> dle vašich připomínek.</string>
+    <string name="html_text_dev_feature_thanks">Mnohé díky za vaše přispění.</string>
+    <string name="html_text_dev_feature_work_hard">Tvrdě pracujeme na brzkém vydání této funkce.</string>
+    <string name="html_text_dev_feature_upgrade">Nezapomeňte aplikaci aktualizovat.</string>
+
+    <string name="download">Stáhnout</string>
+    <string name="contribute">Zapojit se</string>
+
+    <string name="encryption_chacha20">ChaCha20</string>
+
+    <string name="kdf_AES">AES KDF</string>
+    <string name="kdf_Argon2">Argon2</string>
+
+    <string name="style_choose_title">Vyberte motiv vzhledu</string>
+    <string name="style_choose_summary">Změnit motiv vzhledu aplikace změnou barev</string>
+    <string name="icon_pack_choose_title">Vyberte sadu ikon</string>
+    <string name="icon_pack_choose_summary">Změnit sadu ikon aplikace</string>
+
 </resources>

app/src/main/res/values-da/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
  Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
      
@@ -26,29 +26,29 @@
     <string name="accept">Accepter</string>
     <string name="add_entry">Tilføj post</string>
     <string name="add_group">Tilføj gruppe</string>
-    <string name="encryption_algorithm">Algoritme</string>
+    <string name="encryption_algorithm">Krypteringsalgoritme</string>
-    <string name="app_timeout">Applikations timeout</string>
+    <string name="app_timeout">Timeout</string>
-    <string name="app_timeout_summary">Tid før databasen låses, når applikationen er inaktiv.</string>
+    <string name="app_timeout_summary">Tid før databasen låses, når programmet er inaktiv</string>
-    <string name="application">Applikation</string>
+    <string name="application">App</string>
-    <string name="menu_app_settings">Applikations-indstillinger</string>
+    <string name="menu_app_settings">Indstillinger</string>
 	<string name="beta_dontask">Vis ikke igen</string>
     <string name="brackets">Parenteser</string>
-    <string name="browser_intall_text">Fil-browsing kræver applikationen "Open Intents File Manager", klik nedenfor for at installere den. Grundet nogle særheder i filmanageren er det ikke sikkert, at fil-browsing virker korrekt forste gang, at du anvender applikationen.</string>
+    <string name="browser_intall_text">Filhåndtering kræver at OpenIntents File Manager er installeret, klik nedenfor for at gøre dette. På grund af nogle særheder i filhåndtering, fungerer det muligvis ikke korrekt i første omgang.</string>
     <string name="cancel">Annuller</string>
-    <string name="clipboard_cleared">Udklipsholder ryddet.</string>
+    <string name="clipboard_cleared">Udklipsholder ryddet</string>
-    <string name="clipboard_error_title">Udklipsholder-fejl</string>
+    <string name="clipboard_error_title">Udklipsfejl</string>
-    <string name="clipboard_error">Nogle Samsung Android enheder har en fejl i implementeringen af udklipsholderen, som får kopiering fra applikationer til at fejle. For yderligere oplysninger gå til:</string>
+    <string name="clipboard_error">Nogle Samsung Android enheder har en fejl i implementeringen af udklipsholderen, som får kopiering fra apps til at mislykkes. Flere oplysninger:</string>
     <string name="clipboard_error_clear">Rydningen af udklipsholderen fejlede</string>
     <string name="clipboard_timeout">Udklipsholder timeout</string>
     <string name="clipboard_timeout_summary">Tid før udklipsholderen bliver ryddet efter kopiering af brugernavn eller adgangskode</string>
-    <string name="select_to_copy">Vælg for at kopiere %1$s til udklipsholderen</string>
+    <string name="select_to_copy">Vælg for at kopiere %1$s til udklipsholder</string>
-    <string name="creating_db_key">Opretter databasenøgle&#8230;</string>
+    <string name="retrieving_db_key">Opretter databasenøgle…</string>
     <string name="database">Database</string>
-    <string name="decrypting_db">Dekrypterer databaseindhold&#8230;</string>
+    <string name="decrypting_db">Dekrypterer databaseindhold…</string>
-    <string name="default_checkbox">Brug denne database som standard</string>
+    <string name="default_checkbox">Brug som standarddatabase</string>
     <string name="digits">Cifre</string>
-    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 3 or later.</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft kommer med ABSOLUT INGEN GARANTI; Det er fri software, og kan videredistribueres under betingelserne i GPL version 3 eller nyere.</string>
-    <string name="select_database_file">Angiv navn på databasefil</string>
+    <string name="select_database_file">Vælg en eksisterende database</string>
     <string name="entry_accessed">Senest åbnet</string>
     <string name="entry_cancel">Annuller</string>
     <string name="entry_comment">Kommentarer</string>
@@ -60,32 +60,32 @@
     <string name="entry_not_found">Data for posten blev ikke fundet.</string>
     <string name="entry_password">Adgangskode</string>
     <string name="entry_save">Gem</string>
-    <string name="entry_title">Navn</string>
+    <string name="entry_title">Titel</string>
     <string name="entry_url">URL</string>
     <string name="entry_user_name">Brugernavn</string>
-    <string name="error_arc4">"ArcFour stream cipher" er ikke understøttet.</string>
+    <string name="error_arc4">ARCFOUR stream cipher er ikke understøttet.</string>
-    <string name="error_can_not_handle_uri">KeePass DX kan ikke håndtere denne uri.</string>
+    <string name="error_can_not_handle_uri">KeePass DX ikke kan håndtere denne URI.</string>
     <string name="error_could_not_create_parent">Kunne ikke oprette rodbiblioteket.</string>
-    <string name="error_database_exists">Denne fil eksisterer allerede.</string>
+    <string name="error_database_exists">Filen eksisterer allerede.</string>
-    <string name="error_failed_to_launch_link">Det mislykkedes at åbne linket.</string>
+    <string name="error_failed_to_launch_link">Kunne ikke åbne linket.</string>
     <string name="error_filename_required">Et filnavn er påkrævet.</string>
     <string name="error_file_not_create">Kunne ikke oprette fil:</string>
-    <string name="error_invalid_db">Ugyldig database.</string>
+    <string name="error_invalid_db">Ugyldig database eller ukendt hovednøgle.</string>
     <string name="error_invalid_path">Ugyldig sti.</string>
     <string name="error_no_name">Et navn er påkrævet.</string>
-    <string name="error_nokeyfile">En adgangskode eller nøglefil er påkrævet.</string>
+    <string name="error_nokeyfile">En nøglefil er påkrævet.</string>
-    <string name="error_out_of_memory">Telefonen løb tør for hukommelse under analysen af din database. Den kan være for stor til, at din telefon kan håndtere den.</string>
+    <string name="error_out_of_memory">Enheden løb tør for hukommelse under parsing af databasen.</string>
-    <string name="error_pass_gen_type">Mindst én adgangskode-genererings-type skal vælges</string>
+    <string name="error_pass_gen_type">Der skal vælges mindst én kode for kodeordsgenerering</string>
-    <string name="error_pass_match">Adgangskoder matcher ikke.</string>
+    <string name="error_pass_match">Adgangskoderne er ikke ens.</string>
-    <string name="error_rounds_not_number">Gentagelser skal være en talværdi.</string>
+    <string name="error_rounds_not_number">\"Runder\" skal være en talværdi.</string>
-    <string name="error_rounds_too_large">For stor gentagelses-værdi.  Maksimal gentagelses-værdi er 2147483648.</string>
+    <string name="error_rounds_too_large">\"Runder\" er for stor. Sættes til 2147483648.</string>
-    <string name="error_string_key">Et felt-navn er nødvendigt for hver streng.</string>
+    <string name="error_string_key">Hver streng skal have et feltnavn.</string>
     <string name="error_title_required">En titel er påkrævet.</string>
-    <string name="error_wrong_length">Angiv et positivt helt tal i feltet</string>
+    <string name="error_wrong_length">Angiv et positivt heltal i feltet \"Længde\"</string>
-    <string name="field_name">Felt-navn</string>
+    <string name="field_name">Feltnavn</string>
-    <string name="field_value">Felt-værdi</string>
+    <string name="field_value">Feltværdi</string>
     <string name="file_not_found">Filen blev ikke fundet.</string>
-    <string name="file_browser">Fil-browser</string>
+    <string name="file_browser">Filhåndtering</string>
     <string name="generate_password">Generer adgangskode</string>
     <string name="hint_conf_pass">bekræft adgangskode</string>
     <string name="hint_generated_password">genereret adgangskode</string>
@@ -94,22 +94,22 @@
     <string name="hint_length">længde</string>
     <string name="hint_pass">adgangskode</string>
     <string name="password">Adgangskode</string>
-    <string name="install_from_play_store">Installer fra Play Butik</string>
+    <string name="install_from_play_store">Installer fra Google Play</string>
     <string name="install_from_f_droid">Installer fra F-Droid</string>
-    <string name="InvalidPassword">Ugyldig adgangskode eller nøglefil.</string>
+    <string name="invalid_password">Ugyldig adgangskode eller nøglefil.</string>
     <string name="invalid_algorithm">Ugyldig algoritme.</string>
     <string name="invalid_db_sig">Databaseformatet blev ikke genkendt.</string>
     <string name="keyfile_does_not_exist">Nøglefil eksisterer ikke.</string>
-    <string name="keyfile_is_empty">Nøglefil er tom.</string>
+    <string name="keyfile_is_empty">Nøglefilen er tom.</string>
     <string name="length">Længde</string>
-    <string name="list_size_title">Gruppeliste størrelse</string>
+    <string name="list_size_title">Størrelse på listeelementer</string>
-    <string name="list_size_summary">Tekststørrelse i gruppelisten</string>
+    <string name="list_size_summary">Tekststørrelse i elementliste</string>
-    <string name="loading_database">Indlæser database&#8230;</string>
+    <string name="loading_database">Indlæser database…</string>
     <string name="lowercase">Små bogstaver</string>
-    <string name="maskpass_title">Skjul adgangskode</string>
+    <string name="maskpass_title">Masker adgangskode</string>
     <string name="maskpass_summary">Skjul adgangskoder som standard</string>
     <string name="menu_about">Om</string>
-    <string name="menu_change_key">Skift master-adgangskode</string>
+    <string name="menu_change_key">Skift masternøgle</string>
     <string name="settings">Indstillinger</string>
     <string name="menu_db_settings">Database indstillinger</string>
     <string name="menu_delete">Slet</string>
@@ -121,44 +121,45 @@
     <string name="menu_search">Søg</string>
     <string name="menu_showpass">Vis adgangskode</string>
     <string name="menu_url">Gå til URL</string>
-    <string name="minus">Minus</string>
+    <string name="minus">Bindestreg</string>
     <string name="never">Aldrig</string>
     <string name="no_results">Ingen søgeresultater</string>
-    <string name="no_url_handler">Kan ikke håndtere denne url.</string>
+    <string name="no_url_handler">Kan ikke håndtere denne URL.</string>
-    <string name="open_recent">Åbn seneste database :</string>
+    <string name="open_recent">Seneste databaser:</string>
-    <string name="omitbackup_title">Søg ikke efter backup poster og poster i papirkurven</string>
+    <string name="omitbackup_title">Gennemsøg ikke backup poster</string>
-    <string name="omitbackup_summary">Udelad \'Backup\' og papirkurvs-gruppen i søgeresultater</string>
+    <string name="omitbackup_summary">Udelad \"Backup\" - gruppen fra søgeresultaterne (gælder kun for .kdb filer)</string>
-    <string name="progress_create">Opretter ny database&#8230;</string>
+    <string name="progress_create">Opretter ny database…</string>
-    <string name="progress_title">Arbejder&#8230;</string>
+    <string name="progress_title">Arbejder…</string>
     <string name="protection">Beskyttelse</string>
-    <string name="read_only_warning">KeePass DX har ikke rettigheder til at skrive til database-lokalisationen, så din database vil blive åbnet som skrivebeskyttet.</string>
+    <string name="read_only_warning">KeePass DX har ikke rettigheder til at skrive til databasen, databasen vil blive åbnet som skrivebeskyttet.</string>
-    <string name="read_only_kitkat_warning">Fra Android KitKat er det på nogle enheder ikke længere muligt for applikationer at skrive til hukommelseskortet.</string>
+    <string name="read_only_kitkat_warning">Startende med Android KitKat, tillader nogle enheder ikke længere apps at skrive til SD-kortet.</string>
     <string name="recentfile_title">Seneste filhistorik</string>
-    <string name="recentfile_summary">Husk seneste filnavne</string>
+    <string name="recentfile_summary">Husk senest anvendte filnavne</string>
     <string name="remember_keyfile_summary">Husker placeringen af nøglefiler</string>
     <string name="remember_keyfile_title">Gem nøglefil</string>
     <string name="remove_from_filelist">Fjern</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="root">Root</string>
+    <string name="root">Rod</string>
-    <string name="rounds">Krypterings-gentagelser</string>
+    <string name="rounds">Transformér \"Runder\"</string>
-    <string name="rounds_explanation">Højere krypterings-gentagelser giver øget beskyttelse imod brute-force angreb, men kan påvirke læsnings- og skrivehastigheden betydentligt.</string>
+    <string name="rounds_explanation">Højere antal krypteringsrunder giver øget beskyttelse imod brute-force angreb, men kan påvirke læsnings- og skrivehastigheden betydentligt.</string>
-    <string name="rounds_hint">gentagelser</string>
+    <string name="rounds_hint">runder</string>
-    <string name="saving_database">Gemmer database&#8230;</string>
+    <string name="saving_database">Gemmer database…</string>
     <string name="space">Mellemrum</string>
     <string name="search_label">Søg</string>
     <string name="sort_db">DB sorteringsrækkefølge</string>
     <string name="special">Speciel</string>
-    <string name="search">Post titel/beskrivelse</string>
+    <string name="search">Søg</string>
     <string name="search_results">Søgeresultater</string>
     <string name="encryption_twofish">Twofish</string>
-    <string name="underline">Understreget</string>
+    <string name="underline">Understregning</string>
     <string name="unsupported_db_version">Database-versionen er ikke understøttet.</string>
     <string name="uppercase">Store bogstaver</string>
-    <string name="warning_read_only">Dit hukommelseskort er skrivebeskyttet. Du er muligvis ikke i stand til at gemme ændringer til din database.</string>
+    <string name="warning_read_only">SD-kortet er i øjeblikket skrivebeskyttet, kan muligvis ikke gemme ændringer i databasen.</string>
-    <string name="warning_unmounted">Dit hukommelseskort er ikke monteret i din enhed. Du vil ikke være i stand til at indlæse eller oprette din database.</string>
+    <string name="warning_unmounted">SD-kortet er ikke monteret i enheden, kan ikke indlæse eller oprette en database.</string>
-    <string name="version_label">Version:</string>
+    <string name="version_label">Version %1$s</string>
-
+    <string name="education_unlock_summary">Angiv en adgangskode og/eller en nøglefil til at låse databasen op.
-    <string name="education_unlock_summary">Angiv en adgangskode og/eller en nøglefil for at få adgang til din database.</string>
+\n
+\nHusk at gemme en kopi af .kdbx filen i et sikkert sted efter hver ændring.</string>
 
     <string-array name="timeout_options">
     	<item>5 sekunder</item>
@@ -176,4 +177,210 @@
     	<item>Mellem</item>
     	<item>Stor</item>
     </string-array>
-</resources>
+<string name="edit_entry">Rediger post</string>
+    <string name="add_string">Tilføj streng</string>
+    <string name="encryption">Kryptering</string>
+    <string name="key_derivation_function">Nøgleafledningsfunktion</string>
+    <string name="extended_ASCII">Udvidet ASCII</string>
+    <string name="allow">Tillad</string>
+    <string name="clipboard_swipe_clean">Stryg for at at rydde udklipsholder nu</string>
+    <string name="error_load_database">Database kan ikke indlæses</string>
+    <string name="error_load_database_KDF_memory">Ude af stand til at indlæse nøglen, prøv at reducere den hukommelse, der bruges af KDF.</string>
+    <string name="error_autofill_enable_service">Tjenesten AutoFyld kan ikke aktiveres.</string>
+    <string name="error_move_folder_in_itself">Kan ikke flytte en gruppe til sig selv.</string>
+    <string name="file_not_found_content">Filen blev ikke fundet. Prøv at genåbne fra indholdsudbyderen.</string>
+    <string name="list_entries_show_username_title">Vis brugernavne</string>
+    <string name="list_entries_show_username_summary">Vis brugernavne i postlister</string>
+    <string name="copy_field">Kopi af %1$s</string>
+    <string name="menu_form_filling_settings">Formularudfyldning</string>
+    <string name="menu_copy">Kopier</string>
+    <string name="menu_move">Flyt</string>
+    <string name="menu_paste">Indsæt</string>
+    <string name="menu_cancel">Annuller</string>
+    <string name="menu_fingerprint_remove_key">Fjern fingeraftryksnøgle</string>
+    <string name="menu_file_selection_read_only">Skrivebeskyttet</string>
+    <string name="menu_open_file_read_and_write">Læs og skriv</string>
+    <string name="read_only">Skrivebeskyttet</string>
+    <string name="encryption_explanation">Algoritme til kryptering af hele databasen. (adgangskoder, brugernavne, noter og alle data i databasen er krypteret med den valgte algoritme)</string>
+    <string name="kdf_explanation">For at generere nøglen til krypteringsalgoritmen, omdannes den komprimerede hovednøgle (SHA-256) ved hjælp af et tilfældigt saltet nøgleafledning funktion.</string>
+    <string name="memory_usage">Hukommelsesforbrug</string>
+    <string name="memory_usage_explanation">Hukommelse (i binær byte), som anvendes af nøgleafledningsfunktion.</string>
+    <string name="parallelism">Parallelitet</string>
+    <string name="parallelism_explanation">"Grad af parallelitet (dvs. antallet af tråde), som anvendes af  nøgleafledningsfunktion."</string>
+    <string name="sort_menu">Sorter</string>
+    <string name="sort_ascending">Stigende ↓</string>
+    <string name="sort_groups_before">Grupper før</string>
+    <string name="sort_recycle_bin_bottom">Papirkurv nederst</string>
+    <string name="sort_title">Titel</string>
+    <string name="sort_username">Brugernavn</string>
+    <string name="sort_creation_time">Oprettelsestidspunkt</string>
+    <string name="sort_last_modify_time">Tidspunkt for seneste ændring</string>
+    <string name="sort_last_access_time">Senest åbnet</string>
+    <string name="use_saf_summary">Brug Android Storage Access (SAF) som filhåndtering (KitKat og senere)</string>
+    <string name="use_saf_title">Storage Access Framework</string>
+    <string name="warning">Advarsel</string>
+    <string name="warning_password_encoding">Adgangskoden kan indeholde bogstaver der ikke understøttes af det Latin-1 tegnsæt, der bruges af .kdb filer. Da alle disse konverteres til samme bogstav, anbefales det at ændre adgangskoden for at gøre det sikrere.</string>
+    <string name="warning_empty_password">Brug en tom streng som adgangskode?</string>
+    <string name="warning_no_encryption_key">Bekræft ingen brug af en krypteringsnøgle?</string>
+    <string name="configure_fingerprint">Fingeraftryk er understøttet, men ikke konfigureret for denne enhed</string>
+    <string name="scanning_fingerprint">Venter på fingeraftryk</string>
+    <string name="encrypted_value_stored">Krypteret adgangskode er gemt</string>
+    <string name="fingerprint_invalid_key">Ugyldig fingeraftryksnøgle. Gendan adgangskode.</string>
+    <string name="fingerprint_not_recognized">Fingeraftryk ikke genkendt</string>
+    <string name="fingerprint_error">Problem med fingeraftryk: %1$s</string>
+    <string name="store_with_fingerprint">Brug fingeraftryk til at gemme adgangskoden</string>
+    <string name="no_password_stored">Ingen adgangskode er endnu gemt i databasen</string>
+    <string name="history">Historik</string>
+    <string name="appearance">Udseende</string>
+    <string name="general">Generelt</string>
+    <string name="autofill">Autoudfyld</string>
+    <string name="autofill_service_name">KeePass DX Autoudfyld tjeneste</string>
+    <string name="autofill_sign_in_prompt">Log ind med KeePass DX</string>
+    <string name="set_autofill_service_title">Indstil standard Autoudfyld</string>
+    <string name="set_autofill_service_summary">Aktiver tjenesten for nemt at udfylde formularer fra andre apps</string>
+    <string name="password_size_title">Adgangskode størrelse</string>
+    <string name="password_size_summary">Angiv standardlængden for den genererede adgangskode</string>
+    <string name="list_password_generator_options_title">Adgangskodetegn</string>
+    <string name="list_password_generator_options_summary">Angiv standardtegn for adgangskodegenerator</string>
+    <string name="clipboard">Udklipsholder</string>
+    <string name="clipboard_notifications_title">Udklipsholdermeddelelser</string>
+    <string name="clipboard_notifications_summary">Aktivere meddelelser fra udklipsholder for at kopiere indtastningsfelter</string>
+    <string name="clipboard_warning">Hvis enheden ikke er i stand til at slette udklip fra udklipsholder automatisk, så slet det kopierede element manuelt fra udklipsholder historikken.</string>
+    <string name="lock">Lås</string>
+    <string name="lock_database_screen_off_title">Skærmlås</string>
+    <string name="lock_database_screen_off_summary">Lås databasen, når skærmen er slukket</string>
+    <string name="fingerprint_quick_unlock_title">Hvordan konfigureres fingeraftryk til hurtig oplåsning?</string>
+    <string name="fingerprint_setting_text">Indstil personligt fingeraftryk for enhed</string>
+    <string name="fingerprint_setting_way_text">\"Indstillinger\" → \"Sikkerhed\" → \"Fingeraftryk\"</string>
+    <string name="fingerprint_type_password_text">Indtast adgangskoden til Keepass DX</string>
+    <string name="fingerprint_scan_to_store">Scan fingeraftryk for at gemme hovedadgangskoden sikkert</string>
+    <string name="fingerprint_scan_to_open">Scan fingeraftryk, når afkrydsningsfeltet for adgangskoden ikke er markeret, for at åbne databasen</string>
+    <string name="usage">Brug</string>
+    <string name="fingerprint">Fingeraftryk</string>
+    <string name="fingerprint_enable_title">Scanner for fingeraftryk</string>
+    <string name="fingerprint_enable_summary">Aktiver åbning af databasen med fingeraftryk</string>
+    <string name="fingerprint_delete_all_title">Slet krypteringsnøgler</string>
+    <string name="fingerprint_delete_all_summary">Slet alle krypteringsnøgler, der er relateret til fingeraftryk</string>
+    <string name="fingerprint_delete_all_warning">Bekræft sletning af alle nøgler, der er relateret til fingeraftryk?</string>
+    <string name="unavailable_feature_text">Funktionen kunne ikke startes.</string>
+    <string name="unavailable_feature_version">Android-version %1$s opfylder ikke minimum versionskrav %2$s.</string>
+    <string name="unavailable_feature_hardware">Hardwaren ikke fundet.</string>
+    <string name="file_name">Filnavn</string>
+    <string name="path">Sti</string>
+    <string name="assign_master_key">Tildel en hovednøgle</string>
+    <string name="create_keepass_file">Oprette en KeePass fil</string>
+    <string name="bytes">Bytes</string>
+    <string name="full_file_path_enable_title">Filsti</string>
+    <string name="full_file_path_enable_summary">Se den fulde filsti</string>
+    <string name="recycle_bin_title">Brug Papirkurv</string>
+    <string name="recycle_bin_summary">Flyt en gruppe eller post til \"Papirkurven\" før den slettes</string>
+    <string name="permission_external_storage_rationale_write_database">KeePass DX skal have tilladelse til ekstern lagring for at skrive til en database</string>
+    <string name="permission_external_storage_rationale_read_database">KeePass DX skal have tilladelse til ekstern lagring for at læse en URI, der ikke leveres af en indholdsleverandør</string>
+    <string name="permission_external_storage_denied">Tilladelse til ekstern lager nægtet</string>
+    <string name="permission_external_storage_never_ask">Kan ikke udføre handlingen uden ekstern lager tilladelse</string>
+    <string name="monospace_font_fields_enable_title">Feltskrifttype</string>
+    <string name="monospace_font_fields_enable_summary">Skift skrifttypen, der anvendes i felter, for at forbedre tegnsynlighed</string>
+    <string name="auto_open_file_uri_title">Åbn automatisk valgte fil</string>
+    <string name="auto_open_file_uri_summary">Åbn filen automatisk efter valg i filhåndtering</string>
+    <string name="allow_copy_password_title">Kopi af adgangskode</string>
+    <string name="allow_copy_password_summary">Tillader kopiering af adgangskoden og beskyttede felter til udklipsholder</string>
+    <string name="allow_copy_password_warning">ADVARSEL: Udklipsholder deles af alle apps. Hvis følsomme data er kopieret, kan andet software gendanne den.</string>
+    <string name="warning_disabling_storage_access_framework">ADVARSEL: Deaktivering af funktionen kan resultere i en manglende evne til at åbne eller gemme databaser</string>
+    <string name="open_link_database">Link til KDBX-filen der skal åbnes</string>
+    <string name="database_name_title">Databasenavn</string>
+    <string name="database_description_title">Database beskrivelse</string>
+    <string name="database_version_title">Databaseversion</string>
+    <string name="text_appearance">Tekst udseende</string>
+    <string name="application_appearance">App udseende</string>
+    <string name="other">Øvrige</string>
+
+    <string name="keyboard">Tastatur</string>
+    <string name="magic_keyboard_title">Magikeyboard</string>
+    <string name="magic_keyboard_summary">Aktiver et brugerdefineret tastatur, der nemt udfylder adgangskoder og alle identitetsfelter</string>
+    <string name="magic_keyboard_preference_title">Magikeyboard indstillinger</string>
+    <string name="magic_keyboard_configure_title">Hvordan konfigureres tastaturet til sikker formularudfyldning?</string>
+    <string name="magic_keyboard_activate_setting_text">Aktiver Magikeyboard i enhedens indstillinger.</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">\"Indstillinger\" → \"Sprog &amp; input\" → \"Aktuelt tastatur\" og vælg et.</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">eller (\"Indstillinger\" → \"Sprog &amp; input\" → \"Virtuelt tastatur\" og vælg et.)</string>
+    <string name="keyboards_choose_magikeyboard_text">Vælg Magikeyboard, når der er brug for at udfylde en formular.</string>
+    <string name="keyboards_swicth_magikeyboard_text">Skift nemt fra det primære tastatur til Magikeyboard med sprog-knappen på tastaturet, et langt tryk på mellemrumstasten på tastaturet eller - hvis det ikke er tilgængelig - med:</string>
+    <string name="keyboard_select_entry_text">Vælg post med nøglen.</string>
+    <string name="keyboard_fill_field_text">Udfyld felterne ved hjælp af elementerne i posten.</string>
+    <string name="keyboard_lock_database_text">Lås databasen.</string>
+    <string name="keyboard_back_main_keyboard_text">Gå tilbage til det primære tastatur.</string>
+
+    <string name="allow_no_password_title">Tillad ingen adgangskode</string>
+    <string name="allow_no_password_summary">Aktiver knappen Åbn, hvis der ikke er valgt en adgangskodeidentifikation</string>
+    <string name="enable_read_only_title">Skrivebeskyttet</string>
+    <string name="enable_read_only_summary">Som standard åbne databaser skrivebeskyttet</string>
+
+    <string name="enable_education_screens_title">Hjælpeskærme</string>
+    <string name="enable_education_screens_summary">Fremhæver elementer for at lære, hvordan programmet fungerer</string>
+    <string name="reset_education_screens_title">Nulstil hjælpeskærme</string>
+    <string name="reset_education_screens_summary">Nulstil visning af hjælpeelementer</string>
+    <string name="reset_education_screens_text">Hjælpeskærme nulstillet</string>
+    <string name="education_create_database_title">Opret databasefilen</string>
+    <string name="education_create_database_summary">Kender endnu ikke KeePass DX, opret den første adgangskodeadministrationsfil.</string>
+    <string name="education_select_database_title">Åbn en eksisterende database</string>
+    <string name="education_select_database_summary">Har allerede brugt en KeePass manager. Bare åbn KDBX filen fra filhåndtering.</string>
+    <string name="education_open_link_database_title">Et link til filen er tilstrækkelig</string>
+    <string name="education_open_link_database_summary">Databasen kan også åbnes med en fysisk forbindelse (med file:// og content:// for eksempel).</string>
+    <string name="education_new_node_title">Tilføj nye elementer til databasen</string>
+    <string name="education_new_node_summary">Tilføje poster til at styre digitale identiteter.
+\n
+\nTilføje grupper (svarende til mapper) for at organisere indtastninger og database.</string>
+    <string name="education_search_title">Nemt at søge i poster</string>
+    <string name="education_search_summary">Søg efter poster efter titel, brugernavn, eller på andre felter for nemt at hente adgangskoder.</string>
+    <string name="education_fingerprint_title">Lås databasen op med fingeraftryk</string>
+    <string name="education_fingerprint_summary">Lav en forbindelsen mellem kodeord og fingeraftryk for nemt at låse databasen op.</string>
+    <string name="education_entry_edit_title">Rediger posten</string>
+    <string name="education_entry_edit_summary">Rediger post med brugerdefinerede felter, henvisninger til pooldata kan tilføjes mellem felter i forskellige poster.</string>
+    <string name="education_generate_password_title">Opret en stærk adgangskode</string>
+    <string name="education_generate_password_summary">Generer en stærk kodeord til at forbinde elementet, definer det i henhold til kriteriet for formularen og glem ikke et sikkert kodeord og husk på det.</string>
+    <string name="education_entry_new_field_title">Tilføj brugerdefinerede felter</string>
+    <string name="education_entry_new_field_summary">Registrer et felt, der ikke allerede eksisterer, indtast blot i det den nye, som også kan beskyttes visuelt.</string>
+    <string name="education_unlock_title">Lås databasen op</string>
+    <string name="education_read_only_title">Aktiver skrivebeskyttelse</string>
+    <string name="education_read_only_summary">"Skift  åbningstilstanden for sessionen.
+\n 
+\nI skrivebeskyttet tilstand  forhindres utilsigtede ændringer i databasen.
+\n 
+\nI skrivetilstand kan man tilføje, slette eller redigere alle elementerne, som det ønskes."</string>
+    <string name="education_field_copy_title">Kopier et felt</string>
+    <string name="education_field_copy_summary">Kopier nemt et felt og indsæt det hvor det ønskes
+\n
+\nBrug flere formular udfyldninsmetoder. Brug den der foretrækkes.</string>
+    <string name="education_lock_title">Lås databasen</string>
+    <string name="education_lock_summary">Lås hurtigt databasen, indstil til at låse efter et stykke tid, og når skærmen slukkes.</string>
+    <string name="education_sort_title">Sorter elementer</string>
+    <string name="education_sort_summary">Sorter poster og grupper i henhold til specifikke parametre.</string>
+    <string name="education_donation_title">Deltag</string>
+    <string name="education_donation_summary">Deltag for at hjælpe med at øge stabiliteten, sikkerheden og ved at tilføje flere funktioner.</string>
+
+    <string name="html_text_ad_free">I modsætning til andre programmer til adgangskodeadministration er denne <strong> annoncefri </strong>, <strong> copyleft fri software</strong>, og indsamler ikke personlige data på servere, selv i den gratis version.</string>
+    <string name="html_text_buy_pro">Ved at købe pro-versionen, er der adgang til <strong>visuel funktionen</strong>, og det vil især hjælpe <strong>gennemførelsen af lokale projekter.</strong></string>
+    <string name="html_text_feature_generosity">Denne <strong>visuelle funktion</strong> er tilgængelige takket være bidrag.</string>
+    <string name="html_text_donation">For at bevare uafhængighed og altid at være aktiv, regner vi med<strong>bidrag.</strong></string>
+
+    <string name="html_text_dev_feature">Funktionen er <strong>under udvikling</strong>, og det kræver <strong>bidrag</strong>, for snart at være tilgængelig.</string>
+    <string name="html_text_dev_feature_buy_pro">Ved at købe <strong>pro</strong> versionen,</string>
+    <string name="html_text_dev_feature_contibute">Ved at <strong>bidrage</strong>,</string>
+    <string name="html_text_dev_feature_encourage">tilskyndes udviklerne til at lave <strong>nye funktioner</strong> og <strong>rette fejl</strong> i henhold bemærkninger.</string>
+    <string name="html_text_dev_feature_thanks">Tak for bidrag.</string>
+    <string name="html_text_dev_feature_work_hard">Vi arbejder hårdt på hurtigt at frigive denne funktion.</string>
+    <string name="html_text_dev_feature_upgrade">Glem ikke at holde appen opdateret.</string>
+
+    <string name="download">Hent</string>
+    <string name="contribute">Bidrag</string>
+
+    <string name="encryption_chacha20">ChaCha20</string>
+
+    <string name="kdf_AES">AES KDF</string>
+    <string name="kdf_Argon2">Argon2</string>
+
+    <string name="style_choose_title">Vælg et tema</string>
+    <string name="style_choose_summary">Ændre tema ved at ændre farver</string>
+    <string name="icon_pack_choose_title">Vælg en ikonpakke</string>
+    <string name="icon_pack_choose_summary">Skift ikonpakke</string>
+
+</resources>

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

@@ -24,15 +24,15 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="about_feedback">Rückmeldung:</string>
     <string name="about_homepage">Webseite:</string>
-    <string name="about_description">KeePass DX ist die Implementierung des KeePass Passwortmanagers für die Android-Plattform.</string>
+    <string name="about_description">KeePass DX ist eine Implementierung des KeePass Passwortmanagers für die Android-Plattform.</string>
     <string name="accept">Akzeptieren</string>
     <string name="add_entry">Eintrag hinzufügen</string>
     <string name="add_group">Gruppe hinzufügen</string>
     <string name="add_string">Text hinzufügen</string>
     <string name="encryption_algorithm">Verschlüsselungsalgorithmus</string>
-    <string name="app_timeout">Anwendungssperre</string>
+    <string name="app_timeout">App-Sperre</string>
-    <string name="app_timeout_summary">Bei inaktiver Anwendung wird die Datenbank nach Ablauf der eingestellten Zeit automatisch gesperrt.</string>
+    <string name="app_timeout_summary">Bei inaktiver App wird die Datenbank nach Ablauf der eingestellten Zeit automatisch gesperrt</string>
-    <string name="application">Anwendung</string>
+    <string name="application">App</string>
     <string name="menu_app_settings">Einstellungen</string>
     <string name="beta_dontask">Nicht mehr anzeigen</string>
     <string name="brackets">Klammern</string>
@@ -45,7 +45,7 @@
     <string name="clipboard_timeout">Zwischenablagesperre</string>
     <string name="clipboard_timeout_summary">Zeit nach dem Kopieren eines Benutzernamens oder Passworts, bevor die Zwischenablage geleert wird</string>
     <string name="select_to_copy">%1$s in die Zwischenablage kopieren</string>
-    <string name="creating_db_key">Datenbank-Schlüsseldatei erzeugen\u2026</string>
+    <string name="retrieving_db_key">Datenbank-Schlüsseldatei erzeugen\u2026</string>
     <string name="database">Datenbank</string>
     <string name="decrypting_db">Entschlüsselung der Datenbankinhalte\u2026</string>
     <string name="default_checkbox">Als Standard-Datenbank benutzen</string>
@@ -66,7 +66,7 @@
     <string name="entry_title">Titel</string>
     <string name="entry_url">URL</string>
     <string name="entry_user_name">Benutzername</string>
-    <string name="error_arc4">Die RC4/ARC4-Stromverschlüsselung wird nicht unterstützt.</string>
+    <string name="error_arc4">Die RC4/ARCFOUR-Stromverschlüsselung wird nicht unterstützt.</string>
     <string name="error_can_not_handle_uri">KeePass DX kann diese URI-Adresse nicht verarbeiten.</string>
     <string name="error_could_not_create_parent">Verzeichnis konnte nicht erstellt werden.</string>
     <string name="error_database_exists">Die Datei existiert bereits.</string>
@@ -77,7 +77,7 @@
     <string name="error_invalid_path">Ungültiger Pfad.</string>
     <string name="error_no_name">Ein Name wird benötigt.</string>
     <string name="error_nokeyfile">Ein Passwort oder eine Schlüsseldatei wird benötigt.</string>
-    <string name="error_out_of_memory">Der Speicher Ihres Smartphones reicht nicht aus, um die Datenbank zu analysieren. Sie ist wahrscheinlich zu groß.</string>
+    <string name="error_out_of_memory">Der Speicher Ihres Smartphones reicht nicht aus, um die Datenbank zu analysieren.</string>
     <string name="error_pass_gen_type">Mindestens eine Art der Passwortgenerierung muss ausgewählt werden</string>
     <string name="error_pass_match">Die Passwörter stimmen nicht überein.</string>
     <string name="error_rounds_not_number">Die Anzahl der Wiederholungen muss eine Zahl sein.</string>
@@ -100,11 +100,11 @@
     <string name="password">Passwort</string>
     <string name="install_from_play_store">Google Play</string>
     <string name="install_from_f_droid">F-Droid</string>
-    <string name="InvalidPassword">Passwort oder Schlüsseldatei ist falsch.</string>
+    <string name="invalid_password">Passwort oder Schlüsseldatei ist falsch.</string>
     <string name="invalid_algorithm">Ungültiger Algorithmus.</string>
     <string name="invalid_db_sig">Datenbankformat wurde nicht erkannt.</string>
-    <string name="keyfile_does_not_exist">Schlüsseldatei existiert nicht.</string>
+    <string name="keyfile_does_not_exist">Es existiert keine Schlüsseldatei.</string>
-    <string name="keyfile_is_empty">Schlüsseldatei ist leer.</string>
+    <string name="keyfile_is_empty">Die Schlüsseldatei ist leer.</string>
     <string name="length">Länge</string>
     <string name="list_size_title">Gruppenliste</string>
     <string name="list_size_summary">Schriftgröße der Gruppenliste</string>
@@ -129,15 +129,15 @@
     <string name="never">Nie</string>
     <string name="no_results">Keine Suchergebnisse</string>
     <string name="no_url_handler">Kein Handler zum Öffnen der URL vorhanden.</string>
-    <string name="open_recent">Zuletzt geöffnete Datenbanken :</string>
+    <string name="open_recent">Zuletzt geöffnete Datenbanken:</string>
     <string name="omitbackup_title">Papierkorb/Sicherungen nicht durchsuchen</string>
     <string name="omitbackup_summary">Papierkorb und Sicherungseinträge werden bei der Suche nicht berücksichtigt (nur bei .kdb Dateien)</string>
     <string name="progress_create">Neue Datenbank anlegen\u2026</string>
     <string name="progress_title">Ausführen\u2026</string>
     <string name="protection">Sicherheit</string>
     <string name="read_only">Schreibschutz</string>
-    <string name="read_only_warning">KeePass DX hat keine Schreibrechte für die Datenbank. Die Datenbank wird schreibgeschützt geöffnet.</string>
+    <string name="read_only_warning">KeePass DX hat keine Schreibrechte für den Speicherort Ihrer Datenbank. Daher wird sie schreibgeschützt geöffnet.</string>
-    <string name="read_only_kitkat_warning">Ab Android KitKat haben einige Geräte keine Schreibrechte mehr für die SD-Karte.</string>
+    <string name="read_only_kitkat_warning">Ab Android KitKat haben auf einigen Geräten Apps keine Schreibrechte mehr für die SD-Karte.</string>
     <string name="recentfile_title">Zuletzt verwendete Datenbanken</string>
     <string name="recentfile_summary">Zuletzt verwendete Datenbanken merken</string>
     <string name="remember_keyfile_summary">Den Pfad der Schlüsseldatei merken</string>
@@ -156,18 +156,20 @@
     <string name="search">Titel/Beschreibung des Eintrags</string>
     <string name="search_results">Suchergebnisse</string>
     <string name="encryption_twofish">Twofish</string>
-    <string name="underline">Unterstrichen</string>
+    <string name="underline">Unterstriche</string>
     <string name="unsupported_db_version">Datenbankversion wird nicht unterstützt.</string>
     <string name="uppercase">Großbuchstaben</string>
-    <string name="use_saf_summary">Storage Access Framework als Dateimanager verwenden (Android KitKat und später)</string>
+    <string name="use_saf_summary">Storage Access Framework (SAF) als Dateimanager verwenden (Android KitKat und später)</string>
     <string name="use_saf_title">Speicherzugriff-Framework</string>
     <string name="warning">Warnung</string>
-    <string name="warning_password_encoding">Das .kdb Format unterstützt nur den Latin1-Zeichensatz. Enthält Ihr Passwort Zeichen, die in diesem Zeichensatz nicht vorkommen, werden diese alle in in ein und dasselbe Zeichen umgewandelt. Dies reduziert die Sicherheit des Passwortes. Es wird empfohlen, dass Sie Ihr Passwort ändern.</string>
+    <string name="warning_password_encoding">Ihr Passwort enthält Zeichen, die nicht Teil des Latin-1-Zeichensatzes sind, der im .kdb Format verwendet wird. Da diese Zeichen in ein und dasselbe Zeichen umgewandelt werden, wird empfohlen, das Passwort zu ändern, um dessen Sicherheit zu erhöhen.</string>
     <string name="warning_read_only">Die SD-Karte ist schreibgeschützt. Etwaige Änderungen in den Datensätzen können daher nicht in der Datenbank gespeichert werden.</string>
     <string name="warning_unmounted">Keine SD-Karte vorhanden oder derzeit nicht im Gerät eingebunden. Daher kann weder eine Datenbank geöffnet, noch erstellt werden.</string>
-    <string name="version_label">Version:</string>
+    <string name="version_label">Version %1$s</string>
 
-    <string name="education_unlock_summary">Passwort und/oder Schlüsseldatei zum Entschlüsseln Ihrer Datenbank eingeben.</string>
+    <string name="education_unlock_summary">Geben Sie ein Passwort und/oder eine Schlüsseldatei zum Entsperren Ihrer Datenbank ein.
+\n
+\nDenken Sie daran, nach jeder Änderung eine Kopie Ihrer .kdbx-Datei an einem sicheren Ort abzuspeichern.</string>
 
     <string-array name="timeout_options">
       <item>5 Sekunden</item>
@@ -186,7 +188,7 @@
       <item>Groß</item>
     </string-array>
 
-    <string name="warning_empty_password">Sind Sie sicher, dass Sie ein leeres Passwort verwenden wollen ?</string>
+    <string name="warning_empty_password">Sind Sie sicher, dass Sie ein leeres Passwort verwenden wollen?</string>
     <string name="warning_no_encryption_key">Sind Sie sicher, dass Sie keinen Verschlüsselungsschlüssel verwenden wollen ?</string>
     <string name="appearance">Aussehen</string>
     <string name="password_size_title">Passwortlänge</string>
@@ -195,12 +197,12 @@
     <string name="clipboard_notifications_summary">Zwischenablagenbenachrichtigungen einschalten um Eingabefelder zu aktivieren</string>
     <string name="lock_database_screen_off_title">Bildschirmsperre</string>
     <string name="lock_database_screen_off_summary">Datenbank sperren, wenn der Bildschirm ausgeschaltet wird</string>
-    <string name="create_keepass_file">Keepass Datei erstellen</string>
+    <string name="create_keepass_file">KeePass Datei erstellen</string>
-    <string name="style_choose_title">Thema auswählen</string>
+    <string name="style_choose_title">Design auswählen</string>
     <string name="assign_master_key">Hauptschlüssel zuweisen</string>
     <string name="path">Pfad</string>
     <string name="file_name">Dateiname</string>
-    <string name="unavailable_feature_text">Dieses Feature kann nicht gestartet werden.</string>
+    <string name="unavailable_feature_text">Dieses Feature konnte nicht gestartet werden.</string>
     <string name="fingerprint_enable_summary">Datenbanköffnung mit Fingerabdruck einschalten</string>
     <string name="fingerprint">Fingerabdruck</string>
     <string name="fingerprint_enable_title">Fingerabdruckscanner</string>
@@ -210,50 +212,50 @@
     <string name="lock">Sperre</string>
     <string name="list_password_generator_options_summary">Standardzeichen für Passwortgenerator setzen</string>
     <string name="list_password_generator_options_title">Passwortzeichen</string>
-    <string name="configure_fingerprint">Fingerabdruck unterstützt, jedoch nicht für dieses Gerät konfiguriert</string>
+    <string name="configure_fingerprint">Der Fingerabdruck wird von ihrem Gerät unterstützt, ist jedoch nicht konfiguriert</string>
     <string name="scanning_fingerprint">Fingerabdruck wird gescannt</string>
     <string name="encrypted_value_stored">Verschlüsseltes Passwort wurde gespeichert</string>
     <string name="fingerprint_invalid_key">Ungültiger Fingerabdruckschlüssel. Stellen Sie Ihr Passwort wieder her.</string>
-    <string name="fingerprint_error">Probleme mit dem Fingerabdruck : %1$s</string>
+    <string name="fingerprint_error">Probleme mit dem Fingerabdruck: %1$s</string>
     <string name="history">Verlauf</string>
-    <string name="fingerprint_quick_unlock_title">Wie richte ich den Fingerabdruckscanner für schnelles Entsperren ein ?</string>
+    <string name="fingerprint_quick_unlock_title">Wie richte ich den Fingerabdruckscanner für schnelles Entsperren ein?</string>
     <string name="fingerprint_setting_text">Speichern Sie Ihren persönlichen Fingerabdruck in</string>
-    <string name="fingerprint_setting_way_text">Einstellungen -&gt; Sicherheit -&gt; Fingerabdruck</string>
+    <string name="fingerprint_setting_way_text">\"Einstellungen\" → \"Sicherheit\" → \"Fingerabdruck\"</string>
     <string name="usage">Verwendung</string>
     <string name="general">Allgemein</string>
     <string name="store_with_fingerprint">Fingerabdruck verwenden um dieses Passwort zu speichern</string>
     <string name="no_password_stored">Noch kein Passwort für diese Datenbank gespeichert</string>
-    <string name="style_choose_summary">Thema durch verändern der Farben ändern</string>
+    <string name="style_choose_summary">Das App-Design durch Wechsel der Farben ändern</string>
     <string name="encryption">Verschlüsselung</string>
     <string name="key_derivation_function">Schlüsselableitungsfunktion</string>
     <string name="extended_ASCII">Erweitertes ASCII</string>
     <string name="allow">Erlauben</string>
-    <string name="clipboard_swipe_clean">Wischen und Zwischenablage zu leeren</string>
+    <string name="clipboard_swipe_clean">Wischen, um Zwischenablage jetzt zu leeren</string>
     <string name="error_autofill_enable_service">Autofill-Dienst kann nicht aktiviert werden.</string>
     <string name="copy_field">Kopie von %1$s</string>
     <string name="menu_form_filling_settings">Formularausfüllung</string>
     <string name="menu_fingerprint_remove_key">Fingerabdruckschlüssel entfernen</string>
     <string name="encryption_explanation">Algorithmus um die ganze Datenbank zu verschlüsseln. (Passwörter, Benutzernamen, Notizen und alle Daten in der Datenbank werden mit dem gewählten Algorithmus verschlüsselt)</string>
-    <string name="kdf_explanation">Um den Schlüssel für den Verschlüsselungsalgorithmus zu generieren, wird der komprimierte Masterschlüssel (SHA-256) mit einer Schlüsselableitung umgewandelt (mit einem zufälligen Salt).</string>
+    <string name="kdf_explanation">Um den Schlüssel für den Verschlüsselungsalgorithmus zu generieren, wird der komprimierte Masterschlüssel (SHA-256) mit einer zufällig gesaltenen Schlüsselableitung umgewandelt.</string>
     <string name="memory_usage">Speichernutzung</string>
     <string name="memory_usage_explanation">Größe des Speichers (in binären Bytes) der für die Schlüsselableitung genutzt wird.</string>
     <string name="parallelism">Parallelismus</string>
     <string name="parallelism_explanation">Grad des Parallelismus (d.h. Anzahl der Threads) der für die Schlüsselableitung genutzt wird.</string>
     <string name="sort_menu">Sortieren</string>
-    <string name="sort_ascending">Aufsteigend</string>
+    <string name="sort_ascending">Aufsteigend ↓</string>
     <string name="sort_groups_before">Gruppen davor</string>
     <string name="sort_recycle_bin_bottom">Papierkorb unten</string>
-    <string name="sort_title">Nach Titel sortieren</string>
+    <string name="sort_title">Titel</string>
-    <string name="sort_username">Nach Nutzername sortieren</string>
+    <string name="sort_username">Benutzername</string>
-    <string name="sort_creation_time">Nach Erstellungsdatum sortieren</string>
+    <string name="sort_creation_time">Erstellungsdatum</string>
-    <string name="sort_last_modify_time">Nach Änderungsdatum sortieren</string>
+    <string name="sort_last_modify_time">Letztes Änderungsdatum</string>
-    <string name="sort_last_access_time">Nach letztem Zugriffsdatum sortieren</string>
+    <string name="sort_last_access_time">Letztes Zugriffsdatum</string>
     <string name="fingerprint_not_recognized">Fingerabdruck nicht erkannt</string>
     <string name="autofill">Auto-Einfügen</string>
     <string name="autofill_service_name">KeePass DX Autofill-Dienst</string>
     <string name="autofill_sign_in_prompt">Mit KeePass DX anmelden</string>
     <string name="set_autofill_service_title">Standard Autofill-Dienst auswählen</string>
-    <string name="set_autofill_service_summary">Dienst aktivieren, um automatisch Eingabefelder anderer Anwendungen auszufüllen</string>
+    <string name="set_autofill_service_summary">Dienst aktivieren, um automatisch Eingabefelder anderer Apps auszufüllen</string>
     <string name="clipboard">Zwischenablage</string>
     <string name="fingerprint_delete_all_title">Verschlüsselungskeys löschen</string>
     <string name="fingerprint_delete_all_summary">Alle Verschlüsselungsschlüssel für Fingerabdruckerkennung löschen</string>
@@ -269,23 +271,23 @@
     <string name="permission_external_storage_rationale_read_database">KeePass DX benötigt externe Speicherzugriffsberechtigung um eine URI zu lesen, die nicht von einem Content-Provider zur Verfügung gestellt wird</string>
     <string name="permission_external_storage_denied">Speicherzugriff verweigert</string>
     <string name="permission_external_storage_never_ask">Aktion kann ohne Speicherzugriff nicht ausgeführt werden</string>
-    <string name="monospace_font_fields_enable_title">Felder Schriftart</string>
+    <string name="monospace_font_fields_enable_title">Feldschriftart</string>
-    <string name="monospace_font_fields_enable_summary">Schriftart der Felder ändern um Lesbarkeit zu verbessern</string>
+    <string name="monospace_font_fields_enable_summary">Schriftart in Feldern ändern, um Lesbarkeit zu verbessern</string>
-    <string name="auto_open_file_uri_title">Ausgewählte Datei automatisch öffnen</string>
+    <string name="auto_open_file_uri_title">Gewählte Datei automatisch öffnen</string>
-    <string name="auto_open_file_uri_summary">Automatisch eine Datei vom Auswahlbildschirm öffnen nach Auswahl im Dateibrowser</string>
+    <string name="auto_open_file_uri_summary">Automatisch eine Datei vom Auswahlbildschirm öffnen nach der Auswahl im Dateibrowser</string>
     <string name="allow_copy_password_title">Kopie des Passworts</string>
-    <string name="allow_copy_password_summary">Kopieren des Passworts und der geschützten Felder in die Zwischenablage erlauben.</string>
+    <string name="allow_copy_password_summary">Kopieren des Passworts und der geschützten Felder in die Zwischenablage erlauben</string>
-    <string name="warning_disabling_storage_access_framework">WARNUNG: Deaktivierung dieses Features könnte das Öffnen und Speichern von Datenbanken unmöglich machen</string>
+    <string name="warning_disabling_storage_access_framework">WARNUNG: Die Deaktivierung dieses Features kann das Öffnen und Speichern von Datenbanken unmöglich machen</string>
-    <string name="open_link_database">Link der zu öffnenden Kdbx-Datei</string>
+    <string name="open_link_database">Link der zu öffnenden KDBX-Datei</string>
     <string name="database_name_title">Datenbankname</string>
     <string name="database_description_title">Datenbankbeschreibung</string>
     <string name="database_version_title">Datenbankversion</string>
     <string name="text_appearance">Aussehen des Textes</string>
-    <string name="application_appearance">Aussehen der Anwendung</string>
+    <string name="application_appearance">Aussehen der App</string>
     <string name="other">Andere</string>
     <string name="keyboard">Tastatur</string>
     <string name="magic_keyboard_title">Magikeyboard</string>
-    <string name="magic_keyboard_summary">Aktiviert eine eigene Tastatur, die Passwort- und Identitätsfelder ganz einfach ausfüllt.</string>
+    <string name="magic_keyboard_summary">Eine eigene Tastatur zum einfachen Ausfüllen aller Passwort- und Identitätsfelder aktivieren</string>
 
     <string name="reset_education_screens_title">Hilfe-Anzeige abschalten</string>
     <string name="reset_education_screens_summary">Anzeige von Hilfe-Themen abschalten</string>
@@ -293,9 +295,9 @@
     <string name="education_create_database_title">Ihre Datenbankdatei erstellen</string>
     <string name="education_create_database_summary">Sie kennen KeePass DX noch nicht, erstellen Sie Ihre erste Passwortmanager-Datei.</string>
     <string name="education_select_database_title">Existierende Datenbank öffnen</string>
-    <string name="education_select_database_summary">Sie haben einen KeePass-Manager bereits genutzt. Einfach die Kdbx-Datei über den Dateibrowser öffnen.</string>
+    <string name="education_select_database_summary">Sie haben bereits einen KeePass-Manager verwendet. Einfach die KDBX-Datei über den Dateibrowser öffnen.</string>
     <string name="education_open_link_database_title">Ein Link zum Speicherort Ihrer Datei ist ausreichend</string>
-    <string name="education_open_link_database_summary">Sie können Ihre Datenbank auch mit einem physikalischen Link öffnen (z.B. mit file:// und content://).</string>
+    <string name="education_open_link_database_summary">Sie können Ihre Datenbank auch mit einem physischen Link öffnen (z.B. mit file:// und content://).</string>
     <string name="education_new_node_title">Neue Einträge zu Ihrer Datenbank hinzufügen</string>
     <string name="education_new_node_summary">Elemente hinzufügen um Ihre digitalen Identitäten zu verwalten.\n\nGruppen hinzufügen (wie Ordner) um Ihre Einträge und Datenbank zu ordnen.</string>
     <string name="education_search_title">Ihre Einträge ganz einfach durchsuchen</string>
@@ -303,77 +305,84 @@
     <string name="education_fingerprint_title">Ihre Datenbank mit Ihrem Fingerabdruck entsperren</string>
     <string name="education_fingerprint_summary">Verknüpfen Sie Ihr Passwort und Ihren Fingerabdruck um Ihre Datenbank im Handumdrehen zu entsperren.</string>
     <string name="education_entry_edit_title">Eintrag bearbeiten</string>
-    <string name="education_entry_edit_summary">Bearbeiten Sie Ihren Eintrag mit eigenen Feldern, Sie können Verweise hinzufügen um verschiedene Einträge und Felder zu verknüpfen.</string>
+    <string name="education_entry_edit_summary">Bearbeiten Sie Ihren Eintrag mit eigenen Feldern, Sie können zwischen Feldern aus verschiedenen Einträgen Verweise hinzufügen, um Daten zusammenzufassen.</string>
     <string name="education_generate_password_title">Ein starkes Passwort erstellen</string>
     <string name="education_generate_password_summary">Generieren Sie ein starkes Passwort zu Ihrem Eintrag, stellen Sie Ihre Kriterien zur Erstellung des Passworts nach den gewünschten Merkmalen ein und vergessen Sie nie wieder ein schweres, aber sicheres Passwort.</string>
     <string name="education_entry_new_field_title">Benutzerdefinierte Felder hinzufügen</string>
     <string name="education_entry_new_field_summary">Wenn Sie ein eigenes, hier nicht aufgelistetes Feld eintragen möchten, erstellen Sie hier ein neues, welches Sie auch visuell schützen können.</string>
     <string name="education_unlock_title">Ihre Datenbank entsperren</string>
     <string name="education_field_copy_title">Ein Feld kopieren</string>
-    <string name="education_field_copy_summary">Ganz einfach ein Feld kopieren und einfügen wo Sie wollen\n\nSie können verschiedene Formularausfüllungsmethoden auswählen. Wählen Sie die, die Ihnen am meisten zusagt!</string>
+    <string name="education_field_copy_summary">Kopieren Sie einfach ein Feld, um es, wo Sie wollen, wieder einzufügen
+\n
+\nSie können verschiedene Methoden zum Ausfüllen von Formularen verwenden. Wählen Sie die, die Ihnen am meisten zusagt.</string>
     <string name="education_lock_title">Datenbank sperren</string>
-    <string name="education_lock_summary">Schnell die Datenbank sperren, Sie können auch Parameter zum automatischen Sperren nach Zeit oder Bildschirmsperre einstellen.</string>
+    <string name="education_lock_summary">Schnell Ihre Datenbank sperren, in den App-Einstellungen können Sie eine Sperre nach Zeit und bei Ausschalten des Bildschirms festlegen.</string>
     <string name="education_sort_title">Einträge sortieren</string>
     <string name="education_sort_summary">Einträge und Gruppen nach spezifischen Parametern sortieren.</string>
     <string name="education_donation_title">Mitmachen</string>
-    <string name="education_donation_summary">Mitmachen, um Stabilität, Sicherheit und weitere Funktionen hinzuzufügen.</string>
+    <string name="education_donation_summary">Machen Sie mit, damit sich Stabilität, Sicherheit verbessern und weitere Funktionen hinzukommen.</string>
 
-    <string name="html_text_ad_free">Anders als viele andere Passwortmanager ist diese app <strong>werbefrei</strong>, <strong>quelloffen</strong> und speichert keine persönlichen Daten auf Servern, auch in der kostenlosen Version.</string>
+    <string name="html_text_ad_free">Anders als viele andere Passwortmanager ist dieser <strong>werbefrei</strong>, <strong>quelloffen</strong> und speichert selbst in der kostenlosen Version keine persönlichen Daten auf Servern.</string>
-    <string name="html_text_buy_pro">Mit dem Kauf der Pro-Version bekommen Sie Zugang zu dieser <strong>visuellen Funktion</strong> und Sie unterstützen besonders <strong>die Umsetzung von Gemeinschaftsprojekten.</strong></string>
+    <string name="html_text_buy_pro">Mit dem Kauf der Pro-Version erhalten Sie Zugang zu dieser <strong>visuellen Funktion</strong> und Sie unterstützen insbesondere <strong>die Umsetzung gemeinschaftlicher Projektarbeiten.</strong></string>
     <string name="html_text_feature_generosity">Diese <strong>visuelle Funktion</strong> wurde wegen Ihrer Großzügigkeit freigeschaltet.</string>
     <string name="html_text_donation">Um unsere Freiheit zu bewahren und immer aktiv zu bleiben, zählen wir auf Ihren <strong>Beitrag.</strong></string>
 
-    <string name="html_text_dev_feature">Diese Funktion ist <strong>in Entwicklung</strong> und erfordert <strong>Ihren Beitrag</strong> um bald verfügbar zu sein.</string>
+    <string name="html_text_dev_feature">Diese Funktion ist <strong>in Entwicklung</strong> und erfordert <strong>Ihren Beitrag</strong>, um bald verfügbar zu sein.</string>
     <string name="html_text_dev_feature_buy_pro">Durch den Kauf der <strong>Pro-Version</strong>,</string>
-    <string name="html_text_dev_feature_contibute">Durch Ihren <strong>Beitrag</strong>,</string>
+    <string name="html_text_dev_feature_contibute">Durch Ihr <strong>Mitwirken</strong>,</string>
-    <string name="html_text_dev_feature_encourage">ermutigen Sie Entwickler, <strong>neue Funktionen</strong> hinzuzufügen und <strong>Fehler zu beheben</strong> nach Ihrem Feedback.</string>
+    <string name="html_text_dev_feature_encourage">bestärken Sie die Entwickler, <strong>neue Funktionen</strong> einzuführen und gemäß Ihren Anmerkungen <strong>Fehler auszumerzen</strong>.</string>
     <string name="html_text_dev_feature_thanks">Vielen Dank für Ihre Unterstützung.</string>
-    <string name="html_text_dev_feature_work_hard">Wir arbeiten hart um diese Funktion bald zu veröffentlichen.</string>
+    <string name="html_text_dev_feature_work_hard">Wir bemühen uns, diese Funktion bald zu veröffentlichen.</string>
-    <string name="html_text_dev_feature_upgrade">Vergessen Sie nicht, Ihre Anwendung aktuell zu halten.</string>
+    <string name="html_text_dev_feature_upgrade">Vergessen Sie nicht, Ihre App aktuell zu halten.</string>
 
     <string name="download">Download</string>
     <string name="contribute">Unterstützen</string>
 
     <string name="encryption_chacha20">ChaCha20</string>
 
-    <string name="kdf_AES">AES-KDF</string>
+    <string name="kdf_AES">AES KDF</string>
     <string name="kdf_Argon2">Argon2</string>
 
     <string name="icon_pack_choose_title">Icon-Paket auswählen</string>
-    <string name="icon_pack_choose_summary">Das Symbolpaket der Anwendung ändern</string>
+    <string name="icon_pack_choose_summary">Das Symbolpaket der App ändern</string>
 <string name="error_move_folder_in_itself">Eine Gruppe kann nicht in sich selbst verschoben werden.</string>
     <string name="menu_copy">Kopieren</string>
     <string name="menu_move">Verschieben</string>
     <string name="menu_paste">Einfügen</string>
     <string name="menu_cancel">Abbrechen</string>
-    <string name="clipboard_warning">Einige Geräte sind nicht in der Lage, die Zwischenablage automatisch zu leeren. Ist die Löschung durch den Gerätemanager nicht möglich, müssen die kopierten Elemente manuell aus der Zwischenablage gelöscht werden.</string>
+    <string name="clipboard_warning">Sollte Ihr Gerät die Zwischenablage nicht automatisch leeren können, löschen Sie den kopierten Eintrag manuell aus dem Verlauf der Zwischenablage.</string>
-    <string name="allow_copy_password_warning">WARNUNG : Alle Anwendungen teilen sich die Zwischenablage. Wenn sensible Daten kopiert werden, kann andere Software darauf zugreifen.</string>
+    <string name="allow_copy_password_warning">WARNUNG: Alle Apps teilen sich die Zwischenablage. Wenn sensible Daten kopiert werden, kann andere Software darauf zugreifen.</string>
     <string name="magic_keyboard_preference_title">Magikeyboard-Einstellungen</string>
     <string name="magic_keyboard_configure_title">Wie funktioniert die Tastaturkonfiguration zum sicheren Ausfüllen von Formularen?</string>
     <string name="magic_keyboard_activate_setting_text">Aktivieren Sie das Magikeyboard in den Geräteeinstellungen.</string>
-    <string name="magic_keyboard_activate_setting_path_1_text">Einstellungen -&gt; Sprachen &amp; Eingabe -&gt; Aktuelle Tastatur -&gt; TASTATUR ÄNDERN</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">\"Einstellungen\" → \"Sprache &amp; Eingabe\" → \"Aktuelle Tastatur\" und auswählen.</string>
-    <string name="magic_keyboard_activate_setting_path_2_text">oder (Einstellungen -&gt; System -&gt; Sprachen &amp; Eingabe -&gt; Bildschirmtastatur -&gt; Tastaturen verwalten)</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">oder (\"Einstellungen\" → \"Sprachen &amp; Eingabe\" → \"Bildschirmtastatur\" und auswählen.)</string>
     <string name="keyboards_choose_magikeyboard_text">Wählen Sie das Magikeyboard aus, wenn Sie ein Formular ausfüllen müssen.</string>
-    <string name="keyboards_swicth_magikeyboard_text">Sie können leicht von Ihrer Haupttastatur auf Magikeyboard umschalten, entweder mit der Sprachentaste Ihrer Tastatur, durch einen langen Druck auf die Leertaste oder, wenn das nicht zur Verfügung steht, mit :</string>
+    <string name="keyboards_swicth_magikeyboard_text">Sie können leicht von Ihrer Haupttastatur auf Magikeyboard umschalten, entweder mit der Sprachentaste Ihrer Tastatur, durch einen langen Druck auf die Leertaste oder, wenn das nicht zur Verfügung steht, mit:</string>
     <string name="keyboard_select_entry_text">Wählen Sie den Eintrag mit dem Schlüssel aus.</string>
     <string name="keyboard_fill_field_text">Füllen Sie die Felder mit den Elementen des Eintrags aus.</string>
     <string name="keyboard_lock_database_text">Sperren Sie die Datenbank.</string>
     <string name="keyboard_back_main_keyboard_text">Kehren Sie zur Haupttastatur zurück.</string>
 
     <string name="allow_no_password_title">Kein Passwort zulassen</string>
-    <string name="allow_no_password_summary">Öffnen-Taste aktivieren, wenn keine Passwort-Identifikation festgelegt ist.</string>
+    <string name="allow_no_password_summary">Öffnen-Taste aktivieren, wenn keine Passwort-Identifikation festgelegt ist</string>
 
     <string name="enable_education_screens_title">Hilfe-Anzeige</string>
-    <string name="enable_education_screens_summary">Bedienelemente hervorheben, um die Funktionsweise der Anwendung zu lernen</string>
+    <string name="enable_education_screens_summary">Bedienelemente hervorheben, um die Funktionsweise der App zu lernen</string>
     <string name="menu_open_file_read_and_write">Lesen und Schreiben</string>
     <string name="menu_file_selection_read_only">schreibgeschützt</string>
     <string name="enable_read_only_title">Schreibgeschützt</string>
     <string name="education_read_only_title">Schreibschutz aktivieren</string>
-    <string name="enable_read_only_summary">Standardmäßig wird die Datenbank im schreibgeschützten Modus geöffnet.</string>
+    <string name="enable_read_only_summary">Datenbanken standardmäßig im schreibgeschützten Modus öffnen</string>
 
     <string name="education_read_only_summary">Ändern Sie den Modus bei Eröffnung einer Sitzung.
 \n
 \nIm schreibgeschützten Modus verhindern Sie unbeabsichtigte Änderungen an der Datenbank.
 \n
 \nIm Modus ‘Lesen und Schreiben‘ können Sie alle Elemente hinzufügen, löschen oder verändern, wie Sie möchten.</string>
+    <string name="edit_entry">Eintrag bearbeiten</string>
+    <string name="error_load_database">Datenbank kann nicht geladen werden</string>
+    <string name="error_load_database_KDF_memory">Laden des Schlüssels fehlgeschlagen; versuchen Sie, den Speicher, der von KDF verwendet wird, zu verringen.</string>
+    <string name="list_entries_show_username_title">Benutzernamen anzeigen</string>
+    <string name="list_entries_show_username_summary">Benutzernamen in Eintragslisten anzeigen</string>
     </resources>

app/src/main/res/values-el/strings.xml

@@ -40,7 +40,7 @@
     <string name="clipboard_timeout">Λήξη χρονικού ορίου προχείρου</string>
     <string name="clipboard_timeout_summary">Χρόνος προτού γίνει εκκαθάριση του προχείρου μετά από αντιγραφή ονόματος χρήστη ή κωδικού πρόσβασης</string>
     <string name="select_to_copy">Επιλέξτε για αντιγραφή %1$s στο πρόχειρο</string>
-    <string name="creating_db_key">Δημιουργία κλειδιού βάσης δεδομένων&#8230;</string>
+    <string name="retrieving_db_key">Δημιουργία κλειδιού βάσης δεδομένων&#8230;</string>
     <string name="database">Βάση Δεδομένων</string>
     <string name="decrypting_db">Αποκρυπτογράφηση περιεχομένων βάσης δεδομένων&#8230;</string>
     <string name="default_checkbox">Χρήση αυτής της βάσης ως προεπιλεγμένη</string>
@@ -94,7 +94,7 @@
     <string name="password">Κωδικός Πρόσβασης</string>
     <string name="install_from_play_store">Εγκατάσταση από το Play Store</string>
     <string name="install_from_f_droid">Εγκατάσταση από το F-Droid</string>
-    <string name="InvalidPassword">Εσφαλμένος κωδικός ή αρχείο κλειδιού.</string>
+    <string name="invalid_password">Εσφαλμένος κωδικός ή αρχείο κλειδιού.</string>
     <string name="invalid_algorithm">Εσφαλμένος αλγόριθμος.</string>
     <string name="invalid_db_sig">Η μορφή της Βάσης Δεδομένων δεν αναγνωρίζεται.</string>
     <string name="keyfile_does_not_exist">Δεν υπάρχει αρχείο κλειδιού.</string>
@@ -152,9 +152,8 @@
     <string name="underline">Υπογράμμιση</string>
     <string name="unsupported_db_version">Μη υποστηριζόμενη έκδοση βάσης δεδομένων.</string>
     <string name="uppercase">Κεφαλαία</string>
-    <string name="warning_read_only">Η κάρτα SD είναι αυτή τη στιγμή μόνο για ανάγνωση. Είναι πιθανόν να μη μπορείτε ν αποθηκεύσετε τυχόν αλλαγές στη βάση δεδομένων σας.</string>
     <string name="warning_unmounted">Η κάρτα SD δεν είναι προσαρμοσμένη αυτή τη στιγμή στη συσκευή σας. Δεν θα μπορείτε να φορτώσετε ή να δημιουργήσετε τη βάση δεδομένων σας.</string>
-    <string name="version_label">Έκδοση:</string>
+    <string name="version_label">Έκδοση %1$s</string>
 
     <string name="education_unlock_summary">Εισάγετε έναν κωδικό πρόσβασης και/ή αρχείο κλειδιού για να ξεκλειδώσετε τη βάση δεδομένων σας.</string>
 

app/src/main/res/values-es/strings.xml

@@ -27,8 +27,8 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="add_entry">Añadir entrada</string>
     <string name="add_group">Añadir grupo</string>
     <string name="encryption_algorithm">Algoritmo de cifrado</string>
-    <string name="app_timeout">Tiempo de espera de aplicación</string>
+    <string name="app_timeout">Tiempo de espera de la aplicación excedido</string>
-    <string name="app_timeout_summary">Tiempo hasta bloquear la base de datos cuando la aplicación está inacttiva.</string>
+    <string name="app_timeout_summary">Tiempo hasta bloquear la base de datos cuando la aplicación está inactiva.</string>
     <string name="application">Aplicación</string>
     <string name="menu_app_settings">Configuración de la aplicación</string>
     <string name="brackets">Paréntesis</string>
@@ -38,7 +38,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="clipboard_timeout">Portapapeles caducado</string>
     <string name="clipboard_timeout_summary">Tiempo hasta que el portapapeles se vacía después de copiar el usuario o la contraseña</string>
     <string name="select_to_copy">Seleccionar para copiar %1$s al portapapeles</string>
-    <string name="creating_db_key">Creando clave de la base de datos…</string>
+    <string name="retrieving_db_key">Creando clave de la base de datos…</string>
     <string name="database">Base de datos</string>
     <string name="decrypting_db">Descifrando el contenido de la base de datos…</string>
     <string name="default_checkbox">Utilice esto como base de datos por defecto</string>
@@ -88,7 +88,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="hint_pass">contraseña</string>
     <string name="install_from_play_store">Instalar desde Play Store</string>
     <string name="install_from_f_droid">Instalar desde F-Droid</string>
-    <string name="InvalidPassword">Contraseña o archivo de clave no válido.</string>
+    <string name="invalid_password">Contraseña o archivo de clave no válido.</string>
     <string name="invalid_db_sig">Formato de base de datos no reconocido.</string>
     <string name="length">Longitud</string>
     <string name="list_size_title">Tamaño de la lista de Grupo</string>
@@ -139,9 +139,8 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="underline">Subrayado</string>
     <string name="unsupported_db_version">Versión de base de datos no soportada.</string>
     <string name="uppercase">Mayúsculas</string>
-    <string name="warning_read_only">Actualmente su tarjeta SD es de sólo lectura. No podrá guardar los cambios de su base de datos.</string>
     <string name="warning_unmounted">Actualmente su tarjeta SD no está montada en el dispositivo. No podrá cargar o crear su base de datos.</string>
-    <string name="version_label">Versión:</string>
+    <string name="version_label">Versión %1$s</string>
 
     <string name="education_unlock_summary">Introduzca una contraseña y/o un archivo de clave para desbloquear su base de datos.</string>
 
@@ -343,4 +342,5 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="icon_pack_choose_title">Seleccione un paquete de iconos</string>
     <string name="icon_pack_choose_summary">Cambiar el paquete de íconos de la aplicación</string>
 
-</resources>
+<string name="edit_entry">Editar entrada</string>
+    </resources>

app/src/main/res/values-eu/strings.xml

@@ -42,7 +42,7 @@
     <string name="clipboard_timeout">Arbela denbora pasatu da</string>
     <string name="clipboard_timeout_summary">Erabiltzaile izena edo pasahitza kopiatu ondoren arbela ezabatzeko igaro beharreko denbora</string>
     <string name="select_to_copy">Aukeratu %1$s arbelera kopiatzeko</string>
-    <string name="creating_db_key">Datubasearen gakoa sortzen&#8230;</string>
+    <string name="retrieving_db_key">Datubasearen gakoa sortzen&#8230;</string>
     <string name="database">Datubasea</string>
     <string name="decrypting_db">Datubasearen datuak desenkriptatzen&#8230;</string>
     <string name="default_checkbox">Hau erabili modu lehenetsitako datubase gisa</string>
@@ -96,7 +96,7 @@
     <string name="password">Pasahitza</string>
     <string name="install_from_play_store">Play store-etik Instalatu</string>
     <string name="install_from_f_droid">F-Droid-etik Instalatu</string>
-    <string name="InvalidPassword">Pasahitz edo gako fitxategi baliogabea.</string>
+    <string name="invalid_password">Pasahitz edo gako fitxategi baliogabea.</string>
     <string name="invalid_algorithm">Algoritmo baliogabea.</string>
     <string name="invalid_db_sig">Datubase formato ez ezaguna.</string>
     <string name="keyfile_does_not_exist">Gako fitxategia ez da esistitzen.</string>
@@ -152,9 +152,8 @@
     <string name="underline">Azpimarratu</string>
     <string name="unsupported_db_version">Euskarririk gabeko datubase bertsioa.</string>
     <string name="uppercase">Maiuskulak</string>
-    <string name="warning_read_only">Zure sd txartela bakarrik irakurtzeko moduan dago. Izan daiteke datubasearen aldaketak ezin gordetzea.</string>
     <string name="warning_unmounted">Une honetan zure sd txartela ez dago montatua zure dispositiboan. Ezingo duzu zure datubasea kargatu edo sortu.</string>
-    <string name="version_label">Bertsioa:</string>
+    <string name="version_label">Bertsioa %1$s</string>
 
     <string name="education_unlock_summary">Sartu pasahitz eta / edo gako fitxategi bat zure datubasea desblokeatzeko.</string>
 

app/src/main/res/values-fi/strings.xml

@@ -40,7 +40,7 @@
     <string name="clipboard_timeout">Leikepöydän aikakatkaisu</string>
     <string name="clipboard_timeout_summary">Aika, jonka jälkeen leikepöytä tyhjennetään käyttäjätunnuksen tai salasanan kopioinnin jälkeen</string>
     <string name="select_to_copy">Valitse kopioidaksesi %1$s</string>
-    <string name="creating_db_key">Luodaan tietokanta-avainta&#8230;</string>
+    <string name="retrieving_db_key">Luodaan tietokanta-avainta&#8230;</string>
     <string name="database">Tietokanta</string>
     <string name="decrypting_db">Puretaan tietokannan salausta&#8230;</string>
     <string name="default_checkbox">Käytä tätä oletustietokantana</string>
@@ -94,7 +94,7 @@
     <string name="password">Salasana</string>
     <string name="install_from_play_store">Asenna Play Storesta</string>
     <string name="install_from_f_droid">Asenna F-Droid</string>
-    <string name="InvalidPassword">Väärä salasana tai avaintiedosto.</string>
+    <string name="invalid_password">Väärä salasana tai avaintiedosto.</string>
     <string name="invalid_algorithm">Epäkelpo algoritmi.</string>
     <string name="invalid_db_sig">Salasanatietokannan tyyppiä ei tunnistettu.</string>
     <string name="keyfile_does_not_exist">Avaintiedostoa ei ole olemassa.</string>
@@ -150,9 +150,8 @@
     <string name="underline">Alleviivattu</string>
     <string name="unsupported_db_version">Ei-tuettu salasanatietokannan versio.</string>
     <string name="uppercase">Isot kirjaimet</string>
-    <string name="warning_read_only">SD-korttisi on kirjoitussuojattu. Et ehkä voi tallentaa salasanatietokantaan tekemiäsi muutoksia.</string>
     <string name="warning_unmounted">SD-korttia ei löydy. Et voi ladata tai tallentaa salasanatietokantaa.</string>
-    <string name="version_label">Versio:</string>
+    <string name="version_label">Versio %1$s</string>
 
     <string name="education_unlock_summary">Syötä salasana ja/tai avaintiedosto avataksesi tietokantasi.</string>
 

app/src/main/res/values-fr/strings.xml

@@ -29,25 +29,25 @@
     <string name="encryption_algorithm">Algorithme de Chiffrement</string>
     <string name="key_derivation_function">Fonction de dérivation de clé</string>
     <string name="app_timeout">Délai d\'expiration de l\'application</string>
-    <string name="app_timeout_summary">Temps avant le verrouillage de la base de données lorsque l\'application est inactive.</string>
+    <string name="app_timeout_summary">Temps avant le verrouillage de la base de données lorsque l\'application est inactive</string>
     <string name="application">Application</string>
     <string name="menu_app_settings">Préférences de l\'application</string>
     <string name="menu_form_filling_settings">Remplissage de formulaire</string>
     <string name="beta_dontask">Ne plus afficher</string>
     <string name="brackets">Crochets</string>
     <string name="extended_ASCII">ASCII étendu</string>
-    <string name="browser_intall_text">La navigation dans les fichiers nécessite Open Intents File Manager, cliquez ci-dessous pour l\'installer. En raison de certaines bizarreries dans le gestionnaire de fichiers, la navigation peut ne pas fonctionner correctement, la première fois que vous naviguez.</string>
+    <string name="browser_intall_text">La navigation dans les fichiers nécessite OpenIntents File Manager, cliquez ci-dessous pour l\'installer. En raison de certaines bizarreries dans le gestionnaire de fichiers, la navigation peut ne pas fonctionner correctement la première fois que vous naviguez.</string>
     <string name="cancel">Annuler</string>
     <string name="allow">Permettre</string>
     <string name="clipboard_cleared">Presse-papier vidé</string>
     <string name="clipboard_error_title">Erreur de presse-papier</string>
-    <string name="clipboard_error">Certains appareils Android Samsung ont un bug dans l\'implémentation du presse-papier qui empêche la copie depuis des applications. Pour plus de détails, visitez :</string>
+    <string name="clipboard_error">Certains appareils Android Samsung ont un bug dans l\'implémentation du presse-papier qui empêche la copie depuis des applications. Plus de détails :</string>
     <string name="clipboard_error_clear">Le vidage du presse-papier a échoué</string>
     <string name="clipboard_timeout">Expiration du presse-papier</string>
     <string name="clipboard_timeout_summary">Temps avant le vidage du presse-papier après copie du nom d\'utilisateur ou du mot de passe</string>
     <string name="clipboard_swipe_clean">Balayez pour effacer le presse-papiers maintenant</string>
     <string name="select_to_copy">Copier %1$s dans le presse-papier</string>
-    <string name="creating_db_key">Création de la clé de base de données…</string>
+    <string name="retrieving_db_key">Création de la clé de base de données…</string>
     <string name="database">Base de données</string>
     <string name="decrypting_db">Déchiffrement du contenu de la base de données…</string>
     <string name="default_checkbox">Utiliser comme base de données par défaut</string>
@@ -61,31 +61,31 @@
     <string name="entry_expires">Expire</string>
     <string name="entry_keyfile">Fichier clé</string>
     <string name="entry_modified">Modifié</string>
-    <string name="entry_not_found">Entry data not found.</string>
+    <string name="entry_not_found">Données d\'entrée non trouvées.</string>
     <string name="entry_password">Mot de passe</string>
     <string name="entry_save">Enregistrer</string>
     <string name="entry_title">Titre</string>
     <string name="entry_url">URL</string>
     <string name="entry_user_name">Nom d\'utilisateur</string>
-    <string name="error_arc4">Le chiffrement de flux ArcFour n\'est pas supporté.</string>
+    <string name="error_arc4">Le chiffrement de flux ARCFOUR n\'est pas supporté.</string>
     <string name="error_can_not_handle_uri">KeePass DX ne peut pas gérer cette URI.</string>
     <string name="error_could_not_create_parent">La création du groupe parent a échoué.</string>
     <string name="error_database_exists">Le fichier existe déjà.</string>
-    <string name="error_failed_to_launch_link">Échec lors de l\'ouverture du lien.</string>
+    <string name="error_failed_to_launch_link">Échec d\'ouverture du lien.</string>
     <string name="error_filename_required">Le nom de fichier est obligatoire.</string>
     <string name="error_file_not_create">Impossible de créer le fichier :</string>
     <string name="error_invalid_db">Base de données invalide ou clé maitresse non reconnue.</string>
     <string name="error_invalid_path">Chemin invalide.</string>
     <string name="error_no_name">Le nom est obligatoire.</string>
     <string name="error_nokeyfile">Un fichier clé est requis.</string>
-    <string name="error_out_of_memory">Votre appareil ne dispose pas de suffisamment de mémoire pour ouvrir votre base de données. Elle est probablement trop grosse pour votre appareil.</string>
+    <string name="error_out_of_memory">L\'appareil ne dispose pas de suffisamment de mémoire pour ouvrir votre base de données.</string>
     <string name="error_pass_gen_type">Au moins un type de génération de mot de passe doit être sélectionné</string>
     <string name="error_pass_match">Les mots de passe ne correspondent pas.</string>
-    <string name="error_rounds_not_number">La série doit être un nombre.</string>
+    <string name="error_rounds_not_number">\"Niveaux\" doit être un nombre.</string>
-    <string name="error_rounds_too_large">Niveau trop gros. Paramètres à 2147483648.</string>
+    <string name="error_rounds_too_large">\"Niveaux\" trop gros. Paramètres à 2147483648.</string>
-    <string name="error_string_key">A field name is required for each string.</string>
+    <string name="error_string_key">Un nom de champ est requis pour chaque élément.</string>
     <string name="error_title_required">Le titre est obligatoire.</string>
-    <string name="error_wrong_length">Entrez un entier positif pour la longueur du champ</string>
+    <string name="error_wrong_length">Entrez un entier positif pour le champ \"Longueur\"</string>
     <string name="error_autofill_enable_service">Le service de remplissage automatique ne peut être activé.</string>
     <string name="field_name">Nom du champ</string>
     <string name="field_value">Valeur</string>
@@ -102,7 +102,7 @@
     <string name="password">Mot de passe</string>
     <string name="install_from_play_store">Installer depuis Google Play</string>
     <string name="install_from_f_droid">Installer depuis F-Droid</string>
-    <string name="InvalidPassword">Mot de passe ou fichier de clé invalide.</string>
+    <string name="invalid_password">Mot de passe ou fichier de clé invalide.</string>
     <string name="invalid_algorithm">Algorithme invalide.</string>
     <string name="invalid_db_sig">Format de base de données non reconnu.</string>
     <string name="keyfile_does_not_exist">Le fichier de clé n\'existe pas.</string>
@@ -131,17 +131,17 @@
     <string name="menu_url">Ouvrir l\'URL</string>
     <string name="minus">Moins</string>
     <string name="never">Jamais</string>
-    <string name="no_results">Aucun résultat pour cette recherche.</string>
+    <string name="no_results">Aucun résultat pour cette recherche</string>
     <string name="no_url_handler">Impossible d\'ouvrir cette URL.</string>
     <string name="select_database_file">Sélectionner une base de données existante</string>
     <string name="open_recent">Bases de données récentes :</string>
-    <string name="omitbackup_title">Ignorer les sauvegardes</string>
+    <string name="omitbackup_title">Ne pas rechercher dans les entrées de sauvegarde</string>
-    <string name="omitbackup_summary">Ignorer le groupe Sauvegardes des résultats de recherche (uniquement pour .kdb)</string>
+    <string name="omitbackup_summary">Ignorer le groupe \'Sauvegardes\' des résultats de recherche (uniquement pour .kdb)</string>
     <string name="progress_create">Création d\'une nouvelle base de données…</string>
     <string name="progress_title">Veuillez patienter…</string>
     <string name="protection">Protection</string>
     <string name="read_only">Lecture seule</string>
-    <string name="read_only_warning">KeePass DX n\'a pas la permission d\'écrire dans le répertoire de la base de données. Celle-ci sera ouverte en lecture seule.</string>
+    <string name="read_only_warning">KeePass DX n\'a pas la permission d\'écrire dans votre répertoire de base de données, celle-ci sera ouverte en lecture seule.</string>
     <string name="read_only_kitkat_warning">À partir d\'Android KitKat, certains appareils n\'autorisent plus les applications à écrire sur la carte SD.</string>
     <string name="recentfile_title">Historique de fichiers récents</string>
     <string name="recentfile_summary">Mémoriser les fichiers récemment utilisés</string>
@@ -150,7 +150,7 @@
     <string name="remove_from_filelist">Effacer</string>
     <string name="root">Racine</string>
     <string name="encryption_explanation">Algorithme pour chiffrer toute la base de données. (Les mots de passe, noms d\'utilisateur, notes et toutes les données dans la base de données sont chiffrés avec l\'algorithme sélectionné)</string>
-    <string name="kdf_explanation">Afin de générer la clé pour l\'algorithme de chiffrement, la clé maîtresse compressée (SHA-256) est transformée en utilisant une fonction de dérivation de clé (avec un salage aléatoire).</string>
+    <string name="kdf_explanation">Afin de générer la clé pour l\'algorithme de chiffrement, la clé maîtresse compressée (SHA-256) est transformée en utilisant une fonction de dérivation de clé avec salage aléatoire.</string>
     <string name="rounds">Tours de transformation</string>
     <string name="rounds_explanation">Un niveau de chiffrement supérieur assure une protection supplémentaire contre les attaques de force brute, mais peut considérablement ralentir l\'ouverture et l\'enregistrement.</string>
     <string name="rounds_hint">niveaux</string>
@@ -162,31 +162,31 @@
     <string name="space">Espace</string>
     <string name="search_label">Rechercher</string>
     <string name="sort_menu">Trier</string>
-    <string name="sort_ascending">Ascendant</string>
+    <string name="sort_ascending">Ascendant ↓</string>
     <string name="sort_groups_before">Groupes avant</string>
     <string name="sort_recycle_bin_bottom">Corbeille à la fin</string>
     <string name="sort_db">Tri par défaut (base de données)</string>
-    <string name="sort_title">Tri par Titre</string>
+    <string name="sort_title">Titre</string>
-    <string name="sort_username">Tri par Nom d\'utilisateur</string>
+    <string name="sort_username">Nom d\'utilisateur</string>
-    <string name="sort_creation_time">Tri par Date de Création</string>
+    <string name="sort_creation_time">Date de Création</string>
-    <string name="sort_last_modify_time">Tri par Date de Dernière Modification</string>
+    <string name="sort_last_modify_time">Date de Dernière Modification</string>
-    <string name="sort_last_access_time">Tri par Date de Dernier Accès</string>
+    <string name="sort_last_access_time">Date de Dernier Accès</string>
     <string name="special">Spécial</string>
     <string name="search">Nom/description</string>
     <string name="search_results">Résultats</string>
     <string name="underline">Souligné</string>
     <string name="unsupported_db_version">Version de la base de données non supportée.</string>
     <string name="uppercase">Majuscule</string>
-    <string name="use_saf_summary">Utiliser l\'Environnement d\'Accès au Stockage d\'Android pour naviguer dans les fichiers (KitKat ou plus récent)</string>
+    <string name="use_saf_summary">Utiliser l\'Environnement d\'Accès au Stockage Android pour naviguer dans les fichiers (KitKat ou plus récent)</string>
     <string name="use_saf_title">Environnement d\'Accès au Stockage</string>
     <string name="warning">Alerte</string>
-    <string name="warning_password_encoding">Le format .kdb ne supporte que le jeu de caractère Latin1. Votre mot de passe doit contenir des caractères en dehors de ce jeu. Tous les caractères non-Latin1 sont convertis en un même caractère, ce qui diminue la sécurité de votre mot de passe. Le changement de votre mot de passe est recommandé.</string>
+    <string name="warning_password_encoding">Votre mot de passe peut contenir des lettres non prises en charge par le jeu de caractères Latin-1 utilisé par les fichiers .kdb. Comme elles sont toutes converties vers la même lettre, il est recommandé de changer votre mot de passe pour le rendre plus sûr.</string>
     <string name="warning_read_only">Votre carte SD est actuellement en lecture seule. Vous ne pourrez pas enregistrer les changements dans la base de données.</string>
     <string name="warning_unmounted">Votre carte SD n\'est actuellement pas montée sur votre appareil. Vous ne pourrez pas charger ou créer votre base de données.</string>
-    <string name="warning_empty_password">Voulez-vous vraiment utiliser une chaine de caractères vide comme mot de passe ?</string>
+    <string name="warning_empty_password">Voulez-vous vraiment utiliser une chaîne de caractères vide comme mot de passe ?</string>
-    <string name="warning_no_encryption_key">Etes-vous sûr de ne vouloir utiliser aucune clé de chiffrement.</string>
+    <string name="warning_no_encryption_key">Êtes-vous sûr de ne vouloir utiliser aucune clé de chiffrement ?</string>
-    <string name="version_label">Version :</string>
+    <string name="version_label">Version %1$s</string>
-    <string name="configure_fingerprint">Reconnaissance d\'empreinte digitale non configuré pour cet appareil</string>
+    <string name="configure_fingerprint">La reconnaissance d\'empreinte digitale est supportée mais non configuré pour cet appareil</string>
     <string name="scanning_fingerprint">Attente d\'une reconnaissance d\'empreinte digitale</string>
     <string name="encrypted_value_stored">Mot de passe encrypté stocké</string>
     <string name="fingerprint_invalid_key">Problème de clé invalide. Restaurez votre mot de passe.</string>
@@ -209,48 +209,48 @@
     <string name="clipboard">Presse-papiers</string>
     <string name="clipboard_notifications_title">Notifications du presse-papiers</string>
     <string name="clipboard_notifications_summary">Activer les notifications du presse-papiers pour copier les champs d\'entrées</string>
-    <string name="clipboard_warning">Certains appareils ne sont pas en mesure de supprimer automatiquement les éléments du presse-papiers. Si votre gestionnaire n\'autorise pas cette suppression, vous devrez supprimer manuellement l\'élément copié de l\'historique de votre presse-papiers.</string>
+    <string name="clipboard_warning">Si votre appareil ne parvient pas à supprimer automatiquement les éléments du presse-papiers, supprimez l\'élément copié de l\'historique de votre presse-papiers manuellement.</string>
     <string name="lock">Verrouiller</string>
     <string name="lock_database_screen_off_title">Verrouillage d\'écran</string>
     <string name="lock_database_screen_off_summary">Verrouiller la base de données quand l\'écran est éteint</string>
-    <string name="fingerprint_quick_unlock_title">Comment configurer l\'empreinte digitale pour un déverrouillage rapide?</string>
+    <string name="fingerprint_quick_unlock_title">Comment configurer l\'empreinte digitale pour un déverrouillage rapide ?</string>
     <string name="fingerprint_setting_text">Définissez votre empreinte digitale personnelle pour votre appareil dans </string>
-    <string name="fingerprint_setting_way_text">Paramètres -&gt; Sécurité -&gt; Empreinte digitale</string>
+    <string name="fingerprint_setting_way_text">\"Paramètres\" → \"Sécurité\" → \"Empreinte digitale\"</string>
     <string name="fingerprint_type_password_text">Tapez votre mot de passe dans Keepass DX</string>
     <string name="fingerprint_scan_to_store">Scannez votre empreinte digitale pour stocker votre mot de passe maître en toute sécurité</string>
     <string name="fingerprint_scan_to_open">Scanner votre empreinte digitale lorsque la case à cocher du mot de passe n\'est pas cochée pour ouvrir la base de données</string>
     <string name="usage">Usage</string>
     <string name="fingerprint">Empreinte digitale</string>
-    <string name="fingerprint_enable_title">Écoute d\'empreintes digitales</string>
+    <string name="fingerprint_enable_title">Scan d\'empreintes digitales</string>
     <string name="fingerprint_enable_summary">Activer l\'ouverture de la base de données par empreinte digitale</string>
     <string name="fingerprint_delete_all_title">Supprimer les clés de chiffrement</string>
     <string name="fingerprint_delete_all_summary">Supprimer toutes les clés de chiffrement liées à la reconnaissance des empreintes digitales</string>
-    <string name="fingerprint_delete_all_warning">Êtes-vous sûr de vouloir supprimer toutes les clés liées aux empreintes digitales?</string>
+    <string name="fingerprint_delete_all_warning">Êtes-vous sûr de vouloir supprimer toutes les clés liées aux empreintes digitales ?</string>
     <string name="unavailable_feature_text">Impossible de démarrer cette fonctionnalité.</string>
     <string name="unavailable_feature_version">Votre version Android %1$s n\'est pas la version minimale %2$s requise.</string>
     <string name="unavailable_feature_hardware">Le matériel n\'est pas détecté.</string>
     <string name="file_name">Nom de fichier</string>
     <string name="path">Chemin</string>
     <string name="assign_master_key">Assigner une clé maître</string>
-    <string name="create_keepass_file">Créer un fichier keepass</string>
+    <string name="create_keepass_file">Créer un fichier KeePass</string>
     <string name="bytes">Octets</string>
     <string name="full_file_path_enable_title">Chemin de fichier</string>
     <string name="full_file_path_enable_summary">Afficher le chemin complet des fichiers</string>
     <string name="recycle_bin_title">Utiliser la corbeille</string>
-    <string name="recycle_bin_summary">Déplace un groupe ou une entrée dans la Corbeille avant la suppression</string>
+    <string name="recycle_bin_summary">Déplace un groupe ou une entrée dans la \"Corbeille\" avant la suppression</string>
     <string name="permission_external_storage_rationale_write_database">KeePass DX a besoin d\'une permission de stockage externe pour écrire une base de données</string>
-    <string name="permission_external_storage_rationale_read_database">KeePass DX a besoin d\'une permission de stockage externe pour lire une URI non fournie par un Content Provider</string>
+    <string name="permission_external_storage_rationale_read_database">KeePass DX a besoin d\'une permission de stockage externe pour lire une URI non fournie par un content provider</string>
     <string name="permission_external_storage_denied">Permission de stockage externe refusée</string>
     <string name="permission_external_storage_never_ask">Impossible d\'effectuer l\'action sans autorisation de stockage externe</string>
-    <string name="monospace_font_fields_enable_title">Police des champs</string>
+    <string name="monospace_font_fields_enable_title">Police de champs</string>
     <string name="monospace_font_fields_enable_summary">Changer la police de caractères des champs pour une meilleure visibilité</string>
     <string name="auto_open_file_uri_title">Ouvrir le fichier sélectionné automatiquement</string>
     <string name="auto_open_file_uri_summary">Ouvrir automatiquement un fichier à partir de l\'écran de sélection après une sélection dans le navigateur de fichiers</string>
     <string name="allow_copy_password_title">Copie de mot de passe</string>
-    <string name="allow_copy_password_summary">Autoriser la copie du mot de passe et des champs protégés dans le presse-papiers.</string>
+    <string name="allow_copy_password_summary">Autoriser la copie du mot de passe et des champs protégés dans le presse-papiers</string>
     <string name="allow_copy_password_warning">ATTENTION : Le presse-papiers est partagé par toutes les applications. Si des données sensibles sont copiés, d\'autres logiciels peuvent les récupérer.</string>
     <string name="warning_disabling_storage_access_framework">ATTENTION : désactiver cette fonctionnalité peut engendrer une impossibilité d\'ouvrir ou sauvegarder les bases de données</string>
-    <string name="open_link_database">Lien du fichier Kdbx à ouvrir</string>
+    <string name="open_link_database">Lien du fichier KDBX à ouvrir</string>
     <string name="database_name_title">Nom de la base de données</string>
     <string name="database_description_title">Description de la base de données</string>
     <string name="database_version_title">Version de la base de données</string>
@@ -259,7 +259,7 @@
     <string name="other">Autres</string>
     <string name="keyboard">Clavier</string>
     <string name="magic_keyboard_title">Magikeyboard</string>
-    <string name="magic_keyboard_summary">Activer un clavier customisé qui permet le renseignement de vos mots de passe et de tous vos champs d\'identité facilement.</string>
+    <string name="magic_keyboard_summary">Activer un clavier customisé qui permet le renseignement de vos mots de passe et de tous vos champs d\'identité facilement</string>
 
     <string name="enable_education_screens_title">Ecrans d\'éducation</string>
     <string name="enable_education_screens_summary">Met en surbrillance les éléments pour apprendre le fonctionnement de l\'application</string>
@@ -269,9 +269,9 @@
     <string name="education_create_database_title">Créez votre fichier de base de données</string>
     <string name="education_create_database_summary">Vous ne connaissez pas encore KeePass DX, créez votre premier fichier de gestion de mots de passe.</string>
     <string name="education_select_database_title">Ouvrez une base de données existante</string>
-    <string name="education_select_database_summary">Vous avez déjà utilisé un lecteur KeePass. Ouvrez simplement votre fichier Kdbx depuis votre navigateur de fichiers.</string>
+    <string name="education_select_database_summary">Vous avez déjà utilisé un lecteur KeePass. Ouvrez simplement votre fichier KDBX depuis votre navigateur de fichiers.</string>
     <string name="education_open_link_database_title">Un lien vers l\'emplacement de votre fichier suffit</string>
-    <string name="education_open_link_database_summary">Vous pouvez aussi ouvrir votre base avec un lien physique. (Avec file:// et content:// par exemple).</string>
+    <string name="education_open_link_database_summary">Vous pouvez aussi ouvrir votre base avec un lien physique. (avec file:// et content:// par exemple).</string>
     <string name="education_new_node_title">Ajoutez de nouveaux éléments à votre base</string>
     <string name="education_new_node_summary">Ajoutez des entrées pour gérer vos identités numériques.\n\nAjoutez des groupes (l\'équivalent des dossiers) pour organiser vos entrées et votre base.</string>
     <string name="education_search_title">Recherchez facilement vos entrées</string>
@@ -279,23 +279,27 @@
     <string name="education_fingerprint_title">Débloquez votre base de données avec votre empreinte digitale</string>
     <string name="education_fingerprint_summary">Faites le lien entre votre mot de passe et votre empreinte digitale pour facilement dévérouiller votre base de données.</string>
     <string name="education_entry_edit_title">Editez l\'entrée</string>
-    <string name="education_entry_edit_summary">Editez votre entrée avec des champs customisés, vous pouvez ajouter des références pour mutualiser les données entre les champs de différentes entrées.</string>
+    <string name="education_entry_edit_summary">Éditez votre entrée avec des champs customisés, des références pour mutualiser les données peuvent être ajoutées entre les champs de différentes entrées.</string>
     <string name="education_generate_password_title">Créez un mot de passe fort</string>
-    <string name="education_generate_password_summary">Générez un mot de passe fort à associer avec votre entrée, définissez le facilement en fonction des critères du formulaire et n\'oubliez plus un mot de passe difficile mais sécurisé.</string>
+    <string name="education_generate_password_summary">Générez un mot de passe fort à associer avec votre entrée, définissez le facilement en fonction des critères du formulaire et n\'oubliez plus de mot de passe sécurisé .</string>
     <string name="education_entry_new_field_title">Ajoutez des champs customisés</string>
     <string name="education_entry_new_field_summary">Vous voulez enregistrer un champ non fourni de base, renseignez en simplement un nouveau que vous pouvez aussi protéger visuelement.</string>
     <string name="education_unlock_title">Débloquez votre base de données</string>
-    <string name="education_unlock_summary">Entrez un mot de passe et/ou un fichier de clé pour ouvrir la base de données.\n\nPensez à sauvegarder une copie de votre fichier en lieu sûr après chaque modification.</string>
+    <string name="education_unlock_summary">Entrez un mot de passe et/ou un fichier de clé pour ouvrir la base de données.
+\n
+\nPensez à sauvegarder une copie de votre fichier .kdbx en lieu sûr après chaque modification.</string>
     <string name="education_field_copy_title">Copiez un champ</string>
-    <string name="education_field_copy_summary">Copiez un champ facilement pour le coller où vous voulez.\n\n Vous pouvez utilisez plusieurs méthodes de remplissage de formulaire. Utilisez celle que vous préférez!</string>
+    <string name="education_field_copy_summary">Copiez un champ facilement pour le coller où vous voulez.
+\n
+\n Vous pouvez utilisez plusieurs méthodes de remplissage de formulaire. Utilisez celle que vous préférez.</string>
     <string name="education_lock_title">Vérouillez la base de données</string>
     <string name="education_lock_summary">Verrouillez votre base de données rapidement, vous pouvez paramétrer l\'application pour qu\'elle se verrouille après un certain temps et lorsque l\'écran s\'éteint.</string>
     <string name="education_sort_title">Triez les éléments</string>
     <string name="education_sort_summary">Triez les entrées et les groupes en fonction de paramètres spécifiques.</string>
     <string name="education_donation_title">Participez</string>
-    <string name="education_donation_summary">Participer pour augmenter la stabilité, la sécurité et ajouter plus de fonctionnalités.</string>
+    <string name="education_donation_summary">Participer pour aider à augmenter la stabilité, la sécurité et ajouter plus de fonctionnalités.</string>
 
-    <string name="html_text_ad_free">Contrairement à d\'autres applications de gestion de mots de passe, cette application est &lt;strong&gt;sans publicité&lt;/strong&gt;, &lt;strong&gt;open source&lt;/strong&gt; et ne récupère pas de données personnelles sur ses serveurs, même dans sa version gratuite.</string>
+    <string name="html_text_ad_free">Contrairement à d\'autres applications de gestion de mots de passe, cette application est <strong>sans publicité</strong>, <strong>open source sous licence copyleft</strong> et ne récupère pas de données personnelles sur ses serveurs, même dans sa version gratuite.</string>
     <string name="html_text_buy_pro">En achetant la version pro, vous accéderez à cette &lt;strong&gt;fonctionnalité visuelle&lt;/strong&gt; et vous aiderez en particulier à &lt;strong&gt;la réalisation de projets communautaires.&lt;/strong&gt;</string>
     <string name="html_text_feature_generosity">Cette &lt;strong&gt;fonctionnalité visuelle&lt;/strong&gt; est disponible grâce à votre générosité.</string>
     <string name="html_text_donation">Afin de garder notre liberté et d\'être toujours actif, nous comptons sur votre &lt;strong&gt;contribution.&lt;/strong&gt;</string>
@@ -317,7 +321,7 @@
     <string name="encryption_chacha20">ChaCha20</string>
 
     <!-- Key Derivation Functions -->
-    <string name="kdf_AES">AES-KDF</string>
+    <string name="kdf_AES">AES KDF</string>
     <string name="kdf_Argon2">Argon2</string>
 
     <string-array name="timeout_options">
@@ -358,8 +362,8 @@
     <string name="magic_keyboard_preference_title">Paramètres du Magikeyboard</string>
     <string name="magic_keyboard_configure_title">Comment configurer le clavier pour le remplissage sécurisé de formulaire ?</string>
     <string name="magic_keyboard_activate_setting_text">Activer le Magikeyboard dans les paramètres de l\'appareil.</string>
-    <string name="magic_keyboard_activate_setting_path_1_text">Paramètres -&gt; Langue et saisie -&gt; Clavier actuel -&gt; CHOISIR LES CLAVIERS</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">\"Paramètres\" → \"Langue &amp; saisie\" → \"Clavier actuel\" et en choisir un.</string>
-    <string name="magic_keyboard_activate_setting_path_2_text">ou (Paramètres -&gt; Système -&gt; Langues et saisie -&gt; Clavier virtuel -&gt; Gérer les claviers)</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">ou (\"Paramètres\" → \"Système\" → \"Langues et saisie\" → \"Clavier virtuel\" et en choisir un.)</string>
     <string name="keyboards_choose_magikeyboard_text">Choisir le Magikeyboard lorsque vous avez besoin de remplir un formulaire.</string>
     <string name="keyboards_swicth_magikeyboard_text">Vous pouvez facilement passer de votre clavier principal à Magikeyboard avec le bouton langage de votre clavier, un appui long sur la barre d\'espace de votre clavier, ou, si ce n\'est pas disponible, avec :</string>
     <string name="keyboard_select_entry_text">Sélectionnez votre entrée avec la clé.</string>
@@ -368,12 +372,12 @@
     <string name="keyboard_back_main_keyboard_text">Retourner sur votre clavier principal.</string>
 
     <string name="allow_no_password_title">Autoriser aucun mot de passe</string>
-    <string name="allow_no_password_summary">Activer le bouton d\'ouverture si aucune identification de mot de passe n\'est sélectionnée.</string>
+    <string name="allow_no_password_summary">Activer le bouton d\'ouverture si aucune identification de mot de passe n\'est sélectionnée</string>
 
     <string name="menu_file_selection_read_only">Lecture seule</string>
     <string name="menu_open_file_read_and_write">Lecture et écriture</string>
     <string name="enable_read_only_title">Lecture seule</string>
-    <string name="enable_read_only_summary">Par défaut, ouvrir une base de données en mode lecture seule.</string>
+    <string name="enable_read_only_summary">Par défaut, ouvrir une base de données en mode lecture seule</string>
 
     <string name="education_read_only_title">Activer la lecture seule</string>
     <string name="education_read_only_summary">Changez le mode d\'ouverture de la session.
@@ -381,4 +385,9 @@
 \nEn mode lecture seule, vous empêchez les modifications involontaires de la base de données.
 \n
 \nEn mode écriture, vous pouvez ajouter, supprimer ou modifier tous les éléments comme vous le souhaitez.</string>
+    <string name="edit_entry">Modifier l\'entrée</string>
+    <string name="error_load_database">La base de données ne peut être chargée</string>
+    <string name="error_load_database_KDF_memory">Impossible de charger la clé, essayez de diminuer la mémoire utilisée par le KDF.</string>
+    <string name="list_entries_show_username_title">Afficher les noms d\'utilisateur</string>
+    <string name="list_entries_show_username_summary">Afficher les noms d\'utilisateur dans les listes d\'entrées</string>
     </resources>

app/src/main/res/values-hu/strings.xml

@@ -37,7 +37,7 @@
     <string name="clipboard_timeout">Vágólap időkorlátja</string>
     <string name="clipboard_timeout_summary">Beállíthatja, mennyi idő után kerüljön törlésre a vágólap</string>
     <string name="select_to_copy">%1$s másolása a vágólapra</string>
-    <string name="creating_db_key">Adatbázis létrehozása…</string>
+    <string name="retrieving_db_key">Adatbázis létrehozása…</string>
     <string name="database">Adatbázis</string>
     <string name="decrypting_db">Adatbázis tartalmának dekódolása…</string>
     <string name="default_checkbox">Adatbázis beállítása alapértelmezettként</string>
@@ -91,7 +91,7 @@
     <string name="password">Jelszó</string>
     <string name="install_from_play_store">Letöltés a Google Play-ről</string>
     <string name="install_from_f_droid">Letöltés a F-Droid</string>
-    <string name="InvalidPassword">Érvénytelen jelszó vagy kulcsfájl.</string>
+    <string name="invalid_password">Érvénytelen jelszó vagy kulcsfájl.</string>
     <string name="invalid_algorithm">Érvénytelen algoritmus.</string>
     <string name="invalid_db_sig">Az adabázis formátuma nem ismert.</string>
     <string name="keyfile_does_not_exist">A kulcsfájl nem létezik.</string>
@@ -153,10 +153,9 @@
     <string name="use_saf_summary">Használja az Android Storage Access Framework-öt a fájlok böngészéséhez (KitKat vagy későbbi)</string>
     <string name="use_saf_title">Storage Access Framework</string>
     <string name="warning">Figyelmeztetés</string>
-    <string name="warning_password_encoding">A .kdb formátum csak a Latin1 karakterkészletet támogatja. A jelenlegi jelszó olyan karaktereket is tartalmazhat, amik ezen kívül esnek. Az összes ilyen karakter át lesz lesz konvertálva, viszont ez nagyban csökkenteni fogja a jelszó erősségét. Mielőbbi megváltoztatása ajánlott.</string>
+    <string name="warning_password_encoding">A .kdb formátum csak a Latin1 karakterkészletet támogatja. A jelenlegi jelszó olyan karaktereket is tartalmazhat, amik ezen kívül esnek. Az összes ilyen karakter át lesz konvertálva, viszont ez nagyban csökkenteni fogja a jelszó erősségét. Mielőbbi megváltoztatása ajánlott.</string>
-    <string name="warning_read_only">A memóriakártya jelenleg csak olvasható. Lehet, hogy nem tudja menteni a módosításokat az adatbázisban.</string>
     <string name="warning_unmounted">A memóriakártya jelenleg el van távolítva. Nem fogja tudni az adatbázist betölteni vagy módosítani.</string>
-    <string name="version_label">Verzió:</string>
+    <string name="version_label">Verzió %1$s</string>
     <string name="configure_fingerprint">Az ujjlenyomat használat nincs még beállítva az eszközön</string>
     <string name="scanning_fingerprint">Várakozás az ujjelnyomat megadására</string>
     <string name="encrypted_value_stored">Titkosított jelszó elmentve</string>

app/src/main/res/values-it/strings.xml

@@ -29,27 +29,27 @@
     <string name="add_group">Aggiungi gruppo</string>
     <string name="add_string">Aggiungi stringa</string>
     <string name="encryption_algorithm">Algoritmo</string>
-    <string name="app_timeout">Scadenza applicazione</string>
+    <string name="app_timeout">Scadenza app</string>
-    <string name="app_timeout_summary">Tempo prima che venga bloccato il database quando l\'applicazione è inattiva.</string>
+    <string name="app_timeout_summary">Tempo prima del blocco del database quando l\'app è inattiva</string>
-    <string name="application">Applicazione</string>
+    <string name="application">App</string>
-    <string name="menu_app_settings">Impostazioni applicazione</string>
+    <string name="menu_app_settings">Impostazioni app</string>
     <string name="brackets">Parentesi</string>
-    <string name="browser_intall_text">Sfogliare i file richiede l\'applicazione Gestore File di Open Intents, clicca sotto per installarlo. A causa di alcune stranezze nel gestore file, la prima volta la navigazione potrebbe non funzionare correttamente.</string>
+    <string name="browser_intall_text">Sfogliare i file richiede che sia installato Gestore File di Open Intents, clicca sotto per farlo. A causa di alcune stranezze nel gestore file, la prima volta la navigazione potrebbe non funzionare correttamente.</string>
     <string name="cancel">Annulla</string>
     <string name="clipboard_cleared">Appunti eliminati</string>
     <string name="clipboard_error_title">Errore negli appunti</string>
-    <string name="clipboard_error">Alcuni telefoni Android di Samsung hanno un bug nell\'implementazione degli appunti che causa errori nella copia degli appunti da applicazioni. Per maggiori dettagli:</string>
+    <string name="clipboard_error">Alcuni telefoni Android di Samsung hanno un errore nell\'implementazione degli appunti che causa errori nella copia da app. Maggiori dettagli:</string>
     <string name="clipboard_error_clear">Eliminazione degli appunti fallita</string>
     <string name="clipboard_timeout">Scadenza appunti</string>
     <string name="clipboard_timeout_summary">Tempo prima di eliminare gli appunti dopo la copia del nome file o password</string>
     <string name="select_to_copy">Copia %1$s negli appunti</string>
-    <string name="creating_db_key">Creazione file chiave database…</string>
+    <string name="retrieving_db_key">Creazione file chiave database…</string>
     <string name="database">Database</string>
     <string name="decrypting_db">Decodifica contenuto database…</string>
     <string name="default_checkbox">Usa come database predefinito</string>
-    <string name="digits">Cifre</string>
+    <string name="digits">Numeri</string>
-    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft viene distribuito ASSOLUTAMENTE con NESSUNA GARANZIA; Si tratta di software libero e sei invitato a distribuirlo sotto le condizioni della licenza GPL versione 3 o superiore.</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft viene distribuito ASSOLUTAMENTE con NESSUNA GARANZIA; Si tratta di software libero e sei invitato a distribuirlo sotto le condizioni della licenza GPL versione 3 o successiva.</string>
-    <string name="select_database_file">Inserisci il nome file del database</string>
+    <string name="select_database_file">Seleziona un database esistente</string>
     <string name="entry_accessed">Ultimo accesso</string>
     <string name="entry_cancel">Annulla</string>
     <string name="entry_comment">Commento</string>
@@ -64,8 +64,8 @@
     <string name="entry_title">Nome</string>
     <string name="entry_url">URL</string>
     <string name="entry_user_name">Nome utente</string>
-    <string name="error_arc4">La codifica ArcFour non è supportata.</string>
+    <string name="error_arc4">La codifica a flusso ARCFOUR non è supportata.</string>
-    <string name="error_can_not_handle_uri">KeePass DX non può gestire questo URL.</string>
+    <string name="error_can_not_handle_uri">KeePass DX non può gestire questo URI.</string>
     <string name="error_could_not_create_parent">Impossibile creare la directory principale.</string>
     <string name="error_database_exists">File già esistente.</string>
     <string name="error_failed_to_launch_link">Impossibile aprire il collegamento.</string>
@@ -74,14 +74,14 @@
     <string name="error_invalid_db">Database non valido.</string>
     <string name="error_invalid_path">Percorso non valido.</string>
     <string name="error_no_name">È necessario un nome.</string>
-    <string name="error_out_of_memory">Il telefono ha esaurito la memoria durante l\'elaborazione del database. Potrebbe essere troppo grande per il tuo telefono.</string>
+    <string name="error_out_of_memory">Il dispositivo ha esaurito la memoria durante l\'elaborazione del database.</string>
     <string name="error_pass_gen_type">Deve essere selezionato almeno un tipo di generazione password</string>
     <string name="error_pass_match">Le password non corrispondono.</string>
-    <string name="error_rounds_not_number">Il livello deve essere un numero.</string>
+    <string name="error_rounds_not_number">Il \"livello\" deve essere un numero.</string>
-    <string name="error_rounds_too_large">Livello troppo grande.  Impostato a 2147483648.</string>
+    <string name="error_rounds_too_large">\"Livello\" troppo grande. Impostato a 2147483648.</string>
-    <string name="error_string_key">È richiesto un nome per ogni stringa.</string>
+    <string name="error_string_key">Ogni stringa deve avere un un nome.</string>
     <string name="error_title_required">È necessario un titolo.</string>
-    <string name="error_wrong_length">Inserisci un valore positivo nel campo lunghezza</string>
+    <string name="error_wrong_length">Inserisci un numero naturale positivo nel campo \"lunghezza\"</string>
     <string name="field_name">Nome campo</string>
     <string name="field_value">Valore campo</string>
     <string name="file_not_found">File non trovato.</string>
@@ -97,19 +97,19 @@
     <string name="hint_pass">password</string>
     <string name="install_from_play_store">Installa dal Play Store</string>
     <string name="install_from_f_droid">Installa dal F-Droid</string>
-    <string name="InvalidPassword">Password o file chiave non validi.</string>
+    <string name="invalid_password">Password o file chiave non validi.</string>
     <string name="invalid_algorithm">Algoritmo non valido.</string>
     <string name="invalid_db_sig">Formato database non riconosciuto.</string>
-    <string name="keyfile_does_not_exist">Il file chiave non esiste.</string>
+    <string name="keyfile_does_not_exist">Non esiste alcun file chiave.</string>
     <string name="keyfile_is_empty">Il file chiave è vuoto.</string>
     <string name="length">Lunghezza</string>
     <string name="list_size_title">Dimensione elenco gruppo</string>
     <string name="list_size_summary">Dimensione del testo nell\'elenco del gruppo</string>
     <string name="loading_database">Caricamento database…</string>
-    <string name="lowercase">Minuscolo</string>
+    <string name="lowercase">Minuscole</string>
     <string name="maskpass_title">Maschera password</string>
     <string name="maskpass_summary">Nascondi le password in modo predefinito</string>
-    <string name="menu_about">Info</string>
+    <string name="menu_about">Informazioni</string>
     <string name="menu_change_key">Modifica chiave principale</string>
     <string name="settings">Impostazioni</string>
     <string name="menu_db_settings">Impostazioni database</string>
@@ -126,15 +126,15 @@
     <string name="never">Mai</string>
     <string name="no_results">Nessun risultato di ricerca</string>
     <string name="no_url_handler">Nessun gestore per questo URL.</string>
-    <string name="open_recent">Apri un database recente :</string>
+    <string name="open_recent">Database recenti:</string>
-    <string name="omitbackup_title">Non cercare voci di backup</string>
+    <string name="omitbackup_title">Non cercare nelle voci di backup</string>
-    <string name="omitbackup_summary">Ometti il gruppo \'Backup\' dai risultati di ricerca (si applica solo ai .kdb)</string>
+    <string name="omitbackup_summary">Ometti il gruppo \'Backup\' dai risultati di ricerca (si applica solo ai file .kdb)</string>
     <string name="progress_create">Creazione nuovo database…</string>
     <string name="progress_title">In corso…</string>
     <string name="protection">Protezione</string>
     <string name="read_only">Sola lettura</string>
-    <string name="read_only_warning">KeePassDroid non ha i permessi di scrittura nel percorso del database, quindi il database verrà aperto in sola lettura.</string>
+    <string name="read_only_warning">KeePass DX non ha l\'autorizzazione di scrittura nel percorso del database, quindi verrà aperto in sola lettura.</string>
-    <string name="read_only_kitkat_warning">A partire da Android KitKat, alcuni dispositivi non permettono più alle applicazioni di scrivere nella scheda SD.</string>
+    <string name="read_only_kitkat_warning">A partire da Android KitKat, alcuni dispositivi non permettono più alle app di scrivere nella scheda SD.</string>
     <string name="recentfile_title">Cronologia file recenti</string>
     <string name="recentfile_summary">Ricorda i file usati recentemente</string>
     <string name="remember_keyfile_summary">Ricorda la posizione dei file chiave</string>
@@ -148,28 +148,30 @@
     <string name="space">Spazio</string>
     <string name="search_label">Cerca</string>
     <string name="sort_db">Ordinamento DB</string>
-    <string name="special">Speciale</string>
+    <string name="special">Speciali</string>
     <string name="search">Titolo/descrizione voce</string>
     <string name="search_results">Risultati ricerca</string>
-    <string name="underline">Sottolinea</string>
+    <string name="underline">Trattino basso</string>
     <string name="unsupported_db_version">Versione database non supportata.</string>
-    <string name="uppercase">Maiuscolo</string>
+    <string name="uppercase">Maiuscole</string>
-    <string name="use_saf_summary">Usa l\'Android Storage Access Framework per sfogliare i file (KitKat e successivi)</string>
+    <string name="use_saf_summary">Usa l\'Android Storage Access Framework (SAF) per sfogliare i file (KitKat e successivi)</string>
     <string name="use_saf_title">Storage Access Framework</string>
     <string name="warning">Attenzione</string>
-    <string name="warning_password_encoding">Il formato .kdb supporta solo il set di caratteri Latin1. La tua password potrebbe contenere caratteri fuori da questo set. Tutti i caratteri non Latin1 vengono convertiti nello stesso carattere, il che riduce la sicurezza della password. Si consiglia di modificare la password.</string>
+    <string name="warning_password_encoding">La tua password potrebbe contenere lettere non supportate dal set di caratteri Latin-1 usato dai file .kdb . Dato che sono convertite tutte nello stesso carattere, si consiglia di modificare la password per renderla più sicura.</string>
-    <string name="warning_read_only">Attualmente la scheda SD è in sola lettura. Non sei in grado di salvare le modifiche nel database.</string>
+    <string name="warning_read_only">Attualmente la scheda SD è in sola lettura. Non potrai salvare le modifiche nel database.</string>
-    <string name="warning_unmounted">Attualmente la scheda SD non è montata nel dispositivo. Non sarai in grado di caricare o creare un nuovo database.</string>
+    <string name="warning_unmounted">Attualmente la scheda SD non è montata nel dispositivo. Non potrai caricare o creare un nuovo database.</string>
-    <string name="version_label">Versione:</string>
+    <string name="version_label">Versione %1$s</string>
-    <string name="configure_fingerprint">Impronte supportate ma non configurate nel dispositivo</string>
+    <string name="configure_fingerprint">Le impronte sono supportate ma non configurate nel dispositivo</string>
     <string name="scanning_fingerprint">In attesa di impronte</string>
     <string name="encrypted_value_stored">Password criptata salvata</string>
     <string name="fingerprint_invalid_key">Problema impronta non valida. Ripristina la tua password.</string>
-    <string name="fingerprint_error">Problema impronta : %1$s</string>
+    <string name="fingerprint_error">Problema impronta: %1$s</string>
     <string name="store_with_fingerprint">Usa l\'impronta per salvare questa password</string>
     <string name="no_password_stored">Nessuna password salvata per questo database</string>
 
-    <string name="education_unlock_summary">Inserisci una password e/o file chiave per sbloccare il database.</string>
+    <string name="education_unlock_summary">Inserisci una password e/o file chiave per sbloccare il database.
+\n
+\nRicorda di salvare una copia del tuo file .kdbx in un luogo sicuro dopo ogni modifica.</string>
 
     <string-array name="timeout_options">
     	<item>5 secondi</item>
@@ -212,14 +214,14 @@
     <string name="parallelism">Parallelismo</string>
     <string name="parallelism_explanation">Grado di parallelismo (cioè numero di thread) usato dalla funzione di derivazione della chiave.</string>
     <string name="sort_menu">Ordina</string>
-    <string name="sort_ascending">Ascendente</string>
+    <string name="sort_ascending">Prima il minore ↓</string>
     <string name="sort_groups_before">Prima i gruppi</string>
     <string name="sort_recycle_bin_bottom">Cestino in fondo</string>
-    <string name="sort_title">Ordina per titolo</string>
+    <string name="sort_title">Titolo</string>
-    <string name="sort_username">Ordina per nome utente</string>
+    <string name="sort_username">Nome utente</string>
-    <string name="sort_creation_time">Ordina per data di creazione</string>
+    <string name="sort_creation_time">Data di creazione</string>
-    <string name="sort_last_modify_time">Ordina per ultima modifica</string>
+    <string name="sort_last_modify_time">Ultima modifica</string>
-    <string name="sort_last_access_time">Ordina per ultimo accesso</string>
+    <string name="sort_last_access_time">Ultimo accesso</string>
     <string name="warning_empty_password">Vuoi veramente usare una stringa vuota come password?</string>
     <string name="warning_no_encryption_key">Sei sicuro di non volere usare una chiave di cifratura?</string>
     <string name="fingerprint_not_recognized">Impronta non riconosciuta</string>
@@ -230,26 +232,26 @@
     <string name="autofill_service_name">Servizio autocompletamento di KeePass DX</string>
     <string name="autofill_sign_in_prompt">Accedi con KeePass DX</string>
     <string name="set_autofill_service_title">Imposta servizio predefinito di autocompletamento</string>
-    <string name="set_autofill_service_summary">Attiva il servizio per completare facilmente i moduli da altre applicazioni</string>
+    <string name="set_autofill_service_summary">Attiva il servizio per completare facilmente i moduli da altre app</string>
     <string name="password_size_title">Dimensione password</string>
     <string name="password_size_summary">Imposta la dimensione predefinita della password generata</string>
     <string name="list_password_generator_options_title">Caratteri password</string>
     <string name="list_password_generator_options_summary">Imposta i caratteri predefiniti di generazione password</string>
     <string name="clipboard_notifications_title">Notifiche appunti</string>
     <string name="clipboard_notifications_summary">Attiva le notifiche appunti per copiare gli elementi</string>
-    <string name="clipboard_warning">Alcuni dispositivi non riescono ad eliminare automaticamente gli appunti. Se il tuo gestore non permette questa eliminazione, dovrai cancellare manualmente dagli appunti l\'elemento copiato.</string>
+    <string name="clipboard_warning">Se il tuo dispositivo non riesce ad eliminare gli appunti automaticamente, elimina manualmente dagli appunti l\'elemento copiato.</string>
     <string name="lock">Blocca</string>
     <string name="lock_database_screen_off_title">Blocco schermo</string>
     <string name="lock_database_screen_off_summary">Blocca il database quando lo schermo è spento</string>
     <string name="fingerprint_quick_unlock_title">Come configurare l\'impronta per sbloccare velocemente?</string>
     <string name="fingerprint_setting_text">Imposta la tua impronta per il dispositivo in</string>
-    <string name="fingerprint_setting_way_text">Impostazioni -&gt; Sicurezza -&gt; Impronta</string>
+    <string name="fingerprint_setting_way_text">\"Impostazioni\" → \"Sicurezza\" → \"Impronta\"</string>
     <string name="fingerprint_type_password_text">Digita la tua password in Keepass DX</string>
     <string name="fingerprint_scan_to_store">Scansiona la tua impronta per salvare la tua password master in modo sicuro</string>
     <string name="fingerprint_scan_to_open">Scansiona la tua impronta quando la casella password non è selezionata per aprire il database</string>
     <string name="usage">Utilizzo</string>
     <string name="fingerprint">Impronta</string>
-    <string name="fingerprint_enable_title">Rilevazione impronta</string>
+    <string name="fingerprint_enable_title">Scansione di impronte</string>
     <string name="fingerprint_enable_summary">Attiva apertura database con impronta</string>
     <string name="fingerprint_delete_all_title">Elimina chiavi di cifratura</string>
     <string name="fingerprint_delete_all_summary">Elimina tutte le chiavi di cifratura relative al riconoscimento dell\'impronta</string>
@@ -260,59 +262,59 @@
     <string name="file_name">Nome file</string>
     <string name="path">Percorso</string>
     <string name="assign_master_key">Assegna una chiave master</string>
-    <string name="create_keepass_file">Crea un file keepass</string>
+    <string name="create_keepass_file">Crea un file KeePass</string>
     <string name="bytes">Bytes</string>
     <string name="full_file_path_enable_title">Percorso file</string>
     <string name="full_file_path_enable_summary">Visualizza il percorso file completo</string>
     <string name="recycle_bin_title">Usa il cestino</string>
     <string name="recycle_bin_summary">Sposta un gruppo o elemento nel cestino prima di eliminare</string>
     <string name="permission_external_storage_rationale_write_database">KeePass DX richiede l\'autorizzazione di archiviazione per scrivere un database</string>
-    <string name="permission_external_storage_rationale_read_database">KeePass DX richiede l\'autorizzazione di archiviazione per leggere un URI non fornito da un Content Provider</string>
+    <string name="permission_external_storage_rationale_read_database">KeePass DX richiede l\'autorizzazione di archiviazione per leggere un URI non gestito da un fornitore di contenuti</string>
     <string name="permission_external_storage_denied">Autorizzazione di archiviazione negata</string>
     <string name="permission_external_storage_never_ask">Impossibile eseguire l\'azione senza l\'autorizzazione di archiviazione</string>
     <string name="monospace_font_fields_enable_title">Carattere campi</string>
-    <string name="monospace_font_fields_enable_summary">Cambia il carattere dei campi per una migliore visibilità</string>
+    <string name="monospace_font_fields_enable_summary">Cambia il carattere usato nei campi per una migliore visibilità</string>
     <string name="auto_open_file_uri_title">Apri automaticamente file selezionato</string>
-    <string name="auto_open_file_uri_summary">Apri automaticamente un file dalla finestra di selezione dopo una selezione nel gestore file</string>
+    <string name="auto_open_file_uri_summary">Apri un file dalla finestra di selezione automaticamente dopo una selezione fatta nel gestore file</string>
     <string name="allow_copy_password_title">Copia della password</string>
-    <string name="allow_copy_password_summary">Permetti la copia della password e dei campi protetti negli appunti.</string>
+    <string name="allow_copy_password_summary">Permetti la copia della password e dei campi protetti negli appunti</string>
     <string name="allow_copy_password_warning">ATTENZIONE: gli appunti sono condivisi da tutte le app. Se vengono copiati dati sensibili, altri software possono recuperarli.</string>
-    <string name="warning_disabling_storage_access_framework">ATTENZIONE: disattivando questa funzione potresti non riuscire ad aprire o salvare i database</string>
+    <string name="warning_disabling_storage_access_framework">ATTENZIONE: disattivando questa funzione potresti non riuscire ad aprire o salvare database</string>
-    <string name="open_link_database">Link del file Kdbx da aprire</string>
+    <string name="open_link_database">Link del file KDBX da aprire</string>
     <string name="database_name_title">Nome database</string>
     <string name="database_description_title">Descrizione database</string>
     <string name="database_version_title">Versione database</string>
     <string name="text_appearance">Aspetto del testo</string>
-    <string name="application_appearance">Aspetto dell\'applicazione</string>
+    <string name="application_appearance">Aspetto dell\'app</string>
     <string name="other">Altro</string>
 
     <string name="keyboard">Tastiera</string>
     <string name="magic_keyboard_title">Magitastiera</string>
-    <string name="magic_keyboard_summary">Attiva una tastiera personale che popola le tue password e i campi di identità facilmente.</string>
+    <string name="magic_keyboard_summary">Attiva una tastiera personale che popola le tue password e i campi di identità facilmente</string>
     <string name="magic_keyboard_preference_title">Impostazioni Magitastiera</string>
     <string name="magic_keyboard_configure_title">Come configurare la tastiera per una compilazione di campi sicura?</string>
     <string name="magic_keyboard_activate_setting_text">Attiva la Magitastiera nelle impostazioni del dispositivo.</string>
-    <string name="magic_keyboard_activate_setting_path_1_text">Impostazioni -&gt; Lingue e immissione -&gt; Tastiera attuale -&gt; SCEGLI TASTIERE</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">\"Impostazioni\" → \"Lingue e immissione\" → \"Tastiera attuale\" e scegline una.</string>
-    <string name="magic_keyboard_activate_setting_path_2_text">o (Impostazioni -&gt; Sistema -&gt; Lingue e immissione -&gt; Tastiera virtuale -&gt; Gestisci tastiere)</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">o (\"Impostazioni\" → \"Lingue e immissione\" → \"Tastiera virtuale\" e scegline una.)</string>
     <string name="keyboards_choose_magikeyboard_text">Scegli la Magitastiera quando devi compilare un modulo.</string>
     <string name="keyboards_swicth_magikeyboard_text">Puoi passare facilmente dalla tastiera principale alla Magitastiera con il pulsante lingua della tastiera, una pressione lunga della barra spaziatrice, o, se non disponibile, con:</string>
     <string name="keyboard_lock_database_text">Blocca il database.</string>
     <string name="keyboard_back_main_keyboard_text">Torna alla tua tastiera principale.</string>
 
     <string name="allow_no_password_title">Permetti password mancante</string>
-    <string name="allow_no_password_summary">Attiva il pulsante di apertura se non è selezionata una password.</string>
+    <string name="allow_no_password_summary">Attiva il pulsante di apertura se non è selezionata una password</string>
     <string name="enable_read_only_title">Solo lettura</string>
-    <string name="enable_read_only_summary">Apri un database in sola lettura in modo predefinito.</string>
+    <string name="enable_read_only_summary">Apri i database in sola lettura in modo predefinito</string>
 
     <string name="enable_education_screens_title">Schermate educative</string>
-    <string name="enable_education_screens_summary">Evidenzia gli elementi per imparare come funziona l\'applicazione</string>
+    <string name="enable_education_screens_summary">Evidenzia gli elementi per imparare come funziona l\'app</string>
     <string name="reset_education_screens_title">Ripristina schermate educative</string>
     <string name="reset_education_screens_summary">Ripristina la visualizzazione di elementi educativi</string>
     <string name="reset_education_screens_text">Schermate educative ripristinate</string>
     <string name="education_create_database_title">Crea il tuo file database</string>
     <string name="education_create_database_summary">Non conosci ancora KeePass DX, crea il tuo primo file di gestione password.</string>
     <string name="education_select_database_title">Apri un database esistente</string>
-    <string name="education_select_database_summary">Hai già usato un gestore KeePass. Apri il tuo file Kdbx dal tuo gestore di file.</string>
+    <string name="education_select_database_summary">Hai già usato un gestore KeePass. Apri il tuo file KDBX dal tuo gestore di file.</string>
     <string name="education_open_link_database_title">Un link al percorso del tuo file è sufficiente</string>
     <string name="education_open_link_database_summary">Puoi anche aprire il tuo database con un link fisico (con file:// e content:// ad esempio).</string>
     <string name="education_new_node_title">Aggiungi nuovi elementi al database</string>
@@ -326,7 +328,7 @@
     <string name="education_entry_edit_title">Modifica l\'elemento</string>
     <string name="education_entry_edit_summary">Modifica l\'elemento con campi personali, puoi aggiungere riferimenti per raggruppare i dati tra campi di voci diverse.</string>
     <string name="education_generate_password_title">Crea una password robusta</string>
-    <string name="education_generate_password_summary">Genera una password robusta da associare all\'elemento, definiscila a seconda dei criteri del modulo e non dimenticare una password complessa ma sicura.</string>
+    <string name="education_generate_password_summary">Genera una password robusta da associare all\'elemento, definiscila a seconda dei criteri del modulo e non dimenticare una password sicura che puoi ricordare.</string>
     <string name="education_entry_new_field_title">Aggiungi campi personali</string>
     <string name="education_entry_new_field_summary">Vuoi registrare un campo di base non fornito, inseriscine uno nuovo che puoi anche proteggere visivamente.</string>
     <string name="education_unlock_title">Sblocca il tuo database</string>
@@ -337,18 +339,18 @@
 \n
 \nIn scrittura, puoi aggiungere, eliminare, o modificare tutti gli elementi che vuoi.</string>
     <string name="education_field_copy_title">Copia un campo</string>
-    <string name="education_field_copy_summary">Copia un campo facilmente per incollarlo dove vuoi
+    <string name="education_field_copy_summary">Copia un campo facilmente per incollarlo dove vuoi 
-\n
+\n 
-\nPuoi usare diversi metodi di inserimento moduli. Usa quello che preferisci!</string>
+\nPuoi usare diversi metodi di inserimento moduli. Usa quello che preferisci.</string>
     <string name="education_lock_title">Blocca il database</string>
     <string name="education_lock_summary">Blocca velocemente il database, puoi impostare l\'app per bloccarlo dopo un certo periodo e quando lo schermo si spegne.</string>
     <string name="education_sort_title">Ordina elementi</string>
     <string name="education_sort_summary">Ordina gli elementi e i gruppi secondo parametri specifici.</string>
     <string name="education_donation_title">Partecipa</string>
-    <string name="education_donation_summary">Partecipa per migliorare la stabilità, la sicurezza e aggiungere nuove funzioni.</string>
+    <string name="education_donation_summary">Partecipa per aiutare a migliorare la stabilità, la sicurezza e aggiungere nuove funzioni.</string>
 
-    <string name="html_text_ad_free">Diversamente da molte app di gestione password, questa app è <strong>senza pubblicità</strong>, <strong>open source</strong> e non raccoglie dati personali nei suoi server, anche nella versione gratuita.</string>
+    <string name="html_text_ad_free">Diversamente da molte app di gestione password, questa è <strong>senza pubblicità</strong>, <strong>sofware libero (copyleft)</strong> e non raccoglie dati personali nei suoi server, anche nella versione gratuita.</string>
-    <string name="html_text_buy_pro">Acquistando la versione pro, avrai accesso a questa <strong>funzione visiva</strong> e aiuterai specialmente nella <strong>realizzazione di progetti della comunità.</strong></string>
+    <string name="html_text_buy_pro">Acquistando la versione pro, avrai accesso a questa <strong>funzione visiva</strong> e soprattutto aiuterai nella <strong>realizzazione di progetti della comunità.</strong></string>
     <string name="html_text_feature_generosity">Questa <strong>funzione visiva</strong> è disponibile grazie alla tua generosità.</string>
     <string name="html_text_donation">Per mantenere la nostra libertà ed essere sempre attivi, contiamo sul tuo <strong>contributo.</strong></string>
 
@@ -358,7 +360,7 @@
     <string name="html_text_dev_feature_encourage">incoraggi gli sviluppatori a creare <strong>nuove funzioni</strong> e a <strong>correggere errori</strong> secondo le tue osservazioni.</string>
     <string name="html_text_dev_feature_thanks">Grazie mille per il tuo contributo.</string>
     <string name="html_text_dev_feature_work_hard">Stiamo lavorando sodo per rilasciare questa funzione a breve.</string>
-    <string name="html_text_dev_feature_upgrade">Non dimenticare di tenere aggiornata la tua applicazione.</string>
+    <string name="html_text_dev_feature_upgrade">Non dimenticare di tenere aggiornata la tua app.</string>
 
     <string name="download">Scarica</string>
     <string name="contribute">Contribuisci</string>
@@ -367,14 +369,20 @@
     <string name="encryption_twofish">Twofish</string>
     <string name="encryption_chacha20">ChaCha20</string>
 
-    <string name="kdf_AES">AES-KDF</string>
+    <string name="kdf_AES">AES KDF</string>
     <string name="kdf_Argon2">Argon2</string>
 
     <string name="style_choose_title">Seleziona un tema</string>
-    <string name="style_choose_summary">Cambia il tema dell\'applicazione modificandone i colori</string>
+    <string name="style_choose_summary">Cambia il tema dell\'app modificandone i colori</string>
     <string name="icon_pack_choose_title">Seleziona un pacchetto icone</string>
-    <string name="icon_pack_choose_summary">Cambia il pacchetto di icone dell\'applicazione</string>
+    <string name="icon_pack_choose_summary">Cambia il pacchetto di icone dell\'app</string>
 
 <string name="keyboard_select_entry_text">Seleziona un elemento con la chiave.</string>
-    <string name="keyboard_fill_field_text">Riempi i campi con i contenuti dell\'elemento.</string>
+    <string name="keyboard_fill_field_text">Riempi i campi usando i contenuti dell\'elemento.</string>
+    <string name="edit_entry">Modifica elemento</string>
+    <string name="error_load_database">Il database non può essere caricato</string>
+    <string name="error_load_database_KDF_memory">Impossibile caricare la chiave, prova a diminuire la memoria usata dal KDF.</string>
+    <string name="list_entries_show_username_title">Mostra nomi utente</string>
+    <string name="list_entries_show_username_summary">Mostra i nomi utente negli elenchi</string>
+    <string name="clipboard">Appunti</string>
     </resources>

app/src/main/res/values-iw/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
  Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
      
@@ -41,9 +41,9 @@
     <string name="clipboard_timeout">זמן עד לניקוי לוח ההעתקה</string>
     <string name="clipboard_timeout_summary">זמן לפני שלוח ההעתקה מנוקה לאחר העתקת שם משתמש או סיסמה</string>
     <string name="select_to_copy">בחר בהעתקת %1$s ללוח ההעתקה</string>
-    <string name="creating_db_key">יוצר מפתח מסד נתונים&#8230;</string>
+    <string name="retrieving_db_key">יוצר מפתח מסד נתונים…</string>
     <string name="database">מסד נתונים</string>
-    <string name="decrypting_db">מפענח תוכן מסד נתונים&#8230;</string>
+    <string name="decrypting_db">מפענח תוכן מסד נתונים…</string>
     <string name="default_checkbox">השתמש בזה כמסד הנתונים הברירת מחדל</string>
     <string name="digits">ספרות</string>
     <string name="select_database_file">הזן שם קובץ למסד נתונים:</string>
@@ -93,7 +93,7 @@
     <string name="password">סיסמה</string>
     <string name="install_from_play_store">התקן מחנות Play</string>
     <string name="install_from_f_droid">התקן מהאינטרנט</string>
-    <string name="InvalidPassword">סיסמה או קובץ מפתח לא מתאימים.</string>
+    <string name="invalid_password">סיסמה או קובץ מפתח לא מתאימים.</string>
     <string name="invalid_algorithm">אלגוריתם לא חוקי.</string>
     <string name="invalid_db_sig">תבנית מסד הנתונים אינה מזוהה.</string>
     <string name="keyfile_does_not_exist">קובץ המפתח לא קיים.</string>
@@ -101,7 +101,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="maskpass_title">מסיכת הסיסמה</string>
     <string name="maskpass_summary">הסתר סיסמאות כברירת מחדל</string>
@@ -125,8 +125,8 @@
     <string name="open_recent">פתח מסד נתונים אחרון :</string>
     <string name="omitbackup_title">אל תחפש ערכי גיבוי</string>
     <string name="omitbackup_summary">הורד את קבוצת \"גיבוי\" מתוצאות חיפוש (תואם רק לקבצי kdb)</string>
-    <string name="progress_create">צור מסד נתונים חדש&#8230;</string>
+    <string name="progress_create">צור מסד נתונים חדש…</string>
-    <string name="progress_title">עובד&#8230;</string>
+    <string name="progress_title">עובד…</string>
     <string name="protection">הגנה</string>
     <string name="read_only_warning">ל-KeePass DX אין הרשאות כתיבה למסד הנתונים הזה, ולכן הוא יפתח לקריאה בלבד.</string>
     <string name="read_only_kitkat_warning">החל מאנרואיד 4.4, מספר מכשירים לא מרשים ליישומים לכתובת לכרטיס ה-SD.</string>
@@ -138,7 +138,7 @@
     <string name="rounds">סיבובי הצפנה</string>
     <string name="rounds_explanation">מספר סיבובי הצפנה גבוה יותר מספר הגה טובה יותר נגד התקפות, אבל יכול להעלות בהרבה את זמן הטעינה והשמירה.</string>
     <string name="rounds_hint">סיבובים</string>
-    <string name="saving_database">שומר מסד נתונים&#8230;</string>
+    <string name="saving_database">שומר מסד נתונים…</string>
     <string name="space">גודל</string>
     <string name="search_label">חיפוש</string>
     <string name="sort_db">סדר מיון מסד נתונים</string>
@@ -147,9 +147,8 @@
     <string name="underline">קו תחתון</string>
     <string name="unsupported_db_version">גרסת מסד נתונים לא נתמכת.</string>
     <string name="uppercase">רישית</string>
-    <string name="warning_read_only">כרטיס ה-SD שלך במצב לקריאה בלבד. אתה לא תוכל לשמור את השינויים למסד הנתונים.</string>
     <string name="warning_unmounted">כרטיס ה-SD במצב לקריאה בלבד. אתה לא תוכל לשמור או ליצור במסד הנתונים.</string>
-    <string name="version_label">גרסה:</string>
+    <string name="version_label">גרסה %1$s</string>
 
     <string name="education_unlock_summary">הזן סיסמה ו/או קובץ מפתח כדי לפתוח את מסד הנתונים.</string>
 
@@ -169,4 +168,11 @@
         <item>בינוני</item>
         <item>גדול</item>
     </string-array>
-</resources>
+<string name="edit_entry">ערוך רשומה</string>
+    <string name="add_string">הוסף מחרוזת</string>
+    <string name="encryption">הצפנה</string>
+    <string name="allow">אפשר</string>
+    <string name="clipboard_swipe_clean">החלק לניקוי לוח העתקה עכשיו</string>
+    <string name="entry_url">כתובת URL</string>
+    <string name="error_load_database">לא ניתן לטעון את בסיס הנתונים</string>
+    </resources>

app/src/main/res/values-ja/strings.xml

@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">クリップボード タイムアウト</string>
     <string name="clipboard_timeout_summary">コピーした情報をクリップボードから消去する時間</string>
     <string name="select_to_copy">ここをタップすると%1$sをクリップボードにコピーします</string>
-    <string name="creating_db_key">データベース認証中&#8230;</string>
+    <string name="retrieving_db_key">データベース認証中&#8230;</string>
     <string name="database">データベース</string>
     <string name="decrypting_db">データベースを解析中&#8230;</string>
     <string name="default_checkbox">このデータベースを次回以降も利用する</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">パスワード</string>
     <string name="install_from_play_store">Play Storeで入手</string>
     <string name="install_from_f_droid">F-Droidで入手</string>
-    <string name="InvalidPassword">パスワード/キーファイルが違います。</string>
+    <string name="invalid_password">パスワード/キーファイルが違います。</string>
     <string name="invalid_db_sig">データベースフォーマットが認識できません。</string>
     <string name="length">生成するパスワードの長さ</string>
     <string name="list_size_title">グループ一覧サイズ</string>
@@ -135,9 +135,8 @@
     <string name="underline">アンダーライン (_)</string>
     <string name="unsupported_db_version">このバージョンのデータベースはサポートされていません。</string>
     <string name="uppercase">英数大文字</string>
-    <string name="warning_read_only">お使いのSDカードは読取専用になっているようです。 データベースへの更新を保存することはできないでしょう。</string>
     <string name="warning_unmounted">SDカードがマウントされていません。データベースの読込や作成ができません。</string>
-    <string name="version_label">バージョン:</string>
+    <string name="version_label">バージョン %1$s</string>
 
     <string name="education_unlock_summary">データベースに設定したパスワードを入力するかキーファイルを選択してください。</string>
 

app/src/main/res/values-lt/strings.xml

@@ -3,7 +3,7 @@
     <string name="about_description">KeePass DX yra KeePass slaptažodžių tvarkyklės realizacija Android platformai</string>
     <string name="clipboard_cleared">Iškarpinė išvalyta.</string>
     <string name="file_not_found">Failas nerastas.</string>
-    <string name="InvalidPassword">Neteisingas slaptažodis arba rakto failas.</string>
+    <string name="invalid_password">Neteisingas slaptažodis arba rakto failas.</string>
     <string name="about_feedback">Atsiliepimai:</string>
     <string name="about_homepage">Pagrindinis puslapis:</string>
     <string name="accept">Priimti</string>
@@ -57,7 +57,7 @@
     <string name="protection">Apsauga</string>
     <string name="search_label">Paieška</string>
     <string name="search_results">Paieškos rezultatai</string>
-    <string name="version_label">Versija:</string>
+    <string name="version_label">Versija %1$s</string>
     <string name="warning">Įspėjimas</string>
     <string name="select_database_file">Įveskite duomenų bazės failą</string>
     <string name="error_wrong_length">Įveskite teigiamą skaičių ilgio lauke</string>

app/src/main/res/values-lv/strings.xml

@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="about_feedback">Atsauksmes:</string>
     <string name="about_homepage">Mājaslapa:</string>
-    <string name="about_description">Paroles ir Android-versija programmai KeePass.</string>
+    <string name="about_description">KeePass DX ir KeePass paroļu menedžera Android implementācija</string>
     <string name="accept">Pieņemt</string>
     <string name="add_entry">Jauns ieraksts</string>
     <string name="add_group">Jauna grupa</string>
-    <string name="encryption_algorithm">Algoritms</string>
+    <string name="encryption_algorithm">Šifrēšanas algoritms</string>
     <string name="app_timeout">Pielikuma taimauts</string>
     <string name="app_timeout_summary">Bloķēšanas taimauts, kad programma nav aktīva.</string>
     <string name="application">Programma</string>
     <string name="menu_app_settings">Programmas iestatījumi</string>
     <string name="beta_dontask">Turpmāk nerādīt</string>
-    <string name="brackets">Iekavās</string>
+    <string name="brackets">Iekavas</string>
     <string name="browser_intall_text">Failu pārlūkošanai nepieciešams pārlūks.</string>
     <string name="cancel">Atcelt</string>
-    <string name="clipboard_cleared">Starpliktuve notīrīta.</string>
+    <string name="clipboard_cleared">Starpliktuve notīrīta</string>
     <string name="clipboard_error_title">Starpliktuves kļūda</string>
     <string name="clipboard_error">Dažiem Samsung tālruņiem ir problēmas ar starpliktuves lietošanu. Lai saņemtu sīkāku informāciju, dodieties uz:</string>
     <string name="clipboard_error_clear">Starpliktuves tīrīšana neizdevās</string>
     <string name="clipboard_timeout">Starpliktuves taimauts</string>
     <string name="clipboard_timeout_summary">Notīrīšanas taimauts pēc lietotājvārda vai paroles kopēšana starpliktuvē</string>
     <string name="select_to_copy">%1$s uz starpliktuvi</string>
-    <string name="creating_db_key">Izveidot datu bāzes atslēgu…</string>
+    <string name="retrieving_db_key">Izveido datu bāzes atslēgu…</string>
     <string name="database">Datu bāze</string>
-    <string name="decrypting_db">Datu bāzes atšifrēšana…</string>
+    <string name="decrypting_db">Atšifrē datu bāzes saturu…</string>
     <string name="default_checkbox">Izmantot šo kā manu noklusējuma datu bāzi</string>
     <string name="digits">Cipari</string>
     <string name="select_database_file">Ievadiet datu bāzes nosaukumu</string>
@@ -74,7 +74,7 @@
     <string name="password">Parole</string>
     <string name="install_from_play_store">Instalēt no Play veikala</string>
     <string name="install_from_f_droid">Instalēt no F-Droid</string>
-    <string name="InvalidPassword">Nederīga parole vai atslēgas fails.</string>
+    <string name="invalid_password">Nederīga parole vai atslēgas fails.</string>
     <string name="invalid_algorithm">Nederīgs algoritms.</string>
     <string name="invalid_db_sig">Datu bāzes formāts nav atpazīts.</string>
     <string name="keyfile_does_not_exist">Atslēgas fails nepastāv.</string>
@@ -130,9 +130,8 @@
     <string name="underline">Pasvītrojums</string>
     <string name="unsupported_db_version">Neatbalstīta datu bāzes versija.</string>
     <string name="uppercase">Lielie burti</string>
-    <string name="warning_read_only">SD karte ir tikai lasāma. Nevarēsiet saglabāt izmaiņas datu bāzē.</string>
     <string name="warning_unmounted">Nav SD kartes. Darbības ar datu bāzi nav iespējamas.</string>
-    <string name="version_label">Versija:</string>
+    <string name="version_label">Versija %1$s</string>
 
     <string name="education_unlock_summary">Ievadiet paroli/atslēgas failu, lai atbloķētu savu datu bāzi.</string>
 
@@ -152,4 +151,9 @@
         <item>Vidējs</item>
         <item>Liels</item>
     </string-array>
-</resources>
+<string name="edit_entry">Labot ierakstu</string>
+    <string name="encryption">Šifrēšana</string>
+    <string name="extended_ASCII">Paplašinātais ASCII</string>
+    <string name="allow">Atļaut</string>
+    <string name="disclaimer_formal">KeePassDX \u00A9 %1$d Kunzisoft nāk bez jebkādas garantijas; Šī ir bezmaksas programmatūra un jūs to varat izplatīt apstākļos, kas aprakstīti GPL 3 versijā vai jaunākā.</string>
+    </resources>

app/src/main/res/values-nb/strings.xml

@@ -0,0 +1,348 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="about_feedback">Tilbakemelding:</string>
+    <string name="about_homepage">Hjemmeside:</string>
+    <string name="about_description">KeePass DX er en Android-implementasjon av KeePass-passordsbehandleren.</string>
+    <string name="accept">Godta</string>
+    <string name="add_entry">Legg til oppføring</string>
+    <string name="edit_entry">Rediger oppføring</string>
+    <string name="add_group">Legg til gruppe</string>
+    <string name="add_string">Legg til streng</string>
+    <string name="encryption">Kryptering</string>
+    <string name="encryption_algorithm">Krypteringsalgoritme</string>
+    <string name="key_derivation_function">Nøkkelutledningsfunksjon</string>
+    <string name="app_timeout">Programtidsavbrudd</string>
+    <string name="app_timeout_summary">Tid før databasen låses, ved programinaktivitet.</string>
+    <string name="application">Program</string>
+    <string name="beta_dontask">Ikke vis igjen</string>
+    <string name="brackets">Parenteser</string>
+    <string name="extended_ASCII">Utvidet ASCII</string>
+    <string name="browser_intall_text">Filutforskning krever at OpenIntents filutforsker er installert, klikk nedenfor for å gjøre dette. På grunn av noen snodigheter i filutforskeren, kan det hende at det ikke virker første gang.</string>
+    <string name="cancel">Avbryt</string>
+    <string name="allow">Tillat</string>
+    <string name="clipboard_cleared">Utklippstavle tømt</string>
+    <string name="clipboard_error_title">Utklippstavlefeil</string>
+    <string name="clipboard_error">Noen Samsung Android-telefoner har en feil i utklippstavlen, som forårsaker problemer ved kopiering fra programmer. Flere detaljer:</string>
+    <string name="clipboard_error_clear">Tømming av utklippstavle mislyktes</string>
+    <string name="clipboard_timeout">Tidsavbrudd for utklippstavle</string>
+    <string name="clipboard_timeout_summary">Tid før utklippstavlen tømmes etter kopiering av brukernavn og passord</string>
+    <string name="clipboard_swipe_clean">Dra for å tømme utklippstavlen nå</string>
+    <string name="select_to_copy">Velg for å kopier %1$s til utklippstavlen</string>
+    <string name="retrieving_db_key">Oppretter databasenøkkel…</string>
+    <string name="database">Database</string>
+    <string name="decrypting_db">Dekrypterer databaseinnhold…</string>
+    <string name="default_checkbox">Bruk dette som forvalgt database</string>
+    <string name="digits">Siffer</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft kommer UTEN NOEN FORM FOR GARANTI; Dette er fri programvare, og du er velkommen til å redistribuere det i henhold til vilkårene i GPL versjon 3 eller senere.</string>
+    <string name="entry_accessed">Brukt</string>
+    <string name="entry_cancel">Avbryt</string>
+    <string name="entry_comment">Kommentarer</string>
+    <string name="entry_confpassword">Bekreft passord</string>
+    <string name="entry_created">Opprettet</string>
+    <string name="entry_expires">Utløper</string>
+    <string name="entry_keyfile">Nøkkelfil</string>
+    <string name="entry_modified">Endret</string>
+    <string name="entry_not_found">Fant ikke oppføringsdata.</string>
+    <string name="entry_password">Passord</string>
+    <string name="entry_save">Lagre</string>
+    <string name="entry_title">Tittel</string>
+    <string name="entry_url">Nettadresse</string>
+    <string name="entry_user_name">Brukernavn</string>
+    <string name="error_arc4">ARCFOUR-strømchifferet støttes ikke.</string>
+    <string name="error_can_not_handle_uri">KeePass DX kan ikke håntere denne URI-en.</string>
+    <string name="error_could_not_create_parent">Kunne ikke opprette overnevnt mappe.</string>
+    <string name="error_database_exists">Denne filen finnes allerede.</string>
+    <string name="error_failed_to_launch_link">Kunne ikke åpne lenke.</string>
+    <string name="error_filename_required">Et filnavn er påkrevd.</string>
+    <string name="error_file_not_create">Kunne ikke opprette fil:</string>
+    <string name="error_invalid_db">Ugyldig database eller fremmed hovednøkkel.</string>
+    <string name="error_invalid_path">Ugyldig sti.</string>
+    <string name="error_no_name">Et navn er påkrevd.</string>
+    <string name="error_nokeyfile">En nøkkelfil er påkrevd.</string>
+    <string name="error_out_of_memory">Enheten slapp opp for minne under fortolkning av databasen din.</string>
+    <string name="error_load_database">Databasen kan ikke lastes</string>
+    <string name="error_load_database_KDF_memory">Kunne ikke laste nøkkelen, prøv å senke minnet brukt av KDF.</string>
+    <string name="error_pass_gen_type">Minst én passordgenereringstype må velges.</string>
+    <string name="error_pass_match">Passordene samsvarer ikke.</string>
+    <string name="error_rounds_not_number">\"Omganger\" må være et tall.</string>
+    <string name="error_rounds_too_large">\"Omganger\" er for stort. Setter til 2147483648.</string>
+    <string name="error_string_key">Hver streng må ha et feltnavn.</string>
+    <string name="error_title_required">En tittel er påkrevd.</string>
+    <string name="error_wrong_length">Skriv inn et positivt heltall i \"Lengde\"-feltet.</string>
+    <string name="error_autofill_enable_service">Autofyll-tjenesten kan ikke skrus på.</string>
+    <string name="error_move_folder_in_itself">Kan ikke flytte gruppe inn i seg selv.</string>
+    <string name="field_name">Feltnavn</string>
+    <string name="field_value">Feltverdi</string>
+    <string name="file_not_found">Fant ikke filen.</string>
+    <string name="file_not_found_content">Fant ikke filen. Prøv å åpne den fra din innholdsleverandør.</string>
+    <string name="file_browser">Filutforsker</string>
+    <string name="generate_password">Opprett passord</string>
+    <string name="hint_conf_pass">bekreft passord</string>
+    <string name="hint_generated_password">generert passord</string>
+    <string name="hint_group_name">Gruppenavn</string>
+    <string name="hint_keyfile">nøkkelfil</string>
+    <string name="hint_length">lengde</string>
+    <string name="hint_pass">passord</string>
+    <string name="password">Passord</string>
+    <string name="install_from_play_store">Installer fra Play-butikken</string>
+    <string name="install_from_f_droid">Installer fra F-Droid</string>
+    <string name="invalid_password">Ugyldig passord eller nøkkelfil.</string>
+    <string name="invalid_algorithm">Ugyldig algoritme.</string>
+    <string name="invalid_db_sig">Fremmed databaseformat.</string>
+    <string name="keyfile_does_not_exist">Ingen nøkkelfil finnes.</string>
+    <string name="keyfile_is_empty">Nøkkelfilen er tom.</string>
+    <string name="length">Lengde</string>
+    <string name="list_entries_show_username_title">Vis brukernavn</string>
+    <string name="list_entries_show_username_summary">Vis brukernavn i oppføringslister</string>
+    <string name="list_size_title">Størrelsen på listeelementene</string>
+    <string name="list_size_summary">Tekststørrelse i elemenetlisten</string>
+    <string name="loading_database">Laster database…</string>
+    <string name="lowercase">Små bokstaver</string>
+    <string name="maskpass_title">Masker passord</string>
+    <string name="maskpass_summary">Skjul passord som forvalg</string>
+    <string name="menu_about">Om</string>
+    <string name="menu_change_key">Endre hovednøkkel</string>
+    <string name="copy_field">Kopi av %1$s</string>
+    <string name="settings">Innstillinger</string>
+    <string name="menu_app_settings">Programinnstillinger</string>
+    <string name="menu_form_filling_settings">Skjemautfylling</string>
+    <string name="menu_db_settings">Databaseinnstillinger</string>
+    <string name="menu_donate">Doner</string>
+    <string name="menu_edit">Rediger</string>
+    <string name="menu_copy">Kopier</string>
+    <string name="menu_move">Flytt</string>
+    <string name="menu_paste">Lim inn</string>
+    <string name="menu_delete">Slett</string>
+    <string name="menu_cancel">Avbryt</string>
+    <string name="menu_hide_password">Skjul passord</string>
+    <string name="menu_lock">Lås database</string>
+    <string name="menu_open">Åpne</string>
+    <string name="menu_search">Søk</string>
+    <string name="menu_showpass">Vis passord</string>
+    <string name="menu_fingerprint_remove_key">Fjern fingeravtrykksnøkkelen</string>
+    <string name="menu_url">Gå til nettadresse</string>
+    <string name="menu_file_selection_read_only">Skrivebeskyttet</string>
+    <string name="menu_open_file_read_and_write">Les og skriv</string>
+    <string name="minus">Minus</string>
+    <string name="never">Aldri</string>
+    <string name="no_results">Ingen søkeresultater</string>
+    <string name="no_url_handler">Kan ikke håndtere denne nettadressen.</string>
+    <string name="select_database_file">Velg en eksisterende database</string>
+    <string name="open_recent">Nylige databaser:</string>
+    <string name="omitbackup_title">Ikke søk gjennom sikkerhetskopioppføringer</string>
+    <string name="omitbackup_summary">Utelat \"Sikkerhetskopi\"-gruppen fra søkeresultater (har kunn innvirkning på .kdb-filer)</string>
+    <string name="progress_create">Oppretter ny database…</string>
+    <string name="progress_title">Arbeider…</string>
+    <string name="protection">Beskyttelse</string>
+    <string name="read_only">Skrivebeskyttet</string>
+    <string name="read_only_warning">KeePass DX har ikke skrivetilgang til din databaseplassering, så den vil bli åpnet skrivebeskyttet.</string>
+    <string name="read_only_kitkat_warning">Siden Android KitKat, tillater noen enheter ikke lenger programmer å skrive til SD-kortet.</string>
+    <string name="recentfile_title">Nylig filhistorikk</string>
+    <string name="recentfile_summary">Husk nylig brukte filnavn</string>
+    <string name="remember_keyfile_summary">Husk nøkkelfilers plassering</string>
+    <string name="remember_keyfile_title">Lagre nøkkelfil</string>
+    <string name="remove_from_filelist">Fjern</string>
+    <string name="root">Rot</string>
+    <string name="encryption_explanation">Algoritme for å kryptere hele databasen. (Passord, brukernavn, merknader og all data i databasen er kryptert med valgt algoritme).</string>
+    <string name="kdf_explanation">For å generere en nøkkel for krypteringsalgoritmen, er den komprimerte hovednøkkelen (SHA-256) transformert ved bruk av en tilfeldig saltet nøkkelutledningsfunksjon.</string>
+    <string name="rounds">Krypteringsomganger</string>
+    <string name="rounds_explanation">Flere krypteringsomganger gir ytterligere beskyttelse mot råmaktsangrep, men kan virkelig sakke ned innlasting og lagring.</string>
+    <string name="rounds_hint">omganger</string>
+    <string name="memory_usage">Minnebruk</string>
+    <string name="memory_usage_explanation">Mangden minne (i binære byte) brukt til nøkkelutledelsesfunksjonen.</string>
+    <string name="parallelism">Parallellitet</string>
+    <string name="parallelism_explanation">Graden av parallellitet (dvs. antallet tråder) brukt av nøkkelutledingsfunksjonen.</string>
+    <string name="saving_database">Lagrer database…</string>
+    <string name="space">Mellomrom</string>
+    <string name="search_label">Søk</string>
+    <string name="sort_menu">Sorter</string>
+    <string name="sort_ascending">Laveste først ↓</string>
+    <string name="sort_groups_before">Grupper før</string>
+    <string name="sort_recycle_bin_bottom">Papirkurv nederst</string>
+    <string name="sort_db">Databasesorteringsrekkefølge</string>
+    <string name="sort_title">Tittel</string>
+    <string name="sort_username">Brukernavn</string>
+    <string name="sort_creation_time">Opprettelsestidspunkt</string>
+    <string name="sort_last_modify_time">Siste endringstidspunkt</string>
+    <string name="sort_last_access_time">Sist åpnet</string>
+    <string name="special">Spesialtegn</string>
+    <string name="search">Søk</string>
+    <string name="search_results">Søkeresultater</string>
+    <string name="underline">Understrek</string>
+    <string name="unsupported_db_version">Ustøttet databaseversjon.</string>
+    <string name="uppercase">Store bokstaver</string>
+    <string name="use_saf_summary">Bruk Android-lagringstilgang (SAF) -rammeverk til filutforsking (KitKat og senere).</string>
+    <string name="use_saf_title">Lagringstilgang-rammeverk</string>
+    <string name="warning">Advarsel</string>
+    <string name="warning_password_encoding">Passordet dit kan inneholde bokstaver som ikke støttes av Latin-1 -tegnsettet brukt av .kdb filer. Siden disse alle konverteres til samme bokstav, anbefales det å endre passordet ditt for å gjøre det sikrere.</string>
+    <string name="warning_read_only">SD-kortet ditt er i øyeblikket skrivebeskyttet. Det kan hende du ikke kan lagre endringer i databasen din.</string>
+    <string name="warning_unmounted">SD-kortet ditt er ikke montert på enheten din. Du vil ikke kunne laste inne eller opprette din database.</string>
+    <string name="warning_empty_password">Ønsker du virkelig å bruke en tom streng som ditt passord?</string>
+    <string name="warning_no_encryption_key">Er du sikker på at du ønsker å bruke en krypteringsnøkkel?</string>
+    <string name="version_label">Versjon %1$s</string>
+    <string name="configure_fingerprint">Fingeravtrykket er satt støttet, men ikke satt opp på denne enheten.</string>
+    <string name="scanning_fingerprint">Venter på fingeravtrykk</string>
+    <string name="encrypted_value_stored">Kryptert passord lagret</string>
+    <string name="fingerprint_invalid_key">Ugyldig fingeravtrykksnøkkelproblem. Gjenopprett passordet ditt.</string>
+    <string name="fingerprint_not_recognized">Fremmed fingeravtrykk</string>
+    <string name="fingerprint_error">Fingeravtrykksproblem: %1$s</string>
+    <string name="store_with_fingerprint">Bruk fingeravtrykk til å lagre dette passordet</string>
+    <string name="no_password_stored">Inget passord lagret for denne databasen enda</string>
+    <string name="history">Historikk</string>
+    <string name="appearance">Utseende</string>
+    <string name="general">Generelt</string>
+    <string name="autofill">Autofyll</string>
+    <string name="autofill_service_name">KeePass DX autofyll-tjeneste</string>
+    <string name="autofill_sign_in_prompt">Logg inn med KeePass DX</string>
+    <string name="set_autofill_service_title">Sett forvalgt autofyll-tjeneste</string>
+    <string name="set_autofill_service_summary">Skru på tjenesten for å fylle ut skjema fra andre programmer</string>
+    <string name="password_size_title">Passordsstørrelse</string>
+    <string name="password_size_summary">Sett forvalgt størrelse for generert passord</string>
+    <string name="list_password_generator_options_title">Passordtegn</string>
+    <string name="list_password_generator_options_summary">Sett forvalgte passordgenereringstegn</string>
+    <string name="clipboard">Utklippstavle</string>
+    <string name="clipboard_notifications_title">Utklippstavlemerknader</string>
+    <string name="clipboard_notifications_summary">Skru på utklipstavlemerknader for å kopiering av oppføringsfelter</string>
+    <string name="clipboard_warning">Hvis din enhet ikke er i stand til å slette ting fra utklippstavlen automatisk, slett det kopierte elementet fra din utklippshistorikk manuelt.</string>
+    <string name="lock">Lås</string>
+    <string name="lock_database_screen_off_title">Skjermlås</string>
+    <string name="lock_database_screen_off_summary">Lås databasen når skjermen er av</string>
+    <string name="fingerprint_quick_unlock_title">Hvordan sette opp fingeravtrykk for rask opplåsing?</string>
+    <string name="fingerprint_setting_text">Sett ditt personlige fingeravtrykk for din enhet i</string>
+    <string name="fingerprint_setting_way_text">\"Innstillinger\" → \"Sikkerhet\" → \"Fingeravtrykk\"</string>
+    <string name="fingerprint_type_password_text">Skriv passordet ditt i KeePass DX</string>
+    <string name="fingerprint_scan_to_store">Skann ditt fingeravtrykk for å lagre hovedpassordet ditt sikkert</string>
+    <string name="fingerprint_scan_to_open">Skann fingeravtrykket ditt når passordutkryssingsboksen er fravalgt for å åpne databasen</string>
+    <string name="usage">Bruk</string>
+    <string name="fingerprint">Fingeravtrykk</string>
+    <string name="fingerprint_enable_title">Skanner etter fingeravtrykk</string>
+    <string name="fingerprint_enable_summary">Skru på fingeravtrykksåpning av database</string>
+    <string name="fingerprint_delete_all_title">Slett krypteringsnøkler</string>
+    <string name="fingerprint_delete_all_summary">Slett alle fingeravtrykksnøkler som har med fingeravtrykksgjenkjennelse å gjøre</string>
+    <string name="fingerprint_delete_all_warning">Er du sikker på at du vil slette alle nøklene som har med fingeravtrykk å gjøre?</string>
+    <string name="unavailable_feature_text">Kunne ikke starte denne funksjonen.</string>
+    <string name="unavailable_feature_version">Din Androidversjon %1$s oppfyller ikke minimumskravet, %2$s kreves.</string>
+    <string name="unavailable_feature_hardware">Fant ikke maskinvaren.</string>
+    <string name="file_name">Filnavn</string>
+    <string name="path">Sti</string>
+    <string name="assign_master_key">Tildel en hovednøkkel</string>
+    <string name="create_keepass_file">Oppret en KeePass-fil</string>
+    <string name="bytes">Byte</string>
+    <string name="full_file_path_enable_title">Filsti</string>
+    <string name="full_file_path_enable_summary">Vis hele filstien</string>
+    <string name="recycle_bin_title">Bruk papirkurv</string>
+    <string name="recycle_bin_summary">Flytt en gruppe eller oppføring til \"Papirkurv\" før sletting</string>
+    <string name="permission_external_storage_rationale_write_database">KeePass DX trenger tilgang til ekstern lagringsmedium for å skrive en database</string>
+    <string name="permission_external_storage_rationale_read_database">KeePass DX trenger tilgang til eksternt lagringsmedium for å lese en URI som ikke leveres av en innholdsleverandør.</string>
+    <string name="permission_external_storage_denied">Tilgang til eksternt lagringsmedium avvist</string>
+    <string name="permission_external_storage_never_ask">Kan ikke utføre handlingen uten tilgang til eksternt lagringsmedium</string>
+    <string name="monospace_font_fields_enable_title">Feltskrift</string>
+    <string name="monospace_font_fields_enable_summary">Endre skriften brukt i felter for bedre tegngjengivelse</string>
+    <string name="auto_open_file_uri_title">Åpne valgt fil automatisk</string>
+    <string name="auto_open_file_uri_summary">Åpne en fil fra utvalgsskjermen automatisk etter at et valg er gjort i filutforskeren</string>
+    <string name="allow_copy_password_title">Kopi av passord</string>
+    <string name="allow_copy_password_summary">Tillat kopiering av passordet og beskyttede felter til utklippstavlen.</string>
+    <string name="allow_copy_password_warning">ADVARSEL: Utklippstavlen deles av alle programmer. Hvis sensitiv data kopieres, kan annen programvare gjenopprette den.</string>
+    <string name="warning_disabling_storage_access_framework">ADVARSEL: Å skru av denne funksjonen kan lede til manglende evne til å åpne eller lagre databaser.</string>
+    <string name="open_link_database">Lenke til KDBD-filen å åpne</string>
+    <string name="database_name_title">Databasenavn</string>
+    <string name="database_description_title">Databasebeskrivelse</string>
+    <string name="database_version_title">Databaseversjon</string>
+    <string name="text_appearance">Tekstutseende</string>
+    <string name="application_appearance">Programutseende</string>
+    <string name="other">Annet</string>
+
+    <string name="keyboard">Tastatur</string>
+    <string name="magic_keyboard_title">Magikeyboard</string>
+    <string name="magic_keyboard_summary">Aktiver et egendefinert tastatur som fyller inn passordene og alle identitetsfelter automatisk.</string>
+    <string name="magic_keyboard_preference_title">Magikeyboard-innstillinger</string>
+    <string name="magic_keyboard_configure_title">Hvordan setter jeg opp tastaturet for sikker skjemautfylling?</string>
+    <string name="magic_keyboard_activate_setting_text">Aktiver Magikeyboard i enhetsinnstillingene.</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">\"Innstillinger\" → \"Språk og inndata\" → \"Nåværende tastatur\" og velg ett.</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">eller (\"Innstillinger\" → \"Språk og inndata\" → \"Virtuelt tastatur\" og velg ett.)</string>
+    <string name="keyboards_choose_magikeyboard_text">Velg Magikeyboard når du trenger å fylle inn et skjema.</string>
+    <string name="keyboards_swicth_magikeyboard_text">Du kan enkelt bytte fra ditt hovedtastatur til Magikeyboard med språkknappen på tastaturet ditt, et langt trykk på ditt tastaturs mellomromstast, eller, hvis det ikke er tilgjengelig, med:</string>
+    <string name="keyboard_select_entry_text">Velg din oppføring med nøkkelen.</string>
+    <string name="keyboard_fill_field_text">Fyll inn feltene ved bruk av elementene i oppføringen.</string>
+    <string name="keyboard_lock_database_text">Lås databasen.</string>
+    <string name="keyboard_back_main_keyboard_text">Gå tilbake til ditt hovedtastatur.</string>
+
+    <string name="allow_no_password_title">Tillat inget passord</string>
+    <string name="allow_no_password_summary">Skru på \"Åpne\"-tasten hvis ingen passordidentifikasjon er valgt.</string>
+    <string name="enable_read_only_title">Skrivebeskyttet</string>
+    <string name="enable_read_only_summary">Åpne databaser skrivebeskyttet som forvalg.</string>
+
+    <string name="enable_education_screens_title">Hjelpeskjermer</string>
+    <string name="enable_education_screens_summary">Framhev elementer for opplæring i programmet</string>
+    <string name="reset_education_screens_title">Tilbakestill opplæringsskjermer</string>
+    <string name="reset_education_screens_summary">Tilbakestill visning av opplæringselementer</string>
+    <string name="reset_education_screens_text">Tilbakestilling av opplæringsskjermer</string>
+    <string name="education_create_database_title">Opprett din databasefil</string>
+    <string name="education_create_database_summary">Du kjenner ikke KeePass DX enda, opprett din første passordsaministrasjonsfil.</string>
+    <string name="education_select_database_title">Åpne en eksisterende database</string>
+    <string name="education_select_database_summary">Du har allerede brukt en KeePass-behandler. Bare åpne KDBX-filen fra din filbehandler.</string>
+    <string name="education_open_link_database_title">En lenke til plasseringen av filen din er nok.</string>
+    <string name="education_open_link_database_summary">Du kan også åpne din database med en fysisk lenke (med file:// og content:// for eksempel).</string>
+    <string name="education_new_node_title">Legg til nye elementer i databasen din</string>
+    <string name="education_new_node_summary">Legg til oppføringer for å behandle dine digitale identiteter.
+\n
+\nLegg til grupper (tilsvarende mapper) for å organisere dine oppføringer og databasen din.</string>
+    <string name="education_search_title">Søk i dine oppføringer</string>
+    <string name="education_search_summary">Søk etter oppføringer etter tittel, brukernavn eller andre felter for å hente passordene dine.</string>
+    <string name="education_fingerprint_title">Lås opp databasen din med fingeravtrykket ditt.</string>
+    <string name="education_fingerprint_summary">Lenk passordet og fingeravtrykket ditt for å låse opp databasen din enkelt.</string>
+    <string name="education_entry_edit_title">Rediger oppføringen</string>
+    <string name="education_entry_edit_summary">Rediger din oppføring med egendefinerte felter, referanser til pooldata kan legges til mellom felter av forskjellige oppføringer.</string>
+    <string name="education_generate_password_title">Opprett et sterkt passord</string>
+    <string name="education_generate_password_summary">Generer et sterkt passord for å tilknytte oppføringen, definer det i henhold til kriteriene i skjemaet og ikke glem et sikkert passord du kan huske.</string>
+    <string name="education_entry_new_field_title">Legg til egendefinerte felter</string>
+    <string name="education_entry_new_field_summary">Du ønsker å registrere et grunnleggende felt som ikke allerede finnes, fyll inn et nytt et du også kan beskytte visuelt.</string>
+    <string name="education_unlock_title">Lås opp databasen din</string>
+    <string name="education_unlock_summary">Oppgi passord og/eller nøkkelfil for å låse opp databasen din.
+\n
+\nHusk å lagre en kopi av din .kdbx-fil på et trygt sted etter hver endring.</string>
+    <string name="education_read_only_title">Skru på skrivebeskyttelse</string>
+    <string name="education_read_only_summary">Endre åpningsmodus for økten.
+\n
+\nI skrivebeskyttet modus, kan du forhindre utilsiktede endringer i databasen.
+\n
+\nI skrivemodus, kan du legge til, slette eller endre alle elementene du ønsker.</string>
+    <string name="education_field_copy_title">Kopier et felt</string>
+    <string name="education_field_copy_summary">Kopier et felt for å lime det inn der du ønsker.
+\nBruk den skjemautfyllingsmetoden du foretrekker.</string>
+    <string name="education_lock_title">Lås databasen</string>
+    <string name="education_lock_summary">Lås din database raskt. Du kan sette opp programmet slik at det låser den etter en stund, og når skjermen slår seg av.</string>
+    <string name="education_sort_title">Sorter elementer</string>
+    <string name="education_sort_summary">Sorter oppføringer og grupper i henhold til spesifikke parameter.</string>
+    <string name="education_donation_title">Delta</string>
+    <string name="education_donation_summary">Delta for å øke stabiliteten, sikkerheten, og med å legge til flere funksjoner.</string>
+
+    <string name="html_text_ad_free">Ulikt mange passordbehandlingsprogrammer, er dette <strong>reklamefri</strong>, <strong>copyleftbasert fri programvare</strong> og samler ikke inn personlig data på tjenerne sine, selv i sin gratisversjon.</string>
+    <string name="html_text_buy_pro">Ved kjøp av pro-versjonen, vil du få tilgang til denne <strong>visuelle funksjonen</strong> og du vil spesielt hjelpe <strong> realiseringen av gemenskapsprosjekter.</strong></string>
+    <string name="html_text_feature_generosity">Denne <strong>visuelle funksjonen</strong> er tilgjengelig takket være din generøsitet.</string>
+    <string name="html_text_donation">For å beholde vår frihet og alltid være aktive, stoler vi på dine <strong>bidrag.</strong></string>
+
+    <string name="html_text_dev_feature">Denne funksjonen er <strong>under utvikling</strong> og krever <strong>bidrag</strong> for å bli tilgjengelig snart.</string>
+    <string name="html_text_dev_feature_buy_pro">Ved å kjøpe <strong>pro</strong>-versjonen,</string>
+    <string name="html_text_dev_feature_contibute">Ved å <strong>bidra</strong>,</string>
+    <string name="html_text_dev_feature_encourage">oppfordrer du utviklere til å skape <strong>nye funksjoner</strong> og til å <strong>fikse feil</strong> i henhold til dine kommentarer.</string>
+    <string name="html_text_dev_feature_thanks">Takk for ditt bidrag.</string>
+    <string name="html_text_dev_feature_work_hard">Det arbeides hardt på realiseringen av denne utgaven.</string>
+    <string name="html_text_dev_feature_upgrade">Ikke glem å holde programmet ditt oppgradert.</string>
+
+    <string name="download">Last ned</string>
+    <string name="contribute">Bidra</string>
+
+    <string name="encryption_rijndael">Rijndael (AES)</string>
+    <string name="encryption_twofish">Twofish</string>
+    <string name="encryption_chacha20">ChaCha20</string>
+
+    <string name="kdf_AES">AES KDF</string>
+    <string name="kdf_Argon2">Argon2</string>
+
+    <string name="style_choose_title">Velg en drakt</string>
+    <string name="style_choose_summary">Tilpass programdrakten ved å endre fargene</string>
+    <string name="icon_pack_choose_title">Velg en ikonpakke</string>
+    <string name="icon_pack_choose_summary">Endre programmets ikonpakke</string>
+
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
  Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
      
@@ -21,127 +21,128 @@
 -->
 <resources>
     <string name="about_feedback">Feedback:</string>
-    <string name="about_homepage">Homepage:</string>
+    <string name="about_homepage">Website:</string>
-    <string name="about_description">KeePass DX is een Android implementatie van de KeePass wachtwoordmanager.</string>
+    <string name="about_description">KeePass DX is een Android-implementatie van de KeePass-wachtwoordbeheerder.</string>
-    <string name="accept">Aanvaarden</string>
+    <string name="accept">Accepteren</string>
-    <string name="add_entry">Record toevoegen</string>
+    <string name="add_entry">Item toevoegen</string>
     <string name="add_group">Groep toevoegen</string>
     <string name="encryption_algorithm">Algoritme</string>
-    <string name="app_timeout">Applicatietimeout</string>
+    <string name="app_timeout">App-time-out</string>
-    <string name="app_timeout_summary">Tijd tot het vergrendelen van de database bij inactiviteit.</string>
+    <string name="app_timeout_summary">Tijd tot het vergrendelen van de databank bij inactiviteit</string>
-    <string name="application">Applicatie</string>
+    <string name="application">App</string>
-    <string name="menu_app_settings">Applicatieinstellingen</string>
+    <string name="menu_app_settings">App-instellingen</string>
     <string name="brackets">Haakjes</string>
-    <string name="browser_intall_text">Een bestand opzoeken kan alleen met de Open Intents File Manager, klik hieronder om die te installeren. Door gebreken in deze file manager kan het opzoeken van een bestand echter de eerste keer mislukken.</string>
+    <string name="browser_intall_text">Een bestand opzoeken kan alleen met de Open Intents File Manager. Druk hieronder om deze app te installeren. Let op: door gebreken in deze bestandsbeheerder kan het opzoeken van een bestand de eerste keer mislukken.</string>
     <string name="cancel">Annuleren</string>
-    <string name="clipboard_cleared">Klembord gewist.</string>
+    <string name="clipboard_cleared">Klembord gewist</string>
-    <string name="clipboard_timeout">Klembordtimeout</string>
+    <string name="clipboard_timeout">Klembordtime-out</string>
     <string name="clipboard_timeout_summary">Tijd tussen het kopiëren van gebruikersnaam of wachtwoord en het wissen van het klembord</string>
     <string name="select_to_copy">Selecteer om %1$s naar klembord te kopiëren</string>
-    <string name="creating_db_key">Databasesleutel wordt aangemaakt&#8230;</string>
+    <string name="retrieving_db_key">Bezig met creëren van databanksleutel…</string>
-    <string name="database">Database</string>
+    <string name="database">Databank</string>
-    <string name="decrypting_db">Databaseinhoud wordt ontcijferd&#8230;</string>
+    <string name="decrypting_db">Bezig met ontsleutelen van databankinhoud…</string>
-    <string name="default_checkbox">Gebruik dit als mijn standaard database</string>
+    <string name="default_checkbox">Gebruiken als standaarddatabank</string>
-    <string name="digits">Cijfers</string>
+    <string name="digits">Getallen</string>
-    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft biedt GEEN ENKELE GARANTIE; Dit is vrije software, u mag deze software verspreiden onder de voorwaarden van de GPL versie 3 of recenter.</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft biedt GEEN ENKELE GARANTIE. Dit is vrije software, dus je mag deze software verspreiden onder de voorwaarden van de GPL versie 3 of recenter.</string>
-    <string name="select_database_file">Geef de databasebestandsnaam</string>
+    <string name="select_database_file">Kies een bestaande databank</string>
-    <string name="entry_accessed">Laatst benaderd</string>
+    <string name="entry_accessed">Laatst geopend</string>
     <string name="entry_cancel">Annuleren</string>
-    <string name="entry_comment">Commentaar</string>
+    <string name="entry_comment">Opmerkingen</string>
-    <string name="entry_confpassword">Bevestig wachtwoord</string>
+    <string name="entry_confpassword">Wachtwoord bevestigen</string>
-    <string name="entry_created">Aangemaakt op</string>
+    <string name="entry_created">Gecreëerd op</string>
     <string name="entry_expires">Verloopt op</string>
     <string name="entry_keyfile">Sleutelbestand</string>
-    <string name="entry_modified">Gewijzigd op</string>
+    <string name="entry_modified">Bewerkt op</string>
     <string name="entry_password">Wachtwoord</string>
     <string name="entry_save">Opslaan</string>
     <string name="entry_title">Naam</string>
     <string name="entry_url">URL</string>
     <string name="entry_user_name">Gebruikersnaam</string>
-    <string name="error_arc4">De ArcFour stream-versleuteling wordt niet ondersteund.</string>
+    <string name="error_arc4">De ARCFOUR stream-versleuteling wordt niet ondersteund.</string>
-    <string name="error_can_not_handle_uri">KeePass DX kan deze uri niet verwerken.</string>
+    <string name="error_can_not_handle_uri">KeePass DX kan deze URI niet verwerken.</string>
-    <string name="error_could_not_create_parent">Kan de hogerliggende map niet aanmaken.</string>
+    <string name="error_could_not_create_parent">Kan bovenliggende map niet creëren.</string>
-    <string name="error_database_exists">Dit bestand bestaat reeds.</string>
+    <string name="error_database_exists">Dit bestand bestaat al.</string>
-    <string name="error_failed_to_launch_link">Kon de koppeling niet opstarten.</string>
+    <string name="error_failed_to_launch_link">Kan link niet openen.</string>
-    <string name="error_filename_required">Een bestandsnaam ontbreekt.</string>
+    <string name="error_filename_required">Bestandsnaam vereist.</string>
-    <string name="error_file_not_create">Kon het bestand niet aanmaken:</string>
+    <string name="error_file_not_create">Kan bestand niet creëren:</string>
-    <string name="error_invalid_db">Ongeldige database.</string>
+    <string name="error_invalid_db">Ongeldige databank of niet-herkende hoofdsleutel.</string>
-    <string name="error_invalid_path">Ongeldige padnaam.</string>
+    <string name="error_invalid_path">Ongeldig pad.</string>
-    <string name="error_no_name">Een naam ontbreekt.</string>
+    <string name="error_no_name">Naam vereist.</string>
-    <string name="error_nokeyfile">Een wachtwoord of sleutenbestand ontbreekt.</string>
+    <string name="error_nokeyfile">Sleutelbestand vereist.</string>
-    <string name="error_out_of_memory">Onvoldoende vrij geheugen om de database te lezen. Misschien is de database te groot voor deze telefoon.</string>
+    <string name="error_out_of_memory">Onvoldoende vrij geheugen om de databank uit te lezen.</string>
-    <string name="error_pass_gen_type">U moet minstens één type van wachtwoordgeneratie kiezen.</string>
+    <string name="error_pass_gen_type">Je moet minimaal één soort wachtwoordgenerering kiezen</string>
-    <string name="error_pass_match">Wachtwoorden zijn niet gelijk.</string>
+    <string name="error_pass_match">De wachtwoorden komen niet overeen.</string>
-    <string name="error_rounds_not_number">Cycli-waarde moet een getal zijn.</string>
+    <string name="error_rounds_not_number">\"Cycli-waarde\" moet een getal zijn.</string>
-    <string name="error_rounds_too_large">Cycli-waarde te groot. Ik gebruik 2147483648.</string>
+    <string name="error_rounds_too_large">\"Cycli-waarde\" te groot. Wordt ingesteld op 2147483648.</string>
-    <string name="error_title_required">Een titel ontbreekt.</string>
+    <string name="error_title_required">Titel vereist.</string>
-    <string name="error_wrong_length">Geef een positief geheel getal voor het lengteveld</string>
+    <string name="error_wrong_length">Voer een positief geheel getal in in het veld \"Lengte\"</string>
     <string name="file_not_found">Bestand niet gevonden.</string>
-    <string name="file_browser">Verkenner</string>
+    <string name="file_browser">Bestandsverkenner</string>
-    <string name="generate_password">Genereer wachtwoord</string>
+    <string name="generate_password">Wachtwoord genereren</string>
-    <string name="hint_conf_pass">bevestig wachtwoord</string>
+    <string name="hint_conf_pass">wachtwoord bevestigen</string>
     <string name="hint_generated_password">gegenereerd wachtwoord</string>
-    <string name="hint_group_name">Groepnaam</string>
+    <string name="hint_group_name">Groepsnaam</string>
     <string name="hint_keyfile">sleutelbestand</string>
     <string name="hint_length">lengte</string>
     <string name="password">Wachtwoord</string>
     <string name="hint_pass">wachtwoord</string>
-    <string name="install_from_play_store">Installeer van Play Store</string>
+    <string name="install_from_play_store">Installeren via Play Store</string>
-    <string name="install_from_f_droid">Installeer van F-Droid</string>
+    <string name="install_from_f_droid">Installeren via F-Droid</string>
-    <string name="InvalidPassword">Ongeldig wachtwoord of sleutelbestand.</string>
+    <string name="invalid_password">Ongeldig wachtwoord of sleutelbestand.</string>
-    <string name="invalid_db_sig">Databaseformaat niet herkend.</string>
+    <string name="invalid_db_sig">Databankformaat niet herkend.</string>
     <string name="length">Lengte</string>
-    <string name="list_size_title">Grootte van de groepslijst</string>
+    <string name="list_size_title">Grootte van itemlijst</string>
-    <string name="list_size_summary">Grootte van de tekst in de groepslijst</string>
+    <string name="list_size_summary">Tekstgrootte van itemlijst</string>
-    <string name="loading_database">Database wordt geladen&#8230;</string>
+    <string name="loading_database">Bezig met laden van databank…</string>
     <string name="lowercase">Kleine letters</string>
-    <string name="maskpass_title">Maskeer wachtwoord</string>
+    <string name="maskpass_title">Wachtwoord afschermen</string>
-    <string name="maskpass_summary">Verberg wachtwoorden standaardmatig</string>
+    <string name="maskpass_summary">Wachtwoorden standaard verbergen</string>
     <string name="menu_about">Over</string>
-    <string name="menu_change_key">Wijzig hoofdsleutel</string>
+    <string name="menu_change_key">Hoofdsleutel wijzigen</string>
     <string name="settings">Instellingen</string>
-    <string name="menu_db_settings">Database-instellingen</string>
+    <string name="menu_db_settings">Databank-instellingen</string>
-    <string name="menu_delete">Wissen</string>
+    <string name="menu_delete">Verwijderen</string>
     <string name="menu_donate">Doneren</string>
     <string name="menu_edit">Bewerken</string>
     <string name="menu_hide_password">Wachtwoord verbergen</string>
-    <string name="menu_lock">Vergrendel database</string>
+    <string name="menu_lock">Databank vergrendelen</string>
     <string name="menu_open">Openen</string>
     <string name="menu_search">Zoeken</string>
-    <string name="menu_showpass">Toon wachtwoord</string>
+    <string name="menu_showpass">Wachtwoord tonen</string>
     <string name="menu_url">Ga naar URL</string>
     <string name="minus">Minus</string>
     <string name="never">Nooit</string>
     <string name="no_results">Geen zoekresultaten</string>
-    <string name="no_url_handler">Geen afhandeling voor deze url mogelijk.</string>
+    <string name="no_url_handler">Geen afhandeling voor deze URL mogelijk.</string>
-    <string name="open_recent">Recente database openen :</string>
+    <string name="open_recent">Recente databanken:</string>
-    <string name="omitbackup_title">Niet in backup en prullenbak zoeken</string>
+    <string name="omitbackup_title">Back-upitems niet doorzoeken</string>
-    <string name="omitbackup_summary">Laat \'Backup\' en Prullenbak-groep weg uit zoekresultaten</string>
+    <string name="omitbackup_summary">\'Back-up\'-groep verbergen uit zoekresultaten (alleen van toepassing op .kdb-bestanden)</string>
-    <string name="progress_create">Nieuwe database wordt aangemaakt&#8230;</string>
+    <string name="progress_create">Bezig met creëren van nieuwe databank…</string>
-    <string name="progress_title">Bezig&#8230;</string>
+    <string name="progress_title">Bezig met verwerken…</string>
-    <string name="remember_keyfile_summary">Onthoudt de locatie van de sleutelbestanden</string>
+    <string name="remember_keyfile_summary">Locatie van sleutelbestanden onthouden</string>
     <string name="remember_keyfile_title">Sleutelbestand opslaan</string>
-    <string name="remove_from_filelist">Verwijder</string>
+    <string name="remove_from_filelist">Verwijderen</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="root">Top</string>
+    <string name="root">Hoofdmap</string>
     <string name="rounds">Encryptie-cycli</string>
     <string name="rounds_explanation">Een hoger aantal encryptie-cycli geeft bijkomende bescherming tegen brute-force aanvallen, maar kan het laden en opslaan sterk vertragen.</string>
     <string name="rounds_hint">cycli</string>
-    <string name="saving_database">Database wordt opgeslagen&#8230;</string>
+    <string name="saving_database">Bezig met opslaan van databank…</string>
     <string name="space">Ruimte</string>
     <string name="search_label">Zoeken</string>
-    <string name="sort_db">Sorteringsvolgorde DB</string>
+    <string name="sort_db">DB-sorteervolgorde</string>
     <string name="special">Speciaal</string>
-    <string name="search">Record titel/beschrijving</string>
+    <string name="search">Zoeken</string>
     <string name="encryption_twofish">Twofish</string>
-    <string name="underline">Onderlijnen</string>
+    <string name="underline">Onderstrepen</string>
-    <string name="unsupported_db_version">Niet-ondersteunde databaseversie.</string>
+    <string name="unsupported_db_version">Niet-ondersteunde databankversie.</string>
     <string name="uppercase">Hoofdletters</string>
-    <string name="warning_read_only">Uw sd-card is mementeel niet beschrijfbaar. U zult wijzigingen in de database niet kunnen opslaan.</string>
+    <string name="warning_read_only">Je SD-kaart is momenteel alleen-lezen. Wijzigingen aan de databank kunnen niet worden opgeslagen.</string>
-    <string name="warning_unmounted">Uw sd-card is momenteel ontkoppeld. U zult geen database kunnen openen of aanmaken.</string>
+    <string name="warning_unmounted">Je sd-card is momenteel niet aangekoppeld. Je kunt geen databanken laden of creëren.</string>
-    <string name="version_label">Versie:</string>
+    <string name="version_label">Versie %1$s</string>
-
+    <string name="education_unlock_summary">Geef het wachtwoord en/of sleutelbestand op om je databank te ontgrendelen.
-    <string name="education_unlock_summary">Geef het wachtwoord en/of het sleutelbestand om uw database te ontgrendelen.</string>
+\n
+\nMaak na elke aanpassing een kopie van je .kdbx-bestand op een veilige locatie.</string>
 
     <string-array name="timeout_options">
         <item>5 seconden</item>
@@ -159,4 +160,227 @@
     	<item>Medium</item>
     	<item>Groot</item>
     </string-array>
+<string name="edit_entry">Item bewerken</string>
+    <string name="add_string">Zin toevoegen</string>
+    <string name="encryption">Versleuteling</string>
+    <string name="key_derivation_function">Sleutelafleidingsfunctie</string>
+    <string name="beta_dontask">Niet meer tonen</string>
+    <string name="extended_ASCII">Uitgebreide ASCII</string>
+    <string name="allow">Toestaan</string>
+    <string name="clipboard_error_title">Klembordfout</string>
+    <string name="clipboard_error">Sommige Android-telefoons van Samsung bevatten een fout in de klembordimplementatie, wat leidt tot kopieerfouten. Meer informatie:</string>
+    <string name="clipboard_error_clear">Wissen van klembord mislukt</string>
+    <string name="clipboard_swipe_clean">Veeg om klembord nu te wissen</string>
+    <string name="entry_not_found">Inhoud van item niet gevonden.</string>
+    <string name="error_load_database">Databank kan niet worden geladen</string>
+    <string name="error_load_database_KDF_memory">De sleutel kan niet worden geladen. Probeer om het geheugengebruik van KDF te verminderen.</string>
+    <string name="error_string_key">Elke zin moet een veldnaam bevatten.</string>
+    <string name="error_autofill_enable_service">De dienst automatisch aanvullen kan niet worden ingeschakeld.</string>
+    <string name="error_move_folder_in_itself">Een groep kan niet naar zichzelf worden verplaatst.</string>
+    <string name="field_name">Veldnaam</string>
+    <string name="field_value">Veldwaarde</string>
+    <string name="file_not_found_content">Bestand niet gevonden. Probeer opnieuw te openen van je inhoudsdienst.</string>
+    <string name="invalid_algorithm">Ongeldig algoritme.</string>
+    <string name="keyfile_does_not_exist">Er bestaat geen sleutelbestand.</string>
+    <string name="keyfile_is_empty">Het sleutelbestand is leeg.</string>
+    <string name="list_entries_show_username_title">Gebruikersnamen tonen</string>
+    <string name="list_entries_show_username_summary">Gebruikersnamen tonen in itemlijsten</string>
+    <string name="copy_field">Kopie van %1$s</string>
+    <string name="menu_form_filling_settings">Formulierinvulling</string>
+    <string name="menu_copy">Kopiëren</string>
+    <string name="menu_move">Verplaatsen</string>
+    <string name="menu_paste">Plakken</string>
+    <string name="menu_cancel">Annuleren</string>
+    <string name="menu_fingerprint_remove_key">Vingerafdruksleutel verwijderen</string>
+    <string name="menu_file_selection_read_only">Alleen-lezen</string>
+    <string name="menu_open_file_read_and_write">Lezen en schrijven</string>
+    <string name="protection">Beveiliging</string>
+    <string name="read_only">Alleen-lezen</string>
+    <string name="read_only_warning">KeePass DX is niet gemachtigd om items weg te schrijven naar je databanklocatie; het bestand wordt geopend als alleen-lezen.</string>
+    <string name="read_only_kitkat_warning">Sinds Android KitKat is het op sommige apparaten niet langer toegestaan om apps weg te schrijven naar de SD-kaart.</string>
+    <string name="recentfile_title">Recente bestandgeschiedenis</string>
+    <string name="recentfile_summary">Recent gebruikte bestandsnamen onthouden</string>
+    <string name="encryption_explanation">Het algoritme dat moet worden gebruikt om de gehele databank te versleutelen. (Wachtwoorden, gebruikersnamen, notities en alle databankgegevens worden hiermee versleuteld)</string>
+    <string name="kdf_explanation">Om de sleutel voor het algoritme te kunnen genereren, wordt de ingepakte hoofdsleutel (SHA-256) getransformeerd middels een willekeurige afleidingsfunctie.</string>
+    <string name="memory_usage">Geheugengebruik</string>
+    <string name="memory_usage_explanation">Het geheugen (in binaire bytes) dat de afleidingsfunctie mag gebruiken.</string>
+    <string name="parallelism">Parallellen</string>
+    <string name="parallelism_explanation">Het aantal parallellen (aantal threads) dat de afleidingsfunctie mag gebruiken.</string>
+    <string name="sort_menu">Sorteren</string>
+    <string name="sort_ascending">Laagste eerst ↓</string>
+    <string name="sort_groups_before">Groepen vóór losse items sorteren</string>
+    <string name="sort_recycle_bin_bottom">Prullenbak onderaan plaatsen</string>
+    <string name="sort_title">Titel</string>
+    <string name="sort_username">Gebruikersnaam</string>
+    <string name="sort_creation_time">Gecreëerd om</string>
+    <string name="sort_last_modify_time">Laatst aangepast om</string>
+    <string name="sort_last_access_time">Laatst geopend om</string>
+    <string name="search_results">Zoekresultaten</string>
+    <string name="use_saf_summary">Android-opslagtoegang-framework (SAF) gebruiken voor bestandsverkenning (KitKat en hoger)</string>
+    <string name="use_saf_title">Opslagtoegang-framework</string>
+    <string name="warning">Waarschuwing</string>
+    <string name="warning_password_encoding">Je wachtwoord mag letters bevatten die niet ondersteund worden door de Latin-1-tekenset die gebruikt wordt door .kdb-bestanden. Ze worden allemaal omgezet naar dezelfde letter, dus het wordt aanbevolen om je wachtwoord te wijzigen.</string>
+    <string name="warning_empty_password">Weet je zeker dat je je wachtwoord wilt leeglaten?</string>
+    <string name="warning_no_encryption_key">Weet je zeker dat je geen sleutel wilt koppelen aan je versleuteling?</string>
+    <string name="configure_fingerprint">Vingerafdruk wordt ondersteund, maar is niet ingesteld op dit apparaat</string>
+    <string name="scanning_fingerprint">Bezig met zoeken naar vingerafdrukken</string>
+    <string name="encrypted_value_stored">Versleuteld wachtwoord is opgeslagen</string>
+    <string name="fingerprint_invalid_key">Ongeldige vingerafdruk. Herstel je wachtwoord.</string>
+    <string name="fingerprint_not_recognized">Vingerafdruk niet herkend</string>
+    <string name="fingerprint_error">Vingerafdrukprobleem: %1$s</string>
+    <string name="store_with_fingerprint">Vingerafdruk gebruiken om dit wachtwoord op te slaan</string>
+    <string name="no_password_stored">Nog geen wachtwoord opgeslagen voor deze databank</string>
+    <string name="history">Geschiedenis</string>
+    <string name="appearance">Uiterlijk</string>
+    <string name="general">Algemeen</string>
+    <string name="autofill">Auto-aanvullen</string>
+    <string name="autofill_service_name">KeePass DX auto-aanvullendienst</string>
+    <string name="autofill_sign_in_prompt">Inloggen met KeePass DX</string>
+    <string name="set_autofill_service_title">Standaard aanvuldienst instellen</string>
+    <string name="set_autofill_service_summary">Schakel de dienst in om formulieren in andere apps snel in te vullen</string>
+    <string name="password_size_title">Wachtwoordgrootte</string>
+    <string name="password_size_summary">Standaardgrootte instellen van gegenereerd wachtwoord</string>
+    <string name="list_password_generator_options_title">Wachtwoordtekens</string>
+    <string name="list_password_generator_options_summary">Standaard wachtwoordtekens instellen</string>
+    <string name="clipboard">Klembord</string>
+    <string name="clipboard_notifications_title">Klembordmeldingen</string>
+    <string name="clipboard_notifications_summary">Schakel klembordmeldingen in om itemvelden te kopiëren</string>
+    <string name="clipboard_warning">Als je apparaat niet automatisch items van het klembord kan verwijderen, verwijder het gekopieerde item dan handmatig van het klembord.</string>
+    <string name="lock">Vergrendelen</string>
+    <string name="lock_database_screen_off_title">Schermvergrendeling</string>
+    <string name="lock_database_screen_off_summary">Databank vergrendelen als het scherm uitgaat</string>
+    <string name="fingerprint_quick_unlock_title">Hoe stel ik mijn vingerafdruk in voor snelle ontgrendeling?</string>
+    <string name="fingerprint_setting_text">Stel je persoonlijke vingerafdruk voor je apparaat in via</string>
+    <string name="fingerprint_setting_way_text">\"Instellingen\" → \"Beveiliging\" → \"Vingerafdruk\"</string>
+    <string name="fingerprint_type_password_text">Typ je wachtwoord in KeePass DX</string>
+    <string name="fingerprint_scan_to_store">Scan je vingerafdruk om je hoofdwachtwoord veilig op te slaan</string>
+    <string name="fingerprint_scan_to_open">Scan je vingerafdruk om de databank te ontgrendelen als er geen vinkje staat bij wachtwoord</string>
+    <string name="usage">Gebruik</string>
+    <string name="fingerprint">Vingerafdruk</string>
+    <string name="fingerprint_enable_title">Bezig met vingerafdrukherkenning</string>
+    <string name="fingerprint_enable_summary">Databank openen met vingerafdruk</string>
+    <string name="fingerprint_delete_all_title">Sleutels voor versleuteling verwijderen</string>
+    <string name="fingerprint_delete_all_summary">Alle aan vingerafdrukherkenning gerelateerde sleutels wilt verwijderen</string>
+    <string name="fingerprint_delete_all_warning">Weet je zeker dat je alle aan vingerafdrukherkenning gerelateerde sleutels wilt verwijderen?</string>
+    <string name="unavailable_feature_text">Kan deze functie niet starten.</string>
+    <string name="unavailable_feature_version">Je Android-versie, %1$s, voldoet niet aan de minimumvereiste %2$s.</string>
+    <string name="unavailable_feature_hardware">De hardware wordt niet herkend.</string>
+    <string name="file_name">Bestandsnaam</string>
+    <string name="path">Pad</string>
+    <string name="assign_master_key">Hoofdsleutel toewijzen</string>
+    <string name="create_keepass_file">KeePass-bestand creëren</string>
+    <string name="bytes">bytes</string>
+    <string name="full_file_path_enable_title">Bestandspad</string>
+    <string name="full_file_path_enable_summary">Volledig bestandspad tonen</string>
+    <string name="recycle_bin_title">Prullenbak gebruiken</string>
+    <string name="recycle_bin_summary">Groep of item naar de \"Prullenbak\" verplaatsen alvorens te verwijderen</string>
+    <string name="permission_external_storage_rationale_write_database">KeePass DX heeft de machtiging externe opslag nodig om een databank weg te schrijven</string>
+    <string name="permission_external_storage_rationale_read_database">KeePass DC heeft de machtiging externe opslag nodig om een URL uit te lezen die niet is opgegeven door een inhoudsdienst</string>
+    <string name="permission_external_storage_denied">Machtiging externe opslag afgewezen</string>
+    <string name="permission_external_storage_never_ask">Kan de actie niet uitvoeren zonder de machtiging externe opslag</string>
+    <string name="monospace_font_fields_enable_title">Veldlettertype</string>
+    <string name="monospace_font_fields_enable_summary">Wijzg het lettertype dat gebruikt wordt in velden voor betere leesbaarheid</string>
+    <string name="auto_open_file_uri_title">Gekozen bestand automatisch openen</string>
+    <string name="auto_open_file_uri_summary">Open een bestand van het keuzescherm automatisch nadat een keuze is gemaakt in de bestandsnavigatie</string>
+    <string name="allow_copy_password_title">Wachtwoord kopiëren toestaan</string>
+    <string name="allow_copy_password_summary">Staat toe dat het wachtwoord en beveiligde velden worden gekopieerd naar het klembord</string>
+    <string name="allow_copy_password_warning">WAARSCHUWING: het klembord wordt gedeeld door alle apps. Als gevoelige gegevens worden gekopieerd, kan andere software deze opvragen.</string>
+    <string name="warning_disabling_storage_access_framework">WAARSCHUWING: door deze functie uit te schakelen kunnen databanken mogelijk niet meer worden geopend of opgeslagen</string>
+    <string name="open_link_database">Link naar het te openen KDBX-bestand</string>
+    <string name="database_name_title">Databanknaam</string>
+    <string name="database_description_title">Databankomschrijving</string>
+    <string name="database_version_title">Databankversie</string>
+    <string name="text_appearance">Tekstuiterlijk</string>
+    <string name="application_appearance">App-uiterlijk</string>
+    <string name="other">Overig</string>
+
+    <string name="keyboard">Toetsenbord</string>
+    <string name="magic_keyboard_title">Magikeyboard</string>
+    <string name="magic_keyboard_summary">Activeert een aangepast toetsenbord dat je wachtwoorden en identiteitsvelden eenvoudig aanvult</string>
+    <string name="magic_keyboard_preference_title">Magikeyboard-instellingen</string>
+    <string name="magic_keyboard_configure_title">Hoe stel ik het toetsenbord in voor het veilig invullen van formulieren?</string>
+    <string name="magic_keyboard_activate_setting_text">Activeer Magikeyboard in de apparaatinstellingen.</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">\"Instellingen\" → \"Taal en invoer\" → \"Huidig toetsenbord\" en kies er een.</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">of (\"Instellingen\" → \"Taal en invoer\" → \"Virtueel toetsenbord\")</string>
+    <string name="keyboards_choose_magikeyboard_text">Kies Magikeyboard als je een formulier moet invullen.</string>
+    <string name="keyboards_swicth_magikeyboard_text">Je kunt eenvoudig schakelen tussen je gebruikelijke toetsenbord en Magikeyboard middels de taalknop op je toetsenbord of door de spatiebalk lang ingedrukt te houden. Indien niet beschikbaar kan het ook met:</string>
+    <string name="keyboard_select_entry_text">Kies je iteminvoer met de toets.</string>
+    <string name="keyboard_fill_field_text">Voer je velden in met de elementen van het item.</string>
+    <string name="keyboard_lock_database_text">Databank vergrendelen.</string>
+    <string name="keyboard_back_main_keyboard_text">Terug naar je gebruikelijke toetsenbord.</string>
+
+    <string name="allow_no_password_title">Geen wachtwoord toestaan</string>
+    <string name="allow_no_password_summary">Schakelt de knop openen in als geen wachtwoordidentificatie wordt opgegeven</string>
+    <string name="enable_read_only_title">Alleen-lezen</string>
+    <string name="enable_read_only_summary">Standaard zijn geopende databank alleen-lezen</string>
+
+    <string name="enable_education_screens_title">Educatieve schermen</string>
+    <string name="enable_education_screens_summary">Markeert de elementen om te leren hoe de app werkt</string>
+    <string name="reset_education_screens_title">Standaardwaarden</string>
+    <string name="reset_education_screens_summary">Stelt het tonen van educatie schermen terug op de standaardwaarden</string>
+    <string name="reset_education_screens_text">Standaardwaarden hersteld</string>
+    <string name="education_create_database_title">Creëer je databankbestand</string>
+    <string name="education_create_database_summary">Je kent KeePass DX nog niet. Creëer je eerste wachtwoordbeheer-bestand.</string>
+    <string name="education_select_database_title">Open een bestaande databank</string>
+    <string name="education_select_database_summary">Je hebt al een KeePass-beheerder gebruikt. Open je KDBX-bestand via je bestandsbeheerder.</string>
+    <string name="education_open_link_database_title">Een link naar de bestandslocatie is voldoende</string>
+    <string name="education_open_link_database_summary">Je kunt je databank ook openen middels een fysieke link (bijv. met file:// en content://).</string>
+    <string name="education_new_node_title">Voeg nieuwe items toe</string>
+    <string name="education_new_node_summary">Voeg items toe om je digitale identiteiten te beheren.
+\n
+\nVoeg groepen toe (groepen zijn gelijk aan mappen) om items in je databank te organiseren.</string>
+    <string name="education_search_title">Doorzoek eenvoudig al je items</string>
+    <string name="education_search_summary">Doorzoek items op titel, gebruikersnaam of andere velden om je wachtwoorden te vinden.</string>
+    <string name="education_fingerprint_title">Ontgrendel je databank met je vingerafdruk</string>
+    <string name="education_fingerprint_summary">Koppel je wachtwoord en vingerafdruk om je databank snel te ontgrendelen.</string>
+    <string name="education_entry_edit_title">Bewerk het item</string>
+    <string name="education_entry_edit_summary">Bewerk het item met aangepaste velden. Referenties kunnen worden toegevoegd tussen velden van verschillende items.</string>
+    <string name="education_generate_password_title">Creëern een sterk wachtwoord</string>
+    <string name="education_generate_password_summary">Genereer een sterk wachtwoord voor het item. Maak het gelijk aan de criteria van het formulier en vergeet het wachtwoord niet.</string>
+    <string name="education_entry_new_field_title">Voeg aangepaste velden toe</string>
+    <string name="education_entry_new_field_summary">Als je een niet-standaard veld wilt toevoegen, vul dan een nieuwe in.</string>
+    <string name="education_unlock_title">Ontgrendel je databank</string>
+    <string name="education_read_only_title">Alleen-lezen inschakelen</string>
+    <string name="education_read_only_summary">Wijzig de opstartmodus van de sessie.
+\n
+\nIn alleen-lezenmodus kunnen geen onbedoelde wijzigingen worden gemaakt.
+\n
+\nIn schrijfmodus kun je elementen toevoegen, verwijderen of aanpassen.</string>
+    <string name="education_field_copy_title">Veld kopiëren toestaan</string>
+    <string name="education_field_copy_summary">Kopieer een veld en plak de inhoud waar je maar wilt.
+\n
+\nJe kunt verschillende formulier-invulmethodes gebruiken; kies je voorkeursmethode.</string>
+    <string name="education_lock_title">Databank vergrendelen</string>
+    <string name="education_lock_summary">Vergrendel je databank snel. Je kunt instellen dat de vergrendeling na een bepaalde duur moet plaatsvinden of als het scherm uitgaat.</string>
+    <string name="education_sort_title">Items sorteren</string>
+    <string name="education_sort_summary">Sorteer items en groepen op verschillende manieren.</string>
+    <string name="education_donation_title">Bijdragen</string>
+    <string name="education_donation_summary">Draag bij om de stabiliteit en veiligheid te vergroten en door meer functies toe te voegen.</string>
+
+    <string name="html_text_ad_free">In tegenstelling tot veel wachtwoordbeheerapps is deze <strong>reclamevrij</strong>, <strong>vrije software</strong> en slaat geen persoonlijke gegevens op op de servers, zelfs niet in de gratis versie.</string>
+    <string name="html_text_buy_pro">Door de pro-versie te kopen krijg je toegang tot deze <strong>visuele functie</strong> en draag je bij aan het <strong>realiseren van gemeenschapsprojecten.</strong></string>
+    <string name="html_text_feature_generosity">Deze <strong>visuele functie</strong> is beschikbaar gekomen door jullie gulheid.</string>
+    <string name="html_text_donation">Om altijd vrij en actief te blijven, zijn we afhankelijk van jouw <strong>bijdrage.</strong></string>
+
+    <string name="html_text_dev_feature">Deze functie <strong>wordt momenteel ontwikkeld</strong> en kan alleen beschikbaar komen middels jouw <strong>bijdrage</strong>.</string>
+    <string name="html_text_dev_feature_buy_pro">Door de <strong>pro</strong>-versie te kopen,</string>
+    <string name="html_text_dev_feature_contibute">Door <strong>bij te dragen</strong>,</string>
+    <string name="html_text_dev_feature_encourage">motiveer je ontwikkelaars om <strong>nieuwe functies</strong> te creëren en <strong>bugs op te lossen</strong>.</string>
+    <string name="html_text_dev_feature_thanks">Hartelijk bedankt voor je bijdrage.</string>
+    <string name="html_text_dev_feature_work_hard">We zijn druk bezig om deze functie snel beschikbaar te stellen.</string>
+    <string name="html_text_dev_feature_upgrade">Vergeet niet om de app bijgewerkt te houden.</string>
+
+    <string name="download">Downloaden</string>
+    <string name="contribute">Bijdragen</string>
+
+    <string name="encryption_chacha20">ChaCha20</string>
+
+    <string name="kdf_AES">AES KDF</string>
+    <string name="kdf_Argon2">Argon2</string>
+
+    <string name="style_choose_title">Kies een thema</string>
+    <string name="style_choose_summary">Wijzig het app-thema door de kleuren te wijzigen</string>
+    <string name="icon_pack_choose_title">Kies een pictogramthema</string>
+    <string name="icon_pack_choose_summary">Wijzig het pictogramthema van de app</string>
+
 </resources>

app/src/main/res/values-nn/strings.xml

@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">Tidsavbrot på utklippstavla</string>
     <string name="clipboard_timeout_summary">Tid før utklippstavla blir tømt etter at brukarnamnet eller passordet er kopiert.</string>
     <string name="select_to_copy">Kopier %1$s til utklippstavla</string>
-    <string name="creating_db_key">Lagar databasenøkkelen …</string>
+    <string name="retrieving_db_key">Lagar databasenøkkelen …</string>
     <string name="database">Database</string>
     <string name="decrypting_db">Dekrypterer databasen …</string>
     <string name="default_checkbox">Standarddatabasen</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">passord</string>
     <string name="install_from_play_store">Installer frå Play Store</string>
     <string name="install_from_f_droid">Installer frå F-Droid</string>
-    <string name="InvalidPassword">Ugyldig passord eller nøkkelfil.</string>
+    <string name="invalid_password">Ugyldig passord eller nøkkelfil.</string>
     <string name="invalid_db_sig">Ukjent databaseformat.</string>
     <string name="length">Lengd</string>
     <string name="list_size_title">Gruppelistestorleik</string>
@@ -135,9 +135,8 @@
     <string name="underline">Understreking</string>
     <string name="unsupported_db_version">Kan ikkje bruka databaseutgåva.</string>
     <string name="uppercase">Store bokstavar</string>
-    <string name="warning_read_only">SD-kortet ditt kan berre lesast. Det kan vera at du ikkje kan lagra endringar i databasen.</string>
     <string name="warning_unmounted">SD-kortet er ikkje montert i eininga di. Du kan verken henta eller laga databasen din.</string>
-    <string name="version_label">Utgåve:</string>
+    <string name="version_label">Utgåve %1$s</string>
 
     <string name="education_unlock_summary">Skriv inn passordet og/eller nøkkelfil for å låsa opp databasen.</string>
 

app/src/main/res/values-pl/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
 Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
 This file is part of KeePass DX.
@@ -17,27 +17,27 @@ You should have received a copy of the GNU General Public License
 along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <string name="about_feedback">Feedback:</string>
+    <string name="about_feedback">Informacje zwrotne:</string>
     <string name="about_homepage">Strona domowa:</string>
     <string name="about_description">KeePass DX to Androidowa implementacja menadżera haseł KeePass.</string>
     <string name="accept">Akceptuj</string>
     <string name="add_entry">Dodaj wpis</string>
     <string name="add_group">Dodaj grupę</string>
     <string name="encryption_algorithm">Algorytm</string>
-    <string name="app_timeout">Czas wygaśnięcia aplikacji</string>
+    <string name="app_timeout">Limit czasu aplikacji</string>
-    <string name="app_timeout_summary">Czas do zablokowania bazy danych przy bezczynności aplikacji.</string>
+    <string name="app_timeout_summary">Czas do zablokowania bazy danych przy bezczynności aplikacji</string>
     <string name="application">Aplikacja</string>
     <string name="menu_app_settings">Ustawienia aplikacji</string>
     <string name="brackets">Nawiasy</string>
     <string name="browser_intall_text">Przeglądanie plików wymaga programu Open Intents File Manager, kliknij poniżej by go zainstalować. Ze względu na pewne, dziwne zachowania menadżera plików przeglądanie może nie działać poprawnie przy pierwszym użyciu.</string>
     <string name="cancel">Anuluj</string>
-    <string name="clipboard_cleared">Schowek wyczyszczony.</string>
+    <string name="clipboard_cleared">Schowek został wyczyszczony</string>
     <string name="clipboard_timeout">Czas wygaśnięcia schowka</string>
     <string name="clipboard_timeout_summary">Czas do wyczyszczenia zawartości schowka po kopiowaniu nazwy użytkownika i hasła</string>
     <string name="select_to_copy">Kopiuj %1$s do schowka</string>
-    <string name="creating_db_key">Tworzenie klucza bazy danych&#8230;</string>
+    <string name="retrieving_db_key">Tworzenie klucza bazy danych…</string>
     <string name="database">Baza danych</string>
-    <string name="decrypting_db">Deszyfracja bazy danych&#8230;</string>
+    <string name="decrypting_db">Deszyfracja bazy danych…</string>
     <string name="default_checkbox">Używaj tej bazy danych jako domyślnej</string>
     <string name="digits">Cyfry</string>
     <string name="select_database_file">Wprowadź nazwę pliku bazy danych</string>
@@ -55,23 +55,23 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="entry_url">URL</string>
     <string name="entry_user_name">Nazwa użytkownika</string>
     <string name="error_arc4">Strumieniowe szyfrowanie ArcFour nie jest wspierane.</string>
-    <string name="error_can_not_handle_uri">KeePass DX nie potrafi obsłużyć tego uri.</string>
+    <string name="error_can_not_handle_uri">KeePass DX nie potrafi obsłużyć tego adresu URL.</string>
     <string name="error_could_not_create_parent">Nie można utworzyć folderu nadrzędnego.</string>
     <string name="error_database_exists">Plik o podanej nazwie już istnieje.</string>
-    <string name="error_failed_to_launch_link">Błąd przy uruchamianiu linku.</string>
+    <string name="error_failed_to_launch_link">Nie można otworzyć łącza.</string>
     <string name="error_filename_required">Wymagana nazwa pliku.</string>
     <string name="error_file_not_create">Nie można utworzyć pliku:</string>
     <string name="error_invalid_db">Nieprawidłowa baza danych.</string>
     <string name="error_invalid_path">Nieprawidłowa ścieżka dostępu.</string>
     <string name="error_no_name">Wymagana nazwa.</string>
     <string name="error_nokeyfile">Wymagane hasło lub plik klucza.</string>
-    <string name="error_out_of_memory">Podczas parsowania bazy danych zabrakło pamięci. Być może ta baza danych jest za duża dla Twojego urządzenia.</string>
+    <string name="error_out_of_memory">W urządzeniu zabrakło pamięci podczas analizowania bazy danych.</string>
     <string name="error_pass_gen_type">Przynajmniej jeden sposób generowania hasła musi być wybrany</string>
     <string name="error_pass_match">Hasła nie pasują do siebie.</string>
-    <string name="error_rounds_not_number">Wartość musi być liczbą.</string>
+    <string name="error_rounds_not_number">\"Wartość\" musi być liczbą.</string>
-    <string name="error_rounds_too_large">Wartość za duża. Ustaw 2147483648.</string>
+    <string name="error_rounds_too_large">\"Wartość\" za duża. Ustaw 2147483648.</string>
     <string name="error_title_required">Wymagany tytuł.</string>
-    <string name="error_wrong_length">Wprowadź dodatnią liczbę całkowitą.</string>
+    <string name="error_wrong_length">Wprowadź dodatnią liczbę całkowitą w polu \"Długość\"</string>
     <string name="file_not_found">Plik nie istnieje.</string>
     <string name="file_browser">Przeglądarka plików</string>
     <string name="generate_password">Generuj hasło</string>
@@ -84,12 +84,12 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="hint_pass">hasło</string>
     <string name="install_from_play_store">Zainstaluj z Play-Store</string>
     <string name="install_from_f_droid">Zainstaluj z F-Droid</string>
-    <string name="InvalidPassword">Nieprawidłowe hasło lub plik klucza.</string>
+    <string name="invalid_password">Nieprawidłowe hasło lub plik klucza.</string>
     <string name="invalid_db_sig">Format bazy danych nierozpoznany.</string>
     <string name="length">Długość</string>
     <string name="list_size_title">Wielkość listy grup</string>
     <string name="list_size_summary">Wielkość tekstu w liście grup</string>
-    <string name="loading_database">Wczytywanie bazy danych&#8230;</string>
+    <string name="loading_database">Wczytywanie bazy danych…</string>
     <string name="lowercase">Małe litery</string>
     <string name="maskpass_title">Maska hasła</string>
     <string name="maskpass_summary">Domyślnie ukrywa hasło</string>
@@ -105,18 +105,18 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="menu_open">Otwórz</string>
     <string name="menu_search">Szukaj</string>
     <string name="menu_showpass">Pokaż hasło</string>
-    <string name="menu_url">Przejdź do URL</string>
+    <string name="menu_url">Przejdź do adresu URL</string>
     <string name="minus">Minus</string>
     <string name="never">Nigdy</string>
     <string name="no_results">Brak wyników wyszukiwania</string>
-    <string name="no_url_handler">Brak obsługi dla tego urla.</string>
+    <string name="no_url_handler">Brak obsługi dla tego adresu URL.</string>
     <string name="open_recent">Otwórz ostatnio używaną bazę danych :</string>
-    <string name="omitbackup_title">Nie wyszukuj zapasowych wpisów</string>
+    <string name="omitbackup_title">Nie wyszukuj wpisów kopii zapasowej</string>
-    <string name="omitbackup_summary">Pomiń kopię zapasową grupy z wyników wyszukiwania (dotyczy tylko .kdb)</string>
+    <string name="omitbackup_summary">Pomiń grupę \'Kopia zapasowa\' z wyników wyszukiwania (dotyczy tylko plików .kdb)</string>
-    <string name="progress_create">Tworzenie nowej bazy danych&#8230;</string>
+    <string name="progress_create">Tworzenie nowej bazy danych…</string>
-    <string name="progress_title">Pracuję&#8230;</string>
+    <string name="progress_title">Pracuję…</string>
     <string name="recentfile_title">Najnowsza historia plików</string>
-    <string name="recentfile_summary">Zapamiętaj ostatnio uzywane nazwy plików</string>
+    <string name="recentfile_summary">Zapamiętaj ostatnio używane nazwy plików</string>
     <string name="remember_keyfile_summary">Zapamiętaj lokację plików kluczy</string>
     <string name="remember_keyfile_title">Zapisz plik klucza</string>
     <string name="remove_from_filelist">Usuń</string>
@@ -125,22 +125,24 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="rounds">Złożoność szyfrowania</string>
     <string name="rounds_explanation">Większa złożoność szyfrowania zapewnia dodatkowe zabezpieczenie przed atakiem brute force, ale może spowolnić wczytywanie i zapisywanie bazy danych.</string>
     <string name="rounds_hint">złożoność</string>
-    <string name="saving_database">Zapisywanie bazy danych&#8230;</string>
+    <string name="saving_database">Zapisywanie bazy danych…</string>
     <string name="space">Spacja</string>
     <string name="search_label">Szukaj</string>
     <string name="sort_db">Sortuj wg daty</string>
     <string name="special">Znaki specjalne</string>
-    <string name="search">Tytuł/opis wpisu</string>
+    <string name="search">Szukaj</string>
-    <string name="encryption_twofish">Twofish</string>
+    <string name="encryption_twofish">Dwie ryby</string>
     <string name="underline">Podkreślenie</string>
     <string name="unsupported_db_version">Nieobsługiwana wersja bazy danych.</string>
     <string name="uppercase">Wielkie litery</string>
-    <string name="use_saf_summary">Użyj przeglądarki Android Storage Access Framework do przeglądania plików (KitKat i nowsze)</string>
+    <string name="use_saf_summary">Użyj struktury dostępu do pamięci Android (SAF) do przeglądania plików (KitKat i nowsze)</string>
-    <string name="use_saf_title">Storage Access Framework</string>
+    <string name="use_saf_title">Dostęp do struktury do pamięci masowej</string>
     <string name="warning_read_only">Karta SD jest obecnie w trybie tylko do odczytu. Możesz nie być w stanie zapisać zmian w bazie danych.</string>
     <string name="warning_unmounted">Karta SD nie jest obecnie zamontowana w urządzeniu. Możesz nie być w stanie wczytać lub utworzyć bazy danych.</string>
 
-    <string name="education_unlock_summary">Wprowadź hasło i/lub plik klucza by uzyskać dostęp do bazy danych.</string>
+    <string name="education_unlock_summary">Wprowadź hasło i/lub plik klucza, aby odblokować bazę danych. 
+\n 
+\nPamiętaj o zapisaniu kopii pliku .kdbx w bezpiecznym miejscu po każdej modyfikacji.</string>
 
     <string-array name="timeout_options">
      <item>5 sekund</item>
@@ -158,5 +160,225 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
      <item>Średnia</item>
      <item>Duża</item>
     </string-array>
-</resources>
+<string name="edit_entry">Edytuj wpis</string>
+    <string name="add_string">Dodaj ciąg</string>
+    <string name="encryption">Szyfrowanie</string>
+    <string name="key_derivation_function">Funkcja Generująca Klucze</string>
+    <string name="beta_dontask">Nie pokazuj więcej</string>
+    <string name="extended_ASCII">Rozszerzone ASCII</string>
+    <string name="allow">Zezwalaj</string>
+    <string name="clipboard_error_title">Błąd schowka</string>
+    <string name="clipboard_error">Niektóre telefony Samsung z Androidem mają błąd w implementacji schowka, co powoduje, że kopiowanie z aplikacji kończy się niepowodzeniem. Więcej szczegółów:</string>
+    <string name="clipboard_error_clear">Czyszczenie schowka nie powiodło się</string>
+    <string name="clipboard_swipe_clean">Przesuń, by wyczyścić schowek</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft korzystasz ABSOLUTNIE BEZ GWARANCJI; To jest bezpłatne oprogramowanie i możesz go redystrybuować na warunkach GPL w wersji 3 lub późniejszej.</string>
+    <string name="entry_not_found">Nie znaleziono danych wejściowych.</string>
+    <string name="error_load_database">Baza danych nie może być załadowana</string>
+    <string name="error_load_database_KDF_memory">Nie można załadować klucza, spróbuj zmniejszyć pamięć używaną przez KDF.</string>
+    <string name="error_string_key">Każdy ciąg musi mieć nazwę pola.</string>
+    <string name="error_autofill_enable_service">Usługa autofillowania nie może być włączona.</string>
+    <string name="error_move_folder_in_itself">Nie można przenieść grupy do samej siebie.</string>
+    <string name="field_name">Nazwa pola</string>
+    <string name="field_value">Wartość pola</string>
+    <string name="file_not_found_content">Nie znaleziono pliku. Spróbuj ponownie otworzyć zawartość od dostawcy treści.</string>
+    <string name="invalid_algorithm">Nieprawidłowy algorytm.</string>
+    <string name="keyfile_does_not_exist">Brak pliku klucza.</string>
+    <string name="keyfile_is_empty">Plik klucza jest pusty.</string>
+    <string name="list_entries_show_username_title">Wyświetlaj nazwy użytkownika</string>
+    <string name="list_entries_show_username_summary">Wyświetlaj nazwy użytkowników na listach wpisów</string>
+    <string name="copy_field">Kopiuj z %1$s</string>
+    <string name="menu_form_filling_settings">Wypełnianie formularzy</string>
+    <string name="menu_copy">Kopiuj</string>
+    <string name="menu_move">Przenieś</string>
+    <string name="menu_paste">Wklej</string>
+    <string name="menu_cancel">Anuluj</string>
+    <string name="menu_fingerprint_remove_key">Usuń klucz linii papilarnych</string>
+    <string name="menu_file_selection_read_only">Tylko do odczytu</string>
+    <string name="menu_open_file_read_and_write">Odczyt i zapis</string>
+    <string name="protection">Ochrona</string>
+    <string name="read_only">Tylko do odczytu</string>
+    <string name="read_only_warning">KeePass DX nie ma uprawnień do zapisu w Twojej lokalizacji bazy danych, więc zostanie otwarty tylko do odczytu.</string>
+    <string name="read_only_kitkat_warning">Począwszy od Androida KitKat niektóre urządzenia nie zezwalają już aplikacjom na zapisywanie na kartę SD.</string>
+    <string name="encryption_explanation">Algorytm do szyfrowania całej bazy danych. (Hasła, nazwy użytkowników, notatki i wszystkie dane w bazie danych są szyfrowane za pomocą wybranego algorytmu)</string>
+    <string name="kdf_explanation">Aby wygenerować klucz do algorytmu szyfrowania, skompresowany klucz główny (SHA-256) jest transformowany przy użyciu losowo solonej funkcji wyprowadzania klucza.</string>
+    <string name="memory_usage">Użycie pamięci</string>
+    <string name="memory_usage_explanation">Ilość pamięci (w bajtach binarnych) do użycia przez funkcję wyprowadzania klucza.</string>
+    <string name="parallelism">Równoległy</string>
+    <string name="parallelism_explanation">Stopień równoległości (tj. Liczba wątków) wykorzystywany przez funkcję wyprowadzania klucza.</string>
+    <string name="sort_menu">Sortuj</string>
+    <string name="sort_ascending">Od najniższej ↓</string>
+    <string name="sort_username">Nazwa Użytkownika</string>
+    <string name="sort_creation_time">Czas utworzenia</string>
+    <string name="sort_last_modify_time">Ostatni czas modyfikacji</string>
+    <string name="sort_last_access_time">Ostatni czas dostępu</string>
+    <string name="search_results">Wyniki wyszukiwania</string>
+    <string name="warning">Ostrzeżenie</string>
+    <string name="warning_password_encoding">Twoje hasło może zawierać litery nieobsługiwane przez zestaw znaków Latin-1 używany przez pliki .kdb. Ponieważ wszystkie są konwertowane na tę samą literę, zaleca się zmianę hasła, aby było bezpieczniejsze.</string>
+    <string name="sort_recycle_bin_bottom">Kosz na dole</string>
+    <string name="sort_title">Tytuł</string>
+    <string name="warning_empty_password">Czy na pewno chcesz użyć pustego ciągu jako hasła?</string>
+    <string name="warning_no_encryption_key">Czy na pewno nie chcesz używać żadnego klucza szyfrowania?</string>
+    <string name="version_label">Wersja %1$s</string>
+    <string name="configure_fingerprint">Odcisk palca jest obsługiwany, ale nie skonfigurowany dla tego urządzenia</string>
+    <string name="encrypted_value_stored">"Przechowywane hasło zaszyfrowane "</string>
+    <string name="sort_groups_before">Grupy poprzednie</string>
+    <string name="scanning_fingerprint">Odczytywanie odcisków palców</string>
+    <string name="fingerprint_invalid_key">Problem z kluczem linii papilarnych. Przywróć swoje hasło.</string>
+    <string name="fingerprint_not_recognized">Odcisk palca nie został rozpoznany</string>
+    <string name="fingerprint_error">Problem z odciskami palców: %1$s</string>
+    <string name="store_with_fingerprint">Użyj odcisku palca, aby zapisać to hasło</string>
+    <string name="no_password_stored">Nie ma jeszcze zapisanego hasła dla tej bazy danych</string>
+    <string name="history">Historia</string>
+    <string name="appearance">Wygląd</string>
+    <string name="general">Ogólne</string>
+    <string name="autofill">Wypełnij automatycznie</string>
+    <string name="autofill_service_name">Usługa autouzupełniania KeePass DX</string>
+    <string name="autofill_sign_in_prompt">Zaloguj się za pomocą KeePass DX</string>
+    <string name="set_autofill_service_title">Ustaw domyślną usługę autouzupełniania</string>
+    <string name="set_autofill_service_summary">Włącz usługę, aby łatwo wypełniać formularze z innych aplikacji</string>
+    <string name="password_size_title">Rozmiar hasła</string>
+    <string name="password_size_summary">Ustaw domyślny rozmiar generowanego hasła</string>
+    <string name="list_password_generator_options_title">Znaki hasła</string>
+    <string name="list_password_generator_options_summary">Ustaw domyślne znaki generatora haseł</string>
+    <string name="clipboard">Schowek</string>
+    <string name="clipboard_notifications_title">Powiadomienia w schowku</string>
+    <string name="clipboard_notifications_summary">Włącz powiadomienia ze schowka, aby skopiować pola wprowadzania</string>
+    <string name="clipboard_warning">Jeśli urządzenie nie może automatycznie usunąć klipów ze schowka, ręcznie usuń skopiowany element z historii schowka.</string>
+    <string name="lock">Blokada</string>
+    <string name="lock_database_screen_off_title">Blokada ekranu</string>
+    <string name="lock_database_screen_off_summary">Zablokuj bazę danych, gdy ekran jest wyłączony</string>
+    <string name="fingerprint_quick_unlock_title">Jak skonfigurować odcisk palca do szybkiego odblokowania?</string>
+    <string name="fingerprint_setting_text">Ustaw swój odcisk palca dla swojego urządzenia</string>
+    <string name="fingerprint_setting_way_text">\"Ustawienia\" → \"Bezpieczeństwo\" → \"Odcisk palca\"</string>
+    <string name="fingerprint_type_password_text">Wpisz swoje hasło w Keepass DX</string>
+    <string name="fingerprint_scan_to_store">Zeskanuj swój odcisk palca, aby bezpiecznie przechowywać hasło główne</string>
+    <string name="fingerprint_scan_to_open">Zeskanuj swój odcisk palca, gdy pole wyboru hasła nie jest zaznaczone, aby otworzyć bazę danych</string>
+    <string name="usage">Użycie</string>
+    <string name="fingerprint">Odcisk palca</string>
+    <string name="fingerprint_enable_title">Skanowanie w poszukiwaniu odcisków palców</string>
+    <string name="fingerprint_enable_summary">Włącz tworzenie bazy danych przez odcisk palca</string>
+    <string name="fingerprint_delete_all_title">Usuń klucze szyfrowania</string>
+    <string name="fingerprint_delete_all_summary">Usuń wszystkie klucze szyfrowania związane z rozpoznawaniem linii papilarnych</string>
+    <string name="fingerprint_delete_all_warning">Czy na pewno chcesz usunąć wszystkie klucze związane z odciskami palców?</string>
+    <string name="unavailable_feature_text">Nie można uruchomić tej funkcji.</string>
+    <string name="unavailable_feature_version">Twoja wersja Androida %1$s nie spełnia wymaganej minimalnej wersji %2$s.</string>
+    <string name="unavailable_feature_hardware">Sprzęt nie został wykryty.</string>
+    <string name="file_name">Nazwa pliku</string>
+    <string name="path">Ścieżka</string>
+    <string name="assign_master_key">Przypisz klucz główny</string>
+    <string name="create_keepass_file">Utwórz plik KeePass</string>
+    <string name="bytes">Bajtów</string>
+    <string name="full_file_path_enable_title">Ścieżka pliku</string>
+    <string name="full_file_path_enable_summary">Wyświetl pełną ścieżkę do pliku</string>
+    <string name="recycle_bin_title">Użyj kosza</string>
+    <string name="recycle_bin_summary">Przenieś grupę lub wpis do \"Kosza\" przed usunięciem</string>
+    <string name="permission_external_storage_rationale_write_database">KeePass DX potrzebuje zewnętrznego pozwolenia na przechowywanie, aby zapisać bazę danych</string>
+    <string name="permission_external_storage_rationale_read_database">KeePass DX potrzebuje zewnętrznego pozwolenia na przechowywanie, aby odczytać URI, który nie został dostarczony przez dostawcę treści</string>
+    <string name="permission_external_storage_denied">Odmowa dostępu do zewnętrznej pamięci masowej</string>
+    <string name="permission_external_storage_never_ask">Nie można wykonać akcji bez uprawnień do zewnętrznego magazynu</string>
+    <string name="monospace_font_fields_enable_title">Pole czcionka</string>
+    <string name="monospace_font_fields_enable_summary">Zmień czcionkę użytą w polach, aby poprawić widoczność postaci</string>
+    <string name="auto_open_file_uri_title">Automatycznie otwórz wybrany plik</string>
+    <string name="auto_open_file_uri_summary">Automatycznie otwórz plik z ekranu wyboru, bezpośrednio po dokonaniu wyboru w eksploratorze plików</string>
+    <string name="allow_copy_password_title">Kopia hasła</string>
+    <string name="allow_copy_password_summary">Zezwalaj na kopiowanie hasła i chronionych pól do schowka</string>
+    <string name="allow_copy_password_warning">OSTRZEŻENIE: schowek jest udostępniany przez wszystkie aplikacje. Jeśli dane wrażliwe zostaną skopiowane, inne oprogramowanie może je odzyskać.</string>
+    <string name="warning_disabling_storage_access_framework">OSTRZEŻENIE: Wyłączenie tej funkcji może spowodować niemożność otwarcia lub zapisania baz danych</string>
+    <string name="open_link_database">Link do otwarcia pliku KDBX</string>
+    <string name="database_name_title">Nazwa bazy danych</string>
+    <string name="database_description_title">Opis bazy danych</string>
+    <string name="database_version_title">Wersja bazy danych</string>
+    <string name="text_appearance">Wygląd tekstu</string>
+    <string name="application_appearance">Wygląd aplikacji</string>
+    <string name="other">Inne</string>
 
+    <string name="keyboard">Klawiatura</string>
+    <string name="magic_keyboard_title">Magikeyboard</string>
+    <string name="magic_keyboard_summary">Aktywuj niestandardową klawiaturę, która łatwo wypełnia hasła i wszystkie pola tożsamości</string>
+    <string name="magic_keyboard_preference_title">Ustawienia Magikeyboard</string>
+    <string name="magic_keyboard_configure_title">Jak skonfigurować klawiaturę do bezpiecznego wypełniania formularzy?</string>
+    <string name="magic_keyboard_activate_setting_text">Aktywuj Magikeyboard w ustawieniach urządzenia.</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">\"Ustawienia\" → \"Język i wprowadzanie\" → \"Aktualna klawiatura\" i wybierz jedną.</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">lub (\"Ustawienia\" → \"Język i wprowadzanie danych\" → \"Klawiatura wirtualna\" i wybierz jedną.)</string>
+    <string name="keyboards_choose_magikeyboard_text">Wybierz Magikeyboard, gdy potrzebujesz wypełnić formularz.</string>
+    <string name="keyboards_swicth_magikeyboard_text">Możesz łatwo przełączać się z głównej klawiatury na Magikeyboard za pomocą przycisku języka na klawiaturze, długie naciśnięcie klawisza spacji na klawiaturze lub, jeśli nie jest dostępne, z:</string>
+    <string name="keyboard_select_entry_text">Wybierz wpis za pomocą klawisza.</string>
+    <string name="keyboard_fill_field_text">Wypełnij swoje pola, używając elementów wpisu.</string>
+    <string name="keyboard_lock_database_text">Zablokuj bazę danych.</string>
+    <string name="keyboard_back_main_keyboard_text">Wróć do głównej klawiatury.</string>
+
+    <string name="allow_no_password_title">Nie zezwalaj na żadne hasło</string>
+    <string name="allow_no_password_summary">Włącz przycisk Otwórz, jeśli nie wybrano identyfikacji hasła</string>
+    <string name="enable_read_only_title">Tylko do odczytu</string>
+    <string name="enable_read_only_summary">Domyślnie otwarte bazy danych są tylko do odczytu</string>
+
+    <string name="enable_education_screens_title">Ekrany edukacyjne</string>
+    <string name="enable_education_screens_summary">Zaznacz elementy, aby dowiedzieć się, jak działa aplikacja</string>
+    <string name="reset_education_screens_title">Zresetuj ekrany edukacyjne</string>
+    <string name="reset_education_screens_summary">Zresetuj wyświetlanie elementów edukacyjnych</string>
+    <string name="reset_education_screens_text">Ekrany edukacyjne zostały zresetowane</string>
+    <string name="education_create_database_title">Utwórz plik bazy danych</string>
+    <string name="education_create_database_summary">Nie znasz jeszcze KeePass DX, utwórz swój pierwszy plik zarządzania hasłami.</string>
+    <string name="education_select_database_title">Otwórz istniejącą bazę danych</string>
+    <string name="education_select_database_summary">Użyłeś już menedżera KeePass. Wystarczy otworzyć plik KDBX z przeglądarki plików.</string>
+    <string name="education_open_link_database_title">Link do lokalizacji pliku jest wystarczający</string>
+    <string name="education_open_link_database_summary">Możesz także otworzyć swoją bazę danych za pomocą fizycznego linku (with file:// and content:// for example).</string>
+    <string name="education_new_node_title">Dodaj nowe przedmioty do swojej bazy</string>
+    <string name="education_new_node_summary">"Dodaj wpisy, aby zarządzać swoimi cyfrowymi tożsamościami.
+\n  
+\nDodaj grupy (odpowiednik folderów), aby uporządkować swoje wpisy i bazę danych."</string>
+    <string name="education_search_title">Łatwo przeszukuj swoje wpisy</string>
+    <string name="education_search_summary">Wyszukaj wpisy według tytułu, nazwy użytkownika lub innych pól, aby łatwo odzyskać swoje hasła.</string>
+    <string name="education_fingerprint_title">Odblokuj bazę danych za pomocą odcisku palca</string>
+    <string name="education_fingerprint_summary">Utwórz łącze między hasłem a odciskiem palca, aby łatwo odblokować bazę danych.</string>
+    <string name="education_entry_edit_title">Edytuj wpis</string>
+    <string name="education_entry_edit_summary">Edytuj swój wpis własnymi polami, odniesienia do danych puli mogą być dodawane pomiędzy polami różnych wpisów.</string>
+    <string name="education_generate_password_title">Utwórz silne hasło</string>
+    <string name="education_generate_password_summary">Wygeneruj silne hasło do powiązania z wpisem, określ je zgodnie z kryteriami formularza i nie zapominaj o bezpiecznym haśle, które możesz zapamiętać.</string>
+    <string name="education_entry_new_field_title">Dodaj niestandardowe pola</string>
+    <string name="education_entry_new_field_summary">Chcesz zarejestrować podstawowe pole nie dostarczane, po prostu wypełnij nowe, które możesz również chronić wizualnie.</string>
+    <string name="education_unlock_title">Odblokuj swoją bazę danych</string>
+    <string name="education_read_only_title">Włącz tylko do odczytu</string>
+    <string name="education_read_only_summary">"Zmień tryb otwierania sesji.
+\n   
+\nW trybie tylko do odczytu zapobiegasz niezamierzonym zmianom w bazie danych.
+\n  
+\nW trybie zapisu możesz dodawać, usuwać lub modyfikować wszystkie elementy, jak chcesz."</string>
+    <string name="education_field_copy_title">Skopiuj pole</string>
+    <string name="education_field_copy_summary">"Skopiuj łatwo pole, aby wkleić je tam, gdzie chcesz
+\n  
+\nMożesz użyć kilku metod wypełniania formularzy. Użyj tego, który wolisz."</string>
+    <string name="education_lock_title">Zablokuj bazę danych</string>
+    <string name="education_lock_summary">Zablokuj swoją bazę danych szybko, możesz skonfigurować aplikację, by po chwili zablokowała i po wyłączeniu ekranu.</string>
+    <string name="education_sort_title">Sortuj elementy</string>
+    <string name="education_sort_summary">Sortuj wpisy i grupy według określonych parametrów.</string>
+    <string name="education_donation_title">Weź udział</string>
+    <string name="education_donation_summary">Weź udział, aby zwiększyć stabilność, bezpieczeństwo i dodać więcej funkcji.</string>
+
+    <string name="html_text_ad_free">W przeciwieństwie do wielu aplikacji zarządzania hasłami, ten jeden jest <strong>bez reklam</strong>, <strong> darmowy program typu copyleft</strong> i nie odzyskać danych osobowych na swoich serwerach, nawet w jego wersji darmowej.</string>
+    <string name="html_text_buy_pro">Kupując wersję pro, będziesz mieć dostęp do tej <strong>funkcja wizualna</strong> a szczególnie pomożesz <strong> zrealizować projekty społecznościowe. </strong></string>
+    <string name="html_text_feature_generosity">Ta <strong>funkcja wizualna</strong> jest dostępna dzięki Twojej hojności.</string>
+    <string name="html_text_donation">Aby zachować naszą wolność i być zawsze aktywnym, liczymy na Twój <strong>wkład.</strong></string>
+
+    <string name="html_text_dev_feature">Ta funkcja jest <strong>rozwojowa</strong> i wymaga twojego <strong>wkładu</strong> aby być wkrótce dostępną.</string>
+    <string name="html_text_dev_feature_buy_pro">Kupując wersję <strong>pro</strong> wersja,</string>
+    <string name="html_text_dev_feature_contibute">Przez <strong>przyczynianie się</strong>,</string>
+    <string name="html_text_dev_feature_encourage">zachęcasz programistów do tworzenia <strong>nowych funkcji</strong> i <strong>naprawić błądy</strong> zgodnie z Twoimi uwagami.</string>
+    <string name="html_text_dev_feature_thanks">Wielkie dzięki za twój wkład.</string>
+    <string name="html_text_dev_feature_work_hard">Ciężko pracujemy, aby szybko udostępnić tę funkcję.</string>
+    <string name="html_text_dev_feature_upgrade">Nie zapomnij o aktualizowaniu aplikacji.</string>
+
+    <string name="download">Pobieranie</string>
+    <string name="contribute">Przyczyń się</string>
+
+    <string name="encryption_chacha20">ChaCha20</string>
+
+    <string name="kdf_AES">AES KDF</string>
+    <string name="kdf_Argon2">Argon2</string>
+
+    <string name="style_choose_title">Wybierz motyw</string>
+    <string name="style_choose_summary">Zmień motyw aplikacji, zmieniając kolory</string>
+    <string name="icon_pack_choose_title">Wybierz pakiet ikon</string>
+    <string name="icon_pack_choose_summary">Zmień pakiet ikon aplikacji</string>
+
+</resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -33,13 +33,13 @@
     <string name="application">Aplicação</string>
     <string name="menu_app_settings">Configurações</string>
     <string name="brackets">Parênteses</string>
-    <string name="browser_intall_text">Navegação em arquivos requer o gerenciador de arquivos Open Intents, clique abaixo para instalar. Devido a algumas peculiaridades no gerenciador de arquivos, a navegação pode não funcionar na primeira vez.</string>
+    <string name="browser_intall_text">Navegação em arquivos requer o gerenciador de arquivos OpenIntents, clique abaixo para instalar. Devido a algumas peculiaridades no gerenciador de arquivos, a navegação pode não funcionar na primeira vez.</string>
     <string name="cancel">Cancelar</string>
     <string name="clipboard_cleared">Área de transferência limpa</string>
     <string name="clipboard_timeout">Tempo limite para o clipboard</string>
     <string name="clipboard_timeout_summary">Tempo até limpar a área de transferência após copiar usuário ou senha</string>
     <string name="select_to_copy">Copiar %1$s para o clipboard</string>
-    <string name="creating_db_key">Criando a chave do banco de dados…</string>
+    <string name="retrieving_db_key">Criando a chave do banco de dados…</string>
     <string name="database">Banco de Dados</string>
     <string name="decrypting_db">Decifrando conteúdo do banco de dados…</string>
     <string name="default_checkbox">Usar este banco de dados como padrão</string>
@@ -89,7 +89,7 @@
     <string name="hint_pass">senha</string>
     <string name="install_from_play_store">Instalar a partir do Google Play</string>
     <string name="install_from_f_droid">Instalar a partir do F-Droid</string>
-    <string name="InvalidPassword">Senha ou arquivo de chaves inválidos.</string>
+    <string name="invalid_password">Senha ou arquivo de chaves inválidos.</string>
     <string name="invalid_db_sig">O formato do banco de dados não foi reconhecido.</string>
     <string name="length">Tamanho</string>
     <string name="list_size_title">Tamanho da lista de grupos</string>
@@ -138,9 +138,8 @@
     <string name="underline">Sublinhado</string>
     <string name="unsupported_db_version">Versão de banco de dados não suportada.</string>
     <string name="uppercase">Letras maiúsculas</string>
-    <string name="warning_read_only">Seu cartão SD está no modo de somente leitura. Talvez não seja possível salvar modificações ao banco de dados.</string>
     <string name="warning_unmounted">Seu cartão SD não está montado no dispositivo. Não será possível carregar ou criar um banco de dados.</string>
-    <string name="version_label">Versão:</string>
+    <string name="version_label">Versão %1$s</string>
 
     <string name="education_unlock_summary">Digite uma senha e/ ou entre com o caminho para o arquivo de chaves do banco de dados.</string>
 
@@ -167,7 +166,7 @@
     <string name="extended_ASCII">ASCII Extendido</string>
     <string name="allow">Permitir</string>
     <string name="clipboard_error_title">Erro na área de transferência</string>
-    <string name="clipboard_error">Alguns telefones Samsung Android têm um bug na implementação da área de transferência que faz com que a cópia entre aplicativos falhe. Para mais detalhes, acesse:</string>
+    <string name="clipboard_error">Alguns telefones Samsung Android têm um defeito na implementação da área de transferência que faz com que a cópia entre aplicativos falhe. Para mais detalhes, acesse:</string>
     <string name="clipboard_error_clear">Limpeza de área de transferência falhou</string>
     <string name="clipboard_swipe_clean">Deslize para limpar a área de transferência agora</string>
     <string name="entry_not_found">Entrada não encontrada.</string>
@@ -257,7 +256,7 @@
     <string name="fingerprint_delete_all_summary">Apague todas as chaves de encriptação relacionadas ao reconhecimento de Impressões digitais</string>
     <string name="fingerprint_delete_all_warning">Tem certeza que você quer apagar todas as chaves relacionadas as Impressões digitais?</string>
     <string name="unavailable_feature_text">Não é possível iniciar esse recurso.</string>
-    <string name="unavailable_feature_version">Sua versão do Android %1$s não corresponde a a versão mínima %2$s necessária.</string>
+    <string name="unavailable_feature_version">Sua versão do Android %1$s não corresponde a versão mínima %2$s necessária.</string>
     <string name="unavailable_feature_hardware">Hardware não foi detectado.</string>
     <string name="file_name">Nome do arquivo</string>
     <string name="path">Caminho</string>
@@ -377,4 +376,5 @@
     <string name="icon_pack_choose_title">Selecione um pacote de ícones</string>
     <string name="icon_pack_choose_summary">Alterar o pacote de ícones do aplicativo</string>
 
-</resources>
+<string name="edit_entry">Editar entrada</string>
+    </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -43,7 +43,7 @@
     <string name="clipboard_timeout">Tempo de espera da área de transferência</string>
     <string name="clipboard_timeout_summary">Tempo antes da limpeza da área de transferência depois de copiado o nome de utilizador ou a palavra-passe.</string>
     <string name="select_to_copy">Selecione para copiar %1$s para a área de transferência</string>
-    <string name="creating_db_key">A criar a chave da base de dados&#8230;</string>
+    <string name="retrieving_db_key">A criar a chave da base de dados&#8230;</string>
     <string name="database">Base de dados</string>
     <string name="decrypting_db">A desencriptar conteúdo da base de dados&#8230;</string>
     <string name="default_checkbox">Utilizar esta base de dados como predefinida</string>
@@ -98,7 +98,7 @@
     <string name="password">Palavra-passe</string>
     <string name="install_from_play_store">Instalar pela Play Store</string>
     <string name="install_from_f_droid">Instalar pela F-Droid</string>
-    <string name="InvalidPassword">Palavra-passe ou ficheiro chave inválidos.</string>
+    <string name="invalid_password">Palavra-passe ou ficheiro chave inválidos.</string>
     <string name="invalid_algorithm">Algoritmo inválido.</string>
     <string name="invalid_db_sig">Formato da base de dados não reconhecido.</string>
     <string name="keyfile_does_not_exist">O ficheiro chave não existe.</string>
@@ -161,9 +161,8 @@
     <string name="use_saf_title">Storage Access Framework (SAF)</string>
     <string name="warning">Aviso</string>
     <string name="warning_password_encoding">O formato .kdb apenas suporta o conjunto de caracteres Latin1. A sua palavra-passe pode conter caracteres fora deste conjunto. Todos os caracteres não Latin1 são convertidos para o mesmo carácter, o que reduz a segurança da sua palavra-passe. É recomendável alterar a sua palavra-passe.</string>
-    <string name="warning_read_only">O cartão SD está atualmente em modo de apenas leitura. Poderá não ser possível guardar as alterações na sua base de dados.</string>
     <string name="warning_unmounted">O cartão SD não se encontra montado no seu dispositivo. Não será possível abrir ou criar a sua base de dados.</string>
-    <string name="version_label">Versão:</string>
+    <string name="version_label">Versão %1$s</string>
 
     <string name="education_unlock_summary">Introduza a palavra-passe e/ou o ficheiro chave para desbloquear a base de dados.</string>
 

app/src/main/res/values-ru/strings.xml

@@ -20,41 +20,41 @@
 <resources>
     <string name="about_feedback">Отзывы:</string>
     <string name="about_homepage">Сайт:</string>
-    <string name="about_description">KeePass DX является Android-версией программы управления паролями KeePass</string>
+    <string name="about_description">KeePass DX является Android-версией программы управления паролями KeePass.</string>
     <string name="accept">Принять</string>
     <string name="add_entry">Новая запись</string>
     <string name="add_group">Новая группа</string>
     <string name="add_string">Новая строка</string>
     <string name="encryption_algorithm">Алгоритм шифрования</string>
-    <string name="app_timeout">Блокировка базы</string>
+    <string name="app_timeout">Задержка</string>
     <string name="app_timeout_summary">Задержка блокировки при бездействии</string>
-    <string name="application">Программа</string>
+    <string name="application">Приложение</string>
     <string name="menu_app_settings">Настройки KeePass DX</string>
     <string name="beta_dontask">Не показывать снова</string>
     <string name="brackets">{[(Скобки)]}</string>
-    <string name="browser_intall_text">Для функции обзора необходим менеджер файлов – например, OI File Manager</string>
+    <string name="browser_intall_text">Для функции обзора файлов необходим OI File Manager. Нажмите ниже, чтобы установить. Из-за некоторых проблем с менеджером файлов обзор может работать некорректно при первом запуске.</string>
     <string name="cancel">Отмена</string>
     <string name="clipboard_cleared">Буфер обмена очищен</string>
     <string name="clipboard_error_title">Ошибка буфера обмена</string>
     <string name="clipboard_error">На ряде устройств Samsung буфер обмена содержит ошибку, блокирующую копирование данных из приложений. Подробнее:</string>
-    <string name="clipboard_error_clear">Очистка буфера обмена не удалась</string>
+    <string name="clipboard_error_clear">Не удалось очистить буфер обмена</string>
-    <string name="clipboard_timeout">Очистка буфера</string>
+    <string name="clipboard_timeout">Задержка очистки буфера обмена</string>
-    <string name="clipboard_timeout_summary">Задержка очистки после копирования в буфер</string>
+    <string name="clipboard_timeout_summary">Задержка очистки буфера обмена после копирования логина или пароля</string>
-    <string name="select_to_copy">%1$s – в буфер</string>
+    <string name="select_to_copy">Выберите %1$s для копирования в буфер обмена</string>
-    <string name="creating_db_key">Создание ключа…</string>
+    <string name="retrieving_db_key">Создание ключа базы…</string>
     <string name="database">База</string>
     <string name="decrypting_db">Расшифровка базы…</string>
-    <string name="default_checkbox">По умолчанию</string>
+    <string name="default_checkbox">База по умолчанию</string>
-    <string name="digits">Цифры 0…9</string>
+    <string name="digits">Цифры</string>
     <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft Программа предоставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ. Распространяется свободно по лицензии GPL v3 или новее.</string>
-    <string name="select_database_file">Путь к базе KeePass</string>
+    <string name="select_database_file">Выбрать существующую базу</string>
     <string name="entry_accessed">Доступ</string>
     <string name="entry_cancel">Отмена</string>
-    <string name="entry_comment">Комментарий</string>
+    <string name="entry_comment">Комментарии</string>
     <string name="entry_confpassword">Подтверждение</string>
     <string name="entry_created">Создано</string>
     <string name="entry_expires">Истекает</string>
-    <string name="entry_keyfile">файл-ключ</string>
+    <string name="entry_keyfile">Файл ключа</string>
     <string name="entry_modified">Изменено</string>
     <string name="entry_not_found">Данные записи не найдены.</string>
     <string name="entry_password">Пароль</string>
@@ -63,114 +63,116 @@
     <string name="entry_url">Ссылка</string>
     <string name="entry_user_name">Логин</string>
     <string name="error_arc4">Потоковый шифр RC4 не поддерживается.</string>
-    <string name="error_can_not_handle_uri">Не удалось перейти по указанному адресу</string>
+    <string name="error_can_not_handle_uri">Не удалось перейти по указанному адресу.</string>
     <string name="error_could_not_create_parent">Не удалось создать родительскую папку.</string>
     <string name="error_database_exists">Такой файл уже существует.</string>
     <string name="error_failed_to_launch_link">Не удалось открыть ссылку.</string>
-    <string name="error_filename_required">Введите имя файла</string>
+    <string name="error_filename_required">Введите имя файла.</string>
     <string name="error_file_not_create">Не удалось создать файл:</string>
     <string name="error_invalid_db">Неверный формат базы или неправильный мастер-ключ.</string>
-    <string name="error_invalid_path">Путь указан неверно</string>
+    <string name="error_invalid_path">Путь указан неверно.</string>
-    <string name="error_no_name">Необходимо ввести имя файла</string>
+    <string name="error_no_name">Введите название.</string>
-    <string name="error_nokeyfile">Необходим пароль или файл-ключ</string>
+    <string name="error_nokeyfile">Необходим файл ключа.</string>
-    <string name="error_out_of_memory">Недостаточно памяти для работы с базой</string>
+    <string name="error_out_of_memory">Недостаточно памяти для работы с базой.</string>
     <string name="error_pass_gen_type">Выберите один или несколько типов символов</string>
     <string name="error_pass_match">Пароли не совпадают.</string>
-    <string name="error_rounds_not_number">Введите число от 1 до 2147483648</string>
+    <string name="error_rounds_not_number">Введите число.</string>
-    <string name="error_rounds_too_large">Предельное значение 2147483648</string>
+    <string name="error_rounds_too_large">Предельное значение 2147483648.</string>
-    <string name="error_string_key">Имя поля требуется для каждой строки</string>
+    <string name="error_string_key">Каждое поле должно иметь название.</string>
-    <string name="error_title_required">Введите название</string>
+    <string name="error_title_required">Введите название.</string>
-    <string name="error_wrong_length">Укажите длину больше нуля</string>
+    <string name="error_wrong_length">Поле \"Длина\" должно быть положительным целым числом</string>
-    <string name="field_name">Имя поля</string>
+    <string name="field_name">Название поля</string>
     <string name="field_value">Значение поля</string>
-    <string name="file_not_found">Файл не найден</string>
+    <string name="file_not_found">Файл не найден.</string>
     <string name="file_not_found_content">Файл не найден. Попробуйте повторно открыть через встроенный поставщик содержимого.</string>
     <string name="file_browser">Обзор файлов</string>
-    <string name="generate_password">Создать пароль</string>
+    <string name="generate_password">Генерация пароля</string>
-    <string name="hint_conf_pass">подтверждение</string>
+    <string name="hint_conf_pass">подтвердите пароль</string>
-    <string name="hint_generated_password">созданный пароль</string>
+    <string name="hint_generated_password">сгенерированный пароль</string>
-    <string name="hint_group_name">название</string>
+    <string name="hint_group_name">Название группы</string>
-    <string name="hint_keyfile">файл-ключ</string>
+    <string name="hint_keyfile">файл ключа</string>
     <string name="hint_length">длина</string>
     <string name="hint_pass">пароль</string>
-    <string name="password">пароль</string>
+    <string name="password">Пароль</string>
     <string name="install_from_play_store">Google Play</string>
     <string name="install_from_f_droid">F-Droid</string>
-    <string name="InvalidPassword">Неверный пароль или файл-ключ</string>
+    <string name="invalid_password">Неверный пароль или файл ключа.</string>
-    <string name="invalid_algorithm">Неверный криптоалгоритм</string>
+    <string name="invalid_algorithm">Неверный алгоритм.</string>
-    <string name="invalid_db_sig">Формат базы не определён</string>
+    <string name="invalid_db_sig">Формат базы не определён.</string>
-    <string name="keyfile_does_not_exist">Файл-ключ не найден</string>
+    <string name="keyfile_does_not_exist">Файл ключа не найден.</string>
-    <string name="keyfile_is_empty">Файл-ключ пуст</string>
+    <string name="keyfile_is_empty">Файл ключа пуст.</string>
     <string name="length">Длина пароля</string>
-    <string name="list_size_title">Шрифт списка</string>
+    <string name="list_size_title">Размер списка</string>
-    <string name="list_size_summary">Размер шрифта в списке групп и записей</string>
+    <string name="list_size_summary">Размер шрифта элементов списка</string>
-    <string name="loading_database">Загрузка…</string>
+    <string name="loading_database">Загрузка базы…</string>
-    <string name="lowercase">строчные</string>
+    <string name="lowercase">Строчные</string>
     <string name="maskpass_title">Скрыть пароли</string>
-    <string name="maskpass_summary">Скрыть пароли маской *****</string>
+    <string name="maskpass_summary">Скрывать пароли по умолчанию</string>
     <string name="menu_about">Сведения</string>
-    <string name="menu_change_key">Пароль базы</string>
+    <string name="menu_change_key">Изменить мастер-ключ</string>
     <string name="settings">Настройки</string>
-    <string name="menu_db_settings">Настройки базы KeePass</string>
+    <string name="menu_db_settings">Настройки базы</string>
     <string name="menu_delete">Удалить</string>
     <string name="menu_donate">Помочь</string>
     <string name="menu_edit">Правка</string>
     <string name="menu_hide_password">Скрыть</string>
-    <string name="menu_lock">Блокировка</string>
+    <string name="menu_lock">Заблокировать базу</string>
     <string name="menu_open">Открыть</string>
     <string name="menu_search">Поиск</string>
     <string name="menu_showpass">Показать</string>
-    <string name="menu_url">Ссылка</string>
+    <string name="menu_url">Перейти</string>
     <string name="minus">-Дефис-</string>
     <string name="never">Никогда</string>
     <string name="no_results">Совпадения не найдены</string>
-    <string name="no_url_handler">Не удалось открыть ссылку</string>
+    <string name="no_url_handler">Не удалось открыть ссылку.</string>
     <string name="open_recent">Недавно открытые:</string>
-    <string name="omitbackup_title">Искать в актуальных</string>
+    <string name="omitbackup_title">Не искать в резервных копиях</string>
     <string name="omitbackup_summary">Не искать в Резервировании (.kdb)</string>
-    <string name="progress_create">Создание базы…</string>
+    <string name="progress_create">Создание новой базы…</string>
     <string name="progress_title">Обработка…</string>
     <string name="protection">Защита</string>
     <string name="read_only">Только чтение</string>
     <string name="read_only_warning">KeePass DX не имеет разрешений на запись по указанному пути. База будет открыта только для чтения.</string>
-    <string name="read_only_kitkat_warning">Начиная с Android KitKat, на некоторых устройствах приложениям запрещена запись на SD-карту</string>
+    <string name="read_only_kitkat_warning">Начиная с Android KitKat, на некоторых устройствах приложениям запрещена запись на SD-карту.</string>
     <string name="recentfile_title">Недавно открытые</string>
     <string name="recentfile_summary">Хранить имена открытых файлов</string>
-    <string name="remember_keyfile_summary">Хранить пути к файлам-ключам</string>
+    <string name="remember_keyfile_summary">Хранить пути к файлам ключей</string>
-    <string name="remember_keyfile_title">Предлагать ключи</string>
+    <string name="remember_keyfile_title">Хранить файлы ключей</string>
     <string name="remove_from_filelist">Убрать из списка</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">База</string>
-    <string name="rounds">Проходы шифрования</string>
+    <string name="rounds">Раунды шифрования</string>
-    <string name="rounds_explanation">Больше проходов – выше стойкость базы к подбору пароля, но медленнее открытие и сохранение</string>
+    <string name="rounds_explanation">Больше раундов шифрования – выше стойкость базы к подбору пароля, но медленнее открытие и сохранение.</string>
-    <string name="rounds_hint">проходы</string>
+    <string name="rounds_hint">раунды</string>
     <string name="saving_database">Сохранение базы…</string>
     <string name="space">П р о б е л</string>
     <string name="search_label">Поиск</string>
-    <string name="sort_db">Исходный</string>
+    <string name="sort_db">Сортировка баз</string>
     <string name="special">$пеци@льные</string>
-    <string name="search">название, комментарий</string>
+    <string name="search">Поиск</string>
     <string name="search_results">Результаты поиска</string>
     <string name="encryption_twofish">Twofish</string>
     <string name="underline">_Подчёркивание_</string>
-    <string name="unsupported_db_version">Неподдерживаемая версия базы</string>
+    <string name="unsupported_db_version">Неподдерживаемая версия базы.</string>
     <string name="uppercase">ЗАГЛАВНЫЕ</string>
     <string name="use_saf_summary">Storage Access Framework для обзора файлов (KitKat+)</string>
     <string name="use_saf_title">Обзор через SAF</string>
     <string name="warning">Внимание</string>
     <string name="warning_password_encoding">Пароль содержит символы вне кодировки Latin1, поддерживаемой форматом .kdb! ВСЕ не-Latin1 символы будут преобразованы в одинаковый символ. Рекомендуется изменить пароль.</string>
-    <string name="warning_read_only">Запись на карту памяти невозможна. Изменения не будут сохранены.</string>
+    <string name="warning_read_only">Карта помять в режиме только для чтения. Изменения не будут сохранены.</string>
     <string name="warning_unmounted">Карта памяти не подключена. Работа с базой невозможна.</string>
-    <string name="version_label">Версия:</string>
+    <string name="version_label">Версия %1$s</string>
     <string name="configure_fingerprint">Отпечатки пальцев поддерживаются, но не настроены на устройстве</string>
     <string name="scanning_fingerprint">Ожидание отпечатка пальца</string>
     <string name="encrypted_value_stored">Зашифрованный пароль сохранён</string>
-    <string name="fingerprint_invalid_key">Проблема из-за неверного ключа</string>
+    <string name="fingerprint_invalid_key">Неверный ключ отпечатка пальца. Восстановите пароль.</string>
     <string name="fingerprint_error">Проблема с отпечатком пальца : %1$s</string>
     <string name="store_with_fingerprint">Используйте отпечаток пальца, чтобы сохранить пароль</string>
     <string name="no_password_stored">Для этой базы пароль ещё не сохранён</string>
 
-    <string name="education_unlock_summary">Введите пароль или путь к файлу-ключу.</string>
+    <string name="education_unlock_summary">Введите пароль и/или файл ключа, чтобы разблокировать базу.
+\n
+\nНе забудьте сохранить копию .kdbx файла в безопасном месте после каждого изменения.</string>
 
     <string-array name="timeout_options">
        <item>5 секунд</item>
@@ -191,20 +193,194 @@
     <string name="encryption">Шифрование</string>
     <string name="key_derivation_function">Функция формирования ключа</string>
     <string name="extended_ASCII">Расширенный набор ASCII</string>
-    <string name="error_autofill_enable_service">"Сервис автозаполнения  не может быть разрешен"</string>
+    <string name="error_autofill_enable_service">"Сервис автозаполнения  не может быть включен."</string>
     <string name="copy_field">Копия %1$s</string>
     <string name="menu_form_filling_settings">Заполнение формы</string>
-    <string name="encryption_explanation">Алгоритм для шифрования всей базы данных. (Пароли, имена пользователей, заметки и все другие данные в базе данных будут зашифрованы указанным алгоритмом)</string>
+    <string name="encryption_explanation">Алгоритм для шифрования всей базы данных. (Пароли, логины, заметки и все другие данные в базе данных будут зашифрованы указанным алгоритмом)</string>
-    <string name="kdf_explanation">Для генерации ключа для алгоритма шифрования, сжатый мастер-ключ (SHA-256) преобразуется при помощи функции формирования ключа (со случайной солью).</string>
+    <string name="kdf_explanation">При генерации ключа для алгоритма шифрования, сжатый мастер-ключ (SHA-256) преобразуется при помощи функции формирования ключа со случайной солью.</string>
     <string name="memory_usage">Использование памяти</string>
     <string name="memory_usage_explanation">Количество памяти (в байтах), которое будет использоваться функцией формирования ключа.</string>
-    <string name="parallelism">Степень параллелизма</string>
+    <string name="parallelism">Уровень параллелизма</string>
-    <string name="parallelism_explanation">Степень параллелизма (т.е. количество нитей), используемая функцией формирования ключа.</string>
+    <string name="parallelism_explanation">Уровень параллелизма (т.е. количество потоков), используемый функцией формирования ключа.</string>
     <string name="sort_menu">Сортировка</string>
-    <string name="sort_ascending">По возрастанию</string>
+    <string name="sort_ascending">По возрастанию ↓</string>
-    <string name="sort_username">Сортировать по имени пользователя</string>
+    <string name="sort_username">Логину</string>
-    <string name="sort_creation_time">Сортировать по дате создания</string>
+    <string name="sort_creation_time">Дате создания</string>
-    <string name="sort_last_modify_time">Сортировать по дате последнего изменения</string>
+    <string name="sort_last_modify_time">Дате изменения</string>
-    <string name="sort_last_access_time">Сортировать по дате последнего использования</string>
+    <string name="sort_last_access_time">Дате использования</string>
+
+<string name="edit_entry">Редактировать запись</string>
+    <string name="allow">Разрешить</string>
+    <string name="clipboard_swipe_clean">Смахните, чтобы очистить буфер обмена сейчас</string>
+    <string name="error_load_database">Невозможно загрузить базу</string>
+    <string name="error_load_database_KDF_memory">Невозможно загрузить ключ. Попробуйте уменьшить размер памяти, используемой функцией формирования ключа (KDF).</string>
+    <string name="error_move_folder_in_itself">Невозможно переместить группу в саму себя.</string>
+    <string name="list_entries_show_username_title">Показывать логин</string>
+    <string name="list_entries_show_username_summary">Показывать логин в списке записей</string>
+    <string name="menu_copy">Копировать</string>
+    <string name="menu_move">Переместить</string>
+    <string name="menu_paste">Вставить</string>
+    <string name="menu_cancel">Отмена</string>
+    <string name="menu_fingerprint_remove_key">Удалить отпечаток</string>
+    <string name="menu_file_selection_read_only">Только чтение</string>
+    <string name="menu_open_file_read_and_write">Чтение и запись</string>
+    <string name="sort_groups_before">Сначала группы</string>
+    <string name="sort_recycle_bin_bottom">Корзина внизу</string>
+    <string name="sort_title">Название</string>
+    <string name="warning_empty_password">Вы действительно хотите использовать пустой пароль?</string>
+    <string name="warning_no_encryption_key">Вы действительно не хотите использовать ключ шифрования?</string>
+    <string name="fingerprint_not_recognized">Отпечаток пальца не распознан</string>
+    <string name="history">История</string>
+    <string name="appearance">Внешний вид</string>
+    <string name="general">Общие</string>
+    <string name="autofill">Автозаполнение</string>
+    <string name="autofill_service_name">Сервис автозаполнения KeePass DX</string>
+    <string name="autofill_sign_in_prompt">Войти с помощью KeePass DX</string>
+    <string name="set_autofill_service_title">Установить Сервис автозаполнения по умолчанию</string>
+    <string name="set_autofill_service_summary">Включить сервис для быстрого заполнения форм в других приложениях</string>
+    <string name="password_size_title">Длина пароля</string>
+    <string name="password_size_summary">Установить длину сгенерированных паролей по умолчанию</string>
+    <string name="list_password_generator_options_title">Символы пароля</string>
+    <string name="list_password_generator_options_summary">Установить символы для генерации пароля по умолчанию</string>
+    <string name="clipboard">Буфер обмена</string>
+    <string name="clipboard_notifications_title">Уведомления буфера обмена</string>
+    <string name="clipboard_notifications_summary">Включить уведомления буфера обмен ля копирования полей записи</string>
+    <string name="clipboard_warning">Если автоматическая очистка буфера обмена недоступна на вашем устройстве, очистите историю буфера обмена вручную.</string>
+    <string name="lock">Блокировка</string>
+    <string name="lock_database_screen_off_title">Блокировка экрана</string>
+    <string name="lock_database_screen_off_summary">Блокировать базу при отключении экрана</string>
+    <string name="fingerprint_quick_unlock_title">Как настроить отпечаток пальца для быстрой разблокировки?</string>
+    <string name="fingerprint_setting_text">Установите ваш личный отпечаток пальца для вашего устройства</string>
+    <string name="fingerprint_setting_way_text">\"Настройки\" → \"Безопасность\" → \"Отпечаток пальца\"</string>
+    <string name="fingerprint_type_password_text">Введите ваш пароль в Keepass DX</string>
+    <string name="fingerprint_scan_to_store">Сканируйте ваш отпечаток пальца для безопасного хранения вашего мастер-пароля</string>
+    <string name="fingerprint_scan_to_open">Сканируйте ваш отпечаток пальца, когда поле \"Пароль\" не отмечено, для разблокировки базы</string>
+    <string name="usage">Использование</string>
+    <string name="fingerprint">Отпечаток пальца</string>
+    <string name="fingerprint_enable_title">Сканирование отпечатка пальца</string>
+    <string name="fingerprint_enable_summary">Включить разблокировку базы с помощью отпечатка пальца</string>
+    <string name="fingerprint_delete_all_title">Удалить ключи шифрования</string>
+    <string name="fingerprint_delete_all_summary">Удалить все ключи шифрования, связанные с распознаванием отпечатка пальца</string>
+    <string name="fingerprint_delete_all_warning">Вы уверены, что хотите удалить все ключи, связанные с отпечатком пальца?</string>
+    <string name="unavailable_feature_text">Невозможно запустить эту функцию.</string>
+    <string name="unavailable_feature_version">Ваша версия Android %1$s ниже минимально необходимой %2$s.</string>
+    <string name="unavailable_feature_hardware">Оборудование не найдено.</string>
+    <string name="file_name">Название файла</string>
+    <string name="path">Путь</string>
+    <string name="assign_master_key">Установить мастер-ключ</string>
+    <string name="create_keepass_file">Создать файл KeePass</string>
+    <string name="bytes">Байт</string>
+    <string name="full_file_path_enable_title">Путь к файлу</string>
+    <string name="full_file_path_enable_summary">Показывать полный путь к файлу</string>
+    <string name="recycle_bin_title">Использовать Корзину</string>
+    <string name="recycle_bin_summary">Перемещать группу или запись в Корзину перед удалением</string>
+    <string name="permission_external_storage_rationale_write_database">Для записи базы KeePass DX необходимо разрешение доступа к внешней памяти</string>
+    <string name="permission_external_storage_rationale_read_database">KeePass DX необходимо разрешение доступа к внешней памяти для чтения URI не поставщика содержимого</string>
+    <string name="permission_external_storage_denied">Доступ к внешней памяти отказан</string>
+    <string name="permission_external_storage_never_ask">Невозможно выполнить действие без разрешения доступа к внешней памяти</string>
+    <string name="monospace_font_fields_enable_title">Шрифт полей</string>
+    <string name="monospace_font_fields_enable_summary">Изменить шрифт, используемый в полях, для лучшей видимости</string>
+    <string name="auto_open_file_uri_title">Автоматически открывать выбранный файл</string>
+    <string name="auto_open_file_uri_summary">Открывать файл автоматически после выбора в файловом менеджере</string>
+    <string name="allow_copy_password_title">Копирование пароля</string>
+    <string name="allow_copy_password_summary">Разрешить копирование пароля и защищенных полей в буфер обмена</string>
+    <string name="allow_copy_password_warning">ПРЕДУПРЕЖДЕНИЕ: Буфер обмена доступен всем приложениям. Если чувствительные данные копируются, другие программы могут его перехватить.</string>
+    <string name="warning_disabling_storage_access_framework">ПРЕДУПРЕЖДЕНИЕ: Отключение этой функции может привести к невозможности открывать и сохранять базы</string>
+    <string name="open_link_database">Ссылка на файл KDBX</string>
+    <string name="database_name_title">Название базы</string>
+    <string name="database_description_title">Описание базы</string>
+    <string name="database_version_title">Версия базы</string>
+    <string name="text_appearance">Отображение текста</string>
+    <string name="application_appearance">Отображение приложения</string>
+    <string name="other">Прочее</string>
+
+    <string name="keyboard">Клавиатура</string>
+    <string name="magic_keyboard_title">Magikeyboard</string>
+    <string name="magic_keyboard_summary">Активировать пользовательскую клавиатуру для простого заполнения паролей и всех ваших идентификаторов</string>
+    <string name="magic_keyboard_preference_title">Настройки Magikeyboard</string>
+    <string name="magic_keyboard_configure_title">Как настроить клавиатуру для безопасного заполнения форм?</string>
+    <string name="magic_keyboard_activate_setting_text">Активировать Magikeyboard в настройках устройства.</string>
+    <string name="magic_keyboard_activate_setting_path_1_text">\"Настройки\" → \"Язык и ввод\" → \"Текущая клавиатура\" и выбрать.</string>
+    <string name="magic_keyboard_activate_setting_path_2_text">или (\"Настройки\" → \"Язык и ввод\" → \"Виртуальная клавиатура\" и выбрать.)</string>
+    <string name="keyboards_choose_magikeyboard_text">Выбрать Magikeyboard, когда вам необходимо заполнить форму.</string>
+    <string name="keyboards_swicth_magikeyboard_text">Вы можете легко переключаться с основной клавиатуры на Magikeyboard с помощью кнопки языка клавиатуры, длительного нажатия на пробел клавиатуры или, если она недоступна, с помощью:</string>
+    <string name="keyboard_select_entry_text">Выберите запись с помощью кнопки.</string>
+    <string name="keyboard_fill_field_text">Заполните поля, используя элементы записи.</string>
+    <string name="keyboard_lock_database_text">Заблокируйте базу.</string>
+    <string name="keyboard_back_main_keyboard_text">Вернутесь к основной клавиатуре.</string>
+
+    <string name="allow_no_password_title">Разрешить без пароля</string>
+    <string name="allow_no_password_summary">Включить кнопку открыть, если не выбрана идентификация паролем</string>
+    <string name="enable_read_only_title">Только чтение</string>
+    <string name="enable_read_only_summary">По умолчанию открывать базу только для чтения</string>
+
+    <string name="enable_education_screens_title">Экраны обучения</string>
+    <string name="enable_education_screens_summary">Выделять элементы, чтобы узнать, как работает приложение</string>
+    <string name="reset_education_screens_title">Сбросить экраны обучения</string>
+    <string name="reset_education_screens_summary">Сбрасывает отображение обучающих элементов</string>
+    <string name="reset_education_screens_text">Экраны обучения сброшены</string>
+    <string name="education_create_database_title">Создайте файл базы</string>
+    <string name="education_create_database_summary">Вы ещё не знаете KeePass DX, создайте свой первый файл управления паролями.</string>
+    <string name="education_select_database_title">Откройте существующую базу</string>
+    <string name="education_select_database_summary">Вы уже использовали KeePass менеджер. Просто откройте ваш файл KDBX из вашего файлового менеджера.</string>
+    <string name="education_open_link_database_title">Ссылки на местоположение файла достаточно</string>
+    <string name="education_open_link_database_summary">Вы также можете открыть базу с помощью физической ссылки (например, с file:// или content://).</string>
+    <string name="education_new_node_title">Добавляйте новые элементы в базу</string>
+    <string name="education_new_node_summary">Добавляйте записи для управления цифровыми идентификаторами.
+\n
+\nДобавляйте группы (аналог папок) для организации записей и баз.</string>
+    <string name="education_search_title">Легко находите ваши записи</string>
+    <string name="education_search_summary">Ищите записи по названию, логину или другим полям для быстрого доступа к вашим паролям.</string>
+    <string name="education_fingerprint_title">Разблокируйте базу с помощью отпечатка пальца</string>
+    <string name="education_fingerprint_summary">Установите связь между паролем и отпечатком пальца для быстрой разблокировки базы.</string>
+    <string name="education_entry_edit_title">Редактируйте записи</string>
+    <string name="education_entry_edit_summary">Редактируйте записи с настраиваемыми полями. Ссылки на пул данных могут быть добавлены между полями разных записей.</string>
+    <string name="education_generate_password_title">Создайте надежный пароль</string>
+    <string name="education_generate_password_summary">Создайте надежный пароль, чтобы связать с записью, легко определить его по критериям формы и не забывайте, что пароль можно запомнить.</string>
+    <string name="education_entry_new_field_title">Добавляйте настраиваемые поля</string>
+    <string name="education_entry_new_field_summary">Если хотите зарегистрировать поле, которого ещё нет, просто введите в новое, которое также можно защитить визуально.</string>
+    <string name="education_unlock_title">Разблокируйте базу</string>
+    <string name="education_read_only_title">Включите только для чтения</string>
+    <string name="education_read_only_summary">Изменяйте режим открытия для сессии.
+\n
+\nВ режиме только для чтения, можно предотвратить непреднамеренные изменения в базе.
+\n
+\nВ режиме записи, вы можете добавлять, удалять или изменять все элементы, как вы хотите.</string>
+    <string name="education_field_copy_title">Копируйте поля</string>
+    <string name="education_field_copy_summary">Легко скопируйте поле, чтобы вставить его там, где вы хотите
+\n
+\nВы можете использовать несколько методов заполнения форм. Используйте тот, который вы предпочитаете.</string>
+    <string name="education_lock_title">Заблокируйте базу</string>
+    <string name="education_lock_summary">Быстро заблокируйте вашу базу. Вы можете настроить приложение так, чтобы заблокировать её через некоторое время и при выключении экрана.</string>
+    <string name="education_sort_title">Сортируйте элементы</string>
+    <string name="education_sort_summary">Сортируйте записи и группы по определенным параметрам.</string>
+    <string name="education_donation_title">Участвуйте</string>
+    <string name="education_donation_summary">Примите участие в проекте для повышения стабильности, безопасности и добавления новых возможностей.</string>
+
+    <string name="html_text_ad_free">В отличие от многих приложений управления паролями, это <strong>без рекламы</strong>, <strong>свободное программное обеспечение (copyleft)</strong> и не хранит ваши личные данные на своих серверах, даже в бесплатной версии.</string>
+    <string name="html_text_buy_pro">При покупке Pro версии, вы будете иметь доступ к этим <strong>визуальным функциям</strong> и особенно поможете <strong>реализации общественных проектов.</strong></string>
+    <string name="html_text_feature_generosity">Эти <strong>визуальные функции</strong> доступны благодаря вашей щедрости.</string>
+    <string name="html_text_donation">Для того, чтобы сохранить нашу свободу и быть всегда активными, мы рассчитываем на ваш <strong>вклад.</strong></string>
+
+    <string name="html_text_dev_feature">Эта функция на <strong>в разработке</strong> и требует вашего <strong>участия</strong>, чтобы быть доступной в ближайшее время.</string>
+    <string name="html_text_dev_feature_buy_pro">Покупая <strong>Pro</strong> версию,</string>
+    <string name="html_text_dev_feature_contibute"><strong>Участвуя в проекте</strong>,</string>
+    <string name="html_text_dev_feature_encourage">вы поощряете разработчиков создавать <strong>новые возможности</strong> и <strong>исправлять ошибки</strong> в соответствии с вашими замечаниями.</string>
+    <string name="html_text_dev_feature_thanks">Спасибо большое за ваш вклад.</string>
+    <string name="html_text_dev_feature_work_hard">Мы прилагаем все усилия, чтобы быстро выпустить эту функцию.</string>
+    <string name="html_text_dev_feature_upgrade">Не забывайте обновлять приложение.</string>
+
+    <string name="download">Скачать</string>
+    <string name="contribute">Помощь проекту</string>
+
+    <string name="encryption_chacha20">ChaCha20</string>
+
+    <string name="kdf_AES">Функция формирования ключа AES</string>
+    <string name="kdf_Argon2">Argon2</string>
+
+    <string name="style_choose_title">Выбрать тему</string>
+    <string name="style_choose_summary">Изменить тему приложения, изменив цвета</string>
+    <string name="icon_pack_choose_title">"Выбрать набор значков "</string>
+    <string name="icon_pack_choose_summary">Изменить набор значков приложения</string>
 
 </resources>

app/src/main/res/values-sk/strings.xml

@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">Timeout Schránky</string>
     <string name="clipboard_timeout_summary">Čas pred vyčistením schránky po skopírovaní mena alebo hesla</string>
     <string name="select_to_copy">%1$s skopírované do schránky</string>
-    <string name="creating_db_key">Vytváram databázový kľúč&#8230;</string>
+    <string name="retrieving_db_key">Vytváram databázový kľúč&#8230;</string>
     <string name="database">Databáza</string>
     <string name="decrypting_db">Dešifrujem obsah databázy&#8230;</string>
     <string name="default_checkbox">Použiť toto ako predvolenú databázu</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">heslo</string>
     <string name="install_from_play_store">Inštalovať z Play Store</string>
     <string name="install_from_f_droid">Inštalovať z F-Droid</string>
-    <string name="InvalidPassword">Chybné heslo, alebo súbor keyfile.</string>
+    <string name="invalid_password">Chybné heslo, alebo súbor keyfile.</string>
     <string name="invalid_db_sig">Formát Databázy nerozpoznaný.</string>
     <string name="length">Dĺžka</string>
     <string name="list_size_title">Dĺžka zoznamu skupiny</string>
@@ -135,9 +135,8 @@
     <string name="underline">Podčiarknuté</string>
     <string name="unsupported_db_version">Nepodporovaná verzia databázy.</string>
     <string name="uppercase">Veľké písmená</string>
-    <string name="warning_read_only">Vaša SD karta je momentálne iba na čítanie. Nemôžete uložiť zmeny v databáze.</string>
     <string name="warning_unmounted">Vaša SD karta nie je momentálne pripojená k zariadeniu. Nemôžete načítať, alebo vytvoriť databázu.</string>
-    <string name="version_label">Version:</string>
+    <string name="version_label">Version %1$s</string>
 
     <string name="education_unlock_summary">Vložte heslo a / alebo keyfile pre odomknutie databázy.</string>
 

app/src/main/res/values-sv/strings.xml

@@ -42,7 +42,7 @@
     <string name="clipboard_timeout">Tidsgräns för urklipp</string>
     <string name="clipboard_timeout_summary">Tiden innan användarnamn och lösenord rensas från urklipp</string>
     <string name="select_to_copy">Kopiera %1$s till urklipp</string>
-    <string name="creating_db_key">Skapar databasnyckel&#8230;</string>
+    <string name="retrieving_db_key">Skapar databasnyckel&#8230;</string>
     <string name="database">Databas</string>
     <string name="decrypting_db">Dekrypterar databasinnehåll&#8230;</string>
     <string name="default_checkbox">Använda denna databasen som standard</string>
@@ -95,7 +95,7 @@
     <string name="password">Lösenord</string>
     <string name="install_from_play_store">Installera från Play Store</string>
     <string name="install_from_f_droid">Installera från F-Droid</string>
-    <string name="InvalidPassword">Ogiltigt lösenord eller nyckelfil.</string>
+    <string name="invalid_password">Ogiltigt lösenord eller nyckelfil.</string>
     <string name="invalid_algorithm">Ogiltig algoritm.</string>
     <string name="invalid_db_sig">Databasformatet är okänt.</string>
     <string name="keyfile_does_not_exist">Nyckelfilen existerar inte.</string>
@@ -149,9 +149,8 @@
     <string name="underline">Understreck</string>
     <string name="unsupported_db_version">Databasversionen stöds ej.</string>
     <string name="uppercase">Versaler</string>
-    <string name="warning_read_only">SD-kortet är för närvarande skrivskyddat. Du kanske inte kan spara ändringar i databasen.</string>
     <string name="warning_unmounted">SD-kortet är för närvarande inte monterat på enheten. Du kan inte skapa/ladda databasen.</string>
-    <string name="version_label">Version:</string>
+    <string name="version_label">Version %1$s</string>
 
     <string name="education_unlock_summary">Ange lösenord och/eller nyckelfil för att öppna databasen.</string>
 

app/src/main/res/values-te/strings.xml

@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="about_feedback">అభిప్రాయం:</string>
+    <string name="about_homepage">హోమ్ పేజీ:</string>
+    <string name="about_description">KeePass DX అనేది KeePass పాస్వర్డ్ మేనేజర్ యొక్క యాండ్రాయిడ్ అమలు.</string>
+    <string name="accept">ఆమోదించు</string>
+    <string name="add_entry">"ఎంట్రీని జత చెయ్యండి "</string>
+    <string name="edit_entry">ఎంట్రీని మార్పు చెయ్యండి</string>
+    <string name="add_group">"గ్రూపుని జత చెయ్యండి "</string>
+    <string name="add_string">"స్ట్రింగ్ ని జత చెయ్యండి "</string>
+    <string name="encryption">ఎన్క్రిప్షన్</string>
+    <string name="encryption_algorithm">ఎన్క్రిప్షన్ అల్గోరిథం</string>
+    <string name="key_derivation_function">కీ వ్యుత్పత్తి ఫంక్షన్</string>
+    <string name="app_timeout">యాప్ కి అనువర్తించిన గడువు ముగిసింది</string>
+    </resources>

app/src/main/res/values-uk/strings.xml

@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">Тайм-аут буфера обміну</string>
     <string name="clipboard_timeout_summary">Час через який буде очищено буфер обміну після копіювання ім’я користувача чи пароля</string>
     <string name="select_to_copy">Копіювати %1$s до буфера обміну</string>
-    <string name="creating_db_key">Створення ключа бази даних&#8230;</string>
+    <string name="retrieving_db_key">Створення ключа бази даних&#8230;</string>
     <string name="database">База даних</string>
     <string name="decrypting_db">Розшифрування змісту бази даних&#8230;</string>
     <string name="default_checkbox">Використовувати як мою типову базу даних</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">пароль</string>
     <string name="install_from_play_store">Інсталювати із Google Play</string>
     <string name="install_from_f_droid">Інсталювати із F-Droid</string>
-    <string name="InvalidPassword">Невірний пароль або файл ключа.</string>
+    <string name="invalid_password">Невірний пароль або файл ключа.</string>
     <string name="invalid_db_sig">Формат бази даних не розпізнано.</string>
     <string name="length">Довжина</string>
     <string name="list_size_title">Розмір списку груп</string>
@@ -135,9 +135,8 @@
     <string name="underline">Підкреслення</string>
     <string name="unsupported_db_version">Непідтримувана версія бази даних.</string>
     <string name="uppercase">Верхній регістр</string>
-    <string name="warning_read_only">Ваша карта пам’яті зараз у режимі тільки для читання. Ви не зможете зберегти зміни до вашої бази даних.</string>
     <string name="warning_unmounted">Ваша карта пам’яті зараз не змонтована на телефоні. Ви не зможете завантажити або створити базу даних.</string>
-    <string name="version_label">Версія:</string>
+    <string name="version_label">Версія %1$s</string>
 
     <string name="education_unlock_summary">Введіть пароль і/або файл ключа для відкриття бази даних.</string>
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -20,29 +20,29 @@
 <resources>
     <string name="about_feedback">反馈：</string>
     <string name="about_homepage">主页：</string>
-    <string name="about_description">KeePass DX是KeePass密码管理软件的Android版本。</string>
+    <string name="about_description">KeePass DX 是 KeePass 密码管理器在Android 平台上的一个实现。</string>
     <string name="accept">接受</string>
     <string name="add_entry">添加条目</string>
-    <string name="add_group">添加群组</string>
+    <string name="add_group">添加文件夹</string>
     <string name="encryption_algorithm">算法</string>
-    <string name="app_timeout">应用程序超时</string>
+    <string name="app_timeout">离开应用锁定延时</string>
-    <string name="app_timeout_summary">应用程序处于非活动时锁定数据库。</string>
+    <string name="app_timeout_summary">本应用处于非前台状态之后经过多久自动锁定数据库</string>
-    <string name="application">应用程序</string>
+    <string name="application">应用</string>
-    <string name="menu_app_settings">应用程序设置</string>
+    <string name="menu_app_settings">应用设置</string>
     <string name="brackets">括号</string>
-    <string name="browser_intall_text">	浏览文件需要安装Open Intents File Manager软件，点下面安装。由于一些文件管理软件的差异，在你第一次浏览时可能无法正常工作。</string>
+    <string name="browser_intall_text">浏览文件需要安装 Open-Intents File Manager 软件，点击下面即可安装。由于一些文件管理软件之间的差异，在第一次打开时可能无法正常浏览。</string>
     <string name="cancel">取消</string>
-    <string name="clipboard_cleared">剪贴板已清空</string>
+    <string name="clipboard_cleared">已清空剪贴板</string>
-    <string name="clipboard_timeout">剪贴板超时</string>
+    <string name="clipboard_timeout">剪贴板清空延时</string>
     <string name="clipboard_timeout_summary">复制用户名或密码到剪贴板后清除的时间</string>
-    <string name="select_to_copy">复制%1$s到剪贴板</string>
+    <string name="select_to_copy">复制 %1$s 到剪贴板</string>
-    <string name="creating_db_key">创建数据库密钥…</string>
+    <string name="retrieving_db_key">创建数据库密钥…</string>
     <string name="database">数据库</string>
-    <string name="decrypting_db">解密数据库内容中…</string>
+    <string name="decrypting_db">正在解密数据库内容…</string>
-    <string name="default_checkbox">使用这做为我的默认数据库</string>
+    <string name="default_checkbox">设为默认数据库</string>
     <string name="digits">数字</string>
-    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft；软件不带有绝对担保；是自由软件，您可在遵循GPL 3或者更高版本的情况下重新发布。中文简繁体翻译：wangkf@gmail.com</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft 软件不带有绝对担保；本应用是自由软件，您可在遵循 GPL 3 或者此开源协议的更高版本的情况下重新发布。</string>
-    <string name="select_database_file">输入数据库名</string>
+    <string name="select_database_file">选择一个已有数据库</string>
     <string name="entry_accessed">访问时间</string>
     <string name="entry_cancel">取消</string>
     <string name="entry_comment">备注</string>
@@ -54,44 +54,44 @@
     <string name="entry_password">密码</string>
     <string name="entry_save">保存</string>
     <string name="entry_title">名称</string>
-    <string name="entry_url">网址</string>
+    <string name="entry_url">链接</string>
     <string name="entry_user_name">用户名</string>
-    <string name="error_arc4">ArcFour流密码不被支持。</string>
+    <string name="error_arc4">不支持 ARCFOUR 流式密码。</string>
-    <string name="error_can_not_handle_uri">KeePass DX无法处理此URI。</string>
+    <string name="error_can_not_handle_uri">KeePass DX 无法处理此 URI。</string>
     <string name="error_could_not_create_parent">无法创建上级目录。</string>
     <string name="error_database_exists">文件已存在。</string>
-    <string name="error_failed_to_launch_link">运行链接失败。</string>
+    <string name="error_failed_to_launch_link">无法打开链接。</string>
-    <string name="error_filename_required">请求一个文件名：</string>
+    <string name="error_filename_required">必须输入文件名。</string>
-    <string name="error_file_not_create">不能创建文件：</string>
+    <string name="error_file_not_create">无法创建文件：</string>
-    <string name="error_invalid_db">非法数据库。</string>
+    <string name="error_invalid_db">数据库无效或主密钥无法识别。</string>
-    <string name="error_invalid_path">非法路径。</string>
+    <string name="error_invalid_path">路径无效。</string>
-    <string name="error_no_name">用户名是必须的。</string>
+    <string name="error_no_name">必须输入用户名。</string>
-    <string name="error_nokeyfile">密码或者密钥文件是必须的。</string>
+    <string name="error_nokeyfile">必须输入密码或添加密钥文件。</string>
-    <string name="error_out_of_memory">这款手机运行内存不足而不能解析数据库。这可能是数据库太大的缘故。</string>
+    <string name="error_out_of_memory">此设备因运行内存不足而无法解析数据库。</string>
-    <string name="error_pass_gen_type">至少必须选择一个密码生成类型</string>
+    <string name="error_pass_gen_type">必须选择一个或更多密码生成类型</string>
     <string name="error_pass_match">密码不匹配。</string>
-    <string name="error_rounds_not_number">次数必须是数字。</string>
+    <string name="error_rounds_not_number">“次数”必须是数字。</string>
-    <string name="error_rounds_too_large">次数太大。最大设置到2147483648。</string>
+    <string name="error_rounds_too_large">“次数”过多。最大值为 2147483648。</string>
-    <string name="error_title_required">标题是必填项。</string>
+    <string name="error_title_required">必须输入标题。</string>
-    <string name="error_wrong_length">长度字段输入一个正整数</string>
+    <string name="error_wrong_length">请在“长度”字段输入一个正整数</string>
-    <string name="file_not_found">文件未找到。</string>
+    <string name="file_not_found">找不到文件。</string>
-    <string name="file_browser">文件浏览</string>
+    <string name="file_browser">文件浏览器</string>
     <string name="generate_password">生成密码</string>
     <string name="hint_conf_pass">确认密码</string>
     <string name="hint_generated_password">生成密码</string>
-    <string name="hint_group_name">群组名</string>
+    <string name="hint_group_name">文件夹名</string>
     <string name="hint_keyfile">密钥文件</string>
     <string name="hint_length">长度</string>
     <string name="password">密码</string>
     <string name="hint_pass">密码</string>
-    <string name="install_from_play_store">从电子市场安装</string>
+    <string name="install_from_play_store">从 Play 商店安装</string>
-    <string name="install_from_f_droid">从网络安装</string>
+    <string name="install_from_f_droid">从 F-Droid 安装</string>
-    <string name="InvalidPassword">非法的密码或密钥文件。</string>
+    <string name="invalid_password">密码或密钥文件无效。</string>
-    <string name="invalid_db_sig">数据库格式无法识别。</string>
+    <string name="invalid_db_sig">无法识别数据库格式。</string>
     <string name="length">长度</string>
-    <string name="list_size_title">群列表尺寸</string>
+    <string name="list_size_title">列表项目尺寸</string>
-    <string name="list_size_summary">群列表中的文本尺寸</string>
+    <string name="list_size_summary">列表文字大小</string>
-    <string name="loading_database">加载数据库中…</string>
+    <string name="loading_database">正在加载数据库…</string>
     <string name="lowercase">小写</string>
     <string name="maskpass_title">密码掩膜</string>
     <string name="maskpass_summary">默认隐藏密码</string>
@@ -106,36 +106,38 @@
     <string name="menu_lock">锁定数据库</string>
     <string name="menu_open">打开</string>
     <string name="menu_search">搜索</string>
-    <string name="menu_url">到网址</string>
+    <string name="menu_url">打开链接</string>
-    <string name="minus">减</string>
+    <string name="minus">连字符</string>
     <string name="never">从不</string>
     <string name="no_results">没有搜索结果</string>
-    <string name="no_url_handler">没有这个链接的处理程序。</string>
+    <string name="no_url_handler">没有能处理此链接的程序。</string>
-    <string name="open_recent">打开最近数据库：</string>
+    <string name="open_recent">最近数据库：</string>
-    <string name="progress_create">创建新数据库中…</string>
+    <string name="progress_create">正在创建新数据库…</string>
-    <string name="progress_title">工作中…</string>
+    <string name="progress_title">正在处理…</string>
     <string name="remember_keyfile_summary">记住密钥文件的位置</string>
     <string name="remember_keyfile_title">保存密钥文件</string>
     <string name="remove_from_filelist">移除</string>
-    <string name="encryption_rijndael">Rijndael加密(AES)</string>
+    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">加密次数</string>
-    <string name="rounds_explanation">更高级的加密次数对暴力攻击能提供额外保护，但也会增加加载和保存的时间。</string>
+    <string name="rounds_explanation">更多的加密次数能对暴力破解攻击能提供额外保护，但也会增加加载和保存的时间。</string>
     <string name="rounds_hint">次数</string>
     <string name="saving_database">正在保存数据库…</string>
     <string name="space">空格</string>
     <string name="search_label">搜索</string>
-    <string name="sort_db">数据库的排序顺序</string>
+    <string name="sort_db">数据库排序方式</string>
-    <string name="special">特别</string>
+    <string name="special">特殊符号</string>
-    <string name="search">条目名称/说明</string>
+    <string name="search">搜索</string>
-    <string name="encryption_twofish">Twofish算法</string>
+    <string name="encryption_twofish">Twofish</string>
-    <string name="underline">强调</string>
+    <string name="underline">下划线</string>
     <string name="unsupported_db_version">不支持的数据库版本。</string>
     <string name="uppercase">大写</string>
-    <string name="warning_read_only">你的SD卡目前是只读状态。您可能无法将更改保存到数据库。</string>
+    <string name="warning_read_only">SD卡目前为只读状态。您可能无法将更改保存到数据库。</string>
-    <string name="warning_unmounted">你的SD卡目前尚未安装在您的设备上。你将无法加载或创建您的数据库。</string>
+    <string name="warning_unmounted">您的 SD 卡目前尚未挂载至您的设备上。无法加载或创建您的数据库。</string>
 
-    <string name="education_unlock_summary">输入密码和/或一个密钥文件来解锁你的数据库 </string>
+    <string name="education_unlock_summary">输入密码和/或一个密钥文件来解锁你的数据库。
+\n
+\n记得在每次更改后将您的 .kdbx 文件备份至安全的地方。</string>
 
     <string-array name="timeout_options">
     	<item>5秒</item>
@@ -156,19 +158,99 @@
 <string name="add_string">添加字符串</string>
     <string name="encryption">加密</string>
     <string name="beta_dontask">不再显示</string>
-    <string name="extended_ASCII">拓展版ASCⅡ码</string>
+    <string name="extended_ASCII">ASCⅡ 拓展区字符</string>
     <string name="allow">允许</string>
     <string name="clipboard_error_title">剪切板错误</string>
-    <string name="clipboard_error">某些三星Android手机由于剪切板有bug导致无法从应用复制。更多信息参见：</string>
+    <string name="clipboard_error">一些三星设备的剪切板实现方式有 bug，会导致无法从应用中复制。更多细节：</string>
-    <string name="clipboard_error_clear">清空剪切板失败</string>
+    <string name="clipboard_error_clear">剪切板清空失败</string>
     <string name="clipboard_swipe_clean">滑动以清空剪切板</string>
     <string name="encryption_chacha20">ChaCha20</string>
 
-    <string name="kdf_AES">AES-KDF</string>
+    <string name="kdf_AES">AES KDF</string>
     <string name="kdf_Argon2">Argon2</string>
 
     <string name="style_choose_title">选择主题</string>
     <string name="icon_pack_choose_title">选择图标包</string>
-    <string name="icon_pack_choose_summary">切换应用图标包</string>
+    <string name="icon_pack_choose_summary">切换本应用中使用的图标风格</string>
 
-</resources>
+<string name="edit_entry">编辑条目</string>
+    <string name="key_derivation_function">密钥推导函数/功能 (Key Derivation Function)</string>
+    <string name="entry_not_found">找不到条目。</string>
+    <string name="error_load_database">无法加载数据库</string>
+    <string name="error_load_database_KDF_memory">无法加载密钥，尝试降低 KDF 使用的内存。</string>
+    <string name="error_autofill_enable_service">无法启用自动填充服务。</string>
+    <string name="error_move_folder_in_itself">无法将文件夹移至它自身之下。</string>
+    <string name="file_not_found_content">找不到文件。尝试使用内容提供器重新打开它。</string>
+    <string name="invalid_algorithm">算法无效。</string>
+    <string name="keyfile_does_not_exist">没有密钥文件。</string>
+    <string name="keyfile_is_empty">密钥文件为空文件。</string>
+    <string name="list_entries_show_username_title">显示用户名</string>
+    <string name="list_entries_show_username_summary">在条目列表上显示用户名</string>
+    <string name="menu_form_filling_settings">自动填充</string>
+    <string name="menu_copy">复制</string>
+    <string name="menu_move">剪切</string>
+    <string name="menu_paste">粘贴</string>
+    <string name="menu_cancel">取消</string>
+    <string name="menu_showpass">显示密码</string>
+    <string name="menu_fingerprint_remove_key">移除指纹密钥</string>
+    <string name="menu_file_selection_read_only">只读</string>
+    <string name="menu_open_file_read_and_write">读写</string>
+    <string name="omitbackup_title">搜索时忽略备份条目</string>
+    <string name="omitbackup_summary">从搜索结果中隐藏 “备份” 文件夹的搜索结果（仅适用于 .kdb 文件）</string>
+    <string name="protection">保护</string>
+    <string name="read_only">只读</string>
+    <string name="read_only_warning">KeePass DX 没有写入数据库所在位置的权限，所以此数据库将以只读的形式打开。</string>
+    <string name="read_only_kitkat_warning">从 Android 4.4.4 KitKat 开始，一些设备不再允许应用直接写入 SD 卡。</string>
+    <string name="recentfile_title">最近文件历史</string>
+    <string name="recentfile_summary">记住最近使用的文件名</string>
+    <string name="encryption_explanation">加密整个数据库时使用的算法。（密码，
+\n、用户名、笔记和所有数据库中的数据将使用此算法来加密）</string>
+    <string name="kdf_explanation">为了生成加密算法所需的密钥，通过随机加盐推导算法处理了经过压缩的主密钥（SHA-256）。</string>
+    <string name="memory_usage">内存使用量</string>
+    <string name="memory_usage_explanation">密钥推导算法使用的内存（以二进制字节计）。</string>
+    <string name="parallelism">并行</string>
+    <string name="parallelism_explanation">密钥推导算法使用的并行运行程度（即线程数量）。</string>
+    <string name="sort_menu">排序</string>
+    <string name="sort_title">标题</string>
+    <string name="sort_username">用户名</string>
+    <string name="sort_creation_time">创建时间</string>
+    <string name="sort_last_modify_time">修改时间</string>
+    <string name="sort_last_access_time">访问时间</string>
+    <string name="search_results">搜索结果</string>
+    <string name="warning">警告</string>
+    <string name="version_label">版本 %1$s</string>
+    <string name="store_with_fingerprint">使用指纹保存此密码</string>
+    <string name="history">历史</string>
+    <string name="appearance">外观</string>
+    <string name="general">通用</string>
+    <string name="autofill">自动填充</string>
+    <string name="autofill_service_name">KeePass DX 自动填充服务</string>
+    <string name="autofill_sign_in_prompt">使用 KeePass DX 登录</string>
+    <string name="clipboard">剪贴板</string>
+    <string name="clipboard_notifications_title">剪贴板通知</string>
+    <string name="lock">锁定</string>
+    <string name="fingerprint">指纹</string>
+    <string name="file_name">文件名</string>
+    <string name="path">路径</string>
+    <string name="create_keepass_file">创建 KeePass 文件</string>
+    <string name="bytes">B</string>
+    <string name="full_file_path_enable_title">显示文件路径</string>
+    <string name="full_file_path_enable_summary">显示完整的文件路径</string>
+    <string name="database_name_title">数据库名称</string>
+    <string name="database_description_title">数据库描述</string>
+    <string name="database_version_title">数据库版本</string>
+    <string name="text_appearance">文字样式</string>
+    <string name="application_appearance">应用外观</string>
+    <string name="other">其他</string>
+
+    <string name="keyboard">键盘</string>
+    <string name="magic_keyboard_title">魔法键盘</string>
+    <string name="magic_keyboard_preference_title">魔法键盘设置</string>
+    <string name="enable_read_only_title">默认只读</string>
+    <string name="enable_read_only_summary">默认以只读方式打开数据库</string>
+
+    <string name="download">下载</string>
+    <string name="contribute">贡献</string>
+
+    <string name="style_choose_summary">选择各种颜色的应用主题</string>
+    </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">剪貼板超時</string>
     <string name="clipboard_timeout_summary">複製用戶名或密碼到剪貼板後清除的時間</string>
     <string name="select_to_copy">複製%1$s到剪貼板</string>
-    <string name="creating_db_key">創建資料庫密鑰…</string>
+    <string name="retrieving_db_key">創建資料庫密鑰…</string>
     <string name="database">資料庫</string>
     <string name="decrypting_db">解密資料庫內容中…</string>
     <string name="default_checkbox">使用這作為我的預設資料庫</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">密碼</string>
     <string name="install_from_play_store">從 Play 商店安裝</string>
     <string name="install_from_f_droid">從 F-Droid 安裝</string>
-    <string name="InvalidPassword">無效的密碼或密鑰檔。</string>
+    <string name="invalid_password">無效的密碼或密鑰檔。</string>
     <string name="invalid_db_sig">資料庫格式無法識別。</string>
     <string name="length">長度</string>
     <string name="list_size_title">群列表尺寸</string>
@@ -132,7 +132,6 @@
     <string name="underline">強調</string>
     <string name="unsupported_db_version">不支援的資料庫版本。</string>
     <string name="uppercase">大寫</string>
-    <string name="warning_read_only">你的SD卡目前是唯讀狀態。您可能將無法保存任何變更到資料庫。</string>
     <string name="warning_unmounted">你的SD卡目前尚未安裝在您的設備上。你將無法讀或創建您的資料庫。</string>
 
     <string name="education_unlock_summary">輸入密碼和/或一個密鑰檔來解鎖你的資料庫.</string>