From 4e8ae05c2b46e162329db6c34f55008dca14c02f Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Thu, 6 Feb 2020 10:22:24 -0800
Subject: [PATCH] Fixed NPM auto path fill, improved Russian translation.

---
 meshcentral.js           |  6 +++++-
 package.json             |  2 +-
 translate/translate.js   |  2 +-
 translate/translate.json | 17 ++++++++++-------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/meshcentral.js b/meshcentral.js
index 0198a275..a34c07ad 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -1253,7 +1253,11 @@ function CreateMeshCentralServer(config, args) {
                     try {
                         var nodepath = process.argv[0];
                         var npmpath = obj.path.join(obj.path.dirname(process.argv[0]), 'npm');
-                        if (obj.fs.existsSync(nodepath) && obj.fs.existsSync(npmpath)) { obj.args.npmpath = (nodepath + ' ' + npmpath); }
+                        if (obj.fs.existsSync(nodepath) && obj.fs.existsSync(npmpath)) {
+                            if (nodepath.indexOf(' ') >= 0) { nodepath = '"' + nodepath + '"'; }
+                            if (npmpath.indexOf(' ') >= 0) { npmpath = '"' + npmpath + '"'; }
+                            if (obj.platform == 'win32') { obj.args.npmpath = npmpath; } else { obj.args.npmpath = (nodepath + ' ' + npmpath); }
+                        }
                     } catch (ex) { }
                 }
             });
diff --git a/package.json b/package.json
index 4dc651b1..dd26fbe9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.4.8-q",
+  "version": "0.4.8-r",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/translate/translate.js b/translate/translate.js
index 254592a8..db202971 100644
--- a/translate/translate.js
+++ b/translate/translate.js
@@ -207,7 +207,7 @@ function startEx(argv) {
 
     if (command == 'translateall') {
         if (fs.existsSync('../views/translations') == false) { fs.mkdirSync('../views/translations'); }
-        if (fs.existsSync('../public/translations') == false) { fs.mkdirSync('../public/translations'); }
+        //if (fs.existsSync('../public/translations') == false) { fs.mkdirSync('../public/translations'); }
         var lang = null;
         if (argv.length > 4) { lang = argv[4].toLowerCase(); }
         if (argv.length > 3) {
diff --git a/translate/translate.json b/translate/translate.json
index 3a1dd3fc..da1b7391 100644
--- a/translate/translate.json
+++ b/translate/translate.json
@@ -2167,6 +2167,7 @@
     },
     {
       "en": "Agent Installation",
+      "ru": "Установка агента",
       "xloc": [
         "agentinvite.handlebars->3->3"
       ]
@@ -6224,7 +6225,7 @@
       "ja": "ここからソフトウェアをダウンロードしてください",
       "nl": "Download de software hier",
       "pt": "Faça o download do software aqui",
-      "ru": "Скачайте программное обеспечение здесь",
+      "ru": "Скачайте программу по этой ссылке",
       "xloc": [
         "agentinvite.handlebars->container->column_l->5->wintab32->3->win32url",
         "agentinvite.handlebars->container->column_l->5->wintab64->3->win64url"
@@ -14348,6 +14349,7 @@
     },
     {
       "en": "Remote Agent Installation for {0}",
+      "ru": "Установка агента для {0}",
       "xloc": [
         "agentinvite.handlebars->3->1"
       ]
@@ -20003,7 +20005,7 @@
       "en": "g:",
       "es": "g:",
       "nl": "g:",
-      "ru": "g:",
+      "ru": "г:",
       "xloc": [
         "default.handlebars->25->406",
         "default.handlebars->25->407"
@@ -20015,7 +20017,7 @@
       "en": "group:",
       "es": "grupo:",
       "nl": "groep:",
-      "ru": "group:",
+      "ru": "группа:",
       "xloc": [
         "default.handlebars->25->404",
         "default.handlebars->25->405"
@@ -20203,7 +20205,7 @@
       "en": "t:",
       "es": "t:",
       "nl": "t:",
-      "ru": "t:",
+      "ru": "т:",
       "xloc": [
         "default.handlebars->25->410",
         "default.handlebars->25->411"
@@ -20214,7 +20216,7 @@
       "en": "tag:",
       "es": "etiqueta:",
       "nl": "tag:",
-      "ru": "tag:",
+      "ru": "тег:",
       "xloc": [
         "default.handlebars->25->408",
         "default.handlebars->25->409"
@@ -20271,7 +20273,7 @@
       "en": "u:",
       "es": "u:",
       "nl": "u:",
-      "ru": "u:",
+      "ru": "п:",
       "xloc": [
         "default.handlebars->25->400",
         "default.handlebars->25->401"
@@ -20282,7 +20284,7 @@
       "en": "user:",
       "es": "usuario:",
       "nl": "gebruiker:",
-      "ru": "user:",
+      "ru": "пользователь:",
       "xloc": [
         "default.handlebars->25->398",
         "default.handlebars->25->399"
@@ -20322,6 +20324,7 @@
     },
     {
       "en": "{0} - Agent Installation",
+      "ru": "{0} - установка агента",
       "xloc": [
         "agentinvite.handlebars->3->2"
       ]