From 2b81bd2c8a83222d011725128ca83a01d41839ea Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Fri, 5 Mar 2021 09:33:29 +1000
Subject: [PATCH] Add extra encrypted export warning (#1299)

---
 src/App/Pages/Settings/ExportVaultPageViewModel.cs |  4 +++-
 src/App/Resources/AppResources.Designer.cs         | 12 ++++++++++--
 src/App/Resources/AppResources.resx                |  5 ++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/App/Pages/Settings/ExportVaultPageViewModel.cs b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
index cf21754f4..2998b4a15 100644
--- a/src/App/Pages/Settings/ExportVaultPageViewModel.cs
+++ b/src/App/Pages/Settings/ExportVaultPageViewModel.cs
@@ -170,7 +170,9 @@ namespace Bit.App.Pages
             switch (FileFormatOptions[FileFormatSelectedIndex].Key)
             {
                 case "encrypted_json":
-                    ExportWarningMessage = _i18nService.T("EncExportVaultWarning");
+                    ExportWarningMessage = _i18nService.T("EncExportKeyWarning") +
+                        "\n\n" +
+                        _i18nService.T("EncExportAccountWarning");
                     break;
                 default:
                     ExportWarningMessage = _i18nService.T("ExportVaultWarning");
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 75ef9df7a..c78ef7bd6 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,6 +10,7 @@
 
 namespace Bit.App.Resources {
     using System;
+    using System.Reflection;
     
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
@@ -2817,9 +2819,15 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string EncExportVaultWarning {
+        public static string EncExportKeyWarning {
             get {
-                return ResourceManager.GetString("EncExportVaultWarning", resourceCulture);
+                return ResourceManager.GetString("EncExportKeyWarning", resourceCulture);
+            }
+        }
+        
+        public static string EncExportAccountWarning {
+            get {
+                return ResourceManager.GetString("EncExportAccountWarning", resourceCulture);
             }
         }
         
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index f3d2ba5d7..e49e30979 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1602,9 +1602,12 @@
   <data name="ExportVaultWarning" xml:space="preserve">
     <value>This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it.</value>
   </data>
-  <data name="EncExportVaultWarning" xml:space="preserve">
+  <data name="EncExportKeyWarning" xml:space="preserve">
     <value>This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file.</value>
   </data>
+  <data name="EncExportAccountWarning" xml:space="preserve">
+    <value>Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account.</value>
+  </data>
   <data name="ExportVaultConfirmationTitle" xml:space="preserve">
     <value>Confirm Vault Export</value>
     <comment>Title for the alert to confirm vault exports.</comment>