diff --git a/core/css/apps.css b/core/css/apps.css index de40c40dfc5ab8fbd9dec33e82a8f364b0594413..79044fbaee5483b4e6d9cb6d0c7889e6b8a145d8 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -84,7 +84,7 @@ } #app-navigation .collapse { - display: none; /* hide collapse button intially */ + display: none; /* hide collapse button initially */ } #app-navigation .collapsible > .collapse { position: absolute; diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js index a4373ec82bf73c4c4fbb2e086d0e3e5b33cc6dcd..23ddf94771948f50c11fe3e7aac1f5696f636b87 100644 --- a/core/js/jquery-showpassword.js +++ b/core/js/jquery-showpassword.js @@ -1,6 +1,6 @@ /* * @name Show Password -* @descripton +* @description * @version 1.3 * @requires Jquery 1.5 * diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index d87c234e14e2779a918144263022a2209f44a35b..6ae9cf78a13cc68587415331be19243b271cd84e 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -21,7 +21,7 @@ * This will make the div to jdoe's fitting avatar, with a size of 128px. * * 2. $('.avatardiv').avatar('jdoe'); - * This will make the div to jdoe's fitting avatar. If the div aready has a + * This will make the div to jdoe's fitting avatar. If the div already has a * height, it will be used for the avatars size. Otherwise this plugin will * search for 'size' DOM data, to use for avatar size. If neither are available * it will default to 64px. @@ -117,7 +117,7 @@ var img = new Image(); - // If the new image loads successfull set it. + // If the new image loads successfully set it. img.onload = function() { $div.show(); $div.text(''); diff --git a/core/js/js.js b/core/js/js.js index b74775a935f8e605dbbb6f7e0ef29313de7c7ea8..598e0dcd185ec1cb53148a6e68528b92900e6809 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -255,7 +255,7 @@ var OC={ * * Examples: * http://example.com => example.com - * https://example.com => exmaple.com + * https://example.com => example.com * http://example.com:8080 => example.com:8080 * * @return {string} host @@ -1510,7 +1510,7 @@ function initCore() { initSessionHeartBeat(); } - if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that dont support svg + if(!OC.Util.hasSVGSupport()){ //replace all svg images with png images for browser that don't support svg OC.Util.replaceSVG(); }else{ SVGSupport.checkMimeType(); diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js index e5ef5bb1d6f6752021038030b1c6e55e170e2263..56f53caddae8e84b92a007f2207ed792027d90b9 100644 --- a/core/js/sharedialogview.js +++ b/core/js/sharedialogview.js @@ -238,7 +238,7 @@ ).fail(function() { $loading.addClass('hidden'); $loading.removeClass('inlineblock'); - OC.Notification.show(t('core', 'An error occured. Please try again')); + OC.Notification.show(t('core', 'An error occurred. Please try again')); window.setTimeout(OC.Notification.hide, 5000); }); }, diff --git a/core/strings.php b/core/strings.php index 4936866377ab50a9856a3069b0bd3e008d003db5..ba4bc17813c274aee61afe2fe212b389c47e2c24 100644 --- a/core/strings.php +++ b/core/strings.php @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/> * */ -//some strings that are used in /lib but wont be translatable unless they are in /core too +//some strings that are used in /lib but won't be translatable unless they are in /core too $l = \OC::$server->getL10N('core'); $l->t("Personal"); $l->t("Users"); diff --git a/core/templates/login.php b/core/templates/login.php index a12008295c47fa62e708ecbe1474a43d9f3a7e2d..ef89d227d249dd8c6f0f76c07c28b495fe6275b8 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -27,7 +27,7 @@ script('core', [ <?php endforeach; ?> <?php if (isset($_['internalexception']) && ($_['internalexception'])): ?> <div class="warning"> - <?php p($l->t('An internal error occured.')); ?><br> + <?php p($l->t('An internal error occurred.')); ?><br> <small><?php p($l->t('Please try again or contact your administrator.')); ?></small> </div> <?php endif; ?>