From f36f00e87b732bc68e2dbe9fa34d3e6f663e25a9 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Tue, 17 Jan 2017 15:58:35 +0100
Subject: [PATCH] gui: Update translation base (lang-en) (fixes #3909)

---
 gui/default/assets/lang/lang-en.json | 8 ++++++++
 gui/default/index.html               | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json
index 0a34839f7..97ce06cfd 100644
--- a/gui/default/assets/lang/lang-en.json
+++ b/gui/default/assets/lang/lang-en.json
@@ -4,6 +4,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",
+   "Action": "Action",
    "Actions": "Actions",
    "Add": "Add",
    "Add Device": "Add Device",
@@ -37,8 +38,10 @@
    "Copied from elsewhere": "Copied from elsewhere",
    "Copied from original": "Copied from original",
    "Copyright © 2014-2016 the following Contributors:": "Copyright © 2014-2016 the following Contributors:",
+   "Copyright © 2014-2017 the following Contributors:": "Copyright © 2014-2017 the following Contributors:",
    "Danger!": "Danger!",
    "Deleted": "Deleted",
+   "Device": "Device",
    "Device \"{%name%}\" ({%device%} at {%address%}) wants to connect. Add new device?": "Device \"{{name}}\" ({{device}} at {{address}}) wants to connect. Add new device?",
    "Device ID": "Device ID",
    "Device Identification": "Device Identification",
@@ -79,6 +82,7 @@
    "GUI Authentication User": "GUI Authentication User",
    "GUI Listen Addresses": "GUI Listen Addresses",
    "Generate": "Generate",
+   "Global Changes": "Global Changes",
    "Global Discovery": "Global Discovery",
    "Global Discovery Servers": "Global Discovery Servers",
    "Global State": "Global State",
@@ -89,6 +93,7 @@
    "Ignore Permissions": "Ignore Permissions",
    "Incoming Rate Limit (KiB/s)": "Incoming Rate Limit (KiB/s)",
    "Incorrect configuration may damage your folder contents and render Syncthing inoperable.": "Incorrect configuration may damage your folder contents and render Syncthing inoperable.",
+   "Introduced By": "Introduced By",
    "Introducer": "Introducer",
    "Inversion of the given condition (i.e. do not exclude)": "Inversion of the given condition (i.e. do not exclude)",
    "Keep Versions": "Keep Versions",
@@ -126,6 +131,7 @@
    "Out of Sync Items": "Out of Sync Items",
    "Outgoing Rate Limit (KiB/s)": "Outgoing Rate Limit (KiB/s)",
    "Override Changes": "Override Changes",
+   "Path": "Path",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for",
    "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Path where versions should be stored (leave empty for the default .stversions folder in the folder).",
    "Pause": "Pause",
@@ -215,7 +221,9 @@
    "This Device": "This Device",
    "This can easily give hackers access to read and change any files on your computer.": "This can easily give hackers access to read and change any files on your computer.",
    "This is a major version upgrade.": "This is a major version upgrade.",
+   "Time": "Time",
    "Trash Can File Versioning": "Trash Can File Versioning",
+   "Type": "Type",
    "Unknown": "Unknown",
    "Unshared": "Unshared",
    "Unused": "Unused",
diff --git a/gui/default/index.html b/gui/default/index.html
index 55e4c0b90..f4be9e915 100644
--- a/gui/default/index.html
+++ b/gui/default/index.html
@@ -588,7 +588,7 @@
                     </tr>
                     <tr ng-if="deviceCfg.introducedBy">
                       <th><span class="fa fa-fw fa-meh-o"></span>&nbsp;<span translate>Introduced By</span></th>
-                      <td translate class="text-right">{{ deviceName(findDevice(deviceCfg.introducedBy)) || deviceCfg.introducedBy.substring(0, 5) }}</td>
+                      <td class="text-right">{{ deviceName(findDevice(deviceCfg.introducedBy)) || deviceCfg.introducedBy.substring(0, 5) }}</td>
                     </tr>
                     <tr ng-if="connections[deviceCfg.deviceID].clientVersion">
                       <th><span class="fa fa-fw fa-tag"></span>&nbsp;<span translate>Version</span></th>