diff --git a/CHANGELOG.md b/CHANGELOG.md index 63def433ba..ab0ba9a492 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,7 +46,7 @@ - Display quota if configured/available in navigation drawer - Resume chunked uploads instead of complete restarts - Filter remote and local file lists -- Simple integration with DAVdroid for calender and contacts sync +- Simple integration with DAVdroid for calendar and contacts sync - Mix folders and files on sort by date - Upload when charging option - Revamp upload options Move/Copy/Just-Upload diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 299cb57dd8..48e74b035a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,7 +58,7 @@ If your issue appears to be a bug, and hasn't been reported, open a new issue. # Contributing to Source Code Thanks for wanting to contribute source code to Nextcloud. That's great! -New contributions are addded under AGPL version 3. +New contributions are added under AGPL version 3. ## Developing process We are all about quality while not sacrificing speed so we use a very pragmatic workflow. diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index 12dd17aee9..47839cf4ea 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -12,7 +12,7 @@ ########### This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License verions 2, +it under the terms of the GNU General Public License versions 2, as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, diff --git a/automationTest/README.md b/automationTest/README.md index 899bb8dc79..23450f9847 100644 --- a/automationTest/README.md +++ b/automationTest/README.md @@ -4,7 +4,7 @@ This project contains a set of automatic tests operating in the UI level. Tests are to be run with the tool Appium. Check [here][0] to install it and all its dependencies (including Maven). -You will need to modify the constants in automationTest/src/test/java/com/owncloud/android/test/ui/testSuites/Config.java to assign appropiate values for your test server and accounts. +You will need to modify the constants in automationTest/src/test/java/com/owncloud/android/test/ui/testSuites/Config.java to assign appropriate values for your test server and accounts. You will need to include the ownCloud.apk to test in automationTest/src/test/resources/. To run the tests from command line, plug a device to your computer or start and emulator. Then type @@ -15,6 +15,6 @@ To run only one category of the test mvn clean -Dtest=RunSmokeTests test -The project may also be imported in Eclipse, with the appropiate plug-ins, and run from it. +The project may also be imported in Eclipse, with the appropriate plug-ins, and run from it. [0]: http://appium.io/slate/en/master/?java#about-appium \ No newline at end of file diff --git a/src/main/java/com/owncloud/android/files/services/FileUploader.java b/src/main/java/com/owncloud/android/files/services/FileUploader.java index f8a6608622..e98e71d246 100644 --- a/src/main/java/com/owncloud/android/files/services/FileUploader.java +++ b/src/main/java/com/owncloud/android/files/services/FileUploader.java @@ -84,7 +84,7 @@ import java.util.Vector; * * On next invocation of {@link FileUploader} uploaded files which * previously failed will be uploaded again until either upload succeeded or a - * fatal error occured. + * fatal error occurred. * * Every file passed to this service is uploaded. No filtering is performed. * However, Intent keys (e.g., KEY_WIFI_ONLY) are obeyed. diff --git a/src/main/java/com/owncloud/android/media/MediaService.java b/src/main/java/com/owncloud/android/media/MediaService.java index 409943bdcf..e2850d8356 100644 --- a/src/main/java/com/owncloud/android/media/MediaService.java +++ b/src/main/java/com/owncloud/android/media/MediaService.java @@ -135,7 +135,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre /** Flag signaling if the audio should be played immediately when the file is prepared */ protected boolean mPlayOnPrepared; - /** Position, in miliseconds, where the audio should be started */ + /** Position, in milliseconds, where the audio should be started */ private int mStartPosition; /** Interface to access the service through binding */ @@ -568,7 +568,7 @@ public class MediaService extends Service implements OnCompletionListener, OnPre * * The system will avoid finishing the service as much as possible when resources as low. * - * A notification must be created to keep the user aware of the existance of the service. + * A notification must be created to keep the user aware of the existence of the service. */ private void setUpAsForeground(String content) { String ticker = String.format(getString(R.string.media_notif_ticker), getString(R.string.app_name)); diff --git a/src/main/java/com/owncloud/android/services/observer/FileObserverService.java b/src/main/java/com/owncloud/android/services/observer/FileObserverService.java index 375165cdb7..6692b56c66 100644 --- a/src/main/java/com/owncloud/android/services/observer/FileObserverService.java +++ b/src/main/java/com/owncloud/android/services/observer/FileObserverService.java @@ -177,7 +177,7 @@ public class FileObserverService extends Service { (Account) intent.getParcelableExtra(ARG_ACCOUNT)); } else { - Log_OC.e(TAG, "Unknown action recieved; ignoring it: " + intent.getAction()); + Log_OC.e(TAG, "Unknown action received; ignoring it: " + intent.getAction()); } return Service.START_STICKY; diff --git a/src/main/java/com/owncloud/android/services/observer/SyncedFolderObserverService.java b/src/main/java/com/owncloud/android/services/observer/SyncedFolderObserverService.java index fd48c23e70..ff9c58a621 100644 --- a/src/main/java/com/owncloud/android/services/observer/SyncedFolderObserverService.java +++ b/src/main/java/com/owncloud/android/services/observer/SyncedFolderObserverService.java @@ -72,7 +72,7 @@ public class SyncedFolderObserverService extends Service { observer.addListener(new AdvancedFileAlterationListener(syncedFolder)); monitor.addObserver(observer); } catch (Exception e) { - Log_OC.d(TAG, "Failed getting an observer to intialize " + e); + Log_OC.d(TAG, "Failed getting an observer to initialize " + e); } } @@ -138,7 +138,7 @@ public class SyncedFolderObserverService extends Service { advancedFileAlterationObserver.addListener(new AdvancedFileAlterationListener(syncedFolder)); monitor.addObserver(advancedFileAlterationObserver); } catch (Exception e) { - Log_OC.d(TAG, "Failed getting an observer to intialize"); + Log_OC.d(TAG, "Failed getting an observer to initialize"); } } else { monitor.removeObserver(fileAlterationObserver); @@ -155,7 +155,7 @@ public class SyncedFolderObserverService extends Service { advancedFileAlterationObserver.addListener(new AdvancedFileAlterationListener(syncedFolder)); monitor.addObserver(advancedFileAlterationObserver); } catch (Exception e) { - Log_OC.d(TAG, "Failed getting an observer to intialize"); + Log_OC.d(TAG, "Failed getting an observer to initialize"); } } diff --git a/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java index 1213e19175..358e707897 100644 --- a/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java +++ b/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java @@ -180,7 +180,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { } else { Log_OC.d(TAG, "Leaving synchronization before synchronizing the root folder " + - "because cancelation request"); + "because cancellation request"); } @@ -351,7 +351,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { if (mCancellation && i parent, View view, int position, long id) { - // to be @overriden + // to be @overridden } @Override