diff --git a/Duplicati/Server/webroot/ngax/index.html b/Duplicati/Server/webroot/ngax/index.html index 842f38e24..2afaff9b2 100755 --- a/Duplicati/Server/webroot/ngax/index.html +++ b/Duplicati/Server/webroot/ngax/index.html @@ -313,7 +313,7 @@ The connection to the server is lost, attempting again in {{time}} ...
- Connecting to server ... + Connecting to server …
Connect now @@ -326,7 +326,7 @@
-
Not loaded ...
+
Not loaded …
The page is not yet loaded, this can be caused by a defective install, a browser issue or a slow connection.
diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreController.js index d11c42d4d..0ff98a378 100644 --- a/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreController.js +++ b/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreController.js @@ -67,7 +67,7 @@ backupApp.controller('RestoreController', function ($rootScope, $scope, $routePa $scope.fetchBackupTimes = function() { $scope.connecting = true; - $scope.ConnectionProgress = gettextCatalog.getString('Getting file versions ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Getting file versions …'); var qp = ''; if ($scope.IsBackupTemporary) @@ -121,7 +121,7 @@ backupApp.controller('RestoreController', function ($rootScope, $scope, $routePa if (filesetsBuilt[version] == null) { if ($scope.IsBackupTemporary && filesetsRepaired[version] == null) { $scope.connecting = true; - $scope.ConnectionProgress = gettextCatalog.getString('Fetching path information ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Fetching path information …'); inProgress[version] = true; AppService.post('/backup/' + $scope.BackupID + '/repairupdate', { 'only-paths': true, 'time': filesetStamps[version + '']}).then( @@ -160,7 +160,7 @@ backupApp.controller('RestoreController', function ($rootScope, $scope, $routePa return; $scope.connecting = true; - $scope.ConnectionProgress = gettextCatalog.getString('Fetching path information ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Fetching path information …'); inProgress[version] = true; AppService.get('/backup/' + $scope.BackupID + '/files/*?prefix-only=true&folder-contents=false&time=' + encodeURIComponent(stamp)).then( @@ -358,22 +358,22 @@ backupApp.controller('RestoreController', function ($rootScope, $scope, $routePa if ($scope.IsBackupTemporary) { $scope.connecting = true; - $scope.ConnectionProgress = gettextCatalog.getString('Creating temporary backup ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Creating temporary backup …'); AppService.post('/backup/' + $scope.BackupID + '/copytotemp').then(function(resp) { var backupid = resp.data.ID; - $scope.ConnectionProgress = gettextCatalog.getString('Building partial temporary database ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Building partial temporary database …'); AppService.post('/backup/' + backupid + '/repair', p).then(function(resp) { var taskid = $scope.taskid = resp.data.ID; ServerStatus.callWhenTaskCompletes(taskid, function() { AppService.get('/task/' + taskid).then(function(resp) { - $scope.ConnectionProgress = gettextCatalog.getString('Starting the restore process ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Starting the restore process …'); if (resp.data.Status == 'Completed') { AppService.post('/backup/' + backupid + '/restore', p).then(function(resp) { - $scope.ConnectionProgress = gettextCatalog.getString('Restoring files ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Restoring files …'); var t2 = $scope.taskid = resp.data.TaskID; ServerStatus.callWhenTaskCompletes(t2, function() { $scope.onRestoreComplete(t2); }); }, handleError); @@ -393,9 +393,9 @@ backupApp.controller('RestoreController', function ($rootScope, $scope, $routePa } else { $scope.connecting = true; - $scope.ConnectionProgress = gettextCatalog.getString('Starting the restore process ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Starting the restore process …'); AppService.post('/backup/' + $scope.BackupID + '/restore', p).then(function(resp) { - $scope.ConnectionProgress = gettextCatalog.getString('Restoring files ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Restoring files …'); var t2 = $scope.taskid = resp.data.TaskID; ServerStatus.callWhenTaskCompletes(t2, function() { $scope.onRestoreComplete(t2); }); }, handleError); diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreDirectController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreDirectController.js index 3381921f7..bdc58a67b 100644 --- a/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreDirectController.js +++ b/Duplicati/Server/webroot/ngax/scripts/controllers/RestoreDirectController.js @@ -37,7 +37,7 @@ backupApp.controller('RestoreDirectController', function ($rootScope, $scope, $l $scope.doConnect = function() { function connect() { $scope.connecting = true; - $scope.ConnectionProgress = gettextCatalog.getString('Registering temporary backup ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Registering temporary backup …'); var opts = {}; var obj = {'Backup': {'TargetURL': $scope.TargetURL } }; @@ -61,7 +61,7 @@ backupApp.controller('RestoreDirectController', function ($rootScope, $scope, $l AppService.post('/backups?temporary=true', obj, {'headers': {'Content-Type': 'application/json'}}).then( function(resp) { - $scope.ConnectionProgress = gettextCatalog.getString('Listing backup dates ...'); + $scope.ConnectionProgress = gettextCatalog.getString('Listing backup dates …'); $scope.BackupID = resp.data.ID; $scope.fetchBackupTimes(); }, function(resp) { diff --git a/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js b/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js index 2d17b8f60..0f8c2654b 100644 --- a/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js +++ b/Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js @@ -22,7 +22,7 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus, }; function updateStateDisplay() { - var text = gettextCatalog.getString('Running ...'); + var text = gettextCatalog.getString('Running …'); var pg = -1; if ($scope.state.lastPgEvent != null && $scope.state.activeTask != null) { diff --git a/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js b/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js index 901decc14..5ac789943 100644 --- a/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js +++ b/Duplicati/Server/webroot/ngax/scripts/services/EditUriBuiltins.js @@ -42,7 +42,7 @@ backupApp.service('EditUriBuiltins', function(AppService, AppUtils, SystemInfo, var dlg = null; - dlg = DialogService.dialog(gettextCatalog.getString('Testing permissions...'), gettextCatalog.getString('Testing permissions ...'), [], null, function() { + dlg = DialogService.dialog(gettextCatalog.getString('Testing permissions...'), gettextCatalog.getString('Testing permissions …'), [], null, function() { AppService.post('/webmodule/s3-iamconfig', {'s3-operation': 'CanCreateUser', 's3-username': scope.Username, 's3-password': scope.Password}).then(function(data) { dlg.dismiss(); @@ -112,7 +112,7 @@ backupApp.service('EditUriBuiltins', function(AppService, AppUtils, SystemInfo, var dlg = null; - dlg = DialogService.dialog(gettextCatalog.getString('Creating user...'), gettextCatalog.getString('Creating new user with limited access ...'), [], null, function() { + dlg = DialogService.dialog(gettextCatalog.getString('Creating user...'), gettextCatalog.getString('Creating new user with limited access …'), [], null, function() { path = (scope.Server || '') + '/' + (scope.Path || ''); AppService.post('/webmodule/s3-iamconfig', {'s3-operation': 'CreateIAMUser', 's3-path': path, 's3-username': scope.Username, 's3-password': scope.Password}).then(function(data) { diff --git a/Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js b/Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js index c8f1b727c..fa2770343 100644 --- a/Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js +++ b/Duplicati/Server/webroot/ngax/scripts/services/ServerStatus.js @@ -30,39 +30,39 @@ backupApp.service('ServerStatus', function($rootScope, $timeout, AppService, App function reloadTexts() { self.progress_state_text = { - 'Backup_Begin': gettextCatalog.getString('Starting backup ...'), - 'Backup_PreBackupVerify': gettextCatalog.getString('Verifying backend data ...'), - 'Backup_PostBackupTest': gettextCatalog.getString('Verifying remote data ...'), - 'Backup_PreviousBackupFinalize': gettextCatalog.getString('Completing previous backup ...'), + 'Backup_Begin': gettextCatalog.getString('Starting backup …'), + 'Backup_PreBackupVerify': gettextCatalog.getString('Verifying backend data …'), + 'Backup_PostBackupTest': gettextCatalog.getString('Verifying remote data …'), + 'Backup_PreviousBackupFinalize': gettextCatalog.getString('Completing previous backup …'), 'Backup_ProcessingFiles': null, - 'Backup_Finalize': gettextCatalog.getString('Completing backup ...'), - 'Backup_WaitForUpload': gettextCatalog.getString('Waiting for upload to finish ...'), - 'Backup_Delete': gettextCatalog.getString('Deleting unwanted files ...'), + 'Backup_Finalize': gettextCatalog.getString('Completing backup …'), + 'Backup_WaitForUpload': gettextCatalog.getString('Waiting for upload to finish …'), + 'Backup_Delete': gettextCatalog.getString('Deleting unwanted files …'), 'Backup_Compact': gettextCatalog.getString('Compacting remote data ...'), - 'Backup_VerificationUpload': gettextCatalog.getString('Uploading verification file ...'), - 'Backup_PostBackupVerify': gettextCatalog.getString('Verifying backend data ...'), + 'Backup_VerificationUpload': gettextCatalog.getString('Uploading verification file …'), + 'Backup_PostBackupVerify': gettextCatalog.getString('Verifying backend data …'), 'Backup_Complete': gettextCatalog.getString('Backup complete!'), - 'Restore_Begin': gettextCatalog.getString('Starting restore ...'), - 'Restore_RecreateDatabase': gettextCatalog.getString('Rebuilding local database ...'), - 'Restore_PreRestoreVerify': gettextCatalog.getString('Verifying remote data ...'), - 'Restore_CreateFileList': gettextCatalog.getString('Building list of files to restore ...'), - 'Restore_CreateTargetFolders': gettextCatalog.getString('Creating target folders ...'), - 'Restore_ScanForExistingFiles': gettextCatalog.getString('Scanning existing files ...'), - 'Restore_ScanForLocalBlocks': gettextCatalog.getString('Scanning for local blocks ...'), - 'Restore_PatchWithLocalBlocks': gettextCatalog.getString('Patching files with local blocks ...'), - 'Restore_DownloadingRemoteFiles': gettextCatalog.getString('Downloading files ...'), - 'Restore_PostRestoreVerify': gettextCatalog.getString('Verifying restored files ...'), + 'Restore_Begin': gettextCatalog.getString('Starting restore …'), + 'Restore_RecreateDatabase': gettextCatalog.getString('Rebuilding local database …'), + 'Restore_PreRestoreVerify': gettextCatalog.getString('Verifying remote data …'), + 'Restore_CreateFileList': gettextCatalog.getString('Building list of files to restore …'), + 'Restore_CreateTargetFolders': gettextCatalog.getString('Creating target folders …'), + 'Restore_ScanForExistingFiles': gettextCatalog.getString('Scanning existing files …'), + 'Restore_ScanForLocalBlocks': gettextCatalog.getString('Scanning for local blocks …'), + 'Restore_PatchWithLocalBlocks': gettextCatalog.getString('Patching files with local blocks …'), + 'Restore_DownloadingRemoteFiles': gettextCatalog.getString('Downloading files …'), + 'Restore_PostRestoreVerify': gettextCatalog.getString('Verifying restored files …'), 'Restore_Complete': gettextCatalog.getString('Restore complete!'), - 'Recreate_Running': gettextCatalog.getString('Recreating database ...'), - 'Vacuum_Running': gettextCatalog.getString('Vacuuming database ...'), - 'Repair_Running': gettextCatalog.getString('Repairing database ...'), - 'Verify_Running': gettextCatalog.getString('Verifying files ...'), - 'BugReport_Running': gettextCatalog.getString('Creating bug report ...'), - 'Delete_Listing': gettextCatalog.getString('Listing remote files ...'), - 'Delete_Deleting': gettextCatalog.getString('Deleting remote files ...'), - 'PurgeFiles_Begin,': gettextCatalog.getString('Listing remote files for purge ...'), - 'PurgeFiles_Process,': gettextCatalog.getString('Purging files ...'), - 'PurgeFiles_Compact,': gettextCatalog.getString('Compacting remote data ...'), + 'Recreate_Running': gettextCatalog.getString('Recreating database …'), + 'Vacuum_Running': gettextCatalog.getString('Vacuuming database …'), + 'Repair_Running': gettextCatalog.getString('Repairing database …'), + 'Verify_Running': gettextCatalog.getString('Verifying files …'), + 'BugReport_Running': gettextCatalog.getString('Creating bug report …'), + 'Delete_Listing': gettextCatalog.getString('Listing remote files …'), + 'Delete_Deleting': gettextCatalog.getString('Deleting remote files …'), + 'PurgeFiles_Begin,': gettextCatalog.getString('Listing remote files for purge …'), + 'PurgeFiles_Process,': gettextCatalog.getString('Purging files …'), + 'PurgeFiles_Compact,': gettextCatalog.getString('Compacting remote data …'), 'PurgeFiles_Complete,': gettextCatalog.getString('Purging files complete!'), 'Error': gettextCatalog.getString('Error!') }; diff --git a/Duplicati/Server/webroot/ngax/templates/about.html b/Duplicati/Server/webroot/ngax/templates/about.html index 96538e1ac..37c4fa466 100644 --- a/Duplicati/Server/webroot/ngax/templates/about.html +++ b/Duplicati/Server/webroot/ngax/templates/about.html @@ -34,26 +34,26 @@
Check for updates now -
Checking for updates ...
+
Checking for updates …
- +
 
{{Acknowledgements}}
-
Loading ...
+
Loading …
{{ChangeLog}}
-
Loading ...
+
Loading …
{{brandingService.appName}} is using the following third party libraries:
@@ -46,7 +46,7 @@
-
If the backup file was not downloaded automatically, right click and choose "Save as ..."
+
If the backup file was not downloaded automatically, right click and choose "Save as …"
diff --git a/Duplicati/Server/webroot/ngax/templates/home.html b/Duplicati/Server/webroot/ngax/templates/home.html index 5d1d73141..0df649c8c 100644 --- a/Duplicati/Server/webroot/ngax/templates/home.html +++ b/Duplicati/Server/webroot/ngax/templates/home.html @@ -23,29 +23,29 @@
Operations:

Run now

-

Restore files ...

+

Restore files …

Configuration:
-

Edit ...

-

Export ...

-

Delete ...

+

Edit …

+

Export …

+

Delete …

Advanced:
-

Database ...

+

Database …

Verify files

Compact now

-

Commandline ...

+

Commandline …

Reporting:
-

Show log ...

-

Create bug report ...

+

Show log …

+

Create bug report …

diff --git a/Duplicati/Server/webroot/ngax/templates/import.html b/Duplicati/Server/webroot/ngax/templates/import.html index 0f8a7902e..dca98524a 100644 --- a/Duplicati/Server/webroot/ngax/templates/import.html +++ b/Duplicati/Server/webroot/ngax/templates/import.html @@ -32,7 +32,7 @@
- Importing ... + Importing …
diff --git a/Duplicati/Server/webroot/ngax/templates/localdatabase.html b/Duplicati/Server/webroot/ngax/templates/localdatabase.html index 9a5ce9a90..38f245b1c 100644 --- a/Duplicati/Server/webroot/ngax/templates/localdatabase.html +++ b/Duplicati/Server/webroot/ngax/templates/localdatabase.html @@ -1,7 +1,7 @@

{{'Local database for' | translate}} {{Backup.Backup.Name}} - ...loading... + …loading…

diff --git a/Duplicati/Server/webroot/ngax/templates/log.html b/Duplicati/Server/webroot/ngax/templates/log.html index 0f4564801..657514c52 100644 --- a/Duplicati/Server/webroot/ngax/templates/log.html +++ b/Duplicati/Server/webroot/ngax/templates/log.html @@ -9,7 +9,7 @@
    -
  • Loading ...
  • +
  • Loading …
  • {{item.Timestamp | parsetimestamp}}: {{item.Message}} @@ -20,7 +20,7 @@
- Loading ... + Loading … Load older data
diff --git a/Duplicati/Server/webroot/ngax/templates/notificationarea.html b/Duplicati/Server/webroot/ngax/templates/notificationarea.html index 2880f1556..852dbbef3 100644 --- a/Duplicati/Server/webroot/ngax/templates/notificationarea.html +++ b/Duplicati/Server/webroot/ngax/templates/notificationarea.html @@ -4,7 +4,7 @@
{{item.Message}}
-
If the backup file was not downloaded automatically, right click and choose "Save as ..."
+
If the backup file was not downloaded automatically, right click and choose "Save as …"
Dismiss @@ -21,14 +21,14 @@
New update found: {{message}}
- + diff --git a/Duplicati/Server/webroot/ngax/templates/updatechangelog.html b/Duplicati/Server/webroot/ngax/templates/updatechangelog.html index 2f5697cfd..ee5755dfe 100644 --- a/Duplicati/Server/webroot/ngax/templates/updatechangelog.html +++ b/Duplicati/Server/webroot/ngax/templates/updatechangelog.html @@ -4,7 +4,7 @@
Current version is {{versionname}} ({{versionnumber}})
{{ChangeLog}}
-
Loading ...
+
Loading …