diff options
| -rw-r--r-- | cyruslib.py | 6 | ||||
| -rw-r--r-- | ext/python/Tools/freeze/.svn/text-base/freeze.py.svn-base | 2 | ||||
| -rwxr-xr-x | ext/python/Tools/freeze/freeze.py | 2 | ||||
| -rw-r--r-- | pykolab/auth/__init__.py | 2 | ||||
| -rw-r--r-- | pykolab/conf/__init__.py | 4 | ||||
| -rw-r--r-- | pykolab/imap/cyrus.py | 4 | ||||
| -rw-r--r-- | share/kolab2.schema | 10 | ||||
| -rw-r--r-- | share/templates/roundcubemail/password.inc.php.tpl | 2 | ||||
| -rw-r--r-- | wallace/module_resources.py | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/cyruslib.py b/cyruslib.py index 4697001..b8d5dac 100644 --- a/cyruslib.py +++ b/cyruslib.py @@ -76,7 +76,7 @@ def getflags(test): if len(flag): flags.append(flag) return flags -### A smart function to return an array of splitted strings +### A smart function to return an array of split strings ### and honours quoted strings def splitquote(text): data = text.split(QUOTE) @@ -451,11 +451,11 @@ class CYRUS: self.__verbose( '[LOGOUT] %s: %s' % (res, msg[0]) ) def getEncoding(self): - """Get current input/ouput codification""" + """Get current input/output codification""" return self.ENCODING def setEncoding(self, enc = None): - """Set current input/ouput codification""" + """Set current input/output codification""" if enc is None: self.ENCODING = 'imap' elif enc in self.ENCODING_LIST: diff --git a/ext/python/Tools/freeze/.svn/text-base/freeze.py.svn-base b/ext/python/Tools/freeze/.svn/text-base/freeze.py.svn-base index 836f532..2764cec 100644 --- a/ext/python/Tools/freeze/.svn/text-base/freeze.py.svn-base +++ b/ext/python/Tools/freeze/.svn/text-base/freeze.py.svn-base @@ -159,7 +159,7 @@ def main(): except getopt.error, msg: usage('getopt error: ' + str(msg)) - # proces option arguments + # process option arguments for o, a in opts: if o == '-h': print __doc__ diff --git a/ext/python/Tools/freeze/freeze.py b/ext/python/Tools/freeze/freeze.py index 50b28da..46bfd90 100755 --- a/ext/python/Tools/freeze/freeze.py +++ b/ext/python/Tools/freeze/freeze.py @@ -159,7 +159,7 @@ def main(): except getopt.error, msg: usage('getopt error: ' + str(msg)) - # proces option arguments + # process option arguments for o, a in opts: if o == '-h': print __doc__ diff --git a/pykolab/auth/__init__.py b/pykolab/auth/__init__.py index 79d6561..e9c6c44 100644 --- a/pykolab/auth/__init__.py +++ b/pykolab/auth/__init__.py @@ -53,7 +53,7 @@ class Auth(pykolab.base.Base): if len(login) == 3: # The realm has not been specified. See if we know whether or not # to use virtual_domains, as this may be a cause for the realm not - # having been specified seperately. + # having been specified separately. use_virtual_domains = conf.get('imap', 'virtual_domains') # TODO: Insert debug statements diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py index e05f140..4b4d633 100644 --- a/pykolab/conf/__init__.py +++ b/pykolab/conf/__init__.py @@ -241,7 +241,7 @@ class Conf(object): """ Create options from plugins. - This function must be called seperately from Conf.__init__(), or + This function must be called separately from Conf.__init__(), or the configuration store is not yet done initializing when the plugins class and the plugins themselves go look for it. """ @@ -475,7 +475,7 @@ class Conf(object): def get_list(self, section, key): """ - Gets a comma and/or space seperated list from the configuration file + Gets a comma and/or space separated list from the configuration file and returns a list. """ values = [] diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py index 6f561ce..4dd9284 100644 --- a/pykolab/imap/cyrus.py +++ b/pykolab/imap/cyrus.py @@ -336,7 +336,7 @@ class Cyrus(cyruslib.CYRUS): self.rename(undelete_folder,target_folder) else: if not target_server == self.server: - print >> sys.stdout, _("Would have transfered %s from %s to %s") % (undelete_folder, self.server, target_server) + print >> sys.stdout, _("Would have transferred %s from %s to %s") % (undelete_folder, self.server, target_server) print >> sys.stdout, _("Would have renamed %s to %s") % (undelete_folder, target_folder) @@ -437,7 +437,7 @@ class Cyrus(cyruslib.CYRUS): # user/userid@example.org # - # Here, we explicitely remove any virtdomain folders. + # Here, we explicitly remove any virtdomain folders. if mbox['domain'] == None: _folders = [] for folder in folders: diff --git a/share/kolab2.schema b/share/kolab2.schema index eb40a8d..218e400 100644 --- a/share/kolab2.schema +++ b/share/kolab2.schema @@ -76,7 +76,7 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.3 # kolabEncryptedPassword is an asymmetrically (RSA) encrypted copy of the # cleartext password. This is required in order to pass the password from -# the maintainance/administration application to the kolabHomeServer running the +# the maintenance/administration application to the kolabHomeServer running the # resource handler application in a secure manner. # Actually this attribute is deprecated as of Kolab 2.1. Instead we grant the # calendar user dn: cn=calendar,cn=internal,dc=yourcompany,dc=com access to @@ -350,7 +350,7 @@ attributetype ( 1.3.6.1.4.1.19414.1.1.1.25 SUP labeledURI SINGLE-VALUE ) -# Single string with $ seperated lines consisting of +# Single string with $ separated lines consisting of # surname $ # givenName $ # dateOfBirth $ @@ -363,7 +363,7 @@ attributetype ( 1.3.6.1.4.1.19414.1.1.1.27 SUBSTR caseIgnoreListSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 ) -# Single string with $ seperated lines consisting of +# Single string with $ separated lines consisting of # surname $ # givenName $ # dateOfBirth $ @@ -961,8 +961,8 @@ objectclass ( 1.3.6.1.4.1.19414.2.2.1 # public folders are typically visible to everyone subscribed to # the server without the need for an extra login. Subfolders are -# defined using the hiarchy seperator '/' e.g. "sf/sub1". Please note -# that the term public folder is prefered to shared folder because +# defined using the hiarchy separator '/' e.g. "sf/sub1". Please note +# that the term public folder is preferred to shared folder because # normal user mailboxes can also share folders using acls. objectclass ( 1.3.6.1.4.1.19414.2.2.9 NAME 'kolabSharedFolder' diff --git a/share/templates/roundcubemail/password.inc.php.tpl b/share/templates/roundcubemail/password.inc.php.tpl index 16895fa..52f2148 100644 --- a/share/templates/roundcubemail/password.inc.php.tpl +++ b/share/templates/roundcubemail/password.inc.php.tpl @@ -49,7 +49,7 @@ // LDAP connection method // There is two connection method for changing a user's LDAP password. - // 'user': use user credential (recommanded, require password_confirm_current=true) + // 'user': use user credential (recommended, require password_confirm_current=true) // 'admin': use admin credential (this mode require password_ldap_adminDN and password_ldap_adminPW) // Default: 'user' \$config['password_ldap_method'] = 'user'; diff --git a/wallace/module_resources.py b/wallace/module_resources.py index 6742658..18dbe27 100644 --- a/wallace/module_resources.py +++ b/wallace/module_resources.py @@ -299,7 +299,7 @@ def execute(*args, **kw): elif owner_reply == kolabformat.PartDeclined: decline_reservation_request(_itip_event, receiving_resource) else: - log.info(_("Invalid response (%r) recieved from resource owner for event %r") % ( + log.info(_("Invalid response (%r) received from resource owner for event %r") % ( sender_attendee.get_participant_status(True), reference_uid )) else: @@ -553,7 +553,7 @@ def check_availability(itip_events, resource_dns, resources, receiving_attendee= else: # TODO: shuffle existing bookings of collection members in order - # to make one availale for the requested time + # to make one available for the requested time pass continue |