Skip to content

Commit

Permalink
Fix many typos
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Seiler <[email protected]>
  • Loading branch information
goggle authored and raksooo committed Mar 27, 2023
1 parent ddbf915 commit a7f820a
Show file tree
Hide file tree
Showing 56 changed files with 84 additions and 84 deletions.
12 changes: 6 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ This release is identical to 2021.5-beta2 except that it has translations for ne
- Fix incorrect location and connection status while disconnecting and incorrect location in the
beginning while connecting in the desktop app.
- Improve responsiveness of the controls and status text in the main view in the desktop app.
- Read macOS scrollbar visibility settings to decide wheter or not the scrollbars should hide when
- Read macOS scrollbar visibility settings to decide whether or not the scrollbars should hide when
not scrolling.
- Fix IPv6 connections to WireGuard servers by not dropping select neighbor advertisements and
solicitations.
Expand Down Expand Up @@ -1949,7 +1949,7 @@ This release is identical to 2019.8-beta1
the Wi-Fi calling via iPhone when both devices are on the same network.
- Allow incoming DHCPv4 requests and outgoing responses if allow local network is enabled. Enables
being a DHCPv4 server.
- Add GUI translations for Italian, Japanese, Dutch, Portugese, Russian and Turkish.
- Add GUI translations for Italian, Japanese, Dutch, Portuguese, Russian and Turkish.
- Add missing GUI translations for Czech Republic, USA and UK in the select location view.
- Add translations for the current location displayed on the main screen in the GUI.
- Allow a subset of NDP (Router solicitation, router advertisement and redirects) in the firewall.
Expand All @@ -1973,7 +1973,7 @@ This release is identical to 2019.8-beta1
- Stop allowing the wrong IPv6 net fe02::/16 in the firewall when allow local network was enabled.
Instead allow the correct multicast nets ff02::/16 and ff05::/16.
- Fix the regression that allowed to get past the login screen using the invalid account token.
- Fix the GUI crash caused by a derefence of the already released remote object in Electron.
- Fix the GUI crash caused by a dereference of the already released remote object in Electron.

#### macOS
- Raise max number of open files for the daemon to 1024. Should prevent threads from panicking.
Expand Down Expand Up @@ -2361,7 +2361,7 @@ This release is identical to 2018.2-beta3
- Account tokens are now required to have at least ten digits.

#### macOS
- Rename directores for settings, logs and cache from `mullvad-daemon` to `mullvad-vpn`.
- Rename directories for settings, logs and cache from `mullvad-daemon` to `mullvad-vpn`.

#### Windows
- Use local user directory to store system service settings and GUI electron cache, instead of the
Expand Down Expand Up @@ -2527,8 +2527,8 @@ This release is identical to 2018.2-beta3
- The tray icon now indicates whether the app is allowing traffic outside the tunnel or not. If the
app blocks traffic because the tunnel is not connected the tray icon will indicate this with a
green lock with a red dot.
- While connecting, a message telling the user that internet accesss is blocked is shown.
- Default to selecting servers in Sweden to increase the likelyhood of a fast and stable connection.
- While connecting, a message telling the user that internet access is blocked is shown.
- Default to selecting servers in Sweden to increase the likelihood of a fast and stable connection.
- Scrollbars will automatically hide when not scrolling.

### Removed
Expand Down
4 changes: 2 additions & 2 deletions android/BuildInstructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Run the following command to trigger a full debug build:

