Skip to content

Commit

Permalink
fix: more grammar and spelling issues (#12012)
Browse files Browse the repository at this point in the history
  • Loading branch information
DeepDiver1975 authored Dec 10, 2024
1 parent eaf70c3 commit 1bcc8d5
Show file tree
Hide file tree
Showing 57 changed files with 85 additions and 86 deletions.
6 changes: 3 additions & 3 deletions .craft.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ 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
#Values need to be overwritten to create a cache
UseCache = True
CreateCache = True

Expand All @@ -17,7 +17,7 @@ QtVersion = 6.8.0
CachePatchLvl = 0

# 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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ body:
id: additional-context
attributes:
label: Additional context
description: Any other information you'd like to include, for instance, screnshots, mockups, etc.
description: Any other information you'd like to include, for instance, screenshots, mockups, etc.

14 changes: 7 additions & 7 deletions .github/release_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ __TODO__:
### Administration

* [ ] QA: Update [Test Plans](https://confluence.owncloud.com/display/OG/Desktop+Client+Test+Plan+Maintenance)
* [ ] Update [supported platforms](https://doc.owncloud.com/desktop/next/installing.html#system-requirements) @michaelstingl
* [ ] Update [supported platforms](https://doc.owncloud.com/desktop/next/installing.html#system-requirements) @DeepDiver1975
* [ ] 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]`
* [ ] DEV: Check for new OpenSSL version
* [ ] DEV: Update [dependencies](https://confluence.owncloud.com/display/OG/Dependencies)
Expand All @@ -21,28 +21,28 @@ __TODO__:
* [ ] QA: Communicate documentation changes
* [ ] 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
* [ ] 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
* [ ] Decide if the prerelease stage will be public or internal @michaelstingl
* [ ] Decide if the prerelease stage will be public or internal @DeepDiver1975
* [ ] Announce feature freeze in ``#release_coordination`` channel before Beta build
* [ ] Announce string freeze in ``#release_coordination`` channel a few days later
* [ ] Inform ``#documentation-internal`` about it so that they can do the translations

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

* [ ] 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/)
* [ ] QA: [Smoke test](https://owncloud.testrail.io/index.php?/cases/view/2469) (for public prelease)
* [ ] QA: [Smoke test](https://owncloud.testrail.io/index.php?/cases/view/2469) (for public pre-release)
* [ ] DEV: GitHub release
* [ ] Beta/RC [Communication](https://confluence.owncloud.com/x/loJK)
* [ ] Inform ``#updates`` that we have Beta/RC
* [ ] For public prerelease: Inform ``#marketing`` and tell them to send email to beta testers
* [ ] For public prerelease: Write/edit Central post https://central.owncloud.org/tags/c/news/desktop with link to github release
* [ ] For public prerelease: Write/edit Central post https://central.owncloud.org/tags/c/news/desktop with link to GitHub release
* [ ] DEV: Prepare the update server for new version (AppImages included)
* [ ] DEV: Provide 'testpilotcloud' on **Beta** update channel

### QA

* [ ] QA: [Antivirus scan](https://confluence.owncloud.com/display/OG/Virus+Scanning) the first RC
* [ ] QA: [Upload](https://confluence.owncloud.com/display/OG/Upload+linux+gpg+keys+to+key+server) linux gpg keys to key server
* [ ] 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)
* [ ] 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
* [ ] Windows
* [ ] macOS
* [ ] AppImage (Linux)
Expand All @@ -65,7 +65,7 @@ __TODO__:
* [ ] DEV: Create final release tag (e.g., `v4.5.6`)
* [ ] DEV: Create [builds](https://confluence.owncloud.com/display/OG/Build+and+Tags#BuildandTags-Tags) for themes 'ownCloud' and 'testpilotcloud' for final release tag
* [ ] DEV: Update version for future builds
* [ ] 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
* [ ] 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
* [ ] 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)

### Final Steps
Expand All @@ -79,7 +79,7 @@ __TODO__:

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

* [ ] 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))
* [ ] 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))
* [ ] QA: Central post https://central.owncloud.org/tags/c/news/desktop
* [ ] QA: Inform on ``#updates`` channel
* [ ] QA: Inform [packagers](https://confluence.owncloud.com/x/QYLEAg)
Expand Down
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].
- **Important**: When reporting an issue provide as much requested information as possible, we :heart: log files.
- **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
- 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
12 changes: 6 additions & 6 deletions PACKAGING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ For that, ownCloud and the distributions need to collaborate.
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.
## Integration Problems

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.
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.

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.
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.

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.
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.

## Solution

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.

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

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".

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

## Packaging Hints

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:
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:

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.
Each of them should be available as separate distro package, so that they can be suggested to complement "their" file manager.

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.

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.
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.

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.

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
2 changes: 1 addition & 1 deletion changelog/2.10.0_2022-01-17/8924.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bugfix: Do not ask for credentials at start-up when the user logged out

When a user would logout, and quit the client, then on the next start
When a user would log out, and quit the client, then on the next start
the client would immediately ask for credentials. This has been fixed by
storing the fact that the user logged out before in the account
settings.
Expand Down
2 changes: 1 addition & 1 deletion changelog/2.10.0_2022-01-17/9194.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Bugfix: Don't abort upload if chunk is locked

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

https://github.com/owncloud/client/issues/9194
Expand Down
2 changes: 1 addition & 1 deletion changelog/2.10.0_2022-01-17/9208.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Enhancement: Also ignore local repeating errors for a period of time

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.
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.
We now do the same with errors that occur locally.

https://github.com/owncloud/client/issues/9208
Expand Down
2 changes: 1 addition & 1 deletion changelog/2.10.0_2022-01-17/9341.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Bugfix: Run a full local discovery after we were paused or on a forced sync

Previously we did a incremental search which might have skipped some local changes.
Previously we did an incremental search which might have skipped some local changes.

https://github.com/owncloud/client/issues/9341
2 changes: 1 addition & 1 deletion changelog/2.10.1_2022-04-05/9383.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Bugfix: Don't reset change time on upload

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

https://github.com/owncloud/client/issues/9383
https://github.com/owncloud/client-desktop-vfs-win/pull/16
2 changes: 1 addition & 1 deletion changelog/2.10.1_2022-04-05/9460.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Enhancement: Provide informal German translations

The community was maintaining an informal German translation for years but we where only able to
The community was maintaining an informal German translation for years but we were only able to
provide a single version of German in the client.
We now ship both versions, the informal can be selected in the combobox in the advanced settings.
To be able to distinguish between formal and informal locales, we also include the locale
Expand Down
2 changes: 1 addition & 1 deletion changelog/2.10.1_2022-04-05/9533.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bugfix: Possible crash when removing non existing folder
Bugfix: Possible crash when removing non-existing folder


https://github.com/owncloud/client/issues/9533
4 changes: 2 additions & 2 deletions changelog/2.11.0_2022-08-18/5174.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Bugfix: Compare usernames case insensitive
Bugfix: Compare usernames case-insensitive

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

https://github.com/owncloud/enterprise/issues/5174
2 changes: 1 addition & 1 deletion changelog/2.11.0_2022-08-18/9571.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Bugfix: Use UTF-8 for .owncloudsync.log

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

https://github.com/owncloud/client/pull/9571
2 changes: 1 addition & 1 deletion changelog/2.11.0_2022-08-18/9956.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Enhancement: Don't abort sync if a user requests a file

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

https://github.com/owncloud/client/pull/9956
https://github.com/owncloud/client/issues/9832
2 changes: 1 addition & 1 deletion changelog/2.6.3_2020-06-10/7336.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bugfix: Expand file tree also when no folders are synced

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

https://github.com/owncloud/client/issues/7336
2 changes: 1 addition & 1 deletion changelog/2.6.3_2020-06-10/7774.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Bugfix: On Windows the share dialog does not open as the top most window

We now ensure that the our dialogs are correctly raised.
We now ensure that our dialogs are correctly raised.

https://github.com/owncloud/client/issues/7774
2 changes: 1 addition & 1 deletion changelog/2.7.0_2020-11-13/8018.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Change: Move "Choose what to sync" to sync everything settings

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

https://github.com/owncloud/client/pull/8018
2 changes: 1 addition & 1 deletion changelog/2.7.0_2020-11-13/8051.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Bugfix: The back button on the advanced wizard page no longer gets enabled

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

https://github.com/owncloud/client/issues/8051
2 changes: 1 addition & 1 deletion changelog/2.7.0_2020-11-13/8127.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Change: Remove update channels from the ownCloud client
To ensure a maximum of stability user should not replace their productive client with a preview build.
For that exact reason we offer testpilotcloud clients, they can be installed in parallel and updated via the beta channel.

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

https://github.com/owncloud/client/issues/8127
2 changes: 1 addition & 1 deletion changelog/2.7.0_2020-11-13/product-19.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Change: Add support for the TUS resumeable upload protocol
Change: Add support for the TUS resume-able upload protocol

With the support of the TUS protocol we are now able to easily and reliably
upload files to oCIS.
Expand Down
2 changes: 1 addition & 1 deletion changelog/2.7.4_2020-12-21/7672.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bugfix: Update Windows launch on start entry

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

https://github.com/owncloud/client/issues/7672
4 changes: 2 additions & 2 deletions changelog/2.7.6_2021-02-04/8371.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bugfix: Case sensitive comparison of checksum algorithm
Bugfix: Case-sensitive comparison of checksum algorithm

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

https://github.com/owncloud/client/pull/8371
Expand Down
2 changes: 1 addition & 1 deletion changelog/2.9.0_2021-09-08/7715.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Enhancement: Display the information state in case we encountered ignored errors
If syncing a file fails multiple times we mark it as ignored to skip it for a certain amount of time.
If we have ignored files we are not in sync, we now don't display the green icon.

Additionally this change aligns the icon displayed in the system tray with the icon displayed in the app.
Additionally, this change aligns the icon displayed in the system tray with the icon displayed in the app.

https://github.com/owncloud/client/issues/7715
https://github.com/owncloud/client/issues/7365
Expand Down
2 changes: 1 addition & 1 deletion changelog/2.9.0_2021-09-08/8299.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Change: Ignore the desktop.ini file in every directory, not only in top dir

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

Expand Down
4 changes: 2 additions & 2 deletions changelog/2.9.0_2021-09-08/8374.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Change: Include full os version in the about dialog
Change: Include full os version in the about-dialog

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

https://github.com/owncloud/client/pull/8374
2 changes: 1 addition & 1 deletion changelog/2.9.0_2021-09-08/8761.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Bugfix: Locked files are not correctly synced

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

https://github.com/owncloud/client/issues/8761
Expand Down
Loading

0 comments on commit 1bcc8d5

Please sign in to comment.