Browse Source

spelling fixes

klemens 7 năm trước cách đây
mục cha
commit
f30cbca78c

+ 1 - 1
CHANGELOG.md

@@ -46,7 +46,7 @@
 - Display quota if configured/available in navigation drawer
 - Display quota if configured/available in navigation drawer
 - Resume chunked uploads instead of complete restarts
 - Resume chunked uploads instead of complete restarts
 - Filter remote and local file lists
 - 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
 - Mix folders and files on sort by date
 - Upload when charging option
 - Upload when charging option
 - Revamp upload options Move/Copy/Just-Upload
 - Revamp upload options Move/Copy/Just-Upload

+ 1 - 1
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
 # Contributing to Source Code
 Thanks for wanting to contribute source code to Nextcloud. That's great!
 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
 ## Developing process
 We are all about quality while not sacrificing speed so we use a very pragmatic workflow.
 We are all about quality while not sacrificing speed so we use a very pragmatic workflow.

+ 1 - 1
THIRD_PARTY.txt

@@ -12,7 +12,7 @@
 ###########
 ###########
 
 
 This program is free software: you can redistribute it and/or modify
 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.
 as published by the Free Software Foundation.
 
 
 This program is distributed in the hope that it will be useful,
 This program is distributed in the hope that it will be useful,

+ 2 - 2
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).
 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/.
 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 
 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
 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
 [0]: http://appium.io/slate/en/master/?java#about-appium

+ 1 - 1
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
  * On next invocation of {@link FileUploader} uploaded files which
  * previously failed will be uploaded again until either upload succeeded or a
  * 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.
  * Every file passed to this service is uploaded. No filtering is performed.
  * However, Intent keys (e.g., KEY_WIFI_ONLY) are obeyed.
  * However, Intent keys (e.g., KEY_WIFI_ONLY) are obeyed.

+ 2 - 2
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 */
     /** Flag signaling if the audio should be played immediately when the file is prepared */
     protected boolean mPlayOnPrepared;
     protected boolean mPlayOnPrepared;
 
 
-    /** Position, in miliseconds, where the audio should be started */
+    /** Position, in milliseconds, where the audio should be started */
     private int mStartPosition;
     private int mStartPosition;
 
 
     /** Interface to access the service through binding */
     /** 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.
      * 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) {
     private void setUpAsForeground(String content) {
         String ticker = String.format(getString(R.string.media_notif_ticker), getString(R.string.app_name));
         String ticker = String.format(getString(R.string.media_notif_ticker), getString(R.string.app_name));

+ 1 - 1
src/main/java/com/owncloud/android/services/observer/FileObserverService.java

@@ -177,7 +177,7 @@ public class FileObserverService extends Service {
                     (Account) intent.getParcelableExtra(ARG_ACCOUNT));
                     (Account) intent.getParcelableExtra(ARG_ACCOUNT));
 
 
         } else {
         } 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;
         return Service.START_STICKY;

+ 3 - 3
src/main/java/com/owncloud/android/services/observer/SyncedFolderObserverService.java

@@ -72,7 +72,7 @@ public class SyncedFolderObserverService extends Service {
                     observer.addListener(new AdvancedFileAlterationListener(syncedFolder));
                     observer.addListener(new AdvancedFileAlterationListener(syncedFolder));
                     monitor.addObserver(observer);
                     monitor.addObserver(observer);
                 } catch (Exception e) {
                 } 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));
                         advancedFileAlterationObserver.addListener(new AdvancedFileAlterationListener(syncedFolder));
                         monitor.addObserver(advancedFileAlterationObserver);
                         monitor.addObserver(advancedFileAlterationObserver);
                     } catch (Exception e) {
                     } catch (Exception e) {
-                        Log_OC.d(TAG, "Failed getting an observer to intialize");
+                        Log_OC.d(TAG, "Failed getting an observer to initialize");
                     }
                     }
                 } else {
                 } else {
                     monitor.removeObserver(fileAlterationObserver);
                     monitor.removeObserver(fileAlterationObserver);
@@ -155,7 +155,7 @@ public class SyncedFolderObserverService extends Service {
                 advancedFileAlterationObserver.addListener(new AdvancedFileAlterationListener(syncedFolder));
                 advancedFileAlterationObserver.addListener(new AdvancedFileAlterationListener(syncedFolder));
                 monitor.addObserver(advancedFileAlterationObserver);
                 monitor.addObserver(advancedFileAlterationObserver);
             } catch (Exception e) {
             } catch (Exception e) {
-                Log_OC.d(TAG, "Failed getting an observer to intialize");
+                Log_OC.d(TAG, "Failed getting an observer to initialize");
             }
             }
 
 
         }
         }

+ 2 - 2
src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -180,7 +180,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 
                 
             } else {
             } else {
                 Log_OC.d(TAG, "Leaving synchronization before synchronizing the root folder " +
                 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 <files.size()) {
         if (mCancellation && i <files.size()) {
             Log_OC.d(TAG,
             Log_OC.d(TAG,
                     "Leaving synchronization before synchronizing " + files.get(i).getRemotePath() +
                     "Leaving synchronization before synchronizing " + files.get(i).getRemotePath() +
-                            " due to cancelation request");
+                            " due to cancellation request");
         }
         }
     }
     }
 
 

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/BaseActivity.java

@@ -222,7 +222,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         boolean mMandatoryCreation;
         boolean mMandatoryCreation;
 
 
         /**
         /**
-         * Constuctor
+         * Constructor
          *
          *
          * @param mandatoryCreation     When 'true', if an account was not created, the app is closed.
          * @param mandatoryCreation     When 'true', if an account was not created, the app is closed.
          */
          */

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java

@@ -171,7 +171,7 @@ public class PassCodeActivity extends AppCompatActivity {
 
 
 
 
     /**
     /**
-     * Binds the appropiate listeners to the input boxes receiving each digit of the pass code.
+     * Binds the appropriate listeners to the input boxes receiving each digit of the pass code.
      */
      */
     protected void setTextListeners() {
     protected void setTextListeners() {
     
     

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java

@@ -90,7 +90,7 @@ public class UploadListActivity extends FileActivity implements UploadListFragme
 
 
         setContentView(R.layout.upload_list_layout);
         setContentView(R.layout.upload_list_layout);
 
 
-        // this activity has no file really bound, it's for mulitple accounts at the same time; should no inherit
+        // this activity has no file really bound, it's for multiple accounts at the same time; should no inherit
         // from FileActivity; moreover, some behaviours inherited from FileActivity should be delegated to Fragments;
         // from FileActivity; moreover, some behaviours inherited from FileActivity should be delegated to Fragments;
         // but that's other story
         // but that's other story
         setFile(null);
         setFile(null);

+ 2 - 2
src/main/java/com/owncloud/android/ui/fragment/ExpandableListFragment.java

@@ -82,8 +82,8 @@ public class ExpandableListFragment extends ExtendedListFragment implements OnCh
 
 
     @Override
     @Override
     public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
     public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
-        // to be @overriden
-        Log_OC.e(TAG, "onChildClick(). This method should be overriden!");
+        // to be @overridden
+        Log_OC.e(TAG, "onChildClick(). This method should be overridden!");
         return false;
         return false;
     }
     }
 }
 }

+ 1 - 1
src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -549,7 +549,7 @@ public class ExtendedListFragment extends Fragment
 
 
     @Override
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        // to be @overriden
+        // to be @overridden
     }
     }
 
 
     @Override
     @Override