From b844f78f6bfd87f37ab750959dcaf6839b62f3e6 Mon Sep 17 00:00:00 2001
From: PhilippC <philipp.crocoll@web.de>
Date: Wed, 27 Feb 2013 04:59:46 +0100
Subject: [PATCH] used resources from Crowdin, some cleanup therefore, some
 more or less empty resource files

---
 .../Resources/Resource.designer.cs            | 648 +++++++++---------
 .../layout/file_selection_filename.xml        |   3 +-
 .../Resources/values-ca/strings.xml           | 337 +++++----
 .../Resources/values-cs/strings.xml           | 332 +++++----
 .../Resources/values-da/strings.xml           | 331 ++++-----
 .../Resources/values-de/strings.xml           |  21 +-
 .../Resources/values-es/strings.xml           | 337 +++++----
 .../Resources/values-fr/strings.xml           | 211 +++---
 .../Resources/values-hu/strings.xml           | 319 +++++----
 .../Resources/values-it/strings.xml           | 331 ++++-----
 .../Resources/values-ja/strings.xml           | 331 +++++----
 .../Resources/values-nl/strings.xml           | 330 ++++-----
 .../Resources/values-nn/strings.xml           | 332 +++++----
 .../Resources/values-pl/strings.xml           | 323 ++++-----
 .../Resources/values-pt-rBR/strings.xml       | 334 +++++----
 .../Resources/values-ru/strings.xml           | 338 +++++----
 .../Resources/values-sk/strings.xml           | 330 +++++----
 .../Resources/values-uk/strings.xml           | 330 +++++----
 .../Resources/values-zh-rCN/strings.xml       | 331 +++++----
 .../Resources/values-zh-rTW/strings.xml       | 331 +++++----
 .../Resources/values/config.xml               |   3 +-
 .../Resources/values/strings.xml              | 477 ++++++-------
 .../Resources/xml/preferences.xml             |   1 -
 .../fileselect/FileSelectActivity.cs          |   4 +-
 24 files changed, 3132 insertions(+), 3533 deletions(-)

diff --git a/src/keepass2android/Resources/Resource.designer.cs b/src/keepass2android/Resources/Resource.designer.cs
index a92afbe4..1ef96035 100644
--- a/src/keepass2android/Resources/Resource.designer.cs
+++ b/src/keepass2android/Resources/Resource.designer.cs
@@ -997,23 +997,23 @@ namespace keepass2android
 		public partial class String
 		{
 			
-			// aapt resource value: 0x7f05001f
-			public const int AboutText = 2131034143;
+			// aapt resource value: 0x7f050020
+			public const int AboutText = 2131034144;
+			
+			// aapt resource value: 0x7f0500e4
+			public const int AskOverwriteBinary = 2131034340;
 			
 			// aapt resource value: 0x7f0500e7
-			public const int AskOverwriteBinary = 2131034343;
+			public const int AskOverwriteBinary_no = 2131034343;
 			
-			// aapt resource value: 0x7f0500ea
-			public const int AskOverwriteBinary_no = 2131034346;
+			// aapt resource value: 0x7f0500e5
+			public const int AskOverwriteBinary_title = 2131034341;
+			
+			// aapt resource value: 0x7f0500e6
+			public const int AskOverwriteBinary_yes = 2131034342;
 			
 			// aapt resource value: 0x7f0500e8
-			public const int AskOverwriteBinary_title = 2131034344;
-			
-			// aapt resource value: 0x7f0500e9
-			public const int AskOverwriteBinary_yes = 2131034345;
-			
-			// aapt resource value: 0x7f0500eb
-			public const int AttachFailed = 2131034347;
+			public const int AttachFailed = 2131034344;
 			
 			// aapt resource value: 0x7f050017
 			public const int BinaryDirectory_default = 2131034135;
@@ -1021,68 +1021,68 @@ namespace keepass2android
 			// aapt resource value: 0x7f050016
 			public const int BinaryDirectory_key = 2131034134;
 			
-			// aapt resource value: 0x7f0500d9
-			public const int BinaryDirectory_summary = 2131034329;
+			// aapt resource value: 0x7f0500d6
+			public const int BinaryDirectory_summary = 2131034326;
 			
-			// aapt resource value: 0x7f0500d8
-			public const int BinaryDirectory_title = 2131034328;
+			// aapt resource value: 0x7f0500d5
+			public const int BinaryDirectory_title = 2131034325;
 			
-			// aapt resource value: 0x7f050031
-			public const int ClearClipboard = 2131034161;
+			// aapt resource value: 0x7f050032
+			public const int ClearClipboard = 2131034162;
 			
-			// aapt resource value: 0x7f050020
-			public const int CreditsText = 2131034144;
+			// aapt resource value: 0x7f050021
+			public const int CreditsText = 2131034145;
 			
-			// aapt resource value: 0x7f050067
-			public const int FileNotFound = 2131034215;
+			// aapt resource value: 0x7f050068
+			public const int FileNotFound = 2131034216;
 			
-			// aapt resource value: 0x7f05007a
-			public const int InvalidPassword = 2131034234;
+			// aapt resource value: 0x7f05007b
+			public const int InvalidPassword = 2131034235;
 			
-			// aapt resource value: 0x7f050084
-			public const int MaskedPassword = 2131034244;
+			// aapt resource value: 0x7f050085
+			public const int MaskedPassword = 2131034245;
 			
 			// aapt resource value: 0x7f050018
 			public const int QuickUnlockDefaultEnabled_key = 2131034136;
 			
-			// aapt resource value: 0x7f0500d3
-			public const int QuickUnlockDefaultEnabled_summary = 2131034323;
+			// aapt resource value: 0x7f0500d1
+			public const int QuickUnlockDefaultEnabled_summary = 2131034321;
 			
-			// aapt resource value: 0x7f0500d2
-			public const int QuickUnlockDefaultEnabled_title = 2131034322;
+			// aapt resource value: 0x7f0500d0
+			public const int QuickUnlockDefaultEnabled_title = 2131034320;
 			
-			// aapt resource value: 0x7f0500d7
-			public const int QuickUnlockLength_default = 2131034327;
+			// aapt resource value: 0x7f05001a
+			public const int QuickUnlockLength_default = 2131034138;
 			
 			// aapt resource value: 0x7f050019
 			public const int QuickUnlockLength_key = 2131034137;
 			
-			// aapt resource value: 0x7f0500d5
-			public const int QuickUnlockLength_summary = 2131034325;
+			// aapt resource value: 0x7f0500d3
+			public const int QuickUnlockLength_summary = 2131034323;
+			
+			// aapt resource value: 0x7f0500d2
+			public const int QuickUnlockLength_title = 2131034322;
+			
+			// aapt resource value: 0x7f0500ce
+			public const int QuickUnlock_button = 2131034318;
 			
 			// aapt resource value: 0x7f0500d4
-			public const int QuickUnlockLength_title = 2131034324;
+			public const int QuickUnlock_fail = 2131034324;
 			
-			// aapt resource value: 0x7f0500d0
-			public const int QuickUnlock_button = 2131034320;
-			
-			// aapt resource value: 0x7f0500d6
-			public const int QuickUnlock_fail = 2131034326;
+			// aapt resource value: 0x7f0500cd
+			public const int QuickUnlock_label = 2131034317;
 			
 			// aapt resource value: 0x7f0500cf
-			public const int QuickUnlock_label = 2131034319;
+			public const int QuickUnlock_lockButton = 2131034319;
 			
-			// aapt resource value: 0x7f0500d1
-			public const int QuickUnlock_lockButton = 2131034321;
+			// aapt resource value: 0x7f0500e9
+			public const int RecycleBin = 2131034345;
 			
-			// aapt resource value: 0x7f0500ec
-			public const int RecycleBin = 2131034348;
+			// aapt resource value: 0x7f0500d8
+			public const int SaveAttachment_Failed = 2131034328;
 			
-			// aapt resource value: 0x7f0500db
-			public const int SaveAttachment_Failed = 2131034331;
-			
-			// aapt resource value: 0x7f0500da
-			public const int SaveAttachment_doneMessage = 2131034330;
+			// aapt resource value: 0x7f0500d7
+			public const int SaveAttachment_doneMessage = 2131034327;
 			
 			// aapt resource value: 0x7f050014
 			public const int TanExpiresOnUse_key = 2131034132;
@@ -1093,47 +1093,44 @@ namespace keepass2android
 			// aapt resource value: 0x7f0500c0
 			public const int TanExpiresOnUse_title = 2131034304;
 			
-			// aapt resource value: 0x7f05001a
-			public const int UseFileTransactions_key = 2131034138;
+			// aapt resource value: 0x7f05001b
+			public const int UseFileTransactions_key = 2131034139;
 			
-			// aapt resource value: 0x7f0500e6
-			public const int UseFileTransactions_summary = 2131034342;
-			
-			// aapt resource value: 0x7f0500e5
-			public const int UseFileTransactions_title = 2131034341;
-			
-			// aapt resource value: 0x7f05001d
-			public const int about_feedback = 2131034141;
-			
-			// aapt resource value: 0x7f05001e
-			public const int about_homepage = 2131034142;
-			
-			// aapt resource value: 0x7f0500ed
-			public const int about_twitter = 2131034349;
-			
-			// aapt resource value: 0x7f050021
-			public const int accept = 2131034145;
-			
-			// aapt resource value: 0x7f0500e1
-			public const int add_binary = 2131034337;
-			
-			// aapt resource value: 0x7f050022
-			public const int add_entry = 2131034146;
+			// aapt resource value: 0x7f0500e3
+			public const int UseFileTransactions_summary = 2131034339;
 			
 			// aapt resource value: 0x7f0500e2
-			public const int add_extra_string = 2131034338;
+			public const int UseFileTransactions_title = 2131034338;
+			
+			// aapt resource value: 0x7f05001e
+			public const int about_feedback = 2131034142;
+			
+			// aapt resource value: 0x7f05001f
+			public const int about_homepage = 2131034143;
+			
+			// aapt resource value: 0x7f050022
+			public const int accept = 2131034146;
+			
+			// aapt resource value: 0x7f0500de
+			public const int add_binary = 2131034334;
 			
 			// aapt resource value: 0x7f050023
-			public const int add_group = 2131034147;
+			public const int add_entry = 2131034147;
+			
+			// aapt resource value: 0x7f0500df
+			public const int add_extra_string = 2131034335;
 			
 			// aapt resource value: 0x7f050024
-			public const int add_group_title = 2131034148;
+			public const int add_group = 2131034148;
 			
 			// aapt resource value: 0x7f050025
-			public const int algorithm = 2131034149;
+			public const int add_group_title = 2131034149;
 			
 			// aapt resource value: 0x7f050026
-			public const int algorithm_colon = 2131034150;
+			public const int algorithm = 2131034150;
+			
+			// aapt resource value: 0x7f050027
+			public const int algorithm_colon = 2131034151;
 			
 			// aapt resource value: 0x7f050008
 			public const int algorithm_key = 2131034120;
@@ -1141,305 +1138,296 @@ namespace keepass2android
 			// aapt resource value: 0x7f050009
 			public const int app_key = 2131034121;
 			
-			// aapt resource value: 0x7f050027
-			public const int app_name = 2131034151;
+			// aapt resource value: 0x7f050028
+			public const int app_name = 2131034152;
 			
-			// aapt resource value: 0x7f050029
-			public const int app_timeout = 2131034153;
+			// aapt resource value: 0x7f05002a
+			public const int app_timeout = 2131034154;
 			
 			// aapt resource value: 0x7f05000a
 			public const int app_timeout_key = 2131034122;
 			
-			// aapt resource value: 0x7f05002a
-			public const int app_timeout_summary = 2131034154;
-			
 			// aapt resource value: 0x7f05002b
-			public const int application = 2131034155;
+			public const int app_timeout_summary = 2131034155;
 			
 			// aapt resource value: 0x7f05002c
-			public const int application_settings = 2131034156;
+			public const int application = 2131034156;
 			
 			// aapt resource value: 0x7f05002d
-			public const int brackets = 2131034157;
+			public const int application_settings = 2131034157;
 			
 			// aapt resource value: 0x7f05002e
-			public const int browser_intall_text = 2131034158;
+			public const int brackets = 2131034158;
 			
 			// aapt resource value: 0x7f05002f
-			public const int building_search_idx = 2131034159;
+			public const int browser_intall_text = 2131034159;
 			
 			// aapt resource value: 0x7f050030
-			public const int cancel = 2131034160;
+			public const int building_search_idx = 2131034160;
+			
+			// aapt resource value: 0x7f050031
+			public const int cancel = 2131034161;
 			
 			// aapt resource value: 0x7f0500c5
 			public const int caseSensitive = 2131034309;
 			
-			// aapt resource value: 0x7f050032
-			public const int clipboard_timeout = 2131034162;
+			// aapt resource value: 0x7f050033
+			public const int clipboard_timeout = 2131034163;
 			
-			// aapt resource value: 0x7f05001b
-			public const int clipboard_timeout_default = 2131034139;
+			// aapt resource value: 0x7f05001c
+			public const int clipboard_timeout_default = 2131034140;
 			
 			// aapt resource value: 0x7f05000b
 			public const int clipboard_timeout_key = 2131034123;
 			
-			// aapt resource value: 0x7f050033
-			public const int clipboard_timeout_summary = 2131034163;
-			
-			// aapt resource value: 0x7f050035
-			public const int copy_password = 2131034165;
-			
 			// aapt resource value: 0x7f050034
-			public const int copy_username = 2131034164;
+			public const int clipboard_timeout_summary = 2131034164;
 			
 			// aapt resource value: 0x7f050036
-			public const int creating_db_key = 2131034166;
+			public const int copy_password = 2131034166;
 			
-			// aapt resource value: 0x7f0500e4
-			public const int credentials_dialog_title = 2131034340;
+			// aapt resource value: 0x7f050035
+			public const int copy_username = 2131034165;
 			
 			// aapt resource value: 0x7f050037
-			public const int current_group = 2131034167;
+			public const int creating_db_key = 2131034167;
+			
+			// aapt resource value: 0x7f0500e1
+			public const int credentials_dialog_title = 2131034337;
 			
 			// aapt resource value: 0x7f050038
-			public const int current_group_root = 2131034168;
+			public const int current_group = 2131034168;
 			
 			// aapt resource value: 0x7f050039
-			public const int database = 2131034169;
+			public const int current_group_root = 2131034169;
 			
-			// aapt resource value: 0x7f0500e3
-			public const int database_loaded_quickunlock_enabled = 2131034339;
+			// aapt resource value: 0x7f05003a
+			public const int database = 2131034170;
+			
+			// aapt resource value: 0x7f0500e0
+			public const int database_loaded_quickunlock_enabled = 2131034336;
 			
 			// aapt resource value: 0x7f05000c
 			public const int db_key = 2131034124;
 			
-			// aapt resource value: 0x7f05003a
-			public const int decrypting_db = 2131034170;
-			
 			// aapt resource value: 0x7f05003b
-			public const int decrypting_entry = 2131034171;
+			public const int decrypting_db = 2131034171;
 			
 			// aapt resource value: 0x7f05003c
-			public const int default_checkbox = 2131034172;
+			public const int decrypting_entry = 2131034172;
+			
+			// aapt resource value: 0x7f05003d
+			public const int default_checkbox = 2131034173;
 			
 			// aapt resource value: 0x7f050001
 			public const int default_file_path = 2131034113;
 			
-			// aapt resource value: 0x7f0500ac
-			public const int default_username = 2131034284;
+			// aapt resource value: 0x7f0500ad
+			public const int default_username = 2131034285;
 			
 			// aapt resource value: 0x7f050015
 			public const int default_username_key = 2131034133;
 			
-			// aapt resource value: 0x7f0500ad
-			public const int default_username_summary = 2131034285;
-			
-			// aapt resource value: 0x7f05003d
-			public const int digits = 2131034173;
-			
 			// aapt resource value: 0x7f05003e
-			public const int disclaimer_formal = 2131034174;
+			public const int digits = 2131034174;
+			
+			// aapt resource value: 0x7f05003f
+			public const int disclaimer_formal = 2131034175;
 			
 			// aapt resource value: 0x7f050002
 			public const int donate_url = 2131034114;
 			
-			// aapt resource value: 0x7f05003f
-			public const int ellipsis = 2131034175;
-			
-			// aapt resource value: 0x7f0500ce
-			public const int enable_quickunlock = 2131034318;
-			
 			// aapt resource value: 0x7f050040
-			public const int enter_filename = 2131034176;
+			public const int ellipsis = 2131034176;
 			
 			// aapt resource value: 0x7f0500cc
-			public const int enter_filename_details_create = 2131034316;
-			
-			// aapt resource value: 0x7f0500cd
-			public const int enter_filename_details_create_import = 2131034317;
-			
-			// aapt resource value: 0x7f0500ca
-			public const int enter_filename_details_file = 2131034314;
-			
-			// aapt resource value: 0x7f0500cb
-			public const int enter_filename_details_url = 2131034315;
+			public const int enable_quickunlock = 2131034316;
 			
 			// aapt resource value: 0x7f050041
-			public const int entry_accessed = 2131034177;
+			public const int enter_filename = 2131034177;
+			
+			// aapt resource value: 0x7f0500cb
+			public const int enter_filename_details_create_import = 2131034315;
+			
+			// aapt resource value: 0x7f0500ca
+			public const int enter_filename_details_url = 2131034314;
 			
 			// aapt resource value: 0x7f050042
-			public const int entry_and_or = 2131034178;
-			
-			// aapt resource value: 0x7f050052
-			public const int entry_binaries = 2131034194;
+			public const int entry_accessed = 2131034178;
 			
 			// aapt resource value: 0x7f050043
-			public const int entry_cancel = 2131034179;
-			
-			// aapt resource value: 0x7f050044
-			public const int entry_comment = 2131034180;
-			
-			// aapt resource value: 0x7f050047
-			public const int entry_confpassword = 2131034183;
-			
-			// aapt resource value: 0x7f050048
-			public const int entry_created = 2131034184;
-			
-			// aapt resource value: 0x7f050049
-			public const int entry_expires = 2131034185;
-			
-			// aapt resource value: 0x7f050051
-			public const int entry_extra_strings = 2131034193;
-			
-			// aapt resource value: 0x7f05004a
-			public const int entry_keyfile = 2131034186;
-			
-			// aapt resource value: 0x7f05004b
-			public const int entry_modified = 2131034187;
-			
-			// aapt resource value: 0x7f050046
-			public const int entry_override_url = 2131034182;
-			
-			// aapt resource value: 0x7f05004c
-			public const int entry_password = 2131034188;
-			
-			// aapt resource value: 0x7f05004d
-			public const int entry_save = 2131034189;
-			
-			// aapt resource value: 0x7f050045
-			public const int entry_tags = 2131034181;
-			
-			// aapt resource value: 0x7f05004e
-			public const int entry_title = 2131034190;
-			
-			// aapt resource value: 0x7f05004f
-			public const int entry_url = 2131034191;
-			
-			// aapt resource value: 0x7f050050
-			public const int entry_user_name = 2131034192;
+			public const int entry_and_or = 2131034179;
 			
 			// aapt resource value: 0x7f050053
-			public const int error_arc4 = 2131034195;
+			public const int entry_binaries = 2131034195;
+			
+			// aapt resource value: 0x7f050044
+			public const int entry_cancel = 2131034180;
+			
+			// aapt resource value: 0x7f050045
+			public const int entry_comment = 2131034181;
+			
+			// aapt resource value: 0x7f050048
+			public const int entry_confpassword = 2131034184;
+			
+			// aapt resource value: 0x7f050049
+			public const int entry_created = 2131034185;
+			
+			// aapt resource value: 0x7f05004a
+			public const int entry_expires = 2131034186;
+			
+			// aapt resource value: 0x7f050052
+			public const int entry_extra_strings = 2131034194;
+			
+			// aapt resource value: 0x7f05004b
+			public const int entry_keyfile = 2131034187;
+			
+			// aapt resource value: 0x7f05004c
+			public const int entry_modified = 2131034188;
+			
+			// aapt resource value: 0x7f050047
+			public const int entry_override_url = 2131034183;
+			
+			// aapt resource value: 0x7f05004d
+			public const int entry_password = 2131034189;
+			
+			// aapt resource value: 0x7f05004e
+			public const int entry_save = 2131034190;
+			
+			// aapt resource value: 0x7f050046
+			public const int entry_tags = 2131034182;
+			
+			// aapt resource value: 0x7f05004f
+			public const int entry_title = 2131034191;
+			
+			// aapt resource value: 0x7f050050
+			public const int entry_url = 2131034192;
+			
+			// aapt resource value: 0x7f050051
+			public const int entry_user_name = 2131034193;
 			
 			// aapt resource value: 0x7f050054
-			public const int error_can_not_handle_uri = 2131034196;
+			public const int error_arc4 = 2131034196;
 			
 			// aapt resource value: 0x7f050055
-			public const int error_could_not_create_group = 2131034197;
+			public const int error_can_not_handle_uri = 2131034197;
 			
 			// aapt resource value: 0x7f050056
-			public const int error_could_not_create_parent = 2131034198;
+			public const int error_could_not_create_group = 2131034198;
 			
 			// aapt resource value: 0x7f050057
-			public const int error_database_exists = 2131034199;
+			public const int error_could_not_create_parent = 2131034199;
 			
 			// aapt resource value: 0x7f050058
-			public const int error_database_settings = 2131034200;
+			public const int error_database_exists = 2131034200;
 			
 			// aapt resource value: 0x7f050059
-			public const int error_failed_to_launch_link = 2131034201;
-			
-			// aapt resource value: 0x7f05005b
-			public const int error_file_not_create = 2131034203;
+			public const int error_database_settings = 2131034201;
 			
 			// aapt resource value: 0x7f05005a
-			public const int error_filename_required = 2131034202;
+			public const int error_failed_to_launch_link = 2131034202;
 			
 			// aapt resource value: 0x7f05005c
-			public const int error_invalid_db = 2131034204;
+			public const int error_file_not_create = 2131034204;
 			
-			// aapt resource value: 0x7f0500dc
-			public const int error_invalid_expiry_date = 2131034332;
+			// aapt resource value: 0x7f05005b
+			public const int error_filename_required = 2131034203;
 			
 			// aapt resource value: 0x7f05005d
-			public const int error_invalid_path = 2131034205;
+			public const int error_invalid_db = 2131034205;
+			
+			// aapt resource value: 0x7f0500d9
+			public const int error_invalid_expiry_date = 2131034329;
 			
 			// aapt resource value: 0x7f05005e
-			public const int error_no_name = 2131034206;
+			public const int error_invalid_path = 2131034206;
 			
 			// aapt resource value: 0x7f05005f
-			public const int error_nopass = 2131034207;
+			public const int error_no_name = 2131034207;
 			
 			// aapt resource value: 0x7f050060
-			public const int error_out_of_memory = 2131034208;
+			public const int error_nopass = 2131034208;
 			
 			// aapt resource value: 0x7f050061
-			public const int error_pass_gen_type = 2131034209;
+			public const int error_out_of_memory = 2131034209;
 			
 			// aapt resource value: 0x7f050062
-			public const int error_pass_match = 2131034210;
+			public const int error_pass_gen_type = 2131034210;
 			
 			// aapt resource value: 0x7f050063
-			public const int error_rounds_not_number = 2131034211;
+			public const int error_pass_match = 2131034211;
 			
 			// aapt resource value: 0x7f050064
-			public const int error_rounds_too_large = 2131034212;
-			
-			// aapt resource value: 0x7f0500dd
-			public const int error_string_key = 2131034333;
+			public const int error_rounds_not_number = 2131034212;
 			
 			// aapt resource value: 0x7f050065
-			public const int error_title_required = 2131034213;
+			public const int error_rounds_too_large = 2131034213;
+			
+			// aapt resource value: 0x7f0500da
+			public const int error_string_key = 2131034330;
 			
 			// aapt resource value: 0x7f050066
-			public const int error_wrong_length = 2131034214;
+			public const int error_title_required = 2131034214;
+			
+			// aapt resource value: 0x7f050067
+			public const int error_wrong_length = 2131034215;
 			
 			// aapt resource value: 0x7f0500c3
 			public const int excludeExpiredEntries = 2131034307;
 			
-			// aapt resource value: 0x7f0500de
-			public const int field_name = 2131034334;
+			// aapt resource value: 0x7f0500db
+			public const int field_name = 2131034331;
 			
-			// aapt resource value: 0x7f0500df
-			public const int field_value = 2131034335;
-			
-			// aapt resource value: 0x7f050068
-			public const int file_browser = 2131034216;
+			// aapt resource value: 0x7f0500dc
+			public const int field_value = 2131034332;
 			
 			// aapt resource value: 0x7f050069
-			public const int generate_password = 2131034217;
+			public const int file_browser = 2131034217;
 			
 			// aapt resource value: 0x7f05006a
-			public const int group = 2131034218;
+			public const int generate_password = 2131034218;
 			
 			// aapt resource value: 0x7f05006b
-			public const int hint_comment = 2131034219;
+			public const int group = 2131034219;
 			
 			// aapt resource value: 0x7f05006c
-			public const int hint_conf_pass = 2131034220;
+			public const int hint_comment = 2131034220;
 			
 			// aapt resource value: 0x7f05006d
-			public const int hint_generated_password = 2131034221;
+			public const int hint_conf_pass = 2131034221;
 			
 			// aapt resource value: 0x7f05006e
-			public const int hint_group_name = 2131034222;
+			public const int hint_generated_password = 2131034222;
 			
 			// aapt resource value: 0x7f05006f
-			public const int hint_keyfile = 2131034223;
+			public const int hint_group_name = 2131034223;
 			
 			// aapt resource value: 0x7f050070
-			public const int hint_length = 2131034224;
-			
-			// aapt resource value: 0x7f050072
-			public const int hint_login_pass = 2131034226;
-			
-			// aapt resource value: 0x7f050075
-			public const int hint_override_url = 2131034229;
+			public const int hint_keyfile = 2131034224;
 			
 			// aapt resource value: 0x7f050071
-			public const int hint_pass = 2131034225;
-			
-			// aapt resource value: 0x7f050076
-			public const int hint_tags = 2131034230;
+			public const int hint_length = 2131034225;
 			
 			// aapt resource value: 0x7f050073
-			public const int hint_title = 2131034227;
+			public const int hint_login_pass = 2131034227;
 			
-			// aapt resource value: 0x7f050074
-			public const int hint_url = 2131034228;
+			// aapt resource value: 0x7f050076
+			public const int hint_override_url = 2131034230;
+			
+			// aapt resource value: 0x7f050072
+			public const int hint_pass = 2131034226;
 			
 			// aapt resource value: 0x7f050077
-			public const int hint_username = 2131034231;
+			public const int hint_tags = 2131034231;
+			
+			// aapt resource value: 0x7f050074
+			public const int hint_title = 2131034228;
+			
+			// aapt resource value: 0x7f050075
+			public const int hint_url = 2131034229;
+			
+			// aapt resource value: 0x7f050078
+			public const int hint_username = 2131034232;
 			
 			// aapt resource value: 0x7f050003
 			public const int homepage = 2131034115;
@@ -1447,26 +1435,26 @@ namespace keepass2android
 			// aapt resource value: 0x7f050004
 			public const int homepage_short = 2131034116;
 			
-			// aapt resource value: 0x7f050078
-			public const int install_from_market = 2131034232;
-			
 			// aapt resource value: 0x7f050079
-			public const int install_from_website = 2131034233;
+			public const int install_from_market = 2131034233;
 			
-			// aapt resource value: 0x7f05007b
-			public const int invalid_algorithm = 2131034235;
+			// aapt resource value: 0x7f05007a
+			public const int install_from_website = 2131034234;
 			
 			// aapt resource value: 0x7f05007c
-			public const int invalid_db_sig = 2131034236;
+			public const int invalid_algorithm = 2131034236;
+			
+			// aapt resource value: 0x7f05007d
+			public const int invalid_db_sig = 2131034237;
 			
 			// aapt resource value: 0x7f050005
 			public const int issues = 2131034117;
 			
-			// aapt resource value: 0x7f05007d
-			public const int keyfile_does_not_exist = 2131034237;
-			
 			// aapt resource value: 0x7f05007e
-			public const int keyfile_is_empty = 2131034238;
+			public const int keyfile_does_not_exist = 2131034238;
+			
+			// aapt resource value: 0x7f05007f
+			public const int keyfile_is_empty = 2131034239;
 			
 			// aapt resource value: 0x7f05000e
 			public const int keyfile_key = 2131034126;
@@ -1474,104 +1462,104 @@ namespace keepass2android
 			// aapt resource value: 0x7f0500c2
 			public const int kp2a_findUrl = 2131034306;
 			
-			// aapt resource value: 0x7f05007f
-			public const int length = 2131034239;
+			// aapt resource value: 0x7f050080
+			public const int length = 2131034240;
 			
 			// aapt resource value: 0x7f050000
 			public const int library_name = 2131034112;
 			
-			// aapt resource value: 0x7f05001c
-			public const int list_size_default = 2131034140;
+			// aapt resource value: 0x7f05001d
+			public const int list_size_default = 2131034141;
 			
 			// aapt resource value: 0x7f050011
 			public const int list_size_key = 2131034129;
 			
-			// aapt resource value: 0x7f050081
-			public const int list_size_summary = 2131034241;
-			
-			// aapt resource value: 0x7f050080
-			public const int list_size_title = 2131034240;
-			
 			// aapt resource value: 0x7f050082
-			public const int loading_database = 2131034242;
+			public const int list_size_summary = 2131034242;
+			
+			// aapt resource value: 0x7f050081
+			public const int list_size_title = 2131034241;
 			
 			// aapt resource value: 0x7f050083
-			public const int lowercase = 2131034243;
+			public const int loading_database = 2131034243;
+			
+			// aapt resource value: 0x7f050084
+			public const int lowercase = 2131034244;
 			
 			// aapt resource value: 0x7f05000f
 			public const int maskpass_key = 2131034127;
 			
-			// aapt resource value: 0x7f050086
-			public const int maskpass_summary = 2131034246;
-			
-			// aapt resource value: 0x7f050085
-			public const int maskpass_title = 2131034245;
-			
 			// aapt resource value: 0x7f050087
-			public const int menu_about = 2131034247;
+			public const int maskpass_summary = 2131034247;
 			
-			// aapt resource value: 0x7f05008c
-			public const int menu_app_settings = 2131034252;
+			// aapt resource value: 0x7f050086
+			public const int maskpass_title = 2131034246;
 			
 			// aapt resource value: 0x7f050088
-			public const int menu_change_key = 2131034248;
-			
-			// aapt resource value: 0x7f050089
-			public const int menu_copy_pass = 2131034249;
-			
-			// aapt resource value: 0x7f05008a
-			public const int menu_copy_user = 2131034250;
-			
-			// aapt resource value: 0x7f05008b
-			public const int menu_create = 2131034251;
+			public const int menu_about = 2131034248;
 			
 			// aapt resource value: 0x7f05008d
-			public const int menu_db_settings = 2131034253;
+			public const int menu_app_settings = 2131034253;
+			
+			// aapt resource value: 0x7f050089
+			public const int menu_change_key = 2131034249;
+			
+			// aapt resource value: 0x7f05008a
+			public const int menu_copy_pass = 2131034250;
+			
+			// aapt resource value: 0x7f05008b
+			public const int menu_copy_user = 2131034251;
+			
+			// aapt resource value: 0x7f05008c
+			public const int menu_create = 2131034252;
 			
 			// aapt resource value: 0x7f05008e
-			public const int menu_delete = 2131034254;
+			public const int menu_db_settings = 2131034254;
 			
 			// aapt resource value: 0x7f05008f
-			public const int menu_donate = 2131034255;
+			public const int menu_delete = 2131034255;
 			
 			// aapt resource value: 0x7f050090
-			public const int menu_edit = 2131034256;
+			public const int menu_donate = 2131034256;
 			
 			// aapt resource value: 0x7f050091
-			public const int menu_hide_password = 2131034257;
+			public const int menu_edit = 2131034257;
 			
 			// aapt resource value: 0x7f050092
-			public const int menu_homepage = 2131034258;
+			public const int menu_hide_password = 2131034258;
 			
 			// aapt resource value: 0x7f050093
-			public const int menu_lock = 2131034259;
+			public const int menu_homepage = 2131034259;
 			
 			// aapt resource value: 0x7f050094
-			public const int menu_open = 2131034260;
+			public const int menu_lock = 2131034260;
 			
 			// aapt resource value: 0x7f050095
-			public const int menu_rename = 2131034261;
+			public const int menu_open = 2131034261;
 			
 			// aapt resource value: 0x7f050096
-			public const int menu_search = 2131034262;
+			public const int menu_rename = 2131034262;
 			
 			// aapt resource value: 0x7f050097
-			public const int menu_url = 2131034263;
+			public const int menu_search = 2131034263;
 			
 			// aapt resource value: 0x7f050098
-			public const int minus = 2131034264;
+			public const int menu_url = 2131034264;
 			
 			// aapt resource value: 0x7f050099
-			public const int never = 2131034265;
+			public const int minus = 2131034265;
 			
 			// aapt resource value: 0x7f05009a
-			public const int no_keys = 2131034266;
+			public const int never = 2131034266;
 			
 			// aapt resource value: 0x7f05009b
-			public const int no_results = 2131034267;
+			public const int no_keys = 2131034267;
 			
 			// aapt resource value: 0x7f05009c
-			public const int no_url_handler = 2131034268;
+			public const int no_results = 2131034268;
+			
+			// aapt resource value: 0x7f05009d
+			public const int no_url_handler = 2131034269;
 			
 			// aapt resource value: 0x7f050006
 			public const int oi_filemanager_market = 2131034118;
@@ -1582,56 +1570,56 @@ namespace keepass2android
 			// aapt resource value: 0x7f050010
 			public const int omitbackup_key = 2131034128;
 			
+			// aapt resource value: 0x7f0500a0
+			public const int omitbackup_summary = 2131034272;
+			
 			// aapt resource value: 0x7f05009f
-			public const int omitbackup_summary = 2131034271;
+			public const int omitbackup_title = 2131034271;
 			
 			// aapt resource value: 0x7f05009e
-			public const int omitbackup_title = 2131034270;
-			
-			// aapt resource value: 0x7f05009d
-			public const int open_recent = 2131034269;
-			
-			// aapt resource value: 0x7f0500a0
-			public const int pass_filename = 2131034272;
+			public const int open_recent = 2131034270;
 			
 			// aapt resource value: 0x7f0500a1
-			public const int password_title = 2131034273;
+			public const int pass_filename = 2131034273;
 			
 			// aapt resource value: 0x7f0500a2
-			public const int progress_create = 2131034274;
+			public const int password_title = 2131034274;
 			
 			// aapt resource value: 0x7f0500a3
-			public const int progress_title = 2131034275;
+			public const int progress_create = 2131034275;
 			
-			// aapt resource value: 0x7f0500e0
-			public const int protection = 2131034336;
+			// aapt resource value: 0x7f0500a4
+			public const int progress_title = 2131034276;
+			
+			// aapt resource value: 0x7f0500dd
+			public const int protection = 2131034333;
 			
 			// aapt resource value: 0x7f0500bf
 			public const int regular_expression = 2131034303;
 			
-			// aapt resource value: 0x7f0500a4
-			public const int remember_keyfile_summary = 2131034276;
-			
 			// aapt resource value: 0x7f0500a5
-			public const int remember_keyfile_title = 2131034277;
+			public const int remember_keyfile_summary = 2131034277;
 			
 			// aapt resource value: 0x7f0500a6
-			public const int remove_from_filelist = 2131034278;
+			public const int remember_keyfile_title = 2131034278;
 			
 			// aapt resource value: 0x7f0500a7
-			public const int rijndael = 2131034279;
+			public const int remove_from_filelist = 2131034279;
 			
 			// aapt resource value: 0x7f0500a8
-			public const int root = 2131034280;
+			public const int rijndael = 2131034280;
 			
 			// aapt resource value: 0x7f0500a9
-			public const int rounds = 2131034281;
+			public const int root = 2131034281;
 			
 			// aapt resource value: 0x7f0500aa
-			public const int rounds_explaination = 2131034282;
+			public const int rounds = 2131034282;
 			
 			// aapt resource value: 0x7f0500ab
-			public const int rounds_hint = 2131034283;
+			public const int rounds_explaination = 2131034283;
+			
+			// aapt resource value: 0x7f0500ac
+			public const int rounds_hint = 2131034284;
 			
 			// aapt resource value: 0x7f05000d
 			public const int rounds_key = 2131034125;
@@ -1654,8 +1642,8 @@ namespace keepass2android
 			// aapt resource value: 0x7f0500b6
 			public const int search_results = 2131034294;
 			
-			// aapt resource value: 0x7f050028
-			public const int short_app_name = 2131034152;
+			// aapt resource value: 0x7f050029
+			public const int short_app_name = 2131034153;
 			
 			// aapt resource value: 0x7f0500b1
 			public const int show_password = 2131034289;
diff --git a/src/keepass2android/Resources/layout/file_selection_filename.xml b/src/keepass2android/Resources/layout/file_selection_filename.xml
index 072b93c6..589e5db3 100644
--- a/src/keepass2android/Resources/layout/file_selection_filename.xml
+++ b/src/keepass2android/Resources/layout/file_selection_filename.xml
@@ -37,8 +37,7 @@
             android:id="@+id/label_open_by_filename_details"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/file_filename"
-            android:text="@string/enter_filename_details_file" />
+            android:layout_below="@id/file_filename"/>
         <Button
             android:id="@+id/open"
             android:text="@string/menu_open"
diff --git a/src/keepass2android/Resources/values-ca/strings.xml b/src/keepass2android/Resources/values-ca/strings.xml
index 74289536..4d357f0d 100644
--- a/src/keepass2android/Resources/values-ca/strings.xml
+++ b/src/keepass2android/Resources/values-ca/strings.xml
@@ -1,183 +1,160 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
-  
-  Catalan translation by Oriol Garrote
-  
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Comentaris</string>    
-    <string name="about_homepage">Pàgina inici</string>    
-    <string name="AboutText">Keepass2Android és una implementació per Android de KeePass password manager.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Accepta</string>
-    <string name="add_entry">Afegeix entrada</string>
-    <string name="add_group">Afegeix grup</string>
-    <string name="add_group_title">Afegeix grup</string>
-    <string name="algorithm">Algoritme</string>
-    <string name="algorithm_colon">Algoritme</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Temps d\'espera de l\'aplicació</string>
-    <string name="app_timeout_summary">Temps abans de bloquejar la base de dades quan l\'applicació està inactiva.</string>
-    <string name="application">Aplicació</string>
-    <string name="application_settings">Paràmetres de l\'aplicació</string>
-    <string name="brackets">Parèntesis</string>
-    <string name="browser_intall_text">L\'exploració d\'arxius necessita l\'aplicació Open Intents File Manager, clica a sota per instal·lar-la. Degut a peculiaritats de l\'explorador d\'arxius pot ser que no funcioni correctament la primera execució.</string>
-    <string name="building_search_idx">Construint índex de cerca&#8230;</string>
-    <string name="cancel">Cancel·la</string>
-    <string name="ClearClipboard">Porta-retalls netejat.</string>
-    <string name="clipboard_timeout">Temps d\'espera del porta-retalls</string>
-    <string name="clipboard_timeout_summary">Temps abans de netejar el porta-retalls després de copiar un usuari o contrasenya</string>
-    <string name="copy_username">Selecciona per copiar l\'usuari al porta-retalls</string>
-    <string name="copy_password">Selecciona per copiar la contrasenya al porta-retalls</string>
-    <string name="creating_db_key">Creant clau de base de dades&#8230;</string>
-    <string name="current_group">Grup actual</string>
-    <string name="current_group_root">Grup actual: Arrel</string>
-    <string name="database">Base de dades</string>
-    <string name="decrypting_db">Desencriptant continguts de la base de dades&#8230;</string>
-    <string name="decrypting_entry">Desencriptant entrada</string>
-    <string name="default_checkbox">Utilitza aquesta com a base de dades per defecte</string>
-    <string name="digits">Dígits</string>
-    <string name="disclaimer_formal">Keepass2Android ve SENSE CAP MENA DE GARANTIA; Això és programari lliure, i pots redistribuïr-lo sota els termes de la llicència GPL versió 2 o posterior.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Introdueix el nom de la base de dades</string>    
-    <string name="entry_accessed">Accedida</string>
-    <string name="entry_and_or">Introdueix una contrasenya i/o un arxiu clau per desbloquejar la base de dades</string>    
-    <string name="entry_cancel">Cancel·la</string>
-    <string name="entry_comment">Comentaris</string>
-    <string name="entry_confpassword">Confirma contrasenya</string>    
-    <string name="entry_created">Creada</string>
-    <string name="entry_expires">Expira</string>
-    <string name="entry_keyfile">Arxiu clau (opcional)</string>
-    <string name="entry_modified">Modificada</string>
-    <string name="entry_password">Contrasenya</string>
-    <string name="entry_save">Guarda</string>
-    <string name="entry_title">Nom</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Usuari</string>
-    <string name="error_arc4">L\'encriptació ArcFour no està suportada.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android no pot manejar aquesta uri.</string>
-    <string name="error_could_not_create_group">Error creant grup.</string>
-    <string name="error_could_not_create_parent">No s\'ha pogut crear el directori pare.</string>
-    <string name="error_database_exists">Aquest arxiu ja existeix.</string>
-    <string name="error_database_settings">Error en determinar la configuració de la base de dades.</string>
-    <string name="error_failed_to_launch_link">Error en executar enllaç.</string>
-    <string name="error_filename_required">Es requereix un nom d\'arxiu.</string>
-    <string name="error_file_not_create">No s\'ha pogut crear l\'arxiu</string>    
-    <string name="error_invalid_db">Base de dades invàlida.</string>
-    <string name="error_invalid_path">Camí invàlid.</string>
-    <string name="error_no_name">És necessari un nom.</string>
-    <string name="error_nopass">És necessaria una contrasenya o un arxiu clau.</string>
-    <string name="error_out_of_memory">El telèfon sha quedat sense memòria processant la teva base de dades. Potser és massa gran pel teu telèfon.</string>
-    <string name="error_pass_gen_type">Has de seleccionar almenys un tipus de generador de contrasenyes</string>
-    <string name="error_pass_match">Les contrasenyes no coincideixen.</string>
-    <string name="error_rounds_not_number">Les passades han de ser un número.</string>
-    <string name="error_rounds_too_large">Massa passades. Establint a 2147483648.</string>
-    <string name="error_title_required">És necessari un títol.</string>
-    <string name="error_wrong_length">Insereix un enter positiu al camp longitud</string>
-    <string name="FileNotFound">Arxiu no trobat.</string>
-    <string name="file_browser">Explorador d\'arxius</string>
-    <string name="generate_password">Generar contrasenya</string>
-    <string name="group">Grup</string>
-    <string name="hint_comment">comentari</string>
-    <string name="hint_conf_pass">confirma contrasenya</string>
-    <string name="hint_generated_password">contrasenya generada</string>
-    <string name="hint_group_name">Nom del grup</string>
-    <string name="hint_keyfile">arxiu clau</string>
-    <string name="hint_length">longitud</string>
-    <string name="hint_pass">contrasenya</string>
-    <string name="hint_login_pass">Contrasenya</string>
-    <string name="hint_title">nom</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">usuari</string>
-    <string name="install_from_market">Instal·la de la Play Store</string>
-    <string name="install_from_website">Instal·la de la web</string>
-    <string name="InvalidPassword">Contrasenya o arxiu clau invàlids.</string>
-    <string name="invalid_db_sig">Format de base de dades desconegut.</string>
-    <string name="length">Longitud</string>
-    <string name="list_size_title">Mida de la llista de grups</string>
-    <string name="list_size_summary">Mida del text a la llista de grups</string>
-    <string name="loading_database">Carregant base de dades&#8230;</string>
-    <string name="lowercase">Minúscules</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Emmascara contrasenya</string>
-    <string name="maskpass_summary">Amaga les contrasenyes per defecte</string>
-    <string name="menu_about">Sobre</string>
-    <string name="menu_change_key">Canvia Clau Mestra</string>
-    <string name="menu_copy_pass">Copia contrasenya</string>
-    <string name="menu_copy_user">Copia usuari</string>
-    <string name="menu_create">Crear</string>
-    <string name="menu_app_settings">Paràmetres</string>
-    <string name="menu_db_settings">Paràmetres de la base de dades</string>
-    <string name="menu_delete">Esborra</string>
-    <string name="menu_donate">Donar</string>
-    <string name="menu_edit">Editar</string>
-    <string name="menu_hide_password">Amaga contrasenya</string>
-    <string name="menu_homepage">Vés a l\'inici</string>
-    <string name="menu_lock">Bloqueja la base de dades</string>
-    <string name="menu_open">Obre</string>
-    <string name="menu_rename">Reanomena</string>
-    <string name="menu_search">Cerca</string>
-    <string name="menu_url">Ves a la URL</string>
-    <string name="minus">Menys</string>
-    <string name="never">Mai</string>
-    <string name="no_keys">Sense entrades a la base de dades o grup.</string>
-    <string name="no_results">Cap resultat de cerca</string>
-    <string name="no_url_handler">Sense gestor per aquesta url.</string>
-    <string name="open_recent">Obre base de dades recent (clica per obrir)</string>    
-    <string name="omitbackup_title">No cerquis entrades a còpia de seguretat ni paperera</string>
-    <string name="omitbackup_summary">Omet els grups \'Còpia de seguretat\' i paperera dels resultats de cerca</string>
-    <string name="pass_filename">Nom de base de dades KeePass</string>    
-    <string name="password_title">Introdueix contrasenya de la base de dades</string>
-    <string name="progress_create">Creant nova base de dades&#8230;</string>
-    <string name="progress_title">Treballant&#8230;</string>
-    <string name="remember_keyfile_summary">Recorda la localització d\'arxius clau</string>
-    <string name="remember_keyfile_title">Guarda arxiu clau</string>
-    <string name="remove_from_filelist">Elimina</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Arrel</string>
-    <string name="rounds">Passades d\'encriptació</string>
-    <string name="rounds_explaination">Més passades d\'encriptació dónen protecció adicional contra atacs de força bruta, però poden alentir molt carregar i guardar la base de dades.</string>
-    <string name="rounds_hint">passades</string>
-    <string name="saving_database">Guardant la base de dades&#8230;</string>
-    <string name="space">Espai</string>
-    <string name="search_label">Cerca</string>
-    <string name="show_password">Mostra contrasenya</string>
-    <string name="sort_name">Ordena per nom</string>
-    <string name="sort_db">Ordenació de base de dades</string>
-    <string name="special">Especial</string>
-    <string name="search_results">Resultats de cerca</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Subratllat</string>
-    <string name="unsupported_db_version">Versió de la base de dades no suportada.</string>
-    <string name="uppercase">Majúscules</string>
-    <string name="warning_read_only">La teva tarja SD és de només lectura. No podràs guardar canvis a la teva base de dades.</string>
-    <string name="warning_unmounted">La teva tarja SD no està muntada al teu dispositiu. No podràs carregar ni guardar una base de dades.</string>
-    <string name="version_label">Versió</string>    
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30 segons</item>
-    	<item>1 minut</item>
-    	<item>5 minuts</item>
-    	<item>Mai</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Petita</item>
-    	<item>Mitjana</item>
-    	<item>Gran</item>
-    </string-array>
+  <string name="about_feedback">Comentaris</string>
+  <string name="about_homepage">Pàgina inici</string>
+  <string name="AboutText">Keepass2Android és una implementació per Android de KeePass password manager.</string>
+  <string name="accept">Accepta</string>
+  <string name="add_entry">Afegeix entrada</string>
+  <string name="add_group">Afegeix grup</string>
+  <string name="add_group_title">Afegeix grup</string>
+  <string name="algorithm">Algoritme</string>
+  <string name="algorithm_colon">Algoritme</string>
+  <string name="app_timeout">Temps d\'espera de l\'aplicació</string>
+  <string name="app_timeout_summary">Temps abans de bloquejar la base de dades quan l\'applicació està inactiva.</string>
+  <string name="application">Aplicació</string>
+  <string name="application_settings">Paràmetres de l\'aplicació</string>
+  <string name="brackets">Parèntesis</string>
+  <string name="browser_intall_text">L\'exploració d\'arxius necessita l\'aplicació Open Intents File Manager, clica a sota per instal·lar-la. Degut a peculiaritats de l\'explorador d\'arxius pot ser que no funcioni correctament la primera execució.</string>
+  <string name="building_search_idx">Construint índex de cerca…</string>
+  <string name="cancel">Cancel·la</string>
+  <string name="ClearClipboard">Porta-retalls netejat.</string>
+  <string name="clipboard_timeout">Temps d\'espera del porta-retalls</string>
+  <string name="clipboard_timeout_summary">Temps abans de netejar el porta-retalls després de copiar un usuari o contrasenya</string>
+  <string name="copy_username">Selecciona per copiar l\'usuari al porta-retalls</string>
+  <string name="copy_password">Selecciona per copiar la contrasenya al porta-retalls</string>
+  <string name="creating_db_key">Creant clau de base de dades…</string>
+  <string name="current_group">Grup actual</string>
+  <string name="current_group_root">Grup actual: Arrel</string>
+  <string name="database">Base de dades</string>
+  <string name="decrypting_db">Desencriptant continguts de la base de dades…</string>
+  <string name="decrypting_entry">Desencriptant entrada</string>
+  <string name="default_checkbox">Utilitza aquesta com a base de dades per defecte</string>
+  <string name="digits">Dígits</string>
+  <string name="disclaimer_formal">Keepass2Android ve SENSE CAP MENA DE GARANTIA; Això és programari lliure, i pots redistribuïr-lo sota els termes de la llicència GPL versió 2 o posterior.</string>
+  <string name="enter_filename">Introdueix el nom de la base de dades</string>
+  <string name="entry_accessed">Accedida</string>
+  <string name="entry_and_or">Introdueix una contrasenya i/o un arxiu clau per desbloquejar la base de dades</string>
+  <string name="entry_cancel">Cancel·la</string>
+  <string name="entry_comment">Comentaris</string>
+  <string name="entry_confpassword">Confirma contrasenya</string>
+  <string name="entry_created">Creada</string>
+  <string name="entry_expires">Expira</string>
+  <string name="entry_keyfile">Arxiu clau (opcional)</string>
+  <string name="entry_modified">Modificada</string>
+  <string name="entry_password">Contrasenya</string>
+  <string name="entry_save">Guarda</string>
+  <string name="entry_title">Nom</string>
+  <string name="entry_user_name">Usuari</string>
+  <string name="error_arc4">L\'encriptació ArcFour no està suportada.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android no pot manejar aquesta uri.</string>
+  <string name="error_could_not_create_group">Error creant grup.</string>
+  <string name="error_could_not_create_parent">No s\'ha pogut crear el directori pare.</string>
+  <string name="error_database_exists">Aquest arxiu ja existeix.</string>
+  <string name="error_database_settings">Error en determinar la configuració de la base de dades.</string>
+  <string name="error_failed_to_launch_link">Error en executar enllaç.</string>
+  <string name="error_filename_required">Es requereix un nom d\'arxiu.</string>
+  <string name="error_file_not_create">No s\'ha pogut crear l\'arxiu</string>
+  <string name="error_invalid_db">Base de dades invàlida.</string>
+  <string name="error_invalid_path">Camí invàlid.</string>
+  <string name="error_no_name">És necessari un nom.</string>
+  <string name="error_nopass">És necessaria una contrasenya o un arxiu clau.</string>
+  <string name="error_out_of_memory">El telèfon sha quedat sense memòria processant la teva base de dades. Potser és massa gran pel teu telèfon.</string>
+  <string name="error_pass_gen_type">Has de seleccionar almenys un tipus de generador de contrasenyes</string>
+  <string name="error_pass_match">Les contrasenyes no coincideixen.</string>
+  <string name="error_rounds_not_number">Les passades han de ser un número.</string>
+  <string name="error_rounds_too_large">Massa passades. Establint a 2147483648.</string>
+  <string name="error_title_required">És necessari un títol.</string>
+  <string name="error_wrong_length">Insereix un enter positiu al camp longitud</string>
+  <string name="FileNotFound">Arxiu no trobat.</string>
+  <string name="file_browser">Explorador d\'arxius</string>
+  <string name="generate_password">Generar contrasenya</string>
+  <string name="group">Grup</string>
+  <string name="hint_comment">comentari</string>
+  <string name="hint_conf_pass">confirma contrasenya</string>
+  <string name="hint_generated_password">contrasenya generada</string>
+  <string name="hint_group_name">Nom del grup</string>
+  <string name="hint_keyfile">arxiu clau</string>
+  <string name="hint_length">longitud</string>
+  <string name="hint_pass">contrasenya</string>
+  <string name="hint_login_pass">Contrasenya</string>
+  <string name="hint_title">nom</string>
+  <string name="hint_username">usuari</string>
+  <string name="install_from_market">Instal·la de la Play Store</string>
+  <string name="install_from_website">Instal·la de la web</string>
+  <string name="InvalidPassword">Contrasenya o arxiu clau invàlids.</string>
+  <string name="invalid_db_sig">Format de base de dades desconegut.</string>
+  <string name="length">Longitud</string>
+  <string name="list_size_title">Mida de la llista de grups</string>
+  <string name="list_size_summary">Mida del text a la llista de grups</string>
+  <string name="loading_database">Carregant base de dades…</string>
+  <string name="lowercase">Minúscules</string>
+  <string name="maskpass_title">Emmascara contrasenya</string>
+  <string name="maskpass_summary">Amaga les contrasenyes per defecte</string>
+  <string name="menu_about">Sobre</string>
+  <string name="menu_change_key">Canvia Clau Mestra</string>
+  <string name="menu_copy_pass">Copia contrasenya</string>
+  <string name="menu_copy_user">Copia usuari</string>
+  <string name="menu_create">Crear</string>
+  <string name="menu_app_settings">Paràmetres</string>
+  <string name="menu_db_settings">Paràmetres de la base de dades</string>
+  <string name="menu_delete">Esborra</string>
+  <string name="menu_donate">Donar</string>
+  <string name="menu_edit">Editar</string>
+  <string name="menu_hide_password">Amaga contrasenya</string>
+  <string name="menu_homepage">Vés a l\'inici</string>
+  <string name="menu_lock">Bloqueja la base de dades</string>
+  <string name="menu_open">Obre</string>
+  <string name="menu_rename">Reanomena</string>
+  <string name="menu_search">Cerca</string>
+  <string name="menu_url">Ves a la URL</string>
+  <string name="minus">Menys</string>
+  <string name="never">Mai</string>
+  <string name="no_keys">Sense entrades a la base de dades o grup.</string>
+  <string name="no_results">Cap resultat de cerca</string>
+  <string name="no_url_handler">Sense gestor per aquesta url.</string>
+  <string name="open_recent">Obre base de dades recent (clica per obrir)</string>
+  <string name="omitbackup_title">No cerquis entrades a còpia de seguretat ni paperera</string>
+  <string name="omitbackup_summary">Omet els grups \'Còpia de seguretat\' i paperera dels resultats de cerca</string>
+  <string name="pass_filename">Nom de base de dades KeePass</string>
+  <string name="password_title">Introdueix contrasenya de la base de dades</string>
+  <string name="progress_create">Creant nova base de dades…</string>
+  <string name="progress_title">Treballant…</string>
+  <string name="remember_keyfile_summary">Recorda la localització d\'arxius clau</string>
+  <string name="remember_keyfile_title">Guarda arxiu clau</string>
+  <string name="remove_from_filelist">Elimina</string>
+  <string name="root">Arrel</string>
+  <string name="rounds">Passades d\'encriptació</string>
+  <string name="rounds_explaination">Més passades d\'encriptació dónen protecció adicional contra atacs de força bruta, però poden alentir molt carregar i guardar la base de dades.</string>
+  <string name="rounds_hint">passades</string>
+  <string name="saving_database">Guardant la base de dades…</string>
+  <string name="space">Espai</string>
+  <string name="search_label">Cerca</string>
+  <string name="show_password">Mostra contrasenya</string>
+  <string name="sort_name">Ordena per nom</string>
+  <string name="sort_db">Ordenació de base de dades</string>
+  <string name="special">Especial</string>
+  <string name="search_results">Resultats de cerca</string>
+  <string name="underline">Subratllat</string>
+  <string name="unsupported_db_version">Versió de la base de dades no suportada.</string>
+  <string name="uppercase">Majúscules</string>
+  <string name="warning_read_only">La teva tarja SD és de només lectura. No podràs guardar canvis a la teva base de dades.</string>
+  <string name="warning_unmounted">La teva tarja SD no està muntada al teu dispositiu. No podràs carregar ni guardar una base de dades.</string>
+  <string name="version_label">Versió</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 segons</item>
+    <item>1 minut</item>
+    <item>5 minuts</item>
+    <item>Mai</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Petita</item>
+    <item>Mitjana</item>
+    <item>Gran</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-cs/strings.xml b/src/keepass2android/Resources/values-cs/strings.xml
index b21ef3a8..0e0c7b03 100644
--- a/src/keepass2android/Resources/values-cs/strings.xml
+++ b/src/keepass2android/Resources/values-cs/strings.xml
@@ -1,179 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Připomínky</string>    
-    <string name="about_homepage">Domovská stránka</string>    
-    <string name="AboutText">Keepass2Android je Android implementace správce hesel KeePass.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Přijat</string>
-    <string name="add_entry">Přidat záznam</string>
-    <string name="add_group">Přidat skupinu</string>
-    <string name="add_group_title">Přidat skupinu</string>
-    <string name="algorithm">Algoritmus</string>
-    <string name="algorithm_colon">Algoritmus</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Časový limit aplikace</string>
-    <string name="app_timeout_summary">Čas před zamknutím databáze, když je aplikace neaktivní.</string>
-    <string name="application">Aplikace</string>
-    <string name="application_settings">Nastavení aplikace</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&#8230;</string>
-    <string name="cancel">Storno</string>
-    <string name="ClearClipboard">Schránka vyčištěna.</string>
-    <string name="clipboard_timeout">Časový limit schránky</string>
-    <string name="clipboard_timeout_summary">Čas před vyčištěním schránky po zkopírování jména nebo hesla</string>
-    <string name="copy_username">Kopírovat uživatelské jméno do schránky</string>
-    <string name="copy_password">Kopírovat heslo do schránky</string>
-    <string name="creating_db_key">Vytvářím databázový klíč&#8230;</string>
-    <string name="current_group">Aktuální skupina</string>
-    <string name="current_group_root">Aktuální skupina: Kořen</string>
-    <string name="database">Databáze</string>
-    <string name="decrypting_db">Dešifruji obsah databáze&#8230;</string>
-    <string name="decrypting_entry">Dešifruji záznam</string>
-    <string name="default_checkbox">Použít jako výchozí databázi</string>
-    <string name="digits">Čísla</string>
-    <string name="disclaimer_formal">Keepass2Android dodáván BEZ JAKÉKOLIV ZÁRUKY; Toto je free software zdarma, a je možná jeho redistribuce pod podmínkou licence GPL verze 2 nebo novější.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Zadejte názvev souboru databáze</string>    
-    <string name="entry_accessed">Poslední přístup</string>
-    <string name="entry_and_or">Zadejte heslo a/nebo soubor s klíčem pro odemknutí databáze</string>    
-    <string name="entry_cancel">Storno</string>
-    <string name="entry_comment">Poznámky</string>
-    <string name="entry_confpassword">Potvrďte heslo</string>    
-    <string name="entry_created">Vytvořeno</string>
-    <string name="entry_expires">Vyprší</string>
-    <string name="entry_keyfile">Klíčový soubor (nepovinné)</string>
-    <string name="entry_modified">Změněno</string>
-    <string name="entry_password">Heslo</string>
-    <string name="entry_save">Uložit</string>
-    <string name="entry_title">Název</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Uživatelské jméno</string>
-    <string name="error_arc4">ArcFour stream šifra není podporována.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android nemůže zpracovat tuto uri.</string>
-    <string name="error_could_not_create_group">Chyba při vytváření skupiny.</string>
-    <string name="error_could_not_create_parent">Nelze vyvořit nadřazený adresář.</string>
-    <string name="error_database_exists">Tento soubor již existuje.</string>
-    <string name="error_database_settings">Chyba při zjišťování nastavení databáze.</string>
-    <string name="error_failed_to_launch_link">Nelze spustit odkaz.</string>
-    <string name="error_filename_required">Je požadováno jméno souboru.</string>
-    <string name="error_file_not_create">Nelze vytvořit soubor</string>    
-    <string name="error_invalid_db">Chybná databáze.</string>
-    <string name="error_invalid_path">Chybná cesta.</string>
-    <string name="error_no_name">Jméno je povinné.</string>
-    <string name="error_nopass">Heslo nebo klíčový soubor jsou povinné.</string>
-    <string name="error_out_of_memory">Přístroj má málo paměti pro zpracování databáze. Možná je příliš velká pro Váš přístroj.</string>
-    <string name="error_pass_gen_type">Minimálně jeden typ generování hesla musí být zvolen</string>
-    <string name="error_pass_match">Hesla se neshodují.</string>
-    <string name="error_rounds_not_number">Opakování musí být číslo.</string>
-    <string name="error_rounds_too_large">Opakování příliš mnoho.  Nastavuji na 2147483648.</string>
-    <string name="error_title_required">Název je povinný.</string>
-    <string name="error_wrong_length">Zadejte celé kladné číslo do délky pole</string>
-    <string name="FileNotFound">Soubor nenalezen.</string>
-    <string name="file_browser">Správce souborů</string>
-    <string name="generate_password">Generovat heslo</string>
-    <string name="group">Skupina</string>
-    <string name="hint_comment">poznámka</string>
-    <string name="hint_conf_pass">potvrdit heslo</string>
-    <string name="hint_generated_password">generované heslo</string>
-    <string name="hint_group_name">Název skupiny</string>
-    <string name="hint_keyfile">klíčový soubor</string>
-    <string name="hint_length">délka</string>
-    <string name="hint_pass">heslo</string>
-    <string name="hint_login_pass">Heslo</string>
-    <string name="hint_title">název</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">uživatelské jméno</string>
-    <string name="install_from_market">Instalovat z Play</string>
-    <string name="install_from_website">Instalovat z webu</string>
-    <string name="InvalidPassword">Chybné heslo nebo klíčový soubor.</string>
-    <string name="invalid_db_sig">Databázový formát nelze rozpoznat.</string>
-    <string name="length">Délka</string>
-    <string name="list_size_title">Velikost seznamu skupin</string>
-    <string name="list_size_summary">Velikost textu v seznamu skupin</string>
-    <string name="loading_database">Načítám databázi&#8230;</string>
-    <string name="lowercase">Malá písmena</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Skrýt heslo</string>
-    <string name="maskpass_summary">Skrýt heslo jako výchozí</string>
-    <string name="menu_about">O aplikaci</string>
-    <string name="menu_change_key">Změnit hlavní klíč</string>
-    <string name="menu_copy_pass">Kopírovat heslo</string>
-    <string name="menu_copy_user">Kopírovat uživatelské jméno</string>
-    <string name="menu_create">Vytvořit</string>
-    <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_donate">Přispět</string>
-    <string name="menu_edit">Změnit</string>
-    <string name="menu_hide_password">Skrýt heslo</string>
-    <string name="menu_homepage">Jít na domovskou stránku</string>
-    <string name="menu_lock">Zamknout databázi</string>
-    <string name="menu_open">Otevřít</string>
-    <string name="menu_rename">Přejmenovat</string>
-    <string name="menu_search">Hledat</string>
-    <string name="menu_url">Jdi na URL</string>
-    <string name="minus">Mínus</string>
-    <string name="never">Nikdy</string>
-    <string name="no_keys">Žádný záznam v databázi nebo ve skupině.</string>
-    <string name="no_results">žádný výsledek hledání</string>
-    <string name="no_url_handler">Žádný handler pro toto url.</string>
-    <string name="open_recent">Otevřít poslední databázi (kliknout pro otevření)</string>    
-    <string name="omitbackup_title">Neprohledávat zálohy a koš</string>
-    <string name="omitbackup_summary">Vynechat skupiny Záloha a Koš ve výsledcích hledání</string>
-    <string name="pass_filename">Název souboru KeePass databáze</string>    
-    <string name="password_title">Zadejte heslo do databáze</string>
-    <string name="progress_create">Vytvářím novou databázi&#8230;</string>
-    <string name="progress_title">Zpracovávám&#8230;</string>
-    <string name="remember_keyfile_summary">Pamatovat si umístění klíčového souboru</string>
-    <string name="remember_keyfile_title">Uložit klíčový soubor</string>
-    <string name="remove_from_filelist">Odstranit</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Kořen</string>
-    <string name="rounds">Počet zašifrování</string>
-    <string name="rounds_explaination">Vyšší počet opakování šifrování zvýší bezpečnost proti hrubému útoku, ale může výrazně zpomalit načítání a ukládání.</string>
-    <string name="rounds_hint">opakování</string>
-    <string name="saving_database">Ukládám databázi&#8230;</string>
-    <string name="space">Místo</string>
-    <string name="search_label">Hledat</string>
-    <string name="show_password">Zobrazit heslo</string>
-    <string name="sort_name">Seřadit podle jména</string>
-    <string name="sort_db">Seřadit podle DB</string>
-    <string name="special">Speciální</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Podtrženo</string>
-    <string name="unsupported_db_version">Nepodporovaná verze databáze.</string>
-    <string name="uppercase">Velká písmena</string>
-    <string name="warning_read_only">Vaše SD karta je v módu jen pro čtení. Nebudete moct ukládat změny v databázi.</string>
-    <string name="warning_unmounted">Vaše SD karta není momentálně připojena v zařízení. Nebudete moct načíst nebo vytvořit databázi.</string>
-    <string name="version_label">Verze</string>    
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30 sekund</item>
-    	<item>1 minuta</item>
-    	<item>5 minut</item>
-    	<item>Nikdy</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Malý</item>
-    	<item>Střední</item>
-    	<item>Velký</item>
-    </string-array>
+  <string name="about_feedback">Připomínky</string>
+  <string name="about_homepage">Domovská stránka</string>
+  <string name="AboutText">Keepass2Android je Android implementace správce hesel KeePass.</string>
+  <string name="accept">Přijat</string>
+  <string name="add_entry">Přidat záznam</string>
+  <string name="add_group">Přidat skupinu</string>
+  <string name="add_group_title">Přidat skupinu</string>
+  <string name="algorithm">Algoritmus</string>
+  <string name="algorithm_colon">Algoritmus</string>
+  <string name="app_timeout">Časový limit aplikace</string>
+  <string name="app_timeout_summary">Čas před zamknutím databáze, když je aplikace neaktivní.</string>
+  <string name="application">Aplikace</string>
+  <string name="application_settings">Nastavení aplikace</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>
+  <string name="cancel">Storno</string>
+  <string name="ClearClipboard">Schránka vyčištěna.</string>
+  <string name="clipboard_timeout">Časový limit schránky</string>
+  <string name="clipboard_timeout_summary">Čas před vyčištěním schránky po zkopírování jména nebo hesla</string>
+  <string name="copy_username">Kopírovat uživatelské jméno do schránky</string>
+  <string name="copy_password">Kopírovat heslo do schránky</string>
+  <string name="creating_db_key">Vytvářím databázový klíč…</string>
+  <string name="current_group">Aktuální skupina</string>
+  <string name="current_group_root">Aktuální skupina: Kořen</string>
+  <string name="database">Databáze</string>
+  <string name="decrypting_db">Dešifruji obsah databáze…</string>
+  <string name="decrypting_entry">Dešifruji záznam</string>
+  <string name="default_checkbox">Použít jako výchozí databázi</string>
+  <string name="digits">Čísla</string>
+  <string name="disclaimer_formal">Keepass2Android dodáván BEZ JAKÉKOLIV ZÁRUKY; Toto je free software zdarma, a je možná jeho redistribuce pod podmínkou licence GPL verze 2 nebo novější.</string>
+  <string name="enter_filename">Zadejte názvev souboru databáze</string>
+  <string name="entry_accessed">Poslední přístup</string>
+  <string name="entry_and_or">Zadejte heslo a/nebo soubor s klíčem pro odemknutí databáze</string>
+  <string name="entry_cancel">Storno</string>
+  <string name="entry_comment">Poznámky</string>
+  <string name="entry_confpassword">Potvrďte heslo</string>
+  <string name="entry_created">Vytvořeno</string>
+  <string name="entry_expires">Vyprší</string>
+  <string name="entry_keyfile">Klíčový soubor (nepovinné)</string>
+  <string name="entry_modified">Změněno</string>
+  <string name="entry_password">Heslo</string>
+  <string name="entry_save">Uložit</string>
+  <string name="entry_title">Název</string>
+  <string name="entry_user_name">Uživatelské jméno</string>
+  <string name="error_arc4">ArcFour stream šifra není podporována.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android nemůže zpracovat tuto uri.</string>
+  <string name="error_could_not_create_group">Chyba při vytváření skupiny.</string>
+  <string name="error_could_not_create_parent">Nelze vyvořit nadřazený adresář.</string>
+  <string name="error_database_exists">Tento soubor již existuje.</string>
+  <string name="error_database_settings">Chyba při zjišťování nastavení databáze.</string>
+  <string name="error_failed_to_launch_link">Nelze spustit odkaz.</string>
+  <string name="error_filename_required">Je požadováno jméno souboru.</string>
+  <string name="error_file_not_create">Nelze vytvořit soubor</string>
+  <string name="error_invalid_db">Chybná databáze.</string>
+  <string name="error_invalid_path">Chybná cesta.</string>
+  <string name="error_no_name">Jméno je povinné.</string>
+  <string name="error_nopass">Heslo nebo klíčový soubor jsou povinné.</string>
+  <string name="error_out_of_memory">Přístroj má málo paměti pro zpracování databáze. Možná je příliš velká pro Váš přístroj.</string>
+  <string name="error_pass_gen_type">Minimálně jeden typ generování hesla musí být zvolen</string>
+  <string name="error_pass_match">Hesla se neshodují.</string>
+  <string name="error_rounds_not_number">Opakování musí být číslo.</string>
+  <string name="error_rounds_too_large">Opakování příliš mnoho.  Nastavuji na 2147483648.</string>
+  <string name="error_title_required">Název je povinný.</string>
+  <string name="error_wrong_length">Zadejte celé kladné číslo do délky pole</string>
+  <string name="FileNotFound">Soubor nenalezen.</string>
+  <string name="file_browser">Správce souborů</string>
+  <string name="generate_password">Generovat heslo</string>
+  <string name="group">Skupina</string>
+  <string name="hint_comment">poznámka</string>
+  <string name="hint_conf_pass">potvrdit heslo</string>
+  <string name="hint_generated_password">generované heslo</string>
+  <string name="hint_group_name">Název skupiny</string>
+  <string name="hint_keyfile">klíčový soubor</string>
+  <string name="hint_length">délka</string>
+  <string name="hint_pass">heslo</string>
+  <string name="hint_login_pass">Heslo</string>
+  <string name="hint_title">název</string>
+  <string name="hint_username">uživatelské jméno</string>
+  <string name="install_from_market">Instalovat z Play</string>
+  <string name="install_from_website">Instalovat z webu</string>
+  <string name="InvalidPassword">Chybné heslo nebo klíčový soubor.</string>
+  <string name="invalid_db_sig">Databázový formát nelze rozpoznat.</string>
+  <string name="length">Délka</string>
+  <string name="list_size_title">Velikost seznamu skupin</string>
+  <string name="list_size_summary">Velikost textu v seznamu skupin</string>
+  <string name="loading_database">Načítám databázi…</string>
+  <string name="lowercase">Malá písmena</string>
+  <string name="maskpass_title">Skrýt heslo</string>
+  <string name="maskpass_summary">Skrýt heslo jako výchozí</string>
+  <string name="menu_about">O aplikaci</string>
+  <string name="menu_change_key">Změnit hlavní klíč</string>
+  <string name="menu_copy_pass">Kopírovat heslo</string>
+  <string name="menu_copy_user">Kopírovat uživatelské jméno</string>
+  <string name="menu_create">Vytvořit</string>
+  <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_donate">Přispět</string>
+  <string name="menu_edit">Změnit</string>
+  <string name="menu_hide_password">Skrýt heslo</string>
+  <string name="menu_homepage">Jít na domovskou stránku</string>
+  <string name="menu_lock">Zamknout databázi</string>
+  <string name="menu_open">Otevřít</string>
+  <string name="menu_rename">Přejmenovat</string>
+  <string name="menu_search">Hledat</string>
+  <string name="menu_url">Jdi na URL</string>
+  <string name="minus">Mínus</string>
+  <string name="never">Nikdy</string>
+  <string name="no_keys">Žádný záznam v databázi nebo ve skupině.</string>
+  <string name="no_results">žádný výsledek hledání</string>
+  <string name="no_url_handler">Žádný handler pro toto url.</string>
+  <string name="open_recent">Otevřít poslední databázi (kliknout pro otevření)</string>
+  <string name="omitbackup_title">Neprohledávat zálohy a koš</string>
+  <string name="omitbackup_summary">Vynechat skupiny Záloha a Koš ve výsledcích hledání</string>
+  <string name="pass_filename">Název souboru KeePass databáze</string>
+  <string name="password_title">Zadejte heslo do databáze</string>
+  <string name="progress_create">Vytvářím novou databázi…</string>
+  <string name="progress_title">Zpracovávám…</string>
+  <string name="remember_keyfile_summary">Pamatovat si umístění klíčového souboru</string>
+  <string name="remember_keyfile_title">Uložit klíčový soubor</string>
+  <string name="remove_from_filelist">Odstranit</string>
+  <string name="root">Kořen</string>
+  <string name="rounds">Počet zašifrování</string>
+  <string name="rounds_explaination">Vyšší počet opakování šifrování zvýší bezpečnost proti hrubému útoku, ale může výrazně zpomalit načítání a ukládání.</string>
+  <string name="rounds_hint">opakování</string>
+  <string name="saving_database">Ukládám databázi…</string>
+  <string name="space">Místo</string>
+  <string name="search_label">Hledat</string>
+  <string name="show_password">Zobrazit heslo</string>
+  <string name="sort_name">Seřadit podle jména</string>
+  <string name="sort_db">Seřadit podle DB</string>
+  <string name="special">Speciální</string>
+  <string name="underline">Podtrženo</string>
+  <string name="unsupported_db_version">Nepodporovaná verze databáze.</string>
+  <string name="uppercase">Velká písmena</string>
+  <string name="warning_read_only">Vaše SD karta je v módu jen pro čtení. Nebudete moct ukládat změny v databázi.</string>
+  <string name="warning_unmounted">Vaše SD karta není momentálně připojena v zařízení. Nebudete moct načíst nebo vytvořit databázi.</string>
+  <string name="version_label">Verze</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 sekund</item>
+    <item>1 minuta</item>
+    <item>5 minut</item>
+    <item>Nikdy</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Malý</item>
+    <item>Střední</item>
+    <item>Velký</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-da/strings.xml b/src/keepass2android/Resources/values-da/strings.xml
index 41106c6c..23cfcb5e 100644
--- a/src/keepass2android/Resources/values-da/strings.xml
+++ b/src/keepass2android/Resources/values-da/strings.xml
@@ -1,182 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
-  
-  Danish translation by Frederik Svarre (fsvarre@gmail.com)
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Tilbagemelding</string>    
-    <string name="about_homepage">Hjemmeside</string>    
-    <string name="AboutText">Keepass2Android er en Android implementering af KeePass password manager.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Accepter</string>
-    <string name="add_entry">Tilføj post</string>
-    <string name="add_group">Tilføj gruppe</string>
-    <string name="add_group_title">Tilføj gruppe</string>
-    <string name="algorithm">Algoritme</string>
-    <string name="algorithm_colon">Algoritme</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Applikations timeout</string>
-    <string name="app_timeout_summary">Tid før databasen låses, når applikationen er inaktiv.</string>
-    <string name="application">Applikation</string>
-    <string name="application_settings">Applikationsindstillinger</string>
-    <string name="brackets">Parenteser</string>
-    <string name="browser_intall_text">Fil-browsing kræver applikationen "Open Intents File Manager", klik nedenfor for at installere den. Grundet nogle særheder i filmanageren er det ikke sikkert, at fil-browsing virker korrekt forste gang, at du anvender applikationen.</string>
-    <string name="building_search_idx">Bygger søgeindeks&#8230;</string>
-    <string name="cancel">Annuller</string>
-    <string name="ClearClipboard">Udklipsholder ryddet.</string>
-    <string name="clipboard_timeout">Udklipsholder timeout</string>
-    <string name="clipboard_timeout_summary">Tid før udklipsholderen bliver ryddet efter kopiering af brugernavn eller adgangskode</string>
-    <string name="copy_username">Vælg for at kopiere brugernavn til udklipsholderen</string>
-    <string name="copy_password">Vælg for at kopiere adgangskode til udklipsholderen</string>
-    <string name="creating_db_key">Opretter databasenøgle&#8230;</string>
-    <string name="current_group">Aktuel gruppe</string>    
-    <string name="current_group_root">Aktuel gruppe: Root</string>
-    <string name="database">Database</string>
-    <string name="decrypting_db">Dekrypterer databaseindhold&#8230;</string>
-    <string name="decrypting_entry">Dekrypterer post</string>
-    <string name="default_checkbox">Brug denne database som standard</string>
-    <string name="digits">Cifre</string>
-    <string name="disclaimer_formal">Keepass2Android comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 2 or later.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Angiv navn på databasefil</string>    
-    <string name="entry_accessed">Seneste åbnede</string>
-    <string name="entry_and_or">Angiv en adgangskode og/eller en nøglefil for at få adgang til din database</string>    
-    <string name="entry_cancel">Annuller</string>
-    <string name="entry_comment">Kommentarer</string>
-    <string name="entry_confpassword">Bekræft adgangskode</string>
-    <string name="entry_created">Oprettet</string>
-    <string name="entry_expires">Udløber</string>
-    <string name="entry_keyfile">Nøglefil (valgfri)</string>
-    <string name="entry_modified">Ændret</string>
-    <string name="entry_password">Adgangskode</string>
-    <string name="entry_save">Gem</string>
-    <string name="entry_title">Navn</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Brugernavn</string>
-    <string name="error_arc4">"ArcFour stream cipher" er ikke understøttet.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android kan ikke håndtere denne uri.</string>
-    <string name="error_could_not_create_group">Fejl ved oprettelse af gruppe.</string>
-    <string name="error_could_not_create_parent">Kunne ikke oprette rodbiblioteket.</string>
-    <string name="error_database_exists">Denne fil eksisterer allerede.</string>
-    <string name="error_database_settings">Kunne ikke afgøre databaseindstilinger.</string>
-    <string name="error_failed_to_launch_link">Det mislykkedes at åbne linket.</string>
-    <string name="error_filename_required">Et filnavn er påkrævet.</string>
-    <string name="error_file_not_create">Kunne ikke oprette fil</string>    
-    <string name="error_invalid_db">Ugyldig database.</string>
-    <string name="error_invalid_path">Ugyldig sti.</string>
-    <string name="error_no_name">Et navn er påkrævet.</string>
-    <string name="error_nopass">En adgangskode eller nøglefil er påkrævet.</string>
-    <string name="error_out_of_memory">Telefonen løb tør for hukommelse under analysen af din database. Den kan være for stor til, at din telefon kan håndtere den.</string>
-    <string name="error_pass_gen_type">Mindst én adgangskode-genererings-type skal vælges</string>
-    <string name="error_pass_match">Adgangskoder matcher ikke.</string>
-    <string name="error_rounds_not_number">Gentagelser skal være en talværdi.</string>
-    <string name="error_rounds_too_large">For stor gentagelses-værdi.  Maksimal gentagelses-værdi er 2147483648.</string>
-    <string name="error_title_required">En titel er påkrævet.</string>
-    <string name="error_wrong_length">Angiv et positivt helt tal i feltet</string>
-    <string name="FileNotFound">Filen blev ikke fundet.</string>
-    <string name="file_browser">Fil-browser</string>
-    <string name="generate_password">Generer adgangskode</string>
-    <string name="group">Gruppe</string>
-    <string name="hint_comment">kommentar</string>
-    <string name="hint_conf_pass">bekræft adgangskode</string>
-    <string name="hint_generated_password">genereret adgangskode</string>
-    <string name="hint_group_name">Gruppenavn</string>
-    <string name="hint_keyfile">nøglefil</string>
-    <string name="hint_length">længde</string>
-    <string name="hint_pass">adgangskode</string>
-    <string name="hint_login_pass">Adgangskode</string>
-    <string name="hint_title">navn</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">brugernavn</string>
-    <string name="install_from_market">Installer fra Play butik</string>
-    <string name="install_from_website">Installer fra internettet</string>
-    <string name="InvalidPassword">Ugyldig adgangskode eller nøglefil.</string>
-    <string name="invalid_db_sig">Databaseformatet blev ikke genkendt.</string>
-    <string name="length">Længde</string>
-    <string name="list_size_title">Gruppeliste størrelse</string>
-    <string name="list_size_summary">Tekststørrelse i gruppelisten</string>
-    <string name="loading_database">Indlæser database&#8230;</string>
-    <string name="lowercase">Små bogstaver</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Skjul adgangskode</string>
-    <string name="maskpass_summary">Skjul adgangskoder som standard</string>
-    <string name="menu_about">Om</string>
-    <string name="menu_change_key">Skift master-adgangskode</string>
-    <string name="menu_copy_pass">Kopier adgangskode</string>
-    <string name="menu_copy_user">Kopier brugernavn</string>
-    <string name="menu_create">Opret</string>
-    <string name="menu_app_settings">Indstillinger</string>
-    <string name="menu_db_settings">Database indstillinger</string>
-    <string name="menu_delete">Slet</string>
-    <string name="menu_donate">Donér</string>
-    <string name="menu_edit">Rediger</string>
-    <string name="menu_hide_password">Skjul adgangskode</string>
-    <string name="menu_homepage">Gå til hjemmeside</string>
-    <string name="menu_lock">Lås database</string>
-    <string name="menu_open">Åbn</string>
-    <string name="menu_rename">Omdøb</string>
-    <string name="menu_search">Søg</string>
-    <string name="menu_url">Gå til URL</string>
-    <string name="minus">Minus</string>
-    <string name="never">Aldrig</string>
-    <string name="no_keys">Ingen poster i databasen eller gruppen.</string>
-    <string name="no_results">Ingen søgeresultater</string>
-    <string name="no_url_handler">Kan ikke håndtere denne url.</string>
-    <string name="open_recent">Åbn seneste database (klik for at åbne)</string>    
-    <string name="omitbackup_title">Søg ikke efter backup poster og poster i papirkurven</string>
-    <string name="omitbackup_summary">Udelad \'Backup\' og papirkurvs-gruppen i søgeresultater</string>
-    <string name="pass_filename">KeePass database filnavn</string>    
-    <string name="password_title">Angiv database adgangskode</string>
-    <string name="progress_create">Opretter ny database&#8230;</string>
-    <string name="progress_title">Arbejder&#8230;</string>
-    <string name="remember_keyfile_summary">Husker placeringen af nøglefiler</string>
-    <string name="remember_keyfile_title">Gem nøglefil</string>
-    <string name="remove_from_filelist">Fjern</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Root</string>
-    <string name="rounds">Krypterings-gentagelser</string>
-    <string name="rounds_explaination">Højere krypterings-gentagelser giver øget beskyttelse imod brute-force angreb, men kan påvirke læsnings- og skrivehastigheden betydentligt.</string>
-    <string name="rounds_hint">gentagelser</string>
-    <string name="saving_database">Gemmer database&#8230;</string>
-    <string name="space">Mellemrum</string>
-    <string name="search_label">Søg</string>
-    <string name="show_password">Vis adgangskode</string>
-    <string name="sort_name">Sorter efter navn</string>
-    <string name="sort_db">DB sorteringsrækkefølge</string>
-    <string name="special">Speciel</string>
-    <string name="search_results">Søgeresultater</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Understreget</string>
-    <string name="unsupported_db_version">Database-versionen er ikke understøttet.</string>
-    <string name="uppercase">Store bogstaver</string>
-    <string name="warning_read_only">Dit sd-kort er skrivebeskyttet. Du er muligvis ikke i stand til at gemme ændringer til din database.</string>
-    <string name="warning_unmounted">Dit sd-kort er ikke monteret i din enhed. Du vil ikke være i stand til at indlæse eller oprette din database.</string>
-    <string name="version_label">Version</string>    
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30 sekunder</item>
-    	<item>1 minut</item>
-    	<item>5 minutter</item>
-    	<item>Aldrig</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Lille</item>
-    	<item>Mellem</item>
-    	<item>Stor</item>
-    </string-array>
+  <string name="about_feedback">Tilbagemelding</string>
+  <string name="about_homepage">Hjemmeside</string>
+  <string name="AboutText">Keepass2Android er en Android implementering af KeePass password manager.</string>
+  <string name="accept">Accepter</string>
+  <string name="add_entry">Tilføj post</string>
+  <string name="add_group">Tilføj gruppe</string>
+  <string name="add_group_title">Tilføj gruppe</string>
+  <string name="algorithm">Algoritme</string>
+  <string name="algorithm_colon">Algoritme</string>
+  <string name="app_timeout">Applikations timeout</string>
+  <string name="app_timeout_summary">Tid før databasen låses, når applikationen er inaktiv.</string>
+  <string name="application">Applikation</string>
+  <string name="application_settings">Applikationsindstillinger</string>
+  <string name="brackets">Parenteser</string>
+  <string name="browser_intall_text">Fil-browsing kræver applikationen \"Open Intents File Manager\", klik nedenfor for at installere den. Grundet nogle særheder i filmanageren er det ikke sikkert, at fil-browsing virker korrekt forste gang, at du anvender applikationen.</string>
+  <string name="building_search_idx">Bygger søgeindeks…</string>
+  <string name="cancel">Annuller</string>
+  <string name="ClearClipboard">Udklipsholder ryddet.</string>
+  <string name="clipboard_timeout">Udklipsholder timeout</string>
+  <string name="clipboard_timeout_summary">Tid før udklipsholderen bliver ryddet efter kopiering af brugernavn eller adgangskode</string>
+  <string name="copy_username">Vælg for at kopiere brugernavn til udklipsholderen</string>
+  <string name="copy_password">Vælg for at kopiere adgangskode til udklipsholderen</string>
+  <string name="creating_db_key">Opretter databasenøgle…</string>
+  <string name="current_group">Aktuel gruppe</string>
+  <string name="current_group_root">Aktuel gruppe: Root</string>
+  <string name="decrypting_db">Dekrypterer databaseindhold…</string>
+  <string name="decrypting_entry">Dekrypterer post</string>
+  <string name="default_checkbox">Brug denne database som standard</string>
+  <string name="digits">Cifre</string>
+  <string name="enter_filename">Angiv navn på databasefil</string>
+  <string name="entry_accessed">Seneste åbnede</string>
+  <string name="entry_and_or">Angiv en adgangskode og/eller en nøglefil for at få adgang til din database</string>
+  <string name="entry_cancel">Annuller</string>
+  <string name="entry_comment">Kommentarer</string>
+  <string name="entry_confpassword">Bekræft adgangskode</string>
+  <string name="entry_created">Oprettet</string>
+  <string name="entry_expires">Udløber</string>
+  <string name="entry_keyfile">Nøglefil (valgfri)</string>
+  <string name="entry_modified">Ændret</string>
+  <string name="entry_password">Adgangskode</string>
+  <string name="entry_save">Gem</string>
+  <string name="entry_title">Navn</string>
+  <string name="entry_user_name">Brugernavn</string>
+  <string name="error_arc4">\"ArcFour stream cipher\" er ikke understøttet.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android kan ikke håndtere denne uri.</string>
+  <string name="error_could_not_create_group">Fejl ved oprettelse af gruppe.</string>
+  <string name="error_could_not_create_parent">Kunne ikke oprette rodbiblioteket.</string>
+  <string name="error_database_exists">Denne fil eksisterer allerede.</string>
+  <string name="error_database_settings">Kunne ikke afgøre databaseindstilinger.</string>
+  <string name="error_failed_to_launch_link">Det mislykkedes at åbne linket.</string>
+  <string name="error_filename_required">Et filnavn er påkrævet.</string>
+  <string name="error_file_not_create">Kunne ikke oprette fil</string>
+  <string name="error_invalid_db">Ugyldig database.</string>
+  <string name="error_invalid_path">Ugyldig sti.</string>
+  <string name="error_no_name">Et navn er påkrævet.</string>
+  <string name="error_nopass">En adgangskode eller nøglefil er påkrævet.</string>
+  <string name="error_out_of_memory">Telefonen løb tør for hukommelse under analysen af din database. Den kan være for stor til, at din telefon kan håndtere den.</string>
+  <string name="error_pass_gen_type">Mindst én adgangskode-genererings-type skal vælges</string>
+  <string name="error_pass_match">Adgangskoder matcher ikke.</string>
+  <string name="error_rounds_not_number">Gentagelser skal være en talværdi.</string>
+  <string name="error_rounds_too_large">For stor gentagelses-værdi.  Maksimal gentagelses-værdi er 2147483648.</string>
+  <string name="error_title_required">En titel er påkrævet.</string>
+  <string name="error_wrong_length">Angiv et positivt helt tal i feltet</string>
+  <string name="FileNotFound">Filen blev ikke fundet.</string>
+  <string name="file_browser">Fil-browser</string>
+  <string name="generate_password">Generer adgangskode</string>
+  <string name="group">Gruppe</string>
+  <string name="hint_comment">kommentar</string>
+  <string name="hint_conf_pass">bekræft adgangskode</string>
+  <string name="hint_generated_password">genereret adgangskode</string>
+  <string name="hint_group_name">Gruppenavn</string>
+  <string name="hint_keyfile">nøglefil</string>
+  <string name="hint_length">længde</string>
+  <string name="hint_pass">adgangskode</string>
+  <string name="hint_login_pass">Adgangskode</string>
+  <string name="hint_title">navn</string>
+  <string name="hint_username">brugernavn</string>
+  <string name="install_from_market">Installer fra Play butik</string>
+  <string name="install_from_website">Installer fra internettet</string>
+  <string name="InvalidPassword">Ugyldig adgangskode eller nøglefil.</string>
+  <string name="invalid_db_sig">Databaseformatet blev ikke genkendt.</string>
+  <string name="length">Længde</string>
+  <string name="list_size_title">Gruppeliste størrelse</string>
+  <string name="list_size_summary">Tekststørrelse i gruppelisten</string>
+  <string name="loading_database">Indlæser database…</string>
+  <string name="lowercase">Små bogstaver</string>
+  <string name="maskpass_title">Skjul adgangskode</string>
+  <string name="maskpass_summary">Skjul adgangskoder som standard</string>
+  <string name="menu_about">Om</string>
+  <string name="menu_change_key">Skift master-adgangskode</string>
+  <string name="menu_copy_pass">Kopier adgangskode</string>
+  <string name="menu_copy_user">Kopier brugernavn</string>
+  <string name="menu_create">Opret</string>
+  <string name="menu_app_settings">Indstillinger</string>
+  <string name="menu_db_settings">Database indstillinger</string>
+  <string name="menu_delete">Slet</string>
+  <string name="menu_donate">Donér</string>
+  <string name="menu_edit">Rediger</string>
+  <string name="menu_hide_password">Skjul adgangskode</string>
+  <string name="menu_homepage">Gå til hjemmeside</string>
+  <string name="menu_lock">Lås database</string>
+  <string name="menu_open">Åbn</string>
+  <string name="menu_rename">Omdøb</string>
+  <string name="menu_search">Søg</string>
+  <string name="menu_url">Gå til URL</string>
+  <string name="never">Aldrig</string>
+  <string name="no_keys">Ingen poster i databasen eller gruppen.</string>
+  <string name="no_results">Ingen søgeresultater</string>
+  <string name="no_url_handler">Kan ikke håndtere denne url.</string>
+  <string name="open_recent">Åbn seneste database (klik for at åbne)</string>
+  <string name="omitbackup_title">Søg ikke efter backup poster og poster i papirkurven</string>
+  <string name="omitbackup_summary">Udelad \'Backup\' og papirkurvs-gruppen i søgeresultater</string>
+  <string name="pass_filename">KeePass database filnavn</string>
+  <string name="password_title">Angiv database adgangskode</string>
+  <string name="progress_create">Opretter ny database…</string>
+  <string name="progress_title">Arbejder…</string>
+  <string name="remember_keyfile_summary">Husker placeringen af nøglefiler</string>
+  <string name="remember_keyfile_title">Gem nøglefil</string>
+  <string name="remove_from_filelist">Fjern</string>
+  <string name="rounds">Krypterings-gentagelser</string>
+  <string name="rounds_explaination">Højere krypterings-gentagelser giver øget beskyttelse imod brute-force angreb, men kan påvirke læsnings- og skrivehastigheden betydentligt.</string>
+  <string name="rounds_hint">gentagelser</string>
+  <string name="saving_database">Gemmer database…</string>
+  <string name="space">Mellemrum</string>
+  <string name="search_label">Søg</string>
+  <string name="show_password">Vis adgangskode</string>
+  <string name="sort_name">Sorter efter navn</string>
+  <string name="sort_db">DB sorteringsrækkefølge</string>
+  <string name="special">Speciel</string>
+  <string name="search_results">Søgeresultater</string>
+  <string name="underline">Understreget</string>
+  <string name="unsupported_db_version">Database-versionen er ikke understøttet.</string>
+  <string name="uppercase">Store bogstaver</string>
+  <string name="warning_read_only">Dit sd-kort er skrivebeskyttet. Du er muligvis ikke i stand til at gemme ændringer til din database.</string>
+  <string name="warning_unmounted">Dit sd-kort er ikke monteret i din enhed. Du vil ikke være i stand til at indlæse eller oprette din database.</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 sekunder</item>
+    <item>1 minut</item>
+    <item>5 minutter</item>
+    <item>Aldrig</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Lille</item>
+    <item>Mellem</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-de/strings.xml b/src/keepass2android/Resources/values-de/strings.xml
index 5f60236c..212b91a1 100644
--- a/src/keepass2android/Resources/values-de/strings.xml
+++ b/src/keepass2android/Resources/values-de/strings.xml
@@ -3,8 +3,9 @@
 <resources>
   <string name="about_feedback">Issue-Tracker</string>
   <string name="about_homepage">Website</string>
-  <string name="AboutText">Keepass2Android ist die Implementierung des KeePass password manager für die Android Plattform.</string>
-  <string name="CreditsText">The User Interface is based on a port of KeepassDroid developed by Brian Pellin. Code for database operations is based on KeePass by Dominik Reichl. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.</string>
+  <string name="AboutText">Keepass2Android ist ein Passwortmanager mit Lese- und Schreib-Zugriff auf KeePass 2.x Datenbanken.</string>
+  <string name="CreditsText">Die Benutzeroberfläche basiert auf einem Port von Keepassdroid (entwickelt von Brian Pellin) nach Mono for Android. Der Code für die Datenbank-Operationen nutzt eine angepasste Version einer Bibliothek aus KeePass (entwickelt von Dominik Reichl).
+Der Android Robot wird genutzt und wurde modifiziert basierend auf Arbeiten, die Google durchgeführt und zur Verfügung gestellt hat; er wird den Bedingungen der Creative Commons 3.0 Attribution License genutzt.</string>
   <string name="accept">Akzeptieren</string>
   <string name="add_entry">Eintrag hinzufügen</string>
   <string name="add_group">Gruppe hinzufügen</string>
@@ -13,13 +14,12 @@
   <string name="algorithm_colon">Algorithmus</string>
   <string name="app_name">Keepass2Android</string>
   <string name="short_app_name">KP2A</string>
-  <string name="library_name">KeePassLib2Android</string>
   <string name="app_timeout">Anwendungssperre</string>
   <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">Einstellungen</string>
   <string name="brackets">Klammern</string>
-  <string name="browser_intall_text">Um diese Funktion zu nutzen, bitten wir Sie einen externen Dateimanager herunterzuladen, welchen Sie über GooglePlay oder direkt von der Entwickler-Webseite herunterladen können. Aufgrund einiger Beschränkungen kann der Dateimanager nicht vollkommen genutzt werden.</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">Indexiere vor der Suche…</string>
   <string name="cancel">Abbr.</string>
   <string name="ClearClipboard">Zwischenablage geleert…</string>
@@ -35,7 +35,7 @@
   <string name="decrypting_entry">Entschlüsselt</string>
   <string name="default_checkbox">Als Standard-Datenbank benutzen</string>
   <string name="digits">Zahlen</string>
-  <string name="disclaimer_formal">Keepass2Android, Copyright 2013 Philipp Crocoll. Alle Rechte vorbehalten. Wir tragen keine Verantwortung und geben auch keine Garantie bei der Nutzung der Anwendung; Die Anwendung ist kostenlos und wird unter den GPL v2 (und weiteren Versionen) Bedingungen verbreitet.</string>
+  <string name="disclaimer_formal">Keepass2Android, Copyright 2013 Philipp Crocoll. Alle Rechte vorbehalten. Der Autor übernimmt keine Verantwortung gibt KEINERLEI GARANTIE bei der Nutzung der Anwendung; Die Anwendung ist kostenlos und kann unter den Bedingungen der GPL v2 oder später verbreitet werden.</string>
   <string name="ellipsis">…</string>
   <string name="enter_filename">Dateinamen der Datenbank eingeben</string>
   <string name="entry_accessed">Letzter Zugriff</string>
@@ -90,7 +90,7 @@
   <string name="hint_login_pass">Kennwort</string>
   <string name="hint_title">Name</string>
   <string name="hint_url">Adresse</string>
-  <string name="hint_override_url">override url</string>
+  <string name="hint_override_url">Override URL</string>
   <string name="hint_tags">Tag1, Tag2</string>
   <string name="hint_username">Benutzername</string>
   <string name="install_from_market">GooglePlay</string>
@@ -173,22 +173,18 @@
   <string name="start_open_file">Datei öffnen...</string>
   <string name="start_create">Neue Datenbank erstellen...</string>
   <string name="start_open_url">URL öffnen...</string>
-  <string name="start_create_import">Import file to new database...</string>
-  <string name="enter_filename_details_file"> </string>
+  <string name="start_create_import">Datei in neue Datenbank importieren...</string>
   <string name="enter_filename_details_url">Die vollständige URL muss einschließlich Protokoll, z.B. http://, angegeben werden.</string>
-  <string name="enter_filename_details_create_import">File to import will be selected in the next step.</string>
+  <string name="enter_filename_details_create_import">Zu importierende Datei wird im nächsten Schritt gewählt.</string>
   <string name="enable_quickunlock">QuickUnlock aktivieren</string>
   <string name="QuickUnlock_label">Gib die letzten %1$d Zeichen deines Passworts ein:</string>
   <string name="QuickUnlock_button">QuickUnlock!</string>
   <string name="QuickUnlock_lockButton">Datenbank schließen</string>
-  <string name="QuickUnlockDefaultEnabled_key">Enable_QuickUnlock_by_default</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="QuickUnlockLength_key">QuickUnlockLength</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>
-  <string name="QuickUnlockLength_default">3</string>
   <string name="BinaryDirectory_title">Verzeichnis für Datei-Anhänge</string>
   <string name="BinaryDirectory_summary">Verzeichnis, in dem Dateianlagen gespeichert werden.</string>
   <string name="SaveAttachment_doneMessage">Datei unter %1$s gespeichert.</string>
@@ -202,7 +198,6 @@
   <string name="add_extra_string">Zusätzliches Feld hinzufügen</string>
   <string name="database_loaded_quickunlock_enabled">Datenbank geladen, QuickUnlock aktiviert.</string>
   <string name="credentials_dialog_title">Serverzugangsdaten eingeben</string>
-  <string name="UseFileTransactions_key">UseFileTransactions</string>
   <string name="UseFileTransactions_title">Dateitransaktionen</string>
   <string name="UseFileTransactions_summary">Dateitransaktionen beim Schreiben von Datenbank-Dateien verwenden</string>
   <string name="AskOverwriteBinary">Möchtest du den vorhandenen Anhang mit dem gleichen Namen überschreiben?</string>
diff --git a/src/keepass2android/Resources/values-es/strings.xml b/src/keepass2android/Resources/values-es/strings.xml
index 084814e2..68b3d12d 100644
--- a/src/keepass2android/Resources/values-es/strings.xml
+++ b/src/keepass2android/Resources/values-es/strings.xml
@@ -1,182 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-Keepass2Android is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-Keepass2Android is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
-
-Spanish translation by José I. Paños
-
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Realimentación</string>    
-    <string name="about_homepage">Inicio</string>    
-    <string name="AboutText">Keepass2Android es una implementación para Android del gestor de contraseñas KeePass.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Aceptar</string>
-    <string name="add_entry">Añadir entrada</string>
-    <string name="add_group">Añadir grupo</string>
-    <string name="add_group_title">Añadir grupo</string>
-    <string name="algorithm">Algoritmo</string>
-    <string name="algorithm_colon">Algoritmo</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Tiempo de espera de aplicación</string>
-    <string name="app_timeout_summary">Tiempo hasta bloquear la base de datos cuando la aplicación está inacttiva.</string>
-    <string name="application">Aplicación</string>
-    <string name="application_settings">Configuración de la aplicación</string>
-    <string name="brackets">Paréntesis</string>
-    <string name="browser_intall_text">La exploración de archivos necesita Open Intents File Manager, haz clic a continuación para instalarlo. Debido a algunas peculiaridades en el gestor de archivos, puede que la exploración no funcione correctamente la primera vez que la realices.</string>
-    <string name="building_search_idx">Construcción de índice de búsqueda&#8230;</string>
-    <string name="cancel">Cancelar</string>
-    <string name="ClearClipboard">Portapapeles vaciado.</string>
-    <string name="clipboard_timeout">Portapapeles caducado</string>
-    <string name="clipboard_timeout_summary">Tiempo hasta que el portapapeles se vacía después de copiar el usuario o la contraseña</string>
-    <string name="copy_username">Seleccionar para copiar el usuario al portapapeles</string>
-    <string name="copy_password">Seleccionar para copiar la contraseña al portapapeles</string>
-    <string name="creating_db_key">Creando clave de la base de datos&#8230;</string>
-    <string name="current_group">Grupo actual</string>
-    <string name="current_group_root">Grupo actual: Raíz</string>
-    <string name="database">Base de datos</string>
-    <string name="decrypting_db">Descifrando el contenido de la base de datos&#8230;</string>
-    <string name="decrypting_entry">Descrifrando la entrada entry</string>
-    <string name="default_checkbox">Utilice esto como base de datos por defecto</string>
-    <string name="digits">Dígitos</string>
-    <string name="disclaimer_formal">Keepass2Android NO TIENE TOTAL GARANTÍA; Este es software libre, y puedes redristribuirlo bajo las condiciones de la licencia GPL version 2 o posterior.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Introduzca el nombre del archivo de base de datos</string>    
-    <string name="entry_accessed">Acceso</string>
-    <string name="entry_and_or">Introduzca una contraseña y/o un archivo de clave para desbloquear su base de datos</string>    
-    <string name="entry_cancel">Cancelar</string>
-    <string name="entry_comment">Comentario</string>
-    <string name="entry_confpassword">Confirmar contraseña</string>
-    <string name="entry_created">Creación</string>
-    <string name="entry_expires">Caducidad</string>
-    <string name="entry_keyfile">Archivo de clave (opcional)</string>
-    <string name="entry_modified">Modificación</string>
-    <string name="entry_password">Contraseña</string>
-    <string name="entry_save">Guardar</string>
-    <string name="entry_title">Nombre</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Nombre de usuario</string>
-    <string name="error_arc4">Secuencia de cifrado ArcFour no soportada.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android no puede manejar este uri.</string>
-    <string name="error_could_not_create_group">Error creando grupo.</string>
-    <string name="error_could_not_create_parent">No pudo crearse el directorio padre.</string>
-    <string name="error_database_exists">Este archivo ya existe.</string>
-    <string name="error_database_settings">Fallo al determinar la configuración de la base de datos.</string>
-    <string name="error_failed_to_launch_link">Fallo al abrir el enlace.</string>
-    <string name="error_filename_required">Se necesita un nombre de archivo.</string>
-    <string name="error_file_not_create">No se pudo crear el archivo</string>    
-    <string name="error_invalid_db">Base de datos no válida.</string>
-    <string name="error_invalid_path">Ruta no válida.</string>
-    <string name="error_no_name">Se necesita un nombre.</string>
-    <string name="error_nopass">Se necesita una contraseña o un archivo de clave.</string>
-    <string name="error_out_of_memory">El dispositivo se quedó sin memory mientras analizada la base de datos. Puede ser demasiado grande para este dispositivo.</string>
-    <string name="error_pass_gen_type">Debe seleccionar al menos un tipo de generación de contraseñas</string>
-    <string name="error_pass_match">Las contraseñas no coinciden.</string>
-    <string name="error_rounds_not_number">Pasadas debe de ser un número.</string>
-    <string name="error_rounds_too_large">Pasadas demasiado grande. Establecido a 2147483648.</string>
-    <string name="error_title_required">Se necesita un título.</string>
-    <string name="error_wrong_length">Introduzca un entero positivo en el campo longitud</string>
-    <string name="FileNotFound">Archivo no encontrado.</string>
-    <string name="file_browser">Expolrador de Archivos</string>
-    <string name="generate_password">Generar Contraseña</string>
-    <string name="group">Grupo</string>
-    <string name="hint_comment">comentario</string>
-    <string name="hint_conf_pass">confirmar contraseña</string>
-    <string name="hint_generated_password">contraseña generada</string>
-    <string name="hint_group_name">Nombre de grupo</string>
-    <string name="hint_keyfile">archivo clave</string>
-    <string name="hint_length">longitud</string>
-    <string name="hint_login_pass">Contraseña</string>
-    <string name="hint_pass">contraseña</string>
-    <string name="hint_title">combre</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">nombre de usuario</string>
-    <string name="install_from_market">Instalar desde Market</string>
-    <string name="install_from_website">Instalar desde Web</string>
-    <string name="InvalidPassword">Contraseña o archivo de clave no válido.</string>
-    <string name="invalid_db_sig">Formato de base de datos no reconocido.</string>
-    <string name="length">Longitud</string>
-    <string name="list_size_title">Tamaño de la lista de Grupo</string>
-    <string name="list_size_summary">Tamaño del texto de la lista de grupo</string>
-    <string name="loading_database">Cargando base de datos&#8230;</string>
-    <string name="lowercase">Minúsculas</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Ocultar contraseña</string>
-    <string name="maskpass_summary">Ocultar contraseñas por defecto</string>
-    <string name="menu_about">Acerca de</string>
-    <string name="menu_change_key">Cambiar Contraseña Maestra</string>
-    <string name="menu_copy_pass">Copiar Contraseña</string>
-    <string name="menu_copy_user">Copiar Usuario</string>
-    <string name="menu_create">Crear</string>
-    <string name="menu_app_settings">Configuración</string>
-    <string name="menu_db_settings">Configuración de Base de datos</string>
-    <string name="menu_delete">Eliminar</string>
-    <string name="menu_donate">Donar</string>
-    <string name="menu_edit">Editar</string>
-    <string name="menu_hide_password">Ocultar Contraseña</string>
-    <string name="menu_homepage">Ir a Inicio</string>
-    <string name="menu_lock">Bloquear Base de datos</string>
-    <string name="menu_open">Abrir</string>
-    <string name="menu_rename">Renombar</string>
-    <string name="menu_search">Buscar</string>
-    <string name="menu_url">Ir a URL</string>
-    <string name="minus">Menos</string>
-    <string name="never">Nunca</string>
-    <string name="no_keys">Sin entradas en la base de datos o grupo.</string>
-    <string name="no_results">Sin resultado de búsqueda</string>
-    <string name="no_url_handler">Sin manejador para esta url.</string>
-    <string name="open_recent">Abrir base de datos reciente (clic para abrir)</string>    
-    <string name="omitbackup_title">No buscar en las entradas de copia de seguridad o papelera de reciclaje</string>
-    <string name="omitbackup_summary">Omitir \'Backup\' y grupo de Papelera de Reciclaje en los resultados de búsqueda</string>
-    <string name="pass_filename">Nombre de archivo de base de datos de KeePass</string>    
-    <string name="password_title">Introduzca la contraseña de la base de datos</string>
-    <string name="progress_create">Creando nueva base de datos&#8230;</string>
-    <string name="progress_title">Trabajando&#8230;</string>
-    <string name="remember_keyfile_summary">Recordar la ubicación de archivos de clave</string>
-    <string name="remember_keyfile_title">Guardando archivo de clave</string>
-    <string name="remove_from_filelist">Borrar</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Raíz</string>
-    <string name="rounds">Pasadas de Cifrado</string>
-    <string name="rounds_explaination">Un alto número de pasadas de cifrado proporciona protección adicional contra ataques de fuerza bruta, pero puede ralentizar mucho el cargado y el guardado.</string>
-    <string name="rounds_hint">pasadas</string>
-    <string name="saving_database">Guardando base de datos&#8230;</string>
-    <string name="space">Espacio</string>
-    <string name="search_label">Buscar</string>
-    <string name="show_password">Mostrar contraseña</string>
-    <string name="sort_name">Ordenar por nombre</string>
-    <string name="sort_db">Orden de BD</string>
-    <string name="special">Especial</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Subrayado</string>
-    <string name="unsupported_db_version">Versión de base de datos no soportada.</string>
-    <string name="uppercase">Mayúsculas</string>
-    <string name="warning_read_only">Actualmente su tarjeta SD es de sólo lectura. No podrá guardar los cambios de su base de datos.</string>
-    <string name="warning_unmounted">Actualmente su tarjeta SD no está montada en el dispositivo. No podrá cargar o crear su base de datos.</string>
-    <string name="version_label">Versión</string>    
-    
-    <string-array name="clipboard_timeout_options">
-     <item>30 segundos</item>
-     <item>1 minuto</item>
-     <item>5 minutos</item>
-     <item>Nunca</item>
-    </string-array>
-    <string-array name="list_size_options">
-     <item>Pequeño</item>
-     <item>Mediano</item>
-     <item>Grande</item>
-    </string-array>
-</resources>
\ No newline at end of file
+  <string name="about_feedback">Realimentación</string>
+  <string name="about_homepage">Inicio</string>
+  <string name="AboutText">Keepass2Android es una implementación para Android del gestor de contraseñas KeePass.</string>
+  <string name="accept">Aceptar</string>
+  <string name="add_entry">Añadir entrada</string>
+  <string name="add_group">Añadir grupo</string>
+  <string name="add_group_title">Añadir grupo</string>
+  <string name="algorithm">Algoritmo</string>
+  <string name="algorithm_colon">Algoritmo</string>
+  <string name="app_timeout">Tiempo de espera de aplicación</string>
+  <string name="app_timeout_summary">Tiempo hasta bloquear la base de datos cuando la aplicación está inacttiva.</string>
+  <string name="application">Aplicación</string>
+  <string name="application_settings">Configuración de la aplicación</string>
+  <string name="brackets">Paréntesis</string>
+  <string name="browser_intall_text">La exploración de archivos necesita Open Intents File Manager, haz clic a continuación para instalarlo. Debido a algunas peculiaridades en el gestor de archivos, puede que la exploración no funcione correctamente la primera vez que la realices.</string>
+  <string name="building_search_idx">Construcción de índice de búsqueda…</string>
+  <string name="cancel">Cancelar</string>
+  <string name="ClearClipboard">Portapapeles vaciado.</string>
+  <string name="clipboard_timeout">Portapapeles caducado</string>
+  <string name="clipboard_timeout_summary">Tiempo hasta que el portapapeles se vacía después de copiar el usuario o la contraseña</string>
+  <string name="copy_username">Seleccionar para copiar el usuario al portapapeles</string>
+  <string name="copy_password">Seleccionar para copiar la contraseña al portapapeles</string>
+  <string name="creating_db_key">Creando clave de la base de datos…</string>
+  <string name="current_group">Grupo actual</string>
+  <string name="current_group_root">Grupo actual: Raíz</string>
+  <string name="database">Base de datos</string>
+  <string name="decrypting_db">Descifrando el contenido de la base de datos…</string>
+  <string name="decrypting_entry">Descrifrando la entrada entry</string>
+  <string name="default_checkbox">Utilice esto como base de datos por defecto</string>
+  <string name="digits">Dígitos</string>
+  <string name="disclaimer_formal">Keepass2Android NO TIENE TOTAL GARANTÍA; Este es software libre, y puedes redristribuirlo bajo las condiciones de la licencia GPL version 2 o posterior.</string>
+  <string name="enter_filename">Introduzca el nombre del archivo de base de datos</string>
+  <string name="entry_accessed">Acceso</string>
+  <string name="entry_and_or">Introduzca una contraseña y/o un archivo de clave para desbloquear su base de datos</string>
+  <string name="entry_cancel">Cancelar</string>
+  <string name="entry_comment">Comentario</string>
+  <string name="entry_confpassword">Confirmar contraseña</string>
+  <string name="entry_created">Creación</string>
+  <string name="entry_expires">Caducidad</string>
+  <string name="entry_keyfile">Archivo de clave (opcional)</string>
+  <string name="entry_modified">Modificación</string>
+  <string name="entry_password">Contraseña</string>
+  <string name="entry_save">Guardar</string>
+  <string name="entry_title">Nombre</string>
+  <string name="entry_user_name">Nombre de usuario</string>
+  <string name="error_arc4">Secuencia de cifrado ArcFour no soportada.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android no puede manejar este uri.</string>
+  <string name="error_could_not_create_group">Error creando grupo.</string>
+  <string name="error_could_not_create_parent">No pudo crearse el directorio padre.</string>
+  <string name="error_database_exists">Este archivo ya existe.</string>
+  <string name="error_database_settings">Fallo al determinar la configuración de la base de datos.</string>
+  <string name="error_failed_to_launch_link">Fallo al abrir el enlace.</string>
+  <string name="error_filename_required">Se necesita un nombre de archivo.</string>
+  <string name="error_file_not_create">No se pudo crear el archivo</string>
+  <string name="error_invalid_db">Base de datos no válida.</string>
+  <string name="error_invalid_path">Ruta no válida.</string>
+  <string name="error_no_name">Se necesita un nombre.</string>
+  <string name="error_nopass">Se necesita una contraseña o un archivo de clave.</string>
+  <string name="error_out_of_memory">El dispositivo se quedó sin memory mientras analizada la base de datos. Puede ser demasiado grande para este dispositivo.</string>
+  <string name="error_pass_gen_type">Debe seleccionar al menos un tipo de generación de contraseñas</string>
+  <string name="error_pass_match">Las contraseñas no coinciden.</string>
+  <string name="error_rounds_not_number">Pasadas debe de ser un número.</string>
+  <string name="error_rounds_too_large">Pasadas demasiado grande. Establecido a 2147483648.</string>
+  <string name="error_title_required">Se necesita un título.</string>
+  <string name="error_wrong_length">Introduzca un entero positivo en el campo longitud</string>
+  <string name="FileNotFound">Archivo no encontrado.</string>
+  <string name="file_browser">Expolrador de Archivos</string>
+  <string name="generate_password">Generar Contraseña</string>
+  <string name="group">Grupo</string>
+  <string name="hint_comment">comentario</string>
+  <string name="hint_conf_pass">confirmar contraseña</string>
+  <string name="hint_generated_password">contraseña generada</string>
+  <string name="hint_group_name">Nombre de grupo</string>
+  <string name="hint_keyfile">archivo clave</string>
+  <string name="hint_length">longitud</string>
+  <string name="hint_pass">contraseña</string>
+  <string name="hint_login_pass">Contraseña</string>
+  <string name="hint_title">combre</string>
+  <string name="hint_username">nombre de usuario</string>
+  <string name="install_from_market">Instalar desde Market</string>
+  <string name="install_from_website">Instalar desde Web</string>
+  <string name="InvalidPassword">Contraseña o archivo de clave no válido.</string>
+  <string name="invalid_db_sig">Formato de base de datos no reconocido.</string>
+  <string name="length">Longitud</string>
+  <string name="list_size_title">Tamaño de la lista de Grupo</string>
+  <string name="list_size_summary">Tamaño del texto de la lista de grupo</string>
+  <string name="loading_database">Cargando base de datos…</string>
+  <string name="lowercase">Minúsculas</string>
+  <string name="maskpass_title">Ocultar contraseña</string>
+  <string name="maskpass_summary">Ocultar contraseñas por defecto</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="menu_change_key">Cambiar Contraseña Maestra</string>
+  <string name="menu_copy_pass">Copiar Contraseña</string>
+  <string name="menu_copy_user">Copiar Usuario</string>
+  <string name="menu_create">Crear</string>
+  <string name="menu_app_settings">Configuración</string>
+  <string name="menu_db_settings">Configuración de Base de datos</string>
+  <string name="menu_delete">Eliminar</string>
+  <string name="menu_donate">Donar</string>
+  <string name="menu_edit">Editar</string>
+  <string name="menu_hide_password">Ocultar Contraseña</string>
+  <string name="menu_homepage">Ir a Inicio</string>
+  <string name="menu_lock">Bloquear Base de datos</string>
+  <string name="menu_open">Abrir</string>
+  <string name="menu_rename">Renombar</string>
+  <string name="menu_search">Buscar</string>
+  <string name="menu_url">Ir a URL</string>
+  <string name="minus">Menos</string>
+  <string name="never">Nunca</string>
+  <string name="no_keys">Sin entradas en la base de datos o grupo.</string>
+  <string name="no_results">Sin resultado de búsqueda</string>
+  <string name="no_url_handler">Sin manejador para esta url.</string>
+  <string name="open_recent">Abrir base de datos reciente (clic para abrir)</string>
+  <string name="omitbackup_title">No buscar en las entradas de copia de seguridad o papelera de reciclaje</string>
+  <string name="omitbackup_summary">Omitir \'Backup\' y grupo de Papelera de Reciclaje en los resultados de búsqueda</string>
+  <string name="pass_filename">Nombre de archivo de base de datos de KeePass</string>
+  <string name="password_title">Introduzca la contraseña de la base de datos</string>
+  <string name="progress_create">Creando nueva base de datos…</string>
+  <string name="progress_title">Trabajando…</string>
+  <string name="remember_keyfile_summary">Recordar la ubicación de archivos de clave</string>
+  <string name="remember_keyfile_title">Guardando archivo de clave</string>
+  <string name="remove_from_filelist">Borrar</string>
+  <string name="root">Raíz</string>
+  <string name="rounds">Pasadas de Cifrado</string>
+  <string name="rounds_explaination">Un alto número de pasadas de cifrado proporciona protección adicional contra ataques de fuerza bruta, pero puede ralentizar mucho el cargado y el guardado.</string>
+  <string name="rounds_hint">pasadas</string>
+  <string name="saving_database">Guardando base de datos…</string>
+  <string name="space">Espacio</string>
+  <string name="search_label">Buscar</string>
+  <string name="show_password">Mostrar contraseña</string>
+  <string name="sort_name">Ordenar por nombre</string>
+  <string name="sort_db">Orden de BD</string>
+  <string name="special">Especial</string>
+  <string name="underline">Subrayado</string>
+  <string name="unsupported_db_version">Versión de base de datos no soportada.</string>
+  <string name="uppercase">Mayúsculas</string>
+  <string name="warning_read_only">Actualmente su tarjeta SD es de sólo lectura. No podrá guardar los cambios de su base de datos.</string>
+  <string name="warning_unmounted">Actualmente su tarjeta SD no está montada en el dispositivo. No podrá cargar o crear su base de datos.</string>
+  <string name="version_label">Versión</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>5 minutos</item>
+    <item>Nunca</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Pequeño</item>
+    <item>Mediano</item>
+    <item>Grande</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>
+  </string-array>
+</resources>
diff --git a/src/keepass2android/Resources/values-fr/strings.xml b/src/keepass2android/Resources/values-fr/strings.xml
index d7645fad..ec2a137a 100644
--- a/src/keepass2android/Resources/values-fr/strings.xml
+++ b/src/keepass2android/Resources/values-fr/strings.xml
@@ -1,114 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- 
-     
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
- 
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
- 
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
- 
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
- 
-  French translation by Laurent, Norman
- 
--->
+<!--Generated by crowdin.net-->
 <resources>
-	<string name="about_feedback">Commentaires </string>    
-	<string name="about_homepage">Site web </string>    
-	<string name="AboutText">Keepass2Android est un portage du logiciel KeePass Password Manager. Pour l\'instant, vous devez créer une base de données avec le logiciel KeePass sur votre ordinateur puis la transférer sur la carte mémoire de votre appareil mobile.</string>
-	<string name="about_twitter">Twitter </string>    
-	<string name="add_entry">Ajouter une entrée</string>
-	<string name="add_group">Ajouter un groupe</string>
-	<string name="add_group_title">Ajouter un groupe</string>
-	<string name="algorithm">Algorithme</string>
-	<string name="algorithm_colon">Algorithme </string>    
-	<string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>    
-	<string name="cancel">Annuler</string>    
-	<string name="ClearClipboard">Presse-papier nettoyé.</string>    
-	<string name="current_group">Groupe actuel</string>    
-	<string name="current_group_root">Groupe actuel : Racine</string>    
-	<string name="disclaimer_formal">Keepass2Android n\'offre ABSOLUMENT AUCUNE GARANTIE; il s\'agit d\'un logiciel gratuit, et vous pouvez le redistribuer sous les conditions de la licenceGPL v2 ou ultérieure.</string>    
-	<string name="enter_filename">Entrez le nom de fichier de la base de données</string>    
-	<string name="entry_accessed">Accédé</string>    
-	<string name="entry_and_or">Entrez un mot de passe et/ou une clé de fichier pour déverrouiller votre base de données</string>    
-	<string name="entry_cancel">Annuler</string>    
-	<string name="entry_comment">Commentaires</string>    
-	<string name="entry_confpassword">Confirmer mot de passe</string>    
-	<string name="entry_created">Créée</string>    
-	<string name="entry_expires">Expire</string>    
-	<string name="entry_keyfile">Clé (facultative)</string>    
-	<string name="entry_modified">Modifié</string>    
-	<string name="entry_password">Mot de passe</string>    
-	<string name="entry_save">Enregistrer</string>    
-	<string name="entry_title">Nom</string>    
-	<string name="entry_url">URL</string>    
-	<string name="entry_user_name">Nom d\'utilisateur </string>    
-	<string name="error_can_not_handle_uri">Keepass2Android ne peut pas gérer cette URI.</string>    
-	<string name="error_could_not_create_group">Erreur de création de groupe.</string>    
-	<string name="error_database_exists">Ce fichier existe déjà.</string>    
-	<string name="error_database_settings">Impossible de déterminer les paramètres de la base de données.</string>    
-	<string name="error_failed_to_launch_link">Echec lors de l\'ouverture du lien.</string>
-	<string name="error_filename_required">Le nom de fichier est obligatoire.</string>    
-	<string name="error_file_not_create">Impossible de créer le fichier </string>        
-	<string name="error_no_name">Le nom est obligatoire.</string>    
-	<string name="error_nopass">Un mot de passe ou clé de fichier est requis.</string>    
-	<string name="error_pass_match">Les mots de passe ne correspondent pas.</string>    
-	<string name="error_rounds_not_number">La série doit être un nombre.</string>    
-	<string name="error_title_required">Le titre est obligatoire.</string>    
-	<string name="FileNotFound">Fichier non trouvé.</string>    
-	<string name="group">Groupe</string>    
-	<string name="hint_comment">commentaire</string>    
-	<string name="hint_conf_pass">confirmez mot de passe</string>    
-	<string name="hint_group_name">Nom de groupe</string>    
-	<string name="hint_keyfile">clé de fichier</string>    
-	<string name="hint_login_pass">Mot de passe</string>    
-	<string name="hint_pass">mot de passe</string>    
-	<string name="hint_title">nom</string>    
-	<string name="hint_url">url</string>    
-	<string name="hint_username">Nom d\'utilisateur</string>    
-	<string name="InvalidPassword">Mot de passe ou clé de fichier incorrect.</string>    
-	<string name="loading_database">Chargement de la base de données&#8230;</string>    
-	<string name="MaskedPassword">*****</string>    
-	<string name="menu_about">A propos</string>    
-	<string name="menu_change_key">Modifier la Clé maître</string>    
-	<string name="menu_copy_pass">Copier mot de passe</string>    
-	<string name="menu_copy_user">Copier Utilisateur</string>    
-	<string name="menu_create">Créer</string>    
-	<string name="menu_db_settings">Préférences</string>    
-	<string name="menu_delete">Supprimer</string>    
-	<string name="menu_donate">Faire un Don</string>    
-	<string name="menu_edit">Modifier</string>    
-	<string name="menu_hide_password">Masquer le mot de passe</string>    
-	<string name="menu_homepage">Aller à la page d\'accueil</string>    
-	<string name="menu_lock">Verrouiller les données</string>    
-	<string name="menu_open">Ouvrir</string>    
-	<string name="menu_rename">Renommer</string>    
-	<string name="menu_search">Rechercher</string>    
-	<string name="menu_url">Aller à l\'adresse URL</string>    
-	<string name="never">Jamais</string>    
-	<string name="no_keys">Aucune entrée dans la base de données ou le groupe.</string>    
-	<string name="no_results">Aucun résultat pour cette recherche</string>    
-	<string name="no_url_handler">Aucun gestionnaire pour cette url.</string>    
-	<string name="open_recent">bases de données récemment ouvertes (cliquez pour ouvrir) </string>        
-	<string name="pass_filename">Nom de fichier de base de données KeePass </string>        
-	<string name="password_title">Entrez le mot de passe de la base de données</string>    
-	<string name="progress_create">Création d\'une nouvelle base de données&#8230;</string>    
-	<string name="progress_title">En cours&#8230;</string>    
-	<string name="rijndael">Rijndael (AES)</string>    
-	<string name="root">Racine</string>    
-	<string name="rounds">Niveau du cryptage</string>    
-	<string name="rounds_explaination">Un niveau de cryptage supérieur assure une protection supplémentaire contre les attaques de force brute, mais peut considérablement ralentir le chargement et la sauvegarde.</string>    
-	<string name="rounds_hint">niveaux</string>    
-	<string name="saving_database">Enregistrement de la base de données&#8230;</string>    
-	<string name="search_label">Rechercher</string>    
-	<string name="show_password">Afficher le mot de passe</string>
+  <string name="about_feedback">Commentaires </string>
+  <string name="about_homepage">Site web </string>
+  <string name="AboutText">Keepass2Android est un portage du logiciel KeePass Password Manager. Pour l\'instant, vous devez créer une base de données avec le logiciel KeePass sur votre ordinateur puis la transférer sur la carte mémoire de votre appareil mobile.</string>
+  <string name="add_entry">Ajouter une entrée</string>
+  <string name="add_group">Ajouter un groupe</string>
+  <string name="add_group_title">Ajouter un groupe</string>
+  <string name="algorithm">Algorithme</string>
+  <string name="algorithm_colon">Algorithme </string>
+  <string name="cancel">Annuler</string>
+  <string name="ClearClipboard">Presse-papier nettoyé.</string>
+  <string name="current_group">Groupe actuel</string>
+  <string name="current_group_root">Groupe actuel : Racine</string>
+  <string name="disclaimer_formal">Keepass2Android n\'offre ABSOLUMENT AUCUNE GARANTIE; il s\'agit d\'un logiciel gratuit, et vous pouvez le redistribuer sous les conditions de la licenceGPL v2 ou ultérieure.</string>
+  <string name="enter_filename">Entrez le nom de fichier de la base de données</string>
+  <string name="entry_accessed">Accédé</string>
+  <string name="entry_and_or">Entrez un mot de passe et/ou une clé de fichier pour déverrouiller votre base de données</string>
+  <string name="entry_cancel">Annuler</string>
+  <string name="entry_comment">Commentaires</string>
+  <string name="entry_confpassword">Confirmer mot de passe</string>
+  <string name="entry_created">Créée</string>
+  <string name="entry_expires">Expire</string>
+  <string name="entry_keyfile">Clé (facultative)</string>
+  <string name="entry_modified">Modifié</string>
+  <string name="entry_password">Mot de passe</string>
+  <string name="entry_save">Enregistrer</string>
+  <string name="entry_title">Nom</string>
+  <string name="entry_user_name">Nom d\'utilisateur </string>
+  <string name="error_can_not_handle_uri">Keepass2Android ne peut pas gérer cette URI.</string>
+  <string name="error_could_not_create_group">Erreur de création de groupe.</string>
+  <string name="error_database_exists">Ce fichier existe déjà.</string>
+  <string name="error_database_settings">Impossible de déterminer les paramètres de la base de données.</string>
+  <string name="error_failed_to_launch_link">Echec lors de l\'ouverture du lien.</string>
+  <string name="error_filename_required">Le nom de fichier est obligatoire.</string>
+  <string name="error_file_not_create">Impossible de créer le fichier </string>
+  <string name="error_no_name">Le nom est obligatoire.</string>
+  <string name="error_nopass">Un mot de passe ou clé de fichier est requis.</string>
+  <string name="error_pass_match">Les mots de passe ne correspondent pas.</string>
+  <string name="error_rounds_not_number">La série doit être un nombre.</string>
+  <string name="error_title_required">Le titre est obligatoire.</string>
+  <string name="FileNotFound">Fichier non trouvé.</string>
+  <string name="group">Groupe</string>
+  <string name="hint_comment">commentaire</string>
+  <string name="hint_conf_pass">confirmez mot de passe</string>
+  <string name="hint_group_name">Nom de groupe</string>
+  <string name="hint_keyfile">clé de fichier</string>
+  <string name="hint_pass">mot de passe</string>
+  <string name="hint_login_pass">Mot de passe</string>
+  <string name="hint_title">nom</string>
+  <string name="hint_username">Nom d\'utilisateur</string>
+  <string name="InvalidPassword">Mot de passe ou clé de fichier incorrect.</string>
+  <string name="loading_database">Chargement de la base de données…</string>
+  <string name="menu_about">A propos</string>
+  <string name="menu_change_key">Modifier la Clé maître</string>
+  <string name="menu_copy_pass">Copier mot de passe</string>
+  <string name="menu_copy_user">Copier Utilisateur</string>
+  <string name="menu_create">Créer</string>
+  <string name="menu_db_settings">Préférences</string>
+  <string name="menu_delete">Supprimer</string>
+  <string name="menu_donate">Faire un Don</string>
+  <string name="menu_edit">Modifier</string>
+  <string name="menu_hide_password">Masquer le mot de passe</string>
+  <string name="menu_homepage">Aller à la page d\'accueil</string>
+  <string name="menu_lock">Verrouiller les données</string>
+  <string name="menu_open">Ouvrir</string>
+  <string name="menu_rename">Renommer</string>
+  <string name="menu_search">Rechercher</string>
+  <string name="menu_url">Aller à l\'adresse URL</string>
+  <string name="never">Jamais</string>
+  <string name="no_keys">Aucune entrée dans la base de données ou le groupe.</string>
+  <string name="no_results">Aucun résultat pour cette recherche</string>
+  <string name="no_url_handler">Aucun gestionnaire pour cette url.</string>
+  <string name="open_recent">bases de données récemment ouvertes (cliquez pour ouvrir) </string>
+  <string name="pass_filename">Nom de fichier de base de données KeePass </string>
+  <string name="password_title">Entrez le mot de passe de la base de données</string>
+  <string name="progress_create">Création d\'une nouvelle base de données…</string>
+  <string name="progress_title">En cours…</string>
+  <string name="root">Racine</string>
+  <string name="rounds">Niveau du cryptage</string>
+  <string name="rounds_explaination">Un niveau de cryptage supérieur assure une protection supplémentaire contre les attaques de force brute, mais peut considérablement ralentir le chargement et la sauvegarde.</string>
+  <string name="rounds_hint">niveaux</string>
+  <string name="saving_database">Enregistrement de la base de données…</string>
+  <string name="search_label">Rechercher</string>
+  <string name="show_password">Afficher le mot de passe</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>5 minutes</item>
+    <item>Never</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Small</item>
+    <item>Medium</item>
+    <item>Large</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-hu/strings.xml b/src/keepass2android/Resources/values-hu/strings.xml
index 7fec5509..27b2ed1d 100644
--- a/src/keepass2android/Resources/values-hu/strings.xml
+++ b/src/keepass2android/Resources/values-hu/strings.xml
@@ -1,163 +1,160 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Visszajelzés</string>    
-    <string name="about_homepage">Weboldal</string>    
-    <string name="AboutText">Keepass2Android a KeePass jelszókezelő android implementációja.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Elfogadás</string>
-    <string name="add_entry">Bejegyzés hozzáadása</string>
-    <string name="add_group">Csoport hozzáadása</string>
-    <string name="add_group_title">Csoport hozzáadása</string>
-    <string name="algorithm">Algoritmus</string>
-    <string name="algorithm_colon">Algoritmus</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Alkalmazás időkorlátja</string>
-    <string name="app_timeout_summary">Beállíthatja, mennyi idő után kerüljön lezárásra az adatbázis.</string>
-    <string name="application">Alkalmazás</string>
-    <string name="application_settings">Alkalmazás beállítások</string>
-    <string name="brackets">Zárójelek</string>
-    <string name="browser_intall_text">A fájl kiválasztásához önnek egy nyílt forrású fájlkezelő programra lesz szüksége, kattintson a lenti telepítés linkre. Előfordulhat, hogy első használatakor nem fog megfelelően működni a fájlkezelő program.</string>
-    <string name="building_search_idx">Keresési index létrehozása…</string>
-    <string name="cancel">Mégsem</string>
-    <string name="ClearClipboard">Vágólap törölve.</string>
-    <string name="clipboard_timeout">Vágólap időkorlátja</string>
-    <string name="clipboard_timeout_summary">Beállíthatja, mennyi idő után kerüljön törlésre a vágólap</string>
-    <string name="copy_username">Felhasználónév másolása a vágólapra</string>
-    <string name="copy_password">Jelszó másolása a vágólapra</string>
-    <string name="creating_db_key">Adatbázis létrehozása…</string>
-    <string name="current_group">Jelenlegi csoport</string>    
-    <string name="current_group_root">Jelenlegi csoport: Gyökérkönyvtár</string>
-    <string name="database">Adatbázis</string>
-    <string name="decrypting_db">Adatbázis tartalmának dekódolása…</string>
-    <string name="decrypting_entry">Bejegyzés dekódolása</string>
-    <string name="default_checkbox">Adatbázis beállítása alapértelmezettként</string>
-    <string name="digits">Számok</string>
-    <string name="disclaimer_formal">Keepass2Android, Copyright 2013 Philipp Crocoll. Ehhez a programhoz SEMMILYEN GARANCIA NEM JÁR; Ez egy szabad szoftver, GNU General Public License v2 vagy későbbi verziójának feltételei mellett terjeszthető, illetve módosítható.  Fordította:  intel</string>
-    <string name="ellipsis">…</string>
-    <string name="enter_filename">Adja meg az adatbázis fájlnevét</string>    
-    <string name="entry_accessed">Utolsó hozzáférés</string>    
-    <string name="entry_and_or">Adja meg a jelszót és/vagy a kulcsfájlt, hogy kinyithassa az adatbázist</string>    
-    <string name="entry_cancel">Mégsem</string>
-    <string name="entry_comment">Megjegyzés</string>    
-    <string name="entry_confpassword">Jelszó megerősítése</string>    
-    <string name="entry_created">Létrehozva</string>    
-    <string name="entry_expires">Lejárat</string>    
-    <string name="entry_keyfile">Kulcsfájl (opcionális)</string>
-    <string name="entry_modified">Módosítva</string>    
-    <string name="entry_password">Jelszó</string>    
-    <string name="entry_save">Mentés</string>
-    <string name="entry_title">Név</string>    
-    <string name="entry_url">URL</string>    
-    <string name="entry_user_name">Felhasználónév</string>    
-    <string name="error_arc4">Az ArcFour folyamrejtjel nem támogatott.</string>
-    <string name="error_can_not_handle_uri">Nem található kezelő ehhez az uri-hoz.</string>
-    <string name="error_could_not_create_group">Hiba a csoport létrehozásakor.</string>
-    <string name="error_could_not_create_parent">Nem sikerült létrehozni szülő könyvtárat.</string>
-    <string name="error_database_exists">A fájl már létezik.</string>
-    <string name="error_database_settings">Nem sikerült meghatározni az adatbázis beállításokat.</string>
-    <string name="error_failed_to_launch_link">Hiba a cím megnyitásakor.</string>
-    <string name="error_filename_required">Fájlnév szükséges.</string>
-    <string name="error_file_not_create">Nem sikerült létrehozni a fájlt</string>    
-    <string name="error_invalid_db">Érvénytelen adatbázis.</string>
-    <string name="error_invalid_path">Érvénytelen útvonal.</string>
-    <string name="error_no_name">Egy névre van szükség.</string>
-    <string name="error_nopass">Jelszóra vagy kulcsfájlra van szükség.</string>
-    <string name="error_out_of_memory">A telefon memóriája megtelt az adatbázis feldolgozása közben. Lehet túl sok ez a telefonnak.</string>
-    <string name="error_pass_gen_type">Legalább egy jelszógenerálási típust kell választania</string>
-    <string name="error_pass_match">A jelszavak nem egyeznek meg.</string>
-    <string name="error_rounds_not_number">A menetek csak számokat tartalmazhatnak.</string>
-    <string name="error_rounds_too_large">A menetek száma túl nagy. A maximális 2147483648.</string>
-    <string name="error_title_required">Cím szükséges.</string>
-    <string name="error_wrong_length">Írjon be egy pozitív egész számot a hossz mezőbe</string>
-    <string name="FileNotFound">A fájl nem található.</string>
-    <string name="file_browser">Fájlkezelő</string>
-    <string name="generate_password">Jelszó generálás</string>
-    <string name="group">Csoport</string>
-    <string name="hint_comment">megjegyzés</string>
-    <string name="hint_conf_pass">jelszó megerősítése</string>
-    <string name="hint_generated_password">generált jelszó</string>
-    <string name="hint_group_name">Csoportnév</string>
-    <string name="hint_keyfile">kulcsfájl</string>
-    <string name="hint_length">hosszúság</string>
-    <string name="hint_login_pass">Jelszó</string>
-    <string name="hint_pass">jelszó</string>
-    <string name="hint_title">név</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">felhasználónév</string>
-    <string name="install_from_market">Letöltés a Google Play-ről</string>
-    <string name="install_from_website">Letöltés az weboldalról</string>
-    <string name="InvalidPassword">Érvénytelen jelszó vagy kulcsfájl.</string>
-    <string name="invalid_db_sig">Az adabázis formátuma nem ismert.</string>
-    <string name="length">Hossz</string>
-    <string name="list_size_title">Csoportok betűmérete</string>
-    <string name="list_size_summary">Beállítja a csoportok betűméretét</string>
-    <string name="loading_database">Adatbázis betöltése…</string>
-    <string name="lowercase">Kisbetűk</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Jelszó elrejtése</string>
-    <string name="maskpass_summary">Jelszavak elrejtése alapértelmezésben</string>
-    <string name="menu_about">Névjegy</string>
-    <string name="menu_change_key">Mesterkulcs megváltoztatása</string>
-    <string name="menu_copy_pass">Jelszó másolása</string>
-    <string name="menu_copy_user">Felhasználónév másolása</string>
-    <string name="menu_create">Létrehozás</string>
-    <string name="menu_app_settings">Beállítások</string>
-    <string name="menu_db_settings">Adatbázis beállítások</string>
-    <string name="menu_delete">Törlés</string>
-    <string name="menu_donate">Támogatás</string>
-    <string name="menu_edit">Szerkeszt</string>
-    <string name="menu_hide_password">Jelszó elrejtése</string>
-    <string name="menu_homepage">Weboldal megtekintése</string>
-    <string name="menu_lock">Adatbázis lezárása</string>
-    <string name="menu_open">Megnyitás</string>
-    <string name="menu_rename">Átnevezés</string>
-    <string name="menu_search">Keresés</string>
-    <string name="menu_url">Ugrás az URL-re</string>
-    <string name="minus">Mínusz</string>
-    <string name="never">Soha</string>
-    <string name="no_keys">Nincs bejegyzés az adatbázisban vagy csoportban.</string>
-    <string name="no_results">Nincs találat</string>
-    <string name="no_url_handler">Nem található kezelő ehhez az url-hez.</string>
-    <string name="open_recent">Korábbi adatbázis megnyitása (kattintson rá a megnyitásra)</string>    
-    <string name="omitbackup_title">Keresési kivételek</string>
-    <string name="omitbackup_summary">A Backup és Lomtár csoportok kihagyása a keresésből</string>
-    <string name="pass_filename">KeePass adatbázis fájlnév</string>    
-    <string name="password_title">Adatbázis jelszó megadása</string>
-    <string name="progress_create">Új adatbázis létrehozása…</string>
-    <string name="progress_title">Feldolgozás…</string>
-    <string name="remember_keyfile_summary">Jegyezze meg a kulcsfájlok helyét</string>
-    <string name="remember_keyfile_title">Kulcsfájl mentése</string>
-    <string name="remove_from_filelist">Eltávolítás</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Gyökérkönyvár</string>
-    <string name="rounds">Titkosítási menetek száma</string>
-    <string name="rounds_explaination">A titkosítási menetek számának növelésével extra védelemet kaphat a brute force támadások ellen, ugyanakkor jelentősen lassíthatja az adatbázis betöltését vagy mentését.</string>
-    <string name="rounds_hint">Menetek száma</string>
-    <string name="saving_database">Adatbázis mentése…</string>
-    <string name="space">Szóköz</string>
-    <string name="search_label">Keresés</string>
-    <string name="show_password">Jelszó megjelenítése</string>
-    <string name="sort_name">Rendezés név alapján</string>
-    <string name="sort_db">Rendezés dátum alapján</string>
-    <string name="special">Speciális</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Aláhúzás</string>
-    <string name="unsupported_db_version">Nem támogatott adatbázis.</string>
-    <string name="uppercase">Nagybetűk</string>
-    <string name="warning_read_only">A memóriakártya jelenleg csak olvasható. Lehet, hogy nem tudja menteni a módosításokat az adatbázisban.</string>
-    <string name="warning_unmounted">A memóriakártya jelenleg el van távolítva. Nem fogja tudni az adatbázist betölteni vagy módosítani.</string>
-    <string name="version_label">Verzió</string>    
-    
-    <string-array name="clipboard_timeout_options">
-        <item>30 másodperc</item>
-        <item>1 perc</item>
-        <item>5 perc</item>
-        <item>Soha</item>
-    </string-array>
-    <string-array name="list_size_options">
-        <item>Kicsi</item>
-        <item>Közepes</item>
-        <item>Nagy</item>
-    </string-array>
+  <string name="about_feedback">Visszajelzés</string>
+  <string name="about_homepage">Weboldal</string>
+  <string name="AboutText">Keepass2Android a KeePass jelszókezelő android implementációja.</string>
+  <string name="accept">Elfogadás</string>
+  <string name="add_entry">Bejegyzés hozzáadása</string>
+  <string name="add_group">Csoport hozzáadása</string>
+  <string name="add_group_title">Csoport hozzáadása</string>
+  <string name="algorithm">Algoritmus</string>
+  <string name="algorithm_colon">Algoritmus</string>
+  <string name="app_timeout">Alkalmazás időkorlátja</string>
+  <string name="app_timeout_summary">Beállíthatja, mennyi idő után kerüljön lezárásra az adatbázis.</string>
+  <string name="application">Alkalmazás</string>
+  <string name="application_settings">Alkalmazás beállítások</string>
+  <string name="brackets">Zárójelek</string>
+  <string name="browser_intall_text">A fájl kiválasztásához önnek egy nyílt forrású fájlkezelő programra lesz szüksége, kattintson a lenti telepítés linkre. Előfordulhat, hogy első használatakor nem fog megfelelően működni a fájlkezelő program.</string>
+  <string name="building_search_idx">Keresési index létrehozása…</string>
+  <string name="cancel">Mégsem</string>
+  <string name="ClearClipboard">Vágólap törölve.</string>
+  <string name="clipboard_timeout">Vágólap időkorlátja</string>
+  <string name="clipboard_timeout_summary">Beállíthatja, mennyi idő után kerüljön törlésre a vágólap</string>
+  <string name="copy_username">Felhasználónév másolása a vágólapra</string>
+  <string name="copy_password">Jelszó másolása a vágólapra</string>
+  <string name="creating_db_key">Adatbázis létrehozása…</string>
+  <string name="current_group">Jelenlegi csoport</string>
+  <string name="current_group_root">Jelenlegi csoport: Gyökérkönyvtár</string>
+  <string name="database">Adatbázis</string>
+  <string name="decrypting_db">Adatbázis tartalmának dekódolása…</string>
+  <string name="decrypting_entry">Bejegyzés dekódolása</string>
+  <string name="default_checkbox">Adatbázis beállítása alapértelmezettként</string>
+  <string name="digits">Számok</string>
+  <string name="disclaimer_formal">Keepass2Android, Copyright 2013 Philipp Crocoll. Ehhez a programhoz SEMMILYEN GARANCIA NEM JÁR; Ez egy szabad szoftver, GNU General Public License v2 vagy későbbi verziójának feltételei mellett terjeszthető, illetve módosítható.  Fordította:  intel</string>
+  <string name="ellipsis">…</string>
+  <string name="enter_filename">Adja meg az adatbázis fájlnevét</string>
+  <string name="entry_accessed">Utolsó hozzáférés</string>
+  <string name="entry_and_or">Adja meg a jelszót és/vagy a kulcsfájlt, hogy kinyithassa az adatbázist</string>
+  <string name="entry_cancel">Mégsem</string>
+  <string name="entry_comment">Megjegyzés</string>
+  <string name="entry_confpassword">Jelszó megerősítése</string>
+  <string name="entry_created">Létrehozva</string>
+  <string name="entry_expires">Lejárat</string>
+  <string name="entry_keyfile">Kulcsfájl (opcionális)</string>
+  <string name="entry_modified">Módosítva</string>
+  <string name="entry_password">Jelszó</string>
+  <string name="entry_save">Mentés</string>
+  <string name="entry_title">Név</string>
+  <string name="entry_user_name">Felhasználónév</string>
+  <string name="error_arc4">Az ArcFour folyamrejtjel nem támogatott.</string>
+  <string name="error_can_not_handle_uri">Nem található kezelő ehhez az uri-hoz.</string>
+  <string name="error_could_not_create_group">Hiba a csoport létrehozásakor.</string>
+  <string name="error_could_not_create_parent">Nem sikerült létrehozni szülő könyvtárat.</string>
+  <string name="error_database_exists">A fájl már létezik.</string>
+  <string name="error_database_settings">Nem sikerült meghatározni az adatbázis beállításokat.</string>
+  <string name="error_failed_to_launch_link">Hiba a cím megnyitásakor.</string>
+  <string name="error_filename_required">Fájlnév szükséges.</string>
+  <string name="error_file_not_create">Nem sikerült létrehozni a fájlt</string>
+  <string name="error_invalid_db">Érvénytelen adatbázis.</string>
+  <string name="error_invalid_path">Érvénytelen útvonal.</string>
+  <string name="error_no_name">Egy névre van szükség.</string>
+  <string name="error_nopass">Jelszóra vagy kulcsfájlra van szükség.</string>
+  <string name="error_out_of_memory">A telefon memóriája megtelt az adatbázis feldolgozása közben. Lehet túl sok ez a telefonnak.</string>
+  <string name="error_pass_gen_type">Legalább egy jelszógenerálási típust kell választania</string>
+  <string name="error_pass_match">A jelszavak nem egyeznek meg.</string>
+  <string name="error_rounds_not_number">A menetek csak számokat tartalmazhatnak.</string>
+  <string name="error_rounds_too_large">A menetek száma túl nagy. A maximális 2147483648.</string>
+  <string name="error_title_required">Cím szükséges.</string>
+  <string name="error_wrong_length">Írjon be egy pozitív egész számot a hossz mezőbe</string>
+  <string name="FileNotFound">A fájl nem található.</string>
+  <string name="file_browser">Fájlkezelő</string>
+  <string name="generate_password">Jelszó generálás</string>
+  <string name="group">Csoport</string>
+  <string name="hint_comment">megjegyzés</string>
+  <string name="hint_conf_pass">jelszó megerősítése</string>
+  <string name="hint_generated_password">generált jelszó</string>
+  <string name="hint_group_name">Csoportnév</string>
+  <string name="hint_keyfile">kulcsfájl</string>
+  <string name="hint_length">hosszúság</string>
+  <string name="hint_pass">jelszó</string>
+  <string name="hint_login_pass">Jelszó</string>
+  <string name="hint_title">név</string>
+  <string name="hint_username">felhasználónév</string>
+  <string name="install_from_market">Letöltés a Google Play-ről</string>
+  <string name="install_from_website">Letöltés az weboldalról</string>
+  <string name="InvalidPassword">Érvénytelen jelszó vagy kulcsfájl.</string>
+  <string name="invalid_db_sig">Az adabázis formátuma nem ismert.</string>
+  <string name="length">Hossz</string>
+  <string name="list_size_title">Csoportok betűmérete</string>
+  <string name="list_size_summary">Beállítja a csoportok betűméretét</string>
+  <string name="loading_database">Adatbázis betöltése…</string>
+  <string name="lowercase">Kisbetűk</string>
+  <string name="maskpass_title">Jelszó elrejtése</string>
+  <string name="maskpass_summary">Jelszavak elrejtése alapértelmezésben</string>
+  <string name="menu_about">Névjegy</string>
+  <string name="menu_change_key">Mesterkulcs megváltoztatása</string>
+  <string name="menu_copy_pass">Jelszó másolása</string>
+  <string name="menu_copy_user">Felhasználónév másolása</string>
+  <string name="menu_create">Létrehozás</string>
+  <string name="menu_app_settings">Beállítások</string>
+  <string name="menu_db_settings">Adatbázis beállítások</string>
+  <string name="menu_delete">Törlés</string>
+  <string name="menu_donate">Támogatás</string>
+  <string name="menu_edit">Szerkeszt</string>
+  <string name="menu_hide_password">Jelszó elrejtése</string>
+  <string name="menu_homepage">Weboldal megtekintése</string>
+  <string name="menu_lock">Adatbázis lezárása</string>
+  <string name="menu_open">Megnyitás</string>
+  <string name="menu_rename">Átnevezés</string>
+  <string name="menu_search">Keresés</string>
+  <string name="menu_url">Ugrás az URL-re</string>
+  <string name="minus">Mínusz</string>
+  <string name="never">Soha</string>
+  <string name="no_keys">Nincs bejegyzés az adatbázisban vagy csoportban.</string>
+  <string name="no_results">Nincs találat</string>
+  <string name="no_url_handler">Nem található kezelő ehhez az url-hez.</string>
+  <string name="open_recent">Korábbi adatbázis megnyitása (kattintson rá a megnyitásra)</string>
+  <string name="omitbackup_title">Keresési kivételek</string>
+  <string name="omitbackup_summary">A Backup és Lomtár csoportok kihagyása a keresésből</string>
+  <string name="pass_filename">KeePass adatbázis fájlnév</string>
+  <string name="password_title">Adatbázis jelszó megadása</string>
+  <string name="progress_create">Új adatbázis létrehozása…</string>
+  <string name="progress_title">Feldolgozás…</string>
+  <string name="remember_keyfile_summary">Jegyezze meg a kulcsfájlok helyét</string>
+  <string name="remember_keyfile_title">Kulcsfájl mentése</string>
+  <string name="remove_from_filelist">Eltávolítás</string>
+  <string name="root">Gyökérkönyvár</string>
+  <string name="rounds">Titkosítási menetek száma</string>
+  <string name="rounds_explaination">A titkosítási menetek számának növelésével extra védelemet kaphat a brute force támadások ellen, ugyanakkor jelentősen lassíthatja az adatbázis betöltését vagy mentését.</string>
+  <string name="rounds_hint">Menetek száma</string>
+  <string name="saving_database">Adatbázis mentése…</string>
+  <string name="space">Szóköz</string>
+  <string name="search_label">Keresés</string>
+  <string name="show_password">Jelszó megjelenítése</string>
+  <string name="sort_name">Rendezés név alapján</string>
+  <string name="sort_db">Rendezés dátum alapján</string>
+  <string name="special">Speciális</string>
+  <string name="underline">Aláhúzás</string>
+  <string name="unsupported_db_version">Nem támogatott adatbázis.</string>
+  <string name="uppercase">Nagybetűk</string>
+  <string name="warning_read_only">A memóriakártya jelenleg csak olvasható. Lehet, hogy nem tudja menteni a módosításokat az adatbázisban.</string>
+  <string name="warning_unmounted">A memóriakártya jelenleg el van távolítva. Nem fogja tudni az adatbázist betölteni vagy módosítani.</string>
+  <string name="version_label">Verzió</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 másodperc</item>
+    <item>1 perc</item>
+    <item>5 perc</item>
+    <item>Soha</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Kicsi</item>
+    <item>Közepes</item>
+    <item>Nagy</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-it/strings.xml b/src/keepass2android/Resources/values-it/strings.xml
index 171be601..5c299a7a 100644
--- a/src/keepass2android/Resources/values-it/strings.xml
+++ b/src/keepass2android/Resources/values-it/strings.xml
@@ -1,182 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
-
-  Italian translation by Diego Pierotto
-
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Commenti</string>    
-    <string name="about_homepage">Pagina web</string>    
-    <string name="AboutText">Keepass2Android è un\'implementazione del gestore password KeePass.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Accetto</string>
-    <string name="add_entry">Aggiungi voce</string>
-    <string name="add_group">Aggiungi gruppo</string>
-    <string name="add_group_title">Aggiungi Gruppo</string>
-    <string name="algorithm">Algoritmo</string>
-    <string name="algorithm_colon">Algoritmo</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Scadenza applicazione</string>
-    <string name="app_timeout_summary">Tempo prima che venga bloccato il database quando l\'applicazione è inattiva.</string>
-    <string name="application">Applicazione</string>
-    <string name="application_settings">Impostazioni Applicazione</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&#8230;</string>
-    <string name="cancel">Annulla</string>
-    <string name="ClearClipboard">Appunti eliminati.</string>
-    <string name="clipboard_timeout">Scadenza appunti</string>
-    <string name="clipboard_timeout_summary">Tempo prima di eliminare gli appunti dopo la copia del nome file o password</string>
-    <string name="copy_username">Copia nome utente negli appunti</string>
-    <string name="copy_password">Copia password negli appunti</string>
-    <string name="creating_db_key">Creazione file chiave database&#8230;</string>
-    <string name="current_group">Gruppo attuale</string>
-    <string name="current_group_root">Gruppo attuale: Principale</string>
-    <string name="database">Database</string>
-    <string name="decrypting_db">Decodifica contenuto database&#8230;</string>
-    <string name="decrypting_entry">Decodifica valore</string>
-    <string name="default_checkbox">Usa come database predefinito</string>
-    <string name="digits">Cifre</string>
-    <string name="disclaimer_formal">Keepass2Android, Copyright 2013 Philipp Crocoll, viene distribuito ASSOLUTAMENTE con NESSUNA GARANZIA; Si tratta di software libero, e sei invitato a distribuirlo sotto le condizioni della licenza GPL versione 2 o superiore.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Inserisci il nome file del database</string>    
-    <string name="entry_accessed">Ultimo accesso</string>
-    <string name="entry_and_or">Inserisci una password e/o file chiave per sbloccare il database</string>    
-    <string name="entry_cancel">Annulla</string>
-    <string name="entry_comment">Commento</string>
-    <string name="entry_confpassword">Conferma password</string>    
-    <string name="entry_created">Creato</string>
-    <string name="entry_expires">Scade</string>
-    <string name="entry_keyfile">File chiave (opzionale)</string>
-    <string name="entry_modified">Modificato</string>
-    <string name="entry_password">Password</string>
-    <string name="entry_save">Salva</string>
-    <string name="entry_title">Nome</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Nome utente</string>
-    <string name="error_arc4">La codifica ArcFour non è supportata.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android non può gestire questo URL.</string>
-    <string name="error_could_not_create_group">Errore creazione gruppo.</string>
-    <string name="error_could_not_create_parent">Impossibile creare la directory principale.</string>
-    <string name="error_database_exists">File già esistente.</string>
-    <string name="error_database_settings">Impossibile determinare le impostazioni database.</string>
-    <string name="error_failed_to_launch_link">Impossibile aprire il collegamento.</string>
-    <string name="error_filename_required">E\' necessario un nome file.</string>
-    <string name="error_file_not_create">Impossibile creare il file</string>    
-    <string name="error_invalid_db">Database non valido.</string>
-    <string name="error_invalid_path">Percorso non valido.</string>
-    <string name="error_no_name">E\' necessario un nome.</string>
-    <string name="error_nopass">E\' necessaria una password o un file chiave.</string>
-    <string name="error_out_of_memory">Il telefono ha esaurito la memoria durante l\'elaborazione del database. Potrebbe essere troppo grande per il tuo telefono.</string>
-    <string name="error_pass_gen_type">Almeno un tipo di generazione password deve essere selezionato</string>
-    <string name="error_pass_match">Le password non corrispondono.</string>
-    <string name="error_rounds_not_number">Il livello deve essere un numero.</string>
-    <string name="error_rounds_too_large">Livello troppo grande.  Impostato a 2147483648.</string>
-    <string name="error_title_required">E\' necessario un titolo.</string>
-    <string name="error_wrong_length">Inserisci un valore positivo nella lunghezza campo</string>
-    <string name="FileNotFound">File non trovato.</string>
-    <string name="file_browser">Sfoglia file</string>
-    <string name="generate_password">Genera password</string>
-    <string name="group">Gruppo</string>
-    <string name="hint_comment">commento</string>
-    <string name="hint_conf_pass">conferma password</string>
-    <string name="hint_generated_password">password generata</string>
-    <string name="hint_group_name">Nome gruppo</string>
-    <string name="hint_keyfile">file chiave</string>
-    <string name="hint_length">lunghezza</string>
-    <string name="hint_login_pass">Password</string>
-    <string name="hint_pass">password</string>
-    <string name="hint_title">nome</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">nome utente</string>
-    <string name="install_from_market">Installa dal Market</string>
-    <string name="install_from_website">Installa dal Web</string>
-    <string name="InvalidPassword">Password o file chiave non validi.</string>
-    <string name="invalid_db_sig">Formato database non riconosciuto.</string>
-    <string name="length">Lunghezza</string>
-    <string name="list_size_title">Dimensione elenco gruppo</string>
-    <string name="list_size_summary">Dimensione del testo nell\'elenco del gruppo</string>
-    <string name="loading_database">Caricamento database&#8230;</string>
-    <string name="lowercase">Minuscolo</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Maschera password</string>
-    <string name="maskpass_summary">Nascondi le password in modo predefinito</string>
-    <string name="menu_about">Info</string>
-    <string name="menu_change_key">Modifica chiave Principale</string>
-    <string name="menu_copy_pass">Copia Password</string>
-    <string name="menu_copy_user">Copia Utente</string>
-    <string name="menu_create">Crea</string>
-    <string name="menu_app_settings">Impostazioni</string>
-    <string name="menu_db_settings">Impostazioni Database</string>
-    <string name="menu_delete">Elimina</string>
-    <string name="menu_donate">Dona</string>
-    <string name="menu_edit">Modifica</string>
-    <string name="menu_hide_password">Nascondi Password</string>
-    <string name="menu_homepage">Vai alla pagina web</string>
-    <string name="menu_lock">Blocca Database</string>
-    <string name="menu_open">Apri</string>
-    <string name="menu_rename">Rinomina</string>
-    <string name="menu_search">Cerca</string>
-    <string name="menu_url">Vai all\'URL</string>
-    <string name="minus">Meno</string>
-    <string name="never">Mai</string>
-    <string name="no_keys">Nessuna voce nel database o nel gruppo.</string>
-    <string name="no_results">Nessun risultato di ricerca</string>
-    <string name="no_url_handler">Nessun gestore per questo URL.</string>
-    <string name="open_recent">Apri un database recente (clicca per aprire)</string>    
-    <string name="omitbackup_title">Non cercare voci di backup e nel Cestino</string>
-    <string name="omitbackup_summary">Ometti i gruppi \'Backup\' e Cestino dai risultati di ricerca</string>
-    <string name="pass_filename">Nome file del database di KeePass</string>    
-    <string name="password_title">Inserisci password database</string>
-    <string name="progress_create">Creazione nuovo database&#8230;</string>
-    <string name="progress_title">In corso&#8230;</string>
-    <string name="remember_keyfile_summary">Ricorda la posizione dei file chiave</string>
-    <string name="remember_keyfile_title">Salva il file chiave</string>
-    <string name="remove_from_filelist">Elimina</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Principale</string>
-    <string name="rounds">Livello cifratura</string>
-    <string name="rounds_explaination">Un livello di cifratura elevato fornisce una protezione maggiore contro attacchi di tipo "forza brutta", ma può veramente rallentare il caricamento e il salvataggio.</string>
-    <string name="rounds_hint">livello</string>
-    <string name="saving_database">Salvataggio database&#8230;</string>
-    <string name="space">Spazio</string>
-    <string name="search_label">Cerca</string>
-    <string name="show_password">Mostra Password</string>
-    <string name="sort_name">Ordina per nome</string>
-    <string name="sort_db">Ordinamento DB</string>
-    <string name="special">Speciale</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Sottolinea</string>
-    <string name="unsupported_db_version">Versione database non supportata.</string>
-    <string name="uppercase">Maiuscolo</string>
-    <string name="warning_read_only">Attualmente la scheda SD è in sola lettura. Non sei in grado di salvare le modifiche nel database.</string>
-    <string name="warning_unmounted">Attualmente la scheda SD non è montata nel dispositivo. Non sarai in grado di caricare o creare un nuovo database.</string>
-    <string name="version_label">Versione</string>    
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30 secondi</item>
-    	<item>1 minuto</item>
-    	<item>5 minuti</item>
-    	<item>Mai</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Piccolo</item>
-    	<item>Medio</item>
-    	<item>Grande</item>
-    </string-array>
+  <string name="about_feedback">Commenti</string>
+  <string name="about_homepage">Pagina web</string>
+  <string name="AboutText">Keepass2Android è un\'implementazione del gestore password KeePass.</string>
+  <string name="accept">Accetto</string>
+  <string name="add_entry">Aggiungi voce</string>
+  <string name="add_group">Aggiungi gruppo</string>
+  <string name="add_group_title">Aggiungi Gruppo</string>
+  <string name="algorithm">Algoritmo</string>
+  <string name="algorithm_colon">Algoritmo</string>
+  <string name="app_timeout">Scadenza applicazione</string>
+  <string name="app_timeout_summary">Tempo prima che venga bloccato il database quando l\'applicazione è inattiva.</string>
+  <string name="application">Applicazione</string>
+  <string name="application_settings">Impostazioni Applicazione</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>
+  <string name="cancel">Annulla</string>
+  <string name="ClearClipboard">Appunti eliminati.</string>
+  <string name="clipboard_timeout">Scadenza appunti</string>
+  <string name="clipboard_timeout_summary">Tempo prima di eliminare gli appunti dopo la copia del nome file o password</string>
+  <string name="copy_username">Copia nome utente negli appunti</string>
+  <string name="copy_password">Copia password negli appunti</string>
+  <string name="creating_db_key">Creazione file chiave database…</string>
+  <string name="current_group">Gruppo attuale</string>
+  <string name="current_group_root">Gruppo attuale: Principale</string>
+  <string name="decrypting_db">Decodifica contenuto database…</string>
+  <string name="decrypting_entry">Decodifica valore</string>
+  <string name="default_checkbox">Usa come database predefinito</string>
+  <string name="digits">Cifre</string>
+  <string name="disclaimer_formal">Keepass2Android, Copyright 2013 Philipp Crocoll, viene distribuito ASSOLUTAMENTE con NESSUNA GARANZIA; Si tratta di software libero, e sei invitato a distribuirlo sotto le condizioni della licenza GPL versione 2 o superiore.</string>
+  <string name="enter_filename">Inserisci il nome file del database</string>
+  <string name="entry_accessed">Ultimo accesso</string>
+  <string name="entry_and_or">Inserisci una password e/o file chiave per sbloccare il database</string>
+  <string name="entry_cancel">Annulla</string>
+  <string name="entry_comment">Commento</string>
+  <string name="entry_confpassword">Conferma password</string>
+  <string name="entry_created">Creato</string>
+  <string name="entry_expires">Scade</string>
+  <string name="entry_keyfile">File chiave (opzionale)</string>
+  <string name="entry_modified">Modificato</string>
+  <string name="entry_save">Salva</string>
+  <string name="entry_title">Nome</string>
+  <string name="entry_user_name">Nome utente</string>
+  <string name="error_arc4">La codifica ArcFour non è supportata.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android non può gestire questo URL.</string>
+  <string name="error_could_not_create_group">Errore creazione gruppo.</string>
+  <string name="error_could_not_create_parent">Impossibile creare la directory principale.</string>
+  <string name="error_database_exists">File già esistente.</string>
+  <string name="error_database_settings">Impossibile determinare le impostazioni database.</string>
+  <string name="error_failed_to_launch_link">Impossibile aprire il collegamento.</string>
+  <string name="error_filename_required">E\' necessario un nome file.</string>
+  <string name="error_file_not_create">Impossibile creare il file</string>
+  <string name="error_invalid_db">Database non valido.</string>
+  <string name="error_invalid_path">Percorso non valido.</string>
+  <string name="error_no_name">E\' necessario un nome.</string>
+  <string name="error_nopass">E\' necessaria una password o un file chiave.</string>
+  <string name="error_out_of_memory">Il telefono ha esaurito la memoria durante l\'elaborazione del database. Potrebbe essere troppo grande per il tuo telefono.</string>
+  <string name="error_pass_gen_type">Almeno un tipo di generazione password deve essere selezionato</string>
+  <string name="error_pass_match">Le password non corrispondono.</string>
+  <string name="error_rounds_not_number">Il livello deve essere un numero.</string>
+  <string name="error_rounds_too_large">Livello troppo grande.  Impostato a 2147483648.</string>
+  <string name="error_title_required">E\' necessario un titolo.</string>
+  <string name="error_wrong_length">Inserisci un valore positivo nella lunghezza campo</string>
+  <string name="FileNotFound">File non trovato.</string>
+  <string name="file_browser">Sfoglia file</string>
+  <string name="generate_password">Genera password</string>
+  <string name="group">Gruppo</string>
+  <string name="hint_comment">commento</string>
+  <string name="hint_conf_pass">conferma password</string>
+  <string name="hint_generated_password">password generata</string>
+  <string name="hint_group_name">Nome gruppo</string>
+  <string name="hint_keyfile">file chiave</string>
+  <string name="hint_length">lunghezza</string>
+  <string name="hint_title">nome</string>
+  <string name="hint_username">nome utente</string>
+  <string name="install_from_market">Installa dal Market</string>
+  <string name="install_from_website">Installa dal Web</string>
+  <string name="InvalidPassword">Password o file chiave non validi.</string>
+  <string name="invalid_db_sig">Formato database non riconosciuto.</string>
+  <string name="length">Lunghezza</string>
+  <string name="list_size_title">Dimensione elenco gruppo</string>
+  <string name="list_size_summary">Dimensione del testo nell\'elenco del gruppo</string>
+  <string name="loading_database">Caricamento database…</string>
+  <string name="lowercase">Minuscolo</string>
+  <string name="maskpass_title">Maschera password</string>
+  <string name="maskpass_summary">Nascondi le password in modo predefinito</string>
+  <string name="menu_about">Info</string>
+  <string name="menu_change_key">Modifica chiave Principale</string>
+  <string name="menu_copy_pass">Copia Password</string>
+  <string name="menu_copy_user">Copia Utente</string>
+  <string name="menu_create">Crea</string>
+  <string name="menu_app_settings">Impostazioni</string>
+  <string name="menu_db_settings">Impostazioni Database</string>
+  <string name="menu_delete">Elimina</string>
+  <string name="menu_donate">Dona</string>
+  <string name="menu_edit">Modifica</string>
+  <string name="menu_hide_password">Nascondi Password</string>
+  <string name="menu_homepage">Vai alla pagina web</string>
+  <string name="menu_lock">Blocca Database</string>
+  <string name="menu_open">Apri</string>
+  <string name="menu_rename">Rinomina</string>
+  <string name="menu_search">Cerca</string>
+  <string name="menu_url">Vai all\'URL</string>
+  <string name="minus">Meno</string>
+  <string name="never">Mai</string>
+  <string name="no_keys">Nessuna voce nel database o nel gruppo.</string>
+  <string name="no_results">Nessun risultato di ricerca</string>
+  <string name="no_url_handler">Nessun gestore per questo URL.</string>
+  <string name="open_recent">Apri un database recente (clicca per aprire)</string>
+  <string name="omitbackup_title">Non cercare voci di backup e nel Cestino</string>
+  <string name="omitbackup_summary">Ometti i gruppi \'Backup\' e Cestino dai risultati di ricerca</string>
+  <string name="pass_filename">Nome file del database di KeePass</string>
+  <string name="password_title">Inserisci password database</string>
+  <string name="progress_create">Creazione nuovo database…</string>
+  <string name="progress_title">In corso…</string>
+  <string name="remember_keyfile_summary">Ricorda la posizione dei file chiave</string>
+  <string name="remember_keyfile_title">Salva il file chiave</string>
+  <string name="remove_from_filelist">Elimina</string>
+  <string name="root">Principale</string>
+  <string name="rounds">Livello cifratura</string>
+  <string name="rounds_explaination">Un livello di cifratura elevato fornisce una protezione maggiore contro attacchi di tipo \"forza brutta\", ma può veramente rallentare il caricamento e il salvataggio.</string>
+  <string name="rounds_hint">livello</string>
+  <string name="saving_database">Salvataggio database…</string>
+  <string name="space">Spazio</string>
+  <string name="search_label">Cerca</string>
+  <string name="show_password">Mostra Password</string>
+  <string name="sort_name">Ordina per nome</string>
+  <string name="sort_db">Ordinamento DB</string>
+  <string name="special">Speciale</string>
+  <string name="underline">Sottolinea</string>
+  <string name="unsupported_db_version">Versione database non supportata.</string>
+  <string name="uppercase">Maiuscolo</string>
+  <string name="warning_read_only">Attualmente la scheda SD è in sola lettura. Non sei in grado di salvare le modifiche nel database.</string>
+  <string name="warning_unmounted">Attualmente la scheda SD non è montata nel dispositivo. Non sarai in grado di caricare o creare un nuovo database.</string>
+  <string name="version_label">Versione</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 secondi</item>
+    <item>1 minuto</item>
+    <item>5 minuti</item>
+    <item>Mai</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Piccolo</item>
+    <item>Medio</item>
+    <item>Grande</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-ja/strings.xml b/src/keepass2android/Resources/values-ja/strings.xml
index 48e69f55..252c354b 100644
--- a/src/keepass2android/Resources/values-ja/strings.xml
+++ b/src/keepass2android/Resources/values-ja/strings.xml
@@ -1,180 +1,157 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">フィードバック</string>    
-    <string name="about_homepage">WEBサイト</string>    
-    <string name="AboutText">\"Keepass2Android\"はパスワードマネージャソフト\"KeePass\"をAndroid上で利用する為のアプリです。</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">決定</string>
-    <string name="add_entry">エントリーを追加</string>
-    <string name="add_group">グループを追加</string>
-    <string name="add_group_title">新しいグループ名を入力</string>
-    <string name="algorithm">アルゴリズム</string>
-    <string name="algorithm_colon">アルゴリズム</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">アプリケーション タイムアウト</string>
-    <string name="app_timeout_summary">KeePassがこの時間非アクティブだった場合、データベースをロックします。</string>
-    <string name="application">アプリケーション</string>
-    <string name="application_settings">アプリケーション設定</string>
-    <string name="brackets">カッコ</string>
-    <string name="browser_intall_text">ファイルを検索するには OI File Manager が必要です。</string>
-    <string name="building_search_idx">検索中&#8230;</string>
-    <string name="cancel">キャンセル</string>
-    <string name="ClearClipboard">クリップボードを消去しました。</string>
-    <string name="clipboard_timeout">クリップボード タイムアウト</string>
-    <string name="clipboard_timeout_summary">コピーした情報をクリップボードから消去する時間</string>
-    <string name="copy_username">ここをタップするとユーザー名をクリップボードにコピーします</string>
-    <string name="copy_password">ここをタップするとパスワードをクリップボードにコピーします</string>
-    <string name="creating_db_key">データベース認証中&#8230;</string>
-    <string name="current_group">現在のグループ</string>
-    <string name="current_group_root">現在のグループ: Root</string>
-    <string name="database">データベース</string>
-    <string name="decrypting_db">データベースを解析中&#8230;</string>
-    <string name="decrypting_entry">暗号解除エントリー</string>
-    <string name="default_checkbox">このデータベースを次回以降も利用する</string>
-    <string name="digits">数字</string>
-    <string name="disclaimer_formal">Keepass2Android によって作られたフリーソフトウェアであり、無保証です。GPLバージョン2以上の条件下でこれを再頒布することができます。</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">データベースファイル</string>    
-    <string name="entry_accessed">最終アクセス日</string>
-    <string name="entry_and_or">データベースに設定したパスワードを入力するかキーファイルを選択してください。</string>
-    <string name="entry_cancel">キャンセル</string>
-    <string name="entry_comment">備考</string>
-    <string name="entry_confpassword">パスワードの確認</string>    
-    <string name="entry_created">作成日</string>
-    <string name="entry_expires">有効期限</string>
-    <string name="entry_keyfile">キーファイル(オプション)</string>
-    <string name="entry_modified">更新日</string>
-    <string name="entry_password">パスワード</string>    
-    <string name="entry_save">保存</string>
-    <string name="entry_title">タイトル</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">ユーザー名</string>
-    <string name="error_arc4">ArcFour stream cipherには対応していません。</string>
-    <string name="error_can_not_handle_uri">Keepass2Androidはこのuriを処理できません。</string>
-    <string name="error_could_not_create_group">グループ追加エラー</string>
-    <string name="error_could_not_create_parent">親ディレクトリを作成できませんでした。</string>
-    <string name="error_database_exists">ファイルが既に存在します。</string>
-    <string name="error_database_settings">データベース設定の保存に失敗しました。</string>
-    <string name="error_failed_to_launch_link">リンクを開けませんでした。</string>
-    <string name="error_filename_required">ファイル名は必須入力です。</string>
-    <string name="error_file_not_create">ファイルを作成できません。</string>
-    <string name="error_invalid_db">無効なデータベースです。</string>
-    <string name="error_invalid_path">パスが無効です。</string>
-    <string name="error_no_name">タイトルは必須入力です。</string>
-    <string name="error_nopass">パスワードかキーファイルが必要です。</string>
-    <string name="error_out_of_memory">データベース解析中にメモリ不足になりました。</string>
-    <string name="error_pass_gen_type">少なくとも1つ以上のパスワード生成タイプを選択する必要があります。</string>
-    <string name="error_pass_match">パスワードが一致しません</string>
-    <string name="error_rounds_not_number">数値を入力してください。</string>
-    <string name="error_rounds_too_large">値が大きすぎます。 2147483648にセットしました。</string>
-    <string name="error_title_required">タイトルは必須入力です。</string>
-    <string name="error_wrong_length">\"長さ\"欄には正の整数を入力してください。</string>
-    <string name="FileNotFound">ファイルが見つかりません。</string>
-    <string name="file_browser">ファイルブラウザ</string>
-    <string name="generate_password">パスワードを生成する</string>
-    <string name="group">グループ</string>
-    <string name="hint_comment">備考</string>
-    <string name="hint_conf_pass">パスワードをもう一度入力</string>
-    <string name="hint_generated_password">生成されたパスワードが表示されます</string>
-    <string name="hint_group_name">グループ名</string>
-    <string name="hint_keyfile">キーファイル</string>
-    <string name="hint_length">長さ</string>
-    <string name="hint_login_pass">パスワード</string>
-    <string name="hint_pass">パスワード</string>
-    <string name="hint_title">タイトル</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">ユーザー名</string>
-    <string name="install_from_market">Android Marketで入手</string>
-    <string name="install_from_website">Webサイトから入手</string>
-    <string name="InvalidPassword">パスワード/キーファイルが違います。</string>
-    <string name="invalid_db_sig">データベースフォーマットが認識できません。</string>
-    <string name="length">生成するパスワードの長さ</string>
-    <string name="list_size_title">グループ一覧サイズ</string>
-    <string name="list_size_summary">グループ一覧の文字サイズ</string>
-    <string name="loading_database">データベース読込中&#8230;</string>
-    <string name="lowercase">英数小文字</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">パスワードを隠す</string>
-    <string name="maskpass_summary">パスワード欄をアスタリスクで表示します</string>
-    <string name="menu_about">About</string>
-    <string name="menu_change_key">マスターキーを変更</string>
-    <string name="menu_copy_pass">パスワードをコピー</string>
-    <string name="menu_copy_user">ユーザー名をコピー</string>
-    <string name="menu_create">作成</string>
-    <string name="menu_app_settings">設定</string>
-    <string name="menu_db_settings">データベース設定</string>
-    <string name="menu_delete">削除</string>
-    <string name="menu_donate">寄付</string>
-    <string name="menu_edit">編集</string>
-    <string name="menu_hide_password">パスワードを隠す</string>
-    <string name="menu_homepage">URLを開く</string>
-    <string name="menu_lock">データベースをロック</string>
-    <string name="menu_open">開く</string>
-    <string name="menu_rename">タイトルの変更</string>
-    <string name="menu_search">検索</string>
-    <string name="menu_url">WEBサイトへ</string>
-    <string name="minus">マイナス (-)</string>
-    <string name="never">期限なし</string>
-    <string name="no_keys">データベース・グループがありません。</string>
-    <string name="no_results">検索結果に該当するものはありません。</string>
-    <string name="no_url_handler">このuriを処理できません。</string>
-    <string name="open_recent">以前使用したデータベースを開く(クリック)</string>    
-    <string name="omitbackup_title">検索対象から除外</string>
-    <string name="omitbackup_summary">\"バックアップ\"と\"ごみ箱\"を検索対象から除外します</string>
-    <string name="pass_filename">KeePassデータベースファイル</string>    
-    <string name="password_title">データベースのパスワード設定</string>
-    <string name="progress_create">データベースファイルを作成中&#8230;</string>
-    <string name="progress_title">実行中&#8230;</string>
-    <string name="remember_keyfile_summary">前回使用したキーファイルを次回も表示します</string>
-    <string name="remember_keyfile_title">キーファイルを記憶</string>
-    <string name="remove_from_filelist">消去</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Root</string>
-    <string name="rounds">暗号化レベル</string>
-    <string name="rounds_explaination">暗号化レベルを高く設定するとブルートフォース(総当り)攻撃に強くなりますが、保存や読込に時間が掛かります。</string>
-    <string name="rounds_hint">レベル</string>
-    <string name="saving_database">データベースを保存中&#8230;</string>
-    <string name="space">半角スペース</string>
-    <string name="search_label">検索</string>
-    <string name="show_password">パスワードを表示</string>
-    <string name="sort_name">A-Z順に並び替え</string>
-    <string name="sort_db">並べ替え</string>
-    <string name="special">記号</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">アンダーライン (_)</string>
-    <string name="unsupported_db_version">このバージョンのデータベースはサポートされていません。</string>
-    <string name="uppercase">英数大文字</string>
-    <string name="warning_read_only">お使いのSDカードは読取専用になっているようです。 データベースへの更新を保存することはできないでしょう。</string>
-    <string name="warning_unmounted">SDカードがマウントされていません。データベースの読込や作成ができません。</string>
-    <string name="version_label">バージョン</string>    
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30秒</item>
-    	<item>1分</item>
-    	<item>5分</item>
-    	<item>なし</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>小</item>
-    	<item>中</item>
-    	<item>大</item>
-    </string-array>
+  <string name="about_feedback">フィードバック</string>
+  <string name="about_homepage">WEBサイト</string>
+  <string name="AboutText">\"Keepass2Android\"はパスワードマネージャソフト\"KeePass\"をAndroid上で利用する為のアプリです。</string>
+  <string name="accept">決定</string>
+  <string name="add_entry">エントリーを追加</string>
+  <string name="add_group">グループを追加</string>
+  <string name="add_group_title">新しいグループ名を入力</string>
+  <string name="algorithm">アルゴリズム</string>
+  <string name="algorithm_colon">アルゴリズム</string>
+  <string name="app_timeout">アプリケーション タイムアウト</string>
+  <string name="app_timeout_summary">KeePassがこの時間非アクティブだった場合、データベースをロックします。</string>
+  <string name="application">アプリケーション</string>
+  <string name="application_settings">アプリケーション設定</string>
+  <string name="brackets">カッコ</string>
+  <string name="browser_intall_text">ファイルを検索するには OI File Manager が必要です。</string>
+  <string name="building_search_idx">検索中…</string>
+  <string name="cancel">キャンセル</string>
+  <string name="ClearClipboard">クリップボードを消去しました。</string>
+  <string name="clipboard_timeout">クリップボード タイムアウト</string>
+  <string name="clipboard_timeout_summary">コピーした情報をクリップボードから消去する時間</string>
+  <string name="copy_username">ここをタップするとユーザー名をクリップボードにコピーします</string>
+  <string name="copy_password">ここをタップするとパスワードをクリップボードにコピーします</string>
+  <string name="creating_db_key">データベース認証中…</string>
+  <string name="current_group">現在のグループ</string>
+  <string name="current_group_root">現在のグループ: Root</string>
+  <string name="database">データベース</string>
+  <string name="decrypting_db">データベースを解析中…</string>
+  <string name="decrypting_entry">暗号解除エントリー</string>
+  <string name="default_checkbox">このデータベースを次回以降も利用する</string>
+  <string name="digits">数字</string>
+  <string name="disclaimer_formal">Keepass2Android によって作られたフリーソフトウェアであり、無保証です。GPLバージョン2以上の条件下でこれを再頒布することができます。</string>
+  <string name="enter_filename">データベースファイル</string>
+  <string name="entry_accessed">最終アクセス日</string>
+  <string name="entry_and_or">データベースに設定したパスワードを入力するかキーファイルを選択してください。</string>
+  <string name="entry_cancel">キャンセル</string>
+  <string name="entry_comment">備考</string>
+  <string name="entry_confpassword">パスワードの確認</string>
+  <string name="entry_created">作成日</string>
+  <string name="entry_expires">有効期限</string>
+  <string name="entry_keyfile">キーファイル(オプション)</string>
+  <string name="entry_modified">更新日</string>
+  <string name="entry_password">パスワード</string>
+  <string name="entry_save">保存</string>
+  <string name="entry_title">タイトル</string>
+  <string name="entry_user_name">ユーザー名</string>
+  <string name="error_arc4">ArcFour stream cipherには対応していません。</string>
+  <string name="error_can_not_handle_uri">Keepass2Androidはこのuriを処理できません。</string>
+  <string name="error_could_not_create_group">グループ追加エラー</string>
+  <string name="error_could_not_create_parent">親ディレクトリを作成できませんでした。</string>
+  <string name="error_database_exists">ファイルが既に存在します。</string>
+  <string name="error_database_settings">データベース設定の保存に失敗しました。</string>
+  <string name="error_failed_to_launch_link">リンクを開けませんでした。</string>
+  <string name="error_filename_required">ファイル名は必須入力です。</string>
+  <string name="error_file_not_create">ファイルを作成できません。</string>
+  <string name="error_invalid_db">無効なデータベースです。</string>
+  <string name="error_invalid_path">パスが無効です。</string>
+  <string name="error_no_name">タイトルは必須入力です。</string>
+  <string name="error_nopass">パスワードかキーファイルが必要です。</string>
+  <string name="error_out_of_memory">データベース解析中にメモリ不足になりました。</string>
+  <string name="error_pass_gen_type">少なくとも1つ以上のパスワード生成タイプを選択する必要があります。</string>
+  <string name="error_pass_match">パスワードが一致しません</string>
+  <string name="error_rounds_not_number">数値を入力してください。</string>
+  <string name="error_rounds_too_large">値が大きすぎます。 2147483648にセットしました。</string>
+  <string name="error_title_required">タイトルは必須入力です。</string>
+  <string name="error_wrong_length">\"長さ\"欄には正の整数を入力してください。</string>
+  <string name="FileNotFound">ファイルが見つかりません。</string>
+  <string name="file_browser">ファイルブラウザ</string>
+  <string name="generate_password">パスワードを生成する</string>
+  <string name="group">グループ</string>
+  <string name="hint_comment">備考</string>
+  <string name="hint_conf_pass">パスワードをもう一度入力</string>
+  <string name="hint_generated_password">生成されたパスワードが表示されます</string>
+  <string name="hint_group_name">グループ名</string>
+  <string name="hint_keyfile">キーファイル</string>
+  <string name="hint_length">長さ</string>
+  <string name="hint_pass">パスワード</string>
+  <string name="hint_login_pass">パスワード</string>
+  <string name="hint_title">タイトル</string>
+  <string name="hint_username">ユーザー名</string>
+  <string name="install_from_market">Android Marketで入手</string>
+  <string name="install_from_website">Webサイトから入手</string>
+  <string name="InvalidPassword">パスワード/キーファイルが違います。</string>
+  <string name="invalid_db_sig">データベースフォーマットが認識できません。</string>
+  <string name="length">生成するパスワードの長さ</string>
+  <string name="list_size_title">グループ一覧サイズ</string>
+  <string name="list_size_summary">グループ一覧の文字サイズ</string>
+  <string name="loading_database">データベース読込中…</string>
+  <string name="lowercase">英数小文字</string>
+  <string name="maskpass_title">パスワードを隠す</string>
+  <string name="maskpass_summary">パスワード欄をアスタリスクで表示します</string>
+  <string name="menu_change_key">マスターキーを変更</string>
+  <string name="menu_copy_pass">パスワードをコピー</string>
+  <string name="menu_copy_user">ユーザー名をコピー</string>
+  <string name="menu_create">作成</string>
+  <string name="menu_app_settings">設定</string>
+  <string name="menu_db_settings">データベース設定</string>
+  <string name="menu_delete">削除</string>
+  <string name="menu_donate">寄付</string>
+  <string name="menu_edit">編集</string>
+  <string name="menu_hide_password">パスワードを隠す</string>
+  <string name="menu_homepage">URLを開く</string>
+  <string name="menu_lock">データベースをロック</string>
+  <string name="menu_open">開く</string>
+  <string name="menu_rename">タイトルの変更</string>
+  <string name="menu_search">検索</string>
+  <string name="menu_url">WEBサイトへ</string>
+  <string name="minus">マイナス (-)</string>
+  <string name="never">期限なし</string>
+  <string name="no_keys">データベース・グループがありません。</string>
+  <string name="no_results">検索結果に該当するものはありません。</string>
+  <string name="no_url_handler">このuriを処理できません。</string>
+  <string name="open_recent">以前使用したデータベースを開く(クリック)</string>
+  <string name="omitbackup_title">検索対象から除外</string>
+  <string name="omitbackup_summary">\"バックアップ\"と\"ごみ箱\"を検索対象から除外します</string>
+  <string name="pass_filename">KeePassデータベースファイル</string>
+  <string name="password_title">データベースのパスワード設定</string>
+  <string name="progress_create">データベースファイルを作成中…</string>
+  <string name="progress_title">実行中…</string>
+  <string name="remember_keyfile_summary">前回使用したキーファイルを次回も表示します</string>
+  <string name="remember_keyfile_title">キーファイルを記憶</string>
+  <string name="remove_from_filelist">消去</string>
+  <string name="rounds">暗号化レベル</string>
+  <string name="rounds_explaination">暗号化レベルを高く設定するとブルートフォース(総当り)攻撃に強くなりますが、保存や読込に時間が掛かります。</string>
+  <string name="rounds_hint">レベル</string>
+  <string name="saving_database">データベースを保存中…</string>
+  <string name="space">半角スペース</string>
+  <string name="search_label">検索</string>
+  <string name="show_password">パスワードを表示</string>
+  <string name="sort_name">A-Z順に並び替え</string>
+  <string name="sort_db">並べ替え</string>
+  <string name="special">記号</string>
+  <string name="underline">アンダーライン (_)</string>
+  <string name="unsupported_db_version">このバージョンのデータベースはサポートされていません。</string>
+  <string name="uppercase">英数大文字</string>
+  <string name="warning_read_only">お使いのSDカードは読取専用になっているようです。 データベースへの更新を保存することはできないでしょう。</string>
+  <string name="warning_unmounted">SDカードがマウントされていません。データベースの読込や作成ができません。</string>
+  <string name="version_label">バージョン</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30秒</item>
+    <item>1分</item>
+    <item>5分</item>
+    <item>なし</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>小</item>
+    <item>中</item>
+    <item>大</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-nl/strings.xml b/src/keepass2android/Resources/values-nl/strings.xml
index f0023a17..339abfaa 100644
--- a/src/keepass2android/Resources/values-nl/strings.xml
+++ b/src/keepass2android/Resources/values-nl/strings.xml
@@ -1,181 +1,155 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
-  
-  Dutch translation by Erik Devriendt, corrected by Erik Jan Meijer
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Feedback</string>    
-    <string name="about_homepage">Homepage</string>    
-    <string name="AboutText">Keepass2Android is een Android implementatie van de KeePass wachtwoordmanager.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Aanvaarden</string>
-    <string name="add_entry">Record toevoegen</string>
-    <string name="add_group">Groep toevoegen</string>
-    <string name="add_group_title">Groep toevoegen</string>
-    <string name="algorithm">Algoritme</string>
-    <string name="algorithm_colon">Algoritme</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Applicatietimeout</string>
-    <string name="app_timeout_summary">Tijd tot het vergrendelen van de database bij inactiviteit.</string>
-    <string name="application">Applicatie</string>
-    <string name="application_settings">Applicatieinstellingen</string>
-    <string name="brackets">Haakjes</string>
-    <string name="browser_intall_text">Een bestand opzoeken kan alleen met de Open Intents File Manager, klik hieronder om die te installeren. Door gebreken in deze file manager kan het opzoeken van een bestand echter de eerste keer mislukken.</string>
-    <string name="building_search_idx">Zoekindex wordt opgebouwd&#8230;</string>
-    <string name="cancel">Annuleren</string>
-    <string name="ClearClipboard">Klembord gewist.</string>
-    <string name="clipboard_timeout">Klembordtimeout</string>
-    <string name="clipboard_timeout_summary">Tijd tussen het kopiëren van gebruikersnaam of wachtwoord en het wissen van het klembord</string>
-    <string name="copy_username">Selecteer om gebruikersnaam naar klembord te kopiëren</string>
-    <string name="copy_password">Selecteer om wachtwoord naar klembord te kopiëren</string>
-    <string name="creating_db_key">Databasesleutel wordt aangemaakt&#8230;</string>
-    <string name="current_group">Huidige groep</string>
-    <string name="current_group_root">Huidige groep: Top</string>
-    <string name="database">Database</string>
-    <string name="decrypting_db">Databaseinhoud wordt ontcijferd&#8230;</string>
-    <string name="decrypting_entry">Record wordt ontcijferd</string>
-    <string name="default_checkbox">Gebruik dit als mijn standaard database</string>
-    <string name="digits">Cijfers</string>
-    <string name="disclaimer_formal">Keepass2Android biedt GEEN ENKELE GARANTIE; Dit is vrije software, u mag deze software verspreiden onder de voorwaarden van de GPL versie 2 of recenter.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Geef de databasebestandsnaam</string>    
-    <string name="entry_accessed">Laatst benaderd</string>
-    <string name="entry_and_or">Geef het wachtwoord en/of het sleutelbestand om uw database te ontgrendelen</string>    
-    <string name="entry_cancel">Annuleren</string>
-    <string name="entry_comment">Commentaar</string>
-    <string name="entry_confpassword">Bevestig wachtwoord</string>    
-    <string name="entry_created">Aangemaakt op</string>
-    <string name="entry_expires">Verloopt op</string>
-    <string name="entry_keyfile">Sleutelbestand (optioneel)</string>
-    <string name="entry_modified">Gewijzigd op</string>
-    <string name="entry_password">Wachtwoord</string>    
-    <string name="entry_save">Opslaan</string>
-    <string name="entry_title">Naam</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Gebruikersnaam</string>
-    <string name="error_arc4">De ArcFour stream-versleuteling wordt niet ondersteund.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android kan deze uri niet verwerken.</string>
-    <string name="error_could_not_create_group">Fout bij het aanmaken van de groep.</string>
-    <string name="error_could_not_create_parent">Kan de hogerliggende map niet aanmaken.</string>
-    <string name="error_database_exists">Dit bestand bestaat reeds.</string>
-    <string name="error_database_settings">Kon de instellingen van de database niet bepalen.</string>
-    <string name="error_failed_to_launch_link">Kon de koppeling niet opstarten.</string>
-    <string name="error_filename_required">Een bestandsnaam ontbreekt.</string>
-    <string name="error_file_not_create">Kon het bestand niet aanmaken</string>    
-    <string name="error_invalid_db">Ongeldige database.</string>
-    <string name="error_invalid_path">Ongeldige padnaam.</string>
-    <string name="error_no_name">Een naam ontbreekt.</string>
-    <string name="error_nopass">Een wachtwoord of sleutenbestand ontbreekt.</string>
-    <string name="error_out_of_memory">Onvoldoende vrij geheugen om de database te lezen. Misschien is de database te groot voor deze telefoon.</string>
-    <string name="error_pass_gen_type">U moet minstens één type van wachtwoordgeneratie kiezen.</string>
-    <string name="error_pass_match">Wachtwoorden zijn niet gelijk.</string>
-    <string name="error_rounds_not_number">Cycli-waarde moet een getal zijn.</string>
-    <string name="error_rounds_too_large">Cycli-waarde te groot. Ik gebruik 2147483648.</string>
-    <string name="error_title_required">Een titel ontbreekt.</string>
-    <string name="error_wrong_length">Geef een positief geheel getal voor het lengteveld</string>
-    <string name="FileNotFound">Bestand niet gevonden.</string>
-    <string name="file_browser">Verkenner</string>
-    <string name="generate_password">Genereer wachtwoord</string>
-    <string name="group">Groep</string>
-    <string name="hint_comment">commentaar</string>
-    <string name="hint_conf_pass">bevestig wachtwoord</string>
-    <string name="hint_generated_password">gegenereerd wachtwoord</string>
-    <string name="hint_group_name">Groepnaam</string>
-    <string name="hint_keyfile">sleutelbestand</string>
-    <string name="hint_length">lengte</string>
-    <string name="hint_login_pass">Wachtwoord</string>
-    <string name="hint_pass">wachtwoord</string>
-    <string name="hint_title">naam</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">gebruikersnaam</string>
-    <string name="install_from_market">Installeer van Market</string>
-    <string name="install_from_website">Installeer van Web</string>
-    <string name="InvalidPassword">Ongeldig wachtwoord of sleutelbestand.</string>
-    <string name="invalid_db_sig">Databaseformaat niet herkend.</string>
-    <string name="length">Lengte</string>
-    <string name="list_size_title">Grootte van de groepslijst</string>
-    <string name="list_size_summary">Grootte van de tekst in de groepslijst</string>
-    <string name="loading_database">Database wordt geladen&#8230;</string>
-    <string name="lowercase">Kleine letters</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Maskeer wachtwoord</string>
-    <string name="maskpass_summary">Verberg wachtwoorden standaardmatig</string>
-    <string name="menu_about">Over</string>
-    <string name="menu_change_key">Wijzig hoofdsleutel</string>
-    <string name="menu_copy_pass">Kopieer wachtwoord</string>
-    <string name="menu_copy_user">Kopieer gebruikersnaam</string>
-    <string name="menu_create">Aanmaken</string>
-    <string name="menu_app_settings">Instellingen</string>
-    <string name="menu_db_settings">Database-instellingen</string>
-    <string name="menu_delete">Wissen</string>
-    <string name="menu_donate">Doneren</string>
-    <string name="menu_edit">Bewerken</string>
-    <string name="menu_hide_password">Wachtwoord verbergen</string>
-    <string name="menu_homepage">Ga naar homepage</string>
-    <string name="menu_lock">Vergrendel database</string>
-    <string name="menu_open">Openen</string>
-    <string name="menu_rename">Hernoemen</string>
-    <string name="menu_search">Zoeken</string>
-    <string name="menu_url">Ga naar URL</string>
-    <string name="minus">Minus</string>
-    <string name="never">Nooit</string>
-    <string name="no_keys">Geen records in de database of groep.</string>
-    <string name="no_results">Geen zoekresultaten</string>
-    <string name="no_url_handler">Geen afhandeling voor deze url mogelijk.</string>
-    <string name="open_recent">Recente database openen (klik om te openen)</string>    
-    <string name="omitbackup_title">Niet in backup en prullenbak zoeken</string>
-    <string name="omitbackup_summary">Laat \'Backup\' en Prullenbak-groep weg uit zoekresultaten</string>
-    <string name="pass_filename">KeePass databasebestandsnaam</string>    
-    <string name="password_title">Geef databasewachtwoord</string>
-    <string name="progress_create">Nieuwe database wordt aangemaakt&#8230;</string>
-    <string name="progress_title">Bezig&#8230;</string>
-    <string name="remember_keyfile_summary">Onthoudt de locatie van de sleutelbestanden</string>
-    <string name="remember_keyfile_title">Sleutelbestand opslaan</string>
-    <string name="remove_from_filelist">Verwijder</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Top</string>
-    <string name="rounds">Encryptie-cycli</string>
-    <string name="rounds_explaination">Een hoger aantal encryptie-cycli geeft bijkomende bescherming tegen brute-force aanvallen, maar kan het laden en opslaan sterk vertragen.</string>
-    <string name="rounds_hint">cycli</string>
-    <string name="saving_database">Database wordt opgeslagen&#8230;</string>
-    <string name="space">Ruimte</string>
-    <string name="search_label">Zoeken</string>
-    <string name="show_password">Toon wachtwoord</string>
-    <string name="sort_name">Sorteren op naam</string>
-    <string name="sort_db">Sorteringsvolgorde DB</string>
-    <string name="special">Speciaal</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Onderlijnen</string>
-    <string name="unsupported_db_version">Niet-ondersteunde databaseversie.</string>
-    <string name="uppercase">Hoofdletters</string>
-    <string name="warning_read_only">Uw sd-card is mementeel niet beschrijfbaar. U zult wijzigingen in de database niet kunnen opslaan.</string>
-    <string name="warning_unmounted">Uw sd-card is momenteel ontkoppeld. U zult geen database kunnen openen of aanmaken.</string>
-    <string name="version_label">Versie</string>    
-    
-    <string-array name="clipboard_timeout_options">
-     <item>30 seconden</item>
-    	<item>1 minuut</item>
-    	<item>5 minuten</item>
-    	<item>Nooit</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Klein</item>
-    	<item>Medium</item>
-    	<item>Groot</item>
-    </string-array>
+  <string name="AboutText">Keepass2Android is een Android implementatie van de KeePass wachtwoordmanager.</string>
+  <string name="accept">Aanvaarden</string>
+  <string name="add_entry">Record toevoegen</string>
+  <string name="add_group">Groep toevoegen</string>
+  <string name="add_group_title">Groep toevoegen</string>
+  <string name="algorithm">Algoritme</string>
+  <string name="algorithm_colon">Algoritme</string>
+  <string name="app_timeout">Applicatietimeout</string>
+  <string name="app_timeout_summary">Tijd tot het vergrendelen van de database bij inactiviteit.</string>
+  <string name="application">Applicatie</string>
+  <string name="application_settings">Applicatieinstellingen</string>
+  <string name="brackets">Haakjes</string>
+  <string name="browser_intall_text">Een bestand opzoeken kan alleen met de Open Intents File Manager, klik hieronder om die te installeren. Door gebreken in deze file manager kan het opzoeken van een bestand echter de eerste keer mislukken.</string>
+  <string name="building_search_idx">Zoekindex wordt opgebouwd…</string>
+  <string name="cancel">Annuleren</string>
+  <string name="ClearClipboard">Klembord gewist.</string>
+  <string name="clipboard_timeout">Klembordtimeout</string>
+  <string name="clipboard_timeout_summary">Tijd tussen het kopiëren van gebruikersnaam of wachtwoord en het wissen van het klembord</string>
+  <string name="copy_username">Selecteer om gebruikersnaam naar klembord te kopiëren</string>
+  <string name="copy_password">Selecteer om wachtwoord naar klembord te kopiëren</string>
+  <string name="creating_db_key">Databasesleutel wordt aangemaakt…</string>
+  <string name="current_group">Huidige groep</string>
+  <string name="current_group_root">Huidige groep: Top</string>
+  <string name="decrypting_db">Databaseinhoud wordt ontcijferd…</string>
+  <string name="decrypting_entry">Record wordt ontcijferd</string>
+  <string name="default_checkbox">Gebruik dit als mijn standaard database</string>
+  <string name="digits">Cijfers</string>
+  <string name="disclaimer_formal">Keepass2Android biedt GEEN ENKELE GARANTIE; Dit is vrije software, u mag deze software verspreiden onder de voorwaarden van de GPL versie 2 of recenter.</string>
+  <string name="enter_filename">Geef de databasebestandsnaam</string>
+  <string name="entry_accessed">Laatst benaderd</string>
+  <string name="entry_and_or">Geef het wachtwoord en/of het sleutelbestand om uw database te ontgrendelen</string>
+  <string name="entry_cancel">Annuleren</string>
+  <string name="entry_comment">Commentaar</string>
+  <string name="entry_confpassword">Bevestig wachtwoord</string>
+  <string name="entry_created">Aangemaakt op</string>
+  <string name="entry_expires">Verloopt op</string>
+  <string name="entry_keyfile">Sleutelbestand (optioneel)</string>
+  <string name="entry_modified">Gewijzigd op</string>
+  <string name="entry_password">Wachtwoord</string>
+  <string name="entry_save">Opslaan</string>
+  <string name="entry_title">Naam</string>
+  <string name="entry_user_name">Gebruikersnaam</string>
+  <string name="error_arc4">De ArcFour stream-versleuteling wordt niet ondersteund.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android kan deze uri niet verwerken.</string>
+  <string name="error_could_not_create_group">Fout bij het aanmaken van de groep.</string>
+  <string name="error_could_not_create_parent">Kan de hogerliggende map niet aanmaken.</string>
+  <string name="error_database_exists">Dit bestand bestaat reeds.</string>
+  <string name="error_database_settings">Kon de instellingen van de database niet bepalen.</string>
+  <string name="error_failed_to_launch_link">Kon de koppeling niet opstarten.</string>
+  <string name="error_filename_required">Een bestandsnaam ontbreekt.</string>
+  <string name="error_file_not_create">Kon het bestand niet aanmaken</string>
+  <string name="error_invalid_db">Ongeldige database.</string>
+  <string name="error_invalid_path">Ongeldige padnaam.</string>
+  <string name="error_no_name">Een naam ontbreekt.</string>
+  <string name="error_nopass">Een wachtwoord of sleutenbestand ontbreekt.</string>
+  <string name="error_out_of_memory">Onvoldoende vrij geheugen om de database te lezen. Misschien is de database te groot voor deze telefoon.</string>
+  <string name="error_pass_gen_type">U moet minstens één type van wachtwoordgeneratie kiezen.</string>
+  <string name="error_pass_match">Wachtwoorden zijn niet gelijk.</string>
+  <string name="error_rounds_not_number">Cycli-waarde moet een getal zijn.</string>
+  <string name="error_rounds_too_large">Cycli-waarde te groot. Ik gebruik 2147483648.</string>
+  <string name="error_title_required">Een titel ontbreekt.</string>
+  <string name="error_wrong_length">Geef een positief geheel getal voor het lengteveld</string>
+  <string name="FileNotFound">Bestand niet gevonden.</string>
+  <string name="file_browser">Verkenner</string>
+  <string name="generate_password">Genereer wachtwoord</string>
+  <string name="group">Groep</string>
+  <string name="hint_comment">commentaar</string>
+  <string name="hint_conf_pass">bevestig wachtwoord</string>
+  <string name="hint_generated_password">gegenereerd wachtwoord</string>
+  <string name="hint_group_name">Groepnaam</string>
+  <string name="hint_keyfile">sleutelbestand</string>
+  <string name="hint_length">lengte</string>
+  <string name="hint_pass">wachtwoord</string>
+  <string name="hint_login_pass">Wachtwoord</string>
+  <string name="hint_title">naam</string>
+  <string name="hint_username">gebruikersnaam</string>
+  <string name="install_from_market">Installeer van Market</string>
+  <string name="install_from_website">Installeer van Web</string>
+  <string name="InvalidPassword">Ongeldig wachtwoord of sleutelbestand.</string>
+  <string name="invalid_db_sig">Databaseformaat niet herkend.</string>
+  <string name="length">Lengte</string>
+  <string name="list_size_title">Grootte van de groepslijst</string>
+  <string name="list_size_summary">Grootte van de tekst in de groepslijst</string>
+  <string name="loading_database">Database wordt geladen…</string>
+  <string name="lowercase">Kleine letters</string>
+  <string name="maskpass_title">Maskeer wachtwoord</string>
+  <string name="maskpass_summary">Verberg wachtwoorden standaardmatig</string>
+  <string name="menu_about">Over</string>
+  <string name="menu_change_key">Wijzig hoofdsleutel</string>
+  <string name="menu_copy_pass">Kopieer wachtwoord</string>
+  <string name="menu_copy_user">Kopieer gebruikersnaam</string>
+  <string name="menu_create">Aanmaken</string>
+  <string name="menu_app_settings">Instellingen</string>
+  <string name="menu_db_settings">Database-instellingen</string>
+  <string name="menu_delete">Wissen</string>
+  <string name="menu_donate">Doneren</string>
+  <string name="menu_edit">Bewerken</string>
+  <string name="menu_hide_password">Wachtwoord verbergen</string>
+  <string name="menu_homepage">Ga naar homepage</string>
+  <string name="menu_lock">Vergrendel database</string>
+  <string name="menu_open">Openen</string>
+  <string name="menu_rename">Hernoemen</string>
+  <string name="menu_search">Zoeken</string>
+  <string name="menu_url">Ga naar URL</string>
+  <string name="never">Nooit</string>
+  <string name="no_keys">Geen records in de database of groep.</string>
+  <string name="no_results">Geen zoekresultaten</string>
+  <string name="no_url_handler">Geen afhandeling voor deze url mogelijk.</string>
+  <string name="open_recent">Recente database openen (klik om te openen)</string>
+  <string name="omitbackup_title">Niet in backup en prullenbak zoeken</string>
+  <string name="omitbackup_summary">Laat \'Backup\' en Prullenbak-groep weg uit zoekresultaten</string>
+  <string name="pass_filename">KeePass databasebestandsnaam</string>
+  <string name="password_title">Geef databasewachtwoord</string>
+  <string name="progress_create">Nieuwe database wordt aangemaakt…</string>
+  <string name="progress_title">Bezig…</string>
+  <string name="remember_keyfile_summary">Onthoudt de locatie van de sleutelbestanden</string>
+  <string name="remember_keyfile_title">Sleutelbestand opslaan</string>
+  <string name="remove_from_filelist">Verwijder</string>
+  <string name="root">Top</string>
+  <string name="rounds">Encryptie-cycli</string>
+  <string name="rounds_explaination">Een hoger aantal encryptie-cycli geeft bijkomende bescherming tegen brute-force aanvallen, maar kan het laden en opslaan sterk vertragen.</string>
+  <string name="rounds_hint">cycli</string>
+  <string name="saving_database">Database wordt opgeslagen…</string>
+  <string name="space">Ruimte</string>
+  <string name="search_label">Zoeken</string>
+  <string name="show_password">Toon wachtwoord</string>
+  <string name="sort_name">Sorteren op naam</string>
+  <string name="sort_db">Sorteringsvolgorde DB</string>
+  <string name="special">Speciaal</string>
+  <string name="underline">Onderlijnen</string>
+  <string name="unsupported_db_version">Niet-ondersteunde databaseversie.</string>
+  <string name="uppercase">Hoofdletters</string>
+  <string name="warning_read_only">Uw sd-card is mementeel niet beschrijfbaar. U zult wijzigingen in de database niet kunnen opslaan.</string>
+  <string name="warning_unmounted">Uw sd-card is momenteel ontkoppeld. U zult geen database kunnen openen of aanmaken.</string>
+  <string name="version_label">Versie</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 seconden</item>
+    <item>1 minuut</item>
+    <item>5 minuten</item>
+    <item>Nooit</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Klein</item>
+    <item>Medium</item>
+    <item>Groot</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-nn/strings.xml b/src/keepass2android/Resources/values-nn/strings.xml
index 5cdfc0bb..a3635000 100644
--- a/src/keepass2android/Resources/values-nn/strings.xml
+++ b/src/keepass2android/Resources/values-nn/strings.xml
@@ -1,179 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Tilbakemelding</string>    
-    <string name="about_homepage">Heimeside</string>    
-    <string name="AboutText">Keepass2Android er ei android-utgåve av KeePass passordstyrar.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Godta</string>    
-    <string name="add_entry">Legg til post</string>
-    <string name="add_group">Legg til gruppe</string>
-    <string name="add_group_title">Legg til gruppe</string>
-    <string name="algorithm">Algoritme</string>
-    <string name="algorithm_colon">Algoritme</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Programtidsavbrot</string>
-    <string name="app_timeout_summary">Tid før databasen blir låst når programmet ikkje er i bruk.</string>
-    <string name="application">Program</string>
-    <string name="application_settings">Programinnstillingar</string>
-    <string name="brackets">Parentesar</string>
-    <string name="browser_intall_text">Du må ha Open Intents filbehandlar for å kunna bla i filer. Klikk nedanfor for å installera han. Grunna nokre småfeil i programmet kan det vera at det ikkje fungerer heilt den første gongen du bruker det.</string>
-    <string name="building_search_idx">Byggjer søkjeindeksen …</string>
-    <string name="cancel">Avbryt</string>
-    <string name="ClearClipboard">Utklippstavla er tømt.</string>
-    <string name="clipboard_timeout">Tidsavbrot på utklippstavla</string>
-    <string name="clipboard_timeout_summary">Tid før utklippstavla blir tømt etter at brukarnamnet eller passordet er kopiert.</string>
-    <string name="copy_username">Kopier brukarnamnet til utklippstavla</string>
-    <string name="copy_password">Kopier passordet til utklippstavla</string>
-    <string name="creating_db_key">Lagar databasenøkkelen …</string>
-    <string name="current_group">Gjeldande gruppe</string>
-    <string name="current_group_root">Gjeldande gruppe: Rot</string>
-    <string name="database">Database</string>
-    <string name="decrypting_db">Dekrypterer databasen …</string>
-    <string name="decrypting_entry">Dekrypterer oppføringa</string>
-    <string name="default_checkbox">Standarddatabasen</string>
-    <string name="digits">Tal</string>
-    <string name="disclaimer_formal">Keepass2Android kjem med INGEN SOM HELST GARANTI. Dette er eit fritt program. Du er velkomen til å redistribuera det i samsvar med vilkåra til GPL utgåve 2 eller nyare.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Skriv filnamnet til databasen</string>    
-    <string name="entry_accessed">Brukt</string>
-    <string name="entry_and_or">Skriv inn passordet og/eller nøkkelfil for å låsa opp databasen</string>    
-    <string name="entry_cancel">Avbryt</string>
-    <string name="entry_comment">Merknader</string>
-    <string name="entry_confpassword">Stadfest passordet</string>    
-    <string name="entry_created">Laga</string>
-    <string name="entry_expires">Går ut</string>
-    <string name="entry_keyfile">Nøkkelfil (valfri)</string>
-    <string name="entry_modified">Endra</string>
-    <string name="entry_password">Passord</string>    
-    <string name="entry_save">Lagra</string>
-    <string name="entry_title">Namn</string>
-    <string name="entry_url">Adresse</string>
-    <string name="entry_user_name">Brukaramn</string>
-    <string name="error_arc4">Kan ikkje bruka ArcFour dataflytkryptering.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android kan ikkje bruka denne ressursen.</string>
-    <string name="error_could_not_create_group">Klarte ikkje å laga gruppa.</string>
-    <string name="error_could_not_create_parent">Klarte ikkje å laga foreldrekatalogen.</string>
-    <string name="error_database_exists">Denne fila finst allereie.</string>
-    <string name="error_database_settings">Klarte ikkje å bestemma databaseinnstillingane.</string>
-    <string name="error_failed_to_launch_link">Klarte ikkje å lasta lenkja.</string>
-    <string name="error_filename_required">Treng eit filnamn.</string>
-    <string name="error_file_not_create">Klarte ikkje å laga fila</string>    
-    <string name="error_invalid_db">Ugyldig database.</string>
-    <string name="error_invalid_path">Ugyldig stig.</string>
-    <string name="error_no_name">Treng eit namn.</string>
-    <string name="error_nopass">Treng eit passord eller ei nøkkelfil.</string>
-    <string name="error_out_of_memory">Telefonen gjekk tom for minne ved lesinga av databasen din. Databasen er kanskje for stor.</string>
-    <string name="error_pass_gen_type">Du må velja minst éin passordlagingstype</string>
-    <string name="error_pass_match">Passorda samsvarer ikkje.</string>
-    <string name="error_rounds_not_number">Omgangar må vera eit tal.</string>
-    <string name="error_rounds_too_large">For mange omgangar. Bruker 2147483648.</string>
-    <string name="error_title_required">Treng ein tittel.</string>
-    <string name="error_wrong_length">Bruk eit positivt heiltal i lengdfeltet</string>
-    <string name="FileNotFound">Fann ikkje fila.</string>
-    <string name="file_browser">Filbehandlar</string>
-    <string name="generate_password">Lag passord</string>
-    <string name="group">Gruppe</string>
-    <string name="hint_comment">merknad</string>
-    <string name="hint_conf_pass">stadfest passordet</string>
-    <string name="hint_generated_password">laga passord</string>
-    <string name="hint_group_name">Gruppenamn</string>
-    <string name="hint_keyfile">nøkkelfil</string>
-    <string name="hint_length">lengd</string>
-    <string name="hint_login_pass">Passord</string>
-    <string name="hint_pass">passord</string>
-    <string name="hint_title">namn</string>
-    <string name="hint_url">adresse</string>
-    <string name="hint_username">brukarnamn</string>
-    <string name="install_from_market">Installer frå marknaden</string>
-    <string name="install_from_website">Installer frå nettet</string>
-    <string name="InvalidPassword">Ugyldig passord eller nøkkelfil.</string>
-    <string name="invalid_db_sig">Ukjent databaseformat.</string>
-    <string name="length">Lengd</string>
-    <string name="list_size_title">Gruppelistestorleik</string>
-    <string name="list_size_summary">Tekststorleik i gruppelista</string>
-    <string name="loading_database">Lastar databasen …</string>
-    <string name="lowercase">Små bokstavar</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Masker passord</string>
-    <string name="maskpass_summary">Gøym passorda (standardval)</string>
-    <string name="menu_about">Om</string>
-    <string name="menu_change_key">Endra hovudnøkkelen</string>
-    <string name="menu_copy_pass">Kopier passordet</string>
-    <string name="menu_copy_user">Kopier brukaren</string>
-    <string name="menu_create">Lag</string>
-    <string name="menu_app_settings">Innstillingar</string>
-    <string name="menu_db_settings">Databaseinnstillingar</string>
-    <string name="menu_delete">Slett</string>
-    <string name="menu_donate">Doner</string>
-    <string name="menu_edit">Endra</string>
-    <string name="menu_hide_password">Gøym passordet</string>
-    <string name="menu_homepage">Gå til heimesida</string>
-    <string name="menu_lock">Lås databasen</string>
-    <string name="menu_open">Opna</string>
-    <string name="menu_rename">Gje nytt namn</string>
-    <string name="menu_search">Søk</string>
-    <string name="menu_url">Gå til adressa</string>
-    <string name="minus">Minus</string>
-    <string name="never">Aldri</string>
-    <string name="no_keys">Ingen oppføringar i databasen eller gruppa.</string>
-    <string name="no_results">Ingen søkjeresultat</string>
-    <string name="no_url_handler">Ingen behandlar for denne adressa.</string>
-    <string name="open_recent">Opna nyleg brukt database (klikk for å opna)</string>    
-    <string name="omitbackup_title">Søk ikkje i kopipostane eller søppelbøtta</string>
-    <string name="omitbackup_summary">Søkjeresultatet inneheld ikkje oppføringar frå \'Backup\' eller søppelbøtta</string>
-    <string name="pass_filename">Filnamnet til KeePass-databasen</string>    
-    <string name="password_title">Skriv databasepassordet</string>
-    <string name="progress_create">Lager ny database …</string>
-    <string name="progress_title">Arbeider …</string>
-    <string name="remember_keyfile_summary">Hugsar staden til nøkkelfilene</string>
-    <string name="remember_keyfile_title">Lagra nøkkelfila</string>
-    <string name="remove_from_filelist">Ta vekk</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Rot</string>
-    <string name="rounds">Krypteringsomgangar</string>
-    <string name="rounds_explaination">Fleire krypteringsomgangar gjev tilleggsvern mot rå makt-åtak, men kan òg gjera lasting og lagring mykje tregare.</string>
-    <string name="rounds_hint">omgangar</string>
-    <string name="saving_database">Lagrar databasen …</string>
-    <string name="space">Mellomrom</string>    
-    <string name="search_label">Søk</string>
-    <string name="show_password">Syn passordet</string>
-    <string name="sort_name">Sorter etter namn</string>
-    <string name="sort_db">DB-sortering</string>
-    <string name="special">Spesial</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Understreking</string>
-    <string name="unsupported_db_version">Kan ikkje bruka databaseutgåva.</string>
-    <string name="uppercase">Store bokstavar</string>
-    <string name="warning_read_only">SD-kortet ditt kan berre lesast. Det kan vera at du ikkje kan lagra endringar i databasen.</string>
-    <string name="warning_unmounted">SD-kortet er ikkje montert i eininga di. Du kan verken henta eller laga databasen din.</string>
-    <string name="version_label">Utgåve</string>    
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30 sekund</item>
-    	<item>1 minutt</item>
-    	<item>5 minutt</item>
-    	<item>Aldri</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Liten</item>
-    	<item>Middels</item>
-    	<item>Stor</item>
-    </string-array>
+  <string name="about_feedback">Tilbakemelding</string>
+  <string name="about_homepage">Heimeside</string>
+  <string name="AboutText">Keepass2Android er ei android-utgåve av KeePass passordstyrar.</string>
+  <string name="accept">Godta</string>
+  <string name="add_entry">Legg til post</string>
+  <string name="add_group">Legg til gruppe</string>
+  <string name="add_group_title">Legg til gruppe</string>
+  <string name="algorithm">Algoritme</string>
+  <string name="algorithm_colon">Algoritme</string>
+  <string name="app_timeout">Programtidsavbrot</string>
+  <string name="app_timeout_summary">Tid før databasen blir låst når programmet ikkje er i bruk.</string>
+  <string name="application">Program</string>
+  <string name="application_settings">Programinnstillingar</string>
+  <string name="brackets">Parentesar</string>
+  <string name="browser_intall_text">Du må ha Open Intents filbehandlar for å kunna bla i filer. Klikk nedanfor for å installera han. Grunna nokre småfeil i programmet kan det vera at det ikkje fungerer heilt den første gongen du bruker det.</string>
+  <string name="building_search_idx">Byggjer søkjeindeksen …</string>
+  <string name="cancel">Avbryt</string>
+  <string name="ClearClipboard">Utklippstavla er tømt.</string>
+  <string name="clipboard_timeout">Tidsavbrot på utklippstavla</string>
+  <string name="clipboard_timeout_summary">Tid før utklippstavla blir tømt etter at brukarnamnet eller passordet er kopiert.</string>
+  <string name="copy_username">Kopier brukarnamnet til utklippstavla</string>
+  <string name="copy_password">Kopier passordet til utklippstavla</string>
+  <string name="creating_db_key">Lagar databasenøkkelen …</string>
+  <string name="current_group">Gjeldande gruppe</string>
+  <string name="current_group_root">Gjeldande gruppe: Rot</string>
+  <string name="decrypting_db">Dekrypterer databasen …</string>
+  <string name="decrypting_entry">Dekrypterer oppføringa</string>
+  <string name="default_checkbox">Standarddatabasen</string>
+  <string name="digits">Tal</string>
+  <string name="disclaimer_formal">Keepass2Android kjem med INGEN SOM HELST GARANTI. Dette er eit fritt program. Du er velkomen til å redistribuera det i samsvar med vilkåra til GPL utgåve 2 eller nyare.</string>
+  <string name="enter_filename">Skriv filnamnet til databasen</string>
+  <string name="entry_accessed">Brukt</string>
+  <string name="entry_and_or">Skriv inn passordet og/eller nøkkelfil for å låsa opp databasen</string>
+  <string name="entry_cancel">Avbryt</string>
+  <string name="entry_comment">Merknader</string>
+  <string name="entry_confpassword">Stadfest passordet</string>
+  <string name="entry_created">Laga</string>
+  <string name="entry_expires">Går ut</string>
+  <string name="entry_keyfile">Nøkkelfil (valfri)</string>
+  <string name="entry_modified">Endra</string>
+  <string name="entry_password">Passord</string>
+  <string name="entry_save">Lagra</string>
+  <string name="entry_title">Namn</string>
+  <string name="entry_url">Adresse</string>
+  <string name="entry_user_name">Brukaramn</string>
+  <string name="error_arc4">Kan ikkje bruka ArcFour dataflytkryptering.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android kan ikkje bruka denne ressursen.</string>
+  <string name="error_could_not_create_group">Klarte ikkje å laga gruppa.</string>
+  <string name="error_could_not_create_parent">Klarte ikkje å laga foreldrekatalogen.</string>
+  <string name="error_database_exists">Denne fila finst allereie.</string>
+  <string name="error_database_settings">Klarte ikkje å bestemma databaseinnstillingane.</string>
+  <string name="error_failed_to_launch_link">Klarte ikkje å lasta lenkja.</string>
+  <string name="error_filename_required">Treng eit filnamn.</string>
+  <string name="error_file_not_create">Klarte ikkje å laga fila</string>
+  <string name="error_invalid_db">Ugyldig database.</string>
+  <string name="error_invalid_path">Ugyldig stig.</string>
+  <string name="error_no_name">Treng eit namn.</string>
+  <string name="error_nopass">Treng eit passord eller ei nøkkelfil.</string>
+  <string name="error_out_of_memory">Telefonen gjekk tom for minne ved lesinga av databasen din. Databasen er kanskje for stor.</string>
+  <string name="error_pass_gen_type">Du må velja minst éin passordlagingstype</string>
+  <string name="error_pass_match">Passorda samsvarer ikkje.</string>
+  <string name="error_rounds_not_number">Omgangar må vera eit tal.</string>
+  <string name="error_rounds_too_large">For mange omgangar. Bruker 2147483648.</string>
+  <string name="error_title_required">Treng ein tittel.</string>
+  <string name="error_wrong_length">Bruk eit positivt heiltal i lengdfeltet</string>
+  <string name="FileNotFound">Fann ikkje fila.</string>
+  <string name="file_browser">Filbehandlar</string>
+  <string name="generate_password">Lag passord</string>
+  <string name="group">Gruppe</string>
+  <string name="hint_comment">merknad</string>
+  <string name="hint_conf_pass">stadfest passordet</string>
+  <string name="hint_generated_password">laga passord</string>
+  <string name="hint_group_name">Gruppenamn</string>
+  <string name="hint_keyfile">nøkkelfil</string>
+  <string name="hint_length">lengd</string>
+  <string name="hint_pass">passord</string>
+  <string name="hint_login_pass">Passord</string>
+  <string name="hint_title">namn</string>
+  <string name="hint_url">adresse</string>
+  <string name="hint_username">brukarnamn</string>
+  <string name="install_from_market">Installer frå marknaden</string>
+  <string name="install_from_website">Installer frå nettet</string>
+  <string name="InvalidPassword">Ugyldig passord eller nøkkelfil.</string>
+  <string name="invalid_db_sig">Ukjent databaseformat.</string>
+  <string name="length">Lengd</string>
+  <string name="list_size_title">Gruppelistestorleik</string>
+  <string name="list_size_summary">Tekststorleik i gruppelista</string>
+  <string name="loading_database">Lastar databasen …</string>
+  <string name="lowercase">Små bokstavar</string>
+  <string name="maskpass_title">Masker passord</string>
+  <string name="maskpass_summary">Gøym passorda (standardval)</string>
+  <string name="menu_about">Om</string>
+  <string name="menu_change_key">Endra hovudnøkkelen</string>
+  <string name="menu_copy_pass">Kopier passordet</string>
+  <string name="menu_copy_user">Kopier brukaren</string>
+  <string name="menu_create">Lag</string>
+  <string name="menu_app_settings">Innstillingar</string>
+  <string name="menu_db_settings">Databaseinnstillingar</string>
+  <string name="menu_delete">Slett</string>
+  <string name="menu_donate">Doner</string>
+  <string name="menu_edit">Endra</string>
+  <string name="menu_hide_password">Gøym passordet</string>
+  <string name="menu_homepage">Gå til heimesida</string>
+  <string name="menu_lock">Lås databasen</string>
+  <string name="menu_open">Opna</string>
+  <string name="menu_rename">Gje nytt namn</string>
+  <string name="menu_search">Søk</string>
+  <string name="menu_url">Gå til adressa</string>
+  <string name="never">Aldri</string>
+  <string name="no_keys">Ingen oppføringar i databasen eller gruppa.</string>
+  <string name="no_results">Ingen søkjeresultat</string>
+  <string name="no_url_handler">Ingen behandlar for denne adressa.</string>
+  <string name="open_recent">Opna nyleg brukt database (klikk for å opna)</string>
+  <string name="omitbackup_title">Søk ikkje i kopipostane eller søppelbøtta</string>
+  <string name="omitbackup_summary">Søkjeresultatet inneheld ikkje oppføringar frå \'Backup\' eller søppelbøtta</string>
+  <string name="pass_filename">Filnamnet til KeePass-databasen</string>
+  <string name="password_title">Skriv databasepassordet</string>
+  <string name="progress_create">Lager ny database …</string>
+  <string name="progress_title">Arbeider …</string>
+  <string name="remember_keyfile_summary">Hugsar staden til nøkkelfilene</string>
+  <string name="remember_keyfile_title">Lagra nøkkelfila</string>
+  <string name="remove_from_filelist">Ta vekk</string>
+  <string name="root">Rot</string>
+  <string name="rounds">Krypteringsomgangar</string>
+  <string name="rounds_explaination">Fleire krypteringsomgangar gjev tilleggsvern mot rå makt-åtak, men kan òg gjera lasting og lagring mykje tregare.</string>
+  <string name="rounds_hint">omgangar</string>
+  <string name="saving_database">Lagrar databasen …</string>
+  <string name="space">Mellomrom</string>
+  <string name="search_label">Søk</string>
+  <string name="show_password">Syn passordet</string>
+  <string name="sort_name">Sorter etter namn</string>
+  <string name="sort_db">DB-sortering</string>
+  <string name="special">Spesial</string>
+  <string name="underline">Understreking</string>
+  <string name="unsupported_db_version">Kan ikkje bruka databaseutgåva.</string>
+  <string name="uppercase">Store bokstavar</string>
+  <string name="warning_read_only">SD-kortet ditt kan berre lesast. Det kan vera at du ikkje kan lagra endringar i databasen.</string>
+  <string name="warning_unmounted">SD-kortet er ikkje montert i eininga di. Du kan verken henta eller laga databasen din.</string>
+  <string name="version_label">Utgåve</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 sekund</item>
+    <item>1 minutt</item>
+    <item>5 minutt</item>
+    <item>Aldri</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Liten</item>
+    <item>Middels</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-pl/strings.xml b/src/keepass2android/Resources/values-pl/strings.xml
index c2b275ed..bdccc2cb 100644
--- a/src/keepass2android/Resources/values-pl/strings.xml
+++ b/src/keepass2android/Resources/values-pl/strings.xml
@@ -1,177 +1,152 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-
-This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-Keepass2Android is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-Keepass2Android is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Keepass2Android. If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Feedback</string>    
-    <string name="about_homepage">Strona domowa</string>    
-    <string name="AboutText">Keepass2Android to Androidowa implementacja menadżera haseł KeePass.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Akceptuj</string>
-    <string name="add_entry">Dodaj wpis</string>
-    <string name="add_group">Dodaj grupę</string>
-    <string name="add_group_title">Dodaj grupę</string>
-    <string name="algorithm">Algorytm</string>
-    <string name="algorithm_colon">Algorytm</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Czas wygaśnięcia aplikacji</string>
-    <string name="app_timeout_summary">Czas do zablokowania bazy danych przy bezczynności aplikacji.</string>
-    <string name="application">Aplikacja</string>
-    <string name="application_settings">Ustawienia aplikacji</string>
-    <string name="brackets">Nawiasy</string>
-    <string name="browser_intall_text">Przeglądanie plików wymaga programu Open Intents File Manager, kliknij poniżej by go zainstalować. Ze względu na pewne, dziwne zachowania menadżera plików przeglądanie może nie działać poprawnie przy pierwszym użyciu.</string>
-    <string name="building_search_idx">Tworzenie indeksu wyszukiwania&#8230;</string>
-    <string name="cancel">Anuluj</string>
-    <string name="ClearClipboard">Schowek wyczyszczony.</string>
-    <string name="clipboard_timeout">Czas wygaśnięcia schowka</string>
-    <string name="clipboard_timeout_summary">Czas do wyczyszczenia zawartości schowka po kopiowaniu nazwy użytkownika i hasła</string>
-    <string name="copy_username">Kopiuj nazwę użytkownika do schowka</string>
-    <string name="copy_password">Kopiuj hasło do schowka</string>
-    <string name="creating_db_key">Tworzenie klucza bazy danych&#8230;</string>
-    <string name="current_group">Aktualna grupa</string>
-    <string name="current_group_root">Aktualna grupa: Root</string>
-    <string name="database">Baza danych</string>
-    <string name="decrypting_db">Deszyfracja bazy danych&#8230;</string>
-    <string name="decrypting_entry">Deszyfracja wpisu</string>
-    <string name="default_checkbox">Używaj tej bazy danych jako domyślnej</string>
-    <string name="digits">Cyfry</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Wprowadź nazwę pliku bazy danych</string>    
-    <string name="entry_accessed">Dostęp do pliku</string>
-    <string name="entry_and_or">Wprowadź hasło i/lub plik klucza by uzyskać dostęp do bazy danych</string>    
-    <string name="entry_cancel">Anuluj</string>
-    <string name="entry_comment">Komentarz</string>
-    <string name="entry_confpassword">Potwierdź hasło</string>    
-    <string name="entry_created">Utworzono</string>
-    <string name="entry_expires">Wygasa</string>
-    <string name="entry_keyfile">Plik klucza (opcjonalnie)</string>
-    <string name="entry_modified">Zmodyfikowano</string>
-    <string name="entry_password">Hasło</string>
-    <string name="entry_save">Zapisz</string>
-    <string name="entry_title">Tytuł</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Nazwa użytkownika</string>
-    <string name="error_arc4">Strumieniowe szyfrowanie ArcFour nie jest wspierane.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android nie potrafi obsłużyć tego uri.</string>
-    <string name="error_could_not_create_group">Błąd podczas tworzenia grupy.</string>
-    <string name="error_could_not_create_parent">Nie można utworzyć folderu nadrzędnego.</string>
-    <string name="error_database_exists">Plik o podanej nazwie już istnieje.</string>
-    <string name="error_database_settings">Błąd przy wykrywaniu ustawień bazy danych.</string>
-    <string name="error_failed_to_launch_link">Błąd przy uruchamianiu linku.</string>
-    <string name="error_filename_required">Wymagana nazwa pliku.</string>
-    <string name="error_file_not_create">Nie można utworzyć pliku</string>    
-    <string name="error_invalid_db">Nieprawidłowa baza danych.</string>
-    <string name="error_invalid_path">Nieprawidłowa ścieżka dostępu.</string>
-    <string name="error_no_name">Wymagana nazwa.</string>
-    <string name="error_nopass">Wymagane hasło lub plik klucza.</string>
-    <string name="error_out_of_memory">Podczas parsowania bazy danych zabrakło pamięci. Być może ta baza danych jest za duża dla Twojego urządzenia.</string>
-    <string name="error_pass_gen_type">Przynajmniej jeden sposób generowania hasła musi być wybrany</string>
-    <string name="error_pass_match">Pasła nie pasują do siebie.</string>
-    <string name="error_rounds_not_number">Wartość musi być liczbą.</string>
-    <string name="error_rounds_too_large">Wartość za duża. Ustaw 2147483648.</string>
-    <string name="error_title_required">Wymagany tytuł.</string>
-    <string name="error_wrong_length">Wprowadź dodatnią liczbę całkowitą.</string>
-    <string name="FileNotFound">Plik nie istnieje.</string>
-    <string name="file_browser">Przeglądarka plików</string>
-    <string name="generate_password">Generuj hasło</string>
-    <string name="group">Grupa</string>
-    <string name="hint_comment">komentarz</string>
-    <string name="hint_conf_pass">potwierdź hasło</string>
-    <string name="hint_generated_password">hasło wygenerowane</string>
-    <string name="hint_group_name">Nazwa grupy</string>
-    <string name="hint_keyfile">plik klucza</string>
-    <string name="hint_length">długość</string>
-    <string name="hint_login_pass">Hasło</string>
-    <string name="hint_pass">hasło</string>
-    <string name="hint_title">nazwa</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">nazwa użytkownika</string>
-    <string name="install_from_market">Zainstaluj z Marketu</string>
-    <string name="install_from_website">Zainstaluj z WWW</string>
-    <string name="InvalidPassword">Nieprawidłowe hasło lub plik klucza.</string>
-    <string name="invalid_db_sig">Format bazy danych nierozpoznany.</string>
-    <string name="length">Długość</string>
-    <string name="list_size_title">Wielkość listy grup</string>
-    <string name="list_size_summary">Wielkość tekstu w liście grup</string>
-    <string name="loading_database">Wczytywanie bazy danych&#8230;</string>
-    <string name="lowercase">Małe litery</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Maska hasła</string>
-    <string name="maskpass_summary">Domyślnie ukrywa hasło</string>
-    <string name="menu_about">O programie</string>
-    <string name="menu_change_key">Zmień klucz główny</string>
-    <string name="menu_copy_pass">Kopiuj hasło</string>
-    <string name="menu_copy_user">Kopiuj nazwę użytkownika</string>
-    <string name="menu_create">Utwórz</string>
-    <string name="menu_app_settings">Ustawienia</string>
-    <string name="menu_db_settings">Ustawienia bazy danych</string>
-    <string name="menu_delete">Usuń</string>
-    <string name="menu_donate">Dotuj</string>
-    <string name="menu_edit">Edytuj</string>
-    <string name="menu_hide_password">Ukryj hasło</string>
-    <string name="menu_homepage">Przejdź do strony domowej</string>
-    <string name="menu_lock">Zablokuj bazę danych</string>
-    <string name="menu_open">Otwórz</string>
-    <string name="menu_rename">Zmień nazwę</string>
-    <string name="menu_search">Szukaj</string>
-    <string name="menu_url">Przejdź do URL</string>
-    <string name="minus">Minus</string>
-    <string name="never">Nigdy</string>
-    <string name="no_keys">Brak wpisów w bazie danych lub grupie.</string>
-    <string name="no_results">Brak wyników wyszukiwania</string>
-    <string name="no_url_handler">Brak obsługi dla tego urla.</string>
-    <string name="open_recent">Otwórz ostatnio używaną bazę danych (kliknij by otworzyć)</string>    
-    <string name="pass_filename">Nazwa pliku bazy danych KeePass</string>    
-    <string name="password_title">Wprowadź hasło bazy danych</string>
-    <string name="progress_create">Tworzenie nowej bazy danych&#8230;</string>
-    <string name="progress_title">Pracuję&#8230;</string>
-    <string name="remember_keyfile_summary">Zapamiętaj lokację plików kluczy</string>
-    <string name="remember_keyfile_title">Zapisz plik klucza</string>
-    <string name="remove_from_filelist">Usuń</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Root</string>
-    <string name="rounds">Złożoność szyfrowania</string>
-    <string name="rounds_explaination">Większa złożoność szyfrowania zapewnia dodatkowe zabezpieczenie przed atakiem brute force, ale może spowolnić wczytywanie i zapisywanie bazy danych.</string>
-    <string name="rounds_hint">złożoność</string>
-    <string name="saving_database">Zapisywanie bazy danych&#8230;</string>
-    <string name="space">Spacja</string>
-    <string name="search_label">Szukaj</string>
-    <string name="show_password">Pokaż hasło</string>
-    <string name="sort_name">Sortuj wg nazwy</string>
-    <string name="sort_db">Sortuj wg daty</string>
-    <string name="special">Znaki specjalne</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Podkreślenie</string>
-    <string name="unsupported_db_version">Nieobsługiwana wersja bazy danych.</string>
-    <string name="uppercase">Wielkie litery</string>
-    <string name="warning_read_only">Karta SD jest obecnie w trybie tylko do odczytu. Możesz nie być w stanie zapisać zmian w bazie danych.</string>
-    <string name="warning_unmounted">Karta SD nie jest obecnie zamontowana w urządzeniu. Możesz nie być w stanie wczytać lub utworzyć bazy danych.</string>
-    
-    <string-array name="clipboard_timeout_options">
-     <item>30 sekund</item>
-     <item>1 minuta</item>
-     <item>5 minut</item>
-     <item>Nigdy</item>
-    </string-array>
-    <string-array name="list_size_options">
-     <item>Mała</item>
-     <item>Średnia</item>
-     <item>Duża</item>
-    </string-array>
+  <string name="about_homepage">Strona domowa</string>
+  <string name="AboutText">Keepass2Android to Androidowa implementacja menadżera haseł KeePass.</string>
+  <string name="accept">Akceptuj</string>
+  <string name="add_entry">Dodaj wpis</string>
+  <string name="add_group">Dodaj grupę</string>
+  <string name="add_group_title">Dodaj grupę</string>
+  <string name="algorithm">Algorytm</string>
+  <string name="algorithm_colon">Algorytm</string>
+  <string name="app_timeout">Czas wygaśnięcia aplikacji</string>
+  <string name="app_timeout_summary">Czas do zablokowania bazy danych przy bezczynności aplikacji.</string>
+  <string name="application">Aplikacja</string>
+  <string name="application_settings">Ustawienia aplikacji</string>
+  <string name="brackets">Nawiasy</string>
+  <string name="browser_intall_text">Przeglądanie plików wymaga programu Open Intents File Manager, kliknij poniżej by go zainstalować. Ze względu na pewne, dziwne zachowania menadżera plików przeglądanie może nie działać poprawnie przy pierwszym użyciu.</string>
+  <string name="building_search_idx">Tworzenie indeksu wyszukiwania…</string>
+  <string name="cancel">Anuluj</string>
+  <string name="ClearClipboard">Schowek wyczyszczony.</string>
+  <string name="clipboard_timeout">Czas wygaśnięcia schowka</string>
+  <string name="clipboard_timeout_summary">Czas do wyczyszczenia zawartości schowka po kopiowaniu nazwy użytkownika i hasła</string>
+  <string name="copy_username">Kopiuj nazwę użytkownika do schowka</string>
+  <string name="copy_password">Kopiuj hasło do schowka</string>
+  <string name="creating_db_key">Tworzenie klucza bazy danych…</string>
+  <string name="current_group">Aktualna grupa</string>
+  <string name="current_group_root">Aktualna grupa: Root</string>
+  <string name="database">Baza danych</string>
+  <string name="decrypting_db">Deszyfracja bazy danych…</string>
+  <string name="decrypting_entry">Deszyfracja wpisu</string>
+  <string name="default_checkbox">Używaj tej bazy danych jako domyślnej</string>
+  <string name="digits">Cyfry</string>
+  <string name="enter_filename">Wprowadź nazwę pliku bazy danych</string>
+  <string name="entry_accessed">Dostęp do pliku</string>
+  <string name="entry_and_or">Wprowadź hasło i/lub plik klucza by uzyskać dostęp do bazy danych</string>
+  <string name="entry_cancel">Anuluj</string>
+  <string name="entry_comment">Komentarz</string>
+  <string name="entry_confpassword">Potwierdź hasło</string>
+  <string name="entry_created">Utworzono</string>
+  <string name="entry_expires">Wygasa</string>
+  <string name="entry_keyfile">Plik klucza (opcjonalnie)</string>
+  <string name="entry_modified">Zmodyfikowano</string>
+  <string name="entry_password">Hasło</string>
+  <string name="entry_save">Zapisz</string>
+  <string name="entry_title">Tytuł</string>
+  <string name="entry_user_name">Nazwa użytkownika</string>
+  <string name="error_arc4">Strumieniowe szyfrowanie ArcFour nie jest wspierane.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android nie potrafi obsłużyć tego uri.</string>
+  <string name="error_could_not_create_group">Błąd podczas tworzenia grupy.</string>
+  <string name="error_could_not_create_parent">Nie można utworzyć folderu nadrzędnego.</string>
+  <string name="error_database_exists">Plik o podanej nazwie już istnieje.</string>
+  <string name="error_database_settings">Błąd przy wykrywaniu ustawień bazy danych.</string>
+  <string name="error_failed_to_launch_link">Błąd przy uruchamianiu linku.</string>
+  <string name="error_filename_required">Wymagana nazwa pliku.</string>
+  <string name="error_file_not_create">Nie można utworzyć pliku</string>
+  <string name="error_invalid_db">Nieprawidłowa baza danych.</string>
+  <string name="error_invalid_path">Nieprawidłowa ścieżka dostępu.</string>
+  <string name="error_no_name">Wymagana nazwa.</string>
+  <string name="error_nopass">Wymagane hasło lub plik klucza.</string>
+  <string name="error_out_of_memory">Podczas parsowania bazy danych zabrakło pamięci. Być może ta baza danych jest za duża dla Twojego urządzenia.</string>
+  <string name="error_pass_gen_type">Przynajmniej jeden sposób generowania hasła musi być wybrany</string>
+  <string name="error_pass_match">Pasła nie pasują do siebie.</string>
+  <string name="error_rounds_not_number">Wartość musi być liczbą.</string>
+  <string name="error_rounds_too_large">Wartość za duża. Ustaw 2147483648.</string>
+  <string name="error_title_required">Wymagany tytuł.</string>
+  <string name="error_wrong_length">Wprowadź dodatnią liczbę całkowitą.</string>
+  <string name="FileNotFound">Plik nie istnieje.</string>
+  <string name="file_browser">Przeglądarka plików</string>
+  <string name="generate_password">Generuj hasło</string>
+  <string name="group">Grupa</string>
+  <string name="hint_comment">komentarz</string>
+  <string name="hint_conf_pass">potwierdź hasło</string>
+  <string name="hint_generated_password">hasło wygenerowane</string>
+  <string name="hint_group_name">Nazwa grupy</string>
+  <string name="hint_keyfile">plik klucza</string>
+  <string name="hint_length">długość</string>
+  <string name="hint_pass">hasło</string>
+  <string name="hint_login_pass">Hasło</string>
+  <string name="hint_title">nazwa</string>
+  <string name="hint_username">nazwa użytkownika</string>
+  <string name="install_from_market">Zainstaluj z Marketu</string>
+  <string name="install_from_website">Zainstaluj z WWW</string>
+  <string name="InvalidPassword">Nieprawidłowe hasło lub plik klucza.</string>
+  <string name="invalid_db_sig">Format bazy danych nierozpoznany.</string>
+  <string name="length">Długość</string>
+  <string name="list_size_title">Wielkość listy grup</string>
+  <string name="list_size_summary">Wielkość tekstu w liście grup</string>
+  <string name="loading_database">Wczytywanie bazy danych…</string>
+  <string name="lowercase">Małe litery</string>
+  <string name="maskpass_title">Maska hasła</string>
+  <string name="maskpass_summary">Domyślnie ukrywa hasło</string>
+  <string name="menu_about">O programie</string>
+  <string name="menu_change_key">Zmień klucz główny</string>
+  <string name="menu_copy_pass">Kopiuj hasło</string>
+  <string name="menu_copy_user">Kopiuj nazwę użytkownika</string>
+  <string name="menu_create">Utwórz</string>
+  <string name="menu_app_settings">Ustawienia</string>
+  <string name="menu_db_settings">Ustawienia bazy danych</string>
+  <string name="menu_delete">Usuń</string>
+  <string name="menu_donate">Dotuj</string>
+  <string name="menu_edit">Edytuj</string>
+  <string name="menu_hide_password">Ukryj hasło</string>
+  <string name="menu_homepage">Przejdź do strony domowej</string>
+  <string name="menu_lock">Zablokuj bazę danych</string>
+  <string name="menu_open">Otwórz</string>
+  <string name="menu_rename">Zmień nazwę</string>
+  <string name="menu_search">Szukaj</string>
+  <string name="menu_url">Przejdź do URL</string>
+  <string name="never">Nigdy</string>
+  <string name="no_keys">Brak wpisów w bazie danych lub grupie.</string>
+  <string name="no_results">Brak wyników wyszukiwania</string>
+  <string name="no_url_handler">Brak obsługi dla tego urla.</string>
+  <string name="open_recent">Otwórz ostatnio używaną bazę danych (kliknij by otworzyć)</string>
+  <string name="pass_filename">Nazwa pliku bazy danych KeePass</string>
+  <string name="password_title">Wprowadź hasło bazy danych</string>
+  <string name="progress_create">Tworzenie nowej bazy danych…</string>
+  <string name="progress_title">Pracuję…</string>
+  <string name="remember_keyfile_summary">Zapamiętaj lokację plików kluczy</string>
+  <string name="remember_keyfile_title">Zapisz plik klucza</string>
+  <string name="remove_from_filelist">Usuń</string>
+  <string name="rounds">Złożoność szyfrowania</string>
+  <string name="rounds_explaination">Większa złożoność szyfrowania zapewnia dodatkowe zabezpieczenie przed atakiem brute force, ale może spowolnić wczytywanie i zapisywanie bazy danych.</string>
+  <string name="rounds_hint">złożoność</string>
+  <string name="saving_database">Zapisywanie bazy danych…</string>
+  <string name="space">Spacja</string>
+  <string name="search_label">Szukaj</string>
+  <string name="show_password">Pokaż hasło</string>
+  <string name="sort_name">Sortuj wg nazwy</string>
+  <string name="sort_db">Sortuj wg daty</string>
+  <string name="special">Znaki specjalne</string>
+  <string name="underline">Podkreślenie</string>
+  <string name="unsupported_db_version">Nieobsługiwana wersja bazy danych.</string>
+  <string name="uppercase">Wielkie litery</string>
+  <string name="warning_read_only">Karta SD jest obecnie w trybie tylko do odczytu. Możesz nie być w stanie zapisać zmian w bazie danych.</string>
+  <string name="warning_unmounted">Karta SD nie jest obecnie zamontowana w urządzeniu. Możesz nie być w stanie wczytać lub utworzyć bazy danych.</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 sekund</item>
+    <item>1 minuta</item>
+    <item>5 minut</item>
+    <item>Nigdy</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Mała</item>
+    <item>Średnia</item>
+    <item>Duża</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>
+  </string-array>
 </resources>
-
diff --git a/src/keepass2android/Resources/values-pt-rBR/strings.xml b/src/keepass2android/Resources/values-pt-rBR/strings.xml
index aca55135..5bba9198 100644
--- a/src/keepass2android/Resources/values-pt-rBR/strings.xml
+++ b/src/keepass2android/Resources/values-pt-rBR/strings.xml
@@ -1,182 +1,158 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
-  
-  Portuguese translation by Carlos Schlyter.
-  
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <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="about_twitter">Twitter</string>    
-    <string name="accept">Aceitar</string>
-    <string name="add_entry">Adicionar entrada</string>
-    <string name="add_group">Adicionar grupo</string>
-    <string name="add_group_title">Adicionar Grupo</string>
-    <string name="algorithm">Algoritmo</string>
-    <string name="algorithm_colon">Algoritmo</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Tempo limite para o aplicativo</string>
-    <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="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&#8230;</string>
-    <string name="cancel">Cancelar</string>
-    <string name="ClearClipboard">Clipboard limpo.</string>
-    <string name="clipboard_timeout">Tempo limite para o clipboard</string>
-    <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="creating_db_key">Criando a chave do banco de dados&#8230;</string>
-    <string name="current_group">Grupo atual</string>
-    <string name="current_group_root">Grupo atual: Raiz</string>
-    <string name="database">Banco de Dados</string>
-    <string name="decrypting_db">Decifrando conteúdo do banco de dados&#8230;</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="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="ellipsis">\u2026</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_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_modified">Modificado</string>
-    <string name="entry_password">Senha</string>    
-    <string name="entry_save">Salvar</string>
-    <string name="entry_title">Nome</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Nome de usuário</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>
-    <string name="error_could_not_create_parent">Não foi possível criar o diretório pai.</string>
-    <string name="error_database_exists">Este arquivo já existe.</string>
-    <string name="error_database_settings">Falha ao determinar as configurações do banco de dados.</string>
-    <string name="error_failed_to_launch_link">Falha ao executar link.</string>
-    <string name="error_filename_required">É necessário um nome de arquivo.</string>
-    <string name="error_file_not_create">Não foi possível criar o arquivo</string>    
-    <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_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>
-    <string name="error_rounds_not_number">Número de rodadas deve ser um número.</string>
-    <string name="error_rounds_too_large">Número de rodadas é muito grande. Modificado para 2147483648.</string>
-    <string name="error_title_required">É necessário um título.</string>
-    <string name="error_wrong_length">Digite um número inteiro positivo no campo de tamanho</string>
-    <string name="FileNotFound">Arquivo não encontrado.</string>
-    <string name="file_browser">Localizador de Arquivos</string>
-    <string name="generate_password">Gerar Senha</string>
-    <string name="group">Grupo</string>
-    <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_length">tamanho</string>
-    <string name="hint_login_pass">Senha</string>
-    <string name="hint_pass">senha</string>
-    <string name="hint_title">nome</string>
-    <string name="hint_url">url</string>
-    <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="invalid_db_sig">O formato do banco de dados não foi reconhecido.</string>
-    <string name="length">Tamanho</string>
-    <string name="list_size_title">Tamanho da lista de grupos</string>
-    <string name="list_size_summary">Tamanho do texto na lista de grupos</string>
-    <string name="loading_database">Carregando banco de dados&#8230;</string>
-    <string name="lowercase">Letras minúsculas</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Esconder senha</string>
-    <string name="maskpass_summary">Esconder senha por padrão</string>
-    <string name="menu_about">Sobre</string>
-    <string name="menu_change_key">Modificar Senha Mestre</string>
-    <string name="menu_copy_pass">Copiar Senha</string>
-    <string name="menu_copy_user">Copiar Usuário</string>
-    <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_donate">Doaçoes</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>
-    <string name="menu_lock">Trancar banco de dados</string>
-    <string name="menu_open">Abrir</string>
-    <string name="menu_rename">Renomear</string>
-    <string name="menu_search">Procurar</string>
-    <string name="menu_url">Ir para URL</string>
-    <string name="minus">Menos</string>
-    <string name="never">Nunca</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>
-    <string name="open_recent">Abrir banco de dados recente (clique para abrir)</string>    
-    <string name="omitbackup_title">Não procurar entradas no backup ou na lixeira.</string>
-    <string name="omitbackup_summary">Omitir os grupos \'Backup\' e \'Lixeira\' dos resultados da busca</string>
-    <string name="pass_filename">Arquivo de banco de dados do KeePass</string>    
-    <string name="password_title">Digite a senha do banco de dados</string>
-    <string name="progress_create">Criando novo banco de dados&#8230;</string>
-    <string name="progress_title">Trabalhando&#8230;</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="remove_from_filelist">Remover</string>
-    <string name="rijndael">Rijndael (AES)</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="saving_database">Salvando banco de dados&#8230;</string>
-    <string name="space">Spaç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="special">Caracteres Especiais</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Underline</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-array name="clipboard_timeout_options">
-    	<item>30 segundos</item>
-    	<item>1 minuto</item>
-    	<item>5 minutos</item>
-    	<item>Nunca</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Pequeno</item>
-    	<item>Médio</item>
-    	<item>Grande</item>
-    </string-array>
+  <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="accept">Aceitar</string>
+  <string name="add_entry">Adicionar entrada</string>
+  <string name="add_group">Adicionar grupo</string>
+  <string name="add_group_title">Adicionar Grupo</string>
+  <string name="algorithm">Algoritmo</string>
+  <string name="algorithm_colon">Algoritmo</string>
+  <string name="app_timeout">Tempo limite para o aplicativo</string>
+  <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="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>
+  <string name="cancel">Cancelar</string>
+  <string name="ClearClipboard">Clipboard limpo.</string>
+  <string name="clipboard_timeout">Tempo limite para o clipboard</string>
+  <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="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>
+  <string name="database">Banco de Dados</string>
+  <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="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_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_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="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>
+  <string name="error_could_not_create_parent">Não foi possível criar o diretório pai.</string>
+  <string name="error_database_exists">Este arquivo já existe.</string>
+  <string name="error_database_settings">Falha ao determinar as configurações do banco de dados.</string>
+  <string name="error_failed_to_launch_link">Falha ao executar link.</string>
+  <string name="error_filename_required">É necessário um nome de arquivo.</string>
+  <string name="error_file_not_create">Não foi possível criar o arquivo</string>
+  <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_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>
+  <string name="error_rounds_not_number">Número de rodadas deve ser um número.</string>
+  <string name="error_rounds_too_large">Número de rodadas é muito grande. Modificado para 2147483648.</string>
+  <string name="error_title_required">É necessário um título.</string>
+  <string name="error_wrong_length">Digite um número inteiro positivo no campo de tamanho</string>
+  <string name="FileNotFound">Arquivo não encontrado.</string>
+  <string name="file_browser">Localizador de Arquivos</string>
+  <string name="generate_password">Gerar Senha</string>
+  <string name="group">Grupo</string>
+  <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_length">tamanho</string>
+  <string name="hint_pass">senha</string>
+  <string name="hint_login_pass">Senha</string>
+  <string name="hint_title">nome</string>
+  <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="invalid_db_sig">O formato do banco de dados não foi reconhecido.</string>
+  <string name="length">Tamanho</string>
+  <string name="list_size_title">Tamanho da lista de grupos</string>
+  <string name="list_size_summary">Tamanho do texto na lista de grupos</string>
+  <string name="loading_database">Carregando banco de dados…</string>
+  <string name="lowercase">Letras minúsculas</string>
+  <string name="maskpass_title">Esconder senha</string>
+  <string name="maskpass_summary">Esconder senha por padrão</string>
+  <string name="menu_about">Sobre</string>
+  <string name="menu_change_key">Modificar Senha Mestre</string>
+  <string name="menu_copy_pass">Copiar Senha</string>
+  <string name="menu_copy_user">Copiar Usuário</string>
+  <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_donate">Doaçoes</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>
+  <string name="menu_lock">Trancar banco de dados</string>
+  <string name="menu_open">Abrir</string>
+  <string name="menu_rename">Renomear</string>
+  <string name="menu_search">Procurar</string>
+  <string name="menu_url">Ir para URL</string>
+  <string name="minus">Menos</string>
+  <string name="never">Nunca</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>
+  <string name="open_recent">Abrir banco de dados recente (clique para abrir)</string>
+  <string name="omitbackup_title">Não procurar entradas no backup ou na lixeira.</string>
+  <string name="omitbackup_summary">Omitir os grupos \'Backup\' e \'Lixeira\' dos resultados da busca</string>
+  <string name="pass_filename">Arquivo de banco de dados do KeePass</string>
+  <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="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="saving_database">Salvando banco de dados…</string>
+  <string name="space">Spaç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="special">Caracteres Especiais</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-array name="clipboard_timeout_options">
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>5 minutos</item>
+    <item>Nunca</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Pequeno</item>
+    <item>Médio</item>
+    <item>Grande</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-ru/strings.xml b/src/keepass2android/Resources/values-ru/strings.xml
index 15a118b6..c082bd18 100644
--- a/src/keepass2android/Resources/values-ru/strings.xml
+++ b/src/keepass2android/Resources/values-ru/strings.xml
@@ -1,180 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Отзывы</string>    
-    <string name="about_homepage">Сайт</string>    
-    <string name="AboutText">Keepass2Android является Android-версией программы KeePass Password Safe</string>
-    <string name="about_twitter">Твиттер</string>    
-    <string name="accept">Принять</string>
-    <string name="add_entry">Новая запись</string>
-    <string name="add_group">Новая группа</string>
-    <string name="add_group_title">Новая группа</string>
-    <string name="algorithm">Алгоритм</string>
-    <string name="algorithm_colon">Алгоритм</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Блокировка базы</string>
-    <string name="app_timeout_summary">Задержка блокировки при бездействии</string>
-    <string name="application">Программа</string>
-    <string name="application_settings">Настройки Keepass2Android</string>
-    <string name="brackets">{[(Скобки)]}</string>
-    <string name="browser_intall_text">Для функции обзора необходим менеджер файлов &#8211; OI File Manager (альтернативы &#8211; Total Commander, NARF File Manager)</string>
-    <string name="building_search_idx">Индексирование&#8230;</string>
-    <string name="cancel">Отмена</string>
-    <string name="ClearClipboard">Буфер обмена очищен</string>
-    <string name="clipboard_timeout">Очистка буфера</string>
-    <string name="clipboard_timeout_summary">Задержка очистки после копирования в буфер</string>
-    <string name="copy_username">Логин &#8211; в буфер</string>
-    <string name="copy_password">Пароль &#8211; в буфер</string>
-    <string name="creating_db_key">Создание ключа&#8230;</string>
-    <string name="current_group">Текущая группа</string>
-    <string name="current_group_root">Текущая группа: корневая</string>
-    <string name="database">База</string>
-    <string name="decrypting_db">Расшифровка базы&#8230;</string>
-    <string name="decrypting_entry">Расшифровка записи&#8230;</string>
-    <string name="default_checkbox">Открыть при запуске</string>
-    <string name="digits">Цифры 0&#8230;9</string>
-    <string name="disclaimer_formal">Keepass2Android \nРазработчик Philipp Crocoll\n\nПрограмма предоставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ. Распространяется свободно по лицензии GPL v2 или новее</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Путь к базе KeePass</string>    
-    <string name="entry_accessed">Доступ</string>
-    <string name="entry_and_or">Введите пароль или выберите файл-ключ</string>    
-    <string name="entry_cancel">Отмена</string>
-    <string name="entry_comment">Комментарий</string>
-    <string name="entry_confpassword">Подтверждение</string>
-    <string name="entry_created">Создано</string>
-    <string name="entry_expires">Истекает</string>
-    <string name="entry_keyfile">файл-ключ</string>
-    <string name="entry_modified">Изменено</string>
-    <string name="entry_password">Пароль</string>    
-    <string name="entry_save">Сохранить</string>
-    <string name="entry_title">Название</string>
-    <string name="entry_url">Ссылка</string>
-    <string name="entry_user_name">Логин</string>
-    <string name="error_arc4">Потоковый шифр ARC4 не поддерживается</string>
-    <string name="error_can_not_handle_uri">Не удалось перейти по указанному адресу</string>
-    <string name="error_could_not_create_group">Не удалось создать группу</string>
-    <string name="error_could_not_create_parent">Не удалось создать родительскую папку</string>
-    <string name="error_database_exists">Такой файл уже существует</string>
-    <string name="error_database_settings">Неверные настройки базы</string>
-    <string name="error_failed_to_launch_link">Не удалось открыть ссылку</string>
-    <string name="error_filename_required">Введите имя файла</string>
-    <string name="error_file_not_create">Не удалось создать файл</string>    
-    <string name="error_invalid_db">Неверный формат базы</string>
-    <string name="error_invalid_path">Путь указан неверно</string>
-    <string name="error_no_name">Необходимо ввести имя файла</string>
-    <string name="error_nopass">Необходим пароль или файл-ключ</string>
-    <string name="error_out_of_memory">Недостаточно памяти для работы с базой</string>
-    <string name="error_pass_gen_type">Выберите один или несколько типов символов</string>
-    <string name="error_pass_match">Пароли не совпадают</string>
-    <string name="error_rounds_not_number">Введите число от 1 до 2147483648</string>
-    <string name="error_rounds_too_large">Предельное значение 2147483648</string>
-    <string name="error_title_required">Введите название</string>
-    <string name="error_wrong_length">Укажите длину больше нуля</string>
-    <string name="FileNotFound">Файл не найден</string>
-    <string name="file_browser">Обзор файлов</string>
-    <string name="generate_password">Создать пароль</string>
-    <string name="group">Группа</string>
-    <string name="hint_comment">комментарий</string>
-    <string name="hint_conf_pass">подтверждение</string>
-    <string name="hint_generated_password">созданный пароль</string>
-    <string name="hint_group_name">название</string>
-    <string name="hint_keyfile">файл-ключ</string>
-    <string name="hint_length">длина</string>
-    <string name="hint_pass">пароль</string>
-    <string name="hint_login_pass">пароль</string>
-    <string name="hint_title">название</string>
-    <string name="hint_url">ссылка</string>
-    <string name="hint_username">логин</string>
-    <string name="install_from_market">Google Play</string>
-    <string name="install_from_website">OpenIntents</string>
-    <string name="InvalidPassword">Неверный пароль или файл-ключ</string>
-    <string name="invalid_db_sig">Формат базы не определён</string>
-    <string name="length">Длина пароля</string>
-    <string name="list_size_title">Шрифт списка</string>
-    <string name="list_size_summary">Размер шрифта в списке групп и записей</string>
-    <string name="loading_database">Загрузка&#8230;</string>
-    <string name="lowercase">строчные</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Скрыть пароли</string>
-    <string name="maskpass_summary">Скрыть пароли маской *****</string>
-    <string name="menu_about">Сведения</string>
-    <string name="menu_change_key">Пароль базы</string>
-    <string name="menu_copy_pass">Пароль в буфер</string>
-    <string name="menu_copy_user">Логин в буфер</string>
-    <string name="menu_create">Создать</string>
-    <string name="menu_app_settings">Настройки</string>
-    <string name="menu_db_settings">Настройки базы KeePass</string>
-    <string name="menu_delete">Удалить</string>
-    <string name="menu_donate">Помочь</string>
-    <string name="menu_edit">Правка</string>
-    <string name="menu_hide_password">Скрыть</string>
-    <string name="menu_homepage">Сайт</string>
-    <string name="menu_lock">Блокировка</string>
-    <string name="menu_open">Открыть</string>
-    <string name="menu_rename">Новое имя</string>
-    <string name="menu_search">Поиск</string>
-    <string name="menu_url">Ссылка</string>
-    <string name="minus">-Дефис-</string>
-    <string name="never">Никогда</string>
-    <string name="no_keys">Нет записей в базе или группе</string>
-    <string name="no_results">Совпадения не найдены</string>
-    <string name="no_url_handler">Не удалось открыть ссылку</string>
-    <string name="open_recent">Недавно открытые</string>    
-    <string name="omitbackup_title">Искать в актуальных</string>
-    <string name="omitbackup_summary">Не искать в Резервировании и Корзине</string>
-    <string name="pass_filename">База KeePass</string>    
-    <string name="password_title">Изменение пароля базы</string>
-    <string name="progress_create">Создание базы&#8230;</string>
-    <string name="progress_title">Обработка</string>
-    <string name="remember_keyfile_summary">Запоминать пути к файлам-ключам</string>
-    <string name="remember_keyfile_title">Помнить про ключи</string>
-    <string name="remove_from_filelist">Убрать из списка</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">База</string>
-    <string name="rounds">Проходы шифрования</string>
-    <string name="rounds_explaination">Больше проходов &#8211; выше стойкость базы к подбору пароля, но медленнее открытие и сохранение</string>
-    <string name="rounds_hint">проходы</string>
-    <string name="saving_database">Сохранение базы&#8230;</string>
-    <string name="space">П р о б е л</string>
-    <string name="search_label">Поиск</string>
-    <string name="show_password">Показать</string>
-    <string name="sort_name">А&#8211;Я</string>
-    <string name="sort_db">Исходный</string>
-    <string name="special">$пеци@льные</string>
-    <string name="search_results">Результаты поиска</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">_Подчёркивание_</string>
-    <string name="unsupported_db_version">Неподдерживаемая версия базы</string>
-    <string name="uppercase">ЗАГЛАВНЫЕ</string>
-    <string name="warning_read_only">Запись на карту памяти невозможна. Изменения не будут сохранены</string>
-    <string name="warning_unmounted">Карта памяти не подключена. Работа с базой невозможна</string>
-    <string name="version_label">Версия</string>    
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30 сек.</item>
-    	<item>1 мин.</item>
-    	<item>5 мин.</item>
-    	<item>Никогда</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Мелкий</item>
-    	<item>Обычный</item>
-    	<item>Крупный</item>
-    </string-array>
-</resources>
\ No newline at end of file
+  <string name="about_feedback">Отзывы</string>
+  <string name="about_homepage">Сайт</string>
+  <string name="AboutText">Keepass2Android является Android-версией программы KeePass Password Safe</string>
+  <string name="accept">Принять</string>
+  <string name="add_entry">Новая запись</string>
+  <string name="add_group">Новая группа</string>
+  <string name="add_group_title">Новая группа</string>
+  <string name="algorithm">Алгоритм</string>
+  <string name="algorithm_colon">Алгоритм</string>
+  <string name="app_timeout">Блокировка базы</string>
+  <string name="app_timeout_summary">Задержка блокировки при бездействии</string>
+  <string name="application">Программа</string>
+  <string name="application_settings">Настройки Keepass2Android</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>
+  <string name="cancel">Отмена</string>
+  <string name="ClearClipboard">Буфер обмена очищен</string>
+  <string name="clipboard_timeout">Очистка буфера</string>
+  <string name="clipboard_timeout_summary">Задержка очистки после копирования в буфер</string>
+  <string name="copy_username">Логин – в буфер</string>
+  <string name="copy_password">Пароль – в буфер</string>
+  <string name="creating_db_key">Создание ключа…</string>
+  <string name="current_group">Текущая группа</string>
+  <string name="current_group_root">Текущая группа: корневая</string>
+  <string name="database">База</string>
+  <string name="decrypting_db">Расшифровка базы…</string>
+  <string name="decrypting_entry">Расшифровка записи…</string>
+  <string name="default_checkbox">Открыть при запуске</string>
+  <string name="digits">Цифры 0…9</string>
+  <string name="disclaimer_formal">Keepass2Android \nРазработчик Philipp Crocoll\n\nПрограмма предоставляется БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ. Распространяется свободно по лицензии GPL v2 или новее</string>
+  <string name="enter_filename">Путь к базе KeePass</string>
+  <string name="entry_accessed">Доступ</string>
+  <string name="entry_and_or">Введите пароль или выберите файл-ключ</string>
+  <string name="entry_cancel">Отмена</string>
+  <string name="entry_comment">Комментарий</string>
+  <string name="entry_confpassword">Подтверждение</string>
+  <string name="entry_created">Создано</string>
+  <string name="entry_expires">Истекает</string>
+  <string name="entry_keyfile">файл-ключ</string>
+  <string name="entry_modified">Изменено</string>
+  <string name="entry_password">Пароль</string>
+  <string name="entry_save">Сохранить</string>
+  <string name="entry_title">Название</string>
+  <string name="entry_url">Ссылка</string>
+  <string name="entry_user_name">Логин</string>
+  <string name="error_arc4">Потоковый шифр ARC4 не поддерживается</string>
+  <string name="error_can_not_handle_uri">Не удалось перейти по указанному адресу</string>
+  <string name="error_could_not_create_group">Не удалось создать группу</string>
+  <string name="error_could_not_create_parent">Не удалось создать родительскую папку</string>
+  <string name="error_database_exists">Такой файл уже существует</string>
+  <string name="error_database_settings">Неверные настройки базы</string>
+  <string name="error_failed_to_launch_link">Не удалось открыть ссылку</string>
+  <string name="error_filename_required">Введите имя файла</string>
+  <string name="error_file_not_create">Не удалось создать файл</string>
+  <string name="error_invalid_db">Неверный формат базы</string>
+  <string name="error_invalid_path">Путь указан неверно</string>
+  <string name="error_no_name">Необходимо ввести имя файла</string>
+  <string name="error_nopass">Необходим пароль или файл-ключ</string>
+  <string name="error_out_of_memory">Недостаточно памяти для работы с базой</string>
+  <string name="error_pass_gen_type">Выберите один или несколько типов символов</string>
+  <string name="error_pass_match">Пароли не совпадают</string>
+  <string name="error_rounds_not_number">Введите число от 1 до 2147483648</string>
+  <string name="error_rounds_too_large">Предельное значение 2147483648</string>
+  <string name="error_title_required">Введите название</string>
+  <string name="error_wrong_length">Укажите длину больше нуля</string>
+  <string name="FileNotFound">Файл не найден</string>
+  <string name="file_browser">Обзор файлов</string>
+  <string name="generate_password">Создать пароль</string>
+  <string name="group">Группа</string>
+  <string name="hint_comment">комментарий</string>
+  <string name="hint_conf_pass">подтверждение</string>
+  <string name="hint_generated_password">созданный пароль</string>
+  <string name="hint_group_name">название</string>
+  <string name="hint_keyfile">файл-ключ</string>
+  <string name="hint_length">длина</string>
+  <string name="hint_pass">пароль</string>
+  <string name="hint_login_pass">пароль</string>
+  <string name="hint_title">название</string>
+  <string name="hint_url">ссылка</string>
+  <string name="hint_username">логин</string>
+  <string name="install_from_market">Google Play</string>
+  <string name="install_from_website">OpenIntents</string>
+  <string name="InvalidPassword">Неверный пароль или файл-ключ</string>
+  <string name="invalid_db_sig">Формат базы не определён</string>
+  <string name="length">Длина пароля</string>
+  <string name="list_size_title">Шрифт списка</string>
+  <string name="list_size_summary">Размер шрифта в списке групп и записей</string>
+  <string name="loading_database">Загрузка…</string>
+  <string name="lowercase">строчные</string>
+  <string name="maskpass_title">Скрыть пароли</string>
+  <string name="maskpass_summary">Скрыть пароли маской *****</string>
+  <string name="menu_about">Сведения</string>
+  <string name="menu_change_key">Пароль базы</string>
+  <string name="menu_copy_pass">Пароль в буфер</string>
+  <string name="menu_copy_user">Логин в буфер</string>
+  <string name="menu_create">Создать</string>
+  <string name="menu_app_settings">Настройки</string>
+  <string name="menu_db_settings">Настройки базы KeePass</string>
+  <string name="menu_delete">Удалить</string>
+  <string name="menu_donate">Помочь</string>
+  <string name="menu_edit">Правка</string>
+  <string name="menu_hide_password">Скрыть</string>
+  <string name="menu_homepage">Сайт</string>
+  <string name="menu_lock">Блокировка</string>
+  <string name="menu_open">Открыть</string>
+  <string name="menu_rename">Новое имя</string>
+  <string name="menu_search">Поиск</string>
+  <string name="menu_url">Ссылка</string>
+  <string name="minus">-Дефис-</string>
+  <string name="never">Никогда</string>
+  <string name="no_keys">Нет записей в базе или группе</string>
+  <string name="no_results">Совпадения не найдены</string>
+  <string name="no_url_handler">Не удалось открыть ссылку</string>
+  <string name="open_recent">Недавно открытые</string>
+  <string name="omitbackup_title">Искать в актуальных</string>
+  <string name="omitbackup_summary">Не искать в Резервировании и Корзине</string>
+  <string name="pass_filename">База KeePass</string>
+  <string name="password_title">Изменение пароля базы</string>
+  <string name="progress_create">Создание базы…</string>
+  <string name="progress_title">Обработка</string>
+  <string name="remember_keyfile_summary">Запоминать пути к файлам-ключам</string>
+  <string name="remember_keyfile_title">Помнить про ключи</string>
+  <string name="remove_from_filelist">Убрать из списка</string>
+  <string name="root">База</string>
+  <string name="rounds">Проходы шифрования</string>
+  <string name="rounds_explaination">Больше проходов – выше стойкость базы к подбору пароля, но медленнее открытие и сохранение</string>
+  <string name="rounds_hint">проходы</string>
+  <string name="saving_database">Сохранение базы…</string>
+  <string name="space">П р о б е л</string>
+  <string name="search_label">Поиск</string>
+  <string name="show_password">Показать</string>
+  <string name="sort_name">А–Я</string>
+  <string name="sort_db">Исходный</string>
+  <string name="special">$пеци@льные</string>
+  <string name="search_results">Результаты поиска</string>
+  <string name="underline">_Подчёркивание_</string>
+  <string name="unsupported_db_version">Неподдерживаемая версия базы</string>
+  <string name="uppercase">ЗАГЛАВНЫЕ</string>
+  <string name="warning_read_only">Запись на карту памяти невозможна. Изменения не будут сохранены</string>
+  <string name="warning_unmounted">Карта памяти не подключена. Работа с базой невозможна</string>
+  <string name="version_label">Версия</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 сек.</item>
+    <item>1 мин.</item>
+    <item>5 мин.</item>
+    <item>Никогда</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Мелкий</item>
+    <item>Обычный</item>
+    <item>Крупный</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>
+  </string-array>
+</resources>
diff --git a/src/keepass2android/Resources/values-sk/strings.xml b/src/keepass2android/Resources/values-sk/strings.xml
index a2f63121..5a022b31 100644
--- a/src/keepass2android/Resources/values-sk/strings.xml
+++ b/src/keepass2android/Resources/values-sk/strings.xml
@@ -1,179 +1,157 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Spätná Väzba</string>    
-    <string name="about_homepage">Domovská Stránka</string>    
-    <string name="AboutText">Keepass2Android je Android verzia KeePass password manažéra.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Prijať</string>
-    <string name="add_entry">Pridať Záznam</string>
-    <string name="add_group">Pridať Skupinu</string>
-    <string name="add_group_title">Pridať Skupinu</string>
-    <string name="algorithm">Algoritmus</string>
-    <string name="algorithm_colon">Algoritmus</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Časový limit aplikácie.</string>
-    <string name="app_timeout_summary">Čas pred uzamknutím databázy, ak je aplikácia neaktívna.</string>
-    <string name="application">Applikácia</string>
-    <string name="application_settings">Nastavenia aplikácie</string>
-    <string name="brackets">Konzoly</string>
-    <string name="browser_intall_text">Prezeranie súborov vyžaduje otvorenie Správcu súborov, kliknite nižšie pre inštalovanie. Kôli chybám v správcovi súborov, prehľadávanie nemusí pracovať správne, ak prehľadávate prvý krát.</string>
-    <string name="building_search_idx">Spracúvam index hľadania&#8230;</string>
-    <string name="cancel">Zrušiť</string>
-    <string name="ClearClipboard">Schránka vyčistená.</string>
-    <string name="clipboard_timeout">Timeout Schránky</string>
-    <string name="clipboard_timeout_summary">Čas pred vyčistením schránky po skopírovaní mena alebo hesla</string>
-    <string name="copy_username">Meno skopírované do schránky</string>
-    <string name="copy_password">Heslo skopírované do schránky</string>
-    <string name="creating_db_key">Vytváram databázový kľúč&#8230;</string>
-    <string name="current_group">Aktuálna skupina</string>
-    <string name="current_group_root">Aktuálna skupina: Root</string>
-    <string name="database">Databáza</string>
-    <string name="decrypting_db">Dešifrujem obsah databázy&#8230;</string>
-    <string name="decrypting_entry">Dešifrujem záznam</string>
-    <string name="default_checkbox">Použiť toto ako predvolenú databázu</string>
-    <string name="digits">Číslice</string>
-    <string name="disclaimer_formal">Keepass2Android použitie Absolútne bez Záruky; Toto je free software, a môžete ho používať pod GPL ver. 2 alebo vyššie.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Vložte názov Databázy</string>    
-    <string name="entry_accessed">Pristupované</string>
-    <string name="entry_and_or">Vložte heslo a / alebo keyfile pre odomknutie databázy</string>    
-    <string name="entry_cancel">Zrušiť</string>
-    <string name="entry_comment">Poznámky</string>
-    <string name="entry_confpassword">Potvrdiť heslo</string>    
-    <string name="entry_created">Vytvorené</string>
-    <string name="entry_expires">Expirácia</string>
-    <string name="entry_keyfile">Súbor Keyfile (voliteľné)</string>
-    <string name="entry_modified">Upravené</string>
-    <string name="entry_password">Heslo</string>    
-    <string name="entry_save">Uložiť</string>
-    <string name="entry_title">Meno</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Užívateľské meno</string>
-    <string name="error_arc4">ArcFour stream šifra nieje podporovaná.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android nevie použiť túto uri.</string>
-    <string name="error_could_not_create_group">Chyba vytvárania Skupiny.</string>
-    <string name="error_could_not_create_parent">Neviem vytvoriť nadradený adresár.</string>
-    <string name="error_database_exists">Tento súbor už existuje.</string>
-    <string name="error_database_settings">Nedajú sa zistiť nastavenia databázy.</string>
-    <string name="error_failed_to_launch_link">Nedá sa spustiť odkaz.</string>
-    <string name="error_filename_required">Vyžaduje sa názov súboru.</string>
-    <string name="error_file_not_create">Neviem vytvoriť súbor</string>    
-    <string name="error_invalid_db">Chybná databáza.</string>
-    <string name="error_invalid_path">Chybná cesta.</string>
-    <string name="error_no_name">Vyžaduje sa meno.</string>
-    <string name="error_nopass">Vyžaduje sa heslo, alebo súbor keyfile.</string>
-    <string name="error_out_of_memory">Telefón vyčerpal pamäť pri analýze databázy. Možno je to príliš na Váš telefón.</string>
-    <string name="error_pass_gen_type">Musí byť vybraý najmenej jeden typ generovania hesla</string>
-    <string name="error_pass_match">Heslá sa nezhodujú.</string>
-    <string name="error_rounds_not_number">Opakovanie musí byť číslo.</string>
-    <string name="error_rounds_too_large">Príliš veľa opakovaní.  Nastavujem na 2147483648.</string>
-    <string name="error_title_required">Vyžaduje sa názov.</string>
-    <string name="error_wrong_length">Zadajte celé kladné číslo na dĺžku poľa</string>
-    <string name="FileNotFound">Súbor nenájdený.</string>
-    <string name="file_browser">Správca Súborov</string>
-    <string name="generate_password">Generovať Heslo</string>
-    <string name="group">Skupina</string>
-    <string name="hint_comment">poznámka</string>
-    <string name="hint_conf_pass">potvrdiť heslo</string>
-    <string name="hint_generated_password">generované heslo</string>
-    <string name="hint_group_name">Názov Skupiny</string>
-    <string name="hint_keyfile">súbor keyfile</string>
-    <string name="hint_length">dĺžka</string>
-    <string name="hint_login_pass">Heslo</string>
-    <string name="hint_pass">heslo</string>
-    <string name="hint_title">meno</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">užívateľské meno</string>
-    <string name="install_from_market">Inštalovať z Marketu</string>
-    <string name="install_from_website">Inštalovať z WEBu</string>
-    <string name="InvalidPassword">Chybné heslo, alebo súbor keyfile.</string>
-    <string name="invalid_db_sig">Formát Databázy nerozpoznaný.</string>
-    <string name="length">Dĺžka</string>
-    <string name="list_size_title">Dĺžka zoznamu skupiny</string>
-    <string name="list_size_summary">Veľkosť textu v zozname skupín</string>
-    <string name="loading_database">Načítavam Databázu&#8230;</string>
-    <string name="lowercase">Malé písmená</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Skryť heslo</string>
-    <string name="maskpass_summary">Skryť heslá štandardne</string>
-    <string name="menu_about">O Programe</string>
-    <string name="menu_change_key">Zmeniť hlavný Kľúč</string>
-    <string name="menu_copy_pass">Kopíruj Heslo</string>
-    <string name="menu_copy_user">Kopíruj Užívateľa</string>
-    <string name="menu_create">Vytvoriť</string>
-    <string name="menu_app_settings">Nastavenia</string>
-    <string name="menu_db_settings">Nastavenia Databázy</string>
-    <string name="menu_delete">Zmazať</string>
-    <string name="menu_donate">Darovať</string>
-    <string name="menu_edit">Upraviť</string>
-    <string name="menu_hide_password">Skryť Heslo</string>
-    <string name="menu_homepage">Ísť na domovskú stránku</string>
-    <string name="menu_lock">Zamknúť Databázu</string>
-    <string name="menu_open">Otvoriť</string>
-    <string name="menu_rename">Premenovať</string>
-    <string name="menu_search">Hľadať</string>
-    <string name="menu_url">Ísť na URL</string>
-    <string name="minus">Mínus</string>
-    <string name="never">Nikdy</string>
-    <string name="no_keys">Žiadne záznamy v Databáze.</string>
-    <string name="no_results">Žiadne výsledky hľadania</string>
-    <string name="no_url_handler">Žiaden manažér pre url.</string>
-    <string name="open_recent">Otvoriť poslednú databázu (kliknutím otvoriť)</string>    
-    <string name="omitbackup_title">Neprehľadávať položky</string>
-    <string name="omitbackup_summary">Vynechať skupinu \'Backup\' a Recycle Bin z výsledkov hľadania</string>
-    <string name="pass_filename">KeePass databázový súbor</string>    
-    <string name="password_title">Vložte heslo databázy</string>
-    <string name="progress_create">Vytváram novú databázu&#8230;</string>
-    <string name="progress_title">Pracujem&#8230;</string>
-    <string name="remember_keyfile_summary">Zapamätať si umiestnenie keyfile</string>
-    <string name="remember_keyfile_title">Uložiť keyfile</string>
-    <string name="remove_from_filelist">Odstrániť</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Root</string>
-    <string name="rounds">Šifrovacie opakovania</string>
-    <string name="rounds_explaination">Vyššie opakovania šifrovania dávajú vyššiu ochranu proti útokom hrubou silou, ale môžu spomaliť načítavanie a ukladanie.</string>
-    <string name="rounds_hint">opakovania</string>
-    <string name="saving_database">Ukladám databázu&#8230;</string>
-    <string name="space">Miesto</string>
-    <string name="search_label">Hľadať</string>
-    <string name="show_password">Zobraziť heslo</string>
-    <string name="sort_name">Zoradiť podľa mena</string>
-    <string name="sort_db">DB zoradenie poradia</string>
-    <string name="special">Špeciálne</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Podčiarknuté</string>
-    <string name="unsupported_db_version">Nepodporovaná verzia databázy.</string>
-    <string name="uppercase">Veľké písmená</string>
-    <string name="warning_read_only">Vaša SD karta je momentálne iba na čítanie. Nemôžete uložiť zmeny v databáze.</string>
-    <string name="warning_unmounted">Vaša SD karta nie je momentálne pripojená k zariadeniu. Nemôžete načítať, alebo vytvoriť databázu.</string>
-    <string name="version_label">Version</string>    
-    
-    <string-array name="clipboard_timeout_options">
-      <item>30 sekúnd</item>
-     <item>1 minúta</item>
-    	<item>5 minút</item>
-    	<item>Nikdy</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Malé</item>
-    	<item>Stredné</item>
-    	<item>Veľké</item>
-    </string-array>
+  <string name="about_feedback">Spätná Väzba</string>
+  <string name="about_homepage">Domovská Stránka</string>
+  <string name="AboutText">Keepass2Android je Android verzia KeePass password manažéra.</string>
+  <string name="accept">Prijať</string>
+  <string name="add_entry">Pridať Záznam</string>
+  <string name="add_group">Pridať Skupinu</string>
+  <string name="add_group_title">Pridať Skupinu</string>
+  <string name="algorithm">Algoritmus</string>
+  <string name="algorithm_colon">Algoritmus</string>
+  <string name="app_timeout">Časový limit aplikácie.</string>
+  <string name="app_timeout_summary">Čas pred uzamknutím databázy, ak je aplikácia neaktívna.</string>
+  <string name="application">Applikácia</string>
+  <string name="application_settings">Nastavenia aplikácie</string>
+  <string name="brackets">Konzoly</string>
+  <string name="browser_intall_text">Prezeranie súborov vyžaduje otvorenie Správcu súborov, kliknite nižšie pre inštalovanie. Kôli chybám v správcovi súborov, prehľadávanie nemusí pracovať správne, ak prehľadávate prvý krát.</string>
+  <string name="building_search_idx">Spracúvam index hľadania…</string>
+  <string name="cancel">Zrušiť</string>
+  <string name="ClearClipboard">Schránka vyčistená.</string>
+  <string name="clipboard_timeout">Timeout Schránky</string>
+  <string name="clipboard_timeout_summary">Čas pred vyčistením schránky po skopírovaní mena alebo hesla</string>
+  <string name="copy_username">Meno skopírované do schránky</string>
+  <string name="copy_password">Heslo skopírované do schránky</string>
+  <string name="creating_db_key">Vytváram databázový kľúč…</string>
+  <string name="current_group">Aktuálna skupina</string>
+  <string name="current_group_root">Aktuálna skupina: Root</string>
+  <string name="database">Databáza</string>
+  <string name="decrypting_db">Dešifrujem obsah databázy…</string>
+  <string name="decrypting_entry">Dešifrujem záznam</string>
+  <string name="default_checkbox">Použiť toto ako predvolenú databázu</string>
+  <string name="digits">Číslice</string>
+  <string name="disclaimer_formal">Keepass2Android použitie Absolútne bez Záruky; Toto je free software, a môžete ho používať pod GPL ver. 2 alebo vyššie.</string>
+  <string name="enter_filename">Vložte názov Databázy</string>
+  <string name="entry_accessed">Pristupované</string>
+  <string name="entry_and_or">Vložte heslo a / alebo keyfile pre odomknutie databázy</string>
+  <string name="entry_cancel">Zrušiť</string>
+  <string name="entry_comment">Poznámky</string>
+  <string name="entry_confpassword">Potvrdiť heslo</string>
+  <string name="entry_created">Vytvorené</string>
+  <string name="entry_expires">Expirácia</string>
+  <string name="entry_keyfile">Súbor Keyfile (voliteľné)</string>
+  <string name="entry_modified">Upravené</string>
+  <string name="entry_password">Heslo</string>
+  <string name="entry_save">Uložiť</string>
+  <string name="entry_title">Meno</string>
+  <string name="entry_user_name">Užívateľské meno</string>
+  <string name="error_arc4">ArcFour stream šifra nieje podporovaná.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android nevie použiť túto uri.</string>
+  <string name="error_could_not_create_group">Chyba vytvárania Skupiny.</string>
+  <string name="error_could_not_create_parent">Neviem vytvoriť nadradený adresár.</string>
+  <string name="error_database_exists">Tento súbor už existuje.</string>
+  <string name="error_database_settings">Nedajú sa zistiť nastavenia databázy.</string>
+  <string name="error_failed_to_launch_link">Nedá sa spustiť odkaz.</string>
+  <string name="error_filename_required">Vyžaduje sa názov súboru.</string>
+  <string name="error_file_not_create">Neviem vytvoriť súbor</string>
+  <string name="error_invalid_db">Chybná databáza.</string>
+  <string name="error_invalid_path">Chybná cesta.</string>
+  <string name="error_no_name">Vyžaduje sa meno.</string>
+  <string name="error_nopass">Vyžaduje sa heslo, alebo súbor keyfile.</string>
+  <string name="error_out_of_memory">Telefón vyčerpal pamäť pri analýze databázy. Možno je to príliš na Váš telefón.</string>
+  <string name="error_pass_gen_type">Musí byť vybraý najmenej jeden typ generovania hesla</string>
+  <string name="error_pass_match">Heslá sa nezhodujú.</string>
+  <string name="error_rounds_not_number">Opakovanie musí byť číslo.</string>
+  <string name="error_rounds_too_large">Príliš veľa opakovaní.  Nastavujem na 2147483648.</string>
+  <string name="error_title_required">Vyžaduje sa názov.</string>
+  <string name="error_wrong_length">Zadajte celé kladné číslo na dĺžku poľa</string>
+  <string name="FileNotFound">Súbor nenájdený.</string>
+  <string name="file_browser">Správca Súborov</string>
+  <string name="generate_password">Generovať Heslo</string>
+  <string name="group">Skupina</string>
+  <string name="hint_comment">poznámka</string>
+  <string name="hint_conf_pass">potvrdiť heslo</string>
+  <string name="hint_generated_password">generované heslo</string>
+  <string name="hint_group_name">Názov Skupiny</string>
+  <string name="hint_keyfile">súbor keyfile</string>
+  <string name="hint_length">dĺžka</string>
+  <string name="hint_pass">heslo</string>
+  <string name="hint_login_pass">Heslo</string>
+  <string name="hint_title">meno</string>
+  <string name="hint_username">užívateľské meno</string>
+  <string name="install_from_market">Inštalovať z Marketu</string>
+  <string name="install_from_website">Inštalovať z WEBu</string>
+  <string name="InvalidPassword">Chybné heslo, alebo súbor keyfile.</string>
+  <string name="invalid_db_sig">Formát Databázy nerozpoznaný.</string>
+  <string name="length">Dĺžka</string>
+  <string name="list_size_title">Dĺžka zoznamu skupiny</string>
+  <string name="list_size_summary">Veľkosť textu v zozname skupín</string>
+  <string name="loading_database">Načítavam Databázu…</string>
+  <string name="lowercase">Malé písmená</string>
+  <string name="maskpass_title">Skryť heslo</string>
+  <string name="maskpass_summary">Skryť heslá štandardne</string>
+  <string name="menu_about">O Programe</string>
+  <string name="menu_change_key">Zmeniť hlavný Kľúč</string>
+  <string name="menu_copy_pass">Kopíruj Heslo</string>
+  <string name="menu_copy_user">Kopíruj Užívateľa</string>
+  <string name="menu_create">Vytvoriť</string>
+  <string name="menu_app_settings">Nastavenia</string>
+  <string name="menu_db_settings">Nastavenia Databázy</string>
+  <string name="menu_delete">Zmazať</string>
+  <string name="menu_donate">Darovať</string>
+  <string name="menu_edit">Upraviť</string>
+  <string name="menu_hide_password">Skryť Heslo</string>
+  <string name="menu_homepage">Ísť na domovskú stránku</string>
+  <string name="menu_lock">Zamknúť Databázu</string>
+  <string name="menu_open">Otvoriť</string>
+  <string name="menu_rename">Premenovať</string>
+  <string name="menu_search">Hľadať</string>
+  <string name="menu_url">Ísť na URL</string>
+  <string name="minus">Mínus</string>
+  <string name="never">Nikdy</string>
+  <string name="no_keys">Žiadne záznamy v Databáze.</string>
+  <string name="no_results">Žiadne výsledky hľadania</string>
+  <string name="no_url_handler">Žiaden manažér pre url.</string>
+  <string name="open_recent">Otvoriť poslednú databázu (kliknutím otvoriť)</string>
+  <string name="omitbackup_title">Neprehľadávať položky</string>
+  <string name="omitbackup_summary">Vynechať skupinu \'Backup\' a Recycle Bin z výsledkov hľadania</string>
+  <string name="pass_filename">KeePass databázový súbor</string>
+  <string name="password_title">Vložte heslo databázy</string>
+  <string name="progress_create">Vytváram novú databázu…</string>
+  <string name="progress_title">Pracujem…</string>
+  <string name="remember_keyfile_summary">Zapamätať si umiestnenie keyfile</string>
+  <string name="remember_keyfile_title">Uložiť keyfile</string>
+  <string name="remove_from_filelist">Odstrániť</string>
+  <string name="rounds">Šifrovacie opakovania</string>
+  <string name="rounds_explaination">Vyššie opakovania šifrovania dávajú vyššiu ochranu proti útokom hrubou silou, ale môžu spomaliť načítavanie a ukladanie.</string>
+  <string name="rounds_hint">opakovania</string>
+  <string name="saving_database">Ukladám databázu…</string>
+  <string name="space">Miesto</string>
+  <string name="search_label">Hľadať</string>
+  <string name="show_password">Zobraziť heslo</string>
+  <string name="sort_name">Zoradiť podľa mena</string>
+  <string name="sort_db">DB zoradenie poradia</string>
+  <string name="special">Špeciálne</string>
+  <string name="underline">Podčiarknuté</string>
+  <string name="unsupported_db_version">Nepodporovaná verzia databázy.</string>
+  <string name="uppercase">Veľké písmená</string>
+  <string name="warning_read_only">Vaša SD karta je momentálne iba na čítanie. Nemôžete uložiť zmeny v databáze.</string>
+  <string name="warning_unmounted">Vaša SD karta nie je momentálne pripojená k zariadeniu. Nemôžete načítať, alebo vytvoriť databázu.</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 sekúnd</item>
+    <item>1 minúta</item>
+    <item>5 minút</item>
+    <item>Nikdy</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Malé</item>
+    <item>Stredné</item>
+    <item>Veľké</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-uk/strings.xml b/src/keepass2android/Resources/values-uk/strings.xml
index 4684b56c..78b48ae9 100644
--- a/src/keepass2android/Resources/values-uk/strings.xml
+++ b/src/keepass2android/Resources/values-uk/strings.xml
@@ -1,179 +1,157 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">Зворотний зв’язок</string>    
-    <string name="about_homepage">Домашня сторінка</string>    
-    <string name="AboutText">Keepass2Android є Android версією менеджера паролів KeePass.</string>
-    <string name="about_twitter">Twitter</string>    
-    <string name="accept">Прийняти</string>
-    <string name="add_entry">Додати запис</string>
-    <string name="add_group">Додати групу</string>
-    <string name="add_group_title">Додати групу</string>
-    <string name="algorithm">Алгоритм</string>
-    <string name="algorithm_colon">Алгоритм</string>    
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">Тайм-аут програми</string>
-    <string name="app_timeout_summary">Час перед закриттям бази даних, коли програма є неактивною.</string>
-    <string name="application">Програма</string>
-    <string name="application_settings">Налаштування програми</string>
-    <string name="brackets">Дужки</string>
-    <string name="browser_intall_text">Для перегляду файла необхідно Open Intents File Manager, натисніть нижче для його інсталяції. У зв’язку з деякими недоробками у менеджері файлів перегляд може працювати некоректно при запуску перший раз.</string>
-    <string name="building_search_idx">Будується пошуковий індекс&#8230;</string>
-    <string name="cancel">Відміна</string>
-    <string name="ClearClipboard">Буфер обміну очищено.</string>
-    <string name="clipboard_timeout">Тайм-аут буфера обміну</string>
-    <string name="clipboard_timeout_summary">Час через який буде очищено буфер обміну після копіювання ім’я користувача чи пароля</string>
-    <string name="copy_username">Копіювати ім’я користувача до буфера обміну</string>
-    <string name="copy_password">Копіювати пароль до буфера обміну</string>
-    <string name="creating_db_key">Створення ключа бази даних&#8230;</string>
-    <string name="current_group">Поточна група</string>
-    <string name="current_group_root">Поточна група: корінь</string>
-    <string name="database">База даних</string>
-    <string name="decrypting_db">Розшифрування змісту бази даних&#8230;</string>
-    <string name="decrypting_entry">Розшифрування запису</string>
-    <string name="default_checkbox">Використовувати як мою типову базу даних</string>
-    <string name="digits">Цифри</string>
-    <string name="disclaimer_formal">Keepass2Android comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 2 or later.</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">Введіть ім’я бази даних</string>    
-    <string name="entry_accessed">Доступ</string>
-    <string name="entry_and_or">Введіть пароль і/або файл ключа для відкриття бази даних</string>    
-    <string name="entry_cancel">Відміна</string>
-    <string name="entry_comment">Коментар</string>
-    <string name="entry_confpassword">Підтвердження паролю</string>    
-    <string name="entry_created">Створено</string>
-    <string name="entry_expires">Закінчується</string>
-    <string name="entry_keyfile">Файл ключа (необов’язково)</string>
-    <string name="entry_modified">Змінено</string>
-    <string name="entry_password">Пароль</string>    
-    <string name="entry_save">Зберегти</string>
-    <string name="entry_title">Ім’я</string>
-    <string name="entry_url">URL</string>
-    <string name="entry_user_name">Ім’я користувача</string>
-    <string name="error_arc4">Потокове шифрування ArcFour не підтримується.</string>
-    <string name="error_can_not_handle_uri">Keepass2Android не може опрацювати цю адресу.</string>
-    <string name="error_could_not_create_group">Помилка створення групи.</string>
-    <string name="error_could_not_create_parent">Не вдалося створити батьківський каталог.</string>
-    <string name="error_database_exists">Файл вже існує.</string>
-    <string name="error_database_settings">Не вдалося визначити параметри бази даних.</string>
-    <string name="error_failed_to_launch_link">Не вдалося відкрити посилання.</string>
-    <string name="error_filename_required">Необхідно ім’я файла.</string>
-    <string name="error_file_not_create">Не можливо створити файл</string>    
-    <string name="error_invalid_db">Невірна база даних.</string>
-    <string name="error_invalid_path">Невірний шлях.</string>
-    <string name="error_no_name">Потрібне ім’я.</string>
-    <string name="error_nopass">Необхідно пароль або файл ключа.</string>
-    <string name="error_out_of_memory">Телефону не вистачило пам’яті при аналізі вашої бази даних. Можливо база надто велика для вашог телефона.</string>
-    <string name="error_pass_gen_type">Принаймні один тип генерації пароля необхідно вибрати.</string>
-    <string name="error_pass_match">Паролі не співпадають.</string>
-    <string name="error_rounds_not_number">Кількість циклів має бути числом.</string>
-    <string name="error_rounds_too_large">Надто багато циклів.  Установлено 2147483648.</string>
-    <string name="error_title_required">Необхідно вказати заголовок.</string>
-    <string name="error_wrong_length">Введіть ціле число на усю довжину поля</string>
-    <string name="FileNotFound">Файл не знайдено.</string>
-    <string name="file_browser">Перегляд файлів</string>
-    <string name="generate_password">Згенерувати пароль</string>
-    <string name="group">Група</string>
-    <string name="hint_comment">коментар</string>
-    <string name="hint_conf_pass">підтвердження пароля</string>
-    <string name="hint_generated_password">згенерований пароль</string>
-    <string name="hint_group_name">Ім’я групи</string>
-    <string name="hint_keyfile">файл-ключ</string>
-    <string name="hint_length">довжина</string>
-    <string name="hint_login_pass">Пароль</string>
-    <string name="hint_pass">пароль</string>
-    <string name="hint_title">ім’я</string>
-    <string name="hint_url">url</string>
-    <string name="hint_username">ім’я користувача</string>
-    <string name="install_from_market">Інсталювати із Google Play</string>
-    <string name="install_from_website">Інсталювати із Інтернету</string>
-    <string name="InvalidPassword">Невірний пароль або файл ключа.</string>
-    <string name="invalid_db_sig">Формат бази даних не розпізнано.</string>
-    <string name="length">Довжина</string>
-    <string name="list_size_title">Розмір списку груп</string>
-    <string name="list_size_summary">Розмір тексту у списку груп</string>
-    <string name="loading_database">Завантаження бази даних&#8230;</string>
-    <string name="lowercase">Нижній регістр</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">Маска пароля</string>
-    <string name="maskpass_summary">Приховати паролі за замовчуванням</string>
-    <string name="menu_about">Про</string>
-    <string name="menu_change_key">Змінити головний ключ</string>
-    <string name="menu_copy_pass">Копіювати пароль</string>
-    <string name="menu_copy_user">Копіювати користувача</string>
-    <string name="menu_create">Створити</string>
-    <string name="menu_app_settings">Налаштування</string>
-    <string name="menu_db_settings">Налаштування бази даних</string>
-    <string name="menu_delete">Вилучити</string>
-    <string name="menu_donate">Пожертвувати</string>
-    <string name="menu_edit">Редагувати</string>
-    <string name="menu_hide_password">Приховати пароль</string>
-    <string name="menu_homepage">Перейти на домашню сторінку</string>
-    <string name="menu_lock">Блокувати базу даних</string>
-    <string name="menu_open">Відкрити</string>
-    <string name="menu_rename">Перейменувати</string>
-    <string name="menu_search">Пошук</string>
-    <string name="menu_url">Перейти по посиланню</string>
-    <string name="minus">Minus</string>
-    <string name="never">Ніколи</string>
-    <string name="no_keys">Нема записів у базі даних або у групі.</string>
-    <string name="no_results">Нічого не знайдено.</string>
-    <string name="no_url_handler">Нема програми для опрацювання цього посилання.</string>
-    <string name="open_recent">Відкрити останню базу даних (натисніть для відкриття)</string>    
-    <string name="omitbackup_title">Не шукати записів з резервного копіювання та кошиків</string>
-    <string name="omitbackup_summary">Пропустити групу \'Резервна копія\' та Кошик серед результатів пошуку</string>
-    <string name="pass_filename">ім’я бази даних KeePass</string>    
-    <string name="password_title">Введіть пароль бази даних</string>
-    <string name="progress_create">Створення нової бази даних&#8230;</string>
-    <string name="progress_title">Працює&#8230;</string>
-    <string name="remember_keyfile_summary">Запам’ятати розташування файла ключа</string>
-    <string name="remember_keyfile_title">Збережіть файл ключа</string>
-    <string name="remove_from_filelist">Вилучити</string>
-    <string name="rijndael">Rijndael (AES)</string>
-    <string name="root">Корінь</string>
-    <string name="rounds">Циклів шифрування</string>
-    <string name="rounds_explaination">Велика кількість циклів шифрування забезпечує додатковий захист від грубих атак, але може дійсно уповільнити завантаження та захист.</string>
-    <string name="rounds_hint">цикли</string>
-    <string name="saving_database">Збереження бази даних&#8230;</string>
-    <string name="space">Пропуск</string>
-    <string name="search_label">Пошук</string>
-    <string name="show_password">Показати пароль</string>
-    <string name="sort_name">Упорядкувати за ім’ям</string>
-    <string name="sort_db">Упорядкування БД</string>
-    <string name="special">Спеціальний</string>
-    <string name="twofish">Twofish</string>
-    <string name="underline">Підкреслення</string>
-    <string name="unsupported_db_version">Непідтримувана версія бази даних.</string>
-    <string name="uppercase">Верхній регістр</string>
-    <string name="warning_read_only">Ваша карта пам’яті зараз у режимі тільки для читання. Ви не зможете зберегти зміни до вашої бази даних.</string>
-    <string name="warning_unmounted">Ваша карта пам’яті зараз не змонтована на телефоні. Ви не зможете завантажити або створити базу даних.</string>
-    <string name="version_label">Версія</string>    
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30 секунд</item>
-    	<item>1 хвилина</item>
-    	<item>5 хвилин</item>
-    	<item>Ніколи</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>Малий</item>
-    	<item>Середній</item>
-    	<item>Великий</item>
-    </string-array>
+  <string name="about_feedback">Зворотний зв’язок</string>
+  <string name="about_homepage">Домашня сторінка</string>
+  <string name="AboutText">Keepass2Android є Android версією менеджера паролів KeePass.</string>
+  <string name="accept">Прийняти</string>
+  <string name="add_entry">Додати запис</string>
+  <string name="add_group">Додати групу</string>
+  <string name="add_group_title">Додати групу</string>
+  <string name="algorithm">Алгоритм</string>
+  <string name="algorithm_colon">Алгоритм</string>
+  <string name="app_timeout">Тайм-аут програми</string>
+  <string name="app_timeout_summary">Час перед закриттям бази даних, коли програма є неактивною.</string>
+  <string name="application">Програма</string>
+  <string name="application_settings">Налаштування програми</string>
+  <string name="brackets">Дужки</string>
+  <string name="browser_intall_text">Для перегляду файла необхідно Open Intents File Manager, натисніть нижче для його інсталяції. У зв’язку з деякими недоробками у менеджері файлів перегляд може працювати некоректно при запуску перший раз.</string>
+  <string name="building_search_idx">Будується пошуковий індекс…</string>
+  <string name="cancel">Відміна</string>
+  <string name="ClearClipboard">Буфер обміну очищено.</string>
+  <string name="clipboard_timeout">Тайм-аут буфера обміну</string>
+  <string name="clipboard_timeout_summary">Час через який буде очищено буфер обміну після копіювання ім’я користувача чи пароля</string>
+  <string name="copy_username">Копіювати ім’я користувача до буфера обміну</string>
+  <string name="copy_password">Копіювати пароль до буфера обміну</string>
+  <string name="creating_db_key">Створення ключа бази даних…</string>
+  <string name="current_group">Поточна група</string>
+  <string name="current_group_root">Поточна група: корінь</string>
+  <string name="database">База даних</string>
+  <string name="decrypting_db">Розшифрування змісту бази даних…</string>
+  <string name="decrypting_entry">Розшифрування запису</string>
+  <string name="default_checkbox">Використовувати як мою типову базу даних</string>
+  <string name="digits">Цифри</string>
+  <string name="enter_filename">Введіть ім’я бази даних</string>
+  <string name="entry_accessed">Доступ</string>
+  <string name="entry_and_or">Введіть пароль і/або файл ключа для відкриття бази даних</string>
+  <string name="entry_cancel">Відміна</string>
+  <string name="entry_comment">Коментар</string>
+  <string name="entry_confpassword">Підтвердження паролю</string>
+  <string name="entry_created">Створено</string>
+  <string name="entry_expires">Закінчується</string>
+  <string name="entry_keyfile">Файл ключа (необов’язково)</string>
+  <string name="entry_modified">Змінено</string>
+  <string name="entry_password">Пароль</string>
+  <string name="entry_save">Зберегти</string>
+  <string name="entry_title">Ім’я</string>
+  <string name="entry_user_name">Ім’я користувача</string>
+  <string name="error_arc4">Потокове шифрування ArcFour не підтримується.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android не може опрацювати цю адресу.</string>
+  <string name="error_could_not_create_group">Помилка створення групи.</string>
+  <string name="error_could_not_create_parent">Не вдалося створити батьківський каталог.</string>
+  <string name="error_database_exists">Файл вже існує.</string>
+  <string name="error_database_settings">Не вдалося визначити параметри бази даних.</string>
+  <string name="error_failed_to_launch_link">Не вдалося відкрити посилання.</string>
+  <string name="error_filename_required">Необхідно ім’я файла.</string>
+  <string name="error_file_not_create">Не можливо створити файл</string>
+  <string name="error_invalid_db">Невірна база даних.</string>
+  <string name="error_invalid_path">Невірний шлях.</string>
+  <string name="error_no_name">Потрібне ім’я.</string>
+  <string name="error_nopass">Необхідно пароль або файл ключа.</string>
+  <string name="error_out_of_memory">Телефону не вистачило пам’яті при аналізі вашої бази даних. Можливо база надто велика для вашог телефона.</string>
+  <string name="error_pass_gen_type">Принаймні один тип генерації пароля необхідно вибрати.</string>
+  <string name="error_pass_match">Паролі не співпадають.</string>
+  <string name="error_rounds_not_number">Кількість циклів має бути числом.</string>
+  <string name="error_rounds_too_large">Надто багато циклів.  Установлено 2147483648.</string>
+  <string name="error_title_required">Необхідно вказати заголовок.</string>
+  <string name="error_wrong_length">Введіть ціле число на усю довжину поля</string>
+  <string name="FileNotFound">Файл не знайдено.</string>
+  <string name="file_browser">Перегляд файлів</string>
+  <string name="generate_password">Згенерувати пароль</string>
+  <string name="group">Група</string>
+  <string name="hint_comment">коментар</string>
+  <string name="hint_conf_pass">підтвердження пароля</string>
+  <string name="hint_generated_password">згенерований пароль</string>
+  <string name="hint_group_name">Ім’я групи</string>
+  <string name="hint_keyfile">файл-ключ</string>
+  <string name="hint_length">довжина</string>
+  <string name="hint_pass">пароль</string>
+  <string name="hint_login_pass">Пароль</string>
+  <string name="hint_title">ім’я</string>
+  <string name="hint_username">ім’я користувача</string>
+  <string name="install_from_market">Інсталювати із Google Play</string>
+  <string name="install_from_website">Інсталювати із Інтернету</string>
+  <string name="InvalidPassword">Невірний пароль або файл ключа.</string>
+  <string name="invalid_db_sig">Формат бази даних не розпізнано.</string>
+  <string name="length">Довжина</string>
+  <string name="list_size_title">Розмір списку груп</string>
+  <string name="list_size_summary">Розмір тексту у списку груп</string>
+  <string name="loading_database">Завантаження бази даних…</string>
+  <string name="lowercase">Нижній регістр</string>
+  <string name="maskpass_title">Маска пароля</string>
+  <string name="maskpass_summary">Приховати паролі за замовчуванням</string>
+  <string name="menu_about">Про</string>
+  <string name="menu_change_key">Змінити головний ключ</string>
+  <string name="menu_copy_pass">Копіювати пароль</string>
+  <string name="menu_copy_user">Копіювати користувача</string>
+  <string name="menu_create">Створити</string>
+  <string name="menu_app_settings">Налаштування</string>
+  <string name="menu_db_settings">Налаштування бази даних</string>
+  <string name="menu_delete">Вилучити</string>
+  <string name="menu_donate">Пожертвувати</string>
+  <string name="menu_edit">Редагувати</string>
+  <string name="menu_hide_password">Приховати пароль</string>
+  <string name="menu_homepage">Перейти на домашню сторінку</string>
+  <string name="menu_lock">Блокувати базу даних</string>
+  <string name="menu_open">Відкрити</string>
+  <string name="menu_rename">Перейменувати</string>
+  <string name="menu_search">Пошук</string>
+  <string name="menu_url">Перейти по посиланню</string>
+  <string name="never">Ніколи</string>
+  <string name="no_keys">Нема записів у базі даних або у групі.</string>
+  <string name="no_results">Нічого не знайдено.</string>
+  <string name="no_url_handler">Нема програми для опрацювання цього посилання.</string>
+  <string name="open_recent">Відкрити останню базу даних (натисніть для відкриття)</string>
+  <string name="omitbackup_title">Не шукати записів з резервного копіювання та кошиків</string>
+  <string name="omitbackup_summary">Пропустити групу \'Резервна копія\' та Кошик серед результатів пошуку</string>
+  <string name="pass_filename">ім’я бази даних KeePass</string>
+  <string name="password_title">Введіть пароль бази даних</string>
+  <string name="progress_create">Створення нової бази даних…</string>
+  <string name="progress_title">Працює…</string>
+  <string name="remember_keyfile_summary">Запам’ятати розташування файла ключа</string>
+  <string name="remember_keyfile_title">Збережіть файл ключа</string>
+  <string name="remove_from_filelist">Вилучити</string>
+  <string name="root">Корінь</string>
+  <string name="rounds">Циклів шифрування</string>
+  <string name="rounds_explaination">Велика кількість циклів шифрування забезпечує додатковий захист від грубих атак, але може дійсно уповільнити завантаження та захист.</string>
+  <string name="rounds_hint">цикли</string>
+  <string name="saving_database">Збереження бази даних…</string>
+  <string name="space">Пропуск</string>
+  <string name="search_label">Пошук</string>
+  <string name="show_password">Показати пароль</string>
+  <string name="sort_name">Упорядкувати за ім’ям</string>
+  <string name="sort_db">Упорядкування БД</string>
+  <string name="special">Спеціальний</string>
+  <string name="underline">Підкреслення</string>
+  <string name="unsupported_db_version">Непідтримувана версія бази даних.</string>
+  <string name="uppercase">Верхній регістр</string>
+  <string name="warning_read_only">Ваша карта пам’яті зараз у режимі тільки для читання. Ви не зможете зберегти зміни до вашої бази даних.</string>
+  <string name="warning_unmounted">Ваша карта пам’яті зараз не змонтована на телефоні. Ви не зможете завантажити або створити базу даних.</string>
+  <string name="version_label">Версія</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 секунд</item>
+    <item>1 хвилина</item>
+    <item>5 хвилин</item>
+    <item>Ніколи</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Малий</item>
+    <item>Середній</item>
+    <item>Великий</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-zh-rCN/strings.xml b/src/keepass2android/Resources/values-zh-rCN/strings.xml
index 2a877751..80745b3b 100644
--- a/src/keepass2android/Resources/values-zh-rCN/strings.xml
+++ b/src/keepass2android/Resources/values-zh-rCN/strings.xml
@@ -1,178 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- 
-     
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">反馈：</string>
-    <string name="about_homepage">主页：</string>
-    <string name="AboutText">Keepass2Android是KeePass密码管理软件的Android版本。</string>
-    <string name="about_twitter">Twitter：</string>
-    <string name="accept">接受</string>
-    <string name="add_entry">添加条目</string>
-    <string name="add_group">添加群组</string>
-    <string name="add_group_title">添加群</string>
-    <string name="algorithm">算法</string>
-    <string name="algorithm_colon">算法：</string>
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">应用程序超时</string>
-    <string name="app_timeout_summary">应用程序处于非活动时锁定数据库。</string>
-    <string name="application">应用程序</string>
-    <string name="application_settings">应用程序设置</string>
-    <string name="brackets">括号</string>
-    <string name="browser_intall_text">	浏览文件需要安装Open Intents File Manager软件，点下面安装。由于一些文件管理软件的差异，在你第一次浏览时可能无法正常工作。</string>
-    <string name="building_search_idx">建立搜索索引&#8230;</string>
-    <string name="cancel">取消</string>
-    <string name="ClearClipboard">剪贴板已清除。</string>
-    <string name="clipboard_timeout">剪贴板超时。</string>
-    <string name="clipboard_timeout_summary">复制用户名或密码到剪贴板后清除的时间</string>
-    <string name="copy_username">复制用户名到剪贴板</string>
-    <string name="copy_password">复制密码到剪贴板</string>
-    <string name="creating_db_key">创建数据库密钥&#8230;</string>
-    <string name="current_group">当前群组：</string>
-    <string name="current_group_root">当前群组：Root</string>
-    <string name="database">数据库</string>
-    <string name="decrypting_db">解密数据库内容中&#8230;</string>
-    <string name="decrypting_entry">解密条目中</string>
-    <string name="default_checkbox">使用这做为我的默认数据库</string>
-    <string name="digits">数字</string>
-    <string name="disclaimer_formal">Keepass2Android版权归Philipp Crocoll；软件不带有绝对担保；是自由软件，您可在遵循GPL 2或者更高版本的情况下重新发布。中文简繁体翻译：wangkf@gmail.com</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">输入数据库名：</string>
-    <string name="entry_accessed">访问时间：</string>
-    <string name="entry_and_or">输入密码和/或一个密钥文件来解锁你的数据库：</string>
-    <string name="entry_cancel">取消</string>
-    <string name="entry_comment">备注：</string>
-    <string name="entry_confpassword">确认密码：</string>
-    <string name="entry_created">创建：</string>
-    <string name="entry_expires">失效时间：</string>
-    <string name="entry_keyfile">密钥文件（可选）</string>
-    <string name="entry_modified">修改时间：</string>
-    <string name="entry_password">密码：</string>
-    <string name="entry_save">保存</string>
-    <string name="entry_title">名称：</string>
-    <string name="entry_url">网址：</string>
-    <string name="entry_user_name">用户名：</string>
-    <string name="error_arc4">ArcFour流密码不被支持。</string>
-    <string name="error_can_not_handle_uri">Keepass2Android无法处理此URI。</string>
-    <string name="error_could_not_create_group">创建群组错误。</string>
-    <string name="error_could_not_create_parent">无法创建上级目录。</string>
-    <string name="error_database_exists">文件已存在。</string>
-    <string name="error_database_settings">无法确定数据库设置。</string>
-    <string name="error_failed_to_launch_link">运行链接失败。</string>
-    <string name="error_filename_required">请求一个文件名：</string>
-    <string name="error_file_not_create">不能创建文件：</string>
-    <string name="error_invalid_db">非法数据库。</string>
-    <string name="error_invalid_path">非法路径。</string>
-    <string name="error_no_name">用户名是必须的。</string>
-    <string name="error_nopass">密码或者密钥文件是必须的。</string>
-    <string name="error_out_of_memory">这款手机运行内存不足而不能解析数据库。这可能是数据库太大的缘故。</string>
-    <string name="error_pass_gen_type">至少必须选择一个密码生成类型</string>
-    <string name="error_pass_match">密码不匹配。</string>
-    <string name="error_rounds_not_number">次数必须是数字。</string>
-    <string name="error_rounds_too_large">次数太大。最大设置到2147483648。</string>
-    <string name="error_title_required">标题是必填项。</string>
-    <string name="error_wrong_length">长度字段输入一个正整数</string>
-    <string name="FileNotFound">文件未找到。</string>
-    <string name="file_browser">文件浏览</string>
-    <string name="generate_password">生成密码</string>
-    <string name="group">群组</string>
-    <string name="hint_comment">备注</string>
-    <string name="hint_conf_pass">确认密码</string>
-    <string name="hint_generated_password">生成密码</string>
-    <string name="hint_group_name">群组名</string>
-    <string name="hint_keyfile">密钥文件</string>
-    <string name="hint_length">长度</string>
-    <string name="hint_login_pass">密码</string>
-    <string name="hint_pass">密码</string>
-    <string name="hint_title">名称</string>
-    <string name="hint_url">网址</string>
-    <string name="hint_username">用户名</string>
-    <string name="install_from_market">从电子市场安装</string>
-    <string name="install_from_website">从网络安装</string>
-    <string name="InvalidPassword">非法的密码或密钥文件。</string>
-    <string name="invalid_db_sig">数据库格式无法识别。</string>
-    <string name="length">长度</string>
-    <string name="list_size_title">群列表尺寸</string>
-    <string name="list_size_summary">群列表中的文本尺寸</string>
-    <string name="loading_database">加载数据库中&#8230;</string>
-    <string name="lowercase">小写</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">密码掩膜</string>
-    <string name="maskpass_summary">默认隐藏密码</string>
-    <string name="menu_about">关于</string>
-    <string name="menu_change_key">改变主密钥</string>
-    <string name="menu_copy_pass">复制密码</string>
-    <string name="menu_copy_user">复制用户</string>
-    <string name="menu_create">创建</string>
-    <string name="menu_app_settings">设置</string>
-    <string name="menu_db_settings">数据库设置</string>
-    <string name="menu_delete">删除</string>
-    <string name="menu_donate">捐赠</string>
-    <string name="menu_edit">编辑</string>
-    <string name="menu_hide_password">隐藏密码</string>
-    <string name="menu_homepage">到主页</string>
-    <string name="menu_lock">锁定数据库</string>
-    <string name="menu_open">打开</string>
-    <string name="menu_rename">重命名</string>
-    <string name="menu_search">搜索</string>
-    <string name="menu_url">到网址</string>
-    <string name="minus">减</string>
-    <string name="never">从不</string>
-    <string name="no_keys">数据库或群组中无条目。</string>
-    <string name="no_results">没有搜索结果</string>
-    <string name="no_url_handler">没有这个链接的处理程序。</string>
-    <string name="open_recent">打开最近数据库（点击打开）：</string>
-    <string name="pass_filename">KeePass数据库文件名：</string>
-    <string name="password_title">输入数据库密码</string>
-    <string name="progress_create">创建新数据库中&#8230;</string>
-    <string name="progress_title">工作中&#8230;</string>
-    <string name="remember_keyfile_summary">记住密钥文件的位置</string>
-    <string name="remember_keyfile_title">保存密钥文件</string>
-    <string name="remove_from_filelist">移除</string>
-    <string name="rijndael">Rijndael加密(AES)</string>
-    <string name="root">Root</string>
-    <string name="rounds">加密次数</string>
-    <string name="rounds_explaination">更高级的加密次数对暴力攻击能提供额外保护，但也会增加加载和保存的时间。</string>
-    <string name="rounds_hint">次数</string>
-    <string name="saving_database">正在保存数据库&#8230;</string>
-    <string name="space">空格</string>
-    <string name="search_label">搜索</string>
-    <string name="show_password">显示密码</string>
-    <string name="sort_name">通过名称排序</string>
-    <string name="sort_db">数据库的排序顺序</string>
-    <string name="special">特别</string>
-    <string name="twofish">Twofish算法</string>
-    <string name="underline">强调</string>
-    <string name="unsupported_db_version">不支持的数据库版本。</string>
-    <string name="uppercase">大写</string>
-    <string name="warning_read_only">你的SD卡目前是只读状态。您可能无法将更改保存到数据库。</string>
-    <string name="warning_unmounted">你的SD卡目前尚未安装在您的设备上。你将无法加载或创建您的数据库。</string>
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30秒</item>
-    	<item>1分钟</item>
-    	<item>5分钟</item>
-    	<item>从不</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>小</item>
-    	<item>中</item>
-    	<item>大</item>
-    </string-array>
+  <string name="about_feedback">反馈：</string>
+  <string name="about_homepage">主页：</string>
+  <string name="AboutText">Keepass2Android是KeePass密码管理软件的Android版本。</string>
+  <string name="accept">接受</string>
+  <string name="add_entry">添加条目</string>
+  <string name="add_group">添加群组</string>
+  <string name="add_group_title">添加群</string>
+  <string name="algorithm">算法</string>
+  <string name="algorithm_colon">算法：</string>
+  <string name="app_timeout">应用程序超时</string>
+  <string name="app_timeout_summary">应用程序处于非活动时锁定数据库。</string>
+  <string name="application">应用程序</string>
+  <string name="application_settings">应用程序设置</string>
+  <string name="brackets">括号</string>
+  <string name="browser_intall_text">	浏览文件需要安装Open Intents File Manager软件，点下面安装。由于一些文件管理软件的差异，在你第一次浏览时可能无法正常工作。</string>
+  <string name="building_search_idx">建立搜索索引…</string>
+  <string name="cancel">取消</string>
+  <string name="ClearClipboard">剪贴板已清除。</string>
+  <string name="clipboard_timeout">剪贴板超时。</string>
+  <string name="clipboard_timeout_summary">复制用户名或密码到剪贴板后清除的时间</string>
+  <string name="copy_username">复制用户名到剪贴板</string>
+  <string name="copy_password">复制密码到剪贴板</string>
+  <string name="creating_db_key">创建数据库密钥…</string>
+  <string name="current_group">当前群组：</string>
+  <string name="current_group_root">当前群组：Root</string>
+  <string name="database">数据库</string>
+  <string name="decrypting_db">解密数据库内容中…</string>
+  <string name="decrypting_entry">解密条目中</string>
+  <string name="default_checkbox">使用这做为我的默认数据库</string>
+  <string name="digits">数字</string>
+  <string name="disclaimer_formal">Keepass2Android版权归Philipp Crocoll；软件不带有绝对担保；是自由软件，您可在遵循GPL 2或者更高版本的情况下重新发布。中文简繁体翻译：wangkf@gmail.com</string>
+  <string name="enter_filename">输入数据库名：</string>
+  <string name="entry_accessed">访问时间：</string>
+  <string name="entry_and_or">输入密码和/或一个密钥文件来解锁你的数据库：</string>
+  <string name="entry_cancel">取消</string>
+  <string name="entry_comment">备注：</string>
+  <string name="entry_confpassword">确认密码：</string>
+  <string name="entry_created">创建：</string>
+  <string name="entry_expires">失效时间：</string>
+  <string name="entry_keyfile">密钥文件（可选）</string>
+  <string name="entry_modified">修改时间：</string>
+  <string name="entry_password">密码：</string>
+  <string name="entry_save">保存</string>
+  <string name="entry_title">名称：</string>
+  <string name="entry_url">网址：</string>
+  <string name="entry_user_name">用户名：</string>
+  <string name="error_arc4">ArcFour流密码不被支持。</string>
+  <string name="error_can_not_handle_uri">Keepass2Android无法处理此URI。</string>
+  <string name="error_could_not_create_group">创建群组错误。</string>
+  <string name="error_could_not_create_parent">无法创建上级目录。</string>
+  <string name="error_database_exists">文件已存在。</string>
+  <string name="error_database_settings">无法确定数据库设置。</string>
+  <string name="error_failed_to_launch_link">运行链接失败。</string>
+  <string name="error_filename_required">请求一个文件名：</string>
+  <string name="error_file_not_create">不能创建文件：</string>
+  <string name="error_invalid_db">非法数据库。</string>
+  <string name="error_invalid_path">非法路径。</string>
+  <string name="error_no_name">用户名是必须的。</string>
+  <string name="error_nopass">密码或者密钥文件是必须的。</string>
+  <string name="error_out_of_memory">这款手机运行内存不足而不能解析数据库。这可能是数据库太大的缘故。</string>
+  <string name="error_pass_gen_type">至少必须选择一个密码生成类型</string>
+  <string name="error_pass_match">密码不匹配。</string>
+  <string name="error_rounds_not_number">次数必须是数字。</string>
+  <string name="error_rounds_too_large">次数太大。最大设置到2147483648。</string>
+  <string name="error_title_required">标题是必填项。</string>
+  <string name="error_wrong_length">长度字段输入一个正整数</string>
+  <string name="FileNotFound">文件未找到。</string>
+  <string name="file_browser">文件浏览</string>
+  <string name="generate_password">生成密码</string>
+  <string name="group">群组</string>
+  <string name="hint_comment">备注</string>
+  <string name="hint_conf_pass">确认密码</string>
+  <string name="hint_generated_password">生成密码</string>
+  <string name="hint_group_name">群组名</string>
+  <string name="hint_keyfile">密钥文件</string>
+  <string name="hint_length">长度</string>
+  <string name="hint_pass">密码</string>
+  <string name="hint_login_pass">密码</string>
+  <string name="hint_title">名称</string>
+  <string name="hint_url">网址</string>
+  <string name="hint_username">用户名</string>
+  <string name="install_from_market">从电子市场安装</string>
+  <string name="install_from_website">从网络安装</string>
+  <string name="InvalidPassword">非法的密码或密钥文件。</string>
+  <string name="invalid_db_sig">数据库格式无法识别。</string>
+  <string name="length">长度</string>
+  <string name="list_size_title">群列表尺寸</string>
+  <string name="list_size_summary">群列表中的文本尺寸</string>
+  <string name="loading_database">加载数据库中…</string>
+  <string name="lowercase">小写</string>
+  <string name="maskpass_title">密码掩膜</string>
+  <string name="maskpass_summary">默认隐藏密码</string>
+  <string name="menu_about">关于</string>
+  <string name="menu_change_key">改变主密钥</string>
+  <string name="menu_copy_pass">复制密码</string>
+  <string name="menu_copy_user">复制用户</string>
+  <string name="menu_create">创建</string>
+  <string name="menu_app_settings">设置</string>
+  <string name="menu_db_settings">数据库设置</string>
+  <string name="menu_delete">删除</string>
+  <string name="menu_donate">捐赠</string>
+  <string name="menu_edit">编辑</string>
+  <string name="menu_hide_password">隐藏密码</string>
+  <string name="menu_homepage">到主页</string>
+  <string name="menu_lock">锁定数据库</string>
+  <string name="menu_open">打开</string>
+  <string name="menu_rename">重命名</string>
+  <string name="menu_search">搜索</string>
+  <string name="menu_url">到网址</string>
+  <string name="minus">减</string>
+  <string name="never">从不</string>
+  <string name="no_keys">数据库或群组中无条目。</string>
+  <string name="no_results">没有搜索结果</string>
+  <string name="no_url_handler">没有这个链接的处理程序。</string>
+  <string name="open_recent">打开最近数据库（点击打开）：</string>
+  <string name="pass_filename">KeePass数据库文件名：</string>
+  <string name="password_title">输入数据库密码</string>
+  <string name="progress_create">创建新数据库中…</string>
+  <string name="progress_title">工作中…</string>
+  <string name="remember_keyfile_summary">记住密钥文件的位置</string>
+  <string name="remember_keyfile_title">保存密钥文件</string>
+  <string name="remove_from_filelist">移除</string>
+  <string name="rijndael">Rijndael加密(AES)</string>
+  <string name="rounds">加密次数</string>
+  <string name="rounds_explaination">更高级的加密次数对暴力攻击能提供额外保护，但也会增加加载和保存的时间。</string>
+  <string name="rounds_hint">次数</string>
+  <string name="saving_database">正在保存数据库…</string>
+  <string name="space">空格</string>
+  <string name="search_label">搜索</string>
+  <string name="show_password">显示密码</string>
+  <string name="sort_name">通过名称排序</string>
+  <string name="sort_db">数据库的排序顺序</string>
+  <string name="special">特别</string>
+  <string name="twofish">Twofish算法</string>
+  <string name="underline">强调</string>
+  <string name="unsupported_db_version">不支持的数据库版本。</string>
+  <string name="uppercase">大写</string>
+  <string name="warning_read_only">你的SD卡目前是只读状态。您可能无法将更改保存到数据库。</string>
+  <string name="warning_unmounted">你的SD卡目前尚未安装在您的设备上。你将无法加载或创建您的数据库。</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30秒</item>
+    <item>1分钟</item>
+    <item>5分钟</item>
+    <item>从不</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>小</item>
+    <item>中</item>
+    <item>大</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values-zh-rTW/strings.xml b/src/keepass2android/Resources/values-zh-rTW/strings.xml
index 6f0eb42a..a3d124b8 100644
--- a/src/keepass2android/Resources/values-zh-rTW/strings.xml
+++ b/src/keepass2android/Resources/values-zh-rTW/strings.xml
@@ -1,178 +1,159 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
- 
-     
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<!--Generated by crowdin.net-->
 <resources>
-    <string name="about_feedback">回饋：</string>
-    <string name="about_homepage">主頁：</string>
-    <string name="AboutText">Keepass2Android是KeePass密碼管理軟體的Android版本。</string>
-    <string name="about_twitter">Twitter：</string>
-    <string name="accept">接受</string>
-    <string name="add_entry">添加條目</string>
-    <string name="add_group">添加群組</string>
-    <string name="add_group_title">添加群</string>
-    <string name="algorithm">演算法</string>
-    <string name="algorithm_colon">演算法：</string>
-    <string name="app_name">Keepass2Android</string>
-    <string name="short_app_name">KP2A</string>
-    <string name="app_timeout">應用程式超時</string>
-    <string name="app_timeout_summary">應用程式處於非活動時鎖定資料庫。</string>
-    <string name="application">應用程式</string>
-    <string name="application_settings">應用程式設置</string>
-    <string name="brackets">括弧</string>
-    <string name="browser_intall_text">	流覽檔需要安裝Open Intents File Manager軟體，點下面安裝。由於一些檔管理軟體的差異，在你第一次流覽時可能無法正常工作。</string>
-    <string name="building_search_idx">建立搜索索引&#8230;</string>
-    <string name="cancel">取消</string>
-    <string name="ClearClipboard">剪貼板已清除。</string>
-    <string name="clipboard_timeout">剪貼板超時。</string>
-    <string name="clipboard_timeout_summary">複製用戶名或密碼到剪貼板後清除的時間</string>
-    <string name="copy_username">複製用戶名到剪貼板</string>
-    <string name="copy_password">複製密碼到剪貼板</string>
-    <string name="creating_db_key">創建資料庫密鑰&#8230;</string>
-    <string name="current_group">當前群組：</string>
-    <string name="current_group_root">當前群組：Root</string>
-    <string name="database">資料庫</string>
-    <string name="decrypting_db">解密資料庫內容中&#8230;</string>
-    <string name="decrypting_entry">解密條目中</string>
-    <string name="default_checkbox">使用這做為我的默認資料庫</string>
-    <string name="digits">數字</string>
-    <string name="disclaimer_formal">Keepass2Android版權歸Philipp Crocoll；軟體不帶有絕對擔保；是自由軟體，您可在遵循GPL 2或者更高版本的情況下重新發佈。中文簡繁體翻譯：wangkf@gmail.com</string>
-    <string name="ellipsis">\u2026</string>
-    <string name="enter_filename">輸入資料庫名：</string>
-    <string name="entry_accessed">訪問時間：</string>
-    <string name="entry_and_or">輸入密碼和/或一個密鑰檔來解鎖你的資料庫：</string>
-    <string name="entry_cancel">取消</string>
-    <string name="entry_comment">備註：</string>
-    <string name="entry_confpassword">確認密碼：</string>
-    <string name="entry_created">創建：</string>
-    <string name="entry_expires">失效時間：</string>
-    <string name="entry_keyfile">密鑰文件（可選）</string>
-    <string name="entry_modified">修改時間：</string>
-    <string name="entry_password">密碼：</string>
-    <string name="entry_save">保存</string>
-    <string name="entry_title">名稱：</string>
-    <string name="entry_url">網址：</string>
-    <string name="entry_user_name">用戶名：</string>
-    <string name="error_arc4">ArcFour流密碼不被支援。</string>
-    <string name="error_can_not_handle_uri">Keepass2Android無法處理此URI。</string>
-    <string name="error_could_not_create_group">創建群組錯誤。</string>
-    <string name="error_could_not_create_parent">無法創建上級目錄。</string>
-    <string name="error_database_exists">文件已存在。</string>
-    <string name="error_database_settings">無法確定資料庫設置。</string>
-    <string name="error_failed_to_launch_link">運行鏈結失敗。</string>
-    <string name="error_filename_required">請求一個檔案名：</string>
-    <string name="error_file_not_create">不能創建檔：</string>
-    <string name="error_invalid_db">非法資料庫。</string>
-    <string name="error_invalid_path">非法路徑。</string>
-    <string name="error_no_name">用戶名是必須的。</string>
-    <string name="error_nopass">密碼或者密鑰檔是必須的。</string>
-    <string name="error_out_of_memory">這款手機運行記憶體不足而不能解析資料庫。這可能是資料庫太大的緣故。</string>
-    <string name="error_pass_gen_type">至少必須選擇一個密碼生成類型</string>
-    <string name="error_pass_match">密碼不匹配。</string>
-    <string name="error_rounds_not_number">次數必須是數位。</string>
-    <string name="error_rounds_too_large">次數太大。最大設置到2147483648。</string>
-    <string name="error_title_required">標題是必填項。</string>
-    <string name="error_wrong_length">長度欄位輸入一個正整數</string>
-    <string name="FileNotFound">文件未找到。</string>
-    <string name="file_browser">檔流覽</string>
-    <string name="generate_password">生成密碼</string>
-    <string name="group">群組</string>
-    <string name="hint_comment">備註</string>
-    <string name="hint_conf_pass">確認密碼</string>
-    <string name="hint_generated_password">生成密碼</string>
-    <string name="hint_group_name">群組名</string>
-    <string name="hint_keyfile">密鑰文件</string>
-    <string name="hint_length">長度</string>
-    <string name="hint_login_pass">密碼</string>
-    <string name="hint_pass">密碼</string>
-    <string name="hint_title">名稱</string>
-    <string name="hint_url">網址</string>
-    <string name="hint_username">用戶名</string>
-    <string name="install_from_market">從電子市場安裝</string>
-    <string name="install_from_website">從網路安裝</string>
-    <string name="InvalidPassword">非法的密碼或密鑰檔。</string>
-    <string name="invalid_db_sig">資料庫格式無法識別。</string>
-    <string name="length">長度</string>
-    <string name="list_size_title">群列表尺寸</string>
-    <string name="list_size_summary">群列表中的文本尺寸</string>
-    <string name="loading_database">載入資料庫中&#8230;</string>
-    <string name="lowercase">小寫</string>
-    <string name="MaskedPassword">*****</string>
-    <string name="maskpass_title">密碼掩膜</string>
-    <string name="maskpass_summary">默認隱藏密碼</string>
-    <string name="menu_about">關於</string>
-    <string name="menu_change_key">改變主密鑰</string>
-    <string name="menu_copy_pass">複製密碼</string>
-    <string name="menu_copy_user">複製用戶</string>
-    <string name="menu_create">創建</string>
-    <string name="menu_app_settings">設置</string>
-    <string name="menu_db_settings">資料庫設置</string>
-    <string name="menu_delete">刪除</string>
-    <string name="menu_donate">捐贈</string>
-    <string name="menu_edit">編輯</string>
-    <string name="menu_hide_password">隱藏密碼</string>
-    <string name="menu_homepage">到主頁</string>
-    <string name="menu_lock">鎖定資料庫</string>
-    <string name="menu_open">打開</string>
-    <string name="menu_rename">重命名</string>
-    <string name="menu_search">搜索</string>
-    <string name="menu_url">到網址</string>
-    <string name="minus">減</string>
-    <string name="never">從不</string>
-    <string name="no_keys">資料庫或群組中無條目。</string>
-    <string name="no_results">沒有搜索結果</string>
-    <string name="no_url_handler">沒有這個鏈結的處理程式。</string>
-    <string name="open_recent">打開最近資料庫（點擊打開）：</string>
-    <string name="pass_filename">KeePass資料庫檔案名：</string>
-    <string name="password_title">輸入資料庫密碼</string>
-    <string name="progress_create">創建新資料庫中&#8230;</string>
-    <string name="progress_title">工作中&#8230;</string>
-    <string name="remember_keyfile_summary">記住密鑰檔的位置</string>
-    <string name="remember_keyfile_title">保存密鑰檔</string>
-    <string name="remove_from_filelist">移除</string>
-    <string name="rijndael">Rijndael加密(AES)</string>
-    <string name="root">Root</string>
-    <string name="rounds">加密次數</string>
-    <string name="rounds_explaination">更高級的加密次數對暴力攻擊能提供額外保護，但也會增加載入和保存的時間。</string>
-    <string name="rounds_hint">次數</string>
-    <string name="saving_database">正在保存資料庫&#8230;</string>
-    <string name="space">空格</string>
-    <string name="search_label">搜索</string>
-    <string name="show_password">顯示密碼</string>
-    <string name="sort_name">通過名稱排序</string>
-    <string name="sort_db">資料庫的排序順序</string>
-    <string name="special">特別</string>
-    <string name="twofish">Twofish演算法</string>
-    <string name="underline">強調</string>
-    <string name="unsupported_db_version">不支援的資料庫版本。</string>
-    <string name="uppercase">大寫</string>
-    <string name="warning_read_only">你的SD卡目前是唯讀狀態。您可能無法將更改保存到資料庫。</string>
-    <string name="warning_unmounted">你的SD卡目前尚未安裝在您的設備上。你將無法載入或創建您的資料庫。</string>
-    
-    <string-array name="clipboard_timeout_options">
-    	<item>30秒</item>
-    	<item>1分鐘</item>
-    	<item>5分鐘</item>
-    	<item>從不</item>
-    </string-array>
-    <string-array name="list_size_options">
-    	<item>小</item>
-    	<item>中</item>
-    	<item>大</item>
-    </string-array>
+  <string name="about_feedback">回饋：</string>
+  <string name="about_homepage">主頁：</string>
+  <string name="AboutText">Keepass2Android是KeePass密碼管理軟體的Android版本。</string>
+  <string name="accept">接受</string>
+  <string name="add_entry">添加條目</string>
+  <string name="add_group">添加群組</string>
+  <string name="add_group_title">添加群</string>
+  <string name="algorithm">演算法</string>
+  <string name="algorithm_colon">演算法：</string>
+  <string name="app_timeout">應用程式超時</string>
+  <string name="app_timeout_summary">應用程式處於非活動時鎖定資料庫。</string>
+  <string name="application">應用程式</string>
+  <string name="application_settings">應用程式設置</string>
+  <string name="brackets">括弧</string>
+  <string name="browser_intall_text">	流覽檔需要安裝Open Intents File Manager軟體，點下面安裝。由於一些檔管理軟體的差異，在你第一次流覽時可能無法正常工作。</string>
+  <string name="building_search_idx">建立搜索索引…</string>
+  <string name="cancel">取消</string>
+  <string name="ClearClipboard">剪貼板已清除。</string>
+  <string name="clipboard_timeout">剪貼板超時。</string>
+  <string name="clipboard_timeout_summary">複製用戶名或密碼到剪貼板後清除的時間</string>
+  <string name="copy_username">複製用戶名到剪貼板</string>
+  <string name="copy_password">複製密碼到剪貼板</string>
+  <string name="creating_db_key">創建資料庫密鑰…</string>
+  <string name="current_group">當前群組：</string>
+  <string name="current_group_root">當前群組：Root</string>
+  <string name="database">資料庫</string>
+  <string name="decrypting_db">解密資料庫內容中…</string>
+  <string name="decrypting_entry">解密條目中</string>
+  <string name="default_checkbox">使用這做為我的默認資料庫</string>
+  <string name="digits">數字</string>
+  <string name="disclaimer_formal">Keepass2Android版權歸Philipp Crocoll；軟體不帶有絕對擔保；是自由軟體，您可在遵循GPL 2或者更高版本的情況下重新發佈。中文簡繁體翻譯：wangkf@gmail.com</string>
+  <string name="enter_filename">輸入資料庫名：</string>
+  <string name="entry_accessed">訪問時間：</string>
+  <string name="entry_and_or">輸入密碼和/或一個密鑰檔來解鎖你的資料庫：</string>
+  <string name="entry_cancel">取消</string>
+  <string name="entry_comment">備註：</string>
+  <string name="entry_confpassword">確認密碼：</string>
+  <string name="entry_created">創建：</string>
+  <string name="entry_expires">失效時間：</string>
+  <string name="entry_keyfile">密鑰文件（可選）</string>
+  <string name="entry_modified">修改時間：</string>
+  <string name="entry_password">密碼：</string>
+  <string name="entry_save">保存</string>
+  <string name="entry_title">名稱：</string>
+  <string name="entry_url">網址：</string>
+  <string name="entry_user_name">用戶名：</string>
+  <string name="error_arc4">ArcFour流密碼不被支援。</string>
+  <string name="error_can_not_handle_uri">Keepass2Android無法處理此URI。</string>
+  <string name="error_could_not_create_group">創建群組錯誤。</string>
+  <string name="error_could_not_create_parent">無法創建上級目錄。</string>
+  <string name="error_database_exists">文件已存在。</string>
+  <string name="error_database_settings">無法確定資料庫設置。</string>
+  <string name="error_failed_to_launch_link">運行鏈結失敗。</string>
+  <string name="error_filename_required">請求一個檔案名：</string>
+  <string name="error_file_not_create">不能創建檔：</string>
+  <string name="error_invalid_db">非法資料庫。</string>
+  <string name="error_invalid_path">非法路徑。</string>
+  <string name="error_no_name">用戶名是必須的。</string>
+  <string name="error_nopass">密碼或者密鑰檔是必須的。</string>
+  <string name="error_out_of_memory">這款手機運行記憶體不足而不能解析資料庫。這可能是資料庫太大的緣故。</string>
+  <string name="error_pass_gen_type">至少必須選擇一個密碼生成類型</string>
+  <string name="error_pass_match">密碼不匹配。</string>
+  <string name="error_rounds_not_number">次數必須是數位。</string>
+  <string name="error_rounds_too_large">次數太大。最大設置到2147483648。</string>
+  <string name="error_title_required">標題是必填項。</string>
+  <string name="error_wrong_length">長度欄位輸入一個正整數</string>
+  <string name="FileNotFound">文件未找到。</string>
+  <string name="file_browser">檔流覽</string>
+  <string name="generate_password">生成密碼</string>
+  <string name="group">群組</string>
+  <string name="hint_comment">備註</string>
+  <string name="hint_conf_pass">確認密碼</string>
+  <string name="hint_generated_password">生成密碼</string>
+  <string name="hint_group_name">群組名</string>
+  <string name="hint_keyfile">密鑰文件</string>
+  <string name="hint_length">長度</string>
+  <string name="hint_pass">密碼</string>
+  <string name="hint_login_pass">密碼</string>
+  <string name="hint_title">名稱</string>
+  <string name="hint_url">網址</string>
+  <string name="hint_username">用戶名</string>
+  <string name="install_from_market">從電子市場安裝</string>
+  <string name="install_from_website">從網路安裝</string>
+  <string name="InvalidPassword">非法的密碼或密鑰檔。</string>
+  <string name="invalid_db_sig">資料庫格式無法識別。</string>
+  <string name="length">長度</string>
+  <string name="list_size_title">群列表尺寸</string>
+  <string name="list_size_summary">群列表中的文本尺寸</string>
+  <string name="loading_database">載入資料庫中…</string>
+  <string name="lowercase">小寫</string>
+  <string name="maskpass_title">密碼掩膜</string>
+  <string name="maskpass_summary">默認隱藏密碼</string>
+  <string name="menu_about">關於</string>
+  <string name="menu_change_key">改變主密鑰</string>
+  <string name="menu_copy_pass">複製密碼</string>
+  <string name="menu_copy_user">複製用戶</string>
+  <string name="menu_create">創建</string>
+  <string name="menu_app_settings">設置</string>
+  <string name="menu_db_settings">資料庫設置</string>
+  <string name="menu_delete">刪除</string>
+  <string name="menu_donate">捐贈</string>
+  <string name="menu_edit">編輯</string>
+  <string name="menu_hide_password">隱藏密碼</string>
+  <string name="menu_homepage">到主頁</string>
+  <string name="menu_lock">鎖定資料庫</string>
+  <string name="menu_open">打開</string>
+  <string name="menu_rename">重命名</string>
+  <string name="menu_search">搜索</string>
+  <string name="menu_url">到網址</string>
+  <string name="minus">減</string>
+  <string name="never">從不</string>
+  <string name="no_keys">資料庫或群組中無條目。</string>
+  <string name="no_results">沒有搜索結果</string>
+  <string name="no_url_handler">沒有這個鏈結的處理程式。</string>
+  <string name="open_recent">打開最近資料庫（點擊打開）：</string>
+  <string name="pass_filename">KeePass資料庫檔案名：</string>
+  <string name="password_title">輸入資料庫密碼</string>
+  <string name="progress_create">創建新資料庫中…</string>
+  <string name="progress_title">工作中…</string>
+  <string name="remember_keyfile_summary">記住密鑰檔的位置</string>
+  <string name="remember_keyfile_title">保存密鑰檔</string>
+  <string name="remove_from_filelist">移除</string>
+  <string name="rijndael">Rijndael加密(AES)</string>
+  <string name="rounds">加密次數</string>
+  <string name="rounds_explaination">更高級的加密次數對暴力攻擊能提供額外保護，但也會增加載入和保存的時間。</string>
+  <string name="rounds_hint">次數</string>
+  <string name="saving_database">正在保存資料庫…</string>
+  <string name="space">空格</string>
+  <string name="search_label">搜索</string>
+  <string name="show_password">顯示密碼</string>
+  <string name="sort_name">通過名稱排序</string>
+  <string name="sort_db">資料庫的排序順序</string>
+  <string name="special">特別</string>
+  <string name="twofish">Twofish演算法</string>
+  <string name="underline">強調</string>
+  <string name="unsupported_db_version">不支援的資料庫版本。</string>
+  <string name="uppercase">大寫</string>
+  <string name="warning_read_only">你的SD卡目前是唯讀狀態。您可能無法將更改保存到資料庫。</string>
+  <string name="warning_unmounted">你的SD卡目前尚未安裝在您的設備上。你將無法載入或創建您的資料庫。</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30秒</item>
+    <item>1分鐘</item>
+    <item>5分鐘</item>
+    <item>從不</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>小</item>
+    <item>中</item>
+    <item>大</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>
+  </string-array>
 </resources>
diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml
index 734e9c73..b8948429 100644
--- a/src/keepass2android/Resources/values/config.xml
+++ b/src/keepass2android/Resources/values/config.xml
@@ -22,7 +22,7 @@
     <string name="donate_url"><![CDATA[https://www.paypal.com/TODO]]></string>
     <string name="homepage">http://keepass2android.codeplex.com</string>
     <string name="homepage_short">keepass2android.codeplex.com</string>
-    <string name="issues">http://keepass2android.codeplex</string>
+    <string name="issues">http://keepass2android.codeplex.com</string>
     <string name="oi_filemanager_market">market://details?id=org.openintents.filemanager</string>
     <string name="oi_filemanager_web">https://openintents.googlecode.com/files/FileManager-2.0.2.apk</string>
    
@@ -51,6 +51,7 @@
     
     <string name="QuickUnlockDefaultEnabled_key">Enable_QuickUnlock_by_default</string>
 	<string name="QuickUnlockLength_key">QuickUnlockLength</string>
+	<string name="QuickUnlockLength_default">3</string>
 	
 	<string name="UseFileTransactions_key">UseFileTransactions</string>
 	
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index 56a37679..8572a759 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -1,255 +1,224 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 
-     
- This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
-
-  Keepass2Android is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  Keepass2Android is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Keepass2Android.  If not, see <http://www.gnu.org/licenses/>.
--->
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.net-->
 <resources>
-	<string name="about_feedback">Feedback</string>
-	<string name="about_homepage">Homepage</string>
-	<string name="AboutText">Keepass2Android is an Android port of the original KeePass 2.x libraries) using Mono for Android. </string>
-	<string name="CreditsText">The User Interface is based on a port of KeepassDroid developed by Brian Pellin. Code for database operations is based on KeePass by Dominik Reichl. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.</string>
-	<string name="accept">Accept</string>
-	<string name="add_entry">Add entry</string>
-	<string name="add_group">Add group</string>
-	<string name="add_group_title">Add Group</string>
-	<string name="algorithm">Algorithm</string>
-	<string name="algorithm_colon">Algorithm</string>
-	<string name="app_name">Keepass2Android</string>
-	<string name="short_app_name">KP2A</string>
-	<string name="library_name">KeePassLib2Android</string>
-	<string name="app_timeout">Application timeout</string>
-	<string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
-	<string name="application">Application</string>
-	<string name="application_settings">Application settings</string>
-	<string name="brackets">Brackets</string>
-	<string name="browser_intall_text">File browsing requires the Open Intents File Manager, click below to install it. Due to some quirks in the file manager, browsing may not work correctly, the first time you browse.</string>
-	<string name="building_search_idx">Building search index…</string>
-	<string name="cancel">Cancel</string>
-	<string name="ClearClipboard">Clipboard cleared.</string>
-	<string name="clipboard_timeout">Clipboard timeout</string>
-	<string name="clipboard_timeout_summary">Time before clearing clipboard after copying username or password</string>
-	<string name="copy_username">Select to copy username to clipboard</string>
-	<string name="copy_password">Select to copy password to clipboard</string>
-	<string name="creating_db_key">Creating database key…</string>
-	<string name="current_group">Current Group</string>
-	<string name="current_group_root">Current Group: Root</string>
-	<string name="database">Database</string>
-	<string name="decrypting_db">Decrypting database contents…</string>
-	<string name="decrypting_entry">Decrypting entry</string>
-	<string name="default_checkbox">Use this as my default database</string>
-	<string name="digits">Digits</string>
-	<string name="disclaimer_formal">Keepass2Android comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 2 or later.</string>
-	<string name="ellipsis">\u2026</string>
-	<string name="enter_filename">Enter database filename</string>
-	<string name="entry_accessed">Accessed</string>
-	<string name="entry_and_or">Enter a password and/or a key file to unlock your database</string>
-	<string name="entry_cancel">Cancel</string>
-	<string name="entry_comment">Comments</string>
-	<string name="entry_tags">Tags</string>
-	<string name="entry_override_url">Override URL</string>
-	<string name="entry_confpassword">Confirm password</string>
-	<string name="entry_created">Created</string>
-	<string name="entry_expires">Expires</string>
-	<string name="entry_keyfile">Key file (optional)</string>
-	<string name="entry_modified">Modified</string>
-	<string name="entry_password">Password</string>
-	<string name="entry_save">Save</string>
-	<string name="entry_title">Name</string>
-	<string name="entry_url">URL</string>
-	<string name="entry_user_name">User Name</string>
-	<string name="entry_extra_strings">Extra string fields</string>
-	<string name="entry_binaries">File attachments</string>
-	<string name="error_arc4">The ArcFour stream cipher is not supported.</string>
-	<string name="error_can_not_handle_uri">Keepass2Android cannot handle this uri.</string>
-	<string name="error_could_not_create_group">Error creating group.</string>
-	<string name="error_could_not_create_parent">Could not create parent directory.</string>
-	<string name="error_database_exists">This file already exists.</string>
-	<string name="error_database_settings">Failed to determine database settings.</string>
-	<string name="error_failed_to_launch_link">Failed to launch link.</string>
-	<string name="error_filename_required">A filename is required.</string>
-	<string name="error_file_not_create">Could not create file</string>
-	<string name="error_invalid_db">Invalid database.</string>
-	<string name="error_invalid_path">Invalid path.</string>
-	<string name="error_no_name">A name is required.</string>
-	<string name="error_nopass">A password or a keyfile is required.</string>
-	<string name="error_out_of_memory">The phone ran out of memory while parsing your database. It may be too large for your phone.</string>
-	<string name="error_pass_gen_type">At least one password generation type must be selected</string>
-	<string name="error_pass_match">Passwords do not match.</string>
-	<string name="error_rounds_not_number">Rounds must be a number.</string>
-	<string name="error_rounds_too_large">Rounds too big.  Setting to 2147483648.</string>
-	<string name="error_title_required">A title is required.</string>
-	<string name="error_wrong_length">Enter a positive integer on length field</string>
-	<string name="FileNotFound">File not found.</string>
-	<string name="file_browser">File Browser</string>
-	<string name="generate_password">Generate Password</string>
-	<string name="group">Group</string>
-	<string name="hint_comment">comment</string>
-	<string name="hint_conf_pass">confirm password</string>
-	<string name="hint_generated_password">generated password</string>
-	<string name="hint_group_name">Group name</string>
-	<string name="hint_keyfile">key file</string>
-	<string name="hint_length">length</string>
-	<string name="hint_pass">password</string>
-	<string name="hint_login_pass">Password</string>
-	<string name="hint_title">name</string>
-	<string name="hint_url">url</string>
-	<string name="hint_override_url">override url</string>
-	<string name="hint_tags">tag1, tag2</string>
-	<string name="hint_username">username</string>
-	<string name="install_from_market">Install from Play Store</string>
-	<string name="install_from_website">Install from Web</string>
-	<string name="InvalidPassword">Invalid password or key file.</string>
-	<string name="invalid_algorithm">Invalid algorithm.</string>
-	<string name="invalid_db_sig">Database format not recognized.</string>
-	<string name="keyfile_does_not_exist">Key file does not exist.</string>
-	<string name="keyfile_is_empty">Key file is empty.</string>
-	<string name="length">Length</string>
-	<string name="list_size_title">Group list size</string>
-	<string name="list_size_summary">Text size in the group list</string>
-	<string name="loading_database">Loading database…</string>
-	<string name="lowercase">Lower-case</string>
-	<string name="MaskedPassword">*****</string>
-	<string name="maskpass_title">Mask password</string>
-	<string name="maskpass_summary">Hide passwords by default</string>
-	<string name="menu_about">About</string>
-	<string name="menu_change_key">Change Master Key</string>
-	<string name="menu_copy_pass">Copy Password</string>
-	<string name="menu_copy_user">Copy User</string>
-	<string name="menu_create">Create</string>
-	<string name="menu_app_settings">Settings</string>
-	<string name="menu_db_settings">Database settings</string>
-	<string name="menu_delete">Delete</string>
-	<string name="menu_donate">Donate</string>
-	<string name="menu_edit">Edit</string>
-	<string name="menu_hide_password">Hide Password</string>
-	<string name="menu_homepage">Go to Homepage</string>
-	<string name="menu_lock">Lock Database</string>
-	<string name="menu_open">Open</string>
-	<string name="menu_rename">Rename</string>
-	<string name="menu_search">Search</string>
-	<string name="menu_url">Go to URL</string>
-	<string name="minus">Minus</string>
-	<string name="never">Never</string>
-	<string name="no_keys">No entries in the database or group.</string>
-	<string name="no_results">No search results</string>
-	<string name="no_url_handler">No handler for this url.</string>
-	<string name="open_recent">Open recent database (click to open)</string>
-	<string name="omitbackup_title">Don\'t search backup and recycle bin entries</string>
-	<string name="omitbackup_summary">Omit \'Backup\' and Recycle Bin group from search results</string>
-	<string name="pass_filename">KeePass database filename</string>
-	<string name="password_title">Enter database password</string>
-	<string name="progress_create">Creating new database…</string>
-	<string name="progress_title">Working…</string>
-	<string name="remember_keyfile_summary">Remembers the location of keyfiles</string>
-	<string name="remember_keyfile_title">Save keyfile</string>
-	<string name="remove_from_filelist">Remove</string>
-	<string name="rijndael">Rijndael (AES)</string>
-	<string name="root">Root</string>
-	<string name="rounds">Encryption Rounds</string>
-	<string name="rounds_explaination">Higher encryption rounds provide additional protection against brute force attacks, but can really slow down loading and saving.</string>
-	<string name="rounds_hint">rounds</string>
-	<string name="default_username">Default user name for new entries</string>
-	<string name="default_username_summary"></string>
-	<string name="saving_database">Saving database…</string>
-	<string name="space">Space</string>
-	<string name="search_label">Search</string>
-	<string name="show_password">Show password</string>
-	<string name="sort_name">Sort by name</string>
-	<string name="sort_db">Sort by creation date</string>
-	<string name="special">Special</string>
-	<string name="search_hint">Find what</string>
-	<string name="search_results">Search results</string>
-	<string name="search_in">Search in</string>
-	<string name="twofish">Twofish</string>
-	<string name="underline">Underline</string>
-	<string name="unsupported_db_version">Unsupported database version.</string>
-	<string name="uppercase">Upper-case</string>
-	<string name="warning_read_only">Your sd card is currently read-only. You may not be able to save changes to your database.</string>
-	<string name="warning_unmounted">Your sd card is not currently mounted on your device. You will not be able to load or create your database.</string>
-	<string name="version_label">Version</string>
-	<string name="regular_expression">Regular expression</string>
-	<string name="TanExpiresOnUse_title">Tan expires on use</string>
-	<string name="TanExpiresOnUse_summary">Mark TAN entries expired when using them</string>
-	<string name="kp2a_findUrl">Keepass2Android: Find password</string>
-	<string name="excludeExpiredEntries">Exclude expired entries</string>
-	<string-array name="clipboard_timeout_options">
-		<item>30 seconds</item>
-		<item>1 minute</item>
-		<item>5 minutes</item>
-		<item>Never</item>
-	</string-array>
-	<string-array name="list_size_options">
-		<item>Small</item>
-		<item>Medium</item>
-		<item>Large</item>
-	</string-array>
-	<string name="search_options">Options</string>
-	<string name="caseSensitive">Case sensitive</string>
-	<string name="start_open_file">Open file...</string>
-	<string name="start_create">Create new database...</string>
-	<string name="start_open_url">Open URL...</string>
-	<string name="start_create_import">Import file to new database...</string>
-	<string name="enter_filename_details_file"> </string>
-	<string name="enter_filename_details_url">The complete URL must be specified including protocol like http://.</string>
-	<string name="enter_filename_details_create"></string>
-	<string name="enter_filename_details_create_import">File to import will be selected in the next step.</string>
-	<string name="enable_quickunlock">Enable QuickUnlock</string>
-	<string name="QuickUnlock_label">Enter last %1$d characters of your password:</string>
-	<string name="QuickUnlock_button">QuickUnlock!</string>
-	<string name="QuickUnlock_lockButton">Close database</string>
-	<string name="QuickUnlockDefaultEnabled_title">Enable QuickUnlock by default</string>
-	<string name="QuickUnlockDefaultEnabled_summary">Defines whether QuickUnlock is enabled by default or not.</string>
-	
-	<string name="QuickUnlockLength_title">Length of QuickUnlock key</string>
-	<string name="QuickUnlockLength_summary">Maximum number of characters used as QuickUnlock password.</string>
-	<string name="QuickUnlock_fail">QuickUnlock failed: incorrect password!</string>
-	<string name="QuickUnlockLength_default">3</string>
-	<string name="BinaryDirectory_title">File attachments directory</string>
-	<string name="BinaryDirectory_summary">Directory where file attachments are saved to.</string>
-	<string name="SaveAttachment_doneMessage">Saved file to %1$s.</string>
-	<string name="SaveAttachment_Failed">Could not save attachment to %1$s.</string>
-	
-	<string name="error_invalid_expiry_date">Invalid date/time format for expiry date!</string>
-    <string name="error_string_key">A field name is required for each string.</string>
-    
-    <string name="field_name">Field Name</string>
-    <string name="field_value">Field value</string>
-    <string name="protection">Memory Protection</string>
-
-	<string name="add_binary">Add file attachment...</string>
-	<string name="add_extra_string">Add additional string</string>
-	
-	<string name="database_loaded_quickunlock_enabled">Database loaded, QuickUnlock enabled.</string>
-
-	<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>
-	</string-array>
-	<string name="credentials_dialog_title">Enter server credentials</string>
-	<string name="UseFileTransactions_title">File transactions</string>
-	<string name="UseFileTransactions_summary">Use file transactions for writing databases</string>
-	
-	<string name="AskOverwriteBinary">Do you want to overwrite the existing binary with the same name?</string>
-	<string name="AskOverwriteBinary_title">Overwrite existing binary?</string>
-	<string name="AskOverwriteBinary_yes">Overwrite</string>
-	<string name="AskOverwriteBinary_no">Rename</string>
-	<string name="AttachFailed">Failed to add file attachment.</string>
-	
-	<string name="RecycleBin">Recycle Bin</string>
-	
-</resources>
\ No newline at end of file
+  <string name="about_feedback">Feedback</string>
+  <string name="about_homepage">Homepage</string>
+  <string name="AboutText">Keepass2Android is a password manager providing read/write access to KeePass 2.x databases on Android.</string>
+  <string name="CreditsText">The User Interface is based on a port of KeepassDroid developed by Brian Pellin. Code for database operations is based on KeePass by Dominik Reichl. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the Creative Commons 3.0 Attribution License.</string>
+  <string name="accept">Accept</string>
+  <string name="add_entry">Add entry</string>
+  <string name="add_group">Add group</string>
+  <string name="add_group_title">Add Group</string>
+  <string name="algorithm">Algorithm</string>
+  <string name="algorithm_colon">Algorithm</string>
+  <string name="app_name">Keepass2Android</string>
+  <string name="short_app_name">KP2A</string>
+  <string name="app_timeout">Application timeout</string>
+  <string name="app_timeout_summary">Time before locking database when the application is inactive.</string>
+  <string name="application">Application</string>
+  <string name="application_settings">Application settings</string>
+  <string name="brackets">Brackets</string>
+  <string name="browser_intall_text">File browsing requires the Open Intents File Manager, click below to install it. Due to some quirks in the file manager, browsing may not work correctly, the first time you browse.</string>
+  <string name="building_search_idx">Building search index…</string>
+  <string name="cancel">Cancel</string>
+  <string name="ClearClipboard">Clipboard cleared.</string>
+  <string name="clipboard_timeout">Clipboard timeout</string>
+  <string name="clipboard_timeout_summary">Time before clearing clipboard after copying username or password</string>
+  <string name="copy_username">Select to copy username to clipboard</string>
+  <string name="copy_password">Select to copy password to clipboard</string>
+  <string name="creating_db_key">Creating database key…</string>
+  <string name="current_group">Current Group</string>
+  <string name="current_group_root">Current Group: Root</string>
+  <string name="database">Database</string>
+  <string name="decrypting_db">Decrypting database contents…</string>
+  <string name="decrypting_entry">Decrypting entry</string>
+  <string name="default_checkbox">Use this as my default database</string>
+  <string name="digits">Digits</string>
+  <string name="disclaimer_formal">Keepass2Android comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 2 or later.</string>
+  <string name="ellipsis">\u2026</string>
+  <string name="enter_filename">Enter database filename</string>
+  <string name="entry_accessed">Accessed</string>
+  <string name="entry_and_or">Enter a password and/or a key file to unlock your database</string>
+  <string name="entry_cancel">Cancel</string>
+  <string name="entry_comment">Comments</string>
+  <string name="entry_tags">Tags</string>
+  <string name="entry_override_url">Override URL</string>
+  <string name="entry_confpassword">Confirm password</string>
+  <string name="entry_created">Created</string>
+  <string name="entry_expires">Expires</string>
+  <string name="entry_keyfile">Key file (optional)</string>
+  <string name="entry_modified">Modified</string>
+  <string name="entry_password">Password</string>
+  <string name="entry_save">Save</string>
+  <string name="entry_title">Name</string>
+  <string name="entry_url">URL</string>
+  <string name="entry_user_name">User Name</string>
+  <string name="entry_extra_strings">Extra string fields</string>
+  <string name="entry_binaries">File attachments</string>
+  <string name="error_arc4">The ArcFour stream cipher is not supported.</string>
+  <string name="error_can_not_handle_uri">Keepass2Android cannot handle this uri.</string>
+  <string name="error_could_not_create_group">Error creating group.</string>
+  <string name="error_could_not_create_parent">Could not create parent directory.</string>
+  <string name="error_database_exists">This file already exists.</string>
+  <string name="error_database_settings">Failed to determine database settings.</string>
+  <string name="error_failed_to_launch_link">Failed to launch link.</string>
+  <string name="error_filename_required">A filename is required.</string>
+  <string name="error_file_not_create">Could not create file</string>
+  <string name="error_invalid_db">Invalid database.</string>
+  <string name="error_invalid_path">Invalid path.</string>
+  <string name="error_no_name">A name is required.</string>
+  <string name="error_nopass">A password or a keyfile is required.</string>
+  <string name="error_out_of_memory">The phone ran out of memory while parsing your database. It may be too large for your phone.</string>
+  <string name="error_pass_gen_type">At least one password generation type must be selected</string>
+  <string name="error_pass_match">Passwords do not match.</string>
+  <string name="error_rounds_not_number">Rounds must be a number.</string>
+  <string name="error_rounds_too_large">Rounds too big.  Setting to 2147483648.</string>
+  <string name="error_title_required">A title is required.</string>
+  <string name="error_wrong_length">Enter a positive integer on length field</string>
+  <string name="FileNotFound">File not found.</string>
+  <string name="file_browser">File Browser</string>
+  <string name="generate_password">Generate Password</string>
+  <string name="group">Group</string>
+  <string name="hint_comment">comment</string>
+  <string name="hint_conf_pass">confirm password</string>
+  <string name="hint_generated_password">generated password</string>
+  <string name="hint_group_name">Group name</string>
+  <string name="hint_keyfile">key file</string>
+  <string name="hint_length">length</string>
+  <string name="hint_pass">password</string>
+  <string name="hint_login_pass">Password</string>
+  <string name="hint_title">name</string>
+  <string name="hint_url">url</string>
+  <string name="hint_override_url">override url</string>
+  <string name="hint_tags">tag1, tag2</string>
+  <string name="hint_username">username</string>
+  <string name="install_from_market">Install from Play Store</string>
+  <string name="install_from_website">Install from Web</string>
+  <string name="InvalidPassword">Invalid password or key file.</string>
+  <string name="invalid_algorithm">Invalid algorithm.</string>
+  <string name="invalid_db_sig">Database format not recognized.</string>
+  <string name="keyfile_does_not_exist">Key file does not exist.</string>
+  <string name="keyfile_is_empty">Key file is empty.</string>
+  <string name="length">Length</string>
+  <string name="list_size_title">Group list size</string>
+  <string name="list_size_summary">Text size in the group list</string>
+  <string name="loading_database">Loading database…</string>
+  <string name="lowercase">Lower-case</string>
+  <string name="MaskedPassword">*****</string>
+  <string name="maskpass_title">Mask password</string>
+  <string name="maskpass_summary">Hide passwords by default</string>
+  <string name="menu_about">About</string>
+  <string name="menu_change_key">Change Master Key</string>
+  <string name="menu_copy_pass">Copy Password</string>
+  <string name="menu_copy_user">Copy User</string>
+  <string name="menu_create">Create</string>
+  <string name="menu_app_settings">Settings</string>
+  <string name="menu_db_settings">Database settings</string>
+  <string name="menu_delete">Delete</string>
+  <string name="menu_donate">Donate</string>
+  <string name="menu_edit">Edit</string>
+  <string name="menu_hide_password">Hide Password</string>
+  <string name="menu_homepage">Go to Homepage</string>
+  <string name="menu_lock">Lock Database</string>
+  <string name="menu_open">Open</string>
+  <string name="menu_rename">Rename</string>
+  <string name="menu_search">Search</string>
+  <string name="menu_url">Go to URL</string>
+  <string name="minus">Minus</string>
+  <string name="never">Never</string>
+  <string name="no_keys">No entries in the database or group.</string>
+  <string name="no_results">No search results</string>
+  <string name="no_url_handler">No handler for this url.</string>
+  <string name="open_recent">Open recent database (click to open)</string>
+  <string name="omitbackup_title">Don\'t search backup and recycle bin entries</string>
+  <string name="omitbackup_summary">Omit \'Backup\' and Recycle Bin group from search results</string>
+  <string name="pass_filename">KeePass database filename</string>
+  <string name="password_title">Enter database password</string>
+  <string name="progress_create">Creating new database…</string>
+  <string name="progress_title">Working…</string>
+  <string name="remember_keyfile_summary">Remembers the location of keyfiles</string>
+  <string name="remember_keyfile_title">Save keyfile</string>
+  <string name="remove_from_filelist">Remove</string>
+  <string name="rijndael">Rijndael (AES)</string>
+  <string name="root">Root</string>
+  <string name="rounds">Encryption Rounds</string>
+  <string name="rounds_explaination">Higher encryption rounds provide additional protection against brute force attacks, but can really slow down loading and saving.</string>
+  <string name="rounds_hint">rounds</string>
+  <string name="default_username">Default user name for new entries</string>
+  <string name="saving_database">Saving database…</string>
+  <string name="space">Space</string>
+  <string name="search_label">Search</string>
+  <string name="show_password">Show password</string>
+  <string name="sort_name">Sort by name</string>
+  <string name="sort_db">Sort by creation date</string>
+  <string name="special">Special</string>
+  <string name="search_hint">Find what</string>
+  <string name="search_results">Search results</string>
+  <string name="search_in">Search in</string>
+  <string name="twofish">Twofish</string>
+  <string name="underline">Underline</string>
+  <string name="unsupported_db_version">Unsupported database version.</string>
+  <string name="uppercase">Upper-case</string>
+  <string name="warning_read_only">Your sd card is currently read-only. You may not be able to save changes to your database.</string>
+  <string name="warning_unmounted">Your sd card is not currently mounted on your device. You will not be able to load or create your database.</string>
+  <string name="version_label">Version</string>
+  <string name="regular_expression">Regular expression</string>
+  <string name="TanExpiresOnUse_title">Tan expires on use</string>
+  <string name="TanExpiresOnUse_summary">Mark TAN entries expired when using them</string>
+  <string name="kp2a_findUrl">Keepass2Android: Find password</string>
+  <string name="excludeExpiredEntries">Exclude expired entries</string>
+  <string name="search_options">Options</string>
+  <string name="caseSensitive">Case sensitive</string>
+  <string name="start_open_file">Open file...</string>
+  <string name="start_create">Create new database...</string>
+  <string name="start_open_url">Open URL...</string>
+  <string name="start_create_import">Import file to new database...</string>
+  <string name="enter_filename_details_url">The complete URL must be specified including protocol like http://.</string>
+  <string name="enter_filename_details_create_import">File to import will be selected in the next step.</string>
+  <string name="enable_quickunlock">Enable QuickUnlock</string>
+  <string name="QuickUnlock_label">Enter last %1$d characters of your password:</string>
+  <string name="QuickUnlock_button">QuickUnlock!</string>
+  <string name="QuickUnlock_lockButton">Close database</string>
+  <string name="QuickUnlockDefaultEnabled_title">Enable QuickUnlock by default</string>
+  <string name="QuickUnlockDefaultEnabled_summary">Defines whether QuickUnlock is enabled by default or not.</string>
+  <string name="QuickUnlockLength_title">Length of QuickUnlock key</string>
+  <string name="QuickUnlockLength_summary">Maximum number of characters used as QuickUnlock password.</string>
+  <string name="QuickUnlock_fail">QuickUnlock failed: incorrect password!</string>
+  <string name="BinaryDirectory_title">File attachments directory</string>
+  <string name="BinaryDirectory_summary">Directory where file attachments are saved to.</string>
+  <string name="SaveAttachment_doneMessage">Saved file to %1$s.</string>
+  <string name="SaveAttachment_Failed">Could not save attachment to %1$s.</string>
+  <string name="error_invalid_expiry_date">Invalid date/time format for expiry date!</string>
+  <string name="error_string_key">A field name is required for each string.</string>
+  <string name="field_name">Field Name</string>
+  <string name="field_value">Field value</string>
+  <string name="protection">Memory Protection</string>
+  <string name="add_binary">Add file attachment...</string>
+  <string name="add_extra_string">Add additional string</string>
+  <string name="database_loaded_quickunlock_enabled">Database loaded, QuickUnlock enabled.</string>
+  <string name="credentials_dialog_title">Enter server credentials</string>
+  <string name="UseFileTransactions_title">File transactions</string>
+  <string name="UseFileTransactions_summary">Use file transactions for writing databases</string>
+  <string name="AskOverwriteBinary">Do you want to overwrite the existing binary with the same name?</string>
+  <string name="AskOverwriteBinary_title">Overwrite existing binary?</string>
+  <string name="AskOverwriteBinary_yes">Overwrite</string>
+  <string name="AskOverwriteBinary_no">Rename</string>
+  <string name="AttachFailed">Failed to add file attachment.</string>
+  <string name="RecycleBin">Recycle Bin</string>
+  <string-array name="clipboard_timeout_options">
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>5 minutes</item>
+    <item>Never</item>
+  </string-array>
+  <string-array name="list_size_options">
+    <item>Small</item>
+    <item>Medium</item>
+    <item>Large</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>
+  </string-array>
+</resources>
diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android/Resources/xml/preferences.xml
index f7844fbb..d89ecec7 100644
--- a/src/keepass2android/Resources/xml/preferences.xml
+++ b/src/keepass2android/Resources/xml/preferences.xml
@@ -37,7 +37,6 @@
  
 		  <EditTextPreference
                 android:title="@string/default_username"
-                android:summary="@string/default_username_summary"
                 android:persistent="false"
                 android:key="@string/default_username_key"/>
 	</PreferenceScreen>
diff --git a/src/keepass2android/fileselect/FileSelectActivity.cs b/src/keepass2android/fileselect/FileSelectActivity.cs
index c4d458c8..69cf2a48 100644
--- a/src/keepass2android/fileselect/FileSelectActivity.cs
+++ b/src/keepass2android/fileselect/FileSelectActivity.cs
@@ -118,7 +118,7 @@ namespace keepass2android
 				// Set the initial value of the filename
 				EditText filename = (EditText)FindViewById(Resource.Id.file_filename);
 				filename.Text = Android.OS.Environment.ExternalStorageDirectory + GetString(Resource.String.default_file_path);
-				enterFilenameDetails.Text = GetString(Resource.String.enter_filename_details_file);
+				enterFilenameDetails.Text = "";//GetString(Resource.String.enter_filename_details_file);
 				enterFilenameDetails.Visibility = enterFilenameDetails.Text == "" ? ViewStates.Gone : ViewStates.Visible;
 			};
 			openFileButton.Click += openFileButtonClick;
@@ -151,7 +151,7 @@ namespace keepass2android
 				// Set the initial value of the filename
 				EditText filename = (EditText)FindViewById(Resource.Id.file_filename);
 				filename.Text = Android.OS.Environment.ExternalStorageDirectory + GetString(Resource.String.default_file_path);
-				enterFilenameDetails.Text = GetString(Resource.String.enter_filename_details_create);
+				enterFilenameDetails.Text = "";//GetString(Resource.String.enter_filename_details_create);
 				enterFilenameDetails.Visibility = enterFilenameDetails.Text == "" ? ViewStates.Gone : ViewStates.Visible;
 			};
 			createNewButton.Click += createNewButtonClick;