From 920126548c35bfe2a4bd31f2c292aa923336969a Mon Sep 17 00:00:00 2001
From: petervanv <58996467+petervanv@users.noreply.github.com>
Date: Sun, 19 Jan 2020 20:51:03 +0100
Subject: [PATCH 1/2] Dutch language Update .4.7-I

---
 translate/translate.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/translate/translate.json b/translate/translate.json
index 79cb4e47..04f18f3c 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -5632,6 +5632,7 @@
     },
     {
       "en": "Download \\\"meshcmd\\\" with an action file to route traffic thru this server to this device. Make sure to edit meshaction.txt and add your account password or make any changes needed.",
+      "nl": "Download \\\"meshcmd\\\" met het actiebestand om verkeer via deze server naar dit apparaat te leiden. Zorg ervoor dat u meshaction.txt bewerkt en uw accountwachtwoord toevoegt of breng de nodige wijzigingen aan.",
       "xloc": [
         "default.handlebars->23->571"
       ]
@@ -10308,6 +10309,7 @@
     },
     {
       "en": "MeshAction (.txt)",
+      "nl": "MeshAction (.txt)",
       "xloc": [
         "default.handlebars->23->575",
         "default.handlebars->23->577"
@@ -10449,42 +10451,49 @@
     },
     {
       "en": "MeshCmd (Linux ARM, 32bit)",
+      "nl": "MeshCmd (Linux ARM, 32bit)",
       "xloc": [
         "default.handlebars->23->585"
       ]
     },
     {
       "en": "MeshCmd (Linux x86, 32bit)",
+      "nl": "MeshCmd (Linux x86, 32bit)",
       "xloc": [
         "default.handlebars->23->582"
       ]
     },
     {
       "en": "MeshCmd (Linux x86, 64bit)",
+      "nl": "MeshCmd (Linux x86, 64bit)",
       "xloc": [
         "default.handlebars->23->583"
       ]
     },
     {
       "en": "MeshCmd (MacOS, 64bit)",
+      "nl": "MeshCmd (MacOS, 64bit)",
       "xloc": [
         "default.handlebars->23->584"
       ]
     },
     {
       "en": "MeshCmd (Win32 executable)",
+      "nl": "MeshCmd (Win32 executable)",
       "xloc": [
         "default.handlebars->23->580"
       ]
     },
     {
       "en": "MeshCmd (Win64 executable)",
+      "nl": "MeshCmd (Win64 executable)",
       "xloc": [
         "default.handlebars->23->581"
       ]
     },
     {
       "en": "MeshCmd is a command line tool that performs lots of different operations. The action file can optionally be downloaded and edited to provide server information and credentials.",
+      "nl": "MeshCmd is een opdrachtregelprogramma dat veel verschillende bewerkingen uitvoert. Het actiebestand is optioneel, en kan worden gedownload en bewerkt om serverinformatie en referenties te verstrekken.",
       "xloc": [
         "default.handlebars->23->570"
       ]
@@ -19252,4 +19261,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}

From 2973c701197baf68e16faa9531a8593e1be9170a Mon Sep 17 00:00:00 2001
From: Bryan Roe <git.bryan.roe@techsavvydude.com>
Date: Tue, 21 Jan 2020 15:44:24 -0800
Subject: [PATCH 2/2] Added check, so Windows Agents will make sure they can
 run in Safe Mode

---
 agents/meshcore.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/agents/meshcore.js b/agents/meshcore.js
index ed36f055..a3d42fb0 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -39,11 +39,17 @@ var MESHRIGHT_LIMITEDINPUT = 4096;
 
 function createMeshCore(agent) {
     var obj = {};
-    if (process.platform == 'win32' && require('user-sessions').isRoot()) {
+    if (process.platform == 'win32' && require('user-sessions').isRoot())
+    {
         // Check the Agent Uninstall MetaData for correctness, as the installer may have written an incorrect value
         var writtenSize = 0, actualSize = Math.floor(require('fs').statSync(process.execPath).size / 1024);
         try { writtenSize = require('win-registry').QueryKey(require('win-registry').HKEY.LocalMachine, 'Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MeshCentralAgent', 'EstimatedSize'); } catch (x) { }
         if (writtenSize != actualSize) { try { require('win-registry').WriteKey(require('win-registry').HKEY.LocalMachine, 'Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MeshCentralAgent', 'EstimatedSize', actualSize); } catch (x2) { } }
+
+        // Check to see if we are the Installed Mesh Agent Service, if we are, make sure we can run in Safe Mode
+        var meshCheck = false;
+        try { meshCheck = require('service-manager').manager.getService('Mesh Agent').isMe(); } catch (mce) { }
+        if (meshCheck && require('win-bcd').isSafeModeService && !require('win-bcd').isSafeModeService('Mesh Agent')) { require('win-bcd').enableSafeModeService('Mesh Agent'); }
     }
 
     if (process.platform == 'darwin' && !process.versions) {