spelling fixes (#5690)

CHANGELOG

@@ -374,7 +374,7 @@ RELEASE 1.1.1
 - Fix fatal errors on systems without mbstring extension or mb_regex_encoding() function (#4769)
 - Fix cursor position on reply below the quote in HTML mode (#4759)
 - Fix so "over quota" errors are displayed also in message compose page
-- Fix duplicate entries supression in autocomplete result (#4776)
+- Fix duplicate entries suppression in autocomplete result (#4776)
 - Fix "Non-static method PEAR::isError() should not be called statically" errors (#4770)
 - Fix parsing invalid HTML messages with BOM after <!DOCTYPE> (#4777)
 - Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#4779)
@@ -447,7 +447,7 @@ RELEASE 1.1-beta
 - Fix restoring draft messages from localStorage if editor mode differs (#4631)
 - Added config option/user preference to disable saving messages in localStorage (#4606)
 - Added config option 'imap_log_session' to enable Roundcube <-> IMAP session ID logging
-- Added config option 'log_session_id' to control the lengh of the session identifer in logs
+- Added config option 'log_session_id' to control the length of the session identifier in logs
 - Implemented 'storage_connected' API hook after successful IMAP login (#4638)
 - Intergrate Net_LDAP3 and rcube_ldap_generic classes
 - Add option (disabled_actions) to disable UI elements/actions (#4478)
@@ -760,7 +760,7 @@ RELEASE 0.9.4
 - Make identities matching case insensitive (#1881)
 - Fix issue where too big message data was stored in cache causing sql errors (#4325)
 - Fix iframe scrollbars on webkit desktop browsers (#4319)
-- Fix issue where legacy config was overriden by default config (#4305)
+- Fix issue where legacy config was overridden by default config (#4305)
 - Fix newmail_notifier issue where favicon wasn't changed back to default (#4324)
 - Fix setting of Junk and NonJunk flags by markasjunk plugin (#4303)
 - Fix lack of Reply-To address in header of forwarded message body (#4314)
@@ -844,7 +844,7 @@ RELEASE 0.9.1
 - Fix so Sender: address is added to Cc: field on reply to all (#4140)
 - Fix so addressbook_search_mode works also for group search (#4183)
 - Fix removal of a contact from a group in LDAP addressbook (#4185)
-- Inlcude SQL query in the log on SQL error (#4172)
+- Include SQL query in the log on SQL error (#4172)
 - Fix handling untagged responses in IMAP FETCH - "could not load message" error (#4180)
 - Fix very small window size in Chrome (#4087)
 - Fix list page reset when viewing a message in Larry skin (#4182)
@@ -1131,7 +1131,7 @@ RELEASE 0.8-rc
 - Add IE8 hack for messages list issue (#3317)
 - Fix handling errors on draft auto-save
 - Fix importing vCard photo with ENCODING param specified (#3746)
-- Support mutliple name/email pairs for Bcc and Reply-To identity settings (#3752)
+- Support multiple name/email pairs for Bcc and Reply-To identity settings (#3752)
 - Set flexible width to login form fields (#3735)
 - Fix re-draw bug on list columns change in IE8 (#3318)
 - Allow mass-removal of addresses from a group (#3259)
@@ -1627,7 +1627,7 @@ RELEASE 0.4.1
 
 RELEASE 0.4
 -----------
-- Fix disapearing upload form disapears when user selects a file on Safari (#2917)
+- Fix disappearing upload form disappears when user selects a file on Safari (#2917)
 - Don't replace error messages with loading info (#2534)
 - Fix JS errors on compose mode switch (#2952)
 - Fix message structure parsing when it lacks optional fields (#2960)
@@ -2290,7 +2290,7 @@ RELEASE 0.1-RC2
 - Improve message compose screen (closes #1060)
 - Select next row after removing one from list (#1063)
 - Make smtp HELO/EHLO hostname configurable (#851)
-- IPv6 Compatability (#1023), Patch #1484373
+- IPv6 Compatibility (#1023), Patch #1484373
 - Unlock interface when message sending fails (#1188)
 - Eval PHP code in template includes (if configured)
 - Show message when folder is empty. Mo more static text in table (#1068)
@@ -2396,7 +2396,7 @@ RELEASE 0.1-RC1
 - Corrected date string in sent message header (closes #887)
 - Correclty choose "To" column in sent and draft mailboxes (closes #769)
 - Changed srong tooltips for message browse buttons (closes #757)
-- Fixed signature delimeter character to be standard (Bug #830)
+- Fixed signature delimiter character to be standard (Bug #830)
 - Fixed XSS vulnerability (Bug #877)
 - Remove newlines from mail headers (Bug #827)
 - Selection issues when moving/deleting (Bug #837)

config/defaults.inc.php

@@ -85,7 +85,7 @@ $config['syslog_id'] = 'roundcube';
 $config['syslog_facility'] = LOG_USER;
 
 // Activate this option if logs should be written to per-user directories.
-// Data will only be logged if a directry <log_dir>/<username>/ exists and is writable.
+// Data will only be logged if a directory <log_dir>/<username>/ exists and is writable.
 $config['per_user_logging'] = false;
 
 // Log sent messages to <log_dir>/sendmail or to syslog
@@ -210,7 +210,7 @@ $config['imap_skip_hidden_folders'] = false;
 // Note: Because the list is cached, re-login is required after change.
 $config['imap_disabled_caps'] = array();
 
-// Log IMAP session identifers after each IMAP login.
+// Log IMAP session identifiers after each IMAP login.
 // This is used to relate IMAP session with Roundcube user sessions
 $config['imap_log_session'] = false;
 
@@ -351,7 +351,7 @@ $config['apc_max_allowed_packet'] = '2M';
 // ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
 $config['enable_installer'] = false;
 
-// don't allow these settings to be overriden by the user
+// don't allow these settings to be overridden by the user
 $config['dont_override'] = array();
 
 // List of disabled UI elements/actions
@@ -1052,7 +1052,7 @@ $config['addressbook_sort_col'] = 'surname';
 $config['addressbook_name_listing'] = 0;
 
 // use this timezone to display date/time
-// valid timezone identifers are listed here: php.net/manual/en/timezones.php
+// valid timezone identifiers are listed here: php.net/manual/en/timezones.php
 // 'auto' will use the browser's timezone settings
 $config['timezone'] = 'auto';
 

installer/client.js

@@ -1,6 +1,6 @@
 /*
  +-----------------------------------------------------------------------+
- | Roundcube installer cleint function                                   |
+ | Roundcube installer client function                                   |
  |                                                                       |
  | This file is part of the Roundcube web development suite              |
  | Copyright (C) 2009-2012, The Roundcube Dev Team                       |

plugins/acl/acl.js

@@ -368,7 +368,7 @@ rcube_webmail.prototype.acl_init_form = function(id)
         $('input:checked', type_list).focus();
 }
 
-// Returns class name according to ACL comparision result
+// Returns class name according to ACL comparison result
 rcube_webmail.prototype.acl_class = function(acl1, acl2)
 {
     var i, len, found = 0;

plugins/acl/acl.php

@@ -611,7 +611,7 @@ class acl extends rcube_plugin
      * @param array $acl1 ACL rights array (or string)
      * @param array $acl2 ACL rights array (or string)
      *
-     * @param int Comparision result, 2 - full match, 1 - partial match, 0 - no match
+     * @param int Comparison result, 2 - full match, 1 - partial match, 0 - no match
      */
     function acl_compare($acl1, $acl2)
     {

plugins/attachment_reminder/attachment_reminder.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Attachement Reminder
+ * Attachment Reminder
  *
  * A plugin that reminds a user to attach the files
  *

plugins/emoticons/emoticons.php

@@ -90,7 +90,7 @@ class emoticons extends rcube_plugin
      * editor with plain text emoticons.
      *
      * This is executed on html2text action, i.e. when switching from HTML to text
-     * in compose window (or similiar place). Also when generating alternative
+     * in compose window (or similar place). Also when generating alternative
      * text/plain part.
      */
     function html2text($args)

plugins/filesystem_attachments/filesystem_attachments.php

@@ -114,7 +114,7 @@ class filesystem_attachments extends rcube_plugin
     /**
      * When composing an html message, image attachments may be shown
      * For this plugin, the file is already in place, just check for
-     * the existance of the proper metadata
+     * the existence of the proper metadata
      */
     function display($args)
     {

plugins/password/config.inc.php.dist

@@ -328,7 +328,7 @@ $config['password_vpopmaild_host'] = 'localhost';
 // TCP port used for vpopmaild connections
 $config['password_vpopmaild_port'] = 89;
 
-// Timout used for the connection to vpopmaild (in seconds)
+// Timeout used for the connection to vpopmaild (in seconds)
 $config['password_vpopmaild_timeout'] = 10;
 
 

plugins/password/drivers/directadmin.php

@@ -152,8 +152,8 @@ class HTTPSocket {
     /**
      * Specify a username and password.
      *
-     * @param string|null username. defualt is null
-     * @param string|null password. defualt is null
+     * @param string|null username. default is null
+     * @param string|null password. default is null
      */
     function set_login( $uname = '', $passwd = '' )
     {

plugins/password/drivers/plesk.php

@@ -120,7 +120,7 @@ class plesk_rpc
      * send a request to the plesk
      *
      * @param string $packet XML-Packet to send to Plesk
-     * @returns bool request was successfull or not
+     * @returns bool request was successful or not
      */
     function send_request($packet)
     {
@@ -152,7 +152,7 @@ class plesk_rpc
     }
 
     /**
-     * Get all hosting-informations of a domain
+     * Get all hosting-information of a domain
      *
      * @param string $domain domain-name
      * @returns object SimpleXML object
@@ -199,7 +199,7 @@ class plesk_rpc
     /**
      * Change Password of a mailbox
      *
-     * @param string $mailbox full email-adress (user@domain.tld)
+     * @param string $mailbox full email-address (user@domain.tld)
      * @param string $newpass new password of mailbox
      *
      * @returns bool

plugins/password/helpers/change_ldap_pass.pl

@@ -48,7 +48,7 @@ if ($active_server) {
     if ($mesg->code != 0) {
         print "Cannot login: ". $mesg->error;
     } else {
-        # Wyszukanie usera wg filtra
+        # Wyszukanie users wg filtra
         $PAR{'filter'} =~ s/\%login/$PAR{'user'}/;
         my @search_args = (
             base => $PAR{'base'},

plugins/squirrelmail_usercopy/squirrelmail_usercopy.php

@@ -192,7 +192,7 @@ class squirrelmail_usercopy extends rcube_plugin
                     }
                 }
 
-                // parse addres book file
+                // parse address book file
                 if (filesize($abookfile)) {
                     foreach (file($abookfile) as $line) {
                         $line = $this->convert_charset(rtrim($line), $file_charset);
@@ -234,7 +234,7 @@ class squirrelmail_usercopy extends rcube_plugin
             $sql_result = $db->query('SELECT * FROM ' . $db->quote_identifier($address_table)
                 .' WHERE `owner` = ?', $uname); // ? is replaced with emailaddress
 
-            // parse addres book
+            // parse address book
             while ($sql_array = $db->fetch_assoc($sql_result) ) { // fetch one row from result
                 $rec['name']      = rcube_charset::convert(rtrim($sql_array['nickname']), $db_charset);
                 $rec['firstname'] = rcube_charset::convert(rtrim($sql_array['firstname']), $db_charset);

program/include/rcmail.php

@@ -493,7 +493,7 @@ class rcmail extends rcube
     }
 
     /**
-     * Perfom login to the mail server and to the webmail service.
+     * Perform login to the mail server and to the webmail service.
      * This will also create a new user entry if auto_create_user is configured.
      *
      * @param string $username    Mail storage (IMAP) user name
@@ -1194,7 +1194,7 @@ class rcmail extends rcube
      *
      * @param mixed  $date    Date representation (string, timestamp or DateTime object)
      * @param string $format  Date format to use
-     * @param bool   $convert Enables date convertion according to user timezone
+     * @param bool   $convert Enables date conversion according to user timezone
      *
      * @return string Formatted date string
      */

program/include/rcmail_output_html.php

@@ -277,7 +277,7 @@ EOF;
     {
         $this->skin_paths[] = $skin_path;
 
-        // read meta file and check for dependecies
+        // read meta file and check for dependencies
         $meta = @file_get_contents(RCUBE_INSTALL_PATH . $skin_path . '/meta.json');
         $meta = @json_decode($meta, true);
 
@@ -788,7 +788,7 @@ EOF;
     }
 
     /**
-     * Callback funtion for preg_replace_callback() in parse_with_globals()
+     * Callback function for preg_replace_callback() in parse_with_globals()
      */
     protected function globals_callback($matches)
     {

program/js/treelist.js

@@ -32,7 +32,7 @@
 
 /**
  * Roundcube Treelist widget class
- * @contructor
+ * @constructor
  */
 function rcube_treelist_widget(node, p)
 {

program/lib/Roundcube/html.php

@@ -65,7 +65,7 @@ class html
      *
      * @param string $tagname Tag name
      * @param array  $attrib  Tag attributes as key/value pairs
-     * @param string $content Optinal Tag content (creates a container tag)
+     * @param string $content Optional Tag content (creates a container tag)
      * @param array  $allowed List with allowed attributes, omit to allow all
      *
      * @return string The XHTML tag
@@ -630,7 +630,7 @@ class html_textarea extends html
  * $select->add(array('Switzerland','Germany'), array('CH','DE'));
  *
  * // generate pulldown with selection 'Switzerland'  and return html-code
- * // as second argument the same attributes available to instanciate can be used
+ * // as second argument the same attributes available to instantiate can be used
  * print $select->show('CH');
  * </pre>
  *

program/lib/Roundcube/rcube.php

@@ -39,7 +39,7 @@ class rcube
     const DEBUG_LINE_LENGTH = 4096;
 
     /**
-     * Singleton instace of rcube
+     * Singleton instance of rcube
      *
      * @var rcube
      */
@@ -53,21 +53,21 @@ class rcube
     public $config;
 
     /**
-     * Instace of database class.
+     * Instance of database class.
      *
      * @var rcube_db
      */
     public $db;
 
     /**
-     * Instace of Memcache class.
+     * Instance of Memcache class.
      *
      * @var Memcache
      */
     public $memcache;
 
    /**
-     * Instace of rcube_session class.
+     * Instance of rcube_session class.
      *
      * @var rcube_session
      */

program/lib/Roundcube/rcube_addressbook.php

@@ -668,7 +668,7 @@ abstract class rcube_addressbook
      * @param string       $search  Search value
      * @param int          $mode    Search mode
      *
-     * @return bool Comparision result
+     * @return bool Comparison result
      */
     protected function compare_search_value($colname, $value, $search, $mode)
     {

program/lib/Roundcube/rcube_charset.php

@@ -144,7 +144,7 @@ class rcube_charset
             else if (!empty($aliases[$m[1]])) {
                 $result = 'ISO-8859-'.$aliases[$m[1]];
             }
-            // iconv requires convertion of e.g. LATIN-1 to LATIN1
+            // iconv requires conversion of e.g. LATIN-1 to LATIN1
             else {
                 $result = $str;
             }

program/lib/Roundcube/rcube_db.php

@@ -522,7 +522,7 @@ class rcube_db
 
     /**
      * Helper method to handle DB errors.
-     * This by default logs the error but could be overriden by a driver implementation
+     * This by default logs the error but could be overridden by a driver implementation
      *
      * @param string $query Query that triggered the error
      *
@@ -778,7 +778,7 @@ class rcube_db
     /**
      * Release resources related to the last query result.
      * When we know we don't need to access the last query result we can destroy it
-     * and release memory. Usefull especially if the query returned big chunk of data.
+     * and release memory. Useful especially if the query returned big chunk of data.
      */
     public function reset()
     {

program/lib/Roundcube/rcube_db_oracle.php

@@ -191,7 +191,7 @@ class rcube_db_oracle extends rcube_db
 
     /**
      * Helper method to handle DB errors.
-     * This by default logs the error but could be overriden by a driver implementation
+     * This by default logs the error but could be overridden by a driver implementation
      *
      * @param string Query that triggered the error
      * @return mixed Result to be stored and returned

program/lib/Roundcube/rcube_html2text.php

@@ -692,7 +692,7 @@ class rcube_html2text
      */
     private function _toupper($str)
     {
-        // string can containg HTML tags
+        // string can containing HTML tags
         $chunks = preg_split('/(<[^>]*>)/', $str, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 
         // convert toupper only the text between HTML tags

program/lib/Roundcube/rcube_imap.php

@@ -308,7 +308,7 @@ class rcube_imap extends rcube_storage
 
     /**
      * Set internal folder reference.
-     * All operations will be perfomed on this folder.
+     * All operations will be performed on this folder.
      *
      * @param string $folder Folder name
      */
@@ -2798,7 +2798,7 @@ class rcube_imap extends rcube_storage
 
 
     /* --------------------------------
-     *        folder managment
+     *        folder management
      * --------------------------------*/
 
     /**

program/lib/Roundcube/rcube_imap_cache.php

@@ -449,7 +449,7 @@ class rcube_imap_cache
      *
      * @param string               $mailbox  Folder name
      * @param rcube_message_header $message  Message data
-     * @param bool                 $force    Skips message in-cache existance check
+     * @param bool                 $force    Skips message in-cache existence check
      */
     function add_message($mailbox, $message, $force = false)
     {

program/lib/Roundcube/rcube_imap_generic.php

@@ -4065,7 +4065,7 @@ class rcube_imap_generic
     /**
      * Write the given debug text to the current debug output handler.
      *
-     * @param string $message Debug mesage text.
+     * @param string $message Debug message text.
      *
      * @since 0.5-stable
      */

program/lib/Roundcube/rcube_ldap_generic.php

@@ -100,7 +100,7 @@ class rcube_ldap_generic extends Net_LDAP3
     /**
      * Returns the last LDAP error occurred
      *
-     * @return mixed Error message string or null if no error occured
+     * @return mixed Error message string or null if no error occurred
      */
     function get_error()
     {

program/lib/Roundcube/rcube_message.php

@@ -28,7 +28,7 @@
 class rcube_message
 {
     /**
-     * Instace of framework class.
+     * Instance of framework class.
      *
      * @var rcube
      */

program/lib/Roundcube/rcube_mime.php

@@ -42,7 +42,7 @@ class rcube_mime
     /**
      * Returns message/object character set name
      *
-     * @return string Characted set name
+     * @return string Character set name
      */
     public static function get_charset()
     {

program/lib/Roundcube/rcube_smtp.php

@@ -186,7 +186,7 @@ class rcube_smtp
      *
      * @param string Sender e-Mail address
      *
-     * @param mixed  Either a comma-seperated list of recipients
+     * @param mixed  Either a comma-separated list of recipients
      *               (RFC822 compliant), or an array of recipients,
      *               each RFC822 valid. This may contain recipients not
      *               specified in the headers, for Bcc:, resending
@@ -448,7 +448,7 @@ class rcube_smtp
      * bare addresses (forward paths) that can be passed to sendmail
      * or an smtp server with the rcpt to: command.
      *
-     * @param mixed Either a comma-seperated list of recipients
+     * @param mixed Either a comma-separated list of recipients
      *              (RFC822 compliant), or an array of recipients,
      *              each RFC822 valid.
      *

program/lib/Roundcube/rcube_spellchecker.php

@@ -255,7 +255,7 @@ class rcube_spellchecker
     }
 
     /**
-     * Check if the specified word is an exception accoring to 
+     * Check if the specified word is an exception according to 
      * spellcheck options.
      *
      * @param string  $word  The word

program/lib/Roundcube/rcube_storage.php

@@ -177,7 +177,7 @@ abstract class rcube_storage
 
     /**
      * Set internal folder reference.
-     * All operations will be perfomed on this folder.
+     * All operations will be performed on this folder.
      *
      * @param  string $folder  Folder name
      */
@@ -434,7 +434,7 @@ abstract class rcube_storage
      * @param  int                $uid    Message UID
      * @param  string             $part   Part number
      * @param  rcube_message_part $o_part Part object created by get_structure()
-     * @param  mixed              $print  True to print part, ressource to write part contents in
+     * @param  mixed              $print  True to print part, resource to write part contents in
      * @param  resource           $fp     File pointer to save the message part
      * @param  boolean            $skip_charset_conv Disables charset conversion
      *
@@ -608,7 +608,7 @@ abstract class rcube_storage
 
 
     /* --------------------------------
-     *        folder managment
+     *        folder management
      * --------------------------------*/
 
     /**
@@ -849,7 +849,7 @@ abstract class rcube_storage
      */
     public function set_special_folders($specials)
     {
-        // should be overriden by storage class if backend supports special folders (SPECIAL-USE)
+        // should be overridden by storage class if backend supports special folders (SPECIAL-USE)
         unset($this->icache['special-folders']);
     }
 

program/localization/index.inc

@@ -20,7 +20,7 @@
  +-----------------------------------------------------------------------+
 */
 
-// langage codes according to ISO 639-1
+// language codes according to ISO 639-1
 // country codes according to ISO 3166-1 (Alpha-2)
 // original names from http://www.mediaglyphs.org/mg/?p=langnames
 

program/steps/mail/func.inc

@@ -1473,7 +1473,7 @@ function rcmail_html4inline($body, $container_id, $body_class='', &$attributes=a
     unset($GLOBALS['rcmail_html_container_id']);
 
     $body = preg_replace(array(
-            // add comments arround html and other tags
+            // add comments around html and other tags
             '/(<!DOCTYPE[^>]*>)/i',
             '/(<\?xml[^>]*>)/i',
             '/(<\/?html[^>]*>)/i',

program/steps/mail/get.inc

@@ -696,7 +696,7 @@ class rcmail_attachment_handler
         if ($error == rcube_imap_generic::ERROR_BAD) {
             ob_end_clean();
 
-            // Get action is often executed simultanously.
+            // Get action is often executed simultaneously.
             // Some servers have MAXPERIP or other limits.
             // To workaround this we'll wait for some time
             // and try again (once).

program/steps/mail/search_contacts.inc

@@ -12,7 +12,7 @@
  | See the README file for a full license statement.                     |
  |                                                                       |
  | PURPOSE:                                                              |
- |   Search contacts from the adress book widget                         |
+ |   Search contacts from the address book widget                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |

skins/larry/templates/compose.html

@@ -134,7 +134,7 @@
 	<roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="icon" title="openinextwin" label="openinextwin" condition="!env:extwin" />
 </div>
 
-<!-- (collapsable) message options -->
+<!-- (collapsible) message options -->
 <div id="composeoptions" role="region" aria-labelledby="aria-label-composeoptions">
 	<h2 id="aria-label-composeoptions" class="voice"><roundcube:label name="arialabelcomposeoptions" /></h2>
 	<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />