Browse Source

Fix typos (#2705)

Found via `codespell -q 3 -S *.ts,./external`
luzpaz 2 years ago
parent
commit
04b57e4957

+ 1 - 1
.github/workflows/Windows-pack.yml

@@ -125,7 +125,7 @@ jobs:
         working-directory: build
         working-directory: build
         shell: pwsh
         shell: pwsh
         run: |
         run: |
-          # Chocolately made thier own package called cpack and its first in the path. This is a hack since we are only using cmake's cpack, doesnt seem to be required after a CI update
+          # Chocolately made their own package called cpack and its first in the path. This is a hack since we are only using cmake's cpack, doesn't seem to be required after a CI update
           #Remove-Item C:\ProgramData\Chocolatey\bin\cpack.exe
           #Remove-Item C:\ProgramData\Chocolatey\bin\cpack.exe
           If ($env:TYPE -eq "installer")
           If ($env:TYPE -eq "installer")
           {
           {

+ 1 - 1
README.md

@@ -379,7 +379,7 @@ After following all those steps above, `flameshot` will open without problems in
 
 
 ### Tray icon
 ### Tray icon
 
 
-**Note** that for the Flameshot icon to appear in your tray area, you should have a systray software installed. This is especially true for users who use minimal [window managers](https://wiki.archlinux.org/index.php/window_manager) such as [dwm](https://dwm.suckless.org/). In some [Desktop Environment](https://wiki.archlinux.org/index.php/Desktop_environment) installations (e.g Gnome), the systray might be missing and you can install an application or plugin (e.g [Gnome shell extension](https://extensions.gnome.org/extension/1503/tray-icons/)) to add the systray to your setup. It has been [reported](https://github.com/flameshot-org/flameshot/issues/1009#issuecomment-700781081)) that icon of some softwares, including Flameshot, does not show in [gnome-shell-extension-appindicator](https://github.com/ubuntu/gnome-shell-extension-appindicator).
+**Note** that for the Flameshot icon to appear in your tray area, you should have a systray software installed. This is especially true for users who use minimal [window managers](https://wiki.archlinux.org/index.php/window_manager) such as [dwm](https://dwm.suckless.org/). In some [Desktop Environment](https://wiki.archlinux.org/index.php/Desktop_environment) installations (e.g Gnome), the systray might be missing and you can install an application or plugin (e.g [Gnome shell extension](https://extensions.gnome.org/extension/1503/tray-icons/)) to add the systray to your setup. It has been [reported](https://github.com/flameshot-org/flameshot/issues/1009#issuecomment-700781081)) that icon of some software, including Flameshot, does not show in [gnome-shell-extension-appindicator](https://github.com/ubuntu/gnome-shell-extension-appindicator).
 
 
 
 
 Alternatively, in case you don't want to have a systray, you can always call Flameshot from the terminal. See [Usage section](#usage).
 Alternatively, in case you don't want to have a systray, you can always call Flameshot from the terminal. See [Usage section](#usage).

+ 1 - 1
docs/ReleaseNotes_11.0.md

@@ -29,7 +29,7 @@ We will be in beta for 1-2 weeks depending on what kind of issues are found and
 
 
 <p align=center><img src="images/monochrome.png" width=50%> </p>
 <p align=center><img src="images/monochrome.png" width=50%> </p>
 
 
-- The sidebar now shows the hexidecimal color value when the color picker is used:
+- The sidebar now shows the hexadecimal color value when the color picker is used:
 <p align=center><img src="images/hex.png" width=25%> </p>
 <p align=center><img src="images/hex.png" width=25%> </p>
 
 
 - The about screen lists system information and allows you to copy this for easy access in bug submission forms. 
 - The about screen lists system information and allows you to copy this for easy access in bug submission forms. 

+ 1 - 1
docs/ReleaseNotes_12.0.md

@@ -66,7 +66,7 @@ This is the beta for the version 12.0 release. We will be in beta for about a we
 - Fix alignment bug and applied many clang format warnings by @borgmanJeremy in https://github.com/flameshot-org/flameshot/pull/2448
 - Fix alignment bug and applied many clang format warnings by @borgmanJeremy in https://github.com/flameshot-org/flameshot/pull/2448
 - fix the --print-geometry for zsh by @mmahmoudian in https://github.com/flameshot-org/flameshot/pull/2437
 - fix the --print-geometry for zsh by @mmahmoudian in https://github.com/flameshot-org/flameshot/pull/2437
 - fix bug on macos with save dialog by @borgmanJeremy in https://github.com/flameshot-org/flameshot/pull/2379
 - fix bug on macos with save dialog by @borgmanJeremy in https://github.com/flameshot-org/flameshot/pull/2379
-- allow numpad numers to resize and fix text artifacting on large resize by @borgmanJeremy in https://github.com/flameshot-org/flameshot/pull/2386
+- allow numpad numbers to resize and fix text artifacting on large resize by @borgmanJeremy in https://github.com/flameshot-org/flameshot/pull/2386
 - Zooming in/out happens at different speed by @AndreaMarangoni in https://github.com/flameshot-org/flameshot/pull/2378
 - Zooming in/out happens at different speed by @AndreaMarangoni in https://github.com/flameshot-org/flameshot/pull/2378
 - fix: arrow tool glitches by @UnkwUsr in https://github.com/flameshot-org/flameshot/pull/2395
 - fix: arrow tool glitches by @UnkwUsr in https://github.com/flameshot-org/flameshot/pull/2395
 - Fix double click by @borgmanJeremy in https://github.com/flameshot-org/flameshot/pull/2432
 - Fix double click by @borgmanJeremy in https://github.com/flameshot-org/flameshot/pull/2432

+ 1 - 1
packaging/macos/update_package.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-echo "Change the permision of .dmg file"
+echo "Change the permission of .dmg file"
 hdiutil convert "flameshot.dmg" -format UDRW -o "flameshot_rw.dmg"
 hdiutil convert "flameshot.dmg" -format UDRW -o "flameshot_rw.dmg"
 
 
 echo "Mount it and save the device"
 echo "Mount it and save the device"

+ 2 - 2
scripts/upload_services/transferwee.py

@@ -115,7 +115,7 @@ def download_url(url: str) -> str:
 def _file_unquote(file: str) -> str:
 def _file_unquote(file: str) -> str:
     """Given a URL encoded file unquote it.
     """Given a URL encoded file unquote it.
 
 
-    All occurences of `\', `/' and `../' will be ignored to avoid possible
+    All occurrences of `\', `/' and `../' will be ignored to avoid possible
     directory traversals.
     directory traversals.
     """
     """
     return urllib.parse.unquote(file).replace('../', '').replace('/', '').replace('\\', '')
     return urllib.parse.unquote(file).replace('../', '').replace('/', '').replace('\\', '')
@@ -300,7 +300,7 @@ def upload(files: List[str], message: str = '', sender: str = None,
     Also accepts optional parameters:
     Also accepts optional parameters:
      - `message': message used as a description of the transfer
      - `message': message used as a description of the transfer
      - `sender': email address used to receive an ACK if the upload is
      - `sender': email address used to receive an ACK if the upload is
-                 successfull. For every download by the recipients an email
+                 successful. For every download by the recipients an email
                  will be also sent
                  will be also sent
      - `recipients': list of email addresses of recipients. When the upload
      - `recipients': list of email addresses of recipients. When the upload
                      succeed every recipients will receive an email with a link
                      succeed every recipients will receive an email with a link

+ 1 - 1
src/utils/systemnotification.cpp

@@ -14,7 +14,7 @@
 
 
 // work-around for snap, which cannot install icons into
 // work-around for snap, which cannot install icons into
 // the system folder, so instead the absolute path to the
 // the system folder, so instead the absolute path to the
-// icon (saved somwhere in /snap/flameshot/...) is passed
+// icon (saved somewhere in /snap/flameshot/...) is passed
 #ifndef FLAMESHOT_ICON
 #ifndef FLAMESHOT_ICON
 #define FLAMESHOT_ICON "flameshot"
 #define FLAMESHOT_ICON "flameshot"
 #endif
 #endif