From 38d2a10e99834cc021f6e18d3bba2a0738c264b5 Mon Sep 17 00:00:00 2001 From: mathieuRA Date: Tue, 11 Jul 2023 10:33:03 +0200 Subject: [PATCH 1/4] fix(xo-web/settings/config): wording fix for XO Config Cloud Backup --- packages/xo-web/src/common/intl/messages.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js index 0652ccf02a0..bf533e5f99f 100644 --- a/packages/xo-web/src/common/intl/messages.js +++ b/packages/xo-web/src/common/intl/messages.js @@ -2339,8 +2339,8 @@ const messages = { xoConfigCloudBackup: 'XO Config Cloud Backup', xoConfigCloudBackupTips: 'Your encrypted configuration is securely stored inside your Vates account and backed up once a day', - xoCloudConfigEnterPassphrase: 'If you want to encrypt backups, please enter a passphrase:', - xoCloudConfigRestoreEnterPassphrase: 'If the config is encrypted, please enter the passphrase:', + xoCloudConfigEnterPassphrase: 'Passphrase is required to encrypt backups', + xoCloudConfigRestoreEnterPassphrase: 'Enter the passphrase:', // ----- XOSAN ----- xosanTitle: 'XOSAN', From da9519c6f5e2c8b8484fbce0c9b97b24f193986f Mon Sep 17 00:00:00 2001 From: mathieuRA Date: Tue, 11 Jul 2023 10:38:33 +0200 Subject: [PATCH 2/4] changelog --- CHANGELOG.unreleased.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 6deb41e5aca..0a28d007c69 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -13,6 +13,8 @@ > Users must be able to say: “I had this issue, happy to know it's fixed” +- [XO Config Cloud Backup] Wording correction about passphrase [PR [#6938](https://github.com/vatesfr/xen-orchestra/pull/6938)] + ### Packages to release > When modifying a package, add it here with its release type. From 7fc0199b34b0c1ff31bf961383583b47e5de6658 Mon Sep 17 00:00:00 2001 From: Mathieu <70369997+MathieuRA@users.noreply.github.com> Date: Wed, 12 Jul 2023 14:42:20 +0200 Subject: [PATCH 3/4] Update CHANGELOG.unreleased.md --- CHANGELOG.unreleased.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 0a28d007c69..8de3e40d9de 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -13,7 +13,7 @@ > Users must be able to say: “I had this issue, happy to know it's fixed” -- [XO Config Cloud Backup] Wording correction about passphrase [PR [#6938](https://github.com/vatesfr/xen-orchestra/pull/6938)] +- [XO Config Cloud Backup] Improve wording about passphrase [PR [#6938](https://github.com/vatesfr/xen-orchestra/pull/6938)] ### Packages to release From 3756713aaf104e5e6e3acda0cfae59aff9905c10 Mon Sep 17 00:00:00 2001 From: Mathieu <70369997+MathieuRA@users.noreply.github.com> Date: Wed, 12 Jul 2023 15:19:30 +0200 Subject: [PATCH 4/4] Update CHANGELOG.unreleased.md Co-authored-by: rbarhtaoui --- CHANGELOG.unreleased.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 8de3e40d9de..0fa4dd5d431 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -13,7 +13,7 @@ > Users must be able to say: “I had this issue, happy to know it's fixed” -- [XO Config Cloud Backup] Improve wording about passphrase [PR [#6938](https://github.com/vatesfr/xen-orchestra/pull/6938)] +- [XO Config Cloud Backup] Improve wording about passphrase (PR [#6938](https://github.com/vatesfr/xen-orchestra/pull/6938)) ### Packages to release