Merge branch 'Release086'

Conflicts:
	src/keepass2android/Resources/Resource.designer.cs

src/Kp2aBusinessLogic/UiStringKey.cs

@@ -43,6 +43,7 @@ namespace keepass2android
 		RestoringRemoteFile,
 		CheckingDatabaseForChanges,
 		RemoteDatabaseUnchanged,
-		CannotMoveGroupHere
+		CannotMoveGroupHere,
+		ErrorOcurred
     }
 }

src/Kp2aBusinessLogic/database/edit/LoadDB.cs

@@ -51,27 +51,36 @@ namespace keepass2android
 				StatusLogger.UpdateMessage(UiStringKey.loading_database);
 				MemoryStream memoryStream = _databaseData == null ? null : _databaseData.Result;
 				_app.LoadDatabase(_ioc, memoryStream, _pass, _key, StatusLogger);
-				SaveFileData (_ioc, _key);
-				
-			} catch (KeyFileException) {
+				SaveFileData(_ioc, _key);
+
+			}
+			catch (KeyFileException)
+			{
 				Kp2aLog.Log("KeyFileException");
-				Finish(false, /*TODO Localize: use Keepass error text KPRes.KeyFileError (including "or invalid format")*/ _app.GetResourceString(UiStringKey.keyfile_does_not_exist));
+				Finish(false, /*TODO Localize: use Keepass error text KPRes.KeyFileError (including "or invalid format")*/
+				       _app.GetResourceString(UiStringKey.keyfile_does_not_exist));
 			}
 			catch (AggregateException e)
 			{
 				string message = e.Message;
 				foreach (var innerException in e.InnerExceptions)
 				{
-					message = innerException.Message; // Override the message shown with the last (hopefully most recent) inner exception
+					message = innerException.Message;
+						// Override the message shown with the last (hopefully most recent) inner exception
 					Kp2aLog.Log("Exception: " + message);
 				}
-				Finish(false, "An error occured: " + message);
+				Finish(false, UiStringKey.ErrorOcurred + " " + message);
+				return;
+			}
+			catch (OldFormatException )
+			{
+				Finish(false, "Cannot open Keepass 1.x database. As explained in the app description, Keepass2Android is for Keepass 2 only! Please use the desktop application to convert your database to the new file format!");
 				return;
 			}
 			catch (Exception e)
 			{
 				Kp2aLog.Log("Exception: " + e);
-				Finish(false, "An error occured: " + e.Message);
+				Finish(false, UiStringKey.ErrorOcurred + " " + e.Message);
 				return;
 			}
 			

src/TwofishCipher/Properties/AssemblyInfo.cs

