MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-26 23:25:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-01-29 14:39:36 -08:00
commit a0c60ae36c
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db.js
View File

@ -987,7 +987,7 @@ module.exports.CreateDB = function (parent, func) {
if (parent.config.settings.autobackup && parent.config.settings.autobackup.mongodumppath) { mongoDumpPath = parent.config.settings.autobackup.mongodumppath; }
const child_process = require('child_process');
const cmd = '\"' + mongoDumpPath + '\" --db=\"' + dbname + '\" --archive=\"' + newBackupPath + '.archive\"';
if (dburl) { cmd = '\"' + mongoDumpPath + '\" --url=\"' + dburl + '\" --db=\"' + dbname + '\" --archive=\"' + newBackupPath + '.archive\"'; }
if (dburl) { cmd = '\"' + mongoDumpPath + '\" --uri=\"' + dburl + '\" --archive=\"' + newBackupPath + '.archive\"'; }
var backupProcess = child_process.exec(cmd, { cwd: backupPath }, function (error, stdout, stderr) {
try {
backupProcess = null;

18
translate/translate.json
View File

@ -1579,6 +1579,7 @@
},
{
"en": "Action File",
"nl": "Actie bestand",
"es": "Archivo de acción",
"xloc": [
"default.handlebars->25->579",
@ -2393,6 +2394,7 @@
},
{
"en": "Alternate Port",
"nl": "Alternatieve poort",
"xloc": [
"default.handlebars->altPortContextMenu->cxaltport->0"
]
@ -10250,7 +10252,7 @@
"en": "Location",
"es": "Ubicación",
"ja": "ロケーション",
"nl": "Lokatie",
"nl": "Locatie",
"pt": "Localização",
"ru": "Местонахождение",
"xloc": [
@ -12823,6 +12825,7 @@
},
{
"en": "Open XTerm terminal",
"nl": "Open XTerm terminal",
"xloc": [
"default.handlebars->25->503"
]
@ -13422,7 +13425,8 @@
},
{
"en": "Place link to this device in the clipboard",
"es": "Coloque el enlace a este dispositivo en el portapapeles"
"nl": "Plaats de link naar dit apparaat op het klembord",
"es": "Coloque el enlace a este dispositivo en el portapapeles",
},
{
"cs": "Umístit uzel sem",
@ -13972,18 +13976,21 @@
},
{
"en": "RDP Connection",
"nl": "RDP verbinding",
"xloc": [
"default.handlebars->25->406"
]
},
{
"en": "RDP remote connection port:",
"nl": "RDP externe verbindings poort:",
"xloc": [
"default.handlebars->25->405"
]
},
{
"en": "RDP2",
"nl": "RDP2",
"xloc": [
"default.handlebars->25->407"
]
@ -14390,7 +14397,7 @@
"de": "Gerätegruppe entfernen",
"en": "Remove Device Group",
"es": "Eliminar grupo de dispositivos",
"nl": "Remove Device Group",
"nl": "Verwijder apparaatgroep",
"xloc": [
"default.handlebars->25->1296",
"default.handlebars->25->1380"
@ -16025,7 +16032,7 @@
"en": "Simple Admin Control Mode (ACM)",
"es": "Modo de Control de Administrador Simple (ACM)",
"ja": "シンプル管理制御モード（ACM）",
"nl": "Simple Admin Control Mode (ACM)",
"nl": "Eenvoudige Admin Control Mode (ACM)",
"pt": "Modo de controle de administrador simples (ACM)",
"ru": "Простой режим управления администратора (ACM)",
"xloc": [
@ -16039,7 +16046,7 @@
"en": "Simple Client Control Mode (CCM)",
"es": "Modo de control de cliente simple (CCM)",
"ja": "シンプルクライアントコントロールモード（CCM）",
"nl": "Simple Client Control Mode (CCM)",
"nl": "Eenvoudige Client Control Mode (CCM)",
"pt": "Modo de Controle de Cliente Simples (CCM)",
"ru": "Простой режим управления клиента (CCM)",
"xloc": [
@ -19543,6 +19550,7 @@
},
{
"en": "XTerm",
"nl": "XTerm",
"xloc": [
"default.handlebars->25->504"
]