diff --git a/src/java/KP2ASoftKeyboard/project.zip b/src/java/KP2ASoftKeyboard/project.zip
index 18ce8a44..a0f1b68f 100644
Binary files a/src/java/KP2ASoftKeyboard/project.zip and b/src/java/KP2ASoftKeyboard/project.zip differ
diff --git a/src/java/KP2ASoftKeyboard/res/values-nb/strings.xml b/src/java/KP2ASoftKeyboard/res/values-nb/strings.xml
index 14f73c76..7fb47938 100644
--- a/src/java/KP2ASoftKeyboard/res/values-nb/strings.xml
+++ b/src/java/KP2ASoftKeyboard/res/values-nb/strings.xml
@@ -4,6 +4,7 @@
   <string name="word_separators">\u0020.,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\"</string>
   <string name="change_entry">Velg en annen oppføring</string>
   <string name="open_entry">Velg oppføring</string>
+  <string name="open_entry_for_app">Søke etter oppføringen med \"%1$s\"</string>
   <string name="label_go_key">Kjør</string>
   <string name="label_next_key">Neste</string>
   <string name="label_send_key">Send</string>
diff --git a/src/java/KP2ASoftKeyboard/res/values-sv/strings.xml b/src/java/KP2ASoftKeyboard/res/values-sv/strings.xml
index 351dfe74..814ea337 100644
--- a/src/java/KP2ASoftKeyboard/res/values-sv/strings.xml
+++ b/src/java/KP2ASoftKeyboard/res/values-sv/strings.xml
@@ -1,3 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
-<resources/>
+<resources>
+  <string name="word_separators">\u0020.,;:!?\n()[]*&amp;@{}/&lt;&gt;_+=|\"</string>
+  <string name="change_entry">Välj en annan post</string>
+  <string name="open_entry">Välj post</string>
+  <string name="open_entry_for_app">Sök efter post med \"%1$s\"</string>
+  <string name="label_go_key">Gå</string>
+  <string name="label_next_key">Nästa</string>
+  <string name="label_send_key">Skicka</string>
+</resources>
diff --git a/src/keepass2android/Resources/values-cs/strings.xml b/src/keepass2android/Resources/values-cs/strings.xml
index f51d95b1..a2cd03b6 100644
--- a/src/keepass2android/Resources/values-cs/strings.xml
+++ b/src/keepass2android/Resources/values-cs/strings.xml
@@ -209,7 +209,6 @@
   <string name="error_string_key">Název pole je vyžadována pro každý řetězec.</string>
   <string name="field_name">Název pole</string>
   <string name="field_value">Hodnota pole</string>
-  <string name="protection">Ochrana paměti</string>
   <string name="add_binary">Přidáte soubor jako přílohu...</string>
   <string name="add_extra_string">Přidat další řetězec</string>
   <string name="database_loaded_quickunlock_enabled">Databáze načtena, RychléOdemknutí povoleno.</string>
diff --git a/src/keepass2android/Resources/values-de/strings.xml b/src/keepass2android/Resources/values-de/strings.xml
index 5383534d..ba4c3325 100644
--- a/src/keepass2android/Resources/values-de/strings.xml
+++ b/src/keepass2android/Resources/values-de/strings.xml
@@ -130,6 +130,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="menu_open">Öffnen</string>
   <string name="menu_rename">Umbenennen</string>
   <string name="menu_search">Suchen</string>
+  <string name="menu_search_advanced">Erweiterte Suche</string>
   <string name="menu_url">URL öffnen</string>
   <string name="minus">Bindestrich</string>
   <string name="never">Nie</string>
@@ -210,13 +211,16 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="error_string_key">Ein Feldname ist für jeden Eintrag erforderlich.</string>
   <string name="field_name">Feldname</string>
   <string name="field_value">Feldwert</string>
-  <string name="protection">Speicherschutz</string>
+  <string name="protection">Geschütztes Feld</string>
   <string name="add_binary">Dateianhang hinzufügen...</string>
   <string name="add_extra_string">Zusätzliches Feld hinzufügen</string>
+  <string name="delete_extra_string">Zusätzliches Feld löschen</string>
   <string name="database_loaded_quickunlock_enabled">Datenbank geladen, QuickUnlock aktiviert.</string>
   <string name="credentials_dialog_title">Serverzugangsdaten eingeben</string>
   <string name="UseFileTransactions_title">Dateitransaktionen</string>
   <string name="UseFileTransactions_summary">Dateitransaktionen beim Schreiben von Datenbank-Dateien verwenden</string>
+  <string name="CheckForFileChangesOnSave_title">Auf Änderungen prüfen</string>
+  <string name="CheckForFileChangesOnSave_summary">Vor dem Speichern prüfen, ob die Datei von außerhalb geändert wurde.</string>
   <string name="ShowCopyToClipboardNotification_title">Zwischenablage-Benachrichtigungen</string>
   <string name="ShowCopyToClipboardNotification_summary">Benutzername und Passwort über die Benachrichtigungsleiste und die Zwischenablage verfügbar machen. Achtung vor Passwort-Sniffern!</string>
   <string name="ShowKp2aKeyboardNotification_title">KP2A-Tastatur Benachrichtigung</string>
@@ -239,7 +243,31 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="suggest_improvements">Verbesserungen vorschlagen</string>
   <string name="rate_app">Diese App bewerten</string>
   <string name="translate_app">KP2A übersetzen</string>
