Skip to content

Commit 1bcc8d5

Browse files
fix: more grammar and spelling issues (#12012)
1 parent eaf70c3 commit 1bcc8d5

File tree

57 files changed

+85
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+85
-86
lines changed

.craft.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Branch = master
33
ShallowClone = False
44

55
# Variables defined here override the default value
6-
# The variable names are casesensitive
6+
# The variable names are case-sensitive
77
[Variables]
8-
#Values need to be overwritten to create a chache
8+
#Values need to be overwritten to create a cache
99
UseCache = True
1010
CreateCache = True
1111

@@ -17,7 +17,7 @@ QtVersion = 6.8.0
1717
CachePatchLvl = 0
1818

1919
# set WORKSPACE to cwd, override on ci
20-
# with legacy fallbac APPVEYOR_BUILD_FOLDER
20+
# with legacy fallback APPVEYOR_BUILD_FOLDER
2121
WORKSPACE = ${Variables:APPVEYOR_BUILD_FOLDER}
2222
APPVEYOR_BUILD_FOLDER = ${Variables:Root}
2323
CiBuild = True

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@ body:
5555
id: additional-context
5656
attributes:
5757
label: Additional context
58-
description: Any other information you'd like to include, for instance, screnshots, mockups, etc.
58+
description: Any other information you'd like to include, for instance, screenshots, mockups, etc.
5959

.github/release_template.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ __TODO__:
1212
### Administration
1313

1414
* [ ] QA: Update [Test Plans](https://confluence.owncloud.com/display/OG/Desktop+Client+Test+Plan+Maintenance)
15-
* [ ] Update [supported platforms](https://doc.owncloud.com/desktop/next/installing.html#system-requirements) @michaelstingl
15+
* [ ] Update [supported platforms](https://doc.owncloud.com/desktop/next/installing.html#system-requirements) @DeepDiver1975
1616
* [ ] QA: Check the translations coming from transifex: https://github.com/owncloud/client/commits/ -> Filter based on a release branch/tag and search for `[tx] updated client translations from transifex [skip ci]`
1717
* [ ] DEV: Check for new OpenSSL version
1818
* [ ] DEV: Update [dependencies](https://confluence.owncloud.com/display/OG/Dependencies)
@@ -21,28 +21,28 @@ __TODO__:
2121
* [ ] QA: Communicate documentation changes
2222
* [ ] Inform ``#documentation-internal`` (@mmattel) about the start of testing phase (latest a week before the release!). They'll prepare a PR with respective doc version
2323
* [ ] Open issues in ``docs-client-desktop`` repo for already known doc-relevant items and mark them accordingly, e.g. backport to 2.X.x necessary
24-
* [ ] Decide if the prerelease stage will be public or internal @michaelstingl
24+
* [ ] Decide if the prerelease stage will be public or internal @DeepDiver1975
2525
* [ ] Announce feature freeze in ``#release_coordination`` channel before Beta build
2626
* [ ] Announce string freeze in ``#release_coordination`` channel a few days later
2727
* [ ] Inform ``#documentation-internal`` about it so that they can do the translations
2828

2929
### Copy for Each Build (Beta/RC)
3030

3131
* [ ] DEV: Tag (Beta or RC) and build [builds](https://confluence.owncloud.com/display/OG/Build+and+Tags#BuildandTags-Sprintbuild) for theme 'ownCloud' and 'testpilotcloud' (includes ChangeLog for the tag on https://github.com/owncloud/client/releases/)
32-
* [ ] QA: [Smoke test](https://owncloud.testrail.io/index.php?/cases/view/2469) (for public prelease)
32+
* [ ] QA: [Smoke test](https://owncloud.testrail.io/index.php?/cases/view/2469) (for public pre-release)
3333
* [ ] DEV: GitHub release
3434
* [ ] Beta/RC [Communication](https://confluence.owncloud.com/x/loJK)
3535
* [ ] Inform ``#updates`` that we have Beta/RC
3636
* [ ] For public prerelease: Inform ``#marketing`` and tell them to send email to beta testers
37-
* [ ] For public prerelease: Write/edit Central post https://central.owncloud.org/tags/c/news/desktop with link to github release
37+
* [ ] For public prerelease: Write/edit Central post https://central.owncloud.org/tags/c/news/desktop with link to GitHub release
3838
* [ ] DEV: Prepare the update server for new version (AppImages included)
3939
* [ ] DEV: Provide 'testpilotcloud' on **Beta** update channel
4040

4141
### QA
4242

4343
* [ ] QA: [Antivirus scan](https://confluence.owncloud.com/display/OG/Virus+Scanning) the first RC
4444
* [ ] QA: [Upload](https://confluence.owncloud.com/display/OG/Upload+linux+gpg+keys+to+key+server) linux gpg keys to key server
45-
* [ ] QA: Check Crash reporter: start 'owncloud --debug' on cmd line, system tray right click menu: 'Crash now - qt fatal' -> report window not empty, sending the report works)
45+
* [ ] QA: Check Crash reporter: start 'owncloud --debug' on cmd line, system tray right click menu: 'Crash now - qt fatal' -> report window not empty, sending the report works
4646
* [ ] Windows
4747
* [ ] macOS
4848
* [ ] AppImage (Linux)
@@ -65,7 +65,7 @@ __TODO__:
6565
* [ ] DEV: Create final release tag (e.g., `v4.5.6`)
6666
* [ ] DEV: Create [builds](https://confluence.owncloud.com/display/OG/Build+and+Tags#BuildandTags-Tags) for themes 'ownCloud' and 'testpilotcloud' for final release tag
6767
* [ ] DEV: Update version for future builds
68-
* [ ] QA: Check [squish tests](https://confluence.owncloud.com/display/OG/Squish+Testing#SquishTesting-Finalreleasestep) running successfuly on [drone](https://drone.owncloud.com/owncloud/client) for the final tag v3.X.x
68+
* [ ] QA: Check [squish tests](https://confluence.owncloud.com/display/OG/Squish+Testing#SquishTesting-Finalreleasestep) running successfully on [drone](https://drone.owncloud.com/owncloud/client) for the final tag v3.X.x
6969
* [ ] QA: Create a new release issue for a branded release if needed [Branded Client Release Template](https://github.com/owncloud/enterprise/blob/master/internal_release_templates/internal_client_release_template.md)
7070

7171
### Final Steps
@@ -79,7 +79,7 @@ __TODO__:
7979

8080
### [Marketing and Communication](https://confluence.owncloud.com/display/OG/Marketing+and+Communication)
8181

82-
* [ ] QA: Ping ``#marketing``at [email protected]; @bwalter to update links on https://owncloud.com/desktop-app/ (provide links from github releases) and @mfeilner to update [wiki de](https://de.wikipedia.org/wiki/OwnCloud), [wiki en](https://en.wikipedia.org/wiki/OwnCloud), [wikidata](https://www.wikidata.org/wiki/Q20763576))
82+
* [ ] QA: Ping ``#marketing`` to update links on https://owncloud.com/desktop-app/ (provide links from GitHub releases) and @mfeilner to update [wiki de](https://de.wikipedia.org/wiki/OwnCloud), [wiki en](https://en.wikipedia.org/wiki/OwnCloud), [wikidata](https://www.wikidata.org/wiki/Q20763576))
8383
* [ ] QA: Central post https://central.owncloud.org/tags/c/news/desktop
8484
* [ ] QA: Inform on ``#updates`` channel
8585
* [ ] QA: Inform [packagers](https://confluence.owncloud.com/x/QYLEAg)

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ We are also available on [IRC][irc].
99
- **Important**: When reporting an issue provide as much requested information as possible, we :heart: log files.
1010
- **SECURITY**: Report any potential security bug to [email protected] following our [security policy](https://owncloud.com/security/) instead of filing an issue in our bug tracker
1111
- This repository is _only_ for issues within the ownCloud desktop client.
12-
Issues in other components should be reported in their own repositores:
12+
Issues in other components should be reported in their own repositories:
1313
- [ownCloud server](https://github.com/owncloud/core/issues)
1414
- [ownCloud apps](https://github.com/owncloud/apps/issues) (e.g. Calendar,
1515
Contacts...)

PACKAGING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ For that, ownCloud and the distributions need to collaborate.
77
Note that this information is valid for the ownCloud Desktop App 6.0 and subsequent releases only and does not apply for releases 5.x and below.
88
## Integration Problems
99

10-
The ownCloud desktop client gets shipped as AppImage because it is effortless to create, independent from the underlying distro and easy to install, as long as the distribution is not providing a package on their own which is frequently updated.
10+
The ownCloud desktop client gets shipped as AppImage because it is effortless to create, independent of the underlying distro and easy to install, as long as the distribution is not providing a package on their own which is frequently updated.
1111

12-
With AppImage, there comes one problem: For the integration into the desktop file managers which are provided by the distribution (such as Dolphin for KDE and Nautilus), icons and partly also binary code is needed. That is needed to provide the neccessary information to enable the file managers to show for example icon overlays.
12+
With AppImage, there comes one problem: For the integration into the desktop file managers which are provided by the distribution (such as Dolphin for KDE and Nautilus), icons and partly also binary code is needed. That is needed to provide the necessary information to enable the file managers to show for example icon overlays.
1313

14-
So far, the neccessary code and resources were bundled with the desktop client code, but now the desktop shell integrations resources were split off, so that they can be released and shipped separately.
14+
So far, the necessary code and resources were bundled with the desktop client code, but now the desktop shell integrations resources were split off, so that they can be released and shipped separately.
1515

1616
## Solution
1717

1818
The idea is that everything that is needed to integrate into the desktop apps such as dolphin are part of the Linux distribution that any user chooses to use. Ideally they are packages maintained downstream in the Linux distributions and can be installed via the native package management.
1919

20-
Since these parts are very rarely changing, these packages are very stable and thus, packaging efforts a very very low.
20+
Since these parts are very rarely changing, these packages are very stable and thus, packaging efforts a very, very low.
2121

2222
The actual client code, which changes far more often, is either also provided by the Linux distro downstream or by ownCloud as an AppImage. ownCloud chooses to deliver an AppImage because that reduces the effort to package for all distros out there, it is "one fits all".
2323

@@ -27,14 +27,14 @@ With that, the user gets on the one hand very frequently updated desktop clients
2727

2828
## Packaging Hints
2929

30-
Here are some hints for packager of the linux distributions which we kindly ask to change their packages in the distros to help us providing the best ownCloud client integration experience:
30+
Here are some hints for packager of the linux distributions which we kindly ask to change their packages in the distros to help us to provide the best ownCloud client integration experience:
3131

3232
The shell integrations are available for [KDE Dolphin](https://github.com/owncloud/client-desktop-shell-integration-dolphin), [Nautilus and Caja](https://github.com/owncloud/client-desktop-shell-integration-nautilus). While KDE Dolphin needs compiled code, the latter two are using python.
3333
Each of them should be available as separate distro package, so that they can be suggested to complement "their" file manager.
3434

3535
All of these packages should depend on the [client-extension-resources](https://github.com/owncloud/client-desktop-shell-integration-resources) package, which basically only contains the overlay icons. They can optionally be branded with a distro specific theme, to maintain a cool desktop experience.
3636

37-
Non of the three file manager integration packages (for Dolphin, Nautilus or Caja) need a dependency on the "big" ownCloud desktop client package any more, so that they do not change in foreseeable times.
37+
None of the three file manager integration packages (for Dolphin, Nautilus or Caja) need a dependency on the "big" ownCloud desktop client package anymore, so that they do not change in foreseeable times.
3838

3939
If the distro decides to ship an own package of the client or lets their user install the provided AppImage, the experience will be perfect in any case.
4040

admin/osx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Check if varialbe MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
2+
# Check if variable MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
33
# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
44
# branded client.
55
# Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.

changelog/2.10.0_2022-01-17/8924.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Bugfix: Do not ask for credentials at start-up when the user logged out
22

3-
When a user would logout, and quit the client, then on the next start
3+
When a user would log out, and quit the client, then on the next start
44
the client would immediately ask for credentials. This has been fixed by
55
storing the fact that the user logged out before in the account
66
settings.

changelog/2.10.0_2022-01-17/9194.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Bugfix: Don't abort upload if chunk is locked
22

33
Since 2.9 we know that we need exclusive file access to a file to properly handle it with Windows virtual files.
4-
Therefore we checked for the locked state before we start the upload.
4+
Therefore, we checked for the locked state before we start the upload.
55
Due to a bug we checked that for each file chunk, now we only check when the upload starts and when it finished completely.
66

77
https://github.com/owncloud/client/issues/9194

changelog/2.10.0_2022-01-17/9208.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Enhancement: Also ignore local repeating errors for a period of time
22

3-
If an error occurs on the server (a url is not reachable) we try a couple of times, then we ignore that file for a period of time.
3+
If an error occurs on the server (an url is not reachable) we try a couple of times, then we ignore that file for a period of time.
44
We now do the same with errors that occur locally.
55

66
https://github.com/owncloud/client/issues/9208

changelog/2.10.0_2022-01-17/9341.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bugfix: Run a full local discovery after we were paused or on a forced sync
22

3-
Previously we did a incremental search which might have skipped some local changes.
3+
Previously we did an incremental search which might have skipped some local changes.
44

55
https://github.com/owncloud/client/issues/9341

changelog/2.10.1_2022-04-05/9383.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Bugfix: Don't reset change time on upload
22

33
We fixed a bug where we reset the change time of Windows placeholder files to the value in the database during uploads.
4-
This cold cause other applications to detect non existing changes in that file.
4+
This cold cause other applications to detect non-existing changes in that file.
55

66
https://github.com/owncloud/client/issues/9383
77
https://github.com/owncloud/client-desktop-vfs-win/pull/16

changelog/2.10.1_2022-04-05/9460.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Enhancement: Provide informal German translations
22

3-
The community was maintaining an informal German translation for years but we where only able to
3+
The community was maintaining an informal German translation for years but we were only able to
44
provide a single version of German in the client.
55
We now ship both versions, the informal can be selected in the combobox in the advanced settings.
66
To be able to distinguish between formal and informal locales, we also include the locale

changelog/2.10.1_2022-04-05/9533.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Bugfix: Possible crash when removing non existing folder
1+
Bugfix: Possible crash when removing non-existing folder
22

33

44
https://github.com/owncloud/client/issues/9533

changelog/2.11.0_2022-08-18/5174.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Bugfix: Compare usernames case insensitive
1+
Bugfix: Compare usernames case-insensitive
22

3-
We fixed a bug where the user name was compared with the name provided by the server in a case sensitive way.
3+
We fixed a bug where the user name was compared with the name provided by the server in a case-sensitive way.
44

55
https://github.com/owncloud/enterprise/issues/5174

changelog/2.11.0_2022-08-18/9571.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bugfix: Use UTF-8 for .owncloudsync.log
22

3-
We fixed a bug where unicode file names were not correctly displayed in .owncloudsync.log.
3+
We fixed a bug where Unicode file names were not correctly displayed in .owncloudsync.log.
44

55
https://github.com/owncloud/client/pull/9571

changelog/2.11.0_2022-08-18/9956.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Enhancement: Don't abort sync if a user requests a file
22

33
Previously we aborted any running sync if a user requested a file that was not yet available locally.
44
This was done to ensure the user does not need to wait for the current sync to finish.
5-
However in today's code both actions the download and the sync can run in parallel.
5+
However, in today's code both actions the download and the sync can run in parallel.
66

77
https://github.com/owncloud/client/pull/9956
88
https://github.com/owncloud/client/issues/9832

changelog/2.6.3_2020-06-10/7336.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Bugfix: Expand file tree also when no folders are synced
22

33
We have fixed the behaviour of the folder Widget,
4-
when a account was added and none of its folders was selected to be synced, the tree was not expanded.
4+
when an account was added and none of its folders was selected to be synced, the tree was not expanded.
55

66
https://github.com/owncloud/client/issues/7336

changelog/2.6.3_2020-06-10/7774.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bugfix: On Windows the share dialog does not open as the top most window
22

3-
We now ensure that the our dialogs are correctly raised.
3+
We now ensure that our dialogs are correctly raised.
44

55
https://github.com/owncloud/client/issues/7774

changelog/2.7.0_2020-11-13/8018.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Change: Move "Choose what to sync" to sync everything settings
22

33
While selective sync is a feature only available when everything is synced,
4-
the the option had its own radio button.
4+
the option had its own radio button.
55
We now moved the button to the other sync everything related settings.
66

77
https://github.com/owncloud/client/pull/8018

changelog/2.7.0_2020-11-13/8051.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bugfix: The back button on the advanced wizard page no longer gets enabled
22

3-
We fixed a bug where the back button in the advanced wizard page get re enabled.
3+
We fixed a bug where the back button in the advanced wizard page get re-enabled.
44

55
https://github.com/owncloud/client/issues/8051

changelog/2.7.0_2020-11-13/8127.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ Change: Remove update channels from the ownCloud client
33
To ensure a maximum of stability user should not replace their productive client with a preview build.
44
For that exact reason we offer testpilotcloud clients, they can be installed in parallel and updated via the beta channel.
55

6-
If a user is more adventures than the average a manual install of a preview is always possible.
6+
If a user is more adventurous than the average a manual installation of a preview is always possible.
77

88
https://github.com/owncloud/client/issues/8127

changelog/2.7.0_2020-11-13/product-19.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Change: Add support for the TUS resumeable upload protocol
1+
Change: Add support for the TUS resume-able upload protocol
22

33
With the support of the TUS protocol we are now able to easily and reliably
44
upload files to oCIS.

changelog/2.7.4_2020-12-21/7672.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Bugfix: Update Windows launch on start entry
22

3-
We fixed a bug where launch on start did not work after a re install
3+
We fixed a bug where launch on start did not work after a re-install
44
to a new location.
55

66
https://github.com/owncloud/client/issues/7672

changelog/2.7.6_2021-02-04/8371.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Bugfix: Case sensitive comparison of checksum algorithm
1+
Bugfix: Case-sensitive comparison of checksum algorithm
22

3-
We fixed a bug where the checksum detection was case sensitive
3+
We fixed a bug where the checksum detection was case-sensitive
44
and used a different casing than the server.
55

66
https://github.com/owncloud/client/pull/8371

changelog/2.9.0_2021-09-08/7715.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Enhancement: Display the information state in case we encountered ignored errors
33
If syncing a file fails multiple times we mark it as ignored to skip it for a certain amount of time.
44
If we have ignored files we are not in sync, we now don't display the green icon.
55

6-
Additionally this change aligns the icon displayed in the system tray with the icon displayed in the app.
6+
Additionally, this change aligns the icon displayed in the system tray with the icon displayed in the app.
77

88
https://github.com/owncloud/client/issues/7715
99
https://github.com/owncloud/client/issues/7365

changelog/2.9.0_2021-09-08/8299.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Change: Ignore the desktop.ini file in every directory, not only in top dir
22

3-
The windows explorer files called desktop.ini were ignored only in the top
3+
The Windows explorer files called desktop.ini were ignored only in the top
44
sync dir so far. They are now ignored in the sync in all directory levels
55
of the file tree.
66

changelog/2.9.0_2021-09-08/8374.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Change: Include full os version in the about dialog
1+
Change: Include full os version in the about-dialog
22

3-
We now include the os version in the about dialog, this might help us to faster
3+
We now include the os version in the about-dialog, this might help us to faster
44
pin down os related issues.
55

66
https://github.com/owncloud/client/pull/8374

changelog/2.9.0_2021-09-08/8761.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Bugfix: Locked files are not correctly synced
22

3-
We fixed an issue where files locked by office etc, where not correctly synced,
3+
We fixed an issue where files locked by office etc., where not correctly synced,
44
when Windows Virtual files are enabled.
55

66
https://github.com/owncloud/client/issues/8761

0 commit comments

Comments
 (0)