diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index fd56c8167e..c402b0dfed 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -28,7 +28,12 @@ return [
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'backups_help' => 'Download files & Data',
+ 'backups_restoring' => 'Restoring from Backup',
+ 'backups_upload' => 'Upload Backup',
+ 'backups_path' => 'Backups on the server are stored in :path
',
+ 'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.
Your entire :app_name database and any uploaded files will be completely replaced by what\'s in the backup file. ',
+ 'backups_logged_out' => 'You will be logged out once your restore is complete.',
+ 'backups_large' => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone and will PERMANENTLY delete all soft-deleted items and users. (You should make a backup first, just to be safe.)',
@@ -269,23 +274,6 @@ return [
'oauth' => 'OAuth',
'oauth_help' => 'Oauth Endpoint Settings',
'asset_tag_title' => 'Update Asset Tag Settings',
- 'backup_upload' => 'Upload Backup',
- 'backup_files_path' => '
Backup files on the server are stored in: :path
- Use the restore button to - restore from a previous backup. (This does not currently with with S3 file storage.)
- -Your entire :app database and any uploaded files will be completely replaced by what is in the backup file. -
- -- You will be logged out once your restore is complete. -
- -- Very large backups may time out on the restore attempt and may still need to be run via command line. -
', 'barcode_title' => 'Update Barcode Settings', 'barcodes' => 'Barcodes', 'barcodes_help_overview' => 'Barcode & QR settings', diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php index dcd3e839de..ec1ec5b612 100644 --- a/resources/views/settings/backups.blade.php +++ b/resources/views/settings/backups.blade.php @@ -105,14 +105,17 @@+ {!! trans('admin/settings/general.backups_path', ['path'=> $path]) !!} +
@if (config('app.lock_passwords')===true){{ trans('general.feature_disabled') }}
@@ -171,13 +174,23 @@+ {!! trans('admin/settings/general.backups_restore_warning', ['app_name' => config('app.name') ]) !!} +
+ ++ {{ trans('admin/settings/general.backups_logged_out') }} +
+ ++ {{ trans('admin/settings/general.backups_large') }} +