+  <string name="AddingEntry">Füge Eintrag hinzu…</string>
+  <string name="AddingGroup">Füge Gruppe hinzu…</string>
+  <string name="DeletingEntry">Lösche Eintrag…</string>
+  <string name="DeletingGroup">Lösche Gruppe…</string>
+  <string name="SettingPassword">Setze Passwort…</string>
+  <string name="UndoingChanges">Nehme Änderungen zurück…</string>
+  <string name="TransformingKey">Führe Schlüsseltransformationen durch…</string>
+  <string name="DecodingDatabase">Entschlüssele Datenbank…</string>
+  <string name="ParsingDatabase">Lese Datenbank ein…</string>
+  <string name="CheckingTargetFileForChanges">Prüfe ob Zieldatei geändert wurde…</string>
+  <string name="TitleSyncQuestion">Änderungen zusammenführen?</string>
+  <string name="MessageSyncQuestion">Die Datenbankdatei wurde von außerhalb geändert. Sollen diese Änderungen geladen und mit den in Keepass2Android gemachten Änderungen zusammengeführt werden, bevor die Datenbank gespeichert wird? Wähle Nein, um die externen Änderungen zu überschreiben.</string>
+  <string name="SynchronizingDatabase">Führe Änderungen zusammen…</string>
+  <string name="YesSynchronize">Ja, zusammenführen</string>
+  <string name="NoOverwrite">Nein, überschreiben</string>
   <string name="ChangeLog_title">Neuigkeiten</string>
+  <string name="ChangeLog_0_8_4"><b>Version 0.8.4</b>\n 
+* Externe Datenbankänderungen werden beim Speichern erkannt und zusammengeführt\n 
+* Gesteigerte Geschwindigkeit beim Laden\n 
+* Suchleiste mit Vorschlägen\n 
+* Neues App Logo!\n 
+* Unterstützung für das .kdbp-Format für schnelleres Laden/Speichern\n 
+* Verbesserte Bearbeitung von zusätzlichen Feldern und versteckte Darstellung von geschützten Feldern\n 
+Danke an Alex Vallat für seinen Beitrag zum Programm!\n 
+Danke an Niki Hüttner (www.close-cut.de) für das neue Logo!\n</string>
   <string name="ChangeLog_0_8_3"><b>Version 0.8.3</b>\n
 * Benutzername/TAN index wird in Liste der Einträge angezeigt (s. Einstellungen)\n
 * Einträge können neu angelegt werden, wenn Suche aus Browser kein Ergebnis gebracht hat\n
diff --git a/src/keepass2android/Resources/values-es/strings.xml b/src/keepass2android/Resources/values-es/strings.xml
index d568ce43..152df0e9 100644
--- a/src/keepass2android/Resources/values-es/strings.xml
+++ b/src/keepass2android/Resources/values-es/strings.xml
@@ -204,7 +204,6 @@
   <string name="error_string_key">Se requiere un nombre en cada entrada.</string>
   <string name="field_name">Nombre del campo</string>
   <string name="field_value">Valor del campo</string>
-  <string name="protection">Protección de memoria</string>
   <string name="add_binary">Agregar archivo adjunto...</string>
   <string name="add_extra_string">Agregar una cadena</string>
   <string name="database_loaded_quickunlock_enabled">Base de datos cargada, Desbloqueo Rápido habilitado.</string>
diff --git a/src/keepass2android/Resources/values-fr/strings.xml b/src/keepass2android/Resources/values-fr/strings.xml
index 53828cb9..58d8fddc 100644
--- a/src/keepass2android/Resources/values-fr/strings.xml
+++ b/src/keepass2android/Resources/values-fr/strings.xml
@@ -129,6 +129,7 @@
   <string name="menu_open">Ouvrir</string>
   <string name="menu_rename">Renommer</string>
   <string name="menu_search">Rechercher</string>
+  <string name="menu_search_advanced">Recherche avancée</string>
   <string name="menu_url">Aller à l\'adresse URL</string>
   <string name="minus">Moins</string>
   <string name="never">Jamais</string>
@@ -209,13 +210,16 @@
   <string name="error_string_key">Un nom de champ est requis pour chaque chaîne de caractères.</string>
   <string name="field_name">Nom du champ</string>
   <string name="field_value">Valeur du champ</string>
-  <string name="protection">Protection de la mémoire</string>
+  <string name="protection">Champ protégé</string>
   <string name="add_binary">Ajouter une pièce jointe...</string>
   <string name="add_extra_string">Ajouter une chaîne de caractère supplémentaire</string>
+  <string name="delete_extra_string">Supprimer la chaîne additionnelle</string>
   <string name="database_loaded_quickunlock_enabled">Base de donnée chargée, QuickUnlock activé.</string>
   <string name="credentials_dialog_title">Entrez vos identifiants pour le serveur</string>
   <string name="UseFileTransactions_title">File transactions</string>
   <string name="UseFileTransactions_summary">Utiliser les opérations sur les fichiers pour écrire les bases de données</string>
+  <string name="CheckForFileChangesOnSave_title">Rechercher des modifications</string>
+  <string name="CheckForFileChangesOnSave_summary">Vérifie si le fichier a été modifié par ailleurs avant d\'enregistrer les modifications.</string>
   <string name="ShowCopyToClipboardNotification_title">Barre de notification et presse-papiers</string>
   <string name="ShowCopyToClipboardNotification_summary">Rend le nom d\'utilisateur et le mot de passe accessibles via la barre de notification et le presse-papiers. Attention au sniffers de mot de passes !</string>
   <string name="ShowKp2aKeyboardNotification_title">Barre de notification et clavier KP2A</string>
@@ -238,7 +242,29 @@
   <string name="suggest_improvements">Faire des suggestions ou votez pour des améliorations</string>
   <string name="rate_app">Noter cette application</string>
   <string name="translate_app">Traduire KP2A</string>
