From 551dda74d7f76c43fdb04d9121816f24705876a1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 13:21:43 +0000
Subject: [PATCH 01/21] Update typescript requirement from ^4.6.3 to ^4.7.3

Updates the requirements on [typescript](https://github.com/Microsoft/TypeScript) to permit the latest version.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.3...v4.7.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 17c7f28..4767391 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "electron-builder": "^23.0.3",
     "husky": "^8.0.1",
     "prettier": "^2.5.1",
-    "typescript": "^4.6.3"
+    "typescript": "^4.7.3"
   },
   "dependencies": {
     "electron-context-menu": "github:ArmCord/electron-context-menu",

From 81377d36573fe3cf13329377eed2f3dfce0c4057 Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Fri, 10 Jun 2022 20:24:13 +0200
Subject: [PATCH 02/21] Add performance mode

---
 src/content/setup.html     |  3 +++
 src/main.ts                |  5 +++--
 src/settings/settings.html | 11 +++++++++-
 src/utils.ts               | 41 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/content/setup.html b/src/content/setup.html
index 6ed4c94..4b9d4bd 100644
--- a/src/content/setup.html
+++ b/src/content/setup.html
@@ -101,6 +101,7 @@
                     automaticPatches: false,
                     mods: "cumcord",
                     inviteWebsocket: true,
+                    performanceMode: "none",
                     blurType: "acrylic"
                 });
                 setTimeout(() => window.armcordinternal.restart(), 5000);
@@ -130,6 +131,7 @@
                             autoLaunch: true,
                             minimizeToTray: true,
                             automaticPatches: false,
+                            performanceMode: "none",
                             mods: options.mod,
                             inviteWebsocket: true,
                             blurType: "acrylic"
@@ -145,6 +147,7 @@
                         automaticPatches: false,
                         autoLaunch: true,
                         mods: "none",
+                        performanceMode: "none",
                         inviteWebsocket: true,
                         blurType: "acrylic"
                     });
diff --git a/src/main.ts b/src/main.ts
index ec61b77..8d1abb9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,7 @@
 // Modules to control application life and create native browser window
 import {app, BrowserWindow, session, dialog} from "electron";
 import "v8-compile-cache";
-import {getConfig, setup, checkIfConfigExists} from "./utils";
+import {getConfig, setup, checkIfConfigExists, injectElectronFlags} from "./utils";
 import "./extensions/mods";
 import "./extensions/plugin";
 import "./tray";
@@ -12,6 +12,7 @@ export var settings: any;
 export var customTitlebar: boolean;
 export var tabs: boolean;
 
