Merge branch 'criadoperez-fix/criadoperez'

README.md

@@ -50,7 +50,7 @@ Please download binaries from [here](https://github.com/zoneminder/zmNinja/relea
 Key Features 
 -------------
 * Push Notifications  Object detection/face recognition for alarms (Needs the [eventserver](https://github.com/zoneminder/zmeventserver) to be set up)
-* Multiple languages (English, French, German, Spanish, Portugese, Dutch, and more)
+* Multiple languages (English, French, German, Spanish, Portuguese, Dutch, and more)
 * H264 video support
 * live views of monitors
 * Montage view (with multiple montage profile settings/sizes)

docs/guides/FAQ.rst

@@ -315,7 +315,7 @@ If you have used 'make-ssl-cert' or a similar tool that automatically
 generates the cert for you, its very likely you have certificate that
 uses the 'unix hostname' of your server. That will not work.
 
-Assuming you are usin apache and have SSL enabled, here is how to
+Assuming you are using apache and have SSL enabled, here is how to
 regenerate the certs (ubuntu specific, may need to tweak it for your
 distro)
 

docs/obsolete-SSL-Configuration.md

@@ -19,7 +19,7 @@ of the server you are installing ZM in. If not, zmNinja's SSL handshake will fai
 If you have used 'make-ssl-cert' or a similar tool that automatically generates the cert for you, its very likely
 you have certificate that uses the 'unix hostname' of your server. That will not work.
 
-Assuming you are usin apache and have SSL enabled, here is how to regenerate the certs
+Assuming you are using apache and have SSL enabled, here is how to regenerate the certs
 
 This will create a self-signed certificate/key pair and store it in /etc/apache2/ssl (you may have to create that directory, or store it elsewhere)
 

etc/css/ionic.app.css

@@ -8133,7 +8133,7 @@ input:checked + .checkbox-icon:after {
 .platform-android4_2 .toggle .track {
   -webkit-background-clip: padding-box; }
 
-/* the handle (circle) thats inside the toggle's track area */
+/* the handle (circle) that's inside the toggle's track area */
 /* also the handle's appearance when it is "off" */
 .toggle .handle {
   -webkit-transition: 0.3s cubic-bezier(0, 1.1, 1, 1.1);

etc/extensions/zmNinjaNotification/NotificationService.m

@@ -103,7 +103,7 @@ - (void)loadAttachmentForUrlString:(NSString *)urlString
                         attachment = [UNNotificationAttachment attachmentWithIdentifier:@"" URL:localURL options:nil error:&attachmentError];
                         if (attachmentError) {
 
-                            NSLog(@"unable to add attchment: %@", attachmentError.localizedDescription);
+                            NSLog(@"unable to add attachment: %@", attachmentError.localizedDescription);
 
                         }
                     }

etc/js/angular-animate.js

@@ -241,7 +241,7 @@ function resolveElementClasses(existing, toAdd, toRemove) {
     var obj = {};
     forEach(classes, function(klass) {
       // sometimes the split leaves empty string values
-      // incase extra spaces were applied to the options
+      // in case extra spaces were applied to the options
       if (klass.length) {
         obj[klass] = true;
       }
@@ -493,7 +493,7 @@ var $$AnimateChildrenDirective = [function() {
  * ```
  *
  * To actually start the animation we need to run `animation.start()` which will then return a promise that we can hook into to detect when the animation ends.
- * If we choose not to run the animation then we MUST run `animation.end()` to perform a cleanup on the element (since some CSS classes and stlyes may have been
+ * If we choose not to run the animation then we MUST run `animation.end()` to perform a cleanup on the element (since some CSS classes and styles may have been
  * applied to the element during the preparation phase). Note that all other properties such as duration, delay, transitions and keyframes are just properties
  * and that changing them will not reconfigure the parameters of the animation.
  *
@@ -529,7 +529,7 @@ var $$AnimateChildrenDirective = [function() {
  * ({@link ngAnimate#css-staggering-animations Click here to learn how CSS-based staggering works in ngAnimate.})
  * * `staggerIndex` - The numeric index representing the stagger item (e.g. a value of 5 is equal to the sixth item in the stagger; therefore when a
  * `stagger` option value of `0.1` is used then there will be a stagger delay of `600ms`)
- * `applyClassesEarly` - Whether or not the classes being added or removed will be used when detecting the animation. This is set by `$animate` when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time. (Note that this will prevent any transitions from occuring on the classes being added and removed.)
+ * `applyClassesEarly` - Whether or not the classes being added or removed will be used when detecting the animation. This is set by `$animate` when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time. (Note that this will prevent any transitions from occurring on the classes being added and removed.)
  *
  * @return {object} an object with start and end methods and details about the animation.
  *
@@ -746,7 +746,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
       }
 
       // we keep putting this in multiple times even though the value and the cacheKey are the same
-      // because we're keeping an interal tally of how many duplicate animations are detected.
+      // because we're keeping an internal tally of how many duplicate animations are detected.
       gcsLookup.put(cacheKey, timings);
       return timings;
     }
@@ -767,7 +767,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
 
           stagger = computeCssStyles($window, node, properties);
 
-          // force the conversion of a null value to zero incase not set
+          // force the conversion of a null value to zero in case not set
           stagger.animationDuration = Math.max(stagger.animationDuration, 0);
           stagger.transitionDuration = Math.max(stagger.transitionDuration, 0);
 
@@ -1144,7 +1144,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
           }
         };
 
-        // checking the stagger duration prevents an accidently cascade of the CSS delay style
+        // checking the stagger duration prevents an accidentally cascade of the CSS delay style
         // being inherited from the parent. If the transition duration is zero then we can safely
         // rely that the delay value is an intential stagger delay style.
         var maxStagger = itemIndex > 0
@@ -1169,7 +1169,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
         };
 
         function triggerAnimationStart() {
-          // just incase a stagger animation kicks in when the animation
+          // just in case a stagger animation kicks in when the animation
           // itself was cancelled entirely
           if (animationClosed) return;
 
@@ -3637,7 +3637,7 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
  * ### Preventing Collisions With Third Party Libraries
  *
  * Some third-party frameworks place animation duration defaults across many element or className
- * selectors in order to make their code small and reuseable. This can lead to issues with ngAnimate, which
+ * selectors in order to make their code small and reusable. This can lead to issues with ngAnimate, which
  * is expecting actual animations on these elements and has to wait for their completion.
  *
  * You can prevent this unwanted behavior by using a prefix on all your animation classes:

etc/js/angular-carousel.js

@@ -442,7 +442,7 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
                         }
 
                         function updateSlidesPosition(offset) {
-                            // manually apply transformation to carousel childrens
+                            // manually apply transformation to carousel children
                             // todo : optim : apply only to visible items
                             var x = scope.carouselBufferIndex * 100 + offset;
                             angular.forEach(getSlidesDOM(), function(child, index) {
@@ -809,7 +809,7 @@ angular.module('angular-carousel').run(['$templateCache', function($templateCach
                         scope.carouselBufferSize = options.bufferSize;
 
                         function updateBufferIndex() {
-                            // update and cap te buffer index
+                            // update and cap the buffer index
                             var bufferIndex = 0;
                             var bufferEdgeSize = (scope.carouselBufferSize - 1) / 2;
                             if (isBuffered) {
@@ -1654,7 +1654,7 @@ angular.module('angular-carousel.shifty', [])
     }
 
     // Fake a Tweenable and patch some internals.  This approach allows us to
-    // skip uneccessary processing and object recreation, cutting down on garbage
+    // skip unnecessary processing and object recreation, cutting down on garbage
     // collection pauses.
     var mockTweenable = new Tweenable();
     mockTweenable._filterArgs = [];

etc/js/angular-translate.js

@@ -913,7 +913,7 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
    * @methodOf pascalprecht.translate.$translateProvider
    *
    * @description
-   * Tells the module which key must represent the choosed language by a user in the storage.
+   * Tells the module which key must represent the chosen language by a user in the storage.
    *
    * @param {string} key A key for the storage.
    */
@@ -1914,7 +1914,7 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
             missingTranslationHandlerTranslation = translateByHandler(translationId, interpolateParams, defaultTranslationText);
           }
 
-          // since we couldn't translate the inital requested translation id,
+          // since we couldn't translate the initial requested translation id,
           // we try it now with one or more fallback languages, if fallback language(s) is
           // configured.
           if (uses && $fallbackLanguage && $fallbackLanguage.length) {
@@ -1972,7 +1972,7 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
             missingTranslationHandlerTranslation = translateByHandler(translationId, interpolateParams);
           }
 
-          // since we couldn't translate the inital requested translation id,
+          // since we couldn't translate the initial requested translation id,
           // we try it now with one or more fallback languages, if fallback language(s) is
           // configured.
           if (uses && $fallbackLanguage && $fallbackLanguage.length) {
@@ -2187,7 +2187,7 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
        * @description
        * Tells angular-translate which language to use by given language key. This method is
        * used to change language at runtime. It also takes care of storing the language
-       * key in a configured store to let your app remember the choosed language.
+       * key in a configured store to let your app remember the chosen language.
        *
        * When trying to 'use' a language which isn't available it tries to load it
        * asynchronously with registered loaders.
@@ -2752,7 +2752,7 @@ function $translateDefaultInterpolation ($interpolate, $translateSanitization) {
    * @methodOf pascalprecht.translate.$translateDefaultInterpolation
    *
    * @description
-   * Interpolates given value agains given interpolate params using angulars
+   * Interpolates given value against given interpolate params using angulars
    * `$interpolate` service.
    *
    * Since AngularJS 1.5, `value` must not be a string but can be anything input.
@@ -2772,7 +2772,7 @@ function $translateDefaultInterpolation ($interpolate, $translateSanitization) {
       interpolatedText = $interpolate(value)(interpolationParams);
       interpolatedText = $translateSanitization.sanitize(interpolatedText, 'text');
     } else {
-      // neither a number or a string, cant interpolate => empty string
+      // neither a number or a string, can't interpolate => empty string
       interpolatedText = '';
     }
 
@@ -2968,7 +2968,7 @@ function translateDirective($translate, $q, $interpolate, $compile, $parse, $roo
                 });
               }
             } else {
-              // do not assigne the translation id if it is empty.
+              // do not assign the translation id if it is empty.
               translationIds.translate = !iElementText ? undefined : iElementText;
             }
           } else {

etc/js/angular-wizard.js

@@ -174,7 +174,7 @@ angular.module('mgo-angular-wizard').directive('wizard', function() {
                     //setting variable to false so all other step changes must pass validation
                     firstRun = false;
                 } else {
-                    //createing variables to capture current state that goTo() was invoked from and allow booleans
+                    //creating variables to capture current state that goTo() was invoked from and allow booleans
                     var thisStep;
                     //getting data for step you are transitioning out of
                     if($scope.currentStepNumber() > 0){
@@ -253,7 +253,7 @@ angular.module('mgo-angular-wizard').directive('wizard', function() {
             }
 
             $scope.currentStepNumber = function() {
-                //retreive current step number
+                //retrieve current step number
                 return stepIdx($scope.selectedStep) + 1;
             };
 

etc/js/crypto-js.js

@@ -934,7 +934,7 @@
 	            var M_offset_14 = M[offset + 14];
 	            var M_offset_15 = M[offset + 15];
 
-	            // Working varialbes
+	            // Working variables
 	            var a = H[0];
 	            var b = H[1];
 	            var c = H[2];

etc/js/draggabilly.pkgd.js

@@ -903,7 +903,7 @@ proto._dragPointerDown = function( event, pointer ) {
   }
 };
 
-// overwriteable method so Flickity can prevent for scrolling
+// overwritable method so Flickity can prevent for scrolling
 proto.canPreventDefaultOnPointerDown = function( event ) {
   // prevent default, unless touchstart or <select>
   return event.target.nodeName != 'SELECT';

etc/js/localforage.js

@@ -974,7 +974,7 @@ function iterate(iterator, callback) {
                             }
                             var result = iterator(value, cursor.key, iterationNumber++);
 
-                            // when the iterator callback retuns any
+                            // when the iterator callback returns any
                             // (non-`undefined`) value, then we stop
                             // the iteration immediately
                             if (result !== void 0) {
@@ -1563,7 +1563,7 @@ function serialize(value, callback) {
 
         callback(marker + bufferToString(buffer));
     } else if (valueType === '[object Blob]') {
-        // Conver the blob to a binaryArray and then to a string.
+        // Convert the blob to a binaryArray and then to a string.
         var fileReader = new FileReader();
 
         fileReader.onload = function () {

etc/js/ng-cordova.js

@@ -137,7 +137,7 @@ angular.module('ngCordova.plugins.3dtouch', [])
             },
 
             /*
-             * Add a hanlder function for force touch events,
+             * Add a handler function for force touch events,
              *
              * @param    function callback
              * @return   promise
@@ -4016,7 +4016,7 @@ angular.module('ngCordova.plugins.googleAnalytics', [])
 // install   :
 // link      :
 
-// Google Maps needs ALOT of work!
+// Google Maps needs A LOT of work!
 // Not for production use
 
 angular.module('ngCordova.plugins.googleMap', [])
@@ -4059,7 +4059,7 @@ angular.module('ngCordova.plugins.googleMap', [])
         map.setVisible(isVisible);
         return q.promise;
       },
-      // I don't know how to deallocate te map and the google map plugin.
+      // I don't know how to deallocate the map and the google map plugin.
       cleanup: function () {
         map = null;
         // delete map;

etc/js/packery.pkgd.js

@@ -1361,7 +1361,7 @@ var noop = function() {};
 
 // globally unique identifiers
 var GUID = 0;
-// internal store of all Outlayer intances
+// internal store of all Outlayer instances
 var instances = {};
 
 
@@ -1539,7 +1539,7 @@ proto.layout = function() {
     layoutInstant : !this._isLayoutInited;
   this.layoutItems( this.items, isInstant );
 
-  // flag for initalized
+  // flag for initialized
   this._isLayoutInited = true;
 };
 

hooks/README.md

@@ -76,7 +76,7 @@ If a script returns a non-zero exit code, then the parent cordova command will b
 
 ## Writing hooks
 
-We highly recommend writting your hooks using Node.js so that they are
+We highly recommend writing your hooks using Node.js so that they are
 cross-platform. Some good examples are shown here:
 
 [http://devgirl.org/2013/11/12/three-hooks-your-cordovaphonegap-project-needs/](http://devgirl.org/2013/11/12/three-hooks-your-cordovaphonegap-project-needs/)

hooks/after_prepare/020_remove_sass_from_platforms.js

@@ -2,7 +2,7 @@
 
 /**
  * After prepare, files are copied to the platforms/ios and platforms/android folders.
- * Lets clean up some of those files that arent needed with this hook.
+ * Lets clean up some of those files that aren't needed with this hook.
  */
 var fs = require('fs');
 var path = require('path');

www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt

@@ -4,7 +4,7 @@ The code is free for personal, non commercial use
 http://creativecommons.org/licenses/by-nc-sa/4.0/
 In summary: Share Alike, Adapt,Attribute, NonCommercial
 
-zmNinja source code is also open for commerical licensing and white-labeling.
+zmNinja source code is also open for commercial licensing and white-labeling.
 Please contact [email protected]
 
 For Desktop Clients Binaries: 

www/css/ionic.app.css

@@ -9663,7 +9663,7 @@ input:checked + .checkbox-icon:after {
   -webkit-background-clip: padding-box;
 }
 
-/* the handle (circle) thats inside the toggle's track area */
+/* the handle (circle) that's inside the toggle's track area */
 /* also the handle's appearance when it is "off" */
 .toggle .handle {
   -webkit-transition: 0.3s cubic-bezier(0, 1.1, 1, 1.1);

www/external/js/crypto-js.js

@@ -934,7 +934,7 @@
 	            var M_offset_14 = M[offset + 14];
 	            var M_offset_15 = M[offset + 15];
 
-	            // Working varialbes
+	            // Working variables
 	            var a = H[0];
 	            var b = H[1];
 	            var c = H[2];