+  <string name="AddingEntry">Ajout de l\'entrée en cours…</string>
+  <string name="AddingGroup">Ajout du groupe en cours…</string>
+  <string name="DeletingEntry">Suppression de l\'entrée…</string>
+  <string name="DeletingGroup">Suppression du groupe…</string>
+  <string name="SettingPassword">Prise en compte du mot de passe…</string>
+  <string name="UndoingChanges">Annulation de modifications…</string>
+  <string name="TransformingKey">Changement de la clé principale…</string>
+  <string name="DecodingDatabase">Décodage de la base de données…</string>
+  <string name="ParsingDatabase">Analyse de la base de données…</string>
+  <string name="CheckingTargetFileForChanges">Vérification des modifications dans le fichier…</string>
+  <string name="TitleSyncQuestion">Fusionner les modifications ?</string>
+  <string name="MessageSyncQuestion">La base de données a été modifiée par une source tierce. Voulez-vous charger et fusionner les changements avant de sauvegarder ? Sélectionnez \"Non\" si vous voulez écraser les changements externes.</string>
+  <string name="SynchronizingDatabase">Importation des modifications…</string>
   <string name="ChangeLog_title">Journal des modifications</string>
+  <string name="ChangeLog_0_8_4"><b>Version 0.8.4</b>\n 
+* Modifications tierces de la base de données détectées et fusionnées à la sauvegarde\n 
+* Chargement optimisé\n 
+* Amélioration de la barre de recherche (suggestions)\n 
+* Nouveau logo pour l\'application ! \n
+* Support des fichiers .kdbp pour des chargements/enregistrements plus rapides\n 
+* Édition des chaînes additionnelles améliorée et interface cachée lorsque protégée\n 
+Merci à Alex Vallat pour ses contributions au code !\n 
+Merci à Niki Hüttner (www.close-cut.de) pour le nouveau logo !\n</string>
   <string name="ChangeLog_0_8_3"><b>Version 0.8.3</b>\n
 * Nom d\'utilisateur/TAN affiché dans la liste des entrées (voir les préférences)\n
 * Les entrées peuvent être créées lorsqu\'elles ne sont pas trouvées\n
diff --git a/src/keepass2android/Resources/values-nb/strings.xml b/src/keepass2android/Resources/values-nb/strings.xml
index 4bb6c81a..fc533745 100644
--- a/src/keepass2android/Resources/values-nb/strings.xml
+++ b/src/keepass2android/Resources/values-nb/strings.xml
@@ -7,6 +7,7 @@
   <string name="CreditsText">Brukergrensesnittet er basert på en port av KeepassDroid utviklet av Brian Pellin. Kildekode til databaseoperasjoner er basert på KeePass av Dominik Reichl. Android roboten, laget og delt av Google, er reprodusert og modifisert i henhold til Creative Commons 3.0 Navngivelse Lisensen.</string>
   <string name="accept">Godta</string>
   <string name="add_entry">Legg til post</string>
+  <string name="add_url_entry">Lag oppføring for URL</string>
   <string name="add_group">Legg til gruppe</string>
   <string name="add_group_title">Legg til gruppe</string>
   <string name="algorithm">Algoritme</string>
@@ -163,6 +164,8 @@
   <string name="search_hint">Søk etter</string>
   <string name="search_results">Søkeresultater</string>
   <string name="search_in">Søk i</string>
+  <string name="select_other_entry">Velg en annen oppføring</string>
+  <string name="select_group_then_add">Åpne ønsket gruppe, og trykk deretter \"%1$s\"!</string>
   <string name="twofish">Twofish</string>
   <string name="underline">Understreking</string>
   <string name="unsupported_db_version">Ikke-støttet databaseversjon.</string>
@@ -173,6 +176,8 @@
   <string name="regular_expression">Regulært uttrykk</string>
   <string name="TanExpiresOnUse_title">TAN utløper ved bruk</string>
   <string name="TanExpiresOnUse_summary">Marker TAN oppføringer som utløpt når du bruker dem</string>
+  <string name="ShowUsernameInList_title">Vis brukernavn i listen</string>
+  <string name="ShowUsernameInList_summary">Vis brukernavn under oppføringstitler. Nyttig for flere kontoer eller TANs.</string>
   <string name="kp2a_findUrl">Keepass2Android: Finn passord</string>
   <string name="excludeExpiredEntries">Utelukk utløpte oppføringer</string>
   <string name="search_options">Alternativer</string>
@@ -204,7 +209,6 @@
   <string name="error_string_key">Et feltnavn kreves for hver streng.</string>
   <string name="field_name">Feltnavn</string>
   <string name="field_value">Feltverdi</string>
-  <string name="protection">Minnebeskyttelse</string>
   <string name="add_binary">Legg til filvedlegg...</string>
   <string name="add_extra_string">Legg til ekstra streng</string>
   <string name="database_loaded_quickunlock_enabled">Databasen er lastet, QuickUnlock er aktivert.</string>
@@ -215,6 +219,8 @@
   <string name="ShowCopyToClipboardNotification_summary">Gjør brukernavn og passord er tilgjengelig gjennom varslingslinjen og utklippstavle. Vokt deg for passordsniffere!</string>
   <string name="ShowKp2aKeyboardNotification_title">KP2A tastatur varsel</string>
   <string name="ShowKp2aKeyboardNotification_summary">Gjør hele oppføringen tilgjengelig gjennom KP2A tastaturet (anbefales).</string>
+  <string name="OpenKp2aKeyboardAutomatically_title">Dialogboks for valg av tastatur</string>
+  <string name="OpenKp2aKeyboardAutomatically_summary">Åpne tastatur dialog når en oppføring er tilgjengelig gjennom KP2A tastaturet etter søk.</string>
   <string name="AskOverwriteBinary">Vil du overskrive den eksisterende binærfilen med samme navn?</string>
   <string name="AskOverwriteBinary_title">Overskrive eksisterende binærfil?</string>
   <string name="AskOverwriteBinary_yes">Overskriv</string>
@@ -232,6 +238,7 @@
   <string name="rate_app">Vurder denne appen</string>
   <string name="translate_app">Oversett KP2A</string>
   <string name="ChangeLog_title">Endringslogg</string>