+
 if (process.platform == "linux") {
     if (process.env.$XDG_SESSION_TYPE == "wayland") {
         console.log("Wayland specific patches applied.");
@@ -24,7 +25,7 @@ if (process.platform == "linux") {
     }
 }
 checkIfConfigExists();
-
+injectElectronFlags();
 app.whenReady().then(async () => {
     switch (await getConfig("windowStyle")) {
         case "default":
diff --git a/src/settings/settings.html b/src/settings/settings.html
index 7d723c5..c57151c 100644
--- a/src/settings/settings.html
+++ b/src/settings/settings.html
@@ -58,7 +58,14 @@
             </select>
             <p class="header">Client mod:</p>
         </div>
-
+        <div class="switch">
+            <select name="prfmMode" id="prfmMode" class="left">
+                <option value="performance">Performance</option>
+                <option value="battery">Battery</option>
+                <option value="none">None</option>
+            </select>
+            <p class="header">Performance mode:</p>
+        </div>
         <button id="save" class="center">Save settings</button>
     </body>
 
@@ -71,6 +78,7 @@
             document.getElementById("mod").value = await settings.get("mods");
             document.getElementById("channel").value = await settings.get("channel");
             document.getElementById("theme").value = await settings.get("windowStyle");
+            document.getElementById("performanceMode").value = await settings.get("performanceMode");
         }
         loadSettings();
         document.getElementById("save").addEventListener("click", function () {
@@ -84,6 +92,7 @@
                 mods: document.getElementById("mod").value,
                 blurType: "acrylic",
                 inviteWebsocket: document.getElementById("websocket").checked,
+                performanceMode: document.getElementById("prfmMode").value,
                 doneSetup: true
             });
         });
diff --git a/src/utils.ts b/src/utils.ts
index e331a96..2a42ff8 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,6 +1,7 @@
 import * as fs from "fs";
 import {app, dialog} from "electron";
 import path from "path";
+import { defaultMaxListeners } from "events";
 export var firstRun: boolean;
 export var isSetup: boolean;
 export var contentPath: string;
@@ -42,6 +43,7 @@ export function setup() {
         automaticPatches: false,
         mods: "cumcord",
         blurType: "acrylic",
+        performanceMode: "none",
         inviteWebsocket: true,
         doneSetup: false
     };
@@ -63,7 +65,45 @@ export async function injectJS(inject: string) {
 
     document.body.appendChild(el);
 }
+export async function injectElectronFlags() {
+    //     MIT License
 
+    // Copyright (c) 2022 GooseNest
+
+    // Permission is hereby granted, free of charge, to any person obtaining a copy
+    // of this software and associated documentation files (the "Software"), to deal
+    // in the Software without restriction, including without limitation the rights
+    // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    // copies of the Software, and to permit persons to whom the Software is
+    // furnished to do so, subject to the following conditions:
+
+    // The above copyright notice and this permission notice shall be included in all
+    // copies or substantial portions of the Software.
+
+    // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    // SOFTWARE.
+    const presets = {
+        'performance': `--enable-gpu-rasterization --enable-zero-copy --ignore-gpu-blocklist --enable-hardware-overlays=single-fullscreen,single-on-top,underlay --enable-features=EnableDrDc,CanvasOopRasterization,BackForwardCache:TimeToLiveInBackForwardCacheInSeconds/300/should_ignore_blocklists/true/enable_same_site/true,ThrottleDisplayNoneAndVisibilityHiddenCrossOriginIframes,UseSkiaRenderer,WebAssemblyLazyCompilation --disable-features=Vulkan --force_high_performance_gpu`, // Performance
+        'battery': '--enable-features=TurnOffStreamingMediaCachingOnBattery --force_low_power_gpu' // Known to have better battery life for Chromium?
+    };
+    switch (await getConfig("performanceMode")) {
+        case "performance":
+            console.log("Performance mode enabled");
+            app.commandLine.appendSwitch(presets.performance);
+            break;
+        case "battery":
+            console.log("Battery mode enabled");
+            app.commandLine.appendSwitch(presets.battery);
+            break;
+        default:
+            console.log("No performance modes set");
+    }
+}
 //ArmCord Settings/Storage manager
 
 export interface Settings {
@@ -73,6 +113,7 @@ export interface Settings {
     minimizeToTray: boolean;
     automaticPatches: boolean;
     mods: string;
+    performanceMode: string,
     blurType: string;
     inviteWebsocket: boolean;
     doneSetup: boolean;

From 98f88f4609ade9757a72262d3cd126848caa79da Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Fri, 10 Jun 2022 20:46:30 +0200
Subject: [PATCH 03/21] Fix icon loading

---
 package.json  |  2 +-
 src/window.ts | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 17c7f28..6686ce4 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@types/node": "^17.0.33",
     "@types/ws": "^8.5.3",
     "copyfiles": "^2.4.1",
-    "electron": "^18.2.4",
+    "electron": "^19.0.4",
     "electron-builder": "^23.0.3",
     "husky": "^8.0.1",
     "prettier": "^2.5.1",
diff --git a/src/window.ts b/src/window.ts
index 7445fe7..9b6acf2 100644
--- a/src/window.ts
+++ b/src/window.ts
@@ -119,7 +119,7 @@ export function createCustomWindow() {
         height: 350,
         title: "ArmCord",
         darkTheme: true,
-        icon: path.join(__dirname, "/assets/icon_transparent.png"),
+        icon: path.join(__dirname, "../", "/assets/ac_icon_transparent.png"),
         frame: false,
         autoHideMenuBar: true,
         webPreferences: {
@@ -135,7 +135,7 @@ export function createNativeWindow() {
         height: 350,
         title: "ArmCord",
         darkTheme: true,
-        icon: path.join(__dirname, "/assets/icon_transparent.png"),
+        icon: path.join(__dirname, "../", "/assets/ac_icon_transparent.png"),
         frame: true,
         autoHideMenuBar: true,
         webPreferences: {
@@ -157,7 +157,7 @@ export function createTabsHost() {
         height: 350,
         title: "ArmCord",
         darkTheme: true,
-        icon: path.join(__dirname, "/assets/icon_transparent.png"),
+        icon: path.join(__dirname, "../", "/assets/ac_icon_transparent.png"),
         frame: true,
         autoHideMenuBar: true,
         webPreferences: {
@@ -186,7 +186,7 @@ export function createTabsGuest(number: number) {
             height: 600,
             title: "ArmCord Guest Window " + number,
             darkTheme: true,
-            icon: path.join(__dirname, "/assets/icon_transparent.png"),
+            icon: path.join(__dirname, "../", "/assets/ac_icon_transparent.png"),
             frame: true,
             autoHideMenuBar: true,
             webPreferences: {
@@ -223,7 +223,7 @@ export function createInviteWindow() {
         height: 600,
         title: "ArmCord Invite Manager",
         darkTheme: true,
-        icon: path.join(__dirname, "/assets/icon_transparent.png"),
+        icon: path.join(__dirname, "../", "/assets/ac_icon_transparent.png"),
         frame: true,
         autoHideMenuBar: true,
         webPreferences: {

From a12463877a9f7626e0a83bec93207d5429d88b24 Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Fri, 10 Jun 2022 22:29:43 +0200
Subject: [PATCH 04/21] Add macOS tray icon potential fix

---
 assets/macos.png | Bin 0 -> 4460 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 assets/macos.png

diff --git a/assets/macos.png b/assets/macos.png
new file mode 100644
index 0000000000000000000000000000000000000000..953ecfa160dfcaed2b442d82526c9cc4aab2cbb8
GIT binary patch
literal 4460
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

literal 0
HcmV?d00001


From 0f6f650be2e8aa58c91511069a4c39318f3ca3d1 Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Fri, 10 Jun 2022 22:38:27 +0200
Subject: [PATCH 05/21] Add 16x16 icon

---
 assets/16.png | Bin 0 -> 1134 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 assets/16.png

diff --git a/assets/16.png b/assets/16.png
new file mode 100644
index 0000000000000000000000000000000000000000..f43ff68fd6370e39be7d8a943c4a09c2e57241c5
GIT binary patch
literal 1134
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a><YADU|_rz;1lAiqi+mU^Z);U
zCl9~qlq^$ATT6!^9etDV_%u7WI2}DBYv%|<Q%fBK6E#g86H8lTbDNB!Dti}CQBiSy
zV=Gf@Pi=i;9etyjyZ)=F$ZP8v0Sz1wq@*mv!^VJYwY7t*n@^yLg|)GTtAl5fnT?OS
zhB{n<i&sEyMZJGiWn#%Dudr$Z6C0qEfr*8iPf$=)vS&zzs+uxTL|s!?MNNx~lN%UH
zj$Y~U1#3(!T@@82fl|Prh)&H($SSmR@eE6yVPO}bt!HRpY#x!AQP$L@XJi4lOHe?_
z*xWKGp~F3>SW8zQByM2p6H)IU({5zu02I+RG_!UJcMmG@3@NvBi`O+U%dcw6sy~rf
zw6eJCPI1@W+@`ZRji-w`Zx?mmD(bqOTDd17r#7SJP;uAo;_kcAIZN_dE~ZuO%Wu70
z&~_!G_AoF)cMJE`0v+8^666O;DY(G2RdTlb4|}mn_uQUm#mQv9^5(YsXghf}_J&O-
zu3TE5BqFHd(SBjKAuF50;)Am01!h?rGh}7X6tum2_wS6|a>?{_C#9w`N%JtT`5nsA
zYj|mI&zs^%mF-_|-zs6|PX2ncp2hv~T~7|niI;9Jv3@DFVj9pPj7i?^E=+0MH7P(2
zXMsm#F#`j)FbFd;%$g$s6l5>)^mS!_#>OS0$jKD(5R~p;c)B=-NL)^yFl}Ng1CyIX
z!i34;0U=2a9fk%Pt5>XAnQdU;z}ncdY}&TIb@TQ$E)-<ukyt%@#;lpq5mAwcMGOrj
zZr-?c)7rwSk#)w5$cVYIH*QGA+`VJ#z$7y-?w;Mgx_@(G7#kfEL=Va;E}WbAQ1H&1
ztcg4h$`y+iCGXl*U6uT};<2uz#7`li$&-SA{Zjw3WZBZ!X$A(L($i9(Kk=Jmu&_EP
zZeO1m^I`|b#EVZfgVlXznC;!MWJ^zDV8Dt!i#ExxNN@|?8peA;mgkVt)>7m2v-5)Q
zD{y`6n^BP*T<o14y}L!FSwxvZ@Vwdg6~AAF0sX96;u=wsl30>zm0Xkxq!^40jEsP(
zL)XwC#K^$P*x1UzNZY``%D}*8Qu-1U4Y~O#nQ4`{HTa&t4+>}oPgg&ebxsLQ0MavN
Ab^rhX

literal 0
HcmV?d00001


From 465a072e674ec399356b9fa48464f1988dd5f070 Mon Sep 17 00:00:00 2001
From: Ufal Salman <salman.ufal@gmail.com>
Date: Sat, 7 May 2022 13:38:16 +0200
Subject: [PATCH 06/21] Added translation using Weblate (Indonesian)

---
 assets/lang/id-ID.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 assets/lang/id-ID.json

diff --git a/assets/lang/id-ID.json b/assets/lang/id-ID.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/assets/lang/id-ID.json
@@ -0,0 +1 @@
+{}

From b8b1d04d24a548b57ab1ab748d0ebd44b487cb4f Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Sat, 7 May 2022 11:38:17 +0000
Subject: [PATCH 07/21] Translated using Weblate (Indonesian)

Currently translated at 100.0% (0 of 0 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/id/
---
 assets/lang/id-ID.json | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/assets/lang/id-ID.json b/assets/lang/id-ID.json
index 0967ef4..8e16124 100644
--- a/assets/lang/id-ID.json
+++ b/assets/lang/id-ID.json
@@ -1 +1,28 @@
-{}
+{
+    "loading_screen_start": "Starting ArmCord…",
+    "loading_screen_offline": "You appear to be offline. Please connect to the Internet and try again.",
+    "loading_screen_update": "A new version of ArmCord is available. Please update to the latest version.",
+    "setup_question1": "Select what kind of setup you want to perform:",
+    "setup_question1_answer1": "Express setup",
+    "setup_question1_answer2": "Full setup",
+    "setup_question2": "Choose your Discord channel/instance:",
+    "setup_offline": "You appear to be offline. Please connect to the Internet and restart the ArmCord setup.",
+    "setup_question3": "Should ArmCord handle client mods installation?",
+    "yes": "Yes",
+    "no": "No",
+    "next": "Next",
+    "setup_question4": "Select a client mod you want to install:",
+    "setup_question4_clientmodnotice": "Why not all of them? Having many client mods at the same time can cause issues. If you really want to do it though, check our documentation.",
+    "settings-theme": "ArmCord Theme:",
+    "settings-theme-glasstron": "Glasstron (experimental)",
+    "settings-theme-tabs": "Tabs (experimental)",
+    "settings-theme-default": "Default",
+    "settings-theme-native": "Native",
+    "settings-tray": "Minimize to tray",
+    "settings-patches": "Automatic Patches",
+    "settings-channel": "Discord channel:",
+    "settings-invitewebsocket": "discord.gg support",
+    "settings-mod": "Client mod:",
+    "settings-save": "Save settings",
+    "settings-updater": "Check for updates"
+}

From b43a9920273d8e78514814baed663901a6b6a990 Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Fri, 10 Jun 2022 23:17:03 +0200
Subject: [PATCH 08/21] Tweak translations a bit

---
 assets/lang/en_US.json | 10 +++++++---
 src/content/setup.html |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets/lang/en_US.json b/assets/lang/en_US.json
index 03e21bc..979bc73 100644
--- a/assets/lang/en_US.json
+++ b/assets/lang/en_US.json
@@ -12,8 +12,8 @@
   "no": "No",
   "next": "Next",
   "setup_question4": "Select a client mod you want to install:",
-  "setup_question4_clientmodnotice": "Why not all of them? Having many client mods at the same time can cause issues. If you really want to do it though, check our documentation.",
-  "settings-theme": "ArmCord Theme:",
+  "setup_question4_clientmodnotice": "Why not all of them? Having many client mods at the same time can cause issues. If you really want to do it though, check our Discord.",
+  "settings-theme": "ArmCord theme:",
   "settings-theme-glasstron": "Glasstron (experimental)",
   "settings-theme-tabs": "Tabs (experimental)",
   "settings-theme-default": "Default",
@@ -21,8 +21,12 @@
   "settings-tray": "Minimize to tray",
   "settings-patches": "Automatic Patches",
   "settings-channel": "Discord channel:",
-  "settings-invitewebsocket": "discord.gg support",
+  "settings-invitewebsocket": "Invite Websocket",
   "settings-mod": "Client mod:",
+  "settings-prfmMode": "Performance mode:",
+  "settings-prfmMode-performance": "Performance",
+  "settings-prfmMode-battery": "Battery",
+  "settings-none": "None",
   "settings-save": "Save settings",
   "settings-updater": "Check for updates"
 }
diff --git a/src/content/setup.html b/src/content/setup.html
index 4b9d4bd..1783c8f 100644
--- a/src/content/setup.html
+++ b/src/content/setup.html
@@ -57,7 +57,7 @@
                     </div>
                     <p class="text-center">
                         Why not all of them? Having many client mods at the same time can cause issues. If you really
-                        want to do it though, check our documentation ;)
+                        want to do it though, check our Discord ;)
                     </p>
                     <div id="buttons">
                         <button id="next" class="center">Next</button>

From 478c2da61a5748341a47f796efdace0ef98f8578 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 10 Jun 2022 21:22:39 +0000
Subject: [PATCH 09/21] Translated using Weblate (French)

Currently translated at 76.6% (23 of 30 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/fr/
---
 assets/lang/fr-FR.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/lang/fr-FR.json b/assets/lang/fr-FR.json
index 28dbdbd..31e09b1 100644
--- a/assets/lang/fr-FR.json
+++ b/assets/lang/fr-FR.json
@@ -24,5 +24,9 @@
     "settings-theme-glasstron": "Glasstron (experimental)",
     "settings-theme-native": "Native",
     "settings-patches": "Automatic Patches",
-    "settings-invitewebsocket": "discord.gg support"
+    "settings-invitewebsocket": "discord.gg support",
+    "settings-prfmMode": "Performance mode:",
+    "settings-prfmMode-performance": "Performance",
+    "settings-prfmMode-battery": "Battery",
+    "settings-none": "None"
 }

From 7f524b155950d069b5ccd1b72153858540b2c080 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 10 Jun 2022 21:22:39 +0000
Subject: [PATCH 10/21] Translated using Weblate (Italian)

Currently translated at 76.6% (23 of 30 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/it/
---
 assets/lang/it-IT.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/lang/it-IT.json b/assets/lang/it-IT.json
index 144d221..a301d5c 100644
--- a/assets/lang/it-IT.json
+++ b/assets/lang/it-IT.json
@@ -24,5 +24,9 @@
     "settings-theme-default": "Default",
     "settings-theme-native": "Native",
     "settings-patches": "Automatic Patches",
-    "settings-invitewebsocket": "discord.gg support"
+    "settings-invitewebsocket": "discord.gg support",
+    "settings-prfmMode": "Performance mode:",
+    "settings-prfmMode-performance": "Performance",
+    "settings-prfmMode-battery": "Battery",
+    "settings-none": "None"
 }

From 00bf23667b39808ad9d7118b54ac00304416d7dd Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 10 Jun 2022 21:22:39 +0000
Subject: [PATCH 11/21] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 76.6% (23 of 30 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/nb_NO/
---
 assets/lang/nb-NO.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/lang/nb-NO.json b/assets/lang/nb-NO.json
index 41670f2..050af76 100644
--- a/assets/lang/nb-NO.json
+++ b/assets/lang/nb-NO.json
@@ -24,5 +24,9 @@
     "settings-theme-default": "Default",
     "settings-theme-native": "Native",
     "settings-patches": "Automatic Patches",
-    "settings-invitewebsocket": "discord.gg support"
+    "settings-invitewebsocket": "discord.gg support",
+    "settings-prfmMode": "Performance mode:",
+    "settings-prfmMode-performance": "Performance",
+    "settings-prfmMode-battery": "Battery",
+    "settings-none": "None"
 }

From 85dea9731279bc13e4d4f20721b661c4b0f9cb32 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 10 Jun 2022 21:22:40 +0000
Subject: [PATCH 12/21] Translated using Weblate (Dutch)

Currently translated at 76.6% (23 of 30 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/nl/
---
 assets/lang/nl-NL.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/lang/nl-NL.json b/assets/lang/nl-NL.json
index 485d28f..bb37188 100644
--- a/assets/lang/nl-NL.json
+++ b/assets/lang/nl-NL.json
@@ -24,5 +24,9 @@
     "settings-theme-tabs": "Tabs (experimenteel)",
     "settings-theme-default": "Standaard",
     "settings-theme-native": "Native",
-    "settings-invitewebsocket": "discord.gg support"
+    "settings-invitewebsocket": "discord.gg support",
+    "settings-none": "None",
+    "settings-prfmMode": "Performance mode:",
+    "settings-prfmMode-performance": "Performance",
+    "settings-prfmMode-battery": "Battery"
 }

From 113a693603ce46603799c2b9df5a88bbd02ace18 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 10 Jun 2022 21:22:40 +0000
Subject: [PATCH 13/21] Translated using Weblate (Polish)

Currently translated at 76.6% (23 of 30 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/pl/
---
 assets/lang/pl-PL.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/lang/pl-PL.json b/assets/lang/pl-PL.json
index 979e56b..7e06569 100644
--- a/assets/lang/pl-PL.json
+++ b/assets/lang/pl-PL.json
@@ -24,5 +24,9 @@
     "settings-theme-default": "Domyślny",
     "settings-theme-native": "Natywny",
     "settings-patches": "Automatyczne łatki",
-    "settings-invitewebsocket": "Wsparcie linków discord.gg"
+    "settings-invitewebsocket": "Wsparcie linków discord.gg",
+    "settings-prfmMode": "Performance mode:",
+    "settings-prfmMode-performance": "Performance",
+    "settings-prfmMode-battery": "Battery",
+    "settings-none": "None"
 }

From e518c0f04ede5f715e5da5ca23cecb8c87dbcb97 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 10 Jun 2022 21:22:40 +0000
Subject: [PATCH 14/21] Translated using Weblate (Indonesian)

Currently translated at 0.0% (0 of 30 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/id/
---
 assets/lang/id-ID.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assets/lang/id-ID.json b/assets/lang/id-ID.json
index 8e16124..03f2b4f 100644
--- a/assets/lang/id-ID.json
+++ b/assets/lang/id-ID.json
@@ -24,5 +24,9 @@
     "settings-invitewebsocket": "discord.gg support",
     "settings-mod": "Client mod:",
     "settings-save": "Save settings",
-    "settings-updater": "Check for updates"
+    "settings-updater": "Check for updates",
+    "settings-prfmMode": "Performance mode:",
+    "settings-prfmMode-performance": "Performance",
+    "settings-prfmMode-battery": "Battery",
+    "settings-none": "None"
 }

From fa24b7996f1de8041d05a1ff9e8dff98c28e9d14 Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Sat, 11 Jun 2022 22:14:16 +0200
Subject: [PATCH 15/21] Add language detection from Discord

---
 src/ipc.ts             |  5 ++++-
 src/preload/bridge.ts  |  1 +
 src/preload/preload.ts | 13 ++++++++++---
 src/utils.ts           | 22 ++++++++++++++++++----
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/ipc.ts b/src/ipc.ts
index c3e799d..92079ec 100644
--- a/src/ipc.ts
+++ b/src/ipc.ts
@@ -1,7 +1,7 @@
 //ipc stuff
 import {app, ipcMain, shell, desktopCapturer} from "electron";
 import {createTabsGuest, mainWindow} from "./window";
-import {setConfigBulk, getVersion, getConfig} from "./utils";
+import {setConfigBulk, getVersion, getConfig, setLang} from "./utils";
 import {customTitlebar, tabs} from "./main";
 import {createSettingsWindow} from "./settings/main";
 export function registerIpc() {
@@ -11,6 +11,9 @@ export function registerIpc() {
     ipcMain.on("openTab", (event, number: number) => {
         createTabsGuest(number);
     });
+    ipcMain.on("setLang", (event, lang: string) => {
+        setLang(lang);
+    });
     ipcMain.on("open-external-link", (event, href: string) => {
         shell.openExternal(href);
     });
diff --git a/src/preload/bridge.ts b/src/preload/bridge.ts
index 23fe888..931e08e 100644
--- a/src/preload/bridge.ts
+++ b/src/preload/bridge.ts
@@ -16,6 +16,7 @@ contextBridge.exposeInMainWorld("armcord", {
     electron: process.versions.electron,
     channel: ipcRenderer.sendSync("channel"),
     openTab: (number: number) => ipcRenderer.sendSync("openTab", number),
+    setLang: (lang: string) => ipcRenderer.send("setLang", lang),
     version: ipcRenderer.sendSync("get-app-version", "app-version"),
     getDisplayMediaSelector: getDisplayMediaSelector,
     openSettingsWindow: () => ipcRenderer.send("openSettingsWindow")
diff --git a/src/preload/preload.ts b/src/preload/preload.ts
index fcde5a0..810f4a3 100644
--- a/src/preload/preload.ts
+++ b/src/preload/preload.ts
@@ -4,11 +4,15 @@ import "./patch";
 import * as fs from "fs";
 import * as path from "path";
 import {injectTitlebar} from "./titlebar";
-import {sleep, addStyle, injectJS} from "../utils";
+import {sleep, addStyle, injectJS, addScript} from "../utils";
 import {ipcRenderer} from "electron";
 import {injectTabs} from "./tabs";
 var version = ipcRenderer.sendSync("get-app-version", "app-version");
-
+async function updateLang() {
+    addScript(`function getDiscordLang() {
+        {const _w=webpackChunkdiscord_app;let lang;_w.push([[Symbol()],{},e=>{for(const k in e.c){const m=e.c[k].exports;const mDef=m?.default&&m.__esModule?m.default:m;if(mDef?._chosenLocale&&!lang)lang=mDef}}]);_w.pop();window.armcord.setLang(lang._chosenLocale);return lang._chosenLocale;void 0}}
+        getDiscordLang();`);
+}
 declare global {
     interface Window {
         armcord: any;
@@ -30,7 +34,7 @@ if (window.location.href.indexOf("splash.html") > -1) {
     if (ipcRenderer.sendSync("tabs")) {
         injectTabs();
     }
-    sleep(5000).then(() => {
+    sleep(5000).then(async () => {
         const cssPath = path.join(__dirname, "../", "/content/css/discord.css");
         addStyle(fs.readFileSync(cssPath, "utf8"));
 
@@ -38,14 +42,17 @@ if (window.location.href.indexOf("splash.html") > -1) {
             case "goosemod":
                 injectJS(clientMods.goosemod);
                 console.log("Loading GooseMod...");
+                await updateLang();
                 break;
             case "cumcord":
                 injectJS(clientMods.cumcord);
                 console.log("Loading Cumcord...");
+                await updateLang();
                 break;
             case "flicker":
                 injectJS(clientMods.flicker);
                 console.log("Loading FlickerMod...");
+                await updateLang();
                 break;
         }
     });
diff --git a/src/utils.ts b/src/utils.ts
index 2a42ff8..9e51f49 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,7 +1,7 @@
 import * as fs from "fs";
 import {app, dialog} from "electron";
 import path from "path";
-import { defaultMaxListeners } from "events";
+import {defaultMaxListeners} from "events";
 export var firstRun: boolean;
 export var isSetup: boolean;
 export var contentPath: string;
@@ -88,8 +88,8 @@ export async function injectElectronFlags() {
     // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     // SOFTWARE.
     const presets = {
-        'performance': `--enable-gpu-rasterization --enable-zero-copy --ignore-gpu-blocklist --enable-hardware-overlays=single-fullscreen,single-on-top,underlay --enable-features=EnableDrDc,CanvasOopRasterization,BackForwardCache:TimeToLiveInBackForwardCacheInSeconds/300/should_ignore_blocklists/true/enable_same_site/true,ThrottleDisplayNoneAndVisibilityHiddenCrossOriginIframes,UseSkiaRenderer,WebAssemblyLazyCompilation --disable-features=Vulkan --force_high_performance_gpu`, // Performance
-        'battery': '--enable-features=TurnOffStreamingMediaCachingOnBattery --force_low_power_gpu' // Known to have better battery life for Chromium?
+        performance: `--enable-gpu-rasterization --enable-zero-copy --ignore-gpu-blocklist --enable-hardware-overlays=single-fullscreen,single-on-top,underlay --enable-features=EnableDrDc,CanvasOopRasterization,BackForwardCache:TimeToLiveInBackForwardCacheInSeconds/300/should_ignore_blocklists/true/enable_same_site/true,ThrottleDisplayNoneAndVisibilityHiddenCrossOriginIframes,UseSkiaRenderer,WebAssemblyLazyCompilation --disable-features=Vulkan --force_high_performance_gpu`, // Performance
+        battery: "--enable-features=TurnOffStreamingMediaCachingOnBattery --force_low_power_gpu" // Known to have better battery life for Chromium?
     };
     switch (await getConfig("performanceMode")) {
         case "performance":
@@ -104,6 +104,20 @@ export async function injectElectronFlags() {
             console.log("No performance modes set");
     }
 }
+export async function setLang(language: string) {
+    const userDataPath = app.getPath("userData");
+    const storagePath = path.join(userDataPath, "/storage/");
+    const langConfigFile = storagePath + "lang.json";
+    if (!fs.existsSync(langConfigFile)) {
+        fs.writeFileSync(langConfigFile, "{}", "utf-8");
+    }
+    let rawdata = fs.readFileSync(langConfigFile, "utf-8");
+    let parsed = JSON.parse(rawdata);
+    parsed["lang"] = language;
+    let toSave = JSON.stringify(parsed);
+    fs.writeFileSync(langConfigFile, toSave, "utf-8");
+}
+
 //ArmCord Settings/Storage manager
 
 export interface Settings {
@@ -113,7 +127,7 @@ export interface Settings {
     minimizeToTray: boolean;
     automaticPatches: boolean;
     mods: string;
-    performanceMode: string,
+    performanceMode: string;
     blurType: string;
     inviteWebsocket: boolean;
     doneSetup: boolean;

From 410c899c84346c4c92194eaf4f9a77e14117a392 Mon Sep 17 00:00:00 2001
From: smartfridge <smartfrigde@gmail.com>
Date: Fri, 10 Jun 2022 21:26:06 +0000
Subject: [PATCH 16/21] Translated using Weblate (Polish)

Currently translated at 100.0% (30 of 30 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/pl/
---
 assets/lang/pl-PL.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/lang/pl-PL.json b/assets/lang/pl-PL.json
index 7e06569..e4892b6 100644
--- a/assets/lang/pl-PL.json
+++ b/assets/lang/pl-PL.json
@@ -7,7 +7,7 @@
     "no": "Nie",
     "next": "Dalej",
     "setup_question4": "Wybierz modyfikację klienta którą chcesz zainstalować:",
-    "setup_question4_clientmodnotice": "Dlaczego nie wszystkie na raz? Posiadanie wielu modyfikacji może spowodować wiele błędów. Jeśli jednak nalegasz możesz sprawdzić naszą dokumentację.",
+    "setup_question4_clientmodnotice": "Dlaczego nie wszystkie na raz? Posiadanie wielu modyfikacji może spowodować wiele błędów. Jeśli jednak nalegasz możesz sprawdzić naszego Discorda.",
     "loading_screen_start": "Ładowanie ArmCord…",
     "loading_screen_offline": "Wydaje nam się, że nie jesteś połączony z Internetem. Połącz się z internetem i spróbuj ponownie.",
     "setup_question1_answer1": "Ekspresowa konfiguracja",
@@ -24,9 +24,9 @@
     "settings-theme-default": "Domyślny",
     "settings-theme-native": "Natywny",
     "settings-patches": "Automatyczne łatki",
-    "settings-invitewebsocket": "Wsparcie linków discord.gg",
-    "settings-prfmMode": "Performance mode:",
-    "settings-prfmMode-performance": "Performance",
-    "settings-prfmMode-battery": "Battery",
-    "settings-none": "None"
+    "settings-invitewebsocket": "Websocket dla zaproszeń",
+    "settings-prfmMode": "Tryb wydajności:",
+    "settings-prfmMode-performance": "Wydajny",
+    "settings-prfmMode-battery": "Bateria",
+    "settings-none": "Nic/Brak"
 }

From f9bfed7585bceb4ab5e878db11efdc3161ba449d Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Sun, 12 Jun 2022 13:18:18 +0200
Subject: [PATCH 17/21] Add translation loading for settings

---
 assets/lang/{en_US.json => en-US.json} |  0
 src/ipc.ts                             |  5 ++-
 src/settings/main.ts                   |  6 +++-
 src/settings/preload.ts                |  4 +++
 src/settings/settings.html             | 44 +++++++++++++++++++-------
 src/utils.ts                           | 19 ++++++++++-
 6 files changed, 64 insertions(+), 14 deletions(-)
 rename assets/lang/{en_US.json => en-US.json} (100%)

diff --git a/assets/lang/en_US.json b/assets/lang/en-US.json
similarity index 100%
rename from assets/lang/en_US.json
rename to assets/lang/en-US.json
diff --git a/src/ipc.ts b/src/ipc.ts
index 92079ec..830a2f1 100644
--- a/src/ipc.ts
+++ b/src/ipc.ts
@@ -1,7 +1,7 @@
 //ipc stuff
 import {app, ipcMain, shell, desktopCapturer} from "electron";
 import {createTabsGuest, mainWindow} from "./window";
-import {setConfigBulk, getVersion, getConfig, setLang} from "./utils";
+import {setConfigBulk, getVersion, getConfig, setLang, getLang} from "./utils";
 import {customTitlebar, tabs} from "./main";
 import {createSettingsWindow} from "./settings/main";
 export function registerIpc() {
@@ -14,6 +14,9 @@ export function registerIpc() {
     ipcMain.on("setLang", (event, lang: string) => {
         setLang(lang);
     });
+    ipcMain.on("getLang", (event, object: string) => {
+        getLang(object);
+    });
     ipcMain.on("open-external-link", (event, href: string) => {
         shell.openExternal(href);
     });
diff --git a/src/settings/main.ts b/src/settings/main.ts
index 53a46d4..4167f62 100644
--- a/src/settings/main.ts
+++ b/src/settings/main.ts
@@ -1,5 +1,5 @@
 import {BrowserWindow, shell, ipcMain} from "electron";
-import {getConfig, setConfigBulk, Settings} from "../utils";
+import {getConfig, setConfigBulk, Settings, getLang} from "../utils";
 import path from "path";
 var settingsWindow: BrowserWindow;
 var instance: number = 0;
@@ -31,6 +31,9 @@ export function createSettingsWindow() {
         ipcMain.handle("getSetting", (event, toGet: string) => {
             return getConfig(toGet);
         });
+        ipcMain.handle("getLang", (event, toGet: string) => {
+            return getLang(toGet);
+        });
         settingsWindow.webContents.setWindowOpenHandler(({url}) => {
             shell.openExternal(url);
             return {action: "deny"};
@@ -38,6 +41,7 @@ export function createSettingsWindow() {
         settingsWindow.loadURL(`file://${__dirname}/settings.html`);
         settingsWindow.on("close", (event: Event) => {
             ipcMain.removeHandler("getSetting");
+            ipcMain.removeHandler("getLang");
             ipcMain.removeAllListeners("saveSettings");
             instance = 0;
         });
diff --git a/src/settings/preload.ts b/src/settings/preload.ts
index 0c90a53..38c986d 100644
--- a/src/settings/preload.ts
+++ b/src/settings/preload.ts
@@ -2,6 +2,10 @@ import {contextBridge, ipcRenderer} from "electron";
 console.log("ArmCord Settings");
 contextBridge.exposeInMainWorld("settings", {
     save: (...args: any) => ipcRenderer.send("saveSettings", ...args),
+    getLang: (toGet: string) =>
+        ipcRenderer.invoke("getLang", toGet).then((result) => {
+            return result;
+        }),
     get: (toGet: string) =>
         ipcRenderer.invoke("getSetting", toGet).then((result) => {
             return result;
diff --git a/src/settings/settings.html b/src/settings/settings.html
index c57151c..e352741 100644
--- a/src/settings/settings.html
+++ b/src/settings/settings.html
@@ -14,7 +14,7 @@
                 <option value="default">Default</option>
                 <option value="native">Native</option>
             </select>
-            <p class="header">ArmCord theme:</p>
+            <p class="header" id="settings-theme">ArmCord theme:</p>
         </div>
         <br />
         <div class="switch">
@@ -24,19 +24,19 @@
         </div>
         <br />
         <div class="switch">
-            <label class="header">Minimize to tray</label>
+            <label class="header" id="settings-tray">Minimize to tray</label>
             <input class="tgl tgl-light left" id="tray" type="checkbox" />
             <label class="tgl-btn left" for="tray"></label>
         </div>
         <br />
         <div class="switch">
-            <label class="header">Automatic Patches</label>
+            <label class="header" id="settings-patches">Automatic Patches</label>
             <input class="tgl tgl-light left" id="patches" type="checkbox" />
             <label class="tgl-btn left" for="patches"></label>
         </div>
         <br />
         <div class="switch">
-            <label class="header">Invite Websocket</label>
+            <label class="header" id="settings-invitewebsocket">Invite Websocket</label>
             <input class="tgl tgl-light left" id="websocket" type="checkbox" />
             <label class="tgl-btn left" for="websocket"></label>
         </div>
@@ -47,7 +47,7 @@
                 <option value="ptb">PTB</option>
                 <option value="foss">Fosscord</option>
             </select>
-            <p class="header">Discord channel:</p>
+            <p class="header" id="settings-channel">Discord channel:</p>
         </div>
         <div class="switch">
             <select name="mod" id="mod" class="left">
@@ -56,7 +56,7 @@
                 <option value="flicker">Flicker</option>
                 <option value="none">None</option>
             </select>
-            <p class="header">Client mod:</p>
+            <p class="header" id="settings-mod">Client mod:</p>
         </div>
         <div class="switch">
             <select name="prfmMode" id="prfmMode" class="left">
@@ -64,11 +64,33 @@
                 <option value="battery">Battery</option>
                 <option value="none">None</option>
             </select>
-            <p class="header">Performance mode:</p>
+            <p class="header" id="settings-prfmMode">Performance mode:</p>
         </div>
-        <button id="save" class="center">Save settings</button>
+        <button id="settings-save" class="center">Save settings</button>
     </body>
-
+    <script>
+        async function loadLang() {
+            document.getElementById("settings-save").innerHTML = await settings.getLang("settings-save");
+            document.getElementById("settings-mod").innerHTML = await settings.getLang("settings-mod");
+            document.getElementById("settings-channel").innerHTML = await settings.getLang("settings-channel");
+            document.getElementById("settings-invitewebsocket").innerHTML = await settings.getLang(
+                "settings-invitewebsocket"
+            );
+            document.getElementById("settings-patches").innerHTML = await settings.getLang("settings-patches");
+            document.getElementById("settings-tray").innerHTML = await settings.getLang("settings-tray");
+            document.getElementById("settings-theme").innerHTML = await settings.getLang("settings-theme");
+            //select stuff
+            document.getElementById("mod").options[3].text = await settings.getLang("settings-none");
+            document.getElementById("prfmMode").options[2].text = await settings.getLang("settings-none");
+            document.getElementById("prfmMode").options[1].text = await settings.getLang("settings-prfmMode-battery");
+            document.getElementById("prfmMode").options[0].text = await settings.getLang(
+                "settings-prfmMode-performance"
+            );
+            document.getElementById("theme").options[1].text = await settings.getLang("settings-theme-native");
+            document.getElementById("theme").options[0].text = await settings.getLang("settings-theme-default");
+        }
+        loadLang();
+    </script>
     <script>
         async function loadSettings() {
             document.getElementById("csp").checked = await settings.get("armcordCSP");
@@ -78,10 +100,10 @@
             document.getElementById("mod").value = await settings.get("mods");
             document.getElementById("channel").value = await settings.get("channel");
             document.getElementById("theme").value = await settings.get("windowStyle");
-            document.getElementById("performanceMode").value = await settings.get("performanceMode");
+            document.getElementById("prfmMode").value = await settings.get("performanceMode");
         }
         loadSettings();
-        document.getElementById("save").addEventListener("click", function () {
+        document.getElementById("settings-save").addEventListener("click", function () {
             //function saveSettings(windowStyle: string, channelSetting: string, armcordCSPSetting: boolean, minimizeToTray: boolean, automaticPatches: boolean,modsSetting: string, blurType: string)
             settings.save({
                 windowStyle: document.getElementById("theme").value,
diff --git a/src/utils.ts b/src/utils.ts
index 9e51f49..280d97a 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -117,7 +117,24 @@ export async function setLang(language: string) {
     let toSave = JSON.stringify(parsed);
     fs.writeFileSync(langConfigFile, toSave, "utf-8");
 }
-
+var language: string;
+export async function getLang(object: string) {
+    if (language == undefined) {
+        const userDataPath = app.getPath("userData");
+        const storagePath = path.join(userDataPath, "/storage/");
+        const langConfigFile = storagePath + "lang.json";
+        let rawdata = fs.readFileSync(langConfigFile, "utf-8");
+        let parsed = JSON.parse(rawdata);
+        language = parsed["lang"];
+    }
+    if (language.length == 2) {
+        language = language + "-" + language.toUpperCase();
+    }
+    const langPath = path.join(__dirname, "../", "/assets/lang/" + language + ".json");
+    let rawdata = fs.readFileSync(langPath, "utf-8");
+    let parsed = JSON.parse(rawdata);
+    return parsed[object];
+}
 //ArmCord Settings/Storage manager
 
 export interface Settings {

From ade35473a87019914cf52b1f0a7f834c4aa2404c Mon Sep 17 00:00:00 2001
From: Phorcys <gh@phorcys.net>
Date: Sun, 12 Jun 2022 08:18:26 +0000
Subject: [PATCH 18/21] Translated using Weblate (French)

Currently translated at 100.0% (30 of 30 strings)

Translation: ArmCord/ArmCord
Translate-URL: https://hosted.weblate.org/projects/armcord/armcord/fr/
---
 assets/lang/fr-FR.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/assets/lang/fr-FR.json b/assets/lang/fr-FR.json
index 31e09b1..7745641 100644
--- a/assets/lang/fr-FR.json
+++ b/assets/lang/fr-FR.json
@@ -1,6 +1,6 @@
 {
     "loading_screen_start": "Démarrage d'ArmCord…",
-    "loading_screen_update": "Une nouvelle version de ArmCord est disponible. Veuillez mettre à jour la dernière version.",
+    "loading_screen_update": "Une nouvelle version d'ArmCord est disponible. Veuillez mettre à jour vers la dernière version.",
     "setup_question1": "Sélectionnez le type de configuration que vous souhaitez effectuer :",
     "setup_question1_answer1": "Configuration express",
     "setup_question1_answer2": "Configuration complète",
@@ -10,23 +10,23 @@
     "no": "Non",
     "next": "Suivant",
     "setup_question4": "Sélectionnez le mod client que vous souhaitez installer :",
-    "setup_question4_clientmodnotice": "Pourquoi pas tous ? Le fait d'avoir plusieurs mods clients en même temps peut causer des problèmes. Si vous voulez vraiment le faire, consultez notre documentation.",
+    "setup_question4_clientmodnotice": "Pourquoi pas tous ? Le fait d'avoir plusieurs clients mods en même temps peut causer des problèmes. Si vous voulez vraiment le faire, consultez notre Discord.",
     "loading_screen_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et réessayer.",
-    "setup_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et redémarrer ArmCord Setup.",
+    "setup_offline": "Vous semblez être hors ligne. Veuillez vous connecter à internet et redémarrer l'installateur ArmCord.",
     "settings-tray": "Minimize to tray",
     "settings-channel": "Discord channel:",
     "settings-mod": "Client mod:",
     "settings-save": "Save settings",
     "settings-updater": "Check for updates",
-    "settings-theme": "ArmCord Theme:",
+    "settings-theme": "Thème ArmCord :",
     "settings-theme-tabs": "Tabs (experimental)",
     "settings-theme-default": "Default",
     "settings-theme-glasstron": "Glasstron (experimental)",
     "settings-theme-native": "Native",
     "settings-patches": "Automatic Patches",
-    "settings-invitewebsocket": "discord.gg support",
-    "settings-prfmMode": "Performance mode:",
+    "settings-invitewebsocket": "Lien discord.gg",
+    "settings-prfmMode": "Mode performance :",
     "settings-prfmMode-performance": "Performance",
-    "settings-prfmMode-battery": "Battery",
-    "settings-none": "None"
+    "settings-prfmMode-battery": "Batterie",
+    "settings-none": "Aucun"
 }

From 994ab5f5b05808a1070d07894eea92e5d1766ebb Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Sun, 12 Jun 2022 13:32:46 +0200
Subject: [PATCH 19/21] Add fallback to English US if language doesn't exist

---
 src/utils.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utils.ts b/src/utils.ts
index 280d97a..04fe9e2 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -130,7 +130,10 @@ export async function getLang(object: string) {
     if (language.length == 2) {
         language = language + "-" + language.toUpperCase();
     }
-    const langPath = path.join(__dirname, "../", "/assets/lang/" + language + ".json");
+    var langPath = path.join(__dirname, "../", "/assets/lang/" + language + ".json");
+    if (!fs.existsSync(langPath)) {
+        langPath = path.join(__dirname, "../", "/assets/lang/en-US.json");
+    }
     let rawdata = fs.readFileSync(langPath, "utf-8");
     let parsed = JSON.parse(rawdata);
     return parsed[object];

From 86c3636a19277733e07a25fe8585933a6e30240b Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Sun, 12 Jun 2022 20:59:59 +0200
Subject: [PATCH 20/21] Add setup translation loading

---
 package.json           |  1 +
 src/content/setup.html | 36 +++++++++++++++++++++++++++++-------
 src/ipc.ts             |  3 +++
 src/preload/bridge.ts  |  4 ++++
 src/preload/preload.ts | 10 +++++++---
 src/window.ts          |  7 +++++--
 6 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 6686ce4..9541221 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
   },
   "dependencies": {
     "electron-context-menu": "github:ArmCord/electron-context-menu",
+    "os-locale": "^6.0.2",
     "v8-compile-cache": "^2.3.0",
     "ws": "^8.6.0"
   },
diff --git a/src/content/setup.html b/src/content/setup.html
index 1783c8f..04b743c 100644
--- a/src/content/setup.html
+++ b/src/content/setup.html
@@ -12,12 +12,14 @@
     <body>
         <div class="container">
             <div id="warning" class="hidden">
-                <p>You appear to be offline. Please connect to the internet and restart ArmCord Setup.</p>
+                <p id="setup_offline">
+                    You appear to be offline. Please connect to the internet and restart ArmCord Setup.
+                </p>
             </div>
             <div id="setup">
                 <div id="logo" class="hidden"></div>
                 <div id="page1" class="hidden">
-                    <p>Select the type of setup you want to perform.</p>
+                    <p id="setup_question1">Select the type of setup you want to perform.</p>
                     <div id="buttons">
                         <button id="express" class="center">Express</button>
                         <button id="full" class="center">Full</button>
@@ -25,7 +27,7 @@
                 </div>
 
                 <div id="page2" class="hidden">
-                    <p class="text-center setup-ask">Choose your Discord channel/instance:</p>
+                    <p class="text-center setup-ask" id="setup_question2">Choose your Discord channel/instance:</p>
                     <div class="center">
                         <select name="channel" id="channel" class="dropdown-button">
                             <option value="stable">Stable</option>
@@ -34,7 +36,9 @@
                             <option value="foss">Fosscord</option>
                         </select>
                     </div>
-                    <p class="text-center setup-ask">Should ArmCord handle client mods installation?</p>
+                    <p class="text-center setup-ask" id="setup_question3">
+                        Should ArmCord handle client mods installation?
+                    </p>
                     <div class="center">
                         <select name="csp" id="csp" class="dropdown-button">
                             <option value="true">Yes</option>
@@ -47,7 +51,7 @@
                 </div>
 
                 <div id="page3" class="hidden">
-                    <p class="text-center setup-ask">Select a client mod you want to install:</p>
+                    <p class="text-center setup-ask" id="setup_question4">Select a client mod you want to install:</p>
                     <div class="center">
                         <select name="mod" id="mod" class="dropdown-button">
                             <option value="cumcord">Cumcord</option>
@@ -55,7 +59,7 @@
                             <option value="flicker">Flicker (Heavily WIP)</option>
                         </select>
                     </div>
-                    <p class="text-center">
+                    <p class="text-center" id="setup_question4_clientmodnotice">
                         Why not all of them? Having many client mods at the same time can cause issues. If you really
                         want to do it though, check our Discord ;)
                     </p>
@@ -65,7 +69,25 @@
                 </div>
             </div>
         </div>
-
+        <script>
+            async function loadLang() {
+                document.getElementById("next").innerHTML = await armcord.getLang("next");
+                document.getElementById("setup_offline").innerHTML = await armcord.getLang("setup_offline");
+                document.getElementById("setup_question1").innerHTML = await armcord.getLang("setup_question1");
+                document.getElementById("express").innerHTML = await armcord.getLang("setup_question1_answer1");
+                document.getElementById("full").innerHTML = await armcord.getLang("setup_question1_answer2");
+                document.getElementById("setup_question2").innerHTML = await armcord.getLang("setup_question2");
+                document.getElementById("setup_question3").innerHTML = await armcord.getLang("setup_question3");
+                document.getElementById("setup_question4").innerHTML = await armcord.getLang("setup_question4");
+                document.getElementById("setup_question4_clientmodnotice").innerHTML = await armcord.getLang(
+                    "setup_question4_clientmodnotice"
+                );
+                //select stuff1
+                document.getElementById("csp").options[1].text = await armcord.getLang("no");
+                document.getElementById("csp").options[0].text = await armcord.getLang("yes");
+            }
+            loadLang();
+        </script>
         <script>
             document.onload = function () {
                 ipcRenderer.send("win-unmaximize");
diff --git a/src/ipc.ts b/src/ipc.ts
index 830a2f1..1248891 100644
--- a/src/ipc.ts
+++ b/src/ipc.ts
@@ -60,6 +60,9 @@ export function registerIpc() {
     ipcMain.on("channel", async (event) => {
         event.returnValue = await getConfig("channel");
     });
+    ipcMain.handle("getLang", (event, toGet: string) => {
+        return getLang(toGet);
+    });
     ipcMain.on("clientmod", async (event, arg) => {
         event.returnValue = await getConfig("mods");
     });
diff --git a/src/preload/bridge.ts b/src/preload/bridge.ts
index 931e08e..3a458ce 100644
--- a/src/preload/bridge.ts
+++ b/src/preload/bridge.ts
@@ -17,6 +17,10 @@ contextBridge.exposeInMainWorld("armcord", {
     channel: ipcRenderer.sendSync("channel"),
     openTab: (number: number) => ipcRenderer.sendSync("openTab", number),
     setLang: (lang: string) => ipcRenderer.send("setLang", lang),
+    getLang: (toGet: string) =>
+        ipcRenderer.invoke("getLang", toGet).then((result) => {
+            return result;
+        }),
     version: ipcRenderer.sendSync("get-app-version", "app-version"),
     getDisplayMediaSelector: getDisplayMediaSelector,
     openSettingsWindow: () => ipcRenderer.send("openSettingsWindow")
diff --git a/src/preload/preload.ts b/src/preload/preload.ts
index 810f4a3..8b6ac48 100644
--- a/src/preload/preload.ts
+++ b/src/preload/preload.ts
@@ -9,9 +9,13 @@ import {ipcRenderer} from "electron";
 import {injectTabs} from "./tabs";
 var version = ipcRenderer.sendSync("get-app-version", "app-version");
 async function updateLang() {
-    addScript(`function getDiscordLang() {
-        {const _w=webpackChunkdiscord_app;let lang;_w.push([[Symbol()],{},e=>{for(const k in e.c){const m=e.c[k].exports;const mDef=m?.default&&m.__esModule?m.default:m;if(mDef?._chosenLocale&&!lang)lang=mDef}}]);_w.pop();window.armcord.setLang(lang._chosenLocale);return lang._chosenLocale;void 0}}
-        getDiscordLang();`);
+    if (window.location.href.indexOf("setup.html") > -1) {
+        console.log("Setup, skipping lang update");
+    } else {
+        addScript(`function getDiscordLang() {
+            {const _w=webpackChunkdiscord_app;let lang;_w.push([[Symbol()],{},e=>{for(const k in e.c){const m=e.c[k].exports;const mDef=m?.default&&m.__esModule?m.default:m;if(mDef?._chosenLocale&&!lang)lang=mDef}}]);_w.pop();window.armcord.setLang(lang._chosenLocale);return lang._chosenLocale;void 0}}
+            getDiscordLang();`);
+    }
 }
 declare global {
     interface Window {
diff --git a/src/window.ts b/src/window.ts
index 9b6acf2..6c5e2ac 100644
--- a/src/window.ts
+++ b/src/window.ts
@@ -4,9 +4,10 @@
 // I'm sorry for this mess but I'm not sure how to fix it.
 import {BrowserWindow, shell, app, ipcMain, dialog, clipboard} from "electron";
 import path from "path";
-import {checkIfConfigIsBroken, firstRun, getConfig, contentPath, isSetup, setConfig} from "./utils";
+import {checkIfConfigIsBroken, firstRun, getConfig, contentPath, isSetup, setConfig, setLang} from "./utils";
 import {registerIpc} from "./ipc";
 import startServer from "./socket";
+import {osLocale} from 'os-locale';
 import contextMenu from "electron-context-menu";
 import os from "os";
 export var icon: string;
@@ -85,10 +86,10 @@ async function doAfterDefiningTheWindow() {
     if ((await getConfig("inviteWebsocket")) == true) {
         startServer();
     }
-
     try {
         mainWindow.loadFile(contentPath);
         if (isSetup) {
+            await setLang(Intl.DateTimeFormat().resolvedOptions().locale)
             mainWindow.setSize(390, 470);
         }
     } catch (e) {
@@ -98,6 +99,7 @@ async function doAfterDefiningTheWindow() {
         console.log(process.platform);
         if (process.platform === "win32") {
             if (firstRun) {
+                // await setLang(Intl.DateTimeFormat().resolvedOptions().locale)
                 mainWindow.setSize(390, 470);
                 mainWindow.loadURL(`file://${__dirname}/content/setup.html`);
             } else {
@@ -105,6 +107,7 @@ async function doAfterDefiningTheWindow() {
             }
         } else {
             if (firstRun) {
+                await setLang(Intl.DateTimeFormat().resolvedOptions().locale)
                 mainWindow.setSize(390, 470);
                 mainWindow.loadURL(`file://${__dirname}/ts-out/content/setup.html`);
             } else {

From efc0cb4a3f1c6aa7bb15ee923748b2ea681b2cc3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Jun 2022 19:01:41 +0000
Subject: [PATCH 21/21] Update typescript requirement from ^4.6.3 to ^4.7.3

Updates the requirements on [typescript](https://github.com/Microsoft/TypeScript) to permit the latest version.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.3...v4.7.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9541221..35cec9f 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "electron-builder": "^23.0.3",
     "husky": "^8.0.1",
     "prettier": "^2.5.1",
-    "typescript": "^4.6.3"
+    "typescript": "^4.7.3"
   },
   "dependencies": {
     "electron-context-menu": "github:ArmCord/electron-context-menu",