diff --git a/nodes/core/core/20-inject.html b/nodes/core/core/20-inject.html
index fbc180c47..45488d254 100644
--- a/nodes/core/core/20-inject.html
+++ b/nodes/core/core/20-inject.html
@@ -88,7 +88,7 @@
     <div class="form-row inject-time-row hidden" id="inject-time-row-time">
         <span data-i18n="inject.at"></span> <input id="inject-time-time" value="12:00"></input><br/>
         <div id="inject-time-time-days" class="inject-time-days">
-            <div style="display: inline-block; vertical-align: top;margin-right: 5px;">on </div>
+            <div style="display: inline-block; vertical-align: top;margin-right: 5px;" data-i18n="inject.on"></div>
             <div style="display:inline-block;">
                 <div>
                     <label><input type='checkbox' checked value='1'/> <span data-i18n="inject.days.0"></span></label>
diff --git a/nodes/core/core/75-exec.html b/nodes/core/core/75-exec.html
index 985653d8b..0efa61058 100644
--- a/nodes/core/core/75-exec.html
+++ b/nodes/core/core/75-exec.html
@@ -42,7 +42,8 @@
     </div>
     <div class="form-row">
         <label for="node-input-timer"><i class="fa fa-clock-o"></i> <span data-i18n="exec.label.timeout"></span></label>
-        <input type="text" id="node-input-timer" style="width:65px;" data-i18n="[placeholder]exec.label.timeoutplace"> seconds
+        <input type="text" id="node-input-timer" style="width:65px;" data-i18n="[placeholder]exec.label.timeoutplace">
+        <span data-i18n="exec.label.seconds"></span>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
diff --git a/nodes/core/core/80-template.html b/nodes/core/core/80-template.html
index 7de22b06a..94fcd453f 100644
--- a/nodes/core/core/80-template.html
+++ b/nodes/core/core/80-template.html
@@ -30,7 +30,7 @@
                 <option value="css">CSS</option>
                 <option value="markdown">Markdown</option>
                 <option value="yaml">YAML</option>
-                <option value="text">none</option>
+                <option value="text" data-i18n="template.label.none"></option>
             </select>
         </div>
     </div>
diff --git a/nodes/core/core/89-delay.html b/nodes/core/core/89-delay.html
index 8b468d0ea..b7d2d8c6f 100644
--- a/nodes/core/core/89-delay.html
+++ b/nodes/core/core/89-delay.html
@@ -46,7 +46,7 @@
         <div id="random-details" class="form-row">
             <label for="node-input-randomFirst"><i class="fa fa-clock-o"></i> <span data-i18n="delay.between"></span></label>
             <input type="text" id="node-input-randomFirst" placeholder="" style="text-align:end; width:30px !important">
-            &nbsp;&nbsp;&amp;&nbsp;&nbsp;
+            <span data-i18n="delay.and"></span>
             <input type="text" id="node-input-randomLast" placeholder="" style="text-align:end; width:30px !important">
             <select id="node-input-randomUnits" style="width:140px !important">
               <option value="milliseconds" data-i18n="delay.milisecs"></option>