+  <string name="ChangeLog_keptDonate">Utvidet mulighet til å donere en øl, eller noe annet</string>
   <string-array name="clipboard_timeout_options">
     <item>30 sekunder</item>
     <item>1 minutt</item>
diff --git a/src/keepass2android/Resources/values-pl/strings.xml b/src/keepass2android/Resources/values-pl/strings.xml
index e7399a1c..9e350fa3 100644
--- a/src/keepass2android/Resources/values-pl/strings.xml
+++ b/src/keepass2android/Resources/values-pl/strings.xml
@@ -205,7 +205,6 @@ Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej i/
   <string name="error_string_key">Nazwa pola jest wymagana dla każdego ciągu znaków.</string>
   <string name="field_name">Nazwa pola</string>
   <string name="field_value">Wartość pola</string>
-  <string name="protection">Ochrona pamięci</string>
   <string name="add_binary">Dodaj załącznik...</string>
   <string name="add_extra_string">Dodać dodatkowy ciąg znaków</string>
   <string name="database_loaded_quickunlock_enabled">Baza załadowana, Szybkie_Odblokowanie włączone.</string>
diff --git a/src/keepass2android/Resources/values-pt-rBR/strings.xml b/src/keepass2android/Resources/values-pt-rBR/strings.xml
index 5d3b8573..2c5c77c9 100644
--- a/src/keepass2android/Resources/values-pt-rBR/strings.xml
+++ b/src/keepass2android/Resources/values-pt-rBR/strings.xml
@@ -4,8 +4,10 @@
   <string name="about_feedback">Comentários</string>
   <string name="about_homepage">Página inicial</string>
   <string name="AboutText">Keepass2Android é uma implementação do gerenciador de senhas KeePass.</string>
+  <string name="CreditsText">A Interface do usuário baseia-se no KeepassDroid desenvolvido por Brian Pellin. Código para manipulação do banco de dados baseia-se no KeePass por Dominik Reichl. O robô Android é reproduzido ou modificado do trabalho criado e compartilhado pelo Google e utilizado de acordo com os termos descritos na licença Creative Commons 3.0 Attribution License.</string>
   <string name="accept">Aceitar</string>
   <string name="add_entry">Adicionar entrada</string>
+  <string name="add_url_entry">Criar entrada para URL</string>
   <string name="add_group">Adicionar grupo</string>
   <string name="add_group_title">Adicionar Grupo</string>
   <string name="algorithm">Algoritmo</string>
@@ -23,6 +25,9 @@
   <string name="clipboard_timeout_summary">Tempo até limpar o clipboard após copiar usuário ou senha.</string>
   <string name="copy_username">Copiar usuário para o clipboard</string>
   <string name="copy_password">Copiar senha para o clipboard</string>
+  <string name="available_through_keyboard">Entrada está disponível através do teclado KP2A</string>
+  <string name="not_possible_im_picker">Não foi possível abrir a caixa de diálogo para selecionar o método de entrada. Por favor, ative o teclado manualmente.</string>
+  <string name="please_activate_keyboard">Por favor habilite o teclado do Keepass2Android nas configurações do seu sistema.</string>
   <string name="creating_db_key">Criando a chave do banco de dados…</string>
   <string name="current_group">Grupo atual</string>
   <string name="current_group_root">Grupo atual: Raiz</string>
@@ -30,22 +35,24 @@
   <string name="decrypting_db">Decifrando conteúdo do banco de dados…</string>
   <string name="decrypting_entry">Decifrando entrada</string>
   <string name="default_checkbox">Usar este banco de dados como padrão</string>
-  <string name="digits">Digitos</string>
+  <string name="digits">Dígitos</string>
   <string name="disclaimer_formal">Keepass2Android vem com ABSOLUTAMENTE NENHUMA GARANTIA; Este é um software livre, e você está convidado a redistribui-lo sob as condições da GPL versão 2 ou posterior.</string>
   <string name="enter_filename">Digite o nome do arquivo de banco de dados</string>
   <string name="entry_accessed">Acessado</string>
-  <string name="entry_and_or">Digite uma senha e/ ou entre com o caminho para o arquivo de chaves do banco de dados</string>
+  <string name="entry_and_or">Digite uma senha e/ou entre com o caminho para o arquivo chave do banco de dados</string>
   <string name="entry_cancel">Cancelar</string>
   <string name="entry_comment">Comentários</string>
   <string name="entry_confpassword">Confirmar senha</string>
   <string name="entry_created">Criado</string>
   <string name="entry_expires">Expira</string>
-  <string name="entry_keyfile">Arquivo de chave (opcional)</string>
+  <string name="entry_keyfile">Arquivo chave (opcional)</string>
   <string name="entry_modified">Modificado</string>
   <string name="entry_password">Senha</string>
   <string name="entry_save">Salvar</string>
   <string name="entry_title">Nome</string>
   <string name="entry_user_name">Nome de usuário</string>
+  <string name="entry_extra_strings">Campos de texto extra</string>
+  <string name="entry_binaries">Anexos</string>
   <string name="error_arc4">A cifra de fluxo ArcFour não é suportada.</string>
   <string name="error_can_not_handle_uri">Keepass2Android não pôde tratar esta uri.</string>
   <string name="error_could_not_create_group">Erro ao criar grupo.</string>
@@ -58,7 +65,7 @@
   <string name="error_invalid_db">Banco de dados inválido.</string>
   <string name="error_invalid_path">Caminho inválido.</string>
   <string name="error_no_name">É necessário um nome.</string>
