Merge remote-tracking branch 'origin/main'

# Conflicts: # package-lock.json # public/electron.js # src/common/modals/ChangeLogs/changeLog.js # src/common/modals/InstanceDownloadFailed.js # src/common/modals/OptedOutModsList.js
TeamFelNull · Aug 11, 2023 · 94358dc · 94358dc
2 parents a554020 + 68502f3
commit 94358dc
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/electron.js b/public/electron.js
@@ -168,7 +168,10 @@ const userAgent = new UserAgent({
 // app.allowRendererProcessReuse = true;
 Menu.setApplicationMenu(Menu.buildFromTemplate(edit));
 
-const baseUserPath = path.join(app.getPath('appData'), 'felnullgdlauncher_next');
+const baseUserPath = path.join(
+  app.getPath('appData'),
+  'felnullgdlauncher_next'
+);
 
 if (!fss.existsSync(baseUserPath)) {
   fss.mkdirSync(baseUserPath);

diff --git a/src/common/modals/InstanceDownloadFailed.js b/src/common/modals/InstanceDownloadFailed.js
@@ -98,7 +98,7 @@ const InstanceDownloadFailed = ({
             onClick={deleteDownload}
             disabled={loading}
           >
-            Delete Instance
+            インスタンスを削除する
           </Button>
           {isUpdate && (
             <Button
@@ -107,7 +107,7 @@ const InstanceDownloadFailed = ({
               onClick={restoreDownload}
               loading={loading}
             >
-              ダウンロードをキャンセルする
+              インスタンスをそのままにする
             </Button>
           )}
           <Button danger type="primary" onClick={retry} disabled={loading}>

diff --git a/src/common/modals/OptedOutModsList.js b/src/common/modals/OptedOutModsList.js
@@ -312,7 +312,7 @@ const OptedOutModsList = ({
                 background-color: ${props => props.theme.palette.colors.green};
               `}
             >
-              Continue
+              続行
             </Button>
           )}
           {cloudflareBlock && (
@@ -327,7 +327,7 @@ const OptedOutModsList = ({
                   background-color: ${props => props.theme.palette.colors.blue};
                 `}
               >
-                Open folder
+                フォルダを開く
               </Button>
               <Button
                 type="primary"
@@ -341,7 +341,7 @@ const OptedOutModsList = ({
                     props.theme.palette.colors.green};
                 `}
               >
-                Continue
+                続行
               </Button>
             </>
           )}