summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-08 08:58:32 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-08 08:58:32 +0200
commit9bfe14f7781f6f7567cfbf109474254cf6272518 (patch)
tree8ab9558c7e5fa500989100a6b4d73e68a79d4234
parent2b992c5683716faee80e2e0936dc2bbd01b3de09 (diff)
parentb93f5556f20e8e5ce5c235fee11dec4c2a070060 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--CHANGELOG2
-rw-r--r--plugins/acl/acl.php2
-rw-r--r--plugins/enigma/enigma.php2
-rw-r--r--plugins/subscriptions_option/subscriptions_option.php2
-rw-r--r--plugins/vcard_attachments/vcard_attachments.php2
-rw-r--r--program/include/rcube_db.php2
-rw-r--r--program/include/rcube_spellchecker.php12
-rw-r--r--program/include/rcube_vcard.php2
-rw-r--r--program/lib/Mail/mime.php2
-rw-r--r--program/lib/Mail/mimePart.php2
10 files changed, 15 insertions, 15 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4ff82a480..464bc40e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -187,7 +187,7 @@ RELEASE 0.7
- Fix handling contact photo url with https:// prefix (#1488202)
- Fix possible infinite redirect on attachment preview (#1488199)
- Improved clickjacking protection for browsers which don't support X-Frame-Options headers
-- Fixed bug where similiar folder names were highlighted wrong (#1487860)
+- Fixed bug where similar folder names were highlighted wrong (#1487860)
- Fixed bug in handling link with '!' character in it (#1488195)
- Fixed bug where session ID's length was limited to 40 characters (#1488196)
- TinyMCE security issue: removed moxieplayer (embedding flv and mp4 is not supported anymore)
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 8709f0b00..144250495 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -615,7 +615,7 @@ class acl extends rcube_plugin
private function get_realm()
{
// When user enters a username without domain part, realm
- // alows to add it to the username (and display correct username in the table)
+ // allows to add it to the username (and display correct username in the table)
if (isset($_SESSION['acl_username_realm'])) {
return $_SESSION['acl_username_realm'];
diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php
index 22afc901d..a4009ce26 100644
--- a/plugins/enigma/enigma.php
+++ b/plugins/enigma/enigma.php
@@ -429,7 +429,7 @@ class enigma extends rcube_plugin
$style = "margin:0 1em; padding:0.2em 0.5em; border:1px solid #999; width: auto"
." border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px";
- // add box below messsage body
+ // add box below message body
$p['content'] .= html::p(array('style' => $style),
html::a(array(
'href' => "#",
diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
index 8b27afbdc..b81a5ac8a 100644
--- a/plugins/subscriptions_option/subscriptions_option.php
+++ b/plugins/subscriptions_option/subscriptions_option.php
@@ -9,7 +9,7 @@
*
* Add it to the plugins list in config/main.inc.php to enable the user option
* The user option can be hidden and set globally by adding 'use_subscriptions'
- * to the the 'dont_override' configure line:
+ * to the 'dont_override' configure line:
* $rcmail_config['dont_override'] = array('use_subscriptions');
* and then set the global preference
* $rcmail_config['use_subscriptions'] = true; // or false
diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index 1400cd581..ed6d45325 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -81,7 +81,7 @@ class vcard_attachments extends rcube_plugin
if ($vcard->email[0])
$display .= ' <'.$vcard->email[0].'>';
- // add box below messsage body
+ // add box below message body
$p['content'] .= html::p(array('class' => 'vcardattachment'),
html::a(array(
'href' => "#",
diff --git a/program/include/rcube_db.php b/program/include/rcube_db.php
index d0d213cd0..33dcbe975 100644
--- a/program/include/rcube_db.php
+++ b/program/include/rcube_db.php
@@ -196,7 +196,7 @@ class rcube_db
}
/**
- * Connect to appropiate database depending on the operation
+ * Connect to appropriate database depending on the operation
*
* @param string $mode Connection mode (r|w)
*/
diff --git a/program/include/rcube_spellchecker.php b/program/include/rcube_spellchecker.php
index a2d1f7c61..219dca780 100644
--- a/program/include/rcube_spellchecker.php
+++ b/program/include/rcube_spellchecker.php
@@ -124,12 +124,12 @@ class rcube_spellchecker
/**
- * Returns mispelled words
+ * Returns misspelled words
*
* @param string $text The content for spellchecking. If empty content
* used for check() method will be used.
*
- * @return array List of mispelled words
+ * @return array List of misspelled words
*/
function get_words($text = null, $is_html=false)
{
@@ -164,7 +164,7 @@ class rcube_spellchecker
/**
- * Returns checking result (mispelled words with suggestions)
+ * Returns checking result (misspelled words with suggestions)
*
* @return array Spellchecking result. An array indexed by word.
*/
@@ -243,7 +243,7 @@ class rcube_spellchecker
/**
- * Returns the mispelled words
+ * Returns the misspelled words
*/
private function _pspell_words($text = null, $is_html=false)
{
@@ -257,7 +257,7 @@ class rcube_spellchecker
return array();
}
- // With PSpell we don't need to get suggestions to return mispelled words
+ // With PSpell we don't need to get suggestions to return misspelled words
if ($is_html) {
$text = $this->html2text($text);
}
@@ -289,7 +289,7 @@ class rcube_spellchecker
/**
- * Returns suggestions for mispelled word
+ * Returns suggestions for misspelled word
*/
private function _pspell_suggestions($word)
{
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index 52545a0d9..37cd3ab26 100644
--- a/program/include/rcube_vcard.php
+++ b/program/include/rcube_vcard.php
@@ -703,7 +703,7 @@ class rcube_vcard
*
* @param string vCard string to split
* @param string Separator char/string
- * @return array List with splitted values
+ * @return array List with splited values
*/
private static function vcard_unquote($s, $sep = ';')
{
diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
index 76c6ec2ff..c459b9123 100644
--- a/program/lib/Mail/mime.php
+++ b/program/lib/Mail/mime.php
@@ -1090,7 +1090,7 @@ class Mail_mime
/**
* Get the text version of the headers
- * (usefull if you want to use the PHP mail() function)
+ * (useful if you want to use the PHP mail() function)
*
* @param array $xtra_headers Assoc array with any extra headers (optional)
* (Don't set Content-Type for multipart messages here!)
diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php
index 4e4170d8e..292227fb0 100644
--- a/program/lib/Mail/mimePart.php
+++ b/program/lib/Mail/mimePart.php
@@ -648,7 +648,7 @@ class Mail_mimePart
}
/**
- * Encodes the paramater of a header.
+ * Encodes the parameter of a header.
*
* @param string $name The name of the header-parameter
* @param string $value The value of the paramter