# HG changeset patch # User Matteo Cypriani # Date 1410783505 -7200 # Node ID 96fb74a4714d69b5751aa635509ff2d69528f5a9 # Parent 16ce9a6580a37316acec9e8c08ca3b07fcb36e4a misc: fixed some typos diff -r 16ce9a6580a3 -r 96fb74a4714d frontends/src/jp/cmd_info.py --- a/frontends/src/jp/cmd_info.py Tue Sep 09 22:09:51 2014 -0400 +++ b/frontends/src/jp/cmd_info.py Mon Sep 15 14:18:25 2014 +0200 @@ -120,4 +120,4 @@ subcommands = (Disco, Version) def __init__(self, host): - super(Info, self).__init__(host, 'info', use_profile=False, help=_('Get various informations on entities')) + super(Info, self).__init__(host, 'info', use_profile=False, help=_('Get various pieces of information on entities')) diff -r 16ce9a6580a3 -r 96fb74a4714d frontends/src/jp/cmd_profile.py --- a/frontends/src/jp/cmd_profile.py Tue Sep 09 22:09:51 2014 -0400 +++ b/frontends/src/jp/cmd_profile.py Mon Sep 15 14:18:25 2014 +0200 @@ -18,7 +18,7 @@ # along with this program. If not, see . """This module permits to manage profiles. It can list, create, delete -and retrieve informations about a profile.""" +and retrieve information about a profile.""" from logging import debug, info, error, warning from sat.core.i18n import _ @@ -47,7 +47,7 @@ class ProfileInfo(base.CommandBase): def __init__(self, host): - super(ProfileInfo, self).__init__(host, 'info', use_profile=False, help=_('Get informations about a profile')) + super(ProfileInfo, self).__init__(host, 'info', use_profile=False, help=_('Get information about a profile')) def add_parser_options(self): self.parser.add_argument('profile', type=str, help=PROFILE_HELP) diff -r 16ce9a6580a3 -r 96fb74a4714d i18n/fr.po --- a/i18n/fr.po Tue Sep 09 22:09:51 2014 -0400 +++ b/i18n/fr.po Mon Sep 15 14:18:25 2014 +0200 @@ -301,7 +301,7 @@ #: frontends/src/jp/cmd_profile.py:50 #, fuzzy -msgid "Get informations about a profile" +msgid "Get information about a profile" msgstr "Demande de contacts pour un profile inexistant" #: frontends/src/jp/cmd_profile.py:76 @@ -3474,7 +3474,7 @@ msgstr "Flux proposé: serveur=[%(host)s] port=[%(post)s]" #: src/plugins/plugin_xep_0065.py:789 -msgid "Can't determine proxy informations" +msgid "Can't determine proxy information" msgstr "" #: src/plugins/plugin_xep_0065.py:793 diff -r 16ce9a6580a3 -r 96fb74a4714d i18n/sat.po --- a/i18n/sat.po Tue Sep 09 22:09:51 2014 -0400 +++ b/i18n/sat.po Mon Sep 15 14:18:25 2014 +0200 @@ -276,7 +276,7 @@ msgstr "" #: frontends/src/jp/cmd_profile.py:50 -msgid "Get informations about a profile" +msgid "Get information about a profile" msgstr "" #: frontends/src/jp/cmd_profile.py:76 @@ -3175,7 +3175,7 @@ msgstr "" #: src/plugins/plugin_xep_0065.py:789 -msgid "Can't determine proxy informations" +msgid "Can't determine proxy information" msgstr "" #: src/plugins/plugin_xep_0065.py:793 diff -r 16ce9a6580a3 -r 96fb74a4714d src/bridge/bridge_constructor/bridge_template.ini --- a/src/bridge/bridge_constructor/bridge_template.ini Tue Sep 09 22:09:51 2014 -0400 +++ b/src/bridge/bridge_constructor/bridge_template.ini Mon Sep 15 14:18:25 2014 +0200 @@ -61,8 +61,8 @@ type=signal category=core sig_in=ssia{ss}s -doc=Somebody changed his presence informations. -doc_param_0=entity_jid: JID from which we have presence informations +doc=Somebody changed his presence information. +doc_param_0=entity_jid: JID from which we have presence informatios doc_param_1=show: availability status (see RFC 6121 §4.7.2.1) doc_param_2=priority: Priority level of the ressource (see RFC 6121 §4.7.2.3) doc_param_3=statuses: Natural language description of the availability status (see RFC 6121 §4.7.2.2) @@ -260,7 +260,7 @@ sig_in=s sig_out=a(sa{ss}as) param_0_default="@DEFAULT@" -doc=Return informations about all contacts +doc=Return information about all contacts doc_param_0=%(doc_profile_key)s doc_return=array of tuples with the following values: - JID of the contact @@ -273,7 +273,7 @@ sig_in=ss sig_out=as param_1_default="@DEFAULT@" -doc=Return informations about all contacts +doc=Return information about all contacts doc_param_0=group: name of the group to check doc_param_1=%(doc_profile_key)s doc_return=array of jids @@ -295,7 +295,7 @@ sig_in=s sig_out=a{sa{s(sia{ss})}} param_0_default="@DEFAULT@" -doc=Return presence informations of all contacts +doc=Return presence information of all contacts doc_param_0=%(doc_profile_key)s doc_return=Dict of presence with bare JID of contact as key, and value as follow: A dict where key is the resource and the value is a tuple with (show, priority, statuses) as for [presenceUpdate] diff -r 16ce9a6580a3 -r 96fb74a4714d src/memory/memory.py --- a/src/memory/memory.py Tue Sep 09 22:09:51 2014 -0400 +++ b/src/memory/memory.py Mon Sep 15 14:18:25 2014 +0200 @@ -183,7 +183,7 @@ class Memory(object): - """This class manage all persistent informations""" + """This class manage all the persistent information""" def __init__(self, host): log.info(_("Memory manager init")) diff -r 16ce9a6580a3 -r 96fb74a4714d src/plugins/plugin_misc_text_commands.py --- a/src/plugins/plugin_misc_text_commands.py Tue Sep 09 22:09:51 2014 -0400 +++ b/src/plugins/plugin_misc_text_commands.py Mon Sep 15 14:18:25 2014 +0200 @@ -81,7 +81,7 @@ """Add a callback which give information to the /whois command @param callback: a callback which will be called with the following arguments - whois_msg: list of information strings to display, callback need to append its own strings to it - - target_jid: full jid from who we want informations + - target_jid: full jid from whom we want information - profile: %(doc_profile)s @param priority: priority of the information to show (the highest priority will be displayed first) @@ -184,7 +184,7 @@ self.host.plugins[C.TEXT_CMDS].feedBack(feedback + self.HELP_SUGGESTION, mess_data, profile) def cmd_whois(self, mess_data, profile): - """show informations on entity""" + """show information on entity""" log.debug("Catched whois command") entity = mess_data["unparsed"].strip() diff -r 16ce9a6580a3 -r 96fb74a4714d src/plugins/plugin_xep_0045.py --- a/src/plugins/plugin_xep_0045.py Tue Sep 09 22:09:51 2014 -0400 +++ b/src/plugins/plugin_xep_0045.py Mon Sep 15 14:18:25 2014 +0200 @@ -620,7 +620,7 @@ return self.cmd_title(mess_data, profile) def _whois(self, whois_msg, mess_data, target_jid, profile): - """ Add MUC user informations to whois """ + """ Add MUC user information to whois """ if mess_data['type'] != "groupchat": return if target_jid.userhost() not in self.clients[profile].joined_rooms: diff -r 16ce9a6580a3 -r 96fb74a4714d src/plugins/plugin_xep_0054.py --- a/src/plugins/plugin_xep_0054.py Tue Sep 09 22:09:51 2014 -0400 +++ b/src/plugins/plugin_xep_0054.py Mon Sep 15 14:18:25 2014 +0200 @@ -269,7 +269,7 @@ def setAvatar(self, filepath, profile_key=C.PROF_KEY_NONE): """Set avatar of the profile @param filepath: path of the image of the avatar""" - #TODO: This is a temporary way of setting avatar, as other VCard informations are not managed. + #TODO: This is a temporary way of setting the avatar, as other VCard information is not managed. # A proper full VCard management should be done (and more generaly a public/private profile) client = self.host.getClient(profile_key) diff -r 16ce9a6580a3 -r 96fb74a4714d src/plugins/plugin_xep_0065.py --- a/src/plugins/plugin_xep_0065.py Tue Sep 09 22:09:51 2014 -0400 +++ b/src/plugins/plugin_xep_0065.py Mon Sep 15 14:18:25 2014 +0200 @@ -764,10 +764,10 @@ self.host = plugin_parent.host def _proxyDataResult(self, iq_elt): - """Called with the informations about proxy according to XEP-0065 #4 + """Called with the information about proxy according to XEP-0065 #4 Params should be filled with these infos""" if iq_elt["type"] == "error": - log.warning(_("Can't determine proxy informations")) + log.warning(_("Can't determine proxy information")) return query_elt = iq_elt.firstChildElement() if query_elt.name != "query": diff -r 16ce9a6580a3 -r 96fb74a4714d src/tools/xml_tools.py --- a/src/tools/xml_tools.py Tue Sep 09 22:09:51 2014 -0400 +++ b/src/tools/xml_tools.py Mon Sep 15 14:18:25 2014 +0200 @@ -481,7 +481,7 @@ def __init__(self, xmlui, callback_id=None, name=None, headers=None, items=None, columns=None, selectable = 'no', auto_index = False, parent=None): """Create an advanced list - @param headers: optional headers informations + @param headers: optional headers information @param callback_id: id of the method to call when selection is done @param items: list of widgets to add (just the first row) @param columns: number of columns in this table, or None to autodetect