frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'config' into 0.14.0

Browse Source 
explain why this merge is necessary,
This commit is contained in:
Nick O'Leary
2016-05-04 15:44:48 +01:00
parent edceffdaaf 269763fa0c
commit 41445a1b48
34 changed files with 1887 additions and 917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nodes/core/locales/en-US/messages.json
View File

@@ -123,6 +123,23 @@
"event": "Event name"
}
},
"tls": {
"tls": "TLS configuration",
"label": {
"cert": "Certificate",
"key": "Private Key",
"ca": "CA Certificate",
"verify-server-cert":"Verify server certificate"
},
"placeholder": {
"cert":"path to certificate (PEM format)",
"key":"path to private key (PEM format)",
"ca":"path to CA certificate (PEM format)"
},
"error": {
"missing-file": "No certificate/key file provided"
}
},
"exec": {
"label": {
"command": "Command",
@@ -240,6 +257,7 @@
"keepalive": "Keep alive time (s)",
"cleansession": "Use clean session",
"use-tls": "Enable secure (SSL/TLS) connection",
"tls-config":"TLS Configuration",
"verify-server-cert":"Verify server certificate",
"compatmode": "Use legacy MQTT 3.1 support"
},
@@ -279,7 +297,9 @@
"return": "Return"
},
"setby": "- set by msg.method -",
"basicauth": "Use basic authentication?",
"basicauth": "Use basic authentication",
"use-tls": "Enable secure (SSL/TLS) connection",
"tls-config":"TLS Configuration",
"utf8": "a UTF-8 string",
"binary": "a binary buffer",
"json": "a parsed JSON object",