Merge branch 'dev' into adding-timeout-to-functio-node

packages/node_modules/@node-red/nodes/core/common/25-catch.html

@@ -41,7 +41,9 @@
             if (this.name) {
                 return this.name;
             }
-            if (this.scope) {
+            if (this.scope === "group") {
+                return this._("catch.catchGroup");
+            } else if (Array.isArray(this.scope)) {
                 return this._("catch.catchNodes",{number:this.scope.length});
             }
             return this.uncaught?this._("catch.catchUncaught"):this._("catch.catch")

packages/node_modules/@node-red/nodes/core/common/25-status.html

@@ -33,7 +33,15 @@
         outputs:1,
         icon: "status.svg",
         label: function() {
-            return this.name||(this.scope?this._("status.statusNodes",{number:this.scope.length}):this._("status.status"));
+            if (this.name) {
+                return this.name;
+            }
+            if (this.scope === "group") {
+                return this._("status.statusGroup");
+            } else if (Array.isArray(this.scope)) {
+                return this._("status.statusNodes",{number:this.scope.length});
+            }
+            return this._("status.status")
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";

packages/node_modules/@node-red/nodes/core/function/89-delay.js

@@ -229,6 +229,7 @@ module.exports = function(RED) {
             node.on("input", function(msg, send, done) {
                 if (!node.drop) {
                     var m = RED.util.cloneMessage(msg);
+                    delete m.flush;
                     if (Object.keys(m).length > 1) {
                         if (node.intervalID !== -1) {
                             if (node.allowrate && m.hasOwnProperty("rate") && !isNaN(parseFloat(m.rate)) && node.rate !== m.rate) {

packages/node_modules/@node-red/nodes/locales/en-US/messages.json

@@ -94,6 +94,7 @@
     },
     "catch": {
         "catch": "catch: all",
+        "catchGroup": "catch: group",
         "catchNodes": "catch: __number__",
         "catchUncaught": "catch: uncaught",
         "label": {
@@ -109,6 +110,7 @@
     },
     "status": {
         "status": "status: all",
+        "statusGroup": "status: group",
         "statusNodes": "status: __number__",
         "label": {
             "source": "Report status from",

packages/node_modules/@node-red/nodes/locales/ja/messages.json

@@ -103,6 +103,7 @@
         },
         "scope": {
             "all": "全てのノード",
+            "group": "同一グループ内",
             "selected": "選択したノード"
         }
     },
@@ -115,6 +116,7 @@
         },
         "scope": {
             "all": "全てのノード",
+            "group": "同一グループ内",
             "selected": "選択したノード"
         }
     },