-  <string name="error_nopass">São necessários uma senha ou um arquivo de chaves.</string>
+  <string name="error_nopass">É necessário uma senha ou um arquivo chave.</string>
   <string name="error_out_of_memory">Foi atingida a capacidade máxima de memória do seu dispositivo ao carregar o banco de dados. O banco de dados pode ser muito grande para este dispositivo.</string>
   <string name="error_pass_gen_type">Pelo menos um tipo de geração de senhas deve ser selecionado</string>
   <string name="error_pass_match">As senhas não combinam.</string>
@@ -73,8 +80,8 @@
   <string name="hint_comment">comentário</string>
   <string name="hint_conf_pass">confirmar senha</string>
   <string name="hint_generated_password">senha gerada</string>
-  <string name="hint_group_name">Nome do Grupo</string>
-  <string name="hint_keyfile">arquivo de chave</string>
+  <string name="hint_group_name">Nome do grupo</string>
+  <string name="hint_keyfile">arquivo chave</string>
   <string name="hint_length">tamanho</string>
   <string name="hint_pass">senha</string>
   <string name="hint_login_pass">Senha</string>
@@ -82,8 +89,11 @@
   <string name="hint_username">nome de usuário</string>
   <string name="install_from_market">Instalar a partir do Google Play</string>
   <string name="install_from_website">Instalar a partir da Web</string>
-  <string name="InvalidPassword">Senha ou arquivo de chaves inválidos.</string>
+  <string name="InvalidPassword">Senha ou arquivo chave inválidos.</string>
+  <string name="invalid_algorithm">Algoritmo inválido.</string>
   <string name="invalid_db_sig">O formato do banco de dados não foi reconhecido.</string>
+  <string name="keyfile_does_not_exist">Arquivo chave não existe.</string>
+  <string name="keyfile_is_empty">Arquivo chave está vazio.</string>
   <string name="length">Tamanho</string>
   <string name="list_size_title">Tamanho da lista de grupos</string>
   <string name="list_size_summary">Tamanho do texto na lista de grupos</string>
@@ -98,7 +108,8 @@
   <string name="menu_create">Criar</string>
   <string name="menu_app_settings">Configurações</string>
   <string name="menu_db_settings">Configurações do banco de dados</string>
-  <string name="menu_delete">Deletar</string>
+  <string name="menu_delete">Excluir</string>
+  <string name="menu_donate">Doe uma cerveja...</string>
   <string name="menu_edit">Editar</string>
   <string name="menu_hide_password">Esconder Senha</string>
   <string name="menu_homepage">Ir para a página inicial</string>
@@ -109,6 +120,8 @@
   <string name="menu_url">Ir para URL</string>
   <string name="minus">Menos</string>
   <string name="never">Nunca</string>
+  <string name="yes">Sim</string>
+  <string name="no">Não</string>
   <string name="no_keys">Nenhuma entrada no grupo.</string>
   <string name="no_results">Sem resultados na busca.</string>
   <string name="no_url_handler">Erro ao tratar url.</string>
@@ -119,25 +132,37 @@
   <string name="password_title">Digite a senha do banco de dados</string>
   <string name="progress_create">Criando novo banco de dados…</string>
   <string name="progress_title">Trabalhando…</string>
-  <string name="remember_keyfile_summary">Lembrar o local dos arquivos de chave</string>
-  <string name="remember_keyfile_title">Salvar arquivo de chave</string>
+  <string name="remember_keyfile_summary">Lembrar o local dos arquivos chave</string>
+  <string name="remember_keyfile_title">Salvar arquivo chave</string>
   <string name="remove_from_filelist">Remover</string>
   <string name="root">Raiz</string>
   <string name="rounds">Rodadas de criptografia</string>
   <string name="rounds_explaination">Maior número de rodadas de criptografia adiciona mais proteção contra ataques de força bruta, porém pode tornar o processo de carregar e salvar mais lentos.</string>
   <string name="rounds_hint">rodadas</string>
+  <string name="database_name">Nome do banco de dados</string>
+  <string name="default_username">Nome de usuário padrão para novas entradas</string>
   <string name="saving_database">Salvando banco de dados…</string>
-  <string name="space">Spaço</string>
+  <string name="space">Espaço</string>
   <string name="search_label">Busca</string>
   <string name="show_password">Mostrar senha</string>
   <string name="sort_name">Ordenar por nome</string>
-  <string name="sort_db">Ordenação do banco de dados</string>
+  <string name="sort_db">Ordenar por data de criação</string>
   <string name="special">Caracteres Especiais</string>
+  <string name="search_results">Resultado da busca</string>
+  <string name="search_in">Procurar em</string>
+  <string name="select_other_entry">Selecionar outra entrada</string>
+  <string name="select_group_then_add">Abra o grupo desejado e, em seguida, pressione \"%1$s\"!</string>
   <string name="unsupported_db_version">Versão de banco de dados não suportada.</string>
   <string name="uppercase">Letras maiúsculas</string>
   <string name="warning_read_only">Seu cartão SD está no modo de somente leitura. Talvez não seja possível salvar modificações ao banco de dados.</string>
   <string name="warning_unmounted">Seu cartão SD não está montado no dispositivo. Não será possível carregar ou criar um banco de dados.</string>
   <string name="version_label">Versão</string>
+  <string name="regular_expression">Expressão regular</string>
+  <string name="ShowUsernameInList_title">Mostrar nome de usuário na lista</string>
+  <string name="ShowUsernameInList_summary">Mostrar nome de usuário abaixo dos títulos das entradas. Útil para várias contas ou TANs.</string>
+  <string name="kp2a_findUrl">Keepass2Android: Buscar senha</string>
+  <string name="search_options">Opções</string>
+  <string name="start_open_file">Abrir arquivo...</string>
   <string-array name="clipboard_timeout_options">
     <item>30 segundos</item>
     <item>1 minuto</item>
