Merge branch 'master' of https://github.com/nmori/Firebot into JP_TRA…

…NSLATION_5.59.2

package.json

@@ -47,10 +47,10 @@
     "@aws-sdk/client-polly": "^3.26.0",
     "@crowbartools/firebot-custom-scripts-types": "^5.53.2-6",
     "@nut-tree/nut-js": "^3.1.1",
-    "@twurple/api": "^6.0.9",
-    "@twurple/auth": "^6.0.9",
-    "@twurple/chat": "^6.0.9",
-    "@twurple/pubsub": "^6.0.9",
+    "@twurple/api": "^6.2.0",
+    "@twurple/auth": "^6.2.0",
+    "@twurple/chat": "^6.2.0",
+    "@twurple/pubsub": "^6.2.0",
     "@zunderscore/elgato-light-control": "^1.1.2",
     "angular": "^1.8.0",
     "angular-animate": "^1.7.8",

src/backend/app-management/electron/window-management.js

@@ -466,7 +466,7 @@ function createStreamPreviewWindow() {
     streamPreviewWindowState.manage(streamPreview);
 
     streamPreview.on("close", () => {
-        if (!view.isDestroyed()) {
+        if (!view.isDestroyed) {
             view.destroy();
         }
     });

src/backend/chat/chat-listeners/twitch-chat-listeners.js

@@ -63,7 +63,7 @@ exports.setupChatListeners = (streamerChatClient) => {
                 },
                 reward: {
                     id: HIGHLIGHT_MESSAGE_REWARD_ID,
-                    name: "Highlight Message",
+                    name: "ハイライト",
                     cost: 0,
                     imageUrl: "https://static-cdn.jtvnw.net/automatic-reward-images/highlight-4.png"
                 }

src/backend/chat/twitch-commands/chat-handlers.ts

@@ -143,7 +143,7 @@ export const shoutoutHandler: TwitchSlashCommandHandler<[string]> = {
         if (targetUsername == null || targetUsername.length < 1) {
             return {
                 success: false,
-                errorMessage: "文章を入力してください"
+                errorMessage: "ユーザ名を入力してください"
             };
         }
 

src/backend/effects/builtin/active-user-lists.js

@@ -33,9 +33,9 @@ const model = {
             </ul>
         </div>
     </eos-container>
-    <eos-container header="Target" pad-top="true" ng-show="effect.action != null && effect.action !== 'Clear List'">
+    <eos-container header="対象" pad-top="true" ng-show="effect.action != null && effect.action !== 'Clear List'">
         <div class="input-group">
-            <span class="input-group-addon" id="username-type">Username</span>
+            <span class="input-group-addon" id="username-type">視聴者名</span>
             <input ng-model="effect.username" type="text" class="form-control" id="list-username-setting" aria-describedby="list-username-type" replace-variables>
         </div>
     </eos-container>

src/backend/effects/builtin/block-unblock.js

@@ -29,7 +29,7 @@ const model = {
                 </ul>
             </div>
         </eos-container>
-        <eos-container header="Target" pad-top="true" ng-show="effect.action != null">
+        <eos-container header="対象" pad-top="true" ng-show="effect.action != null">
             <div class="input-group">
                 <span class="input-group-addon" id="username-type">視聴者名</span>
                 <input ng-model="effect.username" type="text" class="form-control" id="list-username-setting" aria-describedby="list-username-type" replace-variables>

src/backend/effects/builtin/mark-all-activity-acknowledged.js

@@ -14,7 +14,7 @@ const model = {
     },
     optionsTemplate: `
         <eos-container pad-top="true">
-            <p>このエフェクトが実行されると、チャットページのアクティビティフィード内のすべてのアクティビティが確認済みとしてマークされます。ホットキーやStreamDeckに接続することで、現在のすべてのアクティビティを素早く確認することができます。</p>
+            <p>この演出が実行されると、チャットページのイベント履歴内のすべてのアクティビティが確認済みとしてマークされます。ホットキーやStreamDeckに接続することで、現在のすべてのアクティビティを素早く確認することができます。</p>
         </eos-container>
     `,
     optionsController: () => {},

src/backend/effects/builtin/moderator-ban.js

@@ -29,7 +29,7 @@ const model = {
                 </ul>
             </div>
         </eos-container>
-        <eos-container header="Target" pad-top="true" ng-show="effect.action != null">
+        <eos-container header="対象" pad-top="true" ng-show="effect.action != null">
             <div class="input-group">
                 <span class="input-group-addon" id="username-type">視聴者名</span>
                 <input ng-model="effect.username" type="text" class="form-control" id="list-username-setting" aria-describedby="list-username-type" replace-variables>

src/backend/effects/builtin/moderator-mod.js

@@ -29,7 +29,7 @@ const model = {
             </ul>
         </div>
     </eos-container>
-    <eos-container header="Target" pad-top="true" ng-show="effect.action != null">
+    <eos-container header="対象" pad-top="true" ng-show="effect.action != null">
         <div class="input-group">
             <span class="input-group-addon" id="username-type">視聴者名</span>
             <input ng-model="effect.username" type="text" class="form-control" id="list-username-setting" aria-describedby="list-username-type" replace-variables>

src/backend/effects/builtin/moderator-purge.js

@@ -14,7 +14,7 @@ const model = {
         dependencies: [EffectDependency.CHAT]
     },
     optionsTemplate: `
-    <eos-container header="Target" pad-top="true">
+    <eos-container header="対象" pad-top="true">
         <div class="input-group">
             <span class="input-group-addon" id="username-type">視聴者名</span>
             <input ng-model="effect.username" type="text" class="form-control" id="list-username-setting" aria-describedby="list-username-type" replace-variables menu-position="below">

src/backend/effects/builtin/moderator-timeout.js

@@ -14,7 +14,7 @@ const model = {
         dependencies: [EffectDependency.CHAT]
     },
     optionsTemplate: `
-    <eos-container header="Target" pad-top="true">
+    <eos-container header="対象" pad-top="true">
         <div class="input-group">
             <span class="input-group-addon" id="username-type">視聴者名</span>
             <input ng-model="effect.username" type="text" class="form-control" id="list-username-setting" aria-describedby="list-username-type" replace-variables menu-position="below">

src/backend/effects/builtin/twitch-shoutout.ts

@@ -15,7 +15,7 @@ const model: EffectType<{
     dependencies: [],
   },
   optionsTemplate: `
-        <eos-container header="Target">
+        <eos-container header="対象">
             <firebot-input model="effect.username" placeholder-text="ユーザ名を入れてください" menu-position="below" />
         </eos-container>
 

src/backend/effects/builtin/update-vip-role.js

@@ -30,7 +30,7 @@ const model = {
             </ul>
         </div>
     </eos-container>
-    <eos-container header="Target" pad-top="true" ng-show="effect.action != null">
+    <eos-container header="対象" pad-top="true" ng-show="effect.action != null">
         <div class="input-group">
             <span class="input-group-addon" id="username-type">視聴者名</span></span>
             <input ng-model="effect.username" type="text" class="form-control" id="list-username-setting" aria-describedby="list-username-type" replace-variables>

src/backend/events/builtin/twitchEventSource.js

@@ -185,7 +185,7 @@ module.exports = {
         },
         {
             id: "cheer",
-            name: "チア",
+            name: "Cheer",
             description: "誰かがあなたのチャンネルで声援を送ったとき（ビッツを使ったとき）",
             cached: false,
             manualMetadata: {

src/backend/events/filters/builtin/cheer-bits-amount.js

@@ -4,8 +4,8 @@ const { ComparisonType } = require("../../../../shared/filter-constants");
 
 module.exports = {
     id: "firebot:cheerbitsamount",
-    name: "チアビッツ額",
-    description: "チアしてくれたビッツの金額でフィルタします",
+    name: "Cheerビッツ額",
+    description: "Cheerしてくれたビッツの金額でフィルタします",
     events: [
         { eventSourceId: "twitch", eventId: "cheer" }
     ],

src/backend/twitch-api/pubsub/pubsub-client.js

@@ -111,7 +111,7 @@ async function createClient() {
 
         const bitsListener = pubSubClient.onBits(streamer.userId, (message) => {
             twitchEventsHandler.cheer.triggerCheer(
-                message.userName ?? "An Anonymous Cheerer",
+                message.userName ?? "匿名",
                 message.userId,
                 message.isAnonymous,
                 message.bits,
@@ -123,7 +123,7 @@ async function createClient() {
 
         const bitsBadgeUnlockListener = pubSubClient.onBitsBadgeUnlock(streamer.userId, (message) => {
             twitchEventsHandler.cheer.triggerBitsBadgeUnlock(
-                message.userName ?? "An Anonymous Cheerer",
+                message.userName ?? "匿名",
                 message.message ?? "",
                 message.badgeTier
             );

src/backend/variables/builtin/bits-leaderboard-raw.js

@@ -31,18 +31,18 @@ const model = {
         period = period ?? "all";
 
         if (Number.isNaN(count) || count < 1 || count > 100) {
-            throw new expressionish.ExpressionArgumentsError("First argument needs to be either null or a number.", 0);
+            throw new expressionish.ExpressionArgumentsError("第一引数にはNULLか数値を指定する。", 0);
         }
 
         const validPeriods = ["day", "week", "month", "year", "all"];
         period = period.toLowerCase();
 
         if (validPeriods.indexOf(period) === -1) {
-            throw new expressionish.ExpressionArgumentsError("Second argument must be a valid period ('day', 'week', 'month', 'year', or 'all').", 0);
+            throw new expressionish.ExpressionArgumentsError("第2引数には有効な期間（'day'、'week'、'month'、'year'、'all'）を指定する。", 0);
         }
 
         if (startDate != null && !moment(startDate).isValid()) {
-            throw new expressionish.ExpressionArgumentsError("Third argument must be a valid date string.", 0);
+            throw new expressionish.ExpressionArgumentsError("第3引数は有効な日付文字列でなければならない。", 0);
         }
 
         return true;

src/backend/variables/builtin/custom-variable-keys.js

@@ -22,7 +22,7 @@ const model = {
                 description: "第2引数にプロパティ・パス（ドット記法）を与えて、オブジェクト・プロパティのキーの配列を取得する。"
             }
         ],
-        description: "Get the array of keys for an object saved in the custom variable.",
+        description: "カスタム変数に保存されているオブジェクトのキーの配列を取得します。",
         categories: [VariableCategory.ADVANCED],
         possibleDataOutput: [OutputDataType.TEXT]
     },

src/backend/variables/builtin/math.js

@@ -39,7 +39,7 @@ const model = {
     argsCheck: (exp) => {
 
         if (exp == null || exp.length < 1) {
-            throw new SyntaxError("A math expression must be included!");
+            throw new SyntaxError("数式が含まれていなければならない！");
         }
 
         return true;

src/backend/variables/builtin/read-file.js

@@ -35,7 +35,7 @@ const model = {
     evaluator: (_, filePath, lineOrRandom) => {
 
         if (filePath === null) {
-            return "[File Path Error]";
+            return "[ファイルパスのエラー]";
         }
 
         try {
@@ -73,7 +73,7 @@ const model = {
             return contents;
         } catch (err) {
             logger.error("error reading file", err);
-            return "[Read File Error]";
+            return "[ファイル読み込みエラー］";
         }
     }
 };

src/backend/variables/builtin/regex-exec.js

@@ -7,7 +7,7 @@ const { OutputDataType, VariableCategory } = require("../../../shared/variable-c
 const model = {
     definition: {
         handle: "regexExec",
-        description: "Filter a string with a regular expression",
+        description: "正規表現で文字列をフィルタリングする",
         usage: "regexExec[string, expression]",
         examples: [
             {

src/backend/variables/builtin/replace.js

@@ -27,7 +27,7 @@ const model = {
     evaluator: (_, input, search, replacement = "", searchIsRegex = false, flags = "g") => {
 
         if (input == null) {
-            return "[Missing input]";
+            return "[不足している入力]";
         }
 
         if (search == null) {

src/backend/variables/builtin/reward-description.js

@@ -29,7 +29,7 @@ const model = {
             const channelRewardId = channelRewardManager.getChannelRewardIdByName(rewardName);
 
             if (channelRewardId == null) {
-                return "[Can't find reward by name]";
+                return "[報酬を名前で検索できない]";
             }
 
             const reward = await twitchApi.streamerClient.channelPoints.getCustomRewardById(
@@ -47,7 +47,7 @@ const model = {
         }
 
         if (rewardData == null) {
-            return "[No reward found]";
+            return "[報酬なし]";
         }
 
         return rewardData.rewardDescription;

src/backend/variables/builtin/stream-title.js

@@ -35,7 +35,7 @@ const model = {
 
         const channelInfo = await TwitchApi.channels.getChannelInformationByUsername(username);
 
-        return channelInfo != null ? channelInfo.title : "[No channel found]";
+        return channelInfo != null ? channelInfo.title : "[チャンネルが見つかりません］";
     }
 };
 

src/backend/variables/builtin/top-currency.js

@@ -17,7 +17,7 @@ const model = {
     evaluator: async (_, currencyName, count = 10) => {
 
         if (currencyName == null) {
-            return "[Invalid currency name]";
+            return "[無効な通貨名]";
         }
 
         // limit to max of 50
@@ -31,15 +31,15 @@ const model = {
         const currencyData = currencyDatabase.getCurrencies();
 
         if (currencyData == null) {
-            return "[No currencies created]";
+            return "[通貨発行なし]";
         }
 
         const currencies = Object.values(currencyData);
 
         const currency = currencies.find(c => c.name.toLowerCase() === currencyName.toLowerCase());
 
         if (currency == null) {
-            return "[Invalid currency name]";
+            return "[無効な通貨名]";
         }
 
         const topCurrencyHolders = await currencyDatabase.getTopCurrencyHolders(currency.id, count);

src/backend/variables/builtin/top-metadata-raw.js

@@ -15,7 +15,7 @@ const model = {
     evaluator: async (_, metadataKey, count = 10) => {
 
         if (metadataKey == null) {
-            return "[Invalid metadata key]";
+            return "[無効なメタデータ・キー]";
         }
 
         // limit to max of 50

src/backend/variables/builtin/top-metadata-user.js

@@ -27,13 +27,13 @@ const model = {
     evaluator: async (_, metadataKey, position = 1, usernameOrPosition = "username") => {
 
         if (metadataKey == null) {
-            return "[Invalid metadata name]";
+            return "[無効なメタデータ名]";
         }
 
         const userAtPosition = await userDatabase.getTopMetadataPosition(metadataKey, position);
 
         if (userAtPosition == null) {
-            return "[Can't find user at position]";
+            return "[ユーザーが見つからない]";
         }
 
         if (usernameOrPosition === "username") {

src/backend/variables/builtin/top-metadata.js

@@ -17,7 +17,7 @@ const model = {
     evaluator: async (_, metadataKey, count = 10) => {
 
         if (metadataKey == null) {
-            return "[Invalid metadata key]";
+            return "[無効なメタデータ・キー]";
         }
 
         // limit to max of 50
@@ -46,7 +46,7 @@ const model = {
 
         // no one in list: output none
         if (topUsersDisplay === '') {
-            return '(none)';
+            return '(なし)';
         }
 
         // return list

src/gui/app/directives/chat/quick-actions/quick-actions.js

@@ -37,11 +37,11 @@
                 <div class="quick-action-settings flex flex-col items-center mb-4">
                     <button
                         class="quick-action-btn p-0"
-                        uib-tooltip="Add Custom Quick Action"
+                        uib-tooltip="クイックアクションを追加"
                         append-tooltip-to-body="true"
                         tooltip-placement="right"
                         ng-click="quickActionsService.showAddOrEditCustomQuickActionModal()"
-                        aria-label="クイックアクションの追加"
+                        aria-label="クイックアクションを追加"
                     >
                         <i class="fas fa-plus"></i>
                     </button>

src/gui/app/directives/modals/chat/add-or-edit-custom-quick-action-modal.js

@@ -8,7 +8,7 @@
             template: `
                 <div class="modal-header" style="text-align: center">
                     <button type="button" class="close" ng-click="$ctrl.dismiss()"><span>&times;</span></button>
-                    <h4 class="modal-title">Edit Quick Action</h4>
+                    <h4 class="modal-title">クイックアクションを編集</h4>
                 </div>
                 <div class="modal-body py-8 px-14">
                     <div class="mb-6">

src/gui/app/directives/modals/chat/edit-activity-events-modal.js

@@ -6,10 +6,10 @@
             template: `
             <div class="modal-header" style="text-align: center">
                 <button type="button" class="close" ng-click="$ctrl.dismiss()"><span>&times;</span></button>
-                <h4 class="modal-title">アクティビティイベントの編集</h4>
+                <h4 class="modal-title">イベント履歴の編集</h4>
             </div>
             <div class="modal-body" style="padding: 0 35px">
-              <p>アクティビティフィードで見たいイベントを選択します。</p>
+              <p>履歴に表示したいイベントを選択します</p>
               <div class="viewer-db-switches">
                 <div style="margin-bottom: 10px;">
                     <searchbar placeholder-text="検索" query="eventSearch" />

src/gui/app/directives/modals/effect-queues/addOrEditEffectQueueModal.js

@@ -26,7 +26,7 @@
                 </div>
 
                 <div class="mt-6">
-                    <div class="modal-subheader pb-2 pt-0 px-0">MODE</div>
+                    <div class="modal-subheader pb-2 pt-0 px-0">動作モード</div>
                     <div>
                         <ui-select ng-model="$ctrl.effectQueue.mode" theme="bootstrap" class="control-type-list">
                             <ui-select-match placeholder="Select queue mode">{{$select.selected.display}}</ui-select-match>