summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2016-04-04 10:57:17 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2016-04-04 10:57:17 +0200
commit62a5952a72a84393008f3546a39235534b748b1d (patch)
tree8b369082ac75f1c35dba06d6e4af7f8675a97efb
parente0bae322885f14ea6481e32ef05e2d2e7df439ad (diff)
downloadnextcloud-server-62a5952a72a84393008f3546a39235534b748b1d.tar.gz
nextcloud-server-62a5952a72a84393008f3546a39235534b748b1d.zip
core: Fix typos (found by codespell)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
-rw-r--r--core/css/apps.css2
-rw-r--r--core/js/jquery-showpassword.js2
-rw-r--r--core/js/jquery.avatar.js4
-rw-r--r--core/js/js.js4
-rw-r--r--core/js/sharedialogview.js2
-rw-r--r--core/strings.php2
-rw-r--r--core/templates/login.php2
7 files changed, 9 insertions, 9 deletions
diff --git a/core/css/apps.css b/core/css/apps.css
index de40c40dfc5..79044fbaee5 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 a4373ec82bf..23ddf947719 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 d87c234e14e..6ae9cf78a13 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 b74775a935f..598e0dcd185 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 e5ef5bb1d6f..56f53caddae 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 4936866377a..ba4bc17813c 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 a12008295c4..ef89d227d24 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; ?>