diff --git a/src/keepass2android/Resources/values-ro/strings.xml b/src/keepass2android/Resources/values-ro/strings.xml
index 5fa81e27..013f11bd 100644
--- a/src/keepass2android/Resources/values-ro/strings.xml
+++ b/src/keepass2android/Resources/values-ro/strings.xml
@@ -129,6 +129,7 @@
   <string name="menu_open">Deschide</string>
   <string name="menu_rename">Redenumește</string>
   <string name="menu_search">Căutare</string>
+  <string name="menu_search_advanced">Căutare avansată</string>
   <string name="menu_url">Du-te la URL-ul</string>
   <string name="minus">Minus</string>
   <string name="never">Niciodată</string>
@@ -210,13 +211,16 @@
   <string name="error_string_key">Este necesar un nume câmp pentru fiecare string.</string>
   <string name="field_name">Numele câmpului</string>
   <string name="field_value">Valoarea câmpului</string>
-  <string name="protection">Protecție memorie</string>
+  <string name="protection">Câmp protejat</string>
   <string name="add_binary">Ataşează fişier...</string>
   <string name="add_extra_string">Adaugă string adiţional</string>
+  <string name="delete_extra_string">Şterge string adiţional</string>
   <string name="database_loaded_quickunlock_enabled">Baza de date încărcată, QuickUnlock activat.</string>
   <string name="credentials_dialog_title">Introduceți datele conectare la server</string>
   <string name="UseFileTransactions_title">Tranzacții fișier</string>
   <string name="UseFileTransactions_summary">Foloseşte tranzacţii pentru a scrie bazele de date</string>
+  <string name="CheckForFileChangesOnSave_title">Verifică modificări</string>
+  <string name="CheckForFileChangesOnSave_summary">Verifică dacă nu s-a modificat extern fişierul înainte de a salva.</string>
   <string name="ShowCopyToClipboardNotification_title">Notificări clipboard</string>
   <string name="ShowCopyToClipboardNotification_summary">Oferă utilizatorul şi parolă folosind bara de notificări şi clipboard-ul. Atenţie la \"password sniffers\"!</string>
   <string name="ShowKp2aKeyboardNotification_title">Notificare tastatură KP2A</string>
@@ -239,7 +243,29 @@
   <string name="suggest_improvements">Propuneți sau votați pentru îmbunătățiri</string>
   <string name="rate_app">Evaluează această aplicație</string>
   <string name="translate_app">Traduce KP2A</string>
+  <string name="AddingEntry">Se adaugă înregistrarea…</string>
+  <string name="AddingGroup">Se adaugă grup…</string>
+  <string name="DeletingEntry">Se şterge înregistrarea…</string>
+  <string name="DeletingGroup">Se şterge grupul…</string>
+  <string name="SettingPassword">Se setează parola…</string>
+  <string name="UndoingChanges">Se anulează modificările…</string>
+  <string name="TransformingKey">Se transformă cheia principală…</string>
+  <string name="DecodingDatabase">Se decodează baza de date…</string>
+  <string name="ParsingDatabase">Se parsează baza de date…</string>
+  <string name="CheckingTargetFileForChanges">Se verifică fişierul ţintă pentru modificări…</string>
+  <string name="TitleSyncQuestion">Combinare modificări?</string>
+  <string name="MessageSyncQuestion">Fişierul bazei de date a fost modificat extern. Doriţi să încărcaţi şi să combinaţi modificările înainte de salvare. Selectaţi Nu dacă doriţi să suprascrieţi modificările externe.</string>
+  <string name="SynchronizingDatabase">Se combină modificările…</string>
   <string name="ChangeLog_title">Change log</string>
+  <string name="ChangeLog_0_8_4"><b>Versiunea 0.8.4</b>\n 
+* Modificările externe ale bazei de date sunt detectate şi combinate la salvare\n 
+* S-a îmbunătăţit performanţa la încărcare\n 
+* Bară de căutare îmbunătăţită cu sugestii\n 
+* Logo nou pentru aplicaţie!\n 
+* Adăugat suport pentru formatul .kdbp pentru încărcare/salvare rapidă\n 
+* S-a îmbunătăţit editarea câmpurilor extra şi s-a ascuns afişarea dacă sunt protejate\n 
+Mulţumiri lui Alex Vallat pentru contribuţiile sale la cod!\n 
+Mulţumiri lui Niki Hüttner (www.close-cut.de) pentru noul logo!\n</string>
   <string name="ChangeLog_0_8_3"><b>Versiunea 0.8.3</b>\n
 * index utilizator/TAN afişat în lista de înregistrări (vezi setări)\n
 * Înregistrările pot fi create dacă o căutare din browser nu găseşte rezultate\n
diff --git a/src/keepass2android/Resources/values-ru/strings.xml b/src/keepass2android/Resources/values-ru/strings.xml
index 4637b23b..7a868d19 100644
--- a/src/keepass2android/Resources/values-ru/strings.xml
+++ b/src/keepass2android/Resources/values-ru/strings.xml
@@ -129,6 +129,7 @@
   <string name="menu_open">Открыть</string>
   <string name="menu_rename">Новое имя</string>
   <string name="menu_search">Поиск</string>
+  <string name="menu_search_advanced">Расширенный поиск</string>
   <string name="menu_url">Ссылка</string>
   <string name="minus">-Дефис-</string>
   <string name="never">Никогда</string>
@@ -209,13 +210,16 @@
   <string name="error_string_key">Имя поля обязательно для каждой строки.</string>
   <string name="field_name">Имя поля</string>
   <string name="field_value">Значение поля</string>
-  <string name="protection">Защита памяти</string>
+  <string name="protection">Защищённое поле</string>
   <string name="add_binary">Добавьте вложенный файл...</string>
   <string name="add_extra_string">Добавить дополнительную строку</string>
