From 14bc54f9d3e5dbbe85aa2d1dc7a030c51a898e90 Mon Sep 17 00:00:00 2001
From: Sadiq Khoja <sadiqkhoja@gmail.com>
Date: Wed, 2 Aug 2023 12:11:08 -0400
Subject: [PATCH 1/2] fixes #911: add warning to encryption popup

---
 src/components/project/enable-encryption.vue | 9 ++++++---
 transifex/strings_en.json                    | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/project/enable-encryption.vue b/src/components/project/enable-encryption.vue
index 4b755c284..7bfa686d4 100644
--- a/src/components/project/enable-encryption.vue
+++ b/src/components/project/enable-encryption.vue
@@ -62,12 +62,14 @@ except according to the terms contained in the LICENSE file.
             <div class="info-item">
               <span class="icon-circle-o"></span>
               <p>{{ $t('steps[0].introduction[1][1][0]') }}</p>
-              <p>{{ $t('steps[0].introduction[1][1][1]') }}</p>
             </div>
             <div class="info-item">
               <span class="icon-close"></span>
               <p>{{ $t('steps[0].introduction[1][2][0]') }}</p>
-              <p>{{ $t('steps[0].introduction[1][2][1]') }}</p>
+            </div>
+            <div class="info-item">
+              <span class="icon-close"></span>
+              <p>{{ $t('steps[0].introduction[1][3]') }} </p>
             </div>
           </div>
           <i18n-t tag="p" keypath="steps[0].introduction[2].full">
@@ -298,7 +300,8 @@ export default {
             [
               "Encryption cannot be turned off once enabled.",
               "In a future version, you will be able to disable encryption, which will decrypt your data. This will be true even if you enable encryption now."
-            ]
+            ],
+            "Draft Submissions from all Forms will be deleted."
           ],
           {
             "full": "You can learn more about encryption {here}. If this sounds like something you want, press Next to proceed.",
diff --git a/transifex/strings_en.json b/transifex/strings_en.json
index 971677879..a3df19adc 100644
--- a/transifex/strings_en.json
+++ b/transifex/strings_en.json
@@ -2931,6 +2931,9 @@
                 "1": {
                   "string": "In a future version, you will be able to disable encryption, which will decrypt your data. This will be true even if you enable encryption now."
                 }
+              },
+              "3": {
+                "string": "Draft Submissions from all Forms will be deleted."
               }
             },
             "2": {

From 8d84f4b04a4a43eed85d80b1be957a6c2e1a67a2 Mon Sep 17 00:00:00 2001
From: Sadiq Khoja <sadiqkhoja@gmail.com>
Date: Wed, 9 Aug 2023 17:41:37 -0400
Subject: [PATCH 2/2] update text

---
 src/components/project/enable-encryption.vue | 28 +++++++++-----------
 transifex/strings_en.json                    | 11 +++-----
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/components/project/enable-encryption.vue b/src/components/project/enable-encryption.vue
index 7bfa686d4..7a15bf70d 100644
--- a/src/components/project/enable-encryption.vue
+++ b/src/components/project/enable-encryption.vue
@@ -40,6 +40,14 @@ except according to the terms contained in the LICENSE file.
                 </template>
               </i18n-t>
             </div>
+            <div class="info-item">
+              <span class="icon-circle-o"></span>
+              <p>{{ $t('steps[0].introduction[1][1][0]') }}</p>
+            </div>
+            <div class="info-item">
+              <span class="icon-circle-o"></span>
+              <p>{{ $t('steps[0].introduction[1][3]') }} </p>
+            </div>
             <div class="info-item">
               <span class="icon-close"></span>
               <p>{{ $t('steps[0].introduction[0][4]') }}</p>
@@ -56,21 +64,10 @@ except according to the terms contained in the LICENSE file.
               <span class="icon-close"></span>
               <p>{{ $t('steps[0].introduction[0][7]') }}</p>
             </div>
-          </div>
-          <div class="info-block">
-            <p>{{ $t('steps[0].introduction[1][0]') }}</p>
-            <div class="info-item">
-              <span class="icon-circle-o"></span>
-              <p>{{ $t('steps[0].introduction[1][1][0]') }}</p>
-            </div>
             <div class="info-item">
               <span class="icon-close"></span>
               <p>{{ $t('steps[0].introduction[1][2][0]') }}</p>
             </div>
-            <div class="info-item">
-              <span class="icon-close"></span>
-              <p>{{ $t('steps[0].introduction[1][3]') }} </p>
-            </div>
           </div>
           <i18n-t tag="p" keypath="steps[0].introduction[2].full">
             <template #here>
@@ -292,16 +289,15 @@ export default {
             "New Submissions will no longer be processed into Entities."
           ],
           [
+            // don't translate this sentence, it is not used anywhere
             "In addition, the following are true in this version of ODK Central:",
             [
-              "Existing Submissions will remain unencrypted.",
-              "In a future version, you will have the option to encrypt existing data."
+              "Existing Submissions will remain unencrypted."
             ],
             [
-              "Encryption cannot be turned off once enabled.",
-              "In a future version, you will be able to disable encryption, which will decrypt your data. This will be true even if you enable encryption now."
+              "Encryption cannot be turned off once enabled."
             ],
-            "Draft Submissions from all Forms will be deleted."
+            "Test Submissions to existing Draft Forms will be permanently removed."
           ],
           {
             "full": "You can learn more about encryption {here}. If this sounds like something you want, press Next to proceed.",
diff --git a/transifex/strings_en.json b/transifex/strings_en.json
index a3df19adc..3d336d972 100644
--- a/transifex/strings_en.json
+++ b/transifex/strings_en.json
@@ -2914,26 +2914,21 @@
             },
             "1": {
               "0": {
-                "string": "In addition, the following are true in this version of ODK Central:"
+                "string": "In addition, the following are true in this version of ODK Central:",
+                "developer_comment": "don't translate this sentence, it is not used anywhere"
               },
               "1": {
                 "0": {
                   "string": "Existing Submissions will remain unencrypted."
-                },
-                "1": {
-                  "string": "In a future version, you will have the option to encrypt existing data."
                 }
               },
               "2": {
                 "0": {
                   "string": "Encryption cannot be turned off once enabled."
-                },
-                "1": {
-                  "string": "In a future version, you will be able to disable encryption, which will decrypt your data. This will be true even if you enable encryption now."
                 }
               },
               "3": {
-                "string": "Draft Submissions from all Forms will be deleted."
+                "string": "Test Submissions to existing Draft Forms will be permanently removed."
               }
             },
             "2": {