diff --git a/gui/assets/css/overrides.css b/gui/assets/css/overrides.css index fcafddcbf..a8cbf4ed2 100644 --- a/gui/assets/css/overrides.css +++ b/gui/assets/css/overrides.css @@ -67,7 +67,7 @@ identicon { top: 1px; } -.panel-heading .glyphicon { +.panel-heading .fa, .modal-header .fa { margin-right: 10px; } diff --git a/gui/index.html b/gui/index.html index 6bd466b31..d788eba13 100755 --- a/gui/index.html +++ b/gui/index.html @@ -19,6 +19,7 @@
{{thisDeviceName()}}
The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.
{{err.time | date:"yyyy-MM-dd HH:mm:ss"}}: {{friendlyDevices(err.error)}}
Folder Path | +Folder Path | {{folder.path}} | |
---|---|---|---|
Error | +Error | {{model[folder.id].invalid || model[folder.id].error}} | |
Global State | +Global State | {{model[folder.id].globalFiles | alwaysNumber}} items, ~{{model[folder.id].globalBytes | binary}}B | |
Local State | +Local State | {{model[folder.id].localFiles | alwaysNumber}} items, ~{{model[folder.id].localBytes | binary}}B | |
Out of Sync | +Out of Sync | - {{model[folder.id].needFiles | alwaysNumber}} items, ~{{model[folder.id].needBytes | binary}}B + {{model[folder.id].needFiles | alwaysNumber}} items, ~{{model[folder.id].needBytes | binary}}B | |
Failed Items | +Failed Items | - {{failed[folder.id].length | alwaysNumber}} items + {{failed[folder.id].length | alwaysNumber}} items | - +- ... + |
Folder Master | +Folder Master | Yes | |
Ignore Patterns | +Ignore Patterns | Yes | |
Ignore Permissions | +Ignore Permissions | Yes | |
Rescan Interval | +Rescan Interval | {{folder.rescanIntervalS}} s | |
File Pull Order | +File Pull Order | Random Alphabetic @@ -273,7 +282,7 @@ | |
File Versioning | +File Versioning | Trash Can File Versioning Staggered File Versioning @@ -282,11 +291,11 @@ | |
Shared With | +Shared With | {{sharesFolder(folder)}} | |
Last File Received | +Last File Received | Updated @@ -299,10 +308,16 @@ |
Download Rate | +Download Rate | {{connectionsTotal.inbps | binary}}B/s ({{connectionsTotal.inBytesTotal | binary}}B) | |
---|---|---|---|
Upload Rate | +Upload Rate | {{connectionsTotal.outbps | binary}}B/s ({{connectionsTotal.outBytesTotal | binary}}B) | |
Local State (Total) | +Local State (Total) | {{localStateTotal.files | alwaysNumber}} items, ~{{localStateTotal.bytes | binary}}B | |
RAM Utilization | +RAM Utilization | {{system.sys | binary}}B | |
CPU Utilization | +CPU Utilization | {{system.cpuPercent | alwaysNumber | natural:1}}% | |
Global Discovery | +Global Discovery | OK @@ -367,11 +386,11 @@ | |
Uptime | +Uptime | {{system.uptime | duration:"m"}} | |
Version | +Version | {{versionString()}} |
Download Rate | +Download Rate | {{connections[deviceCfg.deviceID].inbps | binary}}B/s ({{connections[deviceCfg.deviceID].inBytesTotal | binary}}B) | |
---|---|---|---|
Upload Rate | +Upload Rate | {{connections[deviceCfg.deviceID].outbps | binary}}B/s ({{connections[deviceCfg.deviceID].outBytesTotal | binary}}B) | |
Address | +Address | {{deviceAddr(deviceCfg)}} | |
Compression | +Compression | All Data Off | |
Introducer | +Introducer | Yes | |
Version | +Version | {{connections[deviceCfg.deviceID].clientVersion}} | |
Last seen | +Last seen | Never | {{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm:ss"}} |
Folders | +Folders | {{deviceFolders(deviceCfg).join(", ")}} |
Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.
diff --git a/gui/syncthing/core/languageSelectDirective.js b/gui/syncthing/core/languageSelectDirective.js index 84855bd21..0b678d393 100644 --- a/gui/syncthing/core/languageSelectDirective.js +++ b/gui/syncthing/core/languageSelectDirective.js @@ -4,7 +4,7 @@ angular.module('syncthing.core') return { restrict: 'EA', template: - ' {{localesNames[currentLocale] || "English"}} '+ + ' {{localesNames[currentLocale] || "English"}} '+ 'Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…
diff --git a/gui/syncthing/core/restartingDialogView.html b/gui/syncthing/core/restartingDialogView.html index 3fcccebc5..48fe3891b 100644 --- a/gui/syncthing/core/restartingDialogView.html +++ b/gui/syncthing/core/restartingDialogView.html @@ -1,3 +1,3 @@ -Syncthing is restarting. Please wait...
Syncthing has been shut down.
Syncthing is upgrading. Please wait...
Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.
Enter ignore patterns, one per line.
- +Enter ignore patterns, one per line.
+ -Quick guide to supported patterns (full documentation):
-!
*
**
//
{{currentFolder.path}}{{system.pathSeparator}}.stignore
Quick guide to supported patterns (full documentation):
+!
*
**
//
{{currentFolder.path}}{{system.pathSeparator}}.stignore
The following items could not be synchronized. They are retried automatically and will be synced when the error is resolved. diff --git a/gui/syncthing/transfer/neededFilesModalView.html b/gui/syncthing/transfer/neededFilesModalView.html index b4076d140..eac38802c 100644 --- a/gui/syncthing/transfer/neededFilesModalView.html +++ b/gui/syncthing/transfer/neededFilesModalView.html @@ -1,4 +1,4 @@ -
The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.
The aggregated statistics are publicly available at {%url%}.
-{{reportData | json}}
The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.
-The aggregated statistics are publicly available at {%url%}.
-{{reportData | json}}-
The encrypted usage report is sent daily. It is used to track common platforms, folder sizes and app versions. If the reported data set is changed you will be prompted with this dialog again.
+The aggregated statistics are publicly available at {%url%}.
+{{reportData | json}}+