Skip to content

Commit

Permalink
spelling fixes (#5690)
Browse files Browse the repository at this point in the history
  • Loading branch information
ka7 authored and alecpl committed Mar 12, 2017
1 parent 522565b commit 9a35768
Show file tree
Hide file tree
Showing 37 changed files with 63 additions and 63 deletions.
16 changes: 8 additions & 8 deletions CHANGELOG
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions config/defaults.inc.php
Expand Up @@ -85,7 +85,7 @@
$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
Expand Down Expand Up @@ -210,7 +210,7 @@
// 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;

Expand Down Expand Up @@ -351,7 +351,7 @@
// 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
Expand Down Expand Up @@ -1052,7 +1052,7 @@
$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';

Expand Down
2 changes: 1 addition & 1 deletion 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 |
Expand Down
2 changes: 1 addition & 1 deletion plugins/acl/acl.js
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion plugins/acl/acl.php
Expand Up @@ -611,7 +611,7 @@ function acl2text($rights)
* @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)
{
Expand Down
2 changes: 1 addition & 1 deletion 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
*
Expand Down
2 changes: 1 addition & 1 deletion plugins/emoticons/emoticons.php
Expand Up @@ -90,7 +90,7 @@ function message_outgoing_body($args)
* 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)
Expand Down
2 changes: 1 addition & 1 deletion plugins/filesystem_attachments/filesystem_attachments.php
Expand Up @@ -114,7 +114,7 @@ function remove($args)
/**
* 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)
{
Expand Down
2 changes: 1 addition & 1 deletion plugins/password/config.inc.php.dist
Expand Up @@ -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;


Expand Down
4 changes: 2 additions & 2 deletions plugins/password/drivers/directadmin.php
Expand Up @@ -152,8 +152,8 @@ function set_method( $method = 'GET' )
/**
* 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 = '' )
{
Expand Down
6 changes: 3 additions & 3 deletions plugins/password/drivers/plesk.php
Expand Up @@ -120,7 +120,7 @@ function init($host, $port, $path, $user, $pass)
* 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)
{
Expand Down Expand Up @@ -152,7 +152,7 @@ function get_request_obj()
}

/**
* Get all hosting-informations of a domain
* Get all hosting-information of a domain
*
* @param string $domain domain-name
* @returns object SimpleXML object
Expand Down Expand Up @@ -199,7 +199,7 @@ function get_domain_id($domain)
/**
* 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
Expand Down
2 changes: 1 addition & 1 deletion plugins/password/helpers/change_ldap_pass.pl
Expand Up @@ -48,7 +48,7 @@
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'},
Expand Down
4 changes: 2 additions & 2 deletions plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
Expand Up @@ -192,7 +192,7 @@ private function read_squirrel_prefs($uname)
}
}

// parse addres book file
// parse address book file
if (filesize($abookfile)) {
foreach (file($abookfile) as $line) {
$line = $this->convert_charset(rtrim($line), $file_charset);
Expand Down Expand Up @@ -234,7 +234,7 @@ private function read_squirrel_prefs($uname)
$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);
Expand Down
4 changes: 2 additions & 2 deletions program/include/rcmail.php
Expand Up @@ -493,7 +493,7 @@ public function session_init()
}

/**
* 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
Expand Down Expand Up @@ -1194,7 +1194,7 @@ public function table_output($attrib, $table_data, $show_cols, $id_col)
*
* @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
*/
Expand Down
4 changes: 2 additions & 2 deletions program/include/rcmail_output_html.php
Expand Up @@ -277,7 +277,7 @@ private function load_skin($skin_path)
{
$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);

Expand Down Expand Up @@ -788,7 +788,7 @@ protected function parse_with_globals($input)
}

/**
* 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)
{
Expand Down
2 changes: 1 addition & 1 deletion program/js/treelist.js
Expand Up @@ -32,7 +32,7 @@

/**
* Roundcube Treelist widget class
* @contructor
* @constructor
*/
function rcube_treelist_widget(node, p)
{
Expand Down
4 changes: 2 additions & 2 deletions program/lib/Roundcube/html.php
Expand Up @@ -65,7 +65,7 @@ public function show()
*
* @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
Expand Down Expand Up @@ -630,7 +630,7 @@ public function show($value = '', $attrib = null)
* $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>
*
Expand Down
8 changes: 4 additions & 4 deletions program/lib/Roundcube/rcube.php
Expand Up @@ -39,7 +39,7 @@ class rcube
const DEBUG_LINE_LENGTH = 4096;

/**
* Singleton instace of rcube
* Singleton instance of rcube
*
* @var rcube
*/
Expand All @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion program/lib/Roundcube/rcube_addressbook.php
Expand Up @@ -668,7 +668,7 @@ public static function compose_contact_key($contact, $sort_col)
* @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)
{
Expand Down
2 changes: 1 addition & 1 deletion program/lib/Roundcube/rcube_charset.php
Expand Up @@ -144,7 +144,7 @@ public static function parse_charset($input)
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;
}
Expand Down
4 changes: 2 additions & 2 deletions program/lib/Roundcube/rcube_db.php
Expand Up @@ -522,7 +522,7 @@ protected function query_parse($query)

/**
* 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
*
Expand Down Expand Up @@ -778,7 +778,7 @@ public function rollbackTransaction()
/**
* 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()
{
Expand Down
2 changes: 1 addition & 1 deletion program/lib/Roundcube/rcube_db_oracle.php
Expand Up @@ -191,7 +191,7 @@ protected function _query($query, $offset, $numrows, $params)

/**
* 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
Expand Down
2 changes: 1 addition & 1 deletion program/lib/Roundcube/rcube_html2text.php
Expand Up @@ -692,7 +692,7 @@ public function pre_preg_callback($matches)
*/
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
Expand Down

0 comments on commit 9a35768

Please sign in to comment.