@@ -29,6 +29,4 @@ using Android.App;
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 
-// Add some common permissions, these can be removed if not needed
-[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
 [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]

src/keepass2android/Properties/AndroidManifest_net.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="22" 
+			android:versionCode="23" 
 			android:versionName="0.8.6" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">

src/keepass2android/Properties/AndroidManifest_nonet.xml

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

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

@@ -10,6 +10,7 @@
   <string name="add_url_entry">Vytvořit položku pro adresu URL</string>
   <string name="add_group">Přidat skupinu</string>
   <string name="add_group_title">Přidat skupinu</string>
+  <string name="edit_group_title">Editovat skupinu</string>
   <string name="algorithm">Algoritmus</string>
   <string name="algorithm_colon">Algoritmus</string>
   <string name="app_name">Keepass2Android</string>
@@ -20,6 +21,11 @@
   <string name="app_timeout_summary">Čas před zamknutím databáze, když je aplikace neaktivní.</string>
   <string name="application">Aplikace</string>
   <string name="application_settings">Nastavení aplikace</string>
+  <string name="security_prefs">Zabezpečení</string>
+  <string name="display_prefs">Displej</string>
+  <string name="password_access_prefs">Přístup k heslu</string>
+  <string name="QuickUnlock_prefs">RychléOdemknutí</string>
+  <string name="FileHandling_prefs">Zpracování souborů</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="building_search_idx">Vytvářím vyhledávací index…</string>
@@ -121,6 +127,7 @@
   <string name="menu_app_settings">Nastavení</string>
   <string name="menu_db_settings">Nastavení databáze</string>
   <string name="menu_delete">Smazat</string>
+  <string name="menu_move">Přesunutí do jiné skupiny</string>
   <string name="menu_donate">Přispějte na pivo...</string>
   <string name="menu_edit">Změnit</string>
   <string name="menu_hide_password">Skrýt heslo</string>
@@ -168,6 +175,7 @@
   <string name="search_in">Hledat v</string>
   <string name="select_other_entry">Vyberte další položku</string>
   <string name="select_group_then_add">Otevřete požadovanou skupinu a poté stiskněte \"%1$s\"!</string>
+  <string name="insert_element_here">Sem vložit</string>
   <string name="twofish">Twofish</string>
   <string name="underline">Podtrhnout</string>
   <string name="unsupported_db_version">Nepodporovaná verze databáze.</string>
@@ -175,6 +183,10 @@
   <string name="warning_read_only">Vaše SD karta je v módu jen pro čtení. Nebudete moct ukládat změny v databázi.</string>
   <string name="warning_unmounted">SD karta není momentálně vložena do zařízení. Nebudete moci načíst nebo vytvořit databázi.</string>
   <string name="version_label">Verze</string>
+  <string name="version_history">Historie verzí</string>
+  <string name="author">Keepass2Android vyvýjí Philipp Crocoll.</string>
+  <string name="further_authors">Díky za příspěvky kódu %1$s.</string>
+  <string name="credit_plugin1">Modul šifry Twofish pro Keepass byl vyvinut společností Scott Greenberg a je součástí KP2A.</string>
   <string name="regular_expression">Regulární výraz</string>
   <string name="TanExpiresOnUse_title">Tan vyprší při použití</string>
   <string name="TanExpiresOnUse_summary">Při použití označovat vypršelé TAN položky</string>
@@ -198,6 +210,8 @@
   <string name="QuickUnlock_lockButton">Zavřít databázi</string>
   <string name="QuickUnlockDefaultEnabled_title">Ve výchozím nastavení povolit RychléOdemknutí</string>
   <string name="QuickUnlockDefaultEnabled_summary">Definuje, zda RychléOdemknutí je ve výchozím nastavení povoleno, nebo ne.</string>
+  <string name="QuickUnlockIconHidden_title">Skrýt ikonu RychléhoOdemknutí</string>
+  <string name="QuickUnlockIconHidden_summary">QuickUnlock bohužel nefunguje bez zobrazení  ikony upozornění. Vyberte tuto možnost, chcete-li použít transparentní ikonu.</string>
   <string name="QuickUnlockLength_title">Délka klíče pro RychléOdemknutí</string>
   <string name="QuickUnlockLength_summary">Maximální počet znaků používaných jako heslo pro RychléOdemknutí.</string>
   <string name="QuickUnlock_fail">RychléOdemknutí se nezdařilo: nesprávné heslo!</string>
@@ -223,7 +237,7 @@
   <string name="UseFileTransactions_title">Transakce souboru</string>
   <string name="UseFileTransactions_summary">Použít transakční metodu zápisu do databáze</string>
   <string name="UseOfflineCache_title">Ukládání databáze do mezipaměti</string>
-  <string name="UseOfflineCache_summary">Ukládání kopií vzdálených databázových souborů v adresáři aplikace. To umožňuje použít vzdálené databáze, i v offline režimu.</string>
+  <string name="UseOfflineCache_summary">Ukládání kopií vzdálených databázových souborů v adresáři aplikace. To umožňuje použít vzdálené databáze i v offline režimu.</string>
   <string name="ClearOfflineCache_title">Vyčistit mezipaměť?</string>
   <string name="ClearOfflineCache_question">Tímto odstraníte všechny soubory v mezipaměti databáze. Veškeré změny, které jste provedli v době bez internetového připojení, které nebyly dosud synchronizovány, budou ztraceny! Chcete pokračovat?</string>
   <string name="CheckForFileChangesOnSave_title">Kontrola změn</string>
@@ -284,7 +298,18 @@
   <string name="UpdatedCachedFileOnLoad">Aktualizace kopie databáze v místní mezipaměti.</string>
   <string name="RemoteDatabaseUnchanged">Nebyly zjištěny změny.</string>
   <string name="synchronize_database_menu">Synchronizovat databázi…</string>
+  <string name="CannotMoveGroupHere">Skupinu nelze přesunout do této skupiny.</string>
+  <string name="donate_question">Dnes je Oktoberfest! Pokud se vám líbí Keepass2Android: nebyl by dnes dobrý den koupit mi pivo?</string>
+  <string name="ok_donate">Chci vědět víc!</string>
+  <string name="no_thanks">Ne, moc se mi to nelíbí</string>
   <string name="ChangeLog_title">Protokol změn</string>
+  <string name="ChangeLog_0_8_6">
+  <b>Verze 0.8.6</b> \n 
+* podpora Twofish šifry\n 
+* možnost editace skupin\n 
+* možnost přesunu položek a skupin\n 
+* Ikona RychléhoOdemknutí může být zprůhledněna (viz nastavení)\n 
+* opravy chyb</string>
   <string name="ChangeLog_0_8_5">
   <b>Verze 0.8.5</b> \n
 * Vzdálené soubory jsou uloženy v mezipaměti místní aplikace, umožňující používání off-line (včetně úprav a pozdější synchronizace). Viz nastavení.\n

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

@@ -11,6 +11,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="add_url_entry">Eintrag für URL anlegen</string>
   <string name="add_group">Gruppe hinzufügen</string>
   <string name="add_group_title">Gruppe hinzufügen</string>
+  <string name="edit_group_title">Gruppe bearbeiten</string>
   <string name="algorithm">Algorithmus</string>
   <string name="algorithm_colon">Algorithmus</string>
   <string name="app_name">Keepass2Android</string>
@@ -21,6 +22,11 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="app_timeout_summary">Bei inaktiver Anwendung wird die Datenbank nach Ablauf der eingestellten Zeit automatisch gesperrt.</string>
   <string name="application">Anwendung</string>
   <string name="application_settings">Anwendungs-Einstellungen</string>
+  <string name="security_prefs">Sicherheit</string>
+  <string name="display_prefs">Anzeige</string>
+  <string name="password_access_prefs">Passwort-Zugriff</string>
+  <string name="QuickUnlock_prefs">QuickUnlock</string>
+  <string name="FileHandling_prefs">Umgang mit Dateien</string>
   <string name="brackets">Klammern</string>
   <string name="browser_intall_text">Um diese Funktion nutzen zu können, benötigen Sie den OI File Manager, den Sie über Google Play bzw. direkt von der Entwicklerwebsite herunterladen können. Aufgrund einiger Eigenheiten des Dateimanagers kann es bei der ersten Benutzung zu Einschränkungen kommen.</string>
   <string name="building_search_idx">Suchindex erzeugen…</string>
@@ -122,6 +128,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="menu_app_settings">Einstellungen</string>
   <string name="menu_db_settings">Datenbank-Einstellungen</string>
   <string name="menu_delete">Löschen</string>
+  <string name="menu_move">In andere Gruppe verschieben</string>
   <string name="menu_donate">Spendiere ein Bier...</string>
   <string name="menu_edit">Ändern</string>
   <string name="menu_hide_password">Kennwort verstecken</string>
@@ -169,6 +176,7 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="search_in">Suche in</string>
   <string name="select_other_entry">Anderen Eintrag wählen</string>
   <string name="select_group_then_add">Gehe zur gewünschten Gruppe, dann drücke \"%1$s\"!</string>
+  <string name="insert_element_here">Hier einfügen</string>
   <string name="twofish">Twofish</string>
   <string name="underline">Unterstrichen</string>
   <string name="unsupported_db_version">Datenbankversion wird nicht unterstützt.</string>
@@ -176,6 +184,10 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="warning_read_only">Der Speicherort hat nur Lese-Rechte. Zum Speichern ist er nicht geeignet, darum ist es unmöglich letzte Änderungen zu sichern.</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_history">Versionsinformationen</string>
+  <string name="author">Keepass2Android wird von Philipp Crocoll entwickelt.</string>
+  <string name="further_authors">Danke an %1$s für Beiträge zum Source-Code!</string>
+  <string name="credit_plugin1">Das Twofish-Plugin für Keepass wurde von Scott Greenberg entwickelt und ist in KP2A enthalten.</string>
   <string name="regular_expression">Regulärer Ausdruck</string>
   <string name="TanExpiresOnUse_title">Tan verfällt bei Verwendung</string>
   <string name="TanExpiresOnUse_summary">TAN Einträge als abgelaufen markieren, wenn sie geöffnet werden</string>
@@ -199,6 +211,8 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="QuickUnlock_lockButton">Datenbank schließen</string>
   <string name="QuickUnlockDefaultEnabled_title">QuickUnlock standardmäßig aktiviert</string>
   <string name="QuickUnlockDefaultEnabled_summary">Definiert, ob QuickUnlock standardmäßig aktiviert ist oder nicht.</string>
+  <string name="QuickUnlockIconHidden_title">QuickUnlock-Icon verstecken</string>
+  <string name="QuickUnlockIconHidden_summary">QuickUnlock funktioniert leider nicht ohne ein Benachrichtigungssymbol. Wähle diese Option, um ein transparentes Symbol zu verwenden.</string>
   <string name="QuickUnlockLength_title">Länge des QuickUnlock-Schlüssels</string>
   <string name="QuickUnlockLength_summary">Maximale Anzahl von Zeichen, die als QuickUnlock-Kennwort verwendet werden.</string>
   <string name="QuickUnlock_fail">QuickUnlock fehlgeschlagen: falsches Kennwort!</string>
@@ -284,8 +298,18 @@ Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die
   <string name="LoadedFromRemoteInSync">Remote-Datei und Cache stimmen überein.</string>
   <string name="UpdatedCachedFileOnLoad">Kopie der Datenbank im lokalen Cache aktualisiert.</string>
   <string name="RemoteDatabaseUnchanged">Keine Änderungen gefunden.</string>
-  <string name="synchronize_database_menu">Datenbank wird synchronisiert…</string>
+  <string name="synchronize_database_menu">Datenbank synchronisieren…</string>
+  <string name="CannotMoveGroupHere">Kann Gruppe nicht hierher verschieben.</string>
+  <string name="donate_question">Heute ist Oktoberfest! Wenn dir Keepass2Android gefällt: Wäre heute nicht ein guter Tag, um mir ein Bier zu spendieren?</string>
+  <string name="ok_donate">Warum nicht?</string>
+  <string name="no_thanks">So gut gefällt mir\'s dann auch nicht</string>
   <string name="ChangeLog_title">Neuigkeiten</string>
+  <string name="ChangeLog_0_8_6"><b>Version 0.8.6</b>\n
+* Unterstützung für Twofish-Verschlüsselung\n
+* Ermöglicht Bearbeiten von Gruppen\n
+* Ermöglich Verschieben von Einträgen und Gruppen\n
+* Das QuickUnlock-Icon kann transparent gemacht werden (s. Einstellungen)\n
+* Bugs behoben</string>
   <string name="ChangeLog_0_8_5"><b>Version 0.8.5</b>\n
 		* Remote-Dateien werden im lokalen Cache gespeichert. Das erlaubt Offline-Nutzung (inkl. Bearbeiten und späterem Synchronisieren). S. Einstellungen.\n
 		* Benachrichtigungssymbol zum Visualisieren des Sperr-Zustands (s. Einstellungen)\n

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

@@ -1,6 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.net-->
 <resources>
+  <string name="about_feedback">Anna palautetta</string>
+  <string name="about_homepage">Kotisivu</string>
+  <string name="AboutText">Keepass2Android on salasanojen hallintaohjelma, jolla voit lukea ja kirjoittaa KeePass 2.x versioiden tietokantoja Androidilla.</string>
+  <string name="accept">Hyväksy</string>
+  <string name="add_entry">Lisää merkintä</string>
+  <string name="add_url_entry">Luo merkintä URLista</string>
+  <string name="add_group">Lisää ryhmä</string>
+  <string name="add_group_title">Lisää ryhmä</string>
+  <string name="edit_group_title">Muokkaa ryhmää</string>
+  <string name="algorithm">Algoritmi</string>
+  <string name="algorithm_colon">Algoritmi</string>
+  <string name="app_name">Keepass2Android</string>
+  <string name="short_app_name">KP2A</string>
+  <string name="app_name_nonet">Keepass2Android Offline</string>
+  <string name="short_app_name_nonet">KP2A Offline</string>
+  <string name="app_timeout">Aikakatkaisu</string>
+  <string name="app_timeout_summary">Aika jonka jälkeen tietokanta lukkiutuu automaattisesti jos ohjelmaa ei käytetä.</string>
+  <string name="application">Ohjelma</string>
+  <string name="application_settings">Asetukset</string>
+  <string name="security_prefs">Turvallisuus</string>
+  <string name="display_prefs">Näyttö</string>
+  <string name="QuickUnlock_prefs">Pika-avaus</string>
+  <string name="FileHandling_prefs">Tiedostokäsittely</string>
+  <string name="brackets">Hakasulkeet</string>
+  <string name="browser_intall_text">Tiedostojen selaus vaatii Open Intents File Manager -ohjelman. Klikkaa alle asentaaksesi. Bugin takia selaus ei mahdollisesti toimi oikein ensimmäisellä käyttökerralla.</string>
   <string-array name="clipboard_timeout_options">
     <item>30 seconds</item>
     <item>1 minute</item>

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

@@ -10,6 +10,7 @@
   <string name="add_url_entry">Crea voce per l\'URL</string>
   <string name="add_group">Aggiungi gruppo</string>
   <string name="add_group_title">Aggiungi Gruppo</string>
+  <string name="edit_group_title">Modifica Gruppo</string>
   <string name="algorithm">Algoritmo</string>
   <string name="algorithm_colon">Algoritmo</string>
   <string name="app_name">Keepass2Android</string>
@@ -20,6 +21,11 @@
   <string name="app_timeout_summary">Periodo di inattività dell\'applicazione che precede il blocco del database.</string>
   <string name="application">Applicazione</string>
   <string name="application_settings">Impostazioni Applicazione</string>
+  <string name="security_prefs">Sicurezza</string>
+  <string name="display_prefs">Visualizzazione</string>
+  <string name="password_access_prefs">Inserimento password</string>
+  <string name="QuickUnlock_prefs">QuickUnlock</string>
+  <string name="FileHandling_prefs">Gestione dei file</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="building_search_idx">Creazione indice di ricerca…</string>
@@ -121,6 +127,7 @@
   <string name="menu_app_settings">Impostazioni</string>
   <string name="menu_db_settings">Impostazioni Database</string>
   <string name="menu_delete">Elimina</string>
+  <string name="menu_move">Sposta in un altro gruppo</string>
   <string name="menu_donate">Dona una birra...</string>
   <string name="menu_edit">Modifica</string>
   <string name="menu_hide_password">Nascondi Password</string>
@@ -168,6 +175,7 @@
   <string name="search_in">Cerca in</string>
   <string name="select_other_entry">Seleziona un\'altra voce</string>
   <string name="select_group_then_add">Apri il gruppo desiderato, poi premi \"%1$s\"!</string>
+  <string name="insert_element_here">Inserisci qui</string>
   <string name="twofish">Twofish</string>
   <string name="underline">Sottolinea</string>
   <string name="unsupported_db_version">Versione del database non supportata.</string>
@@ -175,6 +183,10 @@
   <string name="warning_read_only">La tua scheda SD è, attualmente, in sola lettura. Potresti non essere in grado di salvare le modifiche nel database.</string>
   <string name="warning_unmounted">La tua scheda SD non è attualmente montata. Non sarai in grado di caricare o creare nessun database.</string>
   <string name="version_label">Versione</string>
+  <string name="version_history">Cronologia delle versioni</string>
+  <string name="author">Keepass2Android è sviluppato da Philipp Crocoll.</string>
+  <string name="further_authors">Grazie per i contributi di codice di %1$s.</string>
+  <string name="credit_plugin1">il Plugin Twofish Cipher per Keepass è stato sviluppato da Scott Greenberg ed è incluso in KP2A.</string>
   <string name="regular_expression">Espressione regolare</string>
   <string name="TanExpiresOnUse_title">Tan scade con l\'uso</string>
   <string name="TanExpiresOnUse_summary">Segna i TAN come scaduti una volta utilizzati</string>
@@ -198,6 +210,8 @@
   <string name="QuickUnlock_lockButton">Chiudi il database</string>
   <string name="QuickUnlockDefaultEnabled_title">Abilita QuickUnlock come impostazione predefinita</string>
   <string name="QuickUnlockDefaultEnabled_summary">Indica se QuickUnlock è attivato per default o no.</string>
+  <string name="QuickUnlockIconHidden_title">Nascondi l\'icona QuickUnlock</string>
+  <string name="QuickUnlockIconHidden_summary">QuickUnlock purtroppo non funziona senza visualizzare un\'icona di notifica. Selezionare questa opzione per utilizzare l\'icona trasparente.</string>
   <string name="QuickUnlockLength_title">Lunghezza della chiave QuickUnlock</string>
   <string name="QuickUnlockLength_summary">Numero massimo di caratteri utilizzati come QuickUnlock password.</string>
   <string name="QuickUnlock_fail">QuickUnlock fallito: password errata!</string>
@@ -284,7 +298,18 @@
   <string name="UpdatedCachedFileOnLoad">Aggiornata la copia cache locale del database.</string>
   <string name="RemoteDatabaseUnchanged">Nessuna modifica rilevata.</string>
   <string name="synchronize_database_menu">Sincronizzazione del database…</string>
+  <string name="CannotMoveGroupHere">Non è possibile spostare il gruppo in questo gruppo.</string>
+  <string name="donate_question">Oggi è l\'Oktoberfest! Se ti piace Keepass2Android: non sarebbe un buon giorno per offrirmi una birra?</string>
+  <string name="ok_donate">Dimmi di più!</string>
+  <string name="no_thanks">No, non mi piace più di tanto</string>
   <string name="ChangeLog_title">log delle modifiche</string>
+  <string name="ChangeLog_0_8_6">
+<b>Versione 0.8.6</b>\n
+* Supporto per cifratura Twofish\n
+* Consentita la modifica dei gruppi\n
+* Consentito lo spostamento di voci e gruppi\n
+* L\'icona QuickUnlock può essere resa trasparente (vedi impostazioni)\n
+* Correzioni di bug</string>
   <string name="ChangeLog_0_8_5">
 <b>Versione 0.8.5</b>\n
 * i file remoti vengono mantenuti nella cache locale dell\'applicazione per permetterne l\'uso offline (compresa la modifica e la successiva sincronizzazione). Vedi Impostazioni. \n

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

@@ -10,6 +10,7 @@
   <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="edit_group_title">Editar Grupo</string>
   <string name="algorithm">Algoritmo</string>
   <string name="algorithm_colon">Algoritmo</string>
   <string name="app_name">Keepass2Android</string>
@@ -20,6 +21,7 @@
   <string name="app_timeout_summary">Tempo até que o banco de dados seja travado quando o aplicativo estiver inativo.</string>
   <string name="application">Aplicação</string>
   <string name="application_settings">Configurações</string>
+  <string name="security_prefs">Segurança</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="building_search_idx">Construindo índice de buscas…</string>
@@ -121,6 +123,7 @@
   <string name="menu_app_settings">Configurações</string>
   <string name="menu_db_settings">Configurações do banco de dados</string>
   <string name="menu_delete">Excluir</string>
+  <string name="menu_move">Mover para outro grupo</string>
   <string name="menu_donate">Doe uma cerveja...</string>
   <string name="menu_edit">Editar</string>
   <string name="menu_hide_password">Esconder Senha</string>
@@ -131,6 +134,7 @@
   <string name="menu_search">Procurar</string>
   <string name="menu_search_advanced">Pesquisa avançada</string>
   <string name="menu_url">Ir para URL</string>
+  <string name="menu_change_db">Alterar banco de dados…</string>
   <string name="minus">Menos</string>
   <string name="never">Nunca</string>
   <string name="yes">Sim</string>
@@ -179,6 +183,11 @@
   <string name="kp2a_findUrl">Keepass2Android: Buscar senha</string>
   <string name="search_options">Opções</string>
   <string name="start_open_file">Abrir arquivo...</string>
+  <string name="start_create">Criar novo banco de dados...</string>
+  <string name="QuickUnlock_lockButton">Fechar banco de dados</string>
+  <string name="QuickUnlockDefaultEnabled_title">Habilitar QuickUnlock por padrão</string>
+  <string name="AddingEntry">Adicionando a entrada…</string>
+  <string name="AddingGroup">Adicionando grupo…</string>
   <string-array name="clipboard_timeout_options">
     <item>30 segundos</item>
     <item>1 minuto</item>

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

@@ -10,6 +10,7 @@
   <string name="add_url_entry">Creaţi intrarea pentru URL</string>
   <string name="add_group">Adăugare grup</string>
   <string name="add_group_title">Adăugare grup</string>
+  <string name="edit_group_title">Editează Grup</string>
   <string name="algorithm">Algoritm</string>
   <string name="algorithm_colon">Algoritm</string>
   <string name="app_name">Keepass2Android</string>
@@ -20,6 +21,11 @@
   <string name="app_timeout_summary">Timp înainte de blocarea bazei de date atunci când aplicația este inactivă.</string>
   <string name="application">Aplicația</string>
   <string name="application_settings">Setări aplicație</string>
+  <string name="security_prefs">Securitate</string>
+  <string name="display_prefs">Afişare</string>
+  <string name="password_access_prefs">Acces introducere parolă</string>
+  <string name="QuickUnlock_prefs">QuickUnlock</string>
+  <string name="FileHandling_prefs">Tratare fişiere</string>
   <string name="brackets">Paranteze</string>
   <string name="browser_intall_text">Navigarea fișierelor necesită Open Intents File Manager, click mai jos pentru a-l instala. Datorită unor mici probleme cu managerul de fișiere navigarea s-ar putea să nu funcționeze corect prima dată când navigați.</string>
   <string name="building_search_idx">Creează index de căutare…</string>
@@ -121,6 +127,7 @@
   <string name="menu_app_settings">Setări</string>
   <string name="menu_db_settings">Setări baze de date</string>
   <string name="menu_delete">Şterge</string>
+  <string name="menu_move">Muta într-un alt grup</string>
   <string name="menu_donate">Doneaza o bere...</string>
   <string name="menu_edit">Editare</string>
   <string name="menu_hide_password">Ascunde parola</string>
@@ -131,6 +138,7 @@
   <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="menu_change_db">Schimbă baza de date…</string>
   <string name="minus">Minus</string>
   <string name="never">Niciodată</string>
   <string name="yes">Da</string>
@@ -167,6 +175,7 @@
   <string name="search_in">Căutare în</string>
   <string name="select_other_entry">Selectaţi o altă înregistrare</string>
   <string name="select_group_then_add">Deschideți grupul dorit, apoi apăsaţi \"%1$s\"!</string>
+  <string name="insert_element_here">Introduceţi aici</string>
   <string name="twofish">Twofish</string>
   <string name="underline">Subliniere</string>
   <string name="unsupported_db_version">Versiunea bazei de date nesuportată.</string>
@@ -174,11 +183,17 @@
   <string name="warning_read_only">Cardul sd este momentan read-only. Nu veți putea salva modificările la baza de date.</string>
   <string name="warning_unmounted">Cardul sd nu este montat momentan. Nu veți putea încărca sau crea baza de date.</string>
   <string name="version_label">Versiunea</string>
+  <string name="version_history">Istoric versiuni</string>
+  <string name="author">Keepass2Android este dezvoltat de către Philipp Crocoll.</string>
+  <string name="further_authors">Vă mulţumim pentru contribuţiile cod %1$s.</string>
+  <string name="credit_plugin1">Plugin-ul pentru cifrul Twofish  a fost dezvoltat de Scott Greenberg şi este inclus în KP2A.</string>
   <string name="regular_expression">Regular expression</string>
   <string name="TanExpiresOnUse_title">Tan expiră la utilizare</string>
   <string name="TanExpiresOnUse_summary">Marchează înregistrările TAN ca expirate la utilizarea lor</string>
   <string name="ShowUsernameInList_title">Afişeayă numele utilizator în lista</string>
   <string name="ShowUsernameInList_summary">Afişează numele utilizator sub înregistrări. Util pentru conturi sau TAN-uri multiple.</string>
+  <string name="RememberRecentFiles_title">Reţine baza de date</string>
+  <string name="RememberRecentFiles_summary">Reţine baze de date deschise recent si afişează-le în ecranul de deschidere a bazelor de date.</string>
   <string name="kp2a_findUrl">Keepass2Android: Cautare parolă</string>
   <string name="excludeExpiredEntries">Exclude înregistrările expirate</string>
   <string name="search_options">Opţiuni</string>
@@ -196,6 +211,8 @@
   <string name="QuickUnlock_lockButton">Închide baza de date</string>
   <string name="QuickUnlockDefaultEnabled_title">Permite QuickUnlock implicit</string>
   <string name="QuickUnlockDefaultEnabled_summary">Defineşte dacă QuickUnlock este activat implicit sau nu.</string>
+  <string name="QuickUnlockIconHidden_title">Ascunde icoana QuickUnlock</string>
+  <string name="QuickUnlockIconHidden_summary">QuickUnlock nu funcţionează din păcate fără a afişa o icoană de notificare. Selectaţi această opţiune pentru a utiliza o icoană transparentă.</string>
   <string name="QuickUnlockLength_title">Lungimea cheii QuickUnlock</string>
   <string name="QuickUnlockLength_summary">Numărul maxim de caractere utilizate ca şi parolă QuickUnlock.</string>
   <string name="QuickUnlock_fail">QuickUnlock a eşuat: parolă incorectă!</string>
@@ -215,9 +232,15 @@
   <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">%1$s: blocat. QuickUnlock activat.</string>
+  <string name="database_loaded_unlocked">%1$s: deblocat.</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="UseOfflineCache_title">Caching bază de date</string>
+  <string name="UseOfflineCache_summary">Păstrează o copie a bazelor de date remote în directorul cache. Aceasta vă permite să le utilizaţi şi offline.</string>
+  <string name="ClearOfflineCache_title">Goliţi Cache-ul?</string>
+  <string name="ClearOfflineCache_question">Aceasta va şterge toate bazele de date din cache. Orice modificări făcute offline ce nu au fost sincronizate vor fi pierdute! Continuaţi?</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>
@@ -226,6 +249,10 @@
   <string name="ShowKp2aKeyboardNotification_summary">Oferă întreaga înregistrare folosind tastatura KP2A (recomandat).</string>
   <string name="OpenKp2aKeyboardAutomatically_title">Dialog selectare tastatură</string>
   <string name="OpenKp2aKeyboardAutomatically_summary">Deschide dialogul de selecţie a tastaturii atunci când înregistrarea este disponibilă prin KP2A după căutare.</string>
+  <string name="ShowUnlockedNotification_title">Notificare în timp ce este deblocat</string>
+  <string name="ShowUnlockedNotification_summary">Afişează o notificare \"în curs\" în timp ce baza de date este deblocată.</string>
+  <string name="PreloadDatabaseEnabled_title">Pre-încărca fişierul bază de date</string>
+  <string name="PreloadDatabaseEnabled_summary">Începe încărcarea în fundal sau descărcarea de la distanţă în timp ce se introduce parola.</string>
   <string name="AskOverwriteBinary">Doriţi să suprascrieţi binarul existent folosind acelaşi nume?</string>
   <string name="AskOverwriteBinary_title">Suprascrieţi binarul existent?</string>
   <string name="AskOverwriteBinary_yes">Suprascrie</string>
@@ -257,7 +284,40 @@
   <string name="SynchronizingDatabase">Se combină modificările…</string>
   <string name="YesSynchronize">Da, combină</string>
   <string name="NoOverwrite">Nu, suprascrie</string>
+  <string name="SynchronizingCachedDatabase">Sincronizează baza de date din cache…</string>
+  <string name="DownloadingRemoteFile">Se descarcă fişierul de la distanţă…</string>
+  <string name="UploadingFile">Se încarcă fişierul…</string>
+  <string name="RestoringRemoteFile">Se restaurează fişierul de la distanţă…</string>
+  <string name="FilesInSync">Fişierele sunt sincronizate.</string>
+  <string name="SynchronizedDatabaseSuccessfully">Baza de date s-a sincronizat cu succes!</string>
+  <string name="CheckingDatabaseForChanges">Verific baza de date pentru modificări…</string>
+  <string name="CouldNotSaveToRemote">Nu s-a putut salva la distanţă: %1$s. Salvaţi din nou sau folosiţi meniul Sincronizare atunci când conexiunea revine.</string>
+  <string name="CouldNotLoadFromRemote">Nu s-a putut deschide de la distanţă: %1$s. S-a încărcat versiunea locală. Totuşi puteţi face modificări în baza de date şi să le sincronizaţi ulterior.</string>
+  <string name="UpdatedRemoteFileOnLoad">S-a actualizat fişierul remote.</string>
+  <string name="NotifyOpenFromLocalDueToConflict">S-a deschis varianta locală din cauza unor conflicte cu varianta remote. Folosiţi meniul Sincronizare pentru a combina.</string>
+  <string name="LoadedFromRemoteInSync">Varianta remote şi din cache sun sincronizate.</string>
+  <string name="UpdatedCachedFileOnLoad">S-a actualizat varianta locală a bazei de date.</string>
+  <string name="RemoteDatabaseUnchanged">Nu s-au detectat modificări.</string>
+  <string name="synchronize_database_menu">Sincronizează baza de date…</string>
+  <string name="CannotMoveGroupHere">Nu se poate muta grupul în acest grup.</string>
+  <string name="donate_question">Astăzi este Oktoberfest! Dacă vă place Keepass2Android: nu ar fi azi o zi potrivită să-mi cumpăraţi o bere?</string>
+  <string name="ok_donate">Spune-mi mai multe!</string>
+  <string name="no_thanks">Nu, nu-mi place atât de mult</string>
   <string name="ChangeLog_title">Change log</string>
+  <string name="ChangeLog_0_8_6">
+<b>Versiunea 0.8.6</b>\n
+* Suport pentru cifrul Twofish\n
+* Permite editarea de grupuri\n
+* Permite mutarea de intrări şi grupuri\n
+* Icoana QuickUnlock poate fi făcută transparentă (setări)\n
+* Bug fixes</string>
+  <string name="ChangeLog_0_8_5"><b>Versiunea 0.8.5</b>\n
+* Fişierele remote sunt stocate local în cache-ul aplicaţiei pentru a permite utilizare offline (inclusiv editare şi sincronizare ulterioară). Verificaţi setările.\n
+* Icoană de notificare pentru a vizualiza starea de blocare a bazei de date (verificaţi setările)\n
+* Determinare imbunătăţită a stării de blocare în unele situaţii\n
+* Bazele de date sunt incărcate în memorie în timpul introducerii parolei pentru scurtarea timpului de incărcare (verificaţi setările)\n
+* Se pot adăuga intrări în grupul rădăcină\n
+* Bug fixes (rezolvă câmpurile referinţă, probleme cu tastatura pe aparatele italiene şi chineze)</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 

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

@@ -3,13 +3,14 @@
 <resources>
   <string name="about_feedback">Оставить отзыв</string>
   <string name="about_homepage">Сайт</string>
-  <string name="AboutText">Keepass2Android является Android-версией программы KeePass Password Safe</string>
-  <string name="CreditsText">Пользовательский интерфейс на основе порта KeepassDroid, разработанной Брайан Пеллин. Код для операций базы данных основан на KeePass Доминик Райхль. Android робот воспроизводён или модифицирован или изменение от работы, созданной и опубликованной Google и используются в соответствии с условиями, описанными в лицензии Creative Commons 3.0 Attribution.</string>
+  <string name="AboutText">Keepass2Android — это менеджер паролей, обеспечивающий полноценную работу с базами KeePass 2.x на Android.</string>
+  <string name="CreditsText">Пользовательский интерфейс основан на портированной версии KeepassDroid, разработанной Брайаном Пеллином. Код для операций с базой данных основан на KeePass Доминика Райхля. Робот Android воссоздан или модифицирован на основе версии, созданной и опубликованной Google, и используются в соответствии с условиями, описанными в лицензии Creative Commons 3.0 Attribution.</string>
   <string name="accept">Принять</string>
-  <string name="add_entry">Новая запись</string>
+  <string name="add_entry">Добавить запись</string>
   <string name="add_url_entry">Создать запись для URL</string>
-  <string name="add_group">Новая группа</string>
-  <string name="add_group_title">Новая группа</string>
+  <string name="add_group">Добавить группу</string>
+  <string name="add_group_title">Добавить группу</string>
+  <string name="edit_group_title">Изменить группу</string>
   <string name="algorithm">Алгоритм</string>
   <string name="algorithm_colon">Алгоритм</string>
   <string name="app_name">Keepass2Android</string>
@@ -20,6 +21,11 @@
   <string name="app_timeout_summary">Задержка блокировки при бездействии</string>
   <string name="application">Программа</string>
   <string name="application_settings">Настройки Keepass2Android</string>
+  <string name="security_prefs">Безопасность</string>
+  <string name="display_prefs">Отображение</string>
+  <string name="password_access_prefs">Парольный доступ</string>
+  <string name="QuickUnlock_prefs">QuickUnlock</string>
+  <string name="FileHandling_prefs">Обработка файлов</string>
   <string name="brackets">{[(Скобки)]}</string>
   <string name="browser_intall_text">Для функции обзора необходим менеджер файлов – OI File Manager (альтернативы – Total Commander, NARF File Manager)</string>
   <string name="building_search_idx">Индексирование…</string>
@@ -121,6 +127,7 @@
   <string name="menu_app_settings">Настройки</string>
   <string name="menu_db_settings">Настройки базы KeePass</string>
   <string name="menu_delete">Удалить</string>
+  <string name="menu_move">Переместить в другую группу</string>
   <string name="menu_donate">Пожертвуйте на пиво...</string>
   <string name="menu_edit">Правка</string>
   <string name="menu_hide_password">Скрыть</string>
@@ -168,6 +175,7 @@
   <string name="search_in">Поиск в</string>
   <string name="select_other_entry">Выбрать другую запись</string>
   <string name="select_group_then_add">Откройте требуемую группу, а затем нажмите \"%1$s\"!</string>
+  <string name="insert_element_here">Вставить сюда</string>
   <string name="twofish">Twofish</string>
   <string name="underline">_Подчёркивание_</string>
   <string name="unsupported_db_version">Неподдерживаемая версия базы</string>
@@ -175,6 +183,10 @@
   <string name="warning_read_only">Запись на карту памяти невозможна. Изменения не будут сохранены</string>
   <string name="warning_unmounted">Карта памяти не подключена. Работа с базой невозможна</string>
   <string name="version_label">Версия</string>
+  <string name="version_history">История версий</string>
+  <string name="author">Keepass2Android разработан Philipp Crocoll.</string>
+  <string name="further_authors">Благодарю %1$s за участие в разработке.</string>
+  <string name="credit_plugin1">Плагин шифрования Twofish для Keepass, включенный в KP2A, был разработан Скоттом Гринбергом.</string>
   <string name="regular_expression">Регулярное выражение</string>
   <string name="TanExpiresOnUse_title">TAN устаревают при использовании</string>
   <string name="TanExpiresOnUse_summary">Помечать TAN записи как устаревшие при их использовании</string>
@@ -194,13 +206,15 @@
   <string name="enter_filename_details_create_import">На следующем шаге будет выбран файл для импорта.</string>
   <string name="enable_quickunlock">Включить БыструюРазблокировку</string>
   <string name="QuickUnlock_label">Введите последние %1$d символов вашего пароля:</string>
-  <string name="QuickUnlock_button">БыстраяРазблокировка!</string>
+  <string name="QuickUnlock_button">QuickUnlock!</string>
   <string name="QuickUnlock_lockButton">Закрыть базу данных</string>
   <string name="QuickUnlockDefaultEnabled_title">Включить БыструюРазблокировку по умолчанию</string>
-  <string name="QuickUnlockDefaultEnabled_summary">Определяет, включена ли БыстраяРазблокировка по умолчанию или нет.</string>
+  <string name="QuickUnlockDefaultEnabled_summary">Определяет, включен ли QuickUnlock по умолчанию.</string>
+  <string name="QuickUnlockIconHidden_title">Скрыть значок БыстройРазблокировки</string>
+  <string name="QuickUnlockIconHidden_summary">К сожалению, QuickUnlock не работает без отображения значка уведомлений. Включите этот параметр для использования прозрачного значка.</string>
   <string name="QuickUnlockLength_title">Длина ключа БыстройРазблокировки</string>
   <string name="QuickUnlockLength_summary">Максимальное количество символов, используемых как пароль БыстройРазблокировки.</string>
-  <string name="QuickUnlock_fail">БыстраяРазблокировка не удалась: неправильный пароль!</string>
+  <string name="QuickUnlock_fail">QuickUnlock не сработал: неправильный пароль!</string>
   <string name="BinaryDirectory_title">Каталог файлов-вложений</string>
   <string name="BinaryDirectory_summary">Каталог для сохранения вложенных файлов.</string>
   <string name="SaveAttachmentDialog_title">Сохранить вложение</string>
@@ -217,7 +231,7 @@
   <string name="add_binary">Добавьте вложенный файл...</string>
   <string name="add_extra_string">Добавить дополнительную строку</string>
   <string name="delete_extra_string">Удалить дополнительную строку</string>
-  <string name="database_loaded_quickunlock_enabled">%1$s: Заблокирована. БыстраяРазблокировка включена.</string>
+  <string name="database_loaded_quickunlock_enabled">%1$s: Заблокирована. QuickUnlock включен.</string>
   <string name="database_loaded_unlocked">%1$s: Разблокирована.</string>
   <string name="credentials_dialog_title">Введите учетные данные сервера</string>
   <string name="UseFileTransactions_title">Файловые транзакции</string>
@@ -284,7 +298,17 @@
   <string name="UpdatedCachedFileOnLoad">Обновление локальной кэшированной копии базы данных.</string>
   <string name="RemoteDatabaseUnchanged">Изменений не обнаружено.</string>
   <string name="synchronize_database_menu">Синхронизируйте базу данных…</string>
+  <string name="CannotMoveGroupHere">Не удается переместить группу в эту группу.</string>
+  <string name="donate_question">Сегодня Октоберфест! Если вам нравится Keepass2Android: сегодня хороший день, чтобы купить мне пива?</string>
+  <string name="ok_donate">Расскажите мне ещё!</string>
+  <string name="no_thanks">Спасибо, больше не нужно</string>
   <string name="ChangeLog_title">Список изменений</string>
+  <string name="ChangeLog_0_8_6"><b>Версия 0.8.6</b>\n
+* Поддержка шифрования Twofish\n
+* Возможность редактировать группы\n
+* Возможность переносить записи и группы\n
+* Значок БыстройРазблокировки можно сделать прозрачнымQuickUnlock (см. настройки)\n
+* Исправления ошибок</string>
   <string name="ChangeLog_0_8_5"><b>Версия 0.8.5</b>\n
 * Удалённый файлы хранятся в локальном кэше приложения для оффлайн-использования (включая редактирование и синхронизацию). См.  настройки. \n
 * Значок в уведомления для отображения статуса блокировки базы данных (см. настройки)\n

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

@@ -7,6 +7,7 @@
   <string name="add_entry">Ny post</string>
   <string name="add_group">Ny grupp</string>
   <string name="add_group_title">Ny grupp</string>
+  <string name="edit_group_title">Redigera grupp</string>
   <string name="algorithm">Algoritm</string>
   <string name="algorithm_colon">Algoritm</string>
   <string name="app_name">Keepass2Android</string>
@@ -17,11 +18,16 @@
   <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="security_prefs">Säkerhet</string>
+  <string name="QuickUnlock_prefs">QuickUnlock</string>
+  <string name="FileHandling_prefs">Filhantering</string>
   <string name="brackets">Paranteser</string>
+  <string name="browser_intall_text">Filhantering kräver Open Intents File Manager, klicka nedan för att installera. Filhanteraren kanske inte fungerar korrekt vid första användningen.</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="clipboard_timeout_summary">Tiden innan användarnamn och lösenord rensas från urklipp</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>
@@ -34,6 +40,9 @@
   <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="enter_filename">Ange databasnamn</string>
+  <string name="entry_accessed">Senast använd</string>
+  <string name="entry_and_or">Ange ett lösenord eller en nyckelfil för att låsa upp databasen</string>
   <string name="entry_cancel">Avbryt</string>
   <string name="entry_comment">Kommentarer</string>
   <string name="entry_tags">Taggar</string>
@@ -47,28 +56,46 @@
   <string name="entry_title">Namn</string>
   <string name="entry_url">URL</string>
   <string name="entry_user_name">Användarnamn</string>
+  <string name="entry_extra_strings">Extra strängfält</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_filename_required">Filnamn krävs.</string>
+  <string name="error_file_not_create">Kunde inte skapa filen</string>
   <string name="error_invalid_db">Ogiltig databas.</string>
   <string name="error_invalid_path">Ogiltig sökväg.</string>
+  <string name="error_no_name">Ett namn krävs.</string>
   <string name="error_nopass">Det krävs ett lösenord eller en nyckelfil.</string>
+  <string name="error_out_of_memory">Telefonen fick slut på minne vid läsning av din databas. Den kan vara för stor för din telefon.</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="error_title_required">Titel krävs.</string>
   <string name="FileNotFound">Hittar inte filen.</string>
+  <string name="generate_password">Generera lösenord</string>
   <string name="group">Grupp</string>
   <string name="hint_comment">kommentar</string>
+  <string name="hint_conf_pass">Bekräfta lösenord</string>
   <string name="hint_group_name">Gruppnamn</string>
+  <string name="hint_keyfile">Nyckelfil</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_tags">tag1, tag2</string>
   <string name="hint_username">användarnamn</string>
   <string name="install_from_market">Installera från Play Store</string>
+  <string name="install_from_website">Installera från webben</string>
+  <string name="InvalidPassword">Ogiltigt lösenord eller nyckelfil.</string>
+  <string name="invalid_algorithm">Ogiltig algoritm.</string>
+  <string name="invalid_db_sig">Databasformat känns inte igen.</string>
+  <string name="keyfile_does_not_exist">Nyckelfilen finns inte.</string>
+  <string name="keyfile_is_empty">Nyckelfilen är tom.</string>
   <string name="length">Längd</string>
+  <string name="lowercase">Gemener</string>
   <string name="MaskedPassword">*****</string>
+  <string name="maskpass_summary">Dölja lösenord som standard</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>
@@ -90,29 +117,53 @@
   <string name="yes">Ja</string>
   <string name="no">Nej</string>
   <string name="progress_title">Arbetar...</string>
+  <string name="remember_keyfile_summary">Kom ihåg platsen för nyckelfilen</string>
+  <string name="remember_keyfile_title">Spara nyckelfil</string>
+  <string name="remove_from_filelist">Ta bort</string>
+  <string name="rijndael">Rijndael (AES)</string>
   <string name="root">Root</string>
   <string name="rounds_hint">rundor</string>
+  <string name="database_name">Databasnamn</string>
   <string name="saving_database">Sparar databasen...</string>
   <string name="space">Utrymme</string>
   <string name="search_label">Sök</string>
+  <string name="show_password">Visa lösenord</string>
   <string name="sort_name">Sortera efter namn</string>
   <string name="sort_db">Sortera efter datum</string>
+  <string name="special">Special</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="warning_read_only">Ditt sd-kort är för närvarande skrivskyddat. Du kan inte spara ändringar till databasen.</string>
+  <string name="warning_unmounted">Ditt sd-kort är för närvarande inte monterad på din enhet. Du kommer inte att kunna läsa in eller skapa databasen.</string>
   <string name="version_label">Version</string>
+  <string name="version_history">Versionshistorik</string>
+  <string name="RememberRecentFiles_title">Kom ihåg databaser</string>
   <string name="search_options">Alternativ</string>
+  <string name="start_open_file">Öppna fil...</string>
+  <string name="start_create">Skapa ny databas...</string>
   <string name="start_open_url">Öppna URL...</string>
+  <string name="start_create_import">Importera filen till ny databas...</string>
   <string name="enable_quickunlock">Aktivera QuickUnlock</string>
   <string name="QuickUnlock_button">QuickUnlock!</string>
+  <string name="QuickUnlock_lockButton">Stäng databasen</string>
+  <string name="QuickUnlockDefaultEnabled_title">Aktivera QuickUnlock som standard</string>
+  <string name="QuickUnlockDefaultEnabled_summary">Anger om QuickUnlock är aktiverad som standard eller inte.</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="AskOverwriteBinary_yes">Skriv över</string>
+  <string name="AskOverwriteBinary_no">Ändra namn</string>
+  <string name="RecycleBin">Papperskorgen</string>
+  <string name="AskDeletePermanently_title">Ta bort permanent?</string>
   <string name="translate_app">Översätt KP2A</string>
+  <string name="YesSynchronize">Ja, slå samman</string>
+  <string name="NoOverwrite">Nej, skriv över</string>
+  <string name="FilesInSync">Filerna är synkroniserade.</string>
   <string name="ChangeLog_title">Ändringslogg</string>
   <string-array name="clipboard_timeout_options">
     <item>30 sekunder</item>
@@ -127,7 +178,7 @@
   </string-array>
   <string-array name="cred_remember_modes">
     <item>Do not remember username and password</item>
-    <item>Remember username only</item>
+    <item>Kom endast ihåg användarnamnet</item>
     <item>Kom ihåg användarnamn och lösenord</item>
   </string-array>
 </resources>

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

@@ -167,7 +167,7 @@
   <string name="search_results">搜索结果</string>
   <string name="search_in">在...中搜索</string>
   <string name="select_other_entry">选择另一条目</string>
-  <string name="select_group_then_add">打开所需的组，然后按\"%1$s\"！</string>
+  <string name="select_group_then_add">打开所需的组，然后按\"%1$s\"</string>
   <string name="twofish">Twofish算法</string>
   <string name="underline">下划线</string>
   <string name="unsupported_db_version">不支持的数据库版本</string>

src/keepass2android/Resources/values/strings.xml

@@ -307,6 +307,8 @@
 	<string name="UpdatedCachedFileOnLoad">Updated local cache copy of database.</string>
 	<string name="RemoteDatabaseUnchanged">No changes detected.</string>
 
+	<string name="ErrorOcurred">An error occured:</string>
+
 	<string name="synchronize_database_menu">Synchronize database…</string>
 
 	<string name="CannotMoveGroupHere">Cannot move group to this group.</string>