+  <string name="delete_extra_string">Удалить дополнительную строку</string>
   <string name="database_loaded_quickunlock_enabled">База данных загружен, БыстраяРазблокировка включена.</string>
   <string name="credentials_dialog_title">Введите учетные данные сервера</string>
   <string name="UseFileTransactions_title">Файловые транзакции</string>
   <string name="UseFileTransactions_summary">Использовать файловые транзакции для записи баз данных</string>
+  <string name="CheckForFileChangesOnSave_title">Проверить на наличие изменений</string>
+  <string name="CheckForFileChangesOnSave_summary">Проверка был ли файл изменен извне до сохранения изменений.</string>
   <string name="ShowCopyToClipboardNotification_title">Уведомления буфера обмена</string>
   <string name="ShowCopyToClipboardNotification_summary">Сделать имя пользователя и пароль доступными через панель уведомлений и буфер обмена. Остерегайтесь перехватчиков паролей!</string>
   <string name="ShowKp2aKeyboardNotification_title">Уведомления клавиатуры KP2A</string>
@@ -238,7 +242,31 @@
   <string name="suggest_improvements">Предложить или голосовать за улучшение</string>
   <string name="rate_app">Оцените это приложение</string>
   <string name="translate_app">Переведите KP2A</string>
+  <string name="AddingEntry">Добавление записи…</string>
+  <string name="AddingGroup">Добавление группы…</string>
+  <string name="DeletingEntry">Удаление записи…</string>
+  <string name="DeletingGroup">Удаление группы…</string>
+  <string name="SettingPassword">Установка пароля…</string>
+  <string name="UndoingChanges">Отмена изменений…</string>
+  <string name="TransformingKey">Преобразование мастер-ключа…</string>
+  <string name="DecodingDatabase">Декодирование базы данных…</string>
+  <string name="ParsingDatabase">Анализ базы данных…</string>
+  <string name="CheckingTargetFileForChanges">Проверка целевого файла на наличие изменений…</string>
+  <string name="TitleSyncQuestion">Слить изменения?</string>
+  <string name="MessageSyncQuestion">Файл базы данных был изменен извне. Вы хотите загрузить и выполнить слияние изменений перед сохранением? Выберите Нет, если вы хотите перезаписать внешние изменения.</string>
+  <string name="SynchronizingDatabase">Слияние изменений…</string>
+  <string name="YesSynchronize">Да, объединить</string>
+  <string name="NoOverwrite">Нет, перезаписать</string>
   <string name="ChangeLog_title">Список изменений</string>
+  <string name="ChangeLog_0_8_4"><b>Версия 0.8.4</b>\n 
+* Внешние модификации базы данных обнаруживаются и объединяются при сохранении\n 
+* Улучшена скорость загрузки\n 
+* Улучшенная панель поиска с подсказками\n 
+* Новый логотип приложения! \n
+* Добавлена поддержка формата .kdbp для более быстрого чтения/записи\n 
+* Улучшено редактирование дополнительных записей и скрытие защищённых\n 
+Благодарю Alex Vallat за вклад в развитие кода!\n 
+Благодарю Niki Hüttner (www.close-cut.de) за новый логотип!\</string>
   <string name="ChangeLog_0_8_3"><b>Версия 0.8.3</b>\n
 * Отображение имени пользователя/TAN в списке записей (см. в настройках)\n
 * Записи могут быть созданы, если поиск из браузера ничего не вернул\n
