mirror of
https://github.com/bitwarden/browser
synced 2026-01-03 17:13:47 +00:00
a108476c3c
* Rough draft of Export/Import changes w/ password encryption * fix for encrypted export changes * Create launch.json * Updates to export logic modal user secret prompt * Updates to error handling * renaming the component for checking the user secret to a name that is more clear about what it accomplishes * Fixing lint errors * Adding a comment * Suggested changes from CR * Suggested changes from CR * Making suggested changes * removing unnecessary properties * changes suggested * Fix * Updating error messages * Removing unecessary launch.json file commit * running lint, removing commented code * removing launch.json * Updates to remove the userVerificationPromptService * updates * Removing unused import, running npm prettier/lint * Changes to use Form Fields * Updates * updates requested by Matt * Update apps/web/src/app/tools/import-export/export.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Suggested Changes from PR * Fix after merge from Master * changes to styling * Removing unused code and cleanup * Update libs/angular/src/components/user-verification-prompt.component.ts Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Update apps/web/src/locales/en/messages.json Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> * Changes suggested by Thomas R * Merging master into branch * Revert "Merging master into branch" This reverts commiteb2cdffe49. * Requested changes and improvements * merging master into feature branch * Revert "merging master into feature branch" This reverts commite287715251. * Suggested Changes * changes * requested changes * Requested changes * removing comments, fixing code * reducing copied code * fixing bug * fixing bug * changes * WIP * Thomas's requested changes * adding back missing spaces * change needed after the merge from master into feature branch * prettier + lint * Updating the EncryptedExportType Import * Fixing build errors Co-authored-by: Thomas Rittson <eliykat@users.noreply.github.com> * Move FilePasswordPrompt to ImportExportModule Also remove base class Also remove duplicate service providers * Run prettier * Suggested Changes from Thomas * only require filePassword and confirmFilePassword if it's type is FileEncrypted * Update to only enable the field when submitting a file password encrypted file * Requested changes, moving logic to web * undoing change to bit button * Refactor to process file-encrypted imports in main import.component * Refactor confirm file password check * Remove UserVerificationPromptService * Address CodeScene feedback * Updates to disable the required file password field when needed * Subscribe to reactive form changes to adjust validators * style changes requested by suhkleen * Delete duplicate classes Co-authored-by: CarleyDiaz-Bitwarden <103955722+CarleyDiaz-Bitwarden@users.noreply.github.com> Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Co-authored-by: Thomas Rittson <trittson@bitwarden.com> Co-authored-by: Thomas Rittson <eliykat@users.noreply.github.com>
51 lines
1.4 KiB
JSON
51 lines
1.4 KiB
JSON
{
|
|
"bitwarden": {
|
|
"message": "Bitwarden"
|
|
},
|
|
"authenticatorAppTitle": {
|
|
"message": "Authenticator App"
|
|
},
|
|
"yubiKeyTitle": {
|
|
"message": "YubiKey OTP Security Key"
|
|
},
|
|
"emailTitle": {
|
|
"message": "Email"
|
|
},
|
|
"noneFolder": {
|
|
"message": "No Folder"
|
|
},
|
|
"importEncKeyError": {
|
|
"message": "Error decrypting the exported file. Your encryption key does not match the encryption key used export the data."
|
|
},
|
|
"invalidFilePassword": {
|
|
"message": "Invalid file password, please use the password you entered when you created the export file."
|
|
},
|
|
"importPasswordRequired": {
|
|
"message": "File is password protected, please provide a decryption password."
|
|
},
|
|
"importFormatError": {
|
|
"message": "Data is not formatted correctly. Please check your import file and try again."
|
|
},
|
|
"importNothingError": {
|
|
"message": "Nothing was imported."
|
|
},
|
|
"verificationCodeRequired": {
|
|
"message": "Verification code is required."
|
|
},
|
|
"invalidVerificationCode": {
|
|
"message": "Invalid verification code."
|
|
},
|
|
"masterPassRequired": {
|
|
"message": "Master password is required."
|
|
},
|
|
"invalidMasterPassword": {
|
|
"message": "Invalid master password."
|
|
},
|
|
"sessionTimeout": {
|
|
"message": "Your session has timed out. Please go back and try logging in again."
|
|
},
|
|
"ssoKeyConnectorError": {
|
|
"message": "Key Connector error: make sure Key Connector is available and working correctly."
|
|
}
|
|
}
|