Fix client updated at, message when importing

2018-06-08 10:12:04 -05:00
parent 0fd9a79559
commit be7a4b7b9f
5 changed files with 20 additions and 7 deletions
--- a/app/assets/templates/directives/account-menu.html.haml
+++ b/app/assets/templates/directives/account-menu.html.haml
@@ -158,6 +158,9 @@
              .button-group.stretch.panel-row.form-submit
                %button.button.info{"type" => "submit"}
                  .label Decrypt & Import
+              %p
+                Importing from backup will overwrite existing notes with matching note from backup. Existing notes not found in the backup will remain as-is and won't be overwritten.
+              %p If you'd like to import only a selection of notes instead of the whole file, please use the Batch Manager extension instead.
          .panel-row
            .spinner.small.info{"ng-if" => "importData.loading"}
    .footer