diff --git a/nodes/core/core/lib/debug/debug-utils.js b/nodes/core/core/lib/debug/debug-utils.js
index f657b2fd7..9dddeb862 100644
--- a/nodes/core/core/lib/debug/debug-utils.js
+++ b/nodes/core/core/lib/debug/debug-utils.js
@@ -41,14 +41,14 @@ RED.debug = (function() {
         var content = $("<div>").css({"position":"relative","height":"100%"});
         var toolbar = $('<div class="sidebar-header">'+
             '<span class="button-group"><a id="debug-tab-filter" class="sidebar-header-button" href="#"><i class="fa fa-filter"></i> <span></span></a></span>'+
-            '<span class="button-group"><a id="debug-tab-clear" title="clear log" class="sidebar-header-button" href="#"><i class="fa fa-trash"></i></a></span></div>').appendTo(content);
+            '<span class="button-group"><a id="debug-tab-clear" class="sidebar-header-button" href="#" data-i18n="[title]node-red:debug.sidebar.clearLog"><i class="fa fa-trash"></i></a></span></div>').appendTo(content);
 
         var footerToolbar = $('<div>'+
             // '<span class="button-group">'+
             //     '<a class="sidebar-footer-button-toggle text-button selected" id="debug-tab-view-list" href="#"><span data-i18n="">list</span></a>'+
             //     '<a class="sidebar-footer-button-toggle text-button" id="debug-tab-view-table" href="#"><span data-i18n="">table</span></a> '+
             // '</span>'+
-            '<span class="button-group"><a id="debug-tab-open" title="open in new window" class="sidebar-footer-button" href="#"><i class="fa fa-desktop"></i></a></span> ' +
+            '<span class="button-group"><a id="debug-tab-open" class="sidebar-footer-button" href="#" data-i18n="[title]node-red:debug.sidebar.openWindow"><i class="fa fa-desktop"></i></a></span> ' +
             '</div>');
 
         messageList = $('<div class="debug-content debug-content-list"/>').appendTo(content);
@@ -70,7 +70,7 @@ RED.debug = (function() {
 
         var debugNodeListRow = $('<div class="debug-filter-row hide"></div>').appendTo(filterDialog);
         var flowCheckboxes = {};
-        var debugNodeListHeader = $('<div><span>Debug nodes</span><span></span></div>');
+        var debugNodeListHeader = $('<div><span data-i18n="node-red:debug.sidebar.debugNodes"></span><span></span></div>');
         var headerCheckbox = $('<input type="checkbox">').appendTo(debugNodeListHeader.find("span")[1]).checkboxSet();
 
         debugNodeList = $('<ol>',{style:"text-align: left; min-height: 250px; max-height: 250px"}).appendTo(debugNodeListRow).editableList({
diff --git a/nodes/core/io/10-mqtt.html b/nodes/core/io/10-mqtt.html
index 54e5c28d0..b778f6c77 100644
--- a/nodes/core/io/10-mqtt.html
+++ b/nodes/core/io/10-mqtt.html
@@ -172,8 +172,8 @@
         <div id="mqtt-broker-tab-connection" style="display:none">
             <div class="form-row node-input-broker">
                 <label for="node-config-input-broker"><i class="fa fa-globe"></i> <span data-i18n="mqtt.label.broker"></span></label>
-                <input class="input-append-left" type="text" id="node-config-input-broker" placeholder="e.g. localhost" style="width:40%;" >
-                <label for="node-config-input-port" style="margin-left:20px; width:35px; "> <span data-i18n="mqtt.label.port"></span></label>
+                <input class="input-append-left" type="text" id="node-config-input-broker" style="width:40%;" data-i18n="[placeholder]mqtt.label.example">
+                <label for="node-config-input-port" style="margin-left:20px; width:43px; "> <span data-i18n="mqtt.label.port"></span></label>
                 <input type="text" id="node-config-input-port" data-i18n="[placeholder]mqtt.label.port" style="width:55px">
             </div>
             <div class="form-row">
diff --git a/nodes/core/io/21-httpin.html b/nodes/core/io/21-httpin.html
index 7265142dd..c09a40189 100644
--- a/nodes/core/io/21-httpin.html
+++ b/nodes/core/io/21-httpin.html
@@ -213,7 +213,7 @@ msg.cookies = {
     var headerTypes = [
         {value:"content-type",label:"Content-Type",hasValue: false},
         {value:"location",label:"Location",hasValue: false},
-        {value:"other",label:"other",icon:"red/images/typedInput/az.png"}
+        {value:"other",label:RED._("node-red:httpin.label.other"),icon:"red/images/typedInput/az.png"}
        ]
     var contentTypes = [
         {value:"application/json",label:"application/json",hasValue: false},
@@ -223,7 +223,7 @@ msg.cookies = {
         {value:"text/plain",label:"text/plain",hasValue: false},
         {value:"image/gif",label:"image/gif",hasValue: false},
         {value:"image/png",label:"image/png",hasValue: false},
-        {value:"other",label:"other",icon:"red/images/typedInput/az.png"}
+        {value:"other",label:RED._("node-red:httpin.label.other"),icon:"red/images/typedInput/az.png"}
     ];
 
     RED.nodes.registerType('http response',{
diff --git a/nodes/core/io/31-tcpin.html b/nodes/core/io/31-tcpin.html
index 6729f711b..c633ac955 100644
--- a/nodes/core/io/31-tcpin.html
+++ b/nodes/core/io/31-tcpin.html
@@ -212,11 +212,12 @@
     <div class="form-row">
         <label for="node-input-server"><i class="fa fa-globe"></i> <span data-i18n="tcpin.label.server"></span></label>
         <input type="text" id="node-input-server" placeholder="ip.address" style="width:45%">
-        &nbsp;port <input type="text" id="node-input-port" style="width:60px">
+        <span data-i18n="tcpin.label.port"></span>
+        <input type="text" id="node-input-port" style="width:60px">
     </div>
     <div class="form-row">
         <label for="node-input-out"><i class="fa fa-sign-out"></i> <span data-i18n="tcpin.label.return"></span></label>
-        <select type="text" id="node-input-out" style="width:56%;">
+        <select type="text" id="node-input-out" style="width:54%;">
             <option value="time" data-i18n="tcpin.return.timeout"></option>
             <option value="char" data-i18n="tcpin.return.character"></option>
             <option value="count" data-i18n="tcpin.return.number"></option>
@@ -272,7 +273,7 @@
                 }
                 else if ($("#node-input-out").val() == "time") {
                     if (previous != "time") { $("#node-input-splitc").val("0"); }
-                    $("#node-units").text("ms");
+                    $("#node-units").text(RED._("node-red:tcpin.label.ms"));
                 }
                 else if ($("#node-input-out").val() == "immed") {
                     if (previous != "immed") { $("#node-input-splitc").val(" "); }
@@ -280,7 +281,7 @@
                 }
                 else if ($("#node-input-out").val() == "count") {
                     if (previous != "count") { $("#node-input-splitc").val("12"); }
-                    $("#node-units").text("chars");
+                    $("#node-units").text(RED._("node-red:tcpin.label.chars"));
                 }
                 else {
                     if (previous != "sit") { $("#node-input-splitc").val(" "); }
diff --git a/nodes/core/locales/en-US/messages.json b/nodes/core/locales/en-US/messages.json
index 1f7e6ca72..113ddfdca 100644
--- a/nodes/core/locales/en-US/messages.json
+++ b/nodes/core/locales/en-US/messages.json
@@ -114,7 +114,10 @@
             "name": "Debug messages",
             "filterAll": "all nodes",
             "filterSelected": "selected nodes",
-            "filterCurrent": "current flow"
+            "filterCurrent": "current flow",
+            "debugNodes": "Debug nodes",
+            "clearLog": "clear log",
+            "openWindow": "open in new window"
         },
         "messageMenu": {
             "collapseAll": "Collapse all paths",
@@ -159,7 +162,8 @@
             "append": "Append",
             "timeout": "Timeout",
             "timeoutplace": "optional",
-            "return": "Output"
+            "return": "Output",
+            "seconds": "seconds"
         },
         "placeholder": {
             "extraparams": "extra input parameters"
@@ -190,7 +194,8 @@
             "output": "Output as",
             "mustache": "Mustache template",
             "plain": "Plain text",
-            "json": "Parsed JSON"
+            "json": "Parsed JSON",
+            "none": "none"
         },
         "templatevalue": "This is the payload: {{payload}} !"
     },
@@ -216,6 +221,7 @@
         "days": "Days",
         "day": "Day",
         "between": "Between",
+        "and": "&",
         "rate": "Rate",
         "msgper": "msg(s) per",
         "dropmsg": "drop intermediate messages",
@@ -297,6 +303,7 @@
     "mqtt": {
         "label": {
             "broker": "Server",
+            "example": "e.g. localhost",
             "qos": "QoS",
             "clientid": "Client ID",
             "port": "Port",
@@ -343,7 +350,8 @@
             "return": "Return",
             "upload": "Accept file uploads?",
             "status": "Status code",
-            "headers": "Headers"
+            "headers": "Headers",
+            "other": "other"
         },
         "setby": "- set by msg.method -",
         "basicauth": "Use basic authentication",
@@ -414,7 +422,9 @@
             "close-connection": "Close connection after each message is sent?",
             "decode-base64": "Decode Base64 message?",
             "server": "Server",
-            "return": "Return"
+            "return": "Return",
+            "ms": "ms",
+            "chars": "chars"
         },
         "type": {
             "listen": "Listen on",
diff --git a/nodes/core/locales/ja/messages.json b/nodes/core/locales/ja/messages.json
index 1419a5b5a..1d507a247 100644
--- a/nodes/core/locales/ja/messages.json
+++ b/nodes/core/locales/ja/messages.json
@@ -90,7 +90,7 @@
             "node": "ノード",
             "type": "型",
             "selectAll": "全て選択",
-            "sortByLabel": "ノード名で並び替え",
+            "sortByLabel": "ノード名で並べ替え",
             "sortByType": "型で並べ替え"
         },
         "scope": {
@@ -114,7 +114,10 @@
             "name": "デバッグメッセージ",
             "filterAll": "全てのフロー",
             "filterSelected": "選択したノード",
-            "filterCurrent": "現在のフロー"
+            "filterCurrent": "現在のフロー",
+            "debugNodes": "debugノード",
+            "clearLog": "ログを削除",
+            "openWindow": "新しいウィンドウで開く"
         },
         "messageMenu": {
             "collapseAll": "全パスを折りたたむ",
@@ -127,7 +130,11 @@
         "linkIn": "link in",
         "linkOut": "link out",
         "label": {
-            "event": "イベント名"
+            "event": "イベント名",
+            "node": "名前",
+            "type": "フロー",
+            "sortByFlow": "フロー名で並べ替え",
+            "sortByLabel": "名前で並べ替え"
         }
     },
     "tls": {
@@ -155,7 +162,8 @@
             "append": "引数",
             "timeout": "タイムアウト",
             "timeoutplace": "任意",
-            "return": "出力"
+            "return": "出力",
+            "seconds": "秒"
         },
         "placeholder": {
             "extraparams": "追加引数"
@@ -164,7 +172,7 @@
             "exec": "コマンド終了時 - execモード",
             "spawn": "コマンド実行中 - spawnモード"
         },
-        "oldrc": "旧型式の出力を使用(互換性モード)"
+        "oldrc": "旧型式の出力を使用(互換モード)"
     },
     "function": {
         "label": {
@@ -186,7 +194,8 @@
             "output": "出力形式",
             "mustache": "Mustacheテンプレート",
             "plain": "平文",
-            "json": "JSON"
+            "json": "JSON",
+            "none": "なし"
         },
         "templatevalue": "This is the payload: {{payload}} !"
     },
@@ -212,6 +221,7 @@
         "days": "日",
         "day": "日",
         "between": "頻度",
+        "and": "回／",
         "rate": "流量",
         "msgper": "メッセージ／",
         "dropmsg": "仲介メッセージを削除",
@@ -293,6 +303,7 @@
     "mqtt": {
         "label": {
             "broker": "サーバ",
+            "example": "例) localhost",
             "qos": "QoS",
             "clientid": "クライアント",
             "port": "ポート",
@@ -339,7 +350,8 @@
             "return": "出力形式",
             "upload": "ファイルのアップロード",
             "status": "状態コード",
-            "headers": "ヘッダ"
+            "headers": "ヘッダ",
+            "other": "その他"
         },
         "setby": "- msg.methodに定義 -",
         "basicauth": "ベーシック認証を使用",
@@ -410,7 +422,9 @@
             "close-connection": "メッセージを送信するたびに接続を切断",
             "decode-base64": "Base64メッセージの復号",
             "server": "サーバ",
-            "return": "戻り値"
+            "return": "戻り値",
+            "ms": "ミリ秒",
+            "chars": "文字"
         },
         "type": {
             "listen": "待ち受け",
@@ -760,6 +774,7 @@
             "breakchunks": "チャンクへ分割",
             "breaklines": "行へ分割",
             "filelabel": "file",
+            "sendError": "エラーメッセージを送信(互換モード)",
             "deletelabel": "delete __file__"
         },
         "action": {