11 files changed, 14 insertions, 14 deletions
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 1e8214a277..c30665ffc5 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -341,7 +341,7 @@ class ApplicationMain
     }
 
     log.info('Disposable logging outputs disposed');
-    log.info('Quit preperations finished');
+    log.info('Quit preparations finished');
   }
 
   private detectLocale(): string {
diff --git a/gui/src/main/linux-desktop-entry.ts b/gui/src/main/linux-desktop-entry.ts
index acac772ce5..d6c11c7943 100644
--- a/gui/src/main/linux-desktop-entry.ts
+++ b/gui/src/main/linux-desktop-entry.ts
@@ -64,7 +64,7 @@ function parseDesktopEntry(
     { absolutepath } as Partial<DesktopEntry>,
   );
 
-  // If the dekstop entry is lacking some of the required keys it's invalid
+  // If the desktop entry is lacking some of the required keys it's invalid
   if (isDesktopEntry(parsed)) {
     return parsed;
   } else {
@@ -78,7 +78,7 @@ function parseDesktopEntryLine(
   line: string,
   locale?: string,
 ): Partial<DesktopEntry> {
-  // Comments start with `#` and keys and values are seperated by a `=`
+  // Comments start with `#` and keys and values are separated by a `=`
   if (!line.startsWith('#') && line.includes('=')) {
     const firstEqualSign = line.indexOf('=');
     const keyWithLocale = line.slice(0, firstEqualSign).replace(' ', '');
diff --git a/gui/src/main/linux-split-tunneling.ts b/gui/src/main/linux-split-tunneling.ts
index c8e5dd527a..9a93054590 100644
--- a/gui/src/main/linux-split-tunneling.ts
+++ b/gui/src/main/linux-split-tunneling.ts
@@ -71,7 +71,7 @@ export async function launchApplication(
       if (code === 1) {
         resolve({
           error:
-            // TRANSLATORS: This error message is shown if an application failes during startup.
+            // TRANSLATORS: This error message is shown if an application fails during startup.
             messages.pgettext('split-tunneling-view', 'Please try again or send a problem report.'),
         });
       } else {
diff --git a/gui/src/main/window-controller.ts b/gui/src/main/window-controller.ts
index 5cd0857bc4..830f6fd1af 100644
--- a/gui/src/main/window-controller.ts
+++ b/gui/src/main/window-controller.ts
@@ -134,7 +134,7 @@ class AttachedToTrayWindowPositioning implements IWindowPositioning {
 
   private getWindowMargin() {
     if (isWindows11OrNewer()) {
-      // Tray applications are positioned aproximately 10px from the tray in Windows 11.
+      // Tray applications are positioned approximately 10px from the tray in Windows 11.
       return 10;
     } else if (process.platform === 'darwin') {
       return 5;
diff --git a/gui/src/main/windows-split-tunneling.ts b/gui/src/main/windows-split-tunneling.ts
index fc6e5d87d9..844b74b77b 100644
--- a/gui/src/main/windows-split-tunneling.ts
+++ b/gui/src/main/windows-split-tunneling.ts
@@ -127,7 +127,7 @@ export function removeApplicationFromCache(application: IWindowsApplication): vo
 }
 
 // Reads the start-menu directories and adds all shortcuts, targeting applications using networking,
-// to the shortcuts cache. Wheter or not an application use networking is determined by checking for
+// to the shortcuts cache. Whether or not an application use networking is determined by checking for
 // "WS2_32.dll" in it's imports.
 async function updateShortcutCache(): Promise<void> {
   const links = await Promise.all(APPLICATION_PATHS.map(findAllLinks));
diff --git a/gui/src/renderer/components/MacOsScrollbarDetection.tsx b/gui/src/renderer/components/MacOsScrollbarDetection.tsx
index 79910c3cdd..de636827bd 100644
--- a/gui/src/renderer/components/MacOsScrollbarDetection.tsx
+++ b/gui/src/renderer/components/MacOsScrollbarDetection.tsx
@@ -15,7 +15,7 @@ const StyledContainer = styled.div({
   height: '0px',
 });
 
-// This component is used to determine wheter scrollbars should be always visible or only visible
+// This component is used to determine whether scrollbars should be always visible or only visible
 // while scrolling when the system setting for this is set to "Automatic". This is detected by
 // testing if any space is taken by a scrollbar.
 export default function MacOsScrollbarDetection() {
diff --git a/gui/src/renderer/components/SplitTunnelingSettings.tsx b/gui/src/renderer/components/SplitTunnelingSettings.tsx
index bf3b7f58b8..c8242cdd88 100644
--- a/gui/src/renderer/components/SplitTunnelingSettings.tsx
+++ b/gui/src/renderer/components/SplitTunnelingSettings.tsx
@@ -184,7 +184,7 @@ function LinuxSplitTunnelingSettings(props: IPlatformSplitTunnelingSettingsProps
         type={ModalAlertType.warning}
         iconColor={colors.red}
         message={sprintf(
-          // TRANSLATORS: Error message showed in a dialog when an application failes to launch.
+          // TRANSLATORS: Error message showed in a dialog when an application fails to launch.
           messages.pgettext(
             'split-tunneling-view',
             'Unable to launch selection. %(detailedErrorMessage)s',
diff --git a/gui/src/renderer/components/TransitionContainer.tsx b/gui/src/renderer/components/TransitionContainer.tsx
index ce9900927f..53f149ba6a 100644
--- a/gui/src/renderer/components/TransitionContainer.tsx
+++ b/gui/src/renderer/components/TransitionContainer.tsx
@@ -180,7 +180,7 @@ export default class TransitionContainer extends React.Component<IProps, IState>
         this.state.currentItem.view.props.routePath === candidate.props.routePath
       ) {
         // There's no transition in progress and the newest candidate has the same path as the
-        // current. In this sitation the app should just remain in the same view.
+        // current. In this situation the app should just remain in the same view.
         this.setState(
           {
             currentItem: TransitionContainer.makeItem(this.props),
diff --git a/gui/src/renderer/components/select-location/select-location-hooks.ts b/gui/src/renderer/components/select-location/select-location-hooks.ts
index 0cefdecb4f..188a1c9aef 100644
--- a/gui/src/renderer/components/select-location/select-location-hooks.ts
+++ b/gui/src/renderer/components/select-location/select-location-hooks.ts
@@ -24,7 +24,7 @@ export function useOnSelectExitLocation() {
   return useCallback(
     async (relayLocation: LocationSelection<undefined>) => {
       if (relayLocation.value === undefined) {
-        throw new Error('relayLocation should never be undefiend');
+        throw new Error('relayLocation should never be undefined');
       }
 
       history.pop();
diff --git a/gui/src/renderer/lib/ip.ts b/gui/src/renderer/lib/ip.ts
index 369d66a479..2f68b68d78 100644
--- a/gui/src/renderer/lib/ip.ts
+++ b/gui/src/renderer/lib/ip.ts
@@ -25,7 +25,7 @@ export abstract class IpAddress<G extends number[]> {
 export abstract class IpRange<G extends number[]> {
   public constructor(public readonly groups: G, public readonly prefixSize: number) {}
 
-  // Returns whether or not this subnet includes the privided IP
+  // Returns whether or not this subnet includes the provided IP
   protected includes<T extends IpAddress<G>>(ip: T, groupSize: number): boolean {
     return IpRange.match(groupSize, ip.groups, [this.groups, this.prefixSize]);
   }
@@ -159,7 +159,7 @@ export class IPv6Address extends IpAddress<IPv6Groups> {
     return localSubnets.some((subnet) => subnet.includes(this));
   }
 
-  // Parses IPv6 addresses where the groups are seperated by ':' and supports shortened addresses.
+  // Parses IPv6 addresses where the groups are separated by ':' and supports shortened addresses.
   public static fromString(ip: string): IPv6Address {
     try {
       const groups = IPv6Address.groupsFromString(ip);
diff --git a/gui/src/shared/gui-settings-state.ts b/gui/src/shared/gui-settings-state.ts
index e1286101b7..d09421c92a 100644
--- a/gui/src/shared/gui-settings-state.ts
+++ b/gui/src/shared/gui-settings-state.ts
@@ -21,10 +21,10 @@ export interface IGuiSettingsState {
   // Tells the app to hide the main window on start.
   startMinimized: boolean;
 
-  // Tells the app wheter or not it should act as a window or a context menu.
+  // Tells the app whether or not it should act as a window or a context menu.
   unpinnedWindow: boolean;
 
-  // Conains a list of filepaths to applications added to the list of applications, in the split
+  // Contains a list of filepaths to applications added to the list of applications, in the split
   // tunneling view, by the user.
   browsedForSplitTunnelingApplications: Array<string>;