diff --git a/src/keepass2android/Resources/values-sv/strings.xml b/src/keepass2android/Resources/values-sv/strings.xml
index 11bc61de..7bc40ec0 100644
--- a/src/keepass2android/Resources/values-sv/strings.xml
+++ b/src/keepass2android/Resources/values-sv/strings.xml
@@ -1,20 +1,133 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
+  <string name="about_feedback">Återkoppling</string>
+  <string name="about_homepage">Hemsida</string>
+  <string name="accept">Godkänn</string>
+  <string name="add_entry">Ny post</string>
+  <string name="add_group">Ny grupp</string>
+  <string name="add_group_title">Ny grupp</string>
+  <string name="algorithm">Algoritm</string>
+  <string name="algorithm_colon">Algoritm</string>
+  <string name="app_name">Keepass2Android</string>
+  <string name="short_app_name">KP2A</string>
+  <string name="app_name_nonet">Keepass2Android är nedkopplad</string>
+  <string name="short_app_name_nonet">KP2A är nedkopplad</string>
+  <string name="app_timeout">Tidsgräns för applikationen</string>
+  <string name="app_timeout_summary">Tid innan låsning av databasen när applikationen är inaktiv.</string>
+  <string name="application">Applikation</string>
+  <string name="application_settings">Applikationsinställningar</string>
+  <string name="brackets">Paranteser</string>
+  <string name="building_search_idx">Bygger sökindex...</string>
+  <string name="cancel">Avbryt</string>
+  <string name="ClearClipboard">Urklippshanteraren rensad.</string>
+  <string name="clipboard_timeout">Tidsgräns för utklipp</string>
+  <string name="copy_username">Kopiera användarnamnet till urklipp</string>
+  <string name="copy_password">Kopiera lösenordet till urklipp</string>
+  <string name="creating_db_key">Skapar databasnyckel...</string>
+  <string name="current_group">Aktuell grupp</string>
+  <string name="current_group_root">Aktuell grupp: Root</string>
+  <string name="database">Databas</string>
+  <string name="decrypting_db">Dekrypterar databasinnehåll...</string>
+  <string name="decrypting_entry">Dekryptera post</string>
+  <string name="default_checkbox">Använd detta som som standarddatabas</string>
+  <string name="digits">Siffror</string>
+  <string name="disclaimer_formal">Keepass2Android kommer HELT UTAN GARANTIER; Detta är fri programvara och du är välkommen att distribuera den utifrån villkoren i GPL version 2 eller senare.</string>
+  <string name="ellipsis">\u2026</string>
+  <string name="entry_cancel">Avbryt</string>
+  <string name="entry_comment">Kommentarer</string>
+  <string name="entry_tags">Taggar</string>
+  <string name="entry_confpassword">Bekräfta lösenord</string>
+  <string name="entry_created">Skapad</string>
+  <string name="entry_expires">Upphör</string>
+  <string name="entry_keyfile">Nyckelfil (valfri)</string>
+  <string name="entry_modified">Ändrad</string>
+  <string name="entry_password">Lösenord</string>
+  <string name="entry_save">Spara</string>
+  <string name="entry_title">Namn</string>
+  <string name="entry_url">URL</string>
+  <string name="entry_user_name">Användarnamn</string>
+  <string name="entry_binaries">Bifogade filer</string>
+  <string name="error_could_not_create_group">Fel vid skapande av grupp.</string>
+  <string name="error_database_exists">Filen finns redan.</string>
+  <string name="error_invalid_db">Ogiltig databas.</string>
+  <string name="error_invalid_path">Ogiltig sökväg.</string>
+  <string name="error_nopass">Det krävs ett lösenord eller en nyckelfil.</string>
+  <string name="error_pass_match">Lösenorden stämmer inte överrens.</string>
+  <string name="error_rounds_not_number">Antalet rundor måste vara en siffra.</string>
+  <string name="error_rounds_too_large">Antalet rundor är för stort. Sätter värdet till 2147483648.</string>
+  <string name="FileNotFound">Hittar inte filen.</string>
+  <string name="group">Grupp</string>
+  <string name="hint_comment">kommentar</string>
+  <string name="hint_group_name">Gruppnamn</string>
+  <string name="hint_length">längd</string>
+  <string name="hint_pass">lösenord</string>
+  <string name="hint_login_pass">Lösenord</string>
+  <string name="hint_title">namn</string>
+  <string name="hint_url">url</string>
+  <string name="hint_username">användarnamn</string>
+  <string name="install_from_market">Installera från Play Store</string>
+  <string name="length">Längd</string>
+  <string name="MaskedPassword">*****</string>
+  <string name="menu_about">Om</string>
+  <string name="menu_copy_pass">Kopiera lösenord</string>
+  <string name="menu_copy_user">Kopiera användarnamn</string>
+  <string name="menu_create">Skapa</string>
+  <string name="menu_app_settings">Inställningar</string>
+  <string name="menu_db_settings">Databasinställningar</string>
+  <string name="menu_delete">Radera</string>
+  <string name="menu_donate">Donera en öl...</string>
+  <string name="menu_edit">Ändra</string>
+  <string name="menu_hide_password">Dölj lösenord</string>
+  <string name="menu_homepage">Gå till hemsida</string>
+  <string name="menu_lock">Lås databasen</string>
+  <string name="menu_open">Öppna</string>
+  <string name="menu_rename">Byt namn</string>
+  <string name="menu_search">Sök</string>
+  <string name="menu_url">Gå till URL</string>
+  <string name="minus">Minus</string>
+  <string name="never">Aldrig</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nej</string>
+  <string name="progress_title">Arbetar...</string>
+  <string name="root">Root</string>
+  <string name="rounds_hint">rundor</string>
+  <string name="saving_database">Sparar databasen...</string>
+  <string name="space">Utrymme</string>
+  <string name="search_label">Sök</string>
+  <string name="sort_name">Sortera efter namn</string>
+  <string name="sort_db">Sortera efter datum</string>
+  <string name="search_results">Sökresultat</string>
+  <string name="search_in">Sök i</string>
+  <string name="select_other_entry">Välj en annan post</string>
+  <string name="twofish">Twofish</string>
+  <string name="underline">Understruken</string>
+  <string name="uppercase">Versaler</string>
+  <string name="version_label">Version</string>
+  <string name="search_options">Alternativ</string>
+  <string name="start_open_url">Öppna URL...</string>
+  <string name="enable_quickunlock">Aktivera QuickUnlock</string>
+  <string name="QuickUnlock_button">QuickUnlock!</string>
+  <string name="SaveAttachmentDialog_title">Spara bilaga</string>
+  <string name="SaveAttachmentDialog_save">Spara till SD-kort</string>
+  <string name="field_name">Fältnamn</string>
+  <string name="field_value">Värdet i fältet</string>
+  <string name="translate_app">Översätt KP2A</string>
+  <string name="ChangeLog_title">Ändringslogg</string>
   <string-array name="clipboard_timeout_options">
-    <item>30 seconds</item>
-    <item>1 minute</item>
-    <item>5 minutes</item>
-    <item>Never</item>
+    <item>30 sekunder</item>
+    <item>1 minut</item>
+    <item>5 minuter</item>
+    <item>Aldrig</item>
   </string-array>
   <string-array name="list_size_options">
-    <item>Small</item>
+    <item>Liten</item>
     <item>Medium</item>
-    <item>Large</item>
+    <item>Stor</item>
   </string-array>
   <string-array name="cred_remember_modes">
     <item>Do not remember username and password</item>
     <item>Remember username only</item>
-    <item>Remember username and password</item>
+    <item>Kom ihåg användarnamn och lösenord</item>
   </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-zh-rCN/strings.xml b/src/keepass2android/Resources/values-zh-rCN/strings.xml
index 38350ce9..96bea970 100644
--- a/src/keepass2android/Resources/values-zh-rCN/strings.xml
+++ b/src/keepass2android/Resources/values-zh-rCN/strings.xml
@@ -193,7 +193,6 @@
   <string name="error_string_key">每个字符串的字段名称是必需的</string>
   <string name="field_name">字段名</string>
   <string name="field_value">字段值</string>
-  <string name="protection">记忆保护</string>
   <string name="add_binary">添加附件...</string>
   <string name="add_extra_string">添加额外的字符串</string>
   <string name="database_loaded_quickunlock_enabled">数据库载入，快速解锁启用。</string>