Skip to content

Commit

Permalink
Verify spelling fixes pass check-spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
jsoref committed Sep 17, 2021
2 parents d234b5c + 3f808d1 commit dc7338c
Show file tree
Hide file tree
Showing 103 changed files with 701 additions and 676 deletions.
4 changes: 2 additions & 2 deletions .craft.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Branch = master
ShallowClone = False

# Variables defined here override the default value
# The variable names are casesensitive
# The variable names are case-sensitive
[Variables]
#Values need to be overwritten to create a chache
UseCache = True
Expand All @@ -17,7 +17,7 @@ QtVersion = 5.12.11
CachePatchLvl = 1

# set WORKSPACE to cwd, override on ci
# with legacy fallbac APPVEYOR_BUILD_FOLDER
# with legacy fallback APPVEYOR_BUILD_FOLDER
WORKSPACE = ${Variables:APPVEYOR_BUILD_FOLDER}
APPVEYOR_BUILD_FOLDER = ${Variables:Root}
CiBuild = True
Expand Down
80 changes: 40 additions & 40 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We are also available on [IRC][irc].
information we need to track down the issue.
* __SECURITY__: Report any potential security bug to security@owncloud.com following our [security policy](https://owncloud.org/security/) instead of filing an issue in our bug tracker
* This repository is *only* for issues within the ownCloud desktop client.
Issues in other components should be reported in their own repositores:
Issues in other components should be reported in their own repositories:
- [ownCloud server](https://github.com/owncloud/core/issues)
- [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
Contacts...)
Expand Down
2 changes: 1 addition & 1 deletion admin/osx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
# Check if variable MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
# branded client.
# Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
Expand Down
4 changes: 2 additions & 2 deletions admin/osx/macosx.pkgproj.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
<dict>
<key>ALIGNMENT</key>
<integer>6</integer>
<key>APPAREANCES</key>
<key>APPEARANCES</key>
<dict>
<key>DARK_AQUA</key>
<dict>
Expand Down Expand Up @@ -642,7 +642,7 @@
<integer>0</integer>
<key>SCALING</key>
<integer>0</integer>
<key>SHARED_SETTINGS_FOR_ALL_APPAREANCES</key>
<key>SHARED_SETTINGS_FOR_ALL_APPEARANCES</key>
<true/>
</dict>
<key>INSTALLATION TYPE</key>
Expand Down
2 changes: 1 addition & 1 deletion admin/osx/pre_install.sh.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# BASH_XTRACEFD=1
# set -x

# don't grep in one line, to avaoid grepping the grep process...
# don't grep in one line, to avoid grepping the grep process...
PROCESSES=$(ps aux)
OC_INSTANCE=$(echo "${PROCESSES}" | grep "/Applications/@APPLICATION_EXECUTABLE@.app/Contents/MacOS/@APPLICATION_EXECUTABLE@")

Expand Down
50 changes: 25 additions & 25 deletions changelog/CHANGELOG.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ version 2.5.1 (2018-11-09)
* macOS: Improve macdeployqt.py
* Discovery: Include path in error message (#6826)
* Database: Allow downgrade from 2.6
* Migration from 2.4: fallback to move file by file if directory move failled (#6807)
* Migration from 2.4: fallback to move file by file if directory move failed (#6807)
* owncloudcmd: Read server version and dav user id from the server (#6830)

version 2.5.0 (2018-09-18)
Expand Down Expand Up @@ -316,7 +316,7 @@ version 2.5.0 (2018-09-18)
* Sync: Increase the timeout for the last MOVE/PUT for huge files (#6527)
* Sync: Fix renames making hierarchy inversion (#6694)
* Sync: RemotePermissions: Fix empty vs null (#4608)
* Sync: Fix the "direction" of the "all file delted" message when the server is reset (#6317)
* Sync: Fix the "direction" of the "all file deleted" message when the server is reset (#6317)
* Data-Fingerprint: Fix backup detection when fingerprint is empty
* propagateuploadv1: Fixed an assert with ownCloud 5
* Download: Use the <s:message> from the reply in the error message (#6459, #6459)
Expand Down Expand Up @@ -519,7 +519,7 @@ version 2.3.3 (2017-08-29)
* Overlay Icons: Fix potential hangs on Windows
* SyncJournalDB: Don't use ._ as filename pattern if that does not work because of SMB storage settings (#5844)
* SyncJournalDB: Log reason for sqlite3 opening errors
* Notifications: Proapgate "Dismiss" button action to server (#5922)
* Notifications: Propagate "Dismiss" button action to server (#5922)
* Switch Linux build also to Qt 5.6.2 (#5470)
* Stopped maintaining Qt 4 buildability

Expand All @@ -543,7 +543,7 @@ version 2.3.0 (2017-03-03)
* Allow to not sync the server's external storages by default
* Switch Windows and OS X build to Qt 5.6.2
* Switch to new ownCloud server WebDAV endpoint
* Chunking NG: New file upload chunking algorithmn for ownCloud server 9.2
* Chunking NG: New file upload chunking algorithm for ownCloud server 9.2
* Allow to sync a folder to multiple different servers (Filename change from .csync_journal.db to _sync_$HASH.db)
* Conflicts: Use the local mtime for the conflict file name (#5273)
* "Sync now" menu item
Expand All @@ -557,7 +557,7 @@ version 2.3.0 (2017-03-03)
* SyncEngine: Fix renaming of folder when file are changed (#5192)
* Fix reconnect bug if status.php intermittently returns wrong data (#5188)
* Improve sync scheduling (#5317)
* Overlay icons: Improvements in correctnes
* Overlay icons: Improvements in correctness
* Tray menu: Only update on demand to fix Linux desktop integration glitches
* Progress: Better time/bandwidth estimations
* Network: Follow certain HTTP redirects (#2791)
Expand Down Expand Up @@ -631,7 +631,7 @@ version 2.2.0 (release 2016-05-12)
* Improved netrc parser (#4691)
* Improved user notifications about ignored files and conflicts (#4761, #3222)
* Add warnings for old server versions (#4523)
* Enable tranportation checksums if the server supports based on server capabilities (#3735)
* Enable transportation checksums if the server supports based on server capabilities (#3735)

* Default Chunk-size changed to 10MB (#4354)
* Documentation Improvements, ie. about overlay icons
Expand Down Expand Up @@ -673,7 +673,7 @@ version 2.1 (release 2015-12-03)
* Improved reconnecting after network change/disconnect (#4167 #3969 ...)
* Improved performance in Windows file system discovery
* Removed libneon-based propagator. As a consequence, The client can no
longer provide bandwith limiting on Linux-distributions where it is
longer provide bandwidth limiting on Linux-distributions where it is
using Qt < 5.4
* Performance improvements in the logging functions
* Ensured that local disk space problems are handled gracefully (#2939)
Expand All @@ -686,14 +686,14 @@ version 2.1 (release 2015-12-03)
* FolderMan: Fixed infinite wait on pause (#4093)
* Renamed env variables to include unit (#2939)
* FolderStatusModel: Attempt to detect removed undecided files (#3612)
* SyncEngine: Don't whipe the white list if the sync was aborted (#4018)
* SyncEngine: Don't wipe the white list if the sync was aborted (#4018)
* Quota: Handle special negative value for the quota (#3940)
* State app name in update notification (#4020)
* PropagateUpload: Fixed double-emission of finished (#3844)
* GUI: Ensured folder names which are excluded from sync can be clicked
* Shell Integration: Dolphin support, requires KF 5.16 and KDE Application 15.12
* FolderStatusModel: Ensured reset also if a folder was renamed (#4011)
* GUI: Fixed accessiblity of remaing items in full settings toolbar (#3795)
* GUI: Fixed accessibility of remaining items in full settings toolbar (#3795)
* Introduced the term "folder sync connection" in more places (#3757)
* AccountSettings: Don't disable pause when offline (#4010)
* Fixed handling of hidden files (#3980)
Expand All @@ -706,7 +706,7 @@ version 2.1 (release 2015-12-03)
* owncloudcmd: Don't do a check that file are older than 2s (#4160)
* Fixed getting size for selective sync (#3986)
* Re-added close button in the settings window (#3713)
* Added abililty to handle storage limitations gracefully (#3736)
* Added ability to handle storage limitations gracefully (#3736)
* Organized patches to our base Qt version into admin/qt/patches
* Plus: A lot of unmentioned improvements and fixes

Expand Down Expand Up @@ -735,7 +735,7 @@ version 2.0.2 (release 2015-10-21)
* GUI: Change tray menu order (#3657)
* GUI: Replace term "sign in" with "Log in" and friends.
* SetupPage: Fix crash caused by uninitialized Account object.
* Use a themable WebDAV path all over.
* Use a themeable WebDAV path all over.
* Units: Back to the "usual" mix units (JEDEC standard).
* csync io: Full UNC path support on Win (#3748)
* Tray: Don't use the tray workaround with the KDE theme (#3706, #3765)
Expand Down Expand Up @@ -805,7 +805,7 @@ version 1.8.2 (release 2015-06-08)
* Win32: Allow concurrent OEM (un-)installers (#3272)
* Win32: Make Setup/Update Mutex theme-unique (#3272)
* HTTP: Add the branding name to the UserAgent string
* ConnectonValidator: Always run with new credentials (#3266)
* ConnectionValidator: Always run with new credentials (#3266)
* Recall Feature: Admins can trigger an upload of a file from
client to server again (#3246)
* Propagator: Add 'Content-Length: 0' header to MKCOL request (#3256)
Expand All @@ -814,7 +814,7 @@ version 1.8.2 (release 2015-06-08)
* Fix opening external links for some labels (#3135)
* AccountState: Run only a single validator, allow error message
overriding (#3236, #3153)
* SyncJournalDB: Minor fixes and simplificatons
* SyncJournalDB: Minor fixes and simplifications
* SyncEngine: Force re-read of folder Etags for upgrades from
1.8.0 and 1.8.1
* Propagator: Limit length of temporary file name (#2789)
Expand Down Expand Up @@ -878,7 +878,7 @@ version 1.8.1 (release 2015-05-07)
* AccountWizard: Fix auth error handling. #3155
* Documentation fixes
* Infrastructure/build fixes
* Win32/OS X: Apply patch from OpenSSL to handle oudated intermediates gracefully #3087
* Win32/OS X: Apply patch from OpenSSL to handle outdated intermediates gracefully #3087

version 1.8.0 (release 2015-03-17)
* Mac OS: HIDPI support
Expand Down Expand Up @@ -915,7 +915,7 @@ version 1.7.1 (release 2014-12-18)
downloads, bug #2528
* Avoid initial ETag fetch job at startup, which is not needed.
* Add chunk size http header to PUT requests
* Fixed deteteCookie method of our CookieJar, fix for Shibboleth
* Fixed deleteCookie method of our CookieJar, fix for Shibboleth
* Added fallback for distros where XDG_RUNTIME_DIR is undefined
* Fix the setup wizard, bug #1989, #2264
* Fix scheduling of ETag check jobs, bug #2553
Expand Down Expand Up @@ -996,7 +996,7 @@ version 1.6.2 (release 2014-07-28 )
* Fix data corruption while trying to resume and the server does
not support it.
* HTTP Credentials: Read password from legacy place if not found.
* Shibboleth: Fix the waiting curser that would not disapear (#1915)
* Shibboleth: Fix the waiting curser that would not disappear (#1915)
* Limit memory usage to avoid mem wasting and crashes
* Propagator: Fix crash when logging out during upload (#1957)
* Propagator_qnam: Fix signal slot connection (#1963)
Expand Down Expand Up @@ -1034,7 +1034,7 @@ version 1.6.0 (release 2014-05-30 )
* Fix memory leaks
* Respect XDG_CONFIG_HOME environment var
* Handle empty fileids in the journal correctly
* Add abilility to compile libowncloudsync without GUI dependendy
* Add ability to compile libowncloudsync without GUI dependency
* Fix SSL error with previously-expired CAs on Windows
* Fix incorrect folder pause state after start
* Fix a couple of actual potential crashes
Expand Down Expand Up @@ -1081,7 +1081,7 @@ version 1.5.2 (release 2014-02-26 )
* Fix online state handling (#1441, #1459)
* Fix potential crash in c_iconv on Mac OS
* Fix certificate chain display in SSLButton
* Fix sporadicly appearing multiple auth prompts on sign-in
* Fix sporadically appearing multiple auth prompts on sign-in
* Show correct state icon in Account Settings right away
* Re-fetch content that gets deleted from read only shared directories
* Do not store the password in the config file, erase existing ones (#1469)
Expand Down Expand Up @@ -1121,7 +1121,7 @@ version 1.5.1 (release 2014-02-13 )
* Fixes in sync journal handling
* Fix the upload progress if the local source is still
changing when the upload begins.
* Add proxy support to owncloud commandline client
* Add proxy support to owncloud command-line client
* NSIS fixes
* A lot of other fixes and minor improvements
* Improve Qt5 compatability
Expand All @@ -1134,7 +1134,7 @@ version 1.5.0 (release 2013-12-12 ), csync 0.91.4 required
* Ask for password if missing
* Introduce activity view
* Introduce black list for files which could not be synced
* Enabling accessbility by shipping accessibility enables on OS X (#736)
* Enabling accessibility by shipping accessibility enables on OS X (#736)
* Toggle Settings window when clicking on systray icon on Win and KDE (#896)
* FolderWizard: Sanitize error detection (#1201)
* Set proper enable state of blacklist button after the dialog was opened
Expand Down Expand Up @@ -1204,15 +1204,15 @@ version 1.4.0 (release 2013-09-04 ), csync 0.90.0 required
* Introduce a sync history, persisting results across syncs
* Move ability to switch to mono icons from a switch to a Settings option
* Add "Launch on System Startup" GUI option
* Add "Show Desktop Nofications"GUI option (enabled by default)
* Add "Show Desktop Notifications"GUI option (enabled by default)
top optionally disable sync notifications
* Add Help item, pointing to online reference
* Implement graphical selection of remote folders in FolderWizard
* Allow custom ignore patterns
* Add an editor for ingore patterns
* Add an editor for ignore patterns
* ALlow to flag certain ignore patterns as discardable
* Ensure to ship with all valid translations
* Progress Dialog now preserves the last syncned items across sync runs
* Progress Dialog now preserves the last synced items across sync runs
* Split Setup Wizard into multiple pages again
* Implement "--logfile -" to log to stdout
* Add preliminary support for Shibboleth authentication
Expand Down Expand Up @@ -1301,7 +1301,7 @@ version 1.2.1 (release 2013-02-26 ), csync 0.70.4 required
* [Platform] Simplified/fixed credential store usage and custom configs.
* [Platform] Added soname version to libowncloudsync.
* [Platform] Pull in Qt translations
* [Gui] Make sync result popups less annoyingq
* [Gui] Make sync result popups less annoying
* [Gui] Fix for result popup

version 1.2.0 (release 2013-01-24 ), csync 0.70.2 required
Expand All @@ -1310,7 +1310,7 @@ version 1.2.0 (release 2013-01-24 ), csync 0.70.2 required
* [GUI] New platform specific icon set.
* [App] Using cross platform QtKeychain library to store credentials crypted.
* [App] Use cross platform notification for changes in the local file system rather than regular poll.
* [Fixes] Improved SSL Certificate handling and SSL fixes troughout syncing.
* [Fixes] Improved SSL Certificate handling and SSL fixes throughout syncing.
* [Fixes] Fixed proxy authentication.
* [Fixes] Allow brackets in folder name alias.
* [Fixes] Lots of other minor fixes.
Expand Down
2 changes: 1 addition & 1 deletion resources/font-awesome/update_color.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $COLOR=$Args[0]
Write-Host "Color:" $COLOR
if (-not $COLOR) {
Write-Host "Please specify color"
Write-Host "update_corlor.ps1 `"#B5B6BB`""
Write-Host "update_color.ps1 `"#B5B6BB`""
exit(1)
}
Get-ChildItem "*.svg" | % {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

# Dimensions taken from https://www.apriorit.com/dev-blog/357-shell-extentions-basics-samples-common-problems#_Toc408244375
# Dimensions taken from https://www.apriorit.com/dev-blog/357-shell-extensions-basics-samples-common-problems#_Toc408244375
convert -background transparent attention.svg -gravity SouthWest \( -clone 0 -resize 10x10 -extent 16x16 \) \( -clone 0 -resize 16x16 -extent 32x32 \) \( -clone 0 -resize 24x24 -extent 48x48 \) \( -clone 0 -resize 128x128 -extent 256x256 \) -delete 0 ../../../windows/OCOverlays/ico/Warning.ico
convert -background transparent error.svg -gravity SouthWest \( -clone 0 -resize 10x10 -extent 16x16 \) \( -clone 0 -resize 16x16 -extent 32x32 \) \( -clone 0 -resize 24x24 -extent 48x48 \) \( -clone 0 -resize 128x128 -extent 256x256 \) -delete 0 ../../../windows/OCOverlays/ico/Error.ico
convert -background transparent ok.svg -gravity SouthWest \( -clone 0 -resize 10x10 -extent 16x16 \) \( -clone 0 -resize 16x16 -extent 32x32 \) \( -clone 0 -resize 24x24 -extent 48x48 \) \( -clone 0 -resize 128x128 -extent 256x256 \) -delete 0 ../../../windows/OCOverlays/ico/OK.ico
Expand Down
2 changes: 1 addition & 1 deletion shell_integration/nautilus/syncstate.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def _connectToSocketServer(self):
return False # Don't run again
except Exception as e:
print("Could not connect to unix socket " + sock_file + ". " + str(e))
except Exception as e: # Bad habbit
except Exception as e: # Bad habit
print("Connect could not be established, try again later.")
self._sock.close()

Expand Down
6 changes: 3 additions & 3 deletions shell_integration/windows/OCContextMenu/OCContextMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ IFACEMETHODIMP OCContextMenu::Initialize(

#pragma region IContextMenu

void InsertSeperator(HMENU hMenu, UINT indexMenu)
void InsertSeparator(HMENU hMenu, UINT indexMenu)
{
// Add a separator.
MENUITEMINFO sep = { sizeof(sep) };
Expand All @@ -140,7 +140,7 @@ IFACEMETHODIMP OCContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT
return MAKE_HRESULT(SEVERITY_SUCCESS, 0, USHORT(0));
}

InsertSeperator(hMenu, indexMenu++);
InsertSeparator(hMenu, indexMenu++);

HMENU hSubmenu = CreateMenu();
{
Expand All @@ -157,7 +157,7 @@ IFACEMETHODIMP OCContextMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT
if (!InsertMenuItem(hMenu, indexMenu++, TRUE, &mii))
return HRESULT_FROM_WIN32(GetLastError());
}
InsertSeperator(hMenu, indexMenu++);
InsertSeparator(hMenu, indexMenu++);

UINT indexSubMenu = 0;
for (auto &item : m_info.menuItems) {
Expand Down
4 changes: 2 additions & 2 deletions shell_integration/windows/OCOverlays/OCOverlay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ IFACEMETHODIMP_(ULONG) OCOverlay::Release()

IFACEMETHODIMP OCOverlay::GetPriority(int *pPriority)
{
// this defines which handler has prededence, so
// we order this in terms of likelyhood
// this defines which handler has precedence, so
// we order this in terms of likelihood
switch (_state) {
case State_OK:
*pPriority = 0; break;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/common/filesystembase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ bool FileSystem::uncheckedRenameReplace(const QString &originFileName,
#ifndef Q_OS_WIN
bool success;
QFile orig(originFileName);
// We want a rename that also overwites. QFile::rename does not overwite.
// We want a rename that also overwrites. QFile::rename does not overwrite.
// Qt 5.1 has QSaveFile::renameOverwrite we could use.
// ### FIXME
success = true;
Expand Down
2 changes: 1 addition & 1 deletion src/common/fixedsizeringbuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace OCC {

/**
* A Fixed sized ring buffer optimized on continouous insertion
* A Fixed sized ring buffer optimized on continuous insertion
*/
template <typename TYPE, size_t _Size>
class FixedSizeRingBuffer
Expand Down

0 comments on commit dc7338c

Please sign in to comment.