Merge pull request #3885 from leela52452/master

Changed ... to ellipsis character
This commit is contained in:
Kenneth Skovhede
2019-09-19 22:12:15 +02:00
committed by GitHub
17 changed files with 75 additions and 75 deletions
+2 -2
View File
@@ -313,7 +313,7 @@
The connection to the server is lost, attempting again in {{time}} ...
</div>
<div class="content" translate ng-hide="state.connectionState !='connecting'">
Connecting to server ...
Connecting to server
</div>
<div class="content buttons">
<a href ng-show="state.connectionState != 'connecting'" ng-click="doReconnect()" class="button" translate>Connect now</a>
@@ -326,7 +326,7 @@
<div ng-show="false" class="connection-lost" ng-click="">
<div class="info">
<div class="title">Not loaded ...</div>
<div class="title">Not loaded </div>
<div class="content">
The page is not yet loaded, this can be caused by a defective install, a browser issue or a slow connection.
</div>
@@ -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);
@@ -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) {
@@ -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)
{
@@ -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) {
@@ -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!')
};
@@ -34,26 +34,26 @@
</div>
<a ng-show="state.updaterState == 'Waiting'" href ng-click="doCheckForUpdates()" translate>Check for updates now</a>
<div ng-show="state.updaterState == 'Checking'" translate>Checking for updates ...</div>
<div ng-show="state.updaterState == 'Checking'" translate>Checking for updates </div>
<progress-bar ng-show="state.updaterState == 'Downloading'" ng-text="'Downloading update ...'", ng-progress="state.updateDownloadProgress">
<progress-bar ng-show="state.updaterState == 'Downloading'" ng-text="'Downloading update '", ng-progress="state.updateDownloadProgress">
</progress-bar>
<div>&nbsp;</div>
<div class="prewrapped-text" ng-show="Acknowledgements">{{Acknowledgements}}</div>
<div class="prewrapped-text" ng-hide="Acknowledgements" translate="">Loading ...</div>
<div class="prewrapped-text" ng-hide="Acknowledgements" translate="">Loading </div>
</div>
<div ng-show="Page == 'changelog'">
<div class="prewrapped-text fixed-width-font" ng-show="ChangeLog">{{ChangeLog}}</div>
<div class="prewrapped-text fixed-width-font" ng-hide="ChangeLog" translate="">Loading ...</div>
<div class="prewrapped-text fixed-width-font" ng-hide="ChangeLog" translate="">Loading </div>
</div>
<div ng-show="Page == 'licenses'" class="licenses">
{{brandingService.appName}} is using the following third party libraries:
<ul>
<li ng-show="Licenses == null" translate>Loading ...</li>
<li ng-show="Licenses == null" translate>Loading </li>
<li ng-repeat="item in Licenses" class="licenseentry">
<external-link class="itemlink" link="item.link">{{item.name}}</external-link>: {{item.description}}. <external-link class="licenselink" link="item.licenselink">{{item.license}} licensed</external-link>
</li>
@@ -152,7 +152,7 @@
<div class="input text overlayButton">
<input type="text" name="sourcePath" id="sourcePath" placeholder="{{'Add a path directly' | translate}}" ng-model="manualSourcePath" ng-disabled="validatingSourcePath" />
<a href id="sourceFolderPathAdd" class="button" ng-disabled="validatingSourcePath || manualSourcePath == null || manualSourcePath == ''" ng-click="addManualSourcePath()">
<span ng-show="validatingSourcePath" translate>Validating ...</span>
<span ng-show="validatingSourcePath" translate>Validating </span>
<span ng-hide="validatingSourcePath" translate>Add path</span>
</a>
</div>
@@ -9,7 +9,7 @@
<div ng-show="Page == 'general'">
<ul class="entries backuplog">
<li ng-show="GeneralData == null" translate>Loading ...</li>
<li ng-show="GeneralData == null" translate>Loading </li>
<li ng-repeat="item in GeneralData" style="width: 100%">
<div ng-click="expanded = !expanded" class="entryline clickable">
<i class="{{ResultIcon(item.Result ? item.Result.ParsedResult : 'None')}}"></i>
@@ -22,14 +22,14 @@
</li>
</ul>
<div ng-show="GeneralData != null &amp;&amp; !GeneralDataComplete" class="button" ng-click="LoadMoreGeneralData()">
<span ng-show="LoadingData" translate>Loading ...</span>
<span ng-show="LoadingData" translate>Loading </span>
<span ng-hide="LoadingData" translate>Load older data</span>
</div>
</div>
<div ng-show="Page == 'remote'">
<ul class="entries">
<li ng-show="RemoteData == null" translate>Loading ...</li>
<li ng-show="RemoteData == null" translate>Loading </li>
<li ng-repeat="item in RemoteData">
<div ng-click="expanded = !expanded" class="entryline clickable">
{{item.Timestamp | parsetimestamp}}: {{item.Operation}} {{item.Path}}
@@ -40,7 +40,7 @@
</li>
</ul>
<div ng-show="RemoteData != null &amp;&amp; !RemoteDataComplete" class="button" ng-click="LoadMoreRemoteData()">
<span ng-show="LoadingData" translate>Loading ...</span>
<span ng-show="LoadingData" translate>Loading </span>
<span ng-hide="LoadingData" translate>Load older data</span>
</div>
</div>
@@ -19,7 +19,7 @@
<div class="buttons">
<a href ng-hide="Testing" class="test-connection" ng-click="testConnection()" translate>Test connection</a>
<a href ng-show="Testing" class="test-connection" translate>Testing ...</a>
<a href ng-show="Testing" class="test-connection" translate>Testing </a>
</div>
<div class="input textarea">
@@ -36,7 +36,7 @@
</div>
<div class="buttons" ng-show="Connecting">
<a href translate>Exporting ...</a>
<a href translate>Exporting </a>
</div>
</div>
@@ -46,7 +46,7 @@
</div>
<div ng-show="DownloadURL != null">
<div translate>If the backup file was not downloaded automatically, <a href="{{DownloadURL}}" target="_blank">right click and choose &quot;Save as ...&quot;</a></div>
<div translate>If the backup file was not downloaded automatically, <a href="{{DownloadURL}}" target="_blank">right click and choose &quot;Save as &quot;</a></div>
</div>
<div class="buttons">
@@ -23,29 +23,29 @@
<dt translate>Operations:</dt>
<dd>
<p ng-click="doRun(item.Backup.ID)" translate>Run now</p>
<p ng-click="doRestore(item.Backup.ID)" translate>Restore files ...</p>
<p ng-click="doRestore(item.Backup.ID)" translate>Restore files </p>
</dd>
<dt translate>Configuration:</dt>
<dd>
<p ng-click="doEdit(item.Backup.ID)" translate>Edit ...</p>
<p ng-click="doExport(item.Backup.ID)" translate>Export ...</p>
<p ng-click="doDelete(item.Backup.ID, item.Backup.Name)" translate>Delete ...</p>
<p ng-click="doEdit(item.Backup.ID)" translate>Edit </p>
<p ng-click="doExport(item.Backup.ID)" translate>Export </p>
<p ng-click="doDelete(item.Backup.ID, item.Backup.Name)" translate>Delete </p>
</dd>
<dt translate>Advanced:</dt>
<dd>
<p ng-click="doLocalDb(item.Backup.ID)" translate>Database ...</p>
<p ng-click="doLocalDb(item.Backup.ID)" translate>Database </p>
<p ng-click="doVerifyRemote(item.Backup.ID)" translate>Verify files</p>
<p ng-click="doCompact(item.Backup.ID)" translate>Compact now</p>
<p ng-click="doCommandLine(item.Backup.ID)" translate>Commandline ...</p>
<p ng-click="doCommandLine(item.Backup.ID)" translate>Commandline </p>
</dd>
<dt translate>Reporting:</dt>
<dd>
<p ng-click="doShowLog(item.Backup.ID)" translate>Show log ...</p>
<p ng-click="doCreateBugReport(item.Backup.ID)" translate>Create bug report ...</p>
<p ng-click="doShowLog(item.Backup.ID)" translate>Show log </p>
<p ng-click="doCreateBugReport(item.Backup.ID)" translate>Create bug report </p>
</dd>
</dl>
@@ -32,7 +32,7 @@
</div>
<div class="buttons" ng-show="Connecting">
<a href translate>Importing ...</a>
<a href translate>Importing </a>
</div>
</form>
@@ -1,7 +1,7 @@
<div ng-controller="LocalDatabaseController" class="localdb" >
<h1>{{'Local database for' | translate}}
<b ng-show="Backup.Backup.Name">{{Backup.Backup.Name}}</b>
<b ng-hide="Backup.Backup.Name" translate>...loading...</b>
<b ng-hide="Backup.Backup.Name" translate>loading</b>
</h1>
<div>
@@ -9,7 +9,7 @@
<div ng-show="Page=='stored'">
<ul class="entries">
<li ng-show="LogData == null" translate>Loading ...</li>
<li ng-show="LogData == null" translate>Loading </li>
<li ng-repeat="item in LogData">
<div ng-click="expanded = !expanded" class="entryline clickable">
{{item.Timestamp | parsetimestamp}}: {{item.Message}}
@@ -20,7 +20,7 @@
</li>
</ul>
<div ng-show="LogData != null &amp;&amp; !LogDataComplete" class="button" ng-click="LoadMoreStoredData()">
<span ng-show="LoadingData" translate>Loading ...</span>
<span ng-show="LoadingData" translate>Loading </span>
<span ng-hide="LoadingData" translate>Load older data</span>
</div>
</div>
@@ -4,7 +4,7 @@
<div class="content">
<div ng-if="item.Action != 'update:new'" class="message">{{item.Message}}</div>
<div ng-show="item.DownloadLink != null">
<div translate>If the backup file was not downloaded automatically, <a href="{{item.DownloadLink}}" target="_blank">right click and choose &quot;Save as ...&quot;</a></div>
<div translate>If the backup file was not downloaded automatically, <a href="{{item.DownloadLink}}" target="_blank">right click and choose &quot;Save as &quot;</a></div>
</div>
<div ng-if="item.Action != 'update:new'" class="buttons">
<a href ng-click="doDismiss(item.ID)" class="button dismiss" translate>Dismiss</a>
@@ -21,14 +21,14 @@
<div ng-if="item.Action == 'update:new'">
<div class="message" translate translate-params-message="item.Message">New update found: {{message}}</div>
<progress-bar ng-show="state.updaterState == 'Downloading'" ng-text="'Downloading update...' | translate" ng-progress="state.updateDownloadProgress"></progress-bar>
<progress-bar ng-show="state.updaterState == 'Downloading'" ng-text="'Downloading update' | translate" ng-progress="state.updateDownloadProgress"></progress-bar>
<div class="buttons">
<a href ng-click="doDismiss(item.ID)" class="button dismiss" translate>Dismiss</a>
<a href ng-show="!state.updateReady &amp;&amp; state.updaterState == 'Waiting'" ng-click="doInstallUpdate(item.ID)" class="button installupdate" translate>Install</a>
<a href ng-show="state.updateReady &amp;&amp; state.updaterState == 'Waiting'" ng-click="doActivateUpdate(item.ID)" class="button installupdate" translate>Activate</a>
<a href ng-show="state.updaterState == 'Downloading'" class="button" ng-disabled="true" ng-click="" translate>Downloading ...</a>
<a href ng-show="state.updaterState == 'Checking'" class="button" ng-disabled="true" ng-click="" translate>Verifying ...</a>
<a href ng-show="state.updaterState == 'Downloading'" class="button" ng-disabled="true" ng-click="" translate>Downloading </a>
<a href ng-show="state.updaterState == 'Checking'" class="button" ng-disabled="true" ng-click="" translate>Verifying </a>
<a href ng-click="doShowUpdate()" class="button showupdate" translate>Show</a>
<div class="clear"></div>
</div>
@@ -4,7 +4,7 @@
<div translate translate-params-versionname="systeminfo.ServerVersionName" translate-params-versionnumber="systeminfo.ServerVersion">Current version is {{versionname}} ({{versionnumber}})</div>
<div class="prewrapped-text fixed-width-font" ng-show="ChangeLog">{{ChangeLog}}</div>
<div class="prewrapped-text fixed-width-font" ng-hide="ChangeLog" translate>Loading ...</div>
<div class="prewrapped-text fixed-width-font" ng-hide="ChangeLog" translate>Loading </div>
<div class="buttons">
<a href class="button" ng-show="serverstate.UpdaterState == 'Waiting' &amp;&amp; serverstate.UpdatedVersion != null" ng-click="doInstall()" translate>Install</a>