Fix client updated at, message when importing

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

app/assets/templates/directives/password-wizard.html.haml

@@ -57,6 +57,9 @@
                 %li Desktop
                 %li Web (Chrome, Firefox, Safari)
                 %li Mobile (iOS and Android)
+              %p.panel-row
+                If you do not currently have access to a device you're signed in on, you may proceed,
+                but must make signing out and back in the first step upon gaining access to that device.
               %p.panel-row Press Continue only when you have completed signing out of all your devices.
 
 
@@ -84,8 +87,8 @@
                   .spinner.small.inline.info.mr-5{"ng-if" => "formData.processing"}
                   .inline.bold{"ng-class" => "{'info' : !formData.statusError, 'error' : formData.statusError}"}
                     {{formData.status}}
-                .panel-column
-                  %p.info{"ng-if" => "syncStatus.total > 0"}
+                .panel-column{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress || syncStatus.needsMoreSync", "delay" => "1000"}
+                  %p.info
                     Syncing {{syncStatus.current}}/{{syncStatus.total}}
 
             %div{"ng-if" => "step == 5"}