### Release build
1. Configure a signing key by following [these instructions](#configure-signing-key).
2. Run the following command after setting the `ANDROID_CREDENTIALS_DIR` enviroment variable to the
2. Run the following command after setting the `ANDROID_CREDENTIALS_DIR` environment variable to the
directory configured in step 1:
```bash
../building/containerized-build.sh android --app-bundle
Expand All @@ -32,7 +32,7 @@ therefore not recommended.

*: A container is still used to build `wireguard-go`.

### Setup build enviroment
### Setup build environment
These steps explain how to manually setup the build environment on a Linux system.

#### 1. Install `podman`
Expand Down
2 changes: 1 addition & 1 deletion audits/2020-06-12-cure53.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ For full transparency we insist to publish both versions.

The reports are also available directly in this repository:
* Final version: [pentest-report_mullvad_2020_v2.pdf](./pentest-report_mullvad_2020_v2.pdf)
* Inital version: [pentest-report_mullvad_2020_v1.pdf](./pentest-report_mullvad_2020_v1.pdf)
* Initial version: [pentest-report_mullvad_2020_v1.pdf](./pentest-report_mullvad_2020_v1.pdf)

## Overview of findings

Expand Down
2 changes: 1 addition & 1 deletion build-windows-modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function get_solution_output_path {
"x86") echo "$solution_root/bin/Win32-$build_mode";;
"x64") echo "$solution_root/bin/x64-$build_mode";;
*)
echo "Unkown build target: $build_target"
echo "Unknown build target: $build_target"
exit 1
;;
esac
Expand Down
2 changes: 1 addition & 1 deletion building/build-and-publish-container-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ fi

cp "$tmp_signature_dir/signature-2" "$signature_dir/"

log_header "Commiting container sigstore signatures"
log_header "Committing container sigstore signatures"
git add "$signature_dir"
GPG_TTY=$(tty) git commit -S -m "Add container signature for $container_name:$tag"

Expand Down
2 changes: 1 addition & 1 deletion docs/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ On Linux, connectivity is inferred by checking if there exists a route to a publ
Currently the Mullvad API IP is used, but the actual IP does not matter as long as it's not a local
one. This is done via Netlink and the route is queried via the exclusion firewall mark - otherwise,
when a tunnel is connected, the address would always be routable as it'd be routed through the
tunnel interface. As such, the offline monitor is somewhat coupled to routing and split tunelling on
tunnel interface. As such, the offline monitor is somewhat coupled to routing and split tunnelling on
Linux.

#### macOS
Expand Down
2 changes: 1 addition & 1 deletion docs/security.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ The firewall allows traffic to the API regardless of tunnel state, so the daemon
keys, fetch account data, etc. In the [Connected] state, API traffic is only allowed inside the tunnel.
For the other states, API traffic will bypass the firewall. On Windows, only the Mullvad service and
problem report tool are able to communicate with the API in any of the blocking states. On macOS and
Linux all applications runnning as root are able to reach the API in blocking states.
Linux all applications running as root are able to reach the API in blocking states.

### Disconnected

Expand Down
2 changes: 1 addition & 1 deletion graphics/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ If `icon.svg` is changed. You need to run the following to generate new assets:
### `icon-square.svg`

This is the regular mole but instead of being placed in a blue circle the entire background is just blue.
The mole is placed slighty to the right compared to `icon.svg` to appear more centered. And the mole
The mole is placed slightly to the right compared to `icon.svg` to appear more centered. And the mole
is a little bit smaller so it fits better when corners are rounded off during icon creation.

#### Desktop
Expand Down
2 changes: 1 addition & 1 deletion gui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions gui/locales/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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 fais 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 ""
Expand Down
4 changes: 2 additions & 2 deletions gui/scripts/build-logo-icons.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion gui/scripts/extract-geo-data.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

# 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"
}

Expand Down
2 changes: 1 addition & 1 deletion gui/scripts/integrate-into-app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gui/src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions gui/src/main/linux-desktop-entry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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(' ', '');
Expand Down
2 changes: 1 addition & 1 deletion gui/src/main/linux-split-tunneling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gui/src/main/window-controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion gui/src/main/windows-split-tunneling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion gui/src/renderer/components/MacOsScrollbarDetection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion gui/src/renderer/components/SplitTunnelingSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion gui/src/renderer/components/TransitionContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions gui/src/renderer/lib/ip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions gui/src/shared/gui-settings-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;

Expand Down
2 changes: 1 addition & 1 deletion gui/standalone-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions ios/MullvadVPN/Classes/ConsolidatedApplicationLog.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import Foundation

private let kLogMaxReadBytes: UInt64 = 128 * 1024
private let kLogDelimeter = "===================="
private let kLogDelimiter = "===================="
private let kRedactedPlaceholder = "[REDACTED]"
private let kRedactedAccountPlaceholder = "[REDACTED ACCOUNT NUMBER]"
private let kRedactedContainerPlaceholder = "[REDACTED CONTAINER PATH]"
Expand Down Expand Up @@ -81,9 +81,9 @@ class ConsolidatedApplicationLog: TextOutputStreamable {
print("", to: &stream)

for attachment in logs {
print(kLogDelimeter, to: &stream)
print(kLogDelimiter, to: &stream)
print(attachment.label, to: &stream)
print(kLogDelimeter, to: &stream)
print(kLogDelimiter, to: &stream)
print(attachment.content, to: &stream)
print("", to: &stream)
}
Expand Down
8 changes: 4 additions & 4 deletions ios/MullvadVPN/Coordinators/App/ApplicationRouter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ enum AppRouteGroup: Comparable, Equatable, Hashable {
case selectLocation

/**
Setings group.
Settings group.
*/
case settings

Expand Down Expand Up @@ -124,7 +124,7 @@ struct PendingRoute: Equatable {
}

/**
Enum type describing an attempt to fullfill the route presentation request.
Enum type describing an attempt to fulfill the route presentation request.
**/
enum PendingPresentationResult {
/**
Expand Down Expand Up @@ -174,7 +174,7 @@ enum PendingDismissalResult {
}

/**
Enum descibing operation over the route.
Enum describing operation over the route.
*/
enum RouteOperation: Equatable {
/**
Expand Down Expand Up @@ -384,7 +384,7 @@ final class ApplicationRouter {
completion: @escaping (PendingPresentationResult) -> Void
) {
/**
Pass sub-route for routes suppporting sub-navigation.
Pass sub-route for routes supporting sub-navigation.
*/
if route.supportsSubNavigation, modalStack.contains(route.routeGroup),
var presentedRoute = presentedRoutes[route.routeGroup]?.first
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ protocol NotificationProviderProtocol {
/// produced by them.
var identifier: String { get }

/// Tell notifcation manager to update the associated notification.
/// Tell notification manager to update the associated notification.
func invalidate()
}
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class LoginViewController: UIViewController, RootContainment {
case .failure, .default:
// Disable "Create account" button on iPad as user types in the account token,
// however leave it enabled on iPhone to avoid confusion to why it's being disabled
// since it's likely overlayed by keyboard.
// since it's likely overlaid by keyboard.
if case .pad = traitCollection.userInterfaceIdiom {
isEnabled = contentView.accountInputGroup.textField.text?.isEmpty ?? true
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ struct PreferencesViewModel: Equatable {

/// Sanitize custom DNS entries.
mutating func sanitizeCustomDNSEntries() {
// Santize DNS domains, drop invalid entries.
// Sanitize DNS domains, drop invalid entries.
customDNSDomains = customDNSDomains.compactMap { entry in
if let canonicalAddress = AnyIPAddress(entry.address) {
var newEntry = entry
Expand Down
2 changes: 1 addition & 1 deletion ios/PacketTunnel/TunnelMonitor/Pinger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ final class Pinger {
throw Error.malformedResponse(.checksumMismatch(clientChecksum, serverChecksum))
}

// Ensure endianess before returning ICMP packet to delegate.
// Ensure endianness before returning ICMP packet to delegate.
var icmpHeader = icmpHeaderPointer.pointee
icmpHeader.identifier = icmpHeader.identifier.bigEndian
icmpHeader.sequenceNumber = icmpHeader.sequenceNumber.bigEndian
Expand Down
Loading

0 comments on commit a7f820a

Please sign in to comment.