diff --git a/gui/assets/css/overrides.css b/gui/assets/css/overrides.css index 4ddc3116d..b2b2d1b96 100644 --- a/gui/assets/css/overrides.css +++ b/gui/assets/css/overrides.css @@ -68,7 +68,7 @@ identicon { } .panel-heading .glyphicon { - margin-right: 15px; + margin-right: 10px; } .panel-heading { diff --git a/gui/assets/lang/lang-en.json b/gui/assets/lang/lang-en.json index 9c816f975..d25501877 100644 --- a/gui/assets/lang/lang-en.json +++ b/gui/assets/lang/lang-en.json @@ -2,6 +2,7 @@ "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.", "API Key": "API Key", "About": "About", + "Actions": "Actions", "Add": "Add", "Add Device": "Add Device", "Add Folder": "Add Folder", @@ -62,6 +63,7 @@ "Global Discovery": "Global Discovery", "Global Discovery Server": "Global Discovery Server", "Global State": "Global State", + "Help": "Help", "Ignore": "Ignore", "Ignore Patterns": "Ignore Patterns", "Ignore Permissions": "Ignore Permissions", diff --git a/gui/index.html b/gui/index.html index fee3d7a1e..f11e81ff0 100644 --- a/gui/index.html +++ b/gui/index.html @@ -34,27 +34,33 @@ @@ -73,7 +79,7 @@

The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.

- +
@@ -87,7 +93,7 @@

-  New Device +  New Device

@@ -100,9 +106,9 @@
- - - + + +
@@ -133,13 +139,13 @@
@@ -157,7 +163,7 @@

{{err.time | date:"yyyy-MM-dd HH:mm:ss"}}: {{friendlyDevices(err.error)}}

- +
@@ -196,51 +202,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + - +
 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
 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 @@ -251,7 +257,7 @@
 File Versioning File Versioning Staggered File Versioning Simple File Versioning @@ -259,11 +265,11 @@
 Shared With Shared With {{sharesFolder(folder)}}
 Last File Received Last File Received {{folderStats[folder.id].lastFile.filename | basename}} @@ -274,10 +280,10 @@
- + - - + +
@@ -285,8 +291,8 @@ - - + +
@@ -309,23 +315,23 @@ - + - + - + - + - + - + - + @@ -374,53 +380,53 @@
 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)
 RAM Utilization RAM Utilization {{system.sys | binary}}B
 CPU Utilization CPU Utilization {{system.cpuPercent | alwaysNumber | natural:1}}%
 Global Discovery Global Discovery OK @@ -338,11 +344,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(", ")}}
-  Edit +  Edit
- +
@@ -433,12 +439,12 @@ @@ -506,8 +512,8 @@

- - + +
@@ -585,9 +591,9 @@
- - - + + +
@@ -750,10 +756,10 @@
When adding a new folder, keep in mind that the Folder ID is used to tie folders together between devices. They are case sensitive and must match exactly between all devices.
- - - - + + + +
@@ -783,8 +789,8 @@
Editing {{currentFolder.path}}{{system.pathSeparator}}.stignore
- - + +
@@ -905,8 +911,8 @@
- - + +
@@ -927,8 +933,8 @@ 
{{reportData | json}}
- - + +
@@ -948,7 +954,7 @@ 
{{reportData | json}}
- +
@@ -979,7 +985,7 @@ -  {{f.name | basename}} +  {{f.name | basename}} diff --git a/gui/scripts/syncthing/core/directives/languageSelectDirective.js b/gui/scripts/syncthing/core/directives/languageSelectDirective.js index d9815e367..30ba3f0e4 100644 --- a/gui/scripts/syncthing/core/directives/languageSelectDirective.js +++ b/gui/scripts/syncthing/core/directives/languageSelectDirective.js @@ -4,7 +4,7 @@ angular.module('syncthing.core') return { restrict: 'EA', template: - '{{localesNames[currentLocale] || "English"}} '+ + ' {{localesNames[currentLocale] || "English"}} '+ '