Skip to content

Commit

Permalink
Merge pull request #8195 from vEnhance/patch-1
Browse files Browse the repository at this point in the history
Fix some spelling errors
  • Loading branch information
The-Compiler committed May 10, 2024
2 parents dbcfab4 + 350f942 commit 81de20d
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion doc/changelog.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3673,7 +3673,7 @@ Fixed
- Continuing a search after clearing it now works correctly.
- The tabbar and completion should now be more consistently and correctly
styled with various system styles.
- Applying styiles in `qt5ct` now shouldn't crash anymore.
- Applying styles in `qt5ct` now shouldn't crash anymore.
- The validation for colors in stylesheets is now less strict,
allowing for all valid Qt values.
- `data:` URLs now aren't added to the history anymore.
Expand Down
2 changes: 1 addition & 1 deletion doc/faq.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ allowing him to work part-time on qutebrowser. If you keep your donation level
for long enough, you can get some qutebrowser stickers!

Why GitHub Sponsors?::
GitHub Sponsors is a crowdfundign platform nicely integrated with
GitHub Sponsors is a crowdfunding platform nicely integrated with
qutebrowser's existing GitHub page and a better offering than alternatives such
as Patreon or Liberapay.
+
Expand Down
2 changes: 1 addition & 1 deletion misc/nsis/install.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ var KeepReg
; Functions
Function CheckInstallation
; if there's an installed version, uninstall it first (I chose not to start the uninstaller silently, so that user sees what failed)
; if both per-user and per-machine versions are installed, unistall the one that matches $MultiUser.InstallMode
; if both per-user and per-machine versions are installed, uninstall the one that matches $MultiUser.InstallMode
StrCpy $0 ""
${if} $HasCurrentModeInstallation = 1
StrCpy $0 "$MultiUser.InstallMode"
Expand Down
2 changes: 1 addition & 1 deletion qutebrowser/browser/qtnetworkdownloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def _do_die(self):
log.downloads.exception("Error while closing file object")

if pos == 0:
# Emtpy remaining file
# Empty remaining file
filename = self._get_open_filename()
log.downloads.debug(f"Removing empty file at {filename}")
try:
Expand Down
2 changes: 1 addition & 1 deletion qutebrowser/misc/elf.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def _find_versions(data: bytes) -> Versions:
# Here it gets even more crazy: Sometimes, we don't have the full UA in one piece
# in the string table somehow (?!). However, Qt 6.2 added a separate
# qWebEngineChromiumVersion(), with PyQt wrappers following later. And *that*
# apperently stores the full version in the string table separately from the UA.
# apparently stores the full version in the string table separately from the UA.
# As we clearly didn't have enough crazy heuristics yet so far, let's hunt for it!

# We first get the partial Chromium version from the UA:
Expand Down
2 changes: 1 addition & 1 deletion qutebrowser/misc/pakjoy.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def _find_webengine_resources() -> pathlib.Path:
# I'm not sure how to arrive at this path without hardcoding it
# ourselves. importlib_resources("PyQt6.Qt6") can serve as a
# replacement for the qtutils bit but it doesn't seem to help find the
# actuall Resources folder.
# actual Resources folder.
candidates.append(
qt_data_path / "lib" / "QtWebEngineCore.framework" / "Resources"
)
Expand Down
2 changes: 1 addition & 1 deletion qutebrowser/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ def expand_windows_drive(path: str) -> str:
path: The path to expand.
"""
# Usually, "E:" on Windows refers to the current working directory on drive
# E:\. The correct way to specifify drive E: is "E:\", but most users
# E:\. The correct way to specify drive E: is "E:\", but most users
# probably don't use the "multiple working directories" feature and expect
# "E:" and "E:\" to be equal.
if re.fullmatch(r'[A-Z]:', path, re.IGNORECASE):
Expand Down
2 changes: 1 addition & 1 deletion tests/end2end/features/prompts.feature
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ Feature: Prompts
}

@qtwebengine_skip
Scenario: Cancellling webpage authentication with QtWebKit
Scenario: Cancelling webpage authentication with QtWebKit
When I open basic-auth/user6/password6 without waiting
And I wait for a prompt
And I run :mode-leave
Expand Down

0 comments on commit 81de20d

Please sign in to comment.