Merge branch 'dev' of https://github.com/node-red/node-red into dev

packages/node_modules/@node-red/nodes/locales/en-US/function/89-trigger.html

@@ -40,6 +40,6 @@
     progress will be cleared and no message triggered.</p>
     <p>The node can be configured to resend a message at a regular interval until it
     is reset by a received message.</p>
-    <p>Optionally, the node can be configured to treat messages with <code>msg.topic</code> as if they
-    are separate streams.</p>
+    <p>Optionally, the node can be configured to treat messages as if they are separate streams,
+    using a msg property to identify each stream. Default <code>msg.topic</code>.</p>
 </script>

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

@@ -37,6 +37,7 @@
         "stopped": "stopped",
         "failed": "Inject failed: __error__",
         "label": {
+            "properties": "Properties",
             "repeat": "Repeat",
             "flow": "flow context",
             "global": "global context",
@@ -79,7 +80,6 @@
         "on": "on",
         "onstart": "Inject once after",
         "onceDelay": "seconds, then",
-        "tip": "<b>Note:</b> \"interval between times\" and \"at a specific time\" will use cron.<br/>\"interval\" should be 596 hours or less.<br/>See info box for details.",
         "success": "Successfully injected: __label__",
         "errors": {
             "failed": "inject failed, see log for details",
@@ -302,7 +302,7 @@
         "wait-for": "wait for",
         "wait-loop": "resend it every",
         "for": "Handling",
-        "bytopics": "each msg.topic independently",
+        "bytopics": "each",
         "alltopics": "all messages",
         "duration": {
             "ms": "Milliseconds",
@@ -311,6 +311,7 @@
             "h": "Hours"
         },
         "extend": " extend delay if new message arrives",
+        "second": " send second message to separate output",
         "label": {
             "trigger": "trigger",
             "trigger-block": "trigger & block",
@@ -723,6 +724,11 @@
             "mac": "Mac (\\r)",
             "windows": "Windows (\\r\\n)"
         },
+        "hdrout": {
+            "none": "never send column headers",
+            "all": "always send column headers",
+            "once": "send headers once, until msg.reset"
+        },
         "errors": {
             "csv_js": "This node only handles CSV strings or js objects.",
             "obj_csv": "No columns template specified for object -> CSV.",

packages/node_modules/@node-red/nodes/locales/en-US/parsers/70-CSV.html

@@ -38,11 +38,13 @@
     <p>The column template can contain an ordered list of column names. When converting CSV to an object, the column names
     will be used as the property names. Alternatively, the column names can be taken from the first row of the CSV.</p>
     <p>When converting to CSV, the column template is used to identify which properties to extract from the object and in what order.</p>
+    <p>If the template is blank then the node can use a simple comma separated list of properties supplied in <code>msg.columns</code> to
+        determine what to extract. If that is not present then all the object properties are ouput in the order in which they are found.</p>
     <p>If the input is an array then the columns template is only used to optionally generate a row of column titles.</p>
     <p>If 'parse numerical values' option is checked, string numerical values will be returned as numbers, ie. middle value '1,"1.5",2'.</p>
     <p>If 'include empty strings' option is checked, empty strings will be returned in result, ie. middle value '"1","",3'.</p>
     <p>If 'include null values' option is checked, null values will be returned in result, ie. middle value '"1",,3'.</p>
-    <p>The node can accept a multi-part input as long as the <code>parts</code> property is set correctly.</p>
+    <p>The node can accept a multi-part input as long as the <code>parts</code> property is set correctly, for example from a file-in node or split node.</p>
     <p>If outputting multiple messages they will have their <code>parts</code> property set and form a complete message sequence.</p>
     <p><b>Note:</b> the column template must be comma separated - even if a different separator is chosen for the data.</p>
 </script>

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

@@ -302,7 +302,7 @@
         "wait-for": "指定した時間待機",
         "wait-loop": "指定した時間間隔毎に送信を繰り返す",
         "for": "処理対象",
-        "bytopics": "msg.topic毎",
+        "bytopics": "毎",
         "alltopics": "全メッセージ",
         "duration": {
             "ms": "ミリ秒",
@@ -719,6 +719,11 @@
             "mac": "Mac (\\r)",
             "windows": "Windows (\\r\\n)"
         },
+        "hdrout": {
+            "none": "カラムヘッダを送信しない",
+            "all": "カラムヘッダを常に送信する",
+            "once": "ヘッダを一度だけ送信する(msg.resetの受け付けると再送)"
+        },
         "errors": {
             "csv_js": "本ノードが処理できる形式は、CSV文字列またはJSONのみです",
             "obj_csv": "オブジェクトをCSVへ変換する際の列名が設定されていません"