summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/README.md2
-rw-r--r--gui/locales/messages.pot4
-rwxr-xr-xgui/scripts/build-logo-icons.sh4
-rwxr-xr-xgui/scripts/extract-geo-data.py2
-rw-r--r--gui/scripts/integrate-into-app.py2
-rw-r--r--gui/src/main/index.ts2
-rw-r--r--gui/src/main/linux-desktop-entry.ts4
-rw-r--r--gui/src/main/linux-split-tunneling.ts2
-rw-r--r--gui/src/main/window-controller.ts2
-rw-r--r--gui/src/main/windows-split-tunneling.ts2
-rw-r--r--gui/src/renderer/components/MacOsScrollbarDetection.tsx2
-rw-r--r--gui/src/renderer/components/SplitTunnelingSettings.tsx2
-rw-r--r--gui/src/renderer/components/TransitionContainer.tsx2
-rw-r--r--gui/src/renderer/components/select-location/select-location-hooks.ts2
-rw-r--r--gui/src/renderer/lib/ip.ts4
-rw-r--r--gui/src/shared/gui-settings-state.ts4
-rw-r--r--gui/standalone-tests.ts2
17 files changed, 22 insertions, 22 deletions
diff --git a/gui/README.md b/gui/README.md
index 30bd14e92a..224f8ed54f 100644
--- a/gui/README.md
+++ b/gui/README.md
@@ -18,7 +18,7 @@ The app has unit tests and integration tests located in test/:
- **test/e2e/installed** (`npm run e2e:installed <tests to run>`): Tests running against the app
at its install path (See [Standalone test executable](#standalone-test-executable) for more info).
- **test/e2e/installed/state-dependent** (`npm run e2e:installed state-dependent`): Tests
- requireing the daemon to be set into a specific state first.
+ requiring the daemon to be set into a specific state first.
### Standalone test executable
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index 74a69734fd..e30f538c05 100644
--- a/gui/locales/messages.pot
+++ b/gui/locales/messages.pot
@@ -1103,12 +1103,12 @@ msgstr ""
#. This error message is shown if the user tries to launch an app that
#. doesn't exist.
-#. This error message is shown if an application failes during startup.
+#. This error message is shown if an application fails during startup.
msgctxt "split-tunneling-view"
msgid "Please try again or send a problem report."
msgstr ""
-#. Error message showed in a dialog when an application failes to launch.
+#. Error message showed in a dialog when an application fails to launch.
msgctxt "split-tunneling-view"
msgid "Unable to launch selection. %(detailedErrorMessage)s"
msgstr ""
diff --git a/gui/scripts/build-logo-icons.sh b/gui/scripts/build-logo-icons.sh
index 7002d565ee..a1e30dd18b 100755
--- a/gui/scripts/build-logo-icons.sh
+++ b/gui/scripts/build-logo-icons.sh
@@ -4,13 +4,13 @@
# first if the source SVGs have been updated. More info about how to update them can be found in
# the readme.
#
-# Icon guidlines for macOS:
+# Icon guidelines for macOS:
# https://developer.apple.com/design/human-interface-guidelines/macos/icons-and-images/app-icon/
#
# Icon templates for macOS:
# https://developer.apple.com/design/resources/
#
-# Icon guidlines for Windows:
+# Icon guidelines for Windows:
# https://docs.microsoft.com/en-us/windows/uwp/design/style/app-icons-and-logos#target-size-app-icon-assets
# https://docs.microsoft.com/en-us/windows/win32/uxguide/vis-icons
diff --git a/gui/scripts/extract-geo-data.py b/gui/scripts/extract-geo-data.py
index 5e9427bd35..7c6479f2a8 100755
--- a/gui/scripts/extract-geo-data.py
+++ b/gui/scripts/extract-geo-data.py
@@ -35,7 +35,7 @@ RELAY_LOCATIONS_PO_FILENAME = "relay-locations.po"
# Custom locale mapping between the identifiers in the app and Natural Earth datasets
LOCALE_MAPPING = {
- # "zh" in Natural Earth Data referes to simplified chinese
+ # "zh" in Natural Earth Data refers to simplified chinese
"zh-CN": "zh"
}
diff --git a/gui/scripts/integrate-into-app.py b/gui/scripts/integrate-into-app.py
index 86eeff63fb..9cba7e8dd2 100644
--- a/gui/scripts/integrate-into-app.py
+++ b/gui/scripts/integrate-into-app.py
@@ -87,7 +87,7 @@ def merge_gettext_catalogues(existing_catalogue_file, generated_catalogue_file):
"--output-file", existing_catalogue_file,
- # ensure that the first occurence takes precedence in merge conflict
+ # ensure that the first occurrence takes precedence in merge conflict
"--use-first",
# sort by msgid
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>;
diff --git a/gui/standalone-tests.ts b/gui/standalone-tests.ts
index 5df16718da..d7aae0a415 100644
--- a/gui/standalone-tests.ts
+++ b/gui/standalone-tests.ts
@@ -3,7 +3,7 @@ import fs from 'fs';
import os from 'os';
import path from 'path';
-// This file is bundled into a standalone executable able to run e2e tests agains an installed
+// This file is bundled into a standalone executable able to run e2e tests against an installed
// version of the app. This file is the entrypoint in the executable and extracts the required
// assets and performs the tests. More info in /gui/README.md.
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.