Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NAS-130139 / 25.04 / Fix unlock children tooltip #10998

Merged
merged 3 commits into from
Nov 11, 2024
Merged

NAS-130139 / 25.04 / Fix unlock children tooltip #10998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2f79cf
NAS-130139: Fix unlock children tooltip
Nov 8, 2024
99636cb
NAS-130139: Fix unlock children tooltip
Nov 11, 2024
885c0b0
Merge branch 'origin/master' into 130139/NAS-130139
Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/app/helptext/storage/volumes/datasets/dataset-unlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ export const helptextUnlock = {
unlock_key_file_placeholder: T('Unlock with Key file'),
unlock_key_file_tooltip: T('Use an exported encryption key file to unlock datasets.'),
unlock_children_placeholder: T('Unlock Child Encrypted Roots'),
unlock_children_tooltip: T('Also unlock any encrypted dataset stored within this dataset.'),
unlock_children_tooltip: T('Also unlock any separate encryption roots that are children of this dataset. \
Child datasets that inherit encryption from this encryption root will be unlocked in either case.'),
upload_key_file_placeholder: T('Upload Key file'),
upload_key_file_tooltip: T('Browse to the exported key file that can be used to unlock this \
dataset.'),
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/af.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/ast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/az.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/be.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/bg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/bn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/br.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/bs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/ca.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/cy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always Chroot": "",
"Amazon S3": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/dsb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/el.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en-au.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en-gb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
"Alphanumeric <a href=\"https://www.backblaze.com/docs/cloud-storage-application-keys?highlight=application%20key\" target=\"_blank\">Backblaze B2</a> Application Key ID. To generate a new application key, log in to the Backblaze account, go to the <i>App Keys</i> page, and add a new application key. Copy the application <i>keyID</i> string to this field.": "",
"Also Include Naming Schema": "",
"Also include snapshots with the name": "",
"Also unlock any encrypted dataset stored within this dataset.": "",
"Also unlock any separate encryption roots that are children of this dataset. Child datasets that inherit encryption from this encryption root will be unlocked in either case.": "",
"Alternative names that SMB clients can use when connecting to this NAS. Can be no greater than 15 characters.": "",
"Alternatively, you can start by configuring VDEVs in the wizard first and then opening Manual selection to make adjustments.": "",
"Always": "",
Expand Down
Loading
Loading