1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge pull request #3705 from kazuhitoyokoi/v2.x-addjpn

Backports to v2.x
This commit is contained in:
Nick O'Leary 2022-06-27 14:15:26 +01:00 committed by GitHub
commit a7375e4e8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 86 additions and 80 deletions

View File

@ -1287,6 +1287,10 @@
"zoom-in": "ズームイン", "zoom-in": "ズームイン",
"zoom-out": "ズームアウト", "zoom-out": "ズームアウト",
"zoom-reset": "ズームリセット", "zoom-reset": "ズームリセット",
"toggle-navigator": "ナビゲータ表示切替" "toggle-navigator": "ナビゲータ表示切替",
"new-project": "新しいプロジェクト",
"open-project": "プロジェクトを開く",
"show-project-settings": "プロジェクト設定を表示",
"show-version-control-tab": "バージョンコントロールタブを表示"
} }
} }

View File

@ -17,7 +17,7 @@
"tip14": "[shift] を押しながらノードを [click] すると、接続された全てのノードを選択できます。", "tip14": "[shift] を押しながらノードを [click] すると、接続された全てのノードを選択できます。",
"tip15": "[ctrl] を押しながらノードを [click] すると、選択/非選択を切り替えできます。", "tip15": "[ctrl] を押しながらノードを [click] すると、選択/非選択を切り替えできます。",
"tip16": "{{core:show-previous-tab}} や {{core:show-next-tab}} で、タブの切り替えができます。", "tip16": "{{core:show-previous-tab}} や {{core:show-next-tab}} で、タブの切り替えができます。",
"tip17": "ノードのプロティ設定画面にて {{core:confirm-edit-tray}} を押すと、変更を確定できます。また、 {{core:cancel-edit-tray}} を押すと、変更を取り消せます。", "tip17": "ノードのプロティ設定画面にて {{core:confirm-edit-tray}} を押すと、変更を確定できます。また、 {{core:cancel-edit-tray}} を押すと、変更を取り消せます。",
"tip18": "ノードを選択し、 {{core:edit-selected-node}} を押すとプロパティ設定画面が表示されます。" "tip18": "ノードを選択し、 {{core:edit-selected-node}} を押すとプロパティ設定画面が表示されます。"
} }
} }

View File

@ -27,10 +27,10 @@
} }
.ui-widget.ui-widget-content { .ui-widget.ui-widget-content {
border: 1px solid $tertiary-border-color; border: 1px solid $tertiary-border-color;
} }
.ui-widget-content { .ui-widget-content {
border: 1px solid $secondary-border-color; border: 1px solid $secondary-border-color;
} }
.ui-widget-header { .ui-widget-header {

View File

@ -254,7 +254,7 @@ button.red-ui-palette-editor-upload-button {
padding: 2px 8px; padding: 2px 8px;
} }
form { form {
width: 0; width: 0;
} }
} }
.red-ui-palette-editor-upload { .red-ui-palette-editor-upload {

View File

@ -399,7 +399,7 @@
$("#func-tabs-content").children().hide(); $("#func-tabs-content").children().hide();
$("#" + tab.id).show(); $("#" + tab.id).show();
let editor = $("#" + tab.id).find('.monaco-editor').first(); let editor = $("#" + tab.id).find('.monaco-editor').first();
if(editor.length) { if(editor.length) {
if(that.editor.nodered && that.editor.type == "monaco") { if(that.editor.nodered && that.editor.type == "monaco") {
that.editor.nodered.refreshModuleLibs(getLibsList()); that.editor.nodered.refreshModuleLibs(getLibsList());
} }

View File

@ -47,7 +47,7 @@
<div class="form-row"> <div class="form-row">
<input type="checkbox" id="node-input-allowEmptySequence" style="margin-left:20px; margin-right: 10px; vertical-align:top; width:auto;"> <input type="checkbox" id="node-input-allowEmptySequence" style="margin-left:20px; margin-right: 10px; vertical-align:top; width:auto;">
<label for="node-input-allowEmptySequence" style="width:auto;" data-i18n="batch.interval.empty"></label> <label for="node-input-allowEmptySequence" style="width:auto;" data-i18n="batch.interval.empty"></label>
</div> </div>
</div> </div>
<div class="node-row-msg-concat"> <div class="node-row-msg-concat">

View File

@ -100,7 +100,9 @@
"error": "クレデンシャルの読み込みエラー: __message__", "error": "クレデンシャルの読み込みエラー: __message__",
"error-saving": "クレデンシャルの保存エラー: __message__", "error-saving": "クレデンシャルの保存エラー: __message__",
"not-registered": "クレデンシャル '__type__' は登録されていません", "not-registered": "クレデンシャル '__type__' は登録されていません",
"system-key-warning": "\n\n---------------------------------------------------------------------\nフローのクレデンシャルファイルはシステム生成キーで暗号化されています。\n\nシステム生成キーを何らかの理由で失った場合、クレデンシャルファイルを\n復元することはできません。その場合、ファイルを削除してクレデンシャルを\n再入力しなければなりません。\n\n設定ファイル内で 'credentialSecret' オプションを使って独自キーを設定\nします。変更を次にデプロイする際、Node-REDは選択したキーを用いてクレ\nデンシャルを再暗号化します。 \n\n---------------------------------------------------------------------\n" "system-key-warning": "\n\n---------------------------------------------------------------------\nフローのクレデンシャルファイルはシステム生成キーで暗号化されています。\n\nシステム生成キーを何らかの理由で失った場合、クレデンシャルファイルを\n復元することはできません。その場合、ファイルを削除してクレデンシャルを\n再入力しなければなりません。\n\n設定ファイル内で 'credentialSecret' オプションを使って独自キーを設定\nします。変更を次にデプロイする際、Node-REDは選択したキーを用いてクレ\nデンシャルを再暗号化します。 \n\n---------------------------------------------------------------------\n",
"unencrypted": "暗号化されていないクレデンシャルを使用",
"encryptedNotFound": "暗号化されたクレデンシャルが存在しません"
}, },
"flows": { "flows": {
"safe-mode": "セーフモードでフローを停止しました。開始するためにはデプロイしてください", "safe-mode": "セーフモードでフローを停止しました。開始するためにはデプロイしてください",

View File

@ -230,80 +230,80 @@ module.exports = {
* - externalModules * - externalModules
******************************************************************************/ ******************************************************************************/
/** Uncomment the following to run node-red in your preferred language. /** Uncomment the following to run node-red in your preferred language.
* Available languages include: en-US (default), ja, de, zh-CN, zh-TW, ru, ko * Available languages include: en-US (default), ja, de, zh-CN, zh-TW, ru, ko
* Some languages are more complete than others. * Some languages are more complete than others.
*/ */
// lang: "de", // lang: "de",
/** Configure the logging output */ /** Configure the logging output */
logging: { logging: {
/** Only console logging is currently supported */ /** Only console logging is currently supported */
console: { console: {
/** Level of logging to be recorded. Options are: /** Level of logging to be recorded. Options are:
* fatal - only those errors which make the application unusable should be recorded * fatal - only those errors which make the application unusable should be recorded
* error - record errors which are deemed fatal for a particular request + fatal errors * error - record errors which are deemed fatal for a particular request + fatal errors
* warn - record problems which are non fatal + errors + fatal errors * warn - record problems which are non fatal + errors + fatal errors
* info - record information about the general running of the application + warn + error + fatal errors * info - record information about the general running of the application + warn + error + fatal errors
* debug - record information which is more verbose than info + info + warn + error + fatal errors * debug - record information which is more verbose than info + info + warn + error + fatal errors
* trace - record very detailed logging + debug + info + warn + error + fatal errors * trace - record very detailed logging + debug + info + warn + error + fatal errors
* off - turn off all logging (doesn't affect metrics or audit) * off - turn off all logging (doesn't affect metrics or audit)
*/ */
level: "info", level: "info",
/** Whether or not to include metric events in the log output */ /** Whether or not to include metric events in the log output */
metrics: false, metrics: false,
/** Whether or not to include audit events in the log output */ /** Whether or not to include audit events in the log output */
audit: false audit: false
} }
}, },
/** Context Storage /** Context Storage
* The following property can be used to enable context storage. The configuration * The following property can be used to enable context storage. The configuration
* provided here will enable file-based context that flushes to disk every 30 seconds. * provided here will enable file-based context that flushes to disk every 30 seconds.
* Refer to the documentation for further options: https://nodered.org/docs/api/context/ * Refer to the documentation for further options: https://nodered.org/docs/api/context/
*/ */
//contextStorage: { //contextStorage: {
// default: { // default: {
// module:"localfilesystem" // module:"localfilesystem"
// }, // },
//}, //},
/** `global.keys()` returns a list of all properties set in global context. /** `global.keys()` returns a list of all properties set in global context.
* This allows them to be displayed in the Context Sidebar within the editor. * This allows them to be displayed in the Context Sidebar within the editor.
* In some circumstances it is not desirable to expose them to the editor. The * In some circumstances it is not desirable to expose them to the editor. The
* following property can be used to hide any property set in `functionGlobalContext` * following property can be used to hide any property set in `functionGlobalContext`
* from being list by `global.keys()`. * from being list by `global.keys()`.
* By default, the property is set to false to avoid accidental exposure of * By default, the property is set to false to avoid accidental exposure of
* their values. Setting this to true will cause the keys to be listed. * their values. Setting this to true will cause the keys to be listed.
*/ */
exportGlobalContextKeys: false, exportGlobalContextKeys: false,
/** Configure how the runtime will handle external npm modules. /** Configure how the runtime will handle external npm modules.
* This covers: * This covers:
* - whether the editor will allow new node modules to be installed * - whether the editor will allow new node modules to be installed
* - whether nodes, such as the Function node are allowed to have their * - whether nodes, such as the Function node are allowed to have their
* own dynamically configured dependencies. * own dynamically configured dependencies.
* The allow/denyList options can be used to limit what modules the runtime * The allow/denyList options can be used to limit what modules the runtime
* will install/load. It can use '*' as a wildcard that matches anything. * will install/load. It can use '*' as a wildcard that matches anything.
*/ */
externalModules: { externalModules: {
// autoInstall: false, /** Whether the runtime will attempt to automatically install missing modules */ // autoInstall: false, /** Whether the runtime will attempt to automatically install missing modules */
// autoInstallRetry: 30, /** Interval, in seconds, between reinstall attempts */ // autoInstallRetry: 30, /** Interval, in seconds, between reinstall attempts */
// palette: { /** Configuration for the Palette Manager */ // palette: { /** Configuration for the Palette Manager */
// allowInstall: true, /** Enable the Palette Manager in the editor */ // allowInstall: true, /** Enable the Palette Manager in the editor */
// allowUpdate: true, /** Allow modules to be updated in the Palette Manager */ // allowUpdate: true, /** Allow modules to be updated in the Palette Manager */
// allowUpload: true, /** Allow module tgz files to be uploaded and installed */ // allowUpload: true, /** Allow module tgz files to be uploaded and installed */
// allowList: ['*'], // allowList: ['*'],
// denyList: [], // denyList: [],
// allowUpdateList: ['*'], // allowUpdateList: ['*'],
// denyUpdateList: [] // denyUpdateList: []
// }, // },
// modules: { /** Configuration for node-specified modules */ // modules: { /** Configuration for node-specified modules */
// allowInstall: true, // allowInstall: true,
// allowList: [], // allowList: [],
// denyList: [] // denyList: []
// } // }
}, },
/******************************************************************************* /*******************************************************************************