diff --git a/src/Kp2aBusinessLogic/IKp2aApp.cs b/src/Kp2aBusinessLogic/IKp2aApp.cs index 4c930487..1b37cde4 100644 --- a/src/Kp2aBusinessLogic/IKp2aApp.cs +++ b/src/Kp2aBusinessLogic/IKp2aApp.cs @@ -100,6 +100,6 @@ namespace keepass2android RemoteCertificateValidationCallback CertificateValidationCallback { get; } - + bool CheckForDuplicateUuids { get; } } } \ No newline at end of file diff --git a/src/Kp2aBusinessLogic/UiStringKey.cs b/src/Kp2aBusinessLogic/UiStringKey.cs index 29ef86c0..d7d9459c 100644 --- a/src/Kp2aBusinessLogic/UiStringKey.cs +++ b/src/Kp2aBusinessLogic/UiStringKey.cs @@ -55,6 +55,7 @@ namespace keepass2android FileIsReadOnly, FileIsReadOnlyOnKitkat, CopyFileRequiredForEditing, - DuplicateUuidsError + DuplicateUuidsError, + DuplicateUuidsErrorAdditional } } diff --git a/src/Kp2aBusinessLogic/database/Database.cs b/src/Kp2aBusinessLogic/database/Database.cs index 5a46842f..6b2f0302 100644 --- a/src/Kp2aBusinessLogic/database/Database.cs +++ b/src/Kp2aBusinessLogic/database/Database.cs @@ -174,8 +174,7 @@ namespace keepass2android } - - private void PopulateGlobals (PwGroup currentGroup) + private void PopulateGlobals(PwGroup currentGroup, bool checkForDuplicateUuids ) { var childGroups = currentGroup.Groups; @@ -183,22 +182,34 @@ namespace keepass2android foreach (PwEntry e in childEntries) { - if (Entries.ContainsKey(e.Uuid)) + if (checkForDuplicateUuids) { - throw new DuplicateUuidsException(); + if (Entries.ContainsKey(e.Uuid)) + { + throw new DuplicateUuidsException(); + } + } Entries [e.Uuid] = e; } foreach (PwGroup g in childGroups) { - if (Groups.ContainsKey(g.Uuid)) + if (checkForDuplicateUuids) { - throw new DuplicateUuidsException(); + + if (Groups.ContainsKey(g.Uuid)) + { + throw new DuplicateUuidsException(); + } } Groups[g.Uuid] = g; PopulateGlobals(g); } } + private void PopulateGlobals (PwGroup currentGroup) + { + PopulateGlobals(currentGroup, _app.CheckForDuplicateUuids); + } public void Clear() { Groups.Clear(); diff --git a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs index a63bc540..5100c508 100644 --- a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs +++ b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs @@ -92,7 +92,7 @@ namespace keepass2android catch (DuplicateUuidsException e) { Kp2aLog.Log("Exception: " + e); - Finish(false, _app.GetResourceString(UiStringKey.DuplicateUuidsError)); + Finish(false, _app.GetResourceString(UiStringKey.DuplicateUuidsError)+" " + _app.GetResourceString(UiStringKey.DuplicateUuidsErrorAdditional)); return; } catch (Exception e) diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs index ac7d1fd4..f293ad9b 100644 --- a/src/keepass2android/PasswordActivity.cs +++ b/src/keepass2android/PasswordActivity.cs @@ -139,7 +139,8 @@ namespace keepass2android private ActivityDesign _design; private bool _performingLoad; - + private bool _keepPasswordInOnResume; + public PasswordActivity (IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer) @@ -213,7 +214,7 @@ namespace keepass2android protected override void OnActivityResult(int requestCode, Result resultCode, Intent data) { base.OnActivityResult(requestCode, resultCode, data); - + _keepPasswordInOnResume = true; Kp2aLog.Log("PasswordActivity.OnActivityResult "+resultCode+"/"+requestCode); AppTask.TryGetFromActivityResult(data, ref AppTask); @@ -576,6 +577,7 @@ namespace keepass2android else if ((action != null) && (action.Equals(Intents.StartWithOtp))) { if (!GetIocFromOtpIntent(savedInstanceState, i)) return; + _keepPasswordInOnResume = true; } else { @@ -596,6 +598,10 @@ namespace keepass2android { _keyFileOrProvider = GetKeyFile(_ioConnection.Path); } + if ((!string.IsNullOrEmpty(_keyFileOrProvider)) || (_password != "")) + { + _keepPasswordInOnResume = true; + } } if (App.Kp2a.GetDb().Loaded && App.Kp2a.GetDb().Ioc != null && @@ -1199,7 +1205,7 @@ namespace keepass2android if ((intent != null) && (intent.HasExtra(Intents.OtpExtraKey))) { string otp = intent.GetStringExtra(Intents.OtpExtraKey); - + _keepPasswordInOnResume = true; if (_otpInfo == null) { //Entering OTPs not yet initialized: @@ -1260,6 +1266,12 @@ namespace keepass2android killButton.Visibility = ViewStates.Gone; } + if (!_keepPasswordInOnResume) + { + ClearEnteredPassword(); + } + _keepPasswordInOnResume = false; + MakePasswordMaskedOrVisible(); UpdateOkButtonState(); @@ -1347,11 +1359,6 @@ namespace keepass2android } } - protected override void OnPause() - { - base.OnPause(); - ClearEnteredPassword(); //if the activity is left without opening the database, clear the password if entered - } protected override void OnDestroy() { @@ -1437,7 +1444,18 @@ namespace keepass2android GC.Collect(); // Ensure temporary memory used while loading is collected } - DisplayMessage(_act); + if ((Message != null) && (Message.Length > 150)) //show long messages as dialog + { + new AlertDialog.Builder(_act).SetMessage(Message) + .SetPositiveButton(Android.Resource.String.Ok, + (sender, args) => ((Dialog) sender).Dismiss()) + .Show(); + } + else + { + DisplayMessage(_act); + } + _act._performingLoad = false; diff --git a/src/keepass2android/Resources/Resource.designer.cs b/src/keepass2android/Resources/Resource.designer.cs index 830e401f..1cd48225 100644 --- a/src/keepass2android/Resources/Resource.designer.cs +++ b/src/keepass2android/Resources/Resource.designer.cs @@ -4934,80 +4934,80 @@ namespace keepass2android public partial class String { - // aapt resource value: 0x7f070163 - public const int AboutText = 2131165539; + // aapt resource value: 0x7f070164 + public const int AboutText = 2131165540; - // aapt resource value: 0x7f07015e - public const int AcceptAllServerCertificates_default = 2131165534; + // aapt resource value: 0x7f07015f + public const int AcceptAllServerCertificates_default = 2131165535; // aapt resource value: 0x7f07014f public const int AcceptAllServerCertificates_key = 2131165519; - // aapt resource value: 0x7f070274 - public const int AcceptAllServerCertificates_summary = 2131165812; + // aapt resource value: 0x7f070275 + public const int AcceptAllServerCertificates_summary = 2131165813; - // aapt resource value: 0x7f070273 - public const int AcceptAllServerCertificates_title = 2131165811; + // aapt resource value: 0x7f070274 + public const int AcceptAllServerCertificates_title = 2131165812; + + // aapt resource value: 0x7f07025d + public const int AddUrlToEntryDialog_text = 2131165789; // aapt resource value: 0x7f07025c - public const int AddUrlToEntryDialog_text = 2131165788; + public const int AddUrlToEntryDialog_title = 2131165788; - // aapt resource value: 0x7f07025b - public const int AddUrlToEntryDialog_title = 2131165787; + // aapt resource value: 0x7f07029e + public const int AddingEntry = 2131165854; - // aapt resource value: 0x7f07029b - public const int AddingEntry = 2131165851; - - // aapt resource value: 0x7f07029c - public const int AddingGroup = 2131165852; + // aapt resource value: 0x7f07029f + public const int AddingGroup = 2131165855; // aapt resource value: 0x7f070039 public const int ApplicationName = 2131165241; - // aapt resource value: 0x7f070291 - public const int AskDeletePermanentlyEntry = 2131165841; - - // aapt resource value: 0x7f070292 - public const int AskDeletePermanentlyGroup = 2131165842; - - // aapt resource value: 0x7f070293 - public const int AskDeletePermanently_title = 2131165843; - - // aapt resource value: 0x7f070296 - public const int AskDiscardChanges = 2131165846; - - // aapt resource value: 0x7f070297 - public const int AskDiscardChanges_title = 2131165847; - - // aapt resource value: 0x7f07028b - public const int AskOverwriteBinary = 2131165835; - - // aapt resource value: 0x7f07028e - public const int AskOverwriteBinary_no = 2131165838; - - // aapt resource value: 0x7f07028c - public const int AskOverwriteBinary_title = 2131165836; - - // aapt resource value: 0x7f07028d - public const int AskOverwriteBinary_yes = 2131165837; + // aapt resource value: 0x7f070294 + public const int AskDeletePermanentlyEntry = 2131165844; // aapt resource value: 0x7f070295 - public const int AskReloadFile = 2131165845; + public const int AskDeletePermanentlyGroup = 2131165845; - // aapt resource value: 0x7f070294 - public const int AskReloadFile_title = 2131165844; + // aapt resource value: 0x7f070296 + public const int AskDeletePermanently_title = 2131165846; + + // aapt resource value: 0x7f070299 + public const int AskDiscardChanges = 2131165849; + + // aapt resource value: 0x7f07029a + public const int AskDiscardChanges_title = 2131165850; + + // aapt resource value: 0x7f07028e + public const int AskOverwriteBinary = 2131165838; + + // aapt resource value: 0x7f070291 + public const int AskOverwriteBinary_no = 2131165841; // aapt resource value: 0x7f07028f - public const int AttachFailed = 2131165839; + public const int AskOverwriteBinary_title = 2131165839; - // aapt resource value: 0x7f07015a - public const int AutoSwitchBackKeyboard_key = 2131165530; + // aapt resource value: 0x7f070290 + public const int AskOverwriteBinary_yes = 2131165840; - // aapt resource value: 0x7f070286 - public const int AutoSwitchBackKeyboard_summary = 2131165830; + // aapt resource value: 0x7f070298 + public const int AskReloadFile = 2131165848; - // aapt resource value: 0x7f070285 - public const int AutoSwitchBackKeyboard_title = 2131165829; + // aapt resource value: 0x7f070297 + public const int AskReloadFile_title = 2131165847; + + // aapt resource value: 0x7f070292 + public const int AttachFailed = 2131165842; + + // aapt resource value: 0x7f07015b + public const int AutoSwitchBackKeyboard_key = 2131165531; + + // aapt resource value: 0x7f070289 + public const int AutoSwitchBackKeyboard_summary = 2131165833; + + // aapt resource value: 0x7f070288 + public const int AutoSwitchBackKeyboard_title = 2131165832; // aapt resource value: 0x7f070138 public const int BinaryDirectory_default = 2131165496; @@ -5015,326 +5015,338 @@ namespace keepass2android // aapt resource value: 0x7f070137 public const int BinaryDirectory_key = 2131165495; + // aapt resource value: 0x7f070255 + public const int BinaryDirectory_summary = 2131165781; + // aapt resource value: 0x7f070254 - public const int BinaryDirectory_summary = 2131165780; - - // aapt resource value: 0x7f070253 - public const int BinaryDirectory_title = 2131165779; - - // aapt resource value: 0x7f07031b - public const int CancelReadOnly = 2131165979; - - // aapt resource value: 0x7f0702c0 - public const int CannotMoveGroupHere = 2131165888; - - // aapt resource value: 0x7f070312 - public const int CertificateFailure = 2131165970; - - // aapt resource value: 0x7f070311 - public const int CertificateWarning = 2131165969; - - // aapt resource value: 0x7f070330 - public const int ChangeLog = 2131166000; - - // aapt resource value: 0x7f07032f - public const int ChangeLog_0_7 = 2131165999; - - // aapt resource value: 0x7f07032d - public const int ChangeLog_0_8 = 2131165997; - - // aapt resource value: 0x7f07032c - public const int ChangeLog_0_8_1 = 2131165996; - - // aapt resource value: 0x7f07032b - public const int ChangeLog_0_8_2 = 2131165995; - - // aapt resource value: 0x7f07032a - public const int ChangeLog_0_8_3 = 2131165994; - - // aapt resource value: 0x7f070329 - public const int ChangeLog_0_8_4 = 2131165993; - - // aapt resource value: 0x7f070328 - public const int ChangeLog_0_8_5 = 2131165992; - - // aapt resource value: 0x7f070327 - public const int ChangeLog_0_8_6 = 2131165991; - - // aapt resource value: 0x7f070326 - public const int ChangeLog_0_9 = 2131165990; - - // aapt resource value: 0x7f070325 - public const int ChangeLog_0_9_1 = 2131165989; - - // aapt resource value: 0x7f070324 - public const int ChangeLog_0_9_2 = 2131165988; - - // aapt resource value: 0x7f070323 - public const int ChangeLog_0_9_3 = 2131165987; - - // aapt resource value: 0x7f070322 - public const int ChangeLog_0_9_3_r5 = 2131165986; - - // aapt resource value: 0x7f070321 - public const int ChangeLog_0_9_4 = 2131165985; - - // aapt resource value: 0x7f070320 - public const int ChangeLog_0_9_5 = 2131165984; + public const int BinaryDirectory_title = 2131165780; // aapt resource value: 0x7f07031f - public const int ChangeLog_0_9_6 = 2131165983; + public const int CancelReadOnly = 2131165983; + + // aapt resource value: 0x7f0702c4 + public const int CannotMoveGroupHere = 2131165892; + + // aapt resource value: 0x7f070316 + public const int CertificateFailure = 2131165974; + + // aapt resource value: 0x7f070315 + public const int CertificateWarning = 2131165973; + + // aapt resource value: 0x7f070334 + public const int ChangeLog = 2131166004; + + // aapt resource value: 0x7f070333 + public const int ChangeLog_0_7 = 2131166003; + + // aapt resource value: 0x7f070331 + public const int ChangeLog_0_8 = 2131166001; + + // aapt resource value: 0x7f070330 + public const int ChangeLog_0_8_1 = 2131166000; + + // aapt resource value: 0x7f07032f + public const int ChangeLog_0_8_2 = 2131165999; // aapt resource value: 0x7f07032e - public const int ChangeLog_keptDonate = 2131165998; + public const int ChangeLog_0_8_3 = 2131165998; - // aapt resource value: 0x7f07031d - public const int ChangeLog_title = 2131165981; + // aapt resource value: 0x7f07032d + public const int ChangeLog_0_8_4 = 2131165997; + + // aapt resource value: 0x7f07032c + public const int ChangeLog_0_8_5 = 2131165996; + + // aapt resource value: 0x7f07032b + public const int ChangeLog_0_8_6 = 2131165995; + + // aapt resource value: 0x7f07032a + public const int ChangeLog_0_9 = 2131165994; + + // aapt resource value: 0x7f070329 + public const int ChangeLog_0_9_1 = 2131165993; + + // aapt resource value: 0x7f070328 + public const int ChangeLog_0_9_2 = 2131165992; + + // aapt resource value: 0x7f070327 + public const int ChangeLog_0_9_3 = 2131165991; + + // aapt resource value: 0x7f070326 + public const int ChangeLog_0_9_3_r5 = 2131165990; + + // aapt resource value: 0x7f070325 + public const int ChangeLog_0_9_4 = 2131165989; + + // aapt resource value: 0x7f070324 + public const int ChangeLog_0_9_5 = 2131165988; + + // aapt resource value: 0x7f070323 + public const int ChangeLog_0_9_6 = 2131165987; + + // aapt resource value: 0x7f070332 + public const int ChangeLog_keptDonate = 2131166002; + + // aapt resource value: 0x7f070321 + public const int ChangeLog_title = 2131165985; + + // aapt resource value: 0x7f070151 + public const int CheckForDuplicateUuids_key = 2131165521; + + // aapt resource value: 0x7f07027b + public const int CheckForDuplicateUuids_summary = 2131165819; + + // aapt resource value: 0x7f07027a + public const int CheckForDuplicateUuids_title = 2131165818; // aapt resource value: 0x7f070150 public const int CheckForFileChangesOnSave_key = 2131165520; + // aapt resource value: 0x7f070279 + public const int CheckForFileChangesOnSave_summary = 2131165817; + // aapt resource value: 0x7f070278 - public const int CheckForFileChangesOnSave_summary = 2131165816; + public const int CheckForFileChangesOnSave_title = 2131165816; + + // aapt resource value: 0x7f0702b3 + public const int CheckingDatabaseForChanges = 2131165875; + + // aapt resource value: 0x7f0702a7 + public const int CheckingTargetFileForChanges = 2131165863; + + // aapt resource value: 0x7f07018f + public const int ClearClipboard = 2131165583; // aapt resource value: 0x7f070277 - public const int CheckForFileChangesOnSave_title = 2131165815; - - // aapt resource value: 0x7f0702b0 - public const int CheckingDatabaseForChanges = 2131165872; - - // aapt resource value: 0x7f0702a4 - public const int CheckingTargetFileForChanges = 2131165860; - - // aapt resource value: 0x7f07018e - public const int ClearClipboard = 2131165582; + public const int ClearOfflineCache_question = 2131165815; // aapt resource value: 0x7f070276 - public const int ClearOfflineCache_question = 2131165814; + public const int ClearOfflineCache_title = 2131165814; - // aapt resource value: 0x7f070275 - public const int ClearOfflineCache_title = 2131165813; - - // aapt resource value: 0x7f07031a - public const int ClickOkToSelectLocation = 2131165978; - - // aapt resource value: 0x7f070318 - public const int CopyFileRequired = 2131165976; - - // aapt resource value: 0x7f070319 - public const int CopyFileRequiredForEditing = 2131165977; - - // aapt resource value: 0x7f070155 - public const int CopyToClipboardNotification_key = 2131165525; + // aapt resource value: 0x7f07031e + public const int ClickOkToSelectLocation = 2131165982; // aapt resource value: 0x7f07031c - public const int CopyingFile = 2131165980; + public const int CopyFileRequired = 2131165980; - // aapt resource value: 0x7f0702b2 - public const int CouldNotLoadFromRemote = 2131165874; + // aapt resource value: 0x7f07031d + public const int CopyFileRequiredForEditing = 2131165981; - // aapt resource value: 0x7f0702b1 - public const int CouldNotSaveToRemote = 2131165873; + // aapt resource value: 0x7f070156 + public const int CopyToClipboardNotification_key = 2131165526; - // aapt resource value: 0x7f0702f4 - public const int CouldntLoadChalAuxFile = 2131165940; + // aapt resource value: 0x7f070320 + public const int CopyingFile = 2131165984; - // aapt resource value: 0x7f0702f5 - public const int CouldntLoadChalAuxFile_Hint = 2131165941; + // aapt resource value: 0x7f0702b5 + public const int CouldNotLoadFromRemote = 2131165877; - // aapt resource value: 0x7f0702e8 - public const int CouldntLoadOtpAuxFile = 2131165928; + // aapt resource value: 0x7f0702b4 + public const int CouldNotSaveToRemote = 2131165876; - // aapt resource value: 0x7f0702e9 - public const int CouldntLoadOtpAuxFile_Hint = 2131165929; + // aapt resource value: 0x7f0702f8 + public const int CouldntLoadChalAuxFile = 2131165944; - // aapt resource value: 0x7f0702ef - public const int CouldntParseOtpSecret = 2131165935; + // aapt resource value: 0x7f0702f9 + public const int CouldntLoadChalAuxFile_Hint = 2131165945; - // aapt resource value: 0x7f070164 - public const int CreditsText = 2131165540; + // aapt resource value: 0x7f0702ec + public const int CouldntLoadOtpAuxFile = 2131165932; + + // aapt resource value: 0x7f0702ed + public const int CouldntLoadOtpAuxFile_Hint = 2131165933; + + // aapt resource value: 0x7f0702f3 + public const int CouldntParseOtpSecret = 2131165939; // aapt resource value: 0x7f070165 - public const int CreditsTextSFTP = 2131165541; + public const int CreditsText = 2131165541; - // aapt resource value: 0x7f07018a - public const int DatabaseFileMoved = 2131165578; + // aapt resource value: 0x7f070166 + public const int CreditsTextSFTP = 2131165542; - // aapt resource value: 0x7f0702a2 - public const int DecodingDatabase = 2131165858; + // aapt resource value: 0x7f07018b + public const int DatabaseFileMoved = 2131165579; - // aapt resource value: 0x7f07029d - public const int DeletingEntry = 2131165853; + // aapt resource value: 0x7f0702a5 + public const int DecodingDatabase = 2131165861; - // aapt resource value: 0x7f07029e - public const int DeletingGroup = 2131165854; + // aapt resource value: 0x7f0702a0 + public const int DeletingEntry = 2131165856; - // aapt resource value: 0x7f0702ab - public const int DownloadingRemoteFile = 2131165867; + // aapt resource value: 0x7f0702a1 + public const int DeletingGroup = 2131165857; - // aapt resource value: 0x7f0702be - public const int DuplicateUuidsError = 2131165886; + // aapt resource value: 0x7f0702ae + public const int DownloadingRemoteFile = 2131165870; - // aapt resource value: 0x7f0702bd - public const int ErrorOcurred = 2131165885; + // aapt resource value: 0x7f0702c1 + public const int DuplicateUuidsError = 2131165889; - // aapt resource value: 0x7f0702f6 - public const int ErrorUpdatingChalAuxFile = 2131165942; + // aapt resource value: 0x7f0702c2 + public const int DuplicateUuidsErrorAdditional = 2131165890; - // aapt resource value: 0x7f0702f1 - public const int ErrorUpdatingOtpAuxFile = 2131165937; + // aapt resource value: 0x7f0702c0 + public const int ErrorOcurred = 2131165888; - // aapt resource value: 0x7f070182 - public const int FileHandling_prefs = 2131165570; + // aapt resource value: 0x7f0702fa + public const int ErrorUpdatingChalAuxFile = 2131165946; + + // aapt resource value: 0x7f0702f5 + public const int ErrorUpdatingOtpAuxFile = 2131165941; + + // aapt resource value: 0x7f070183 + public const int FileHandling_prefs = 2131165571; // aapt resource value: 0x7f070141 public const int FileHandling_prefs_key = 2131165505; - // aapt resource value: 0x7f070189 - public const int FileIsInInternalDirectory = 2131165577; + // aapt resource value: 0x7f07018a + public const int FileIsInInternalDirectory = 2131165578; - // aapt resource value: 0x7f070316 - public const int FileIsReadOnly = 2131165974; + // aapt resource value: 0x7f07031a + public const int FileIsReadOnly = 2131165978; - // aapt resource value: 0x7f070317 - public const int FileIsReadOnlyOnKitkat = 2131165975; + // aapt resource value: 0x7f07031b + public const int FileIsReadOnlyOnKitkat = 2131165979; - // aapt resource value: 0x7f070315 - public const int FileIsTemporarilyAvailable = 2131165973; + // aapt resource value: 0x7f070319 + public const int FileIsTemporarilyAvailable = 2131165977; - // aapt resource value: 0x7f0701c3 - public const int FileNotFound = 2131165635; + // aapt resource value: 0x7f0701c4 + public const int FileNotFound = 2131165636; - // aapt resource value: 0x7f0702ae - public const int FilesInSync = 2131165870; + // aapt resource value: 0x7f0702b1 + public const int FilesInSync = 2131165873; - // aapt resource value: 0x7f0701d4 - public const int InvalidPassword = 2131165652; + // aapt resource value: 0x7f0701d5 + public const int InvalidPassword = 2131165653; + + // aapt resource value: 0x7f07018d + public const int KeyfileMoveRequiresRememberKeyfile = 2131165581; // aapt resource value: 0x7f07018c - public const int KeyfileMoveRequiresRememberKeyfile = 2131165580; - - // aapt resource value: 0x7f07018b - public const int KeyfileMoved = 2131165579; + public const int KeyfileMoved = 2131165580; // aapt resource value: 0x7f070149 public const int LastInfoVersionCode_key = 2131165513; - // aapt resource value: 0x7f0702b5 - public const int LoadedFromRemoteInSync = 2131165877; + // aapt resource value: 0x7f0702b8 + public const int LoadedFromRemoteInSync = 2131165880; // aapt resource value: 0x7f07014c public const int LockWhenNavigateBack_key = 2131165516; - // aapt resource value: 0x7f07026d - public const int LockWhenNavigateBack_summary = 2131165805; + // aapt resource value: 0x7f07026e + public const int LockWhenNavigateBack_summary = 2131165806; - // aapt resource value: 0x7f07026c - public const int LockWhenNavigateBack_title = 2131165804; + // aapt resource value: 0x7f07026d + public const int LockWhenNavigateBack_title = 2131165805; // aapt resource value: 0x7f07014b public const int LockWhenScreenOff_key = 2131165515; + // aapt resource value: 0x7f07026c + public const int LockWhenScreenOff_summary = 2131165804; + // aapt resource value: 0x7f07026b - public const int LockWhenScreenOff_summary = 2131165803; + public const int LockWhenScreenOff_title = 2131165803; - // aapt resource value: 0x7f07026a - public const int LockWhenScreenOff_title = 2131165802; + // aapt resource value: 0x7f070153 + public const int MarketURL = 2131165523; - // aapt resource value: 0x7f070152 - public const int MarketURL = 2131165522; + // aapt resource value: 0x7f0701e0 + public const int MaskedPassword = 2131165664; - // aapt resource value: 0x7f0701df - public const int MaskedPassword = 2131165663; + // aapt resource value: 0x7f0702a9 + public const int MessageSyncQuestion = 2131165865; - // aapt resource value: 0x7f0702a6 - public const int MessageSyncQuestion = 2131165862; - - // aapt resource value: 0x7f07017b - public const int NavigationToGroupCompleted_message = 2131165563; + // aapt resource value: 0x7f07017c + public const int NavigationToGroupCompleted_message = 2131165564; // aapt resource value: 0x7f07014d public const int NoDonateOption_key = 2131165517; + // aapt resource value: 0x7f070271 + public const int NoDonateOption_question = 2131165809; + // aapt resource value: 0x7f070270 - public const int NoDonateOption_question = 2131165808; + public const int NoDonateOption_summary = 2131165808; // aapt resource value: 0x7f07026f - public const int NoDonateOption_summary = 2131165807; + public const int NoDonateOption_title = 2131165807; - // aapt resource value: 0x7f07026e - public const int NoDonateOption_title = 2131165806; + // aapt resource value: 0x7f0702ac + public const int NoOverwrite = 2131165868; - // aapt resource value: 0x7f0702a9 - public const int NoOverwrite = 2131165865; + // aapt resource value: 0x7f0702b7 + public const int NotifyOpenFromLocalDueToConflict = 2131165879; - // aapt resource value: 0x7f0702b4 - public const int NotifyOpenFromLocalDueToConflict = 2131165876; + // aapt resource value: 0x7f070189 + public const int OnlyAvailableForLocalFiles = 2131165577; - // aapt resource value: 0x7f070188 - public const int OnlyAvailableForLocalFiles = 2131165576; + // aapt resource value: 0x7f07015a + public const int OpenKp2aKeyboardAutomaticallyOnlyAfterSearch_key = 2131165530; + + // aapt resource value: 0x7f070287 + public const int OpenKp2aKeyboardAutomaticallyOnlyAfterSearch_summary = 2131165831; + + // aapt resource value: 0x7f070286 + public const int OpenKp2aKeyboardAutomaticallyOnlyAfterSearch_title = 2131165830; // aapt resource value: 0x7f070159 - public const int OpenKp2aKeyboardAutomaticallyOnlyAfterSearch_key = 2131165529; - - // aapt resource value: 0x7f070284 - public const int OpenKp2aKeyboardAutomaticallyOnlyAfterSearch_summary = 2131165828; + public const int OpenKp2aKeyboardAutomatically_key = 2131165529; // aapt resource value: 0x7f070283 - public const int OpenKp2aKeyboardAutomaticallyOnlyAfterSearch_title = 2131165827; + public const int OpenKp2aKeyboardAutomatically_summary = 2131165827; - // aapt resource value: 0x7f070158 - public const int OpenKp2aKeyboardAutomatically_key = 2131165528; + // aapt resource value: 0x7f070282 + public const int OpenKp2aKeyboardAutomatically_title = 2131165826; - // aapt resource value: 0x7f070280 - public const int OpenKp2aKeyboardAutomatically_summary = 2131165824; + // aapt resource value: 0x7f0702f4 + public const int OtpKeyError = 2131165940; - // aapt resource value: 0x7f07027f - public const int OpenKp2aKeyboardAutomatically_title = 2131165823; + // aapt resource value: 0x7f0702a6 + public const int ParsingDatabase = 2131165862; - // aapt resource value: 0x7f0702f0 - public const int OtpKeyError = 2131165936; + // aapt resource value: 0x7f070161 + public const int PreloadDatabaseEnabled_key = 2131165537; - // aapt resource value: 0x7f0702a3 - public const int ParsingDatabase = 2131165859; + // aapt resource value: 0x7f07028d + public const int PreloadDatabaseEnabled_summary = 2131165837; - // aapt resource value: 0x7f070160 - public const int PreloadDatabaseEnabled_key = 2131165536; + // aapt resource value: 0x7f07028c + public const int PreloadDatabaseEnabled_title = 2131165836; - // aapt resource value: 0x7f07028a - public const int PreloadDatabaseEnabled_summary = 2131165834; - - // aapt resource value: 0x7f070289 - public const int PreloadDatabaseEnabled_title = 2131165833; - - // aapt resource value: 0x7f07031e - public const int PreviewWarning = 2131165982; + // aapt resource value: 0x7f070322 + public const int PreviewWarning = 2131165986; // aapt resource value: 0x7f070143 public const int QuickUnlockDefaultEnabled_key = 2131165507; - // aapt resource value: 0x7f070249 - public const int QuickUnlockDefaultEnabled_summary = 2131165769; + // aapt resource value: 0x7f07024a + public const int QuickUnlockDefaultEnabled_summary = 2131165770; - // aapt resource value: 0x7f070248 - public const int QuickUnlockDefaultEnabled_title = 2131165768; + // aapt resource value: 0x7f070249 + public const int QuickUnlockDefaultEnabled_title = 2131165769; // aapt resource value: 0x7f070147 public const int QuickUnlockIconHidden16_key = 2131165511; - // aapt resource value: 0x7f07024f - public const int QuickUnlockIconHidden16_summary = 2131165775; + // aapt resource value: 0x7f070250 + public const int QuickUnlockIconHidden16_summary = 2131165776; - // aapt resource value: 0x7f07024e - public const int QuickUnlockIconHidden16_title = 2131165774; + // aapt resource value: 0x7f07024f + public const int QuickUnlockIconHidden16_title = 2131165775; // aapt resource value: 0x7f070146 public const int QuickUnlockIconHidden_key = 2131165510; - // aapt resource value: 0x7f07024d - public const int QuickUnlockIconHidden_summary = 2131165773; + // aapt resource value: 0x7f07024e + public const int QuickUnlockIconHidden_summary = 2131165774; - // aapt resource value: 0x7f07024c - public const int QuickUnlockIconHidden_title = 2131165772; + // aapt resource value: 0x7f07024d + public const int QuickUnlockIconHidden_title = 2131165773; // aapt resource value: 0x7f070145 public const int QuickUnlockLength_default = 2131165509; @@ -5342,221 +5354,221 @@ namespace keepass2android // aapt resource value: 0x7f070144 public const int QuickUnlockLength_key = 2131165508; - // aapt resource value: 0x7f070251 - public const int QuickUnlockLength_summary = 2131165777; - - // aapt resource value: 0x7f070250 - public const int QuickUnlockLength_title = 2131165776; - - // aapt resource value: 0x7f070246 - public const int QuickUnlock_button = 2131165766; - // aapt resource value: 0x7f070252 - public const int QuickUnlock_fail = 2131165778; + public const int QuickUnlockLength_summary = 2131165778; - // aapt resource value: 0x7f070245 - public const int QuickUnlock_label = 2131165765; + // aapt resource value: 0x7f070251 + public const int QuickUnlockLength_title = 2131165777; // aapt resource value: 0x7f070247 - public const int QuickUnlock_lockButton = 2131165767; + public const int QuickUnlock_button = 2131165767; - // aapt resource value: 0x7f070181 - public const int QuickUnlock_prefs = 2131165569; + // aapt resource value: 0x7f070253 + public const int QuickUnlock_fail = 2131165779; + + // aapt resource value: 0x7f070246 + public const int QuickUnlock_label = 2131165766; + + // aapt resource value: 0x7f070248 + public const int QuickUnlock_lockButton = 2131165768; + + // aapt resource value: 0x7f070182 + public const int QuickUnlock_prefs = 2131165570; // aapt resource value: 0x7f070140 public const int QuickUnlock_prefs_key = 2131165504; - // aapt resource value: 0x7f070290 - public const int RecycleBin = 2131165840; + // aapt resource value: 0x7f070293 + public const int RecycleBin = 2131165843; // aapt resource value: 0x7f070134 public const int RememberRecentFiles_key = 2131165492; + // aapt resource value: 0x7f07023a + public const int RememberRecentFiles_summary = 2131165754; + // aapt resource value: 0x7f070239 - public const int RememberRecentFiles_summary = 2131165753; + public const int RememberRecentFiles_title = 2131165753; - // aapt resource value: 0x7f070238 - public const int RememberRecentFiles_title = 2131165752; + // aapt resource value: 0x7f0702ba + public const int RemoteDatabaseUnchanged = 2131165882; - // aapt resource value: 0x7f0702b7 - public const int RemoteDatabaseUnchanged = 2131165879; + // aapt resource value: 0x7f0702bc + public const int ResolvedCacheConflictByUsingLocalOtpAux = 2131165884; - // aapt resource value: 0x7f0702b9 - public const int ResolvedCacheConflictByUsingLocalOtpAux = 2131165881; + // aapt resource value: 0x7f0702bb + public const int ResolvedCacheConflictByUsingRemoteOtpAux = 2131165883; - // aapt resource value: 0x7f0702b8 - public const int ResolvedCacheConflictByUsingRemoteOtpAux = 2131165880; - - // aapt resource value: 0x7f0702ad - public const int RestoringRemoteFile = 2131165869; - - // aapt resource value: 0x7f07030b - public const int SCOPE_CURRENT_ENTRY_explanation = 2131165963; - - // aapt resource value: 0x7f07030a - public const int SCOPE_CURRENT_ENTRY_title = 2131165962; - - // aapt resource value: 0x7f070309 - public const int SCOPE_DATABASE_ACTIONS_explanation = 2131165961; - - // aapt resource value: 0x7f070308 - public const int SCOPE_DATABASE_ACTIONS_title = 2131165960; - - // aapt resource value: 0x7f07030d - public const int SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE_explanation = 2131165965; - - // aapt resource value: 0x7f07030c - public const int SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE_title = 2131165964; + // aapt resource value: 0x7f0702b0 + public const int RestoringRemoteFile = 2131165872; // aapt resource value: 0x7f07030f - public const int SCOPE_QUERY_CREDENTIALS_explanation = 2131165967; + public const int SCOPE_CURRENT_ENTRY_explanation = 2131165967; // aapt resource value: 0x7f07030e - public const int SCOPE_QUERY_CREDENTIALS_title = 2131165966; + public const int SCOPE_CURRENT_ENTRY_title = 2131165966; - // aapt resource value: 0x7f070258 - public const int SaveAttachmentDialog_open = 2131165784; + // aapt resource value: 0x7f07030d + public const int SCOPE_DATABASE_ACTIONS_explanation = 2131165965; - // aapt resource value: 0x7f070257 - public const int SaveAttachmentDialog_save = 2131165783; + // aapt resource value: 0x7f07030c + public const int SCOPE_DATABASE_ACTIONS_title = 2131165964; - // aapt resource value: 0x7f070256 - public const int SaveAttachmentDialog_text = 2131165782; + // aapt resource value: 0x7f070311 + public const int SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE_explanation = 2131165969; - // aapt resource value: 0x7f070255 - public const int SaveAttachmentDialog_title = 2131165781; + // aapt resource value: 0x7f070310 + public const int SCOPE_QUERY_CREDENTIALS_FOR_OWN_PACKAGE_title = 2131165968; - // aapt resource value: 0x7f07025a - public const int SaveAttachment_Failed = 2131165786; + // aapt resource value: 0x7f070313 + public const int SCOPE_QUERY_CREDENTIALS_explanation = 2131165971; + + // aapt resource value: 0x7f070312 + public const int SCOPE_QUERY_CREDENTIALS_title = 2131165970; // aapt resource value: 0x7f070259 - public const int SaveAttachment_doneMessage = 2131165785; + public const int SaveAttachmentDialog_open = 2131165785; - // aapt resource value: 0x7f0702f2 - public const int SavingOtpAuxFile = 2131165938; + // aapt resource value: 0x7f070258 + public const int SaveAttachmentDialog_save = 2131165784; - // aapt resource value: 0x7f07029f - public const int SettingPassword = 2131165855; + // aapt resource value: 0x7f070257 + public const int SaveAttachmentDialog_text = 2131165783; - // aapt resource value: 0x7f07027a - public const int ShowCopyToClipboardNotification_summary = 2131165818; + // aapt resource value: 0x7f070256 + public const int SaveAttachmentDialog_title = 2131165782; - // aapt resource value: 0x7f070279 - public const int ShowCopyToClipboardNotification_title = 2131165817; + // aapt resource value: 0x7f07025b + public const int SaveAttachment_Failed = 2131165787; - // aapt resource value: 0x7f07017c - public const int ShowGroupInEntry_title = 2131165564; + // aapt resource value: 0x7f07025a + public const int SaveAttachment_doneMessage = 2131165786; + + // aapt resource value: 0x7f0702f6 + public const int SavingOtpAuxFile = 2131165942; + + // aapt resource value: 0x7f0702a2 + public const int SettingPassword = 2131165858; + + // aapt resource value: 0x7f07027d + public const int ShowCopyToClipboardNotification_summary = 2131165821; + + // aapt resource value: 0x7f07027c + public const int ShowCopyToClipboardNotification_title = 2131165820; + + // aapt resource value: 0x7f07017d + public const int ShowGroupInEntry_title = 2131165565; // aapt resource value: 0x7f070132 public const int ShowGroupnameInSearchResult_key = 2131165490; - // aapt resource value: 0x7f07017a - public const int ShowGroupnameInSearchResult_resume = 2131165562; + // aapt resource value: 0x7f07017b + public const int ShowGroupnameInSearchResult_resume = 2131165563; - // aapt resource value: 0x7f070179 - public const int ShowGroupnameInSearchResult_title = 2131165561; + // aapt resource value: 0x7f07017a + public const int ShowGroupnameInSearchResult_title = 2131165562; + + // aapt resource value: 0x7f070281 + public const int ShowKp2aKeyboardNotification_summary = 2131165825; + + // aapt resource value: 0x7f070280 + public const int ShowKp2aKeyboardNotification_title = 2131165824; + + // aapt resource value: 0x7f070157 + public const int ShowSeparateNotifications_key = 2131165527; + + // aapt resource value: 0x7f07027f + public const int ShowSeparateNotifications_summary = 2131165823; // aapt resource value: 0x7f07027e - public const int ShowKp2aKeyboardNotification_summary = 2131165822; + public const int ShowSeparateNotifications_title = 2131165822; - // aapt resource value: 0x7f07027d - public const int ShowKp2aKeyboardNotification_title = 2131165821; + // aapt resource value: 0x7f070160 + public const int ShowUnlockedNotification_key = 2131165536; - // aapt resource value: 0x7f070156 - public const int ShowSeparateNotifications_key = 2131165526; + // aapt resource value: 0x7f07028b + public const int ShowUnlockedNotification_summary = 2131165835; - // aapt resource value: 0x7f07027c - public const int ShowSeparateNotifications_summary = 2131165820; - - // aapt resource value: 0x7f07027b - public const int ShowSeparateNotifications_title = 2131165819; - - // aapt resource value: 0x7f07015f - public const int ShowUnlockedNotification_key = 2131165535; - - // aapt resource value: 0x7f070288 - public const int ShowUnlockedNotification_summary = 2131165832; - - // aapt resource value: 0x7f070287 - public const int ShowUnlockedNotification_title = 2131165831; + // aapt resource value: 0x7f07028a + public const int ShowUnlockedNotification_title = 2131165834; // aapt resource value: 0x7f070133 public const int ShowUsernameInList_key = 2131165491; + // aapt resource value: 0x7f070238 + public const int ShowUsernameInList_summary = 2131165752; + // aapt resource value: 0x7f070237 - public const int ShowUsernameInList_summary = 2131165751; + public const int ShowUsernameInList_title = 2131165751; - // aapt resource value: 0x7f070236 - public const int ShowUsernameInList_title = 2131165750; + // aapt resource value: 0x7f070154 + public const int SuggestionsURL = 2131165524; - // aapt resource value: 0x7f070153 - public const int SuggestionsURL = 2131165523; + // aapt resource value: 0x7f0702b2 + public const int SynchronizedDatabaseSuccessfully = 2131165874; - // aapt resource value: 0x7f0702af - public const int SynchronizedDatabaseSuccessfully = 2131165871; + // aapt resource value: 0x7f0702ad + public const int SynchronizingCachedDatabase = 2131165869; // aapt resource value: 0x7f0702aa - public const int SynchronizingCachedDatabase = 2131165866; + public const int SynchronizingDatabase = 2131165866; - // aapt resource value: 0x7f0702a7 - public const int SynchronizingDatabase = 2131165863; - - // aapt resource value: 0x7f0702ba - public const int SynchronizingOtpAuxFile = 2131165882; + // aapt resource value: 0x7f0702bd + public const int SynchronizingOtpAuxFile = 2131165885; // aapt resource value: 0x7f070131 public const int TanExpiresOnUse_key = 2131165489; + // aapt resource value: 0x7f070236 + public const int TanExpiresOnUse_summary = 2131165750; + // aapt resource value: 0x7f070235 - public const int TanExpiresOnUse_summary = 2131165749; + public const int TanExpiresOnUse_title = 2131165749; - // aapt resource value: 0x7f070234 - public const int TanExpiresOnUse_title = 2131165748; + // aapt resource value: 0x7f0702a8 + public const int TitleSyncQuestion = 2131165864; - // aapt resource value: 0x7f0702a5 - public const int TitleSyncQuestion = 2131165861; + // aapt resource value: 0x7f0702a4 + public const int TransformingKey = 2131165860; - // aapt resource value: 0x7f0702a1 - public const int TransformingKey = 2131165857; - - // aapt resource value: 0x7f070154 - public const int TranslationURL = 2131165524; + // aapt resource value: 0x7f070155 + public const int TranslationURL = 2131165525; // aapt resource value: 0x7f07013b public const int TrayTotp_SeedField_key = 2131165499; - // aapt resource value: 0x7f0702f8 - public const int TrayTotp_SeedField_summary = 2131165944; + // aapt resource value: 0x7f0702fc + public const int TrayTotp_SeedField_summary = 2131165948; - // aapt resource value: 0x7f0702f7 - public const int TrayTotp_SeedField_title = 2131165943; + // aapt resource value: 0x7f0702fb + public const int TrayTotp_SeedField_title = 2131165947; // aapt resource value: 0x7f07013a public const int TrayTotp_SettingsField_key = 2131165498; - // aapt resource value: 0x7f0702fa - public const int TrayTotp_SettingsField_summary = 2131165946; + // aapt resource value: 0x7f0702fe + public const int TrayTotp_SettingsField_summary = 2131165950; - // aapt resource value: 0x7f0702f9 - public const int TrayTotp_SettingsField_title = 2131165945; + // aapt resource value: 0x7f0702fd + public const int TrayTotp_SettingsField_title = 2131165949; - // aapt resource value: 0x7f0702fb - public const int TrayTotp_prefs = 2131165947; + // aapt resource value: 0x7f0702ff + public const int TrayTotp_prefs = 2131165951; // aapt resource value: 0x7f07013c public const int TrayTotp_prefs_key = 2131165500; - // aapt resource value: 0x7f0702a0 - public const int UndoingChanges = 2131165856; + // aapt resource value: 0x7f0702a3 + public const int UndoingChanges = 2131165859; + + // aapt resource value: 0x7f0702b9 + public const int UpdatedCachedFileOnLoad = 2131165881; // aapt resource value: 0x7f0702b6 - public const int UpdatedCachedFileOnLoad = 2131165878; + public const int UpdatedRemoteFileOnLoad = 2131165878; - // aapt resource value: 0x7f0702b3 - public const int UpdatedRemoteFileOnLoad = 2131165875; - - // aapt resource value: 0x7f0702ac - public const int UploadingFile = 2131165868; + // aapt resource value: 0x7f0702af + public const int UploadingFile = 2131165871; // aapt resource value: 0x7f070148 public const int UsageCount_key = 2131165512; @@ -5564,38 +5576,38 @@ namespace keepass2android // aapt resource value: 0x7f07014a public const int UseFileTransactions_key = 2131165514; + // aapt resource value: 0x7f07026a + public const int UseFileTransactions_summary = 2131165802; + // aapt resource value: 0x7f070269 - public const int UseFileTransactions_summary = 2131165801; + public const int UseFileTransactions_title = 2131165801; - // aapt resource value: 0x7f070268 - public const int UseFileTransactions_title = 2131165800; - - // aapt resource value: 0x7f070157 - public const int UseKp2aKeyboard_key = 2131165527; + // aapt resource value: 0x7f070158 + public const int UseKp2aKeyboard_key = 2131165528; // aapt resource value: 0x7f07014e public const int UseOfflineCache_key = 2131165518; - // aapt resource value: 0x7f070272 - public const int UseOfflineCache_summary = 2131165810; + // aapt resource value: 0x7f070273 + public const int UseOfflineCache_summary = 2131165811; - // aapt resource value: 0x7f070271 - public const int UseOfflineCache_title = 2131165809; + // aapt resource value: 0x7f070272 + public const int UseOfflineCache_title = 2131165810; // aapt resource value: 0x7f070139 public const int ViewDatabaseSecure_key = 2131165497; + // aapt resource value: 0x7f07024c + public const int ViewDatabaseSecure_summary = 2131165772; + // aapt resource value: 0x7f07024b - public const int ViewDatabaseSecure_summary = 2131165771; + public const int ViewDatabaseSecure_title = 2131165771; - // aapt resource value: 0x7f07024a - public const int ViewDatabaseSecure_title = 2131165770; + // aapt resource value: 0x7f0702ab + public const int YesSynchronize = 2131165867; - // aapt resource value: 0x7f0702a8 - public const int YesSynchronize = 2131165864; - - // aapt resource value: 0x7f0702e7 - public const int YubiChallengeNotInstalled = 2131165927; + // aapt resource value: 0x7f0702eb + public const int YubiChallengeNotInstalled = 2131165931; // aapt resource value: 0x7f070006 public const int abc_action_bar_home_description = 2131165190; @@ -5645,35 +5657,35 @@ namespace keepass2android // aapt resource value: 0x7f070015 public const int abc_toolbar_collapse_description = 2131165205; - // aapt resource value: 0x7f070161 - public const int about_feedback = 2131165537; - // aapt resource value: 0x7f070162 - public const int about_homepage = 2131165538; + public const int about_feedback = 2131165538; - // aapt resource value: 0x7f070151 - public const int about_prefs_key = 2131165521; + // aapt resource value: 0x7f070163 + public const int about_homepage = 2131165539; + + // aapt resource value: 0x7f070152 + public const int about_prefs_key = 2131165522; // aapt resource value: 0x7f070018 public const int accept = 2131165208; - // aapt resource value: 0x7f070262 - public const int add_binary = 2131165794; - - // aapt resource value: 0x7f070167 - public const int add_entry = 2131165543; - // aapt resource value: 0x7f070263 - public const int add_extra_string = 2131165795; - - // aapt resource value: 0x7f070169 - public const int add_group = 2131165545; - - // aapt resource value: 0x7f07016a - public const int add_group_title = 2131165546; + public const int add_binary = 2131165795; // aapt resource value: 0x7f070168 - public const int add_url_entry = 2131165544; + public const int add_entry = 2131165544; + + // aapt resource value: 0x7f070264 + public const int add_extra_string = 2131165796; + + // aapt resource value: 0x7f07016a + public const int add_group = 2131165546; + + // aapt resource value: 0x7f07016b + public const int add_group_title = 2131165547; + + // aapt resource value: 0x7f070169 + public const int add_url_entry = 2131165545; // aapt resource value: 0x7f07007e public const int added_word = 2131165310; @@ -5858,11 +5870,11 @@ namespace keepass2android // aapt resource value: 0x7f070113 public const int afc_yesterday = 2131165459; - // aapt resource value: 0x7f07016c - public const int algorithm = 2131165548; - // aapt resource value: 0x7f07016d - public const int algorithm_colon = 2131165549; + public const int algorithm = 2131165549; + + // aapt resource value: 0x7f07016e + public const int algorithm_colon = 2131165550; // aapt resource value: 0x7f070121 public const int algorithm_key = 2131165473; @@ -5945,29 +5957,29 @@ namespace keepass2android // aapt resource value: 0x7f070122 public const int app_key = 2131165474; - // aapt resource value: 0x7f07016e - public const int app_name = 2131165550; + // aapt resource value: 0x7f07016f + public const int app_name = 2131165551; - // aapt resource value: 0x7f070170 - public const int app_name_nonet = 2131165552; + // aapt resource value: 0x7f070171 + public const int app_name_nonet = 2131165553; - // aapt resource value: 0x7f070172 - public const int app_timeout = 2131165554; + // aapt resource value: 0x7f070173 + public const int app_timeout = 2131165555; // aapt resource value: 0x7f070123 public const int app_timeout_key = 2131165475; - // aapt resource value: 0x7f070173 - public const int app_timeout_summary = 2131165555; - - // aapt resource value: 0x7f070177 - public const int application = 2131165559; + // aapt resource value: 0x7f070174 + public const int app_timeout_summary = 2131165556; // aapt resource value: 0x7f070178 - public const int application_settings = 2131165560; + public const int application = 2131165560; - // aapt resource value: 0x7f07022b - public const int author = 2131165739; + // aapt resource value: 0x7f070179 + public const int application_settings = 2131165561; + + // aapt resource value: 0x7f07022c + public const int author = 2131165740; // aapt resource value: 0x7f07006b public const int auto_cap = 2131165291; @@ -6002,11 +6014,11 @@ namespace keepass2android // aapt resource value: 0x7f0700ac public const int auto_submit_summary = 2131165356; - // aapt resource value: 0x7f070193 - public const int available_through_keyboard = 2131165587; + // aapt resource value: 0x7f070194 + public const int available_through_keyboard = 2131165588; - // aapt resource value: 0x7f0702f3 - public const int bad_resp = 2131165939; + // aapt resource value: 0x7f0702f7 + public const int bad_resp = 2131165943; // aapt resource value: 0x7f070079 public const int bigram_suggestion = 2131165305; @@ -6014,38 +6026,38 @@ namespace keepass2android // aapt resource value: 0x7f07007a public const int bigram_suggestion_summary = 2131165306; - // aapt resource value: 0x7f07018d - public const int brackets = 2131165581; + // aapt resource value: 0x7f07018e + public const int brackets = 2131165582; - // aapt resource value: 0x7f070332 - public const int browser_intall_text = 2131166002; + // aapt resource value: 0x7f070336 + public const int browser_intall_text = 2131166006; - // aapt resource value: 0x7f070333 - public const int building_search_idx = 2131166003; + // aapt resource value: 0x7f070337 + public const int building_search_idx = 2131166007; - // aapt resource value: 0x7f0702db - public const int button_change_location = 2131165915; + // aapt resource value: 0x7f0702df + public const int button_change_location = 2131165919; // aapt resource value: 0x7f0700a5 public const int cancel = 2131165349; - // aapt resource value: 0x7f07023d - public const int caseSensitive = 2131165757; + // aapt resource value: 0x7f07023e + public const int caseSensitive = 2131165758; // aapt resource value: 0x7f0700c9 public const int change_entry = 2131165385; - // aapt resource value: 0x7f07018f - public const int clipboard_timeout = 2131165583; + // aapt resource value: 0x7f070190 + public const int clipboard_timeout = 2131165584; - // aapt resource value: 0x7f07015b - public const int clipboard_timeout_default = 2131165531; + // aapt resource value: 0x7f07015c + public const int clipboard_timeout_default = 2131165532; // aapt resource value: 0x7f070125 public const int clipboard_timeout_key = 2131165477; - // aapt resource value: 0x7f070190 - public const int clipboard_timeout_summary = 2131165584; + // aapt resource value: 0x7f070191 + public const int clipboard_timeout_summary = 2131165585; // aapt resource value: 0x7f0700ae public const int close_the_keyboard = 2131165358; @@ -6134,14 +6146,14 @@ namespace keepass2android // aapt resource value: 0x7f070036 public const int common_signin_button_text_long = 2131165238; - // aapt resource value: 0x7f070232 - public const int contributors = 2131165746; + // aapt resource value: 0x7f070233 + public const int contributors = 2131165747; + + // aapt resource value: 0x7f070193 + public const int copy_password = 2131165587; // aapt resource value: 0x7f070192 - public const int copy_password = 2131165586; - - // aapt resource value: 0x7f070191 - public const int copy_username = 2131165585; + public const int copy_username = 2131165586; // aapt resource value: 0x7f07001b public const int create_calendar_message = 2131165211; @@ -6149,47 +6161,47 @@ namespace keepass2android // aapt resource value: 0x7f07001a public const int create_calendar_title = 2131165210; - // aapt resource value: 0x7f070205 - public const int create_database = 2131165701; - - // aapt resource value: 0x7f070197 - public const int creating_db_key = 2131165591; - - // aapt resource value: 0x7f070267 - public const int credentials_dialog_title = 2131165799; - - // aapt resource value: 0x7f07022f - public const int credit_android_filechooser = 2131165743; - - // aapt resource value: 0x7f070230 - public const int credit_keyboard = 2131165744; - - // aapt resource value: 0x7f07022e - public const int credit_plugin1 = 2131165742; + // aapt resource value: 0x7f070206 + public const int create_database = 2131165702; // aapt resource value: 0x7f070198 - public const int current_group = 2131165592; + public const int creating_db_key = 2131165592; + + // aapt resource value: 0x7f070268 + public const int credentials_dialog_title = 2131165800; + + // aapt resource value: 0x7f070230 + public const int credit_android_filechooser = 2131165744; + + // aapt resource value: 0x7f070231 + public const int credit_keyboard = 2131165745; + + // aapt resource value: 0x7f07022f + public const int credit_plugin1 = 2131165743; // aapt resource value: 0x7f070199 - public const int current_group_root = 2131165593; + public const int current_group = 2131165593; // aapt resource value: 0x7f07019a - public const int database = 2131165594; + public const int current_group_root = 2131165594; - // aapt resource value: 0x7f0702bb - public const int database_file = 2131165883; + // aapt resource value: 0x7f07019b + public const int database = 2131165595; - // aapt resource value: 0x7f070265 - public const int database_loaded_quickunlock_enabled = 2131165797; + // aapt resource value: 0x7f0702be + public const int database_file = 2131165886; // aapt resource value: 0x7f070266 - public const int database_loaded_unlocked = 2131165798; + public const int database_loaded_quickunlock_enabled = 2131165798; - // aapt resource value: 0x7f0702d8 - public const int database_location = 2131165912; + // aapt resource value: 0x7f070267 + public const int database_loaded_unlocked = 2131165799; - // aapt resource value: 0x7f07020f - public const int database_name = 2131165711; + // aapt resource value: 0x7f0702dc + public const int database_location = 2131165916; + + // aapt resource value: 0x7f070210 + public const int database_name = 2131165712; // aapt resource value: 0x7f070136 public const int database_name_key = 2131165494; @@ -6200,77 +6212,77 @@ namespace keepass2android // aapt resource value: 0x7f070019 public const int decline = 2131165209; - // aapt resource value: 0x7f070334 - public const int decrypting_db = 2131166004; + // aapt resource value: 0x7f070338 + public const int decrypting_db = 2131166008; - // aapt resource value: 0x7f070335 - public const int decrypting_entry = 2131166005; + // aapt resource value: 0x7f070339 + public const int decrypting_entry = 2131166009; - // aapt resource value: 0x7f070336 - public const int default_checkbox = 2131166006; + // aapt resource value: 0x7f07033a + public const int default_checkbox = 2131166010; // aapt resource value: 0x7f070117 public const int default_file_path = 2131165463; - // aapt resource value: 0x7f070210 - public const int default_username = 2131165712; + // aapt resource value: 0x7f070211 + public const int default_username = 2131165713; // aapt resource value: 0x7f070135 public const int default_username_key = 2131165493; - // aapt resource value: 0x7f070264 - public const int delete_extra_string = 2131165796; + // aapt resource value: 0x7f070265 + public const int delete_extra_string = 2131165797; - // aapt resource value: 0x7f070166 - public const int deny = 2131165542; + // aapt resource value: 0x7f070167 + public const int deny = 2131165543; - // aapt resource value: 0x7f07015d - public const int design_default = 2131165533; + // aapt resource value: 0x7f07015e + public const int design_default = 2131165534; // aapt resource value: 0x7f07012d public const int design_key = 2131165485; - // aapt resource value: 0x7f070331 - public const int design_title = 2131166001; + // aapt resource value: 0x7f070335 + public const int design_title = 2131166005; // aapt resource value: 0x7f07011c public const int designer_names = 2131165468; - // aapt resource value: 0x7f07022d - public const int designers = 2131165741; - - // aapt resource value: 0x7f07019b - public const int digits = 2131165595; + // aapt resource value: 0x7f07022e + public const int designers = 2131165742; // aapt resource value: 0x7f07019c - public const int disclaimer_formal = 2131165596; + public const int digits = 2131165596; - // aapt resource value: 0x7f07017f - public const int display_prefs = 2131165567; + // aapt resource value: 0x7f07019d + public const int disclaimer_formal = 2131165597; + + // aapt resource value: 0x7f070180 + public const int display_prefs = 2131165568; // aapt resource value: 0x7f07013f public const int display_prefs_key = 2131165503; - // aapt resource value: 0x7f0702c2 - public const int donate_bday_question = 2131165890; + // aapt resource value: 0x7f0702c6 + public const int donate_bday_question = 2131165894; - // aapt resource value: 0x7f0702c3 - public const int donate_missedbday_question = 2131165891; + // aapt resource value: 0x7f0702c7 + public const int donate_missedbday_question = 2131165895; - // aapt resource value: 0x7f0702c1 - public const int donate_question = 2131165889; + // aapt resource value: 0x7f0702c5 + public const int donate_question = 2131165893; // aapt resource value: 0x7f070118 public const int donate_url = 2131165464; - // aapt resource value: 0x7f07016b - public const int edit_group_title = 2131165547; + // aapt resource value: 0x7f07016c + public const int edit_group_title = 2131165548; - // aapt resource value: 0x7f07019d - public const int ellipsis = 2131165597; + // aapt resource value: 0x7f07019e + public const int ellipsis = 2131165598; - // aapt resource value: 0x7f070244 - public const int enable_quickunlock = 2131165764; + // aapt resource value: 0x7f070245 + public const int enable_quickunlock = 2131165765; // aapt resource value: 0x7f0700c7 public const int english_ime_debug_settings = 2131165383; @@ -6284,296 +6296,296 @@ namespace keepass2android // aapt resource value: 0x7f07005a public const int english_ime_settings = 2131165274; - // aapt resource value: 0x7f07019e - public const int enter_filename = 2131165598; + // aapt resource value: 0x7f07019f + public const int enter_filename = 2131165599; + + // aapt resource value: 0x7f070244 + public const int enter_filename_details_create_import = 2131165764; // aapt resource value: 0x7f070243 - public const int enter_filename_details_create_import = 2131165763; - - // aapt resource value: 0x7f070242 - public const int enter_filename_details_url = 2131165762; - - // aapt resource value: 0x7f0702c9 - public const int enter_sftp_login_title = 2131165897; - - // aapt resource value: 0x7f07019f - public const int entry_accessed = 2131165599; - - // aapt resource value: 0x7f070337 - public const int entry_and_or = 2131166007; - - // aapt resource value: 0x7f0701b1 - public const int entry_binaries = 2131165617; - - // aapt resource value: 0x7f0701a0 - public const int entry_cancel = 2131165600; - - // aapt resource value: 0x7f0701a1 - public const int entry_comment = 2131165601; - - // aapt resource value: 0x7f0701a4 - public const int entry_confpassword = 2131165604; - - // aapt resource value: 0x7f0701a5 - public const int entry_created = 2131165605; - - // aapt resource value: 0x7f0701a6 - public const int entry_expires = 2131165606; - - // aapt resource value: 0x7f0701b0 - public const int entry_extra_strings = 2131165616; - - // aapt resource value: 0x7f0701a7 - public const int entry_group_name = 2131165607; - - // aapt resource value: 0x7f070194 - public const int entry_is_available = 2131165588; - - // aapt resource value: 0x7f0701a8 - public const int entry_keyfile = 2131165608; - - // aapt resource value: 0x7f0701aa - public const int entry_modified = 2131165610; - - // aapt resource value: 0x7f0701a3 - public const int entry_override_url = 2131165603; - - // aapt resource value: 0x7f0701ab - public const int entry_password = 2131165611; - - // aapt resource value: 0x7f0701ac - public const int entry_save = 2131165612; - - // aapt resource value: 0x7f0701a2 - public const int entry_tags = 2131165602; - - // aapt resource value: 0x7f0701ad - public const int entry_title = 2131165613; - - // aapt resource value: 0x7f0701ae - public const int entry_url = 2131165614; - - // aapt resource value: 0x7f0701af - public const int entry_user_name = 2131165615; - - // aapt resource value: 0x7f0702e3 - public const int error_adding_keyfile = 2131165923; - - // aapt resource value: 0x7f070338 - public const int error_arc4 = 2131166008; - - // aapt resource value: 0x7f0701b2 - public const int error_can_not_handle_uri = 2131165618; - - // aapt resource value: 0x7f0701b3 - public const int error_could_not_create_group = 2131165619; - - // aapt resource value: 0x7f0701b4 - public const int error_could_not_create_parent = 2131165620; - - // aapt resource value: 0x7f0701b5 - public const int error_database_exists = 2131165621; - - // aapt resource value: 0x7f070339 - public const int error_database_settings = 2131166009; - - // aapt resource value: 0x7f0701b6 - public const int error_database_settinoverrgs = 2131165622; - - // aapt resource value: 0x7f0701b7 - public const int error_failed_to_launch_link = 2131165623; - - // aapt resource value: 0x7f0701b9 - public const int error_file_not_create = 2131165625; - - // aapt resource value: 0x7f0701b8 - public const int error_filename_required = 2131165624; - - // aapt resource value: 0x7f0701ba - public const int error_invalid_db = 2131165626; - - // aapt resource value: 0x7f07025d - public const int error_invalid_expiry_date = 2131165789; - - // aapt resource value: 0x7f0701bb - public const int error_invalid_path = 2131165627; - - // aapt resource value: 0x7f0701bc - public const int error_no_name = 2131165628; - - // aapt resource value: 0x7f0701bd - public const int error_nopass = 2131165629; - - // aapt resource value: 0x7f07033a - public const int error_out_of_memory = 2131166010; - - // aapt resource value: 0x7f0701be - public const int error_pass_gen_type = 2131165630; - - // aapt resource value: 0x7f0701bf - public const int error_pass_match = 2131165631; - - // aapt resource value: 0x7f0701c0 - public const int error_rounds_not_number = 2131165632; - - // aapt resource value: 0x7f07033b - public const int error_rounds_too_large = 2131166011; - - // aapt resource value: 0x7f07025e - public const int error_string_key = 2131165790; - - // aapt resource value: 0x7f0701c1 - public const int error_title_required = 2131165633; - - // aapt resource value: 0x7f0701c2 - public const int error_wrong_length = 2131165634; - - // aapt resource value: 0x7f07023b - public const int excludeExpiredEntries = 2131165755; - - // aapt resource value: 0x7f070213 - public const int export_database_successful = 2131165715; - - // aapt resource value: 0x7f070313 - public const int export_fileformats_title = 2131165971; - - // aapt resource value: 0x7f070184 - public const int export_prefs = 2131165572; - - // aapt resource value: 0x7f070212 - public const int exporting_database = 2131165714; - - // aapt resource value: 0x7f07025f - public const int field_name = 2131165791; - - // aapt resource value: 0x7f070260 - public const int field_value = 2131165792; - - // aapt resource value: 0x7f0701c4 - public const int file_browser = 2131165636; - - // aapt resource value: 0x7f0702d7 - public const int filestorage_setup_title = 2131165911; - - // aapt resource value: 0x7f0702d3 - public const int filestoragehelp_dropboxKP2A = 2131165907; - - // aapt resource value: 0x7f0702cc - public const int filestoragename_androidget = 2131165900; + public const int enter_filename_details_url = 2131165763; // aapt resource value: 0x7f0702cd - public const int filestoragename_androidsend = 2131165901; + public const int enter_sftp_login_title = 2131165901; - // aapt resource value: 0x7f0702d1 - public const int filestoragename_dropbox = 2131165905; + // aapt resource value: 0x7f0701a0 + public const int entry_accessed = 2131165600; - // aapt resource value: 0x7f0702d2 - public const int filestoragename_dropboxKP2A = 2131165906; + // aapt resource value: 0x7f07033b + public const int entry_and_or = 2131166011; - // aapt resource value: 0x7f0702cb - public const int filestoragename_file = 2131165899; + // aapt resource value: 0x7f0701b2 + public const int entry_binaries = 2131165618; - // aapt resource value: 0x7f0702ce - public const int filestoragename_ftp = 2131165902; + // aapt resource value: 0x7f0701a1 + public const int entry_cancel = 2131165601; - // aapt resource value: 0x7f0702d4 - public const int filestoragename_gdrive = 2131165908; + // aapt resource value: 0x7f0701a2 + public const int entry_comment = 2131165602; - // aapt resource value: 0x7f0702cf - public const int filestoragename_http = 2131165903; + // aapt resource value: 0x7f0701a5 + public const int entry_confpassword = 2131165605; + + // aapt resource value: 0x7f0701a6 + public const int entry_created = 2131165606; + + // aapt resource value: 0x7f0701a7 + public const int entry_expires = 2131165607; + + // aapt resource value: 0x7f0701b1 + public const int entry_extra_strings = 2131165617; + + // aapt resource value: 0x7f0701a8 + public const int entry_group_name = 2131165608; + + // aapt resource value: 0x7f070195 + public const int entry_is_available = 2131165589; + + // aapt resource value: 0x7f0701a9 + public const int entry_keyfile = 2131165609; + + // aapt resource value: 0x7f0701ab + public const int entry_modified = 2131165611; + + // aapt resource value: 0x7f0701a4 + public const int entry_override_url = 2131165604; + + // aapt resource value: 0x7f0701ac + public const int entry_password = 2131165612; + + // aapt resource value: 0x7f0701ad + public const int entry_save = 2131165613; + + // aapt resource value: 0x7f0701a3 + public const int entry_tags = 2131165603; + + // aapt resource value: 0x7f0701ae + public const int entry_title = 2131165614; + + // aapt resource value: 0x7f0701af + public const int entry_url = 2131165615; + + // aapt resource value: 0x7f0701b0 + public const int entry_user_name = 2131165616; + + // aapt resource value: 0x7f0702e7 + public const int error_adding_keyfile = 2131165927; + + // aapt resource value: 0x7f07033c + public const int error_arc4 = 2131166012; + + // aapt resource value: 0x7f0701b3 + public const int error_can_not_handle_uri = 2131165619; + + // aapt resource value: 0x7f0701b4 + public const int error_could_not_create_group = 2131165620; + + // aapt resource value: 0x7f0701b5 + public const int error_could_not_create_parent = 2131165621; + + // aapt resource value: 0x7f0701b6 + public const int error_database_exists = 2131165622; + + // aapt resource value: 0x7f07033d + public const int error_database_settings = 2131166013; + + // aapt resource value: 0x7f0701b7 + public const int error_database_settinoverrgs = 2131165623; + + // aapt resource value: 0x7f0701b8 + public const int error_failed_to_launch_link = 2131165624; + + // aapt resource value: 0x7f0701ba + public const int error_file_not_create = 2131165626; + + // aapt resource value: 0x7f0701b9 + public const int error_filename_required = 2131165625; + + // aapt resource value: 0x7f0701bb + public const int error_invalid_db = 2131165627; + + // aapt resource value: 0x7f07025e + public const int error_invalid_expiry_date = 2131165790; + + // aapt resource value: 0x7f0701bc + public const int error_invalid_path = 2131165628; + + // aapt resource value: 0x7f0701bd + public const int error_no_name = 2131165629; + + // aapt resource value: 0x7f0701be + public const int error_nopass = 2131165630; + + // aapt resource value: 0x7f07033e + public const int error_out_of_memory = 2131166014; + + // aapt resource value: 0x7f0701bf + public const int error_pass_gen_type = 2131165631; + + // aapt resource value: 0x7f0701c0 + public const int error_pass_match = 2131165632; + + // aapt resource value: 0x7f0701c1 + public const int error_rounds_not_number = 2131165633; + + // aapt resource value: 0x7f07033f + public const int error_rounds_too_large = 2131166015; + + // aapt resource value: 0x7f07025f + public const int error_string_key = 2131165791; + + // aapt resource value: 0x7f0701c2 + public const int error_title_required = 2131165634; + + // aapt resource value: 0x7f0701c3 + public const int error_wrong_length = 2131165635; + + // aapt resource value: 0x7f07023c + public const int excludeExpiredEntries = 2131165756; + + // aapt resource value: 0x7f070214 + public const int export_database_successful = 2131165716; + + // aapt resource value: 0x7f070317 + public const int export_fileformats_title = 2131165975; + + // aapt resource value: 0x7f070185 + public const int export_prefs = 2131165573; + + // aapt resource value: 0x7f070213 + public const int exporting_database = 2131165715; + + // aapt resource value: 0x7f070260 + public const int field_name = 2131165792; + + // aapt resource value: 0x7f070261 + public const int field_value = 2131165793; + + // aapt resource value: 0x7f0701c5 + public const int file_browser = 2131165637; + + // aapt resource value: 0x7f0702db + public const int filestorage_setup_title = 2131165915; + + // aapt resource value: 0x7f0702d7 + public const int filestoragehelp_dropboxKP2A = 2131165911; // aapt resource value: 0x7f0702d0 - public const int filestoragename_https = 2131165904; + public const int filestoragename_androidget = 2131165904; - // aapt resource value: 0x7f0702d6 - public const int filestoragename_sftp = 2131165910; + // aapt resource value: 0x7f0702d1 + public const int filestoragename_androidsend = 2131165905; // aapt resource value: 0x7f0702d5 - public const int filestoragename_skydrive = 2131165909; + public const int filestoragename_dropbox = 2131165909; + + // aapt resource value: 0x7f0702d6 + public const int filestoragename_dropboxKP2A = 2131165910; + + // aapt resource value: 0x7f0702cf + public const int filestoragename_file = 2131165903; + + // aapt resource value: 0x7f0702d2 + public const int filestoragename_ftp = 2131165906; + + // aapt resource value: 0x7f0702d8 + public const int filestoragename_gdrive = 2131165912; + + // aapt resource value: 0x7f0702d3 + public const int filestoragename_http = 2131165907; + + // aapt resource value: 0x7f0702d4 + public const int filestoragename_https = 2131165908; + + // aapt resource value: 0x7f0702da + public const int filestoragename_sftp = 2131165914; + + // aapt resource value: 0x7f0702d9 + public const int filestoragename_skydrive = 2131165913; // aapt resource value: 0x7f07011b public const int further_author_names = 2131165467; - // aapt resource value: 0x7f07022c - public const int further_authors = 2131165740; - - // aapt resource value: 0x7f0701c5 - public const int generate_password = 2131165637; - - // aapt resource value: 0x7f070310 - public const int get_regular_version = 2131165968; + // aapt resource value: 0x7f07022d + public const int further_authors = 2131165741; // aapt resource value: 0x7f0701c6 - public const int group = 2131165638; + public const int generate_password = 2131165638; + + // aapt resource value: 0x7f070314 + public const int get_regular_version = 2131165972; + + // aapt resource value: 0x7f0701c7 + public const int group = 2131165639; // aapt resource value: 0x7f0700ba public const int has_dictionary = 2131165370; - // aapt resource value: 0x7f0702d9 - public const int help_database_location = 2131165913; - - // aapt resource value: 0x7f0702e0 - public const int help_key_file = 2131165920; - // aapt resource value: 0x7f0702dd - public const int help_master_password = 2131165917; + public const int help_database_location = 2131165917; + + // aapt resource value: 0x7f0702e4 + public const int help_key_file = 2131165924; + + // aapt resource value: 0x7f0702e1 + public const int help_master_password = 2131165921; // aapt resource value: 0x7f0700b9 public const int hint_add_to_dictionary = 2131165369; - // aapt resource value: 0x7f0701c7 - public const int hint_comment = 2131165639; - // aapt resource value: 0x7f0701c8 - public const int hint_conf_pass = 2131165640; - - // aapt resource value: 0x7f0702da - public const int hint_database_location = 2131165914; + public const int hint_comment = 2131165640; // aapt resource value: 0x7f0701c9 - public const int hint_generated_password = 2131165641; - - // aapt resource value: 0x7f0701ca - public const int hint_group_name = 2131165642; - - // aapt resource value: 0x7f0702e1 - public const int hint_key_file = 2131165921; - - // aapt resource value: 0x7f0701cb - public const int hint_keyfile = 2131165643; - - // aapt resource value: 0x7f0701cc - public const int hint_length = 2131165644; - - // aapt resource value: 0x7f0701ce - public const int hint_login_pass = 2131165646; + public const int hint_conf_pass = 2131165641; // aapt resource value: 0x7f0702de - public const int hint_master_password = 2131165918; + public const int hint_database_location = 2131165918; - // aapt resource value: 0x7f0701d1 - public const int hint_override_url = 2131165649; + // aapt resource value: 0x7f0701ca + public const int hint_generated_password = 2131165642; + + // aapt resource value: 0x7f0701cb + public const int hint_group_name = 2131165643; + + // aapt resource value: 0x7f0702e5 + public const int hint_key_file = 2131165925; + + // aapt resource value: 0x7f0701cc + public const int hint_keyfile = 2131165644; // aapt resource value: 0x7f0701cd - public const int hint_pass = 2131165645; - - // aapt resource value: 0x7f0702c6 - public const int hint_sftp_host = 2131165894; - - // aapt resource value: 0x7f0702c7 - public const int hint_sftp_port = 2131165895; - - // aapt resource value: 0x7f0701d2 - public const int hint_tags = 2131165650; + public const int hint_length = 2131165645; // aapt resource value: 0x7f0701cf - public const int hint_title = 2131165647; + public const int hint_login_pass = 2131165647; - // aapt resource value: 0x7f0701d0 - public const int hint_url = 2131165648; + // aapt resource value: 0x7f0702e2 + public const int hint_master_password = 2131165922; + + // aapt resource value: 0x7f0701d2 + public const int hint_override_url = 2131165650; + + // aapt resource value: 0x7f0701ce + public const int hint_pass = 2131165646; + + // aapt resource value: 0x7f0702ca + public const int hint_sftp_host = 2131165898; + + // aapt resource value: 0x7f0702cb + public const int hint_sftp_port = 2131165899; // aapt resource value: 0x7f0701d3 - public const int hint_username = 2131165651; + public const int hint_tags = 2131165651; + + // aapt resource value: 0x7f0701d0 + public const int hint_title = 2131165648; + + // aapt resource value: 0x7f0701d1 + public const int hint_url = 2131165649; + + // aapt resource value: 0x7f0701d4 + public const int hint_username = 2131165652; // aapt resource value: 0x7f07005f public const int hit_correction = 2131165279; @@ -6596,71 +6608,71 @@ namespace keepass2android // aapt resource value: 0x7f070116 public const int icon_info = 2131165462; - // aapt resource value: 0x7f070185 - public const int import_db_prefs = 2131165573; - // aapt resource value: 0x7f070186 - public const int import_keyfile_prefs = 2131165574; + public const int import_db_prefs = 2131165574; - // aapt resource value: 0x7f0702e4 - public const int init_otp = 2131165924; + // aapt resource value: 0x7f070187 + public const int import_keyfile_prefs = 2131165575; - // aapt resource value: 0x7f0702c8 - public const int initial_directory = 2131165896; + // aapt resource value: 0x7f0702e8 + public const int init_otp = 2131165928; - // aapt resource value: 0x7f070222 - public const int insert_element_here = 2131165730; + // aapt resource value: 0x7f0702cc + public const int initial_directory = 2131165900; - // aapt resource value: 0x7f07033c - public const int install_from_market = 2131166012; + // aapt resource value: 0x7f070223 + public const int insert_element_here = 2131165731; - // aapt resource value: 0x7f07033d - public const int install_from_website = 2131166013; + // aapt resource value: 0x7f070340 + public const int install_from_market = 2131166016; - // aapt resource value: 0x7f0701d5 - public const int invalid_algorithm = 2131165653; + // aapt resource value: 0x7f070341 + public const int install_from_website = 2131166017; // aapt resource value: 0x7f0701d6 - public const int invalid_db_sig = 2131165654; + public const int invalid_algorithm = 2131165654; + + // aapt resource value: 0x7f0701d7 + public const int invalid_db_sig = 2131165655; // aapt resource value: 0x7f07011d public const int issues = 2131165469; - // aapt resource value: 0x7f0702df - public const int key_file = 2131165919; + // aapt resource value: 0x7f0702e3 + public const int key_file = 2131165923; // aapt resource value: 0x7f0700bf public const int keyboard_layout = 2131165375; - // aapt resource value: 0x7f070183 - public const int keyboard_prefs = 2131165571; + // aapt resource value: 0x7f070184 + public const int keyboard_prefs = 2131165572; // aapt resource value: 0x7f0700b0 public const int keyboard_settings = 2131165360; - // aapt resource value: 0x7f070187 - public const int keyboardswitch_prefs = 2131165575; + // aapt resource value: 0x7f070188 + public const int keyboardswitch_prefs = 2131165576; // aapt resource value: 0x7f070142 public const int keyboardswitch_prefs_key = 2131165506; - // aapt resource value: 0x7f0701d7 - public const int keyfile_does_not_exist = 2131165655; + // aapt resource value: 0x7f0701d8 + public const int keyfile_does_not_exist = 2131165656; - // aapt resource value: 0x7f0701a9 - public const int keyfile_heading = 2131165609; + // aapt resource value: 0x7f0701aa + public const int keyfile_heading = 2131165610; - // aapt resource value: 0x7f0701d9 - public const int keyfile_is_empty = 2131165657; + // aapt resource value: 0x7f0701da + public const int keyfile_is_empty = 2131165658; // aapt resource value: 0x7f070129 public const int keyfile_key = 2131165481; - // aapt resource value: 0x7f070174 - public const int kill_app_label = 2131165556; + // aapt resource value: 0x7f070175 + public const int kill_app_label = 2131165557; - // aapt resource value: 0x7f070314 - public const int killed_by_os = 2131165972; + // aapt resource value: 0x7f070318 + public const int killed_by_os = 2131165976; // aapt resource value: 0x7f0700cf public const int kp2a_auto_fill = 2131165391; @@ -6668,8 +6680,8 @@ namespace keepass2android // aapt resource value: 0x7f0700d0 public const int kp2a_auto_fill_summary = 2131165392; - // aapt resource value: 0x7f07023a - public const int kp2a_findUrl = 2131165754; + // aapt resource value: 0x7f07023b + public const int kp2a_findUrl = 2131165755; // aapt resource value: 0x7f0700d5 public const int kp2a_lock_on_sendgodone = 2131165397; @@ -6701,11 +6713,11 @@ namespace keepass2android // aapt resource value: 0x7f0700d8 public const int kp2a_switch_on_sendgodone_summary = 2131165400; - // aapt resource value: 0x7f070281 - public const int kp2a_switch_rooted = 2131165825; + // aapt resource value: 0x7f070284 + public const int kp2a_switch_rooted = 2131165828; - // aapt resource value: 0x7f070282 - public const int kp2a_switch_rooted_summary = 2131165826; + // aapt resource value: 0x7f070285 + public const int kp2a_switch_rooted_summary = 2131165829; // aapt resource value: 0x7f0700cc public const int kp2a_user = 2131165388; @@ -6755,119 +6767,119 @@ namespace keepass2android // aapt resource value: 0x7f0700c3 public const int layout_stone_normal = 2131165379; - // aapt resource value: 0x7f0701da - public const int length = 2131165658; + // aapt resource value: 0x7f0701db + public const int length = 2131165659; // aapt resource value: 0x7f0700d9 public const int library_name = 2131165401; - // aapt resource value: 0x7f07015c - public const int list_size_default = 2131165532; + // aapt resource value: 0x7f07015d + public const int list_size_default = 2131165533; // aapt resource value: 0x7f07012c public const int list_size_key = 2131165484; - // aapt resource value: 0x7f0701dc - public const int list_size_summary = 2131165660; - - // aapt resource value: 0x7f0701db - public const int list_size_title = 2131165659; - - // aapt resource value: 0x7f0702fc - public const int loading = 2131165948; - // aapt resource value: 0x7f0701dd - public const int loading_database = 2131165661; + public const int list_size_summary = 2131165661; + + // aapt resource value: 0x7f0701dc + public const int list_size_title = 2131165660; + + // aapt resource value: 0x7f070300 + public const int loading = 2131165952; // aapt resource value: 0x7f0701de - public const int lowercase = 2131165662; + public const int loading_database = 2131165662; + + // aapt resource value: 0x7f0701df + public const int lowercase = 2131165663; // aapt resource value: 0x7f07012a public const int maskpass_key = 2131165482; + // aapt resource value: 0x7f0701e2 + public const int maskpass_summary = 2131165666; + // aapt resource value: 0x7f0701e1 - public const int maskpass_summary = 2131165665; + public const int maskpass_title = 2131165665; - // aapt resource value: 0x7f0701e0 - public const int maskpass_title = 2131165664; + // aapt resource value: 0x7f070204 + public const int master_key_type = 2131165700; - // aapt resource value: 0x7f070203 - public const int master_key_type = 2131165699; - - // aapt resource value: 0x7f0702dc - public const int master_password = 2131165916; + // aapt resource value: 0x7f0702e0 + public const int master_password = 2131165920; // aapt resource value: 0x7f070128 public const int master_pwd_key = 2131165480; - // aapt resource value: 0x7f0701e2 - public const int menu_about = 2131165666; - - // aapt resource value: 0x7f0701e7 - public const int menu_app_settings = 2131165671; - - // aapt resource value: 0x7f0701f6 - public const int menu_change_db = 2131165686; - // aapt resource value: 0x7f0701e3 - public const int menu_change_key = 2131165667; - - // aapt resource value: 0x7f0701e4 - public const int menu_copy_pass = 2131165668; - - // aapt resource value: 0x7f0701e5 - public const int menu_copy_user = 2131165669; - - // aapt resource value: 0x7f0701e6 - public const int menu_create = 2131165670; + public const int menu_about = 2131165667; // aapt resource value: 0x7f0701e8 - public const int menu_db_settings = 2131165672; - - // aapt resource value: 0x7f0701e9 - public const int menu_delete = 2131165673; - - // aapt resource value: 0x7f0701ed - public const int menu_donate = 2131165677; - - // aapt resource value: 0x7f0701ee - public const int menu_edit = 2131165678; - - // aapt resource value: 0x7f0701ef - public const int menu_hide_password = 2131165679; - - // aapt resource value: 0x7f07033e - public const int menu_homepage = 2131166014; - - // aapt resource value: 0x7f0701f0 - public const int menu_lock = 2131165680; - - // aapt resource value: 0x7f0701ea - public const int menu_move = 2131165674; - - // aapt resource value: 0x7f0701eb - public const int menu_move_light = 2131165675; - - // aapt resource value: 0x7f0701ec - public const int menu_navigate = 2131165676; - - // aapt resource value: 0x7f0701f1 - public const int menu_open = 2131165681; - - // aapt resource value: 0x7f0701f2 - public const int menu_rename = 2131165682; - - // aapt resource value: 0x7f0701f3 - public const int menu_search = 2131165683; - - // aapt resource value: 0x7f0701f4 - public const int menu_search_advanced = 2131165684; - - // aapt resource value: 0x7f0701f5 - public const int menu_url = 2131165685; + public const int menu_app_settings = 2131165672; // aapt resource value: 0x7f0701f7 - public const int minus = 2131165687; + public const int menu_change_db = 2131165687; + + // aapt resource value: 0x7f0701e4 + public const int menu_change_key = 2131165668; + + // aapt resource value: 0x7f0701e5 + public const int menu_copy_pass = 2131165669; + + // aapt resource value: 0x7f0701e6 + public const int menu_copy_user = 2131165670; + + // aapt resource value: 0x7f0701e7 + public const int menu_create = 2131165671; + + // aapt resource value: 0x7f0701e9 + public const int menu_db_settings = 2131165673; + + // aapt resource value: 0x7f0701ea + public const int menu_delete = 2131165674; + + // aapt resource value: 0x7f0701ee + public const int menu_donate = 2131165678; + + // aapt resource value: 0x7f0701ef + public const int menu_edit = 2131165679; + + // aapt resource value: 0x7f0701f0 + public const int menu_hide_password = 2131165680; + + // aapt resource value: 0x7f070342 + public const int menu_homepage = 2131166018; + + // aapt resource value: 0x7f0701f1 + public const int menu_lock = 2131165681; + + // aapt resource value: 0x7f0701eb + public const int menu_move = 2131165675; + + // aapt resource value: 0x7f0701ec + public const int menu_move_light = 2131165676; + + // aapt resource value: 0x7f0701ed + public const int menu_navigate = 2131165677; + + // aapt resource value: 0x7f0701f2 + public const int menu_open = 2131165682; + + // aapt resource value: 0x7f0701f3 + public const int menu_rename = 2131165683; + + // aapt resource value: 0x7f0701f4 + public const int menu_search = 2131165684; + + // aapt resource value: 0x7f0701f5 + public const int menu_search_advanced = 2131165685; + + // aapt resource value: 0x7f0701f6 + public const int menu_url = 2131165686; + + // aapt resource value: 0x7f0701f8 + public const int minus = 2131165688; // aapt resource value: 0x7f070000 public const int mr_media_route_button_content_description = 2131165184; @@ -6887,29 +6899,29 @@ namespace keepass2android // aapt resource value: 0x7f070005 public const int mr_user_route_category_name = 2131165189; - // aapt resource value: 0x7f0701f8 - public const int never = 2131165688; - - // aapt resource value: 0x7f0701fa - public const int no = 2131165690; - - // aapt resource value: 0x7f0701d8 - public const int no_keyfile_selected = 2131165656; + // aapt resource value: 0x7f0701f9 + public const int never = 2131165689; // aapt resource value: 0x7f0701fb - public const int no_keys = 2131165691; + public const int no = 2131165691; + + // aapt resource value: 0x7f0701d9 + public const int no_keyfile_selected = 2131165657; // aapt resource value: 0x7f0701fc - public const int no_results = 2131165692; - - // aapt resource value: 0x7f0702c5 - public const int no_thanks = 2131165893; + public const int no_keys = 2131165692; // aapt resource value: 0x7f0701fd - public const int no_url_handler = 2131165693; + public const int no_results = 2131165693; - // aapt resource value: 0x7f070195 - public const int not_possible_im_picker = 2131165589; + // aapt resource value: 0x7f0702c9 + public const int no_thanks = 2131165897; + + // aapt resource value: 0x7f0701fe + public const int no_url_handler = 2131165694; + + // aapt resource value: 0x7f070196 + public const int not_possible_im_picker = 2131165590; // aapt resource value: 0x7f07011e public const int oi_filemanager_market = 2131165470; @@ -6920,17 +6932,17 @@ namespace keepass2android // aapt resource value: 0x7f0700a6 public const int ok = 2131165350; - // aapt resource value: 0x7f0702c4 - public const int ok_donate = 2131165892; + // aapt resource value: 0x7f0702c8 + public const int ok_donate = 2131165896; // aapt resource value: 0x7f07012b public const int omitbackup_key = 2131165483; - // aapt resource value: 0x7f070200 - public const int omitbackup_summary = 2131165696; + // aapt resource value: 0x7f070201 + public const int omitbackup_summary = 2131165697; - // aapt resource value: 0x7f0701ff - public const int omitbackup_title = 2131165695; + // aapt resource value: 0x7f070200 + public const int omitbackup_title = 2131165696; // aapt resource value: 0x7f0700ca public const int open_entry = 2131165386; @@ -6938,83 +6950,83 @@ namespace keepass2android // aapt resource value: 0x7f0700cb public const int open_entry_for_app = 2131165387; - // aapt resource value: 0x7f0701fe - public const int open_recent = 2131165694; + // aapt resource value: 0x7f0701ff + public const int open_recent = 2131165695; // aapt resource value: 0x7f0700ad public const int open_the_keyboard = 2131165357; - // aapt resource value: 0x7f0702bc - public const int otp_aux_file = 2131165884; + // aapt resource value: 0x7f0702bf + public const int otp_aux_file = 2131165887; - // aapt resource value: 0x7f0702ec - public const int otp_discarded_because_db_open = 2131165932; - - // aapt resource value: 0x7f0702ea - public const int otp_discarded_because_no_db = 2131165930; - - // aapt resource value: 0x7f0702eb - public const int otp_discarded_no_space = 2131165931; - - // aapt resource value: 0x7f0702e5 - public const int otp_explanation = 2131165925; - - // aapt resource value: 0x7f0702e6 - public const int otp_hint = 2131165926; - - // aapt resource value: 0x7f0702ed - public const int otps_pending = 2131165933; + // aapt resource value: 0x7f0702f0 + public const int otp_discarded_because_db_open = 2131165936; // aapt resource value: 0x7f0702ee - public const int otpsecret_hint = 2131165934; + public const int otp_discarded_because_no_db = 2131165934; - // aapt resource value: 0x7f070201 - public const int pass_filename = 2131165697; + // aapt resource value: 0x7f0702ef + public const int otp_discarded_no_space = 2131165935; - // aapt resource value: 0x7f070180 - public const int password_access_prefs = 2131165568; + // aapt resource value: 0x7f0702e9 + public const int otp_explanation = 2131165929; + + // aapt resource value: 0x7f0702ea + public const int otp_hint = 2131165930; + + // aapt resource value: 0x7f0702f1 + public const int otps_pending = 2131165937; + + // aapt resource value: 0x7f0702f2 + public const int otpsecret_hint = 2131165938; + + // aapt resource value: 0x7f070202 + public const int pass_filename = 2131165698; + + // aapt resource value: 0x7f070181 + public const int password_access_prefs = 2131165569; // aapt resource value: 0x7f07013d public const int password_access_prefs_key = 2131165501; - // aapt resource value: 0x7f070202 - public const int password_title = 2131165698; + // aapt resource value: 0x7f070203 + public const int password_title = 2131165699; // aapt resource value: 0x7f070120 public const int permission_desc = 2131165472; - // aapt resource value: 0x7f070196 - public const int please_activate_keyboard = 2131165590; + // aapt resource value: 0x7f070197 + public const int please_activate_keyboard = 2131165591; - // aapt resource value: 0x7f070231 - public const int please_note = 2131165745; - - // aapt resource value: 0x7f070300 - public const int plugin_author = 2131165952; - - // aapt resource value: 0x7f0702ff - public const int plugin_description = 2131165951; - - // aapt resource value: 0x7f070302 - public const int plugin_disabled = 2131165954; - - // aapt resource value: 0x7f070301 - public const int plugin_enabled = 2131165953; - - // aapt resource value: 0x7f070307 - public const int plugin_enabled_checkbox = 2131165959; - - // aapt resource value: 0x7f0702fe - public const int plugin_packagename = 2131165950; + // aapt resource value: 0x7f070232 + public const int please_note = 2131165746; // aapt resource value: 0x7f070304 - public const int plugin_scopes = 2131165956; + public const int plugin_author = 2131165956; // aapt resource value: 0x7f070303 - public const int plugin_web = 2131165955; + public const int plugin_description = 2131165955; - // aapt resource value: 0x7f0702fd - public const int plugins = 2131165949; + // aapt resource value: 0x7f070306 + public const int plugin_disabled = 2131165958; + + // aapt resource value: 0x7f070305 + public const int plugin_enabled = 2131165957; + + // aapt resource value: 0x7f07030b + public const int plugin_enabled_checkbox = 2131165963; + + // aapt resource value: 0x7f070302 + public const int plugin_packagename = 2131165954; + + // aapt resource value: 0x7f070308 + public const int plugin_scopes = 2131165960; + + // aapt resource value: 0x7f070307 + public const int plugin_web = 2131165959; + + // aapt resource value: 0x7f070301 + public const int plugins = 2131165953; // aapt resource value: 0x7f0700b1 public const int popular_domain_0 = 2131165361; @@ -7076,20 +7088,20 @@ namespace keepass2android // aapt resource value: 0x7f070075 public const int prefs_settings_key = 2131165301; - // aapt resource value: 0x7f070204 - public const int progress_create = 2131165700; + // aapt resource value: 0x7f070205 + public const int progress_create = 2131165701; - // aapt resource value: 0x7f070206 - public const int progress_title = 2131165702; + // aapt resource value: 0x7f070207 + public const int progress_title = 2131165703; - // aapt resource value: 0x7f070261 - public const int protection = 2131165793; + // aapt resource value: 0x7f070262 + public const int protection = 2131165794; - // aapt resource value: 0x7f070306 - public const int query_credentials = 2131165958; + // aapt resource value: 0x7f07030a + public const int query_credentials = 2131165962; - // aapt resource value: 0x7f070305 - public const int query_credentials_for_url = 2131165957; + // aapt resource value: 0x7f070309 + public const int query_credentials_for_url = 2131165961; // aapt resource value: 0x7f07006f public const int quick_fixes = 2131165295; @@ -7097,59 +7109,59 @@ namespace keepass2android // aapt resource value: 0x7f070070 public const int quick_fixes_summary = 2131165296; - // aapt resource value: 0x7f070299 - public const int rate_app = 2131165849; + // aapt resource value: 0x7f07029c + public const int rate_app = 2131165852; - // aapt resource value: 0x7f070233 - public const int regular_expression = 2131165747; - - // aapt resource value: 0x7f070207 - public const int remember_keyfile_summary = 2131165703; + // aapt resource value: 0x7f070234 + public const int regular_expression = 2131165748; // aapt resource value: 0x7f070208 - public const int remember_keyfile_title = 2131165704; + public const int remember_keyfile_summary = 2131165704; // aapt resource value: 0x7f070209 - public const int remove_from_filelist = 2131165705; + public const int remember_keyfile_title = 2131165705; // aapt resource value: 0x7f07020a - public const int rijndael = 2131165706; + public const int remove_from_filelist = 2131165706; // aapt resource value: 0x7f07020b - public const int root = 2131165707; + public const int rijndael = 2131165707; // aapt resource value: 0x7f07020c - public const int rounds = 2131165708; + public const int root = 2131165708; // aapt resource value: 0x7f07020d - public const int rounds_explaination = 2131165709; + public const int rounds = 2131165709; // aapt resource value: 0x7f07020e - public const int rounds_hint = 2131165710; + public const int rounds_explaination = 2131165710; + + // aapt resource value: 0x7f07020f + public const int rounds_hint = 2131165711; // aapt resource value: 0x7f070127 public const int rounds_key = 2131165479; - // aapt resource value: 0x7f070211 - public const int saving_database = 2131165713; - - // aapt resource value: 0x7f07021d - public const int search_hint = 2131165725; - - // aapt resource value: 0x7f07021f - public const int search_in = 2131165727; - - // aapt resource value: 0x7f070215 - public const int search_label = 2131165717; - - // aapt resource value: 0x7f07023c - public const int search_options = 2131165756; + // aapt resource value: 0x7f070212 + public const int saving_database = 2131165714; // aapt resource value: 0x7f07021e - public const int search_results = 2131165726; + public const int search_hint = 2131165726; - // aapt resource value: 0x7f07017e - public const int security_prefs = 2131165566; + // aapt resource value: 0x7f070220 + public const int search_in = 2131165728; + + // aapt resource value: 0x7f070216 + public const int search_label = 2131165718; + + // aapt resource value: 0x7f07023d + public const int search_options = 2131165757; + + // aapt resource value: 0x7f07021f + public const int search_results = 2131165727; + + // aapt resource value: 0x7f07017f + public const int security_prefs = 2131165567; // aapt resource value: 0x7f07013e public const int security_prefs_key = 2131165502; @@ -7157,14 +7169,14 @@ namespace keepass2android // aapt resource value: 0x7f0700b6 public const int selectInputMethod = 2131165366; + // aapt resource value: 0x7f070222 + public const int select_group_then_add = 2131165730; + // aapt resource value: 0x7f070221 - public const int select_group_then_add = 2131165729; + public const int select_other_entry = 2131165729; - // aapt resource value: 0x7f070220 - public const int select_other_entry = 2131165728; - - // aapt resource value: 0x7f0702ca - public const int select_storage_type = 2131165898; + // aapt resource value: 0x7f0702ce + public const int select_storage_type = 2131165902; // aapt resource value: 0x7f070054 public const int sentence_separators = 2131165268; @@ -7187,23 +7199,23 @@ namespace keepass2android // aapt resource value: 0x7f070076 public const int settings_key_mode_auto_name = 2131165302; - // aapt resource value: 0x7f07016f - public const int short_app_name = 2131165551; + // aapt resource value: 0x7f070170 + public const int short_app_name = 2131165552; - // aapt resource value: 0x7f070171 - public const int short_app_name_nonet = 2131165553; + // aapt resource value: 0x7f070172 + public const int short_app_name_nonet = 2131165554; - // aapt resource value: 0x7f070175 - public const int show_kill_app = 2131165557; + // aapt resource value: 0x7f070176 + public const int show_kill_app = 2131165558; // aapt resource value: 0x7f070124 public const int show_kill_app_key = 2131165476; - // aapt resource value: 0x7f070176 - public const int show_kill_app_summary = 2131165558; + // aapt resource value: 0x7f070177 + public const int show_kill_app_summary = 2131165559; - // aapt resource value: 0x7f070216 - public const int show_password = 2131165718; + // aapt resource value: 0x7f070217 + public const int show_password = 2131165719; // aapt resource value: 0x7f070071 public const int show_suggestions = 2131165297; @@ -7211,11 +7223,11 @@ namespace keepass2android // aapt resource value: 0x7f070072 public const int show_suggestions_summary = 2131165298; - // aapt resource value: 0x7f070219 - public const int sort_db = 2131165721; + // aapt resource value: 0x7f07021a + public const int sort_db = 2131165722; - // aapt resource value: 0x7f07021b - public const int sort_default = 2131165723; + // aapt resource value: 0x7f07021c + public const int sort_default = 2131165724; // aapt resource value: 0x7f07012f public const int sort_key = 2131165487; @@ -7223,14 +7235,14 @@ namespace keepass2android // aapt resource value: 0x7f07012e public const int sort_key_old = 2131165486; - // aapt resource value: 0x7f070217 - public const int sort_menu = 2131165719; - - // aapt resource value: 0x7f07021a - public const int sort_moddate = 2131165722; - // aapt resource value: 0x7f070218 - public const int sort_name = 2131165720; + public const int sort_menu = 2131165720; + + // aapt resource value: 0x7f07021b + public const int sort_moddate = 2131165723; + + // aapt resource value: 0x7f070219 + public const int sort_name = 2131165721; // aapt resource value: 0x7f070130 public const int sortgroups_key = 2131165488; @@ -7238,23 +7250,23 @@ namespace keepass2android // aapt resource value: 0x7f07005d public const int sound_on_keypress = 2131165277; - // aapt resource value: 0x7f070214 - public const int space = 2131165716; + // aapt resource value: 0x7f070215 + public const int space = 2131165717; - // aapt resource value: 0x7f07021c - public const int special = 2131165724; - - // aapt resource value: 0x7f07023f - public const int start_create = 2131165759; - - // aapt resource value: 0x7f070241 - public const int start_create_import = 2131165761; - - // aapt resource value: 0x7f07023e - public const int start_open_file = 2131165758; + // aapt resource value: 0x7f07021d + public const int special = 2131165725; // aapt resource value: 0x7f070240 - public const int start_open_url = 2131165760; + public const int start_create = 2131165760; + + // aapt resource value: 0x7f070242 + public const int start_create_import = 2131165762; + + // aapt resource value: 0x7f07023f + public const int start_open_file = 2131165759; + + // aapt resource value: 0x7f070241 + public const int start_open_url = 2131165761; // aapt resource value: 0x7f070017 public const int store_picture_message = 2131165207; @@ -7268,14 +7280,14 @@ namespace keepass2android // aapt resource value: 0x7f0700c6 public const int subtype_mode_voice = 2131165382; - // aapt resource value: 0x7f070298 - public const int suggest_improvements = 2131165848; + // aapt resource value: 0x7f07029b + public const int suggest_improvements = 2131165851; // aapt resource value: 0x7f070055 public const int suggested_punctuations = 2131165269; - // aapt resource value: 0x7f0702bf - public const int synchronize_database_menu = 2131165887; + // aapt resource value: 0x7f0702c3 + public const int synchronize_database_menu = 2131165891; // aapt resource value: 0x7f070081 public const int tip_access_symbols = 2131165313; @@ -7316,32 +7328,32 @@ namespace keepass2android // aapt resource value: 0x7f070084 public const int touch_to_finish = 2131165316; - // aapt resource value: 0x7f07029a - public const int translate_app = 2131165850; - - // aapt resource value: 0x7f070223 - public const int twofish = 2131165731; + // aapt resource value: 0x7f07029d + public const int translate_app = 2131165853; // aapt resource value: 0x7f070224 - public const int underline = 2131165732; - - // aapt resource value: 0x7f07017d - public const int unknown_uri_scheme = 2131165565; + public const int twofish = 2131165732; // aapt resource value: 0x7f070225 - public const int unsupported_db_version = 2131165733; + public const int underline = 2131165733; + + // aapt resource value: 0x7f07017e + public const int unknown_uri_scheme = 2131165566; // aapt resource value: 0x7f070226 - public const int uppercase = 2131165734; + public const int unsupported_db_version = 2131165734; - // aapt resource value: 0x7f0702e2 - public const int use_key_file = 2131165922; + // aapt resource value: 0x7f070227 + public const int uppercase = 2131165735; + + // aapt resource value: 0x7f0702e6 + public const int use_key_file = 2131165926; + + // aapt resource value: 0x7f07022b + public const int version_history = 2131165739; // aapt resource value: 0x7f07022a - public const int version_history = 2131165738; - - // aapt resource value: 0x7f070229 - public const int version_label = 2131165737; + public const int version_label = 2131165738; // aapt resource value: 0x7f07005c public const int vibrate_on_keypress = 2131165276; @@ -7415,17 +7427,17 @@ namespace keepass2android // aapt resource value: 0x7f070038 public const int wallet_buy_button_place_holder = 2131165240; - // aapt resource value: 0x7f070227 - public const int warning_read_only = 2131165735; - // aapt resource value: 0x7f070228 - public const int warning_unmounted = 2131165736; + public const int warning_read_only = 2131165736; + + // aapt resource value: 0x7f070229 + public const int warning_unmounted = 2131165737; // aapt resource value: 0x7f070053 public const int word_separators = 2131165267; - // aapt resource value: 0x7f0701f9 - public const int yes = 2131165689; + // aapt resource value: 0x7f0701fa + public const int yes = 2131165690; static String() { diff --git a/src/keepass2android/Resources/values/config.xml b/src/keepass2android/Resources/values/config.xml index 8dfd2744..34475db7 100644 --- a/src/keepass2android/Resources/values/config.xml +++ b/src/keepass2android/Resources/values/config.xml @@ -106,6 +106,7 @@ UseOfflineCache AcceptAllServerCertificates CheckForFileChangesOnSave + CheckForDuplicateUuids_key about_prefs diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml index 2774d571..b026a84f 100644 --- a/src/keepass2android/Resources/values/strings.xml +++ b/src/keepass2android/Resources/values/strings.xml @@ -303,6 +303,9 @@ Check for modifications Check whether the file was modified externally before saving changes. + Check for duplicate UUIDs + Check whether the database file is corrupt by having multiple entries with the same ID. This might cause unexpected behavior. + Clipboard notifications Make username and password accessible through the notification bar and clipboard. Beware of password sniffers! @@ -387,6 +390,7 @@ An error occured: Database is corrupt: Duplicate IDs found. (Did you save with Minikeepass?) Please re-import to a new database with Keepass 2 for PC and select \'Create new IDs\'. + You can disable this error message in Settings/Application settings/File handling/Check for duplicate UUIDs. Please note that you might experience unexpected behavior. It is recommended to fix the database. Synchronize database… diff --git a/src/keepass2android/Resources/xml/preferences.xml b/src/keepass2android/Resources/xml/preferences.xml index d2c33343..e24f839f 100644 --- a/src/keepass2android/Resources/xml/preferences.xml +++ b/src/keepass2android/Resources/xml/preferences.xml @@ -365,6 +365,13 @@ android:title="@string/TanExpiresOnUse_title" android:summary="@string/TanExpiresOnUse_summary" android:defaultValue="@bool/TanExpiresOnUse_default"/> +