From 49e14f9a924ea0324a3ad089befe18cd6ebb3b09 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 28 Jun 2011 19:43:21 +0200 Subject: [PATCH] Conditional & Dict & Factoids & MessageParser: remove redundant spaces, update i18n and l10n-fr --- plugins/Conditional/locale/fr.po | 64 ++++++++++---------- plugins/Conditional/messages.pot | 64 ++++++++++---------- plugins/Conditional/plugin.py | 96 +++++++++++++++--------------- plugins/Dict/locale/fr.po | 11 ++-- plugins/Dict/messages.pot | 7 ++- plugins/Dict/plugin.py | 7 ++- plugins/Factoids/locale/fr.po | 56 ++++++++--------- plugins/Factoids/messages.pot | 48 +++++++-------- plugins/Factoids/plugin.py | 2 +- plugins/MessageParser/locale/fr.po | 38 ++++++------ plugins/MessageParser/messages.pot | 38 ++++++------ 11 files changed, 217 insertions(+), 214 deletions(-) diff --git a/plugins/Conditional/locale/fr.po b/plugins/Conditional/locale/fr.po index 91f8d1cbf..02c0e97ab 100644 --- a/plugins/Conditional/locale/fr.po +++ b/plugins/Conditional/locale/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Gribble\n" -"POT-Creation-Date: 2010-11-02 11:39+CET\n" +"POT-Creation-Date: 2011-06-28 19:37+CEST\n" "PO-Revision-Date: \n" "Last-Translator: Valentin Lorentz \n" "Language-Team: Supybot-fr \n" @@ -26,10 +26,10 @@ msgstr "" #: plugin.py:80 msgid "" " \n" -" \n" +"\n" " Runs if evaluates to true, runs \n" " if it evaluates to false.\n" -" \n" +"\n" " Use other logical operators defined in this plugin and command nesting\n" " to your advantage here.\n" " " @@ -41,7 +41,7 @@ msgstr "" #: plugin.py:97 msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if all conditions supplied evaluate to true.\n" " " msgstr "" @@ -52,7 +52,7 @@ msgstr "" #: plugin.py:109 msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if any one of conditions supplied evaluates to true.\n" " " msgstr "" @@ -63,7 +63,7 @@ msgstr "" #: plugin.py:121 msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if only one of conditions supplied evaluates to true.\n" " " msgstr "" @@ -74,8 +74,8 @@ msgstr "" #: plugin.py:133 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if they are equal.\n" " " msgstr "" @@ -86,8 +86,8 @@ msgstr "" #: plugin.py:146 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if they are not equal.\n" " " msgstr "" @@ -98,8 +98,8 @@ msgstr "" #: plugin.py:159 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is greater than .\n" " " msgstr "" @@ -110,8 +110,8 @@ msgstr "" #: plugin.py:172 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is greater than or equal to .\n" " " msgstr "" @@ -122,8 +122,8 @@ msgstr "" #: plugin.py:185 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is less than .\n" " " msgstr "" @@ -134,8 +134,8 @@ msgstr "" #: plugin.py:198 msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is less than or equal to .\n" " " msgstr "" @@ -146,8 +146,8 @@ msgstr "" #: plugin.py:211 msgid "" " \n" -" \n" -" Determines if is a substring of . \n" +"\n" +" Determines if is a substring of .\n" " Returns true if is contained in .\n" " " msgstr "" @@ -158,8 +158,8 @@ msgstr "" #: plugin.py:224 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they are equal.\n" " " msgstr "" @@ -170,8 +170,8 @@ msgstr "" #: plugin.py:237 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they are not equal.\n" " " msgstr "" @@ -182,8 +182,8 @@ msgstr "" #: plugin.py:250 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they is greater than .\n" " " msgstr "" @@ -194,8 +194,8 @@ msgstr "" #: plugin.py:263 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is greater than or equal to .\n" " " msgstr "" @@ -206,8 +206,8 @@ msgstr "" #: plugin.py:276 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is less than .\n" " " msgstr "" @@ -218,8 +218,8 @@ msgstr "" #: plugin.py:289 msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is less than or equal to .\n" " " msgstr "" diff --git a/plugins/Conditional/messages.pot b/plugins/Conditional/messages.pot index 0fd941dbd..4d60086b4 100644 --- a/plugins/Conditional/messages.pot +++ b/plugins/Conditional/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-11-02 11:39+CET\n" +"POT-Creation-Date: 2011-06-28 19:37+CEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,10 +31,10 @@ msgstr "" #, docstring msgid "" " \n" -" \n" +"\n" " Runs if evaluates to true, runs \n" " if it evaluates to false.\n" -" \n" +"\n" " Use other logical operators defined in this plugin and command nesting\n" " to your advantage here.\n" " " @@ -44,7 +44,7 @@ msgstr "" #, docstring msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if all conditions supplied evaluate to true.\n" " " msgstr "" @@ -53,7 +53,7 @@ msgstr "" #, docstring msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if any one of conditions supplied evaluates to true.\n" " " msgstr "" @@ -62,7 +62,7 @@ msgstr "" #, docstring msgid "" " [ ... ]\n" -" \n" +"\n" " Returns true if only one of conditions supplied evaluates to true.\n" " " msgstr "" @@ -71,8 +71,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if they are equal.\n" " " msgstr "" @@ -81,8 +81,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if they are not equal.\n" " " msgstr "" @@ -91,8 +91,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is greater than .\n" " " msgstr "" @@ -101,8 +101,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is greater than or equal to .\n" " " msgstr "" @@ -111,8 +111,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is less than .\n" " " msgstr "" @@ -121,8 +121,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a string comparison on and . \n" +"\n" +" Does a string comparison on and .\n" " Returns true if is less than or equal to .\n" " " msgstr "" @@ -131,8 +131,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Determines if is a substring of . \n" +"\n" +" Determines if is a substring of .\n" " Returns true if is contained in .\n" " " msgstr "" @@ -141,8 +141,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they are equal.\n" " " msgstr "" @@ -151,8 +151,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they are not equal.\n" " " msgstr "" @@ -161,8 +161,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if they is greater than .\n" " " msgstr "" @@ -171,8 +171,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is greater than or equal to .\n" " " msgstr "" @@ -181,8 +181,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is less than .\n" " " msgstr "" @@ -191,8 +191,8 @@ msgstr "" #, docstring msgid "" " \n" -" \n" -" Does a numeric comparison on and . \n" +"\n" +" Does a numeric comparison on and .\n" " Returns true if is less than or equal to .\n" " " msgstr "" diff --git a/plugins/Conditional/plugin.py b/plugins/Conditional/plugin.py index d349f2103..d3783ef50 100644 --- a/plugins/Conditional/plugin.py +++ b/plugins/Conditional/plugin.py @@ -66,22 +66,22 @@ class Conditional(callbacks.Plugin): threaded = True def __init__(self, irc): callbacks.Plugin.__init__(self, irc) - + def _runCommandFunction(self, irc, msg, command): """Run a command from message, as if command was sent over IRC.""" - tokens = callbacks.tokenize(command) + tokens = callbacks.tokenize(command) try: self.Proxy(irc.irc, msg, tokens) except Exception, e: log.exception('Uncaught exception in requested function:') - + @internationalizeDocstring def cif(self, irc, msg, args, condition, ifcommand, elsecommand): """ - + Runs if evaluates to true, runs if it evaluates to false. - + Use other logical operators defined in this plugin and command nesting to your advantage here. """ @@ -91,11 +91,11 @@ class Conditional(callbacks.Plugin): self._runCommandFunction(irc, msg, elsecommand) irc.noReply() cif = wrap(cif, ['boolean', 'something', 'something']) - + @internationalizeDocstring def cand(self, irc, msg, args, conds): """ [ ... ] - + Returns true if all conditions supplied evaluate to true. """ if _all(conds): @@ -103,11 +103,11 @@ class Conditional(callbacks.Plugin): else: irc.reply("false") cand = wrap(cand, [many('boolean'),]) - + @internationalizeDocstring def cor(self, irc, msg, args, conds): """ [ ... ] - + Returns true if any one of conditions supplied evaluates to true. """ if _any(conds): @@ -115,11 +115,11 @@ class Conditional(callbacks.Plugin): else: irc.reply("false") cor = wrap(cor, [many('boolean'),]) - + @internationalizeDocstring def cxor(self, irc, msg, args, conds): """ [ ... ] - + Returns true if only one of conditions supplied evaluates to true. """ if sum(conds) == 1: @@ -127,12 +127,12 @@ class Conditional(callbacks.Plugin): else: irc.reply("false") cxor = wrap(cxor, [many('boolean'),]) - + @internationalizeDocstring def ceq(self, irc, msg, args, item1, item2): """ - - Does a string comparison on and . + + Does a string comparison on and . Returns true if they are equal. """ if item1 == item2: @@ -140,12 +140,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') ceq = wrap(ceq, ['anything', 'anything']) - + @internationalizeDocstring def ne(self, irc, msg, args, item1, item2): """ - - Does a string comparison on and . + + Does a string comparison on and . Returns true if they are not equal. """ if item1 != item2: @@ -153,12 +153,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') ne = wrap(ne, ['anything', 'anything']) - + @internationalizeDocstring def gt(self, irc, msg, args, item1, item2): """ - - Does a string comparison on and . + + Does a string comparison on and . Returns true if is greater than . """ if item1 > item2: @@ -166,12 +166,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') gt = wrap(gt, ['anything', 'anything']) - + @internationalizeDocstring def ge(self, irc, msg, args, item1, item2): """ - - Does a string comparison on and . + + Does a string comparison on and . Returns true if is greater than or equal to . """ if item1 >= item2: @@ -179,12 +179,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') ge = wrap(ge, ['anything', 'anything']) - + @internationalizeDocstring def lt(self, irc, msg, args, item1, item2): """ - - Does a string comparison on and . + + Does a string comparison on and . Returns true if is less than . """ if item1 < item2: @@ -192,12 +192,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') lt = wrap(lt, ['anything', 'anything']) - + @internationalizeDocstring def le(self, irc, msg, args, item1, item2): """ - - Does a string comparison on and . + + Does a string comparison on and . Returns true if is less than or equal to . """ if item1 <= item2: @@ -209,8 +209,8 @@ class Conditional(callbacks.Plugin): @internationalizeDocstring def match(self, irc, msg, args, item1, item2): """ - - Determines if is a substring of . + + Determines if is a substring of . Returns true if is contained in . """ if item2.find(item1) != -1: @@ -222,8 +222,8 @@ class Conditional(callbacks.Plugin): @internationalizeDocstring def nceq(self, irc, msg, args, item1, item2): """ - - Does a numeric comparison on and . + + Does a numeric comparison on and . Returns true if they are equal. """ if item1 == item2: @@ -231,12 +231,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') nceq = wrap(nceq, ['float', 'float']) - + @internationalizeDocstring def nne(self, irc, msg, args, item1, item2): """ - - Does a numeric comparison on and . + + Does a numeric comparison on and . Returns true if they are not equal. """ if item1 != item2: @@ -244,12 +244,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') nne = wrap(nne, ['float', 'float']) - + @internationalizeDocstring def ngt(self, irc, msg, args, item1, item2): """ - - Does a numeric comparison on and . + + Does a numeric comparison on and . Returns true if they is greater than . """ if item1 > item2: @@ -257,12 +257,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') ngt = wrap(ngt, ['float', 'float']) - + @internationalizeDocstring def nge(self, irc, msg, args, item1, item2): """ - - Does a numeric comparison on and . + + Does a numeric comparison on and . Returns true if is greater than or equal to . """ if item1 >= item2: @@ -270,12 +270,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') nge = wrap(nge, ['float', 'float']) - + @internationalizeDocstring def nlt(self, irc, msg, args, item1, item2): """ - - Does a numeric comparison on and . + + Does a numeric comparison on and . Returns true if is less than . """ if item1 < item2: @@ -283,12 +283,12 @@ class Conditional(callbacks.Plugin): else: irc.reply('false') nlt = wrap(nlt, ['float', 'float']) - + @internationalizeDocstring def nle(self, irc, msg, args, item1, item2): """ - - Does a numeric comparison on and . + + Does a numeric comparison on and . Returns true if is less than or equal to . """ if item1 <= item2: diff --git a/plugins/Dict/locale/fr.po b/plugins/Dict/locale/fr.po index 32708ea0b..2a6360cd2 100644 --- a/plugins/Dict/locale/fr.po +++ b/plugins/Dict/locale/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Supybot-fr\n" -"POT-Creation-Date: 2011-02-26 09:49+CET\n" +"POT-Creation-Date: 2011-06-28 19:40+CEST\n" "PO-Revision-Date: \n" "Last-Translator: Valentin Lorentz \n" "Language-Team: Supybot-fr \n" @@ -87,14 +87,15 @@ msgstr "%L a répondu : %s" #: plugin.py:136 msgid "" " [ ...]\n" +"\n" " Gets a random synonym from the Moby Thesaurus (moby-thes) database.\n" -" \n" +"\n" " If given many words, gets a random synonym for each of them.\n" -" \n" +"\n" " Quote phrases to have them treated as one lookup word.\n" " " msgstr "" -" [ ...]\n" +" [ ...]\n" "\n" -"Récupère un synonyme aléatoire à partir de la base de données de Moby Thesaurus (moby-thes).Si plusieurs mots sont donnés, récupère un synonyme aléatoire pour chaque d'eux.Mettez les phrases entre guillemets pour qu'elles soient considérées comme un seul mot." +"Récupère un synonyme au hasard de la base de données du Moby Thesaurus (moby-thes). Si plusieurs mots sont donnés, récupère un synonyme au hasard pour chacun d'eux. Citez les phrases pour qu'elles soient traitées comme un unique mot." diff --git a/plugins/Dict/messages.pot b/plugins/Dict/messages.pot index 42338f3a2..41a8993a6 100644 --- a/plugins/Dict/messages.pot +++ b/plugins/Dict/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-26 09:49+CET\n" +"POT-Creation-Date: 2011-06-28 19:40+CEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -84,10 +84,11 @@ msgstr "" #, docstring msgid "" " [ ...]\n" +"\n" " Gets a random synonym from the Moby Thesaurus (moby-thes) database.\n" -" \n" +"\n" " If given many words, gets a random synonym for each of them.\n" -" \n" +"\n" " Quote phrases to have them treated as one lookup word.\n" " " msgstr "" diff --git a/plugins/Dict/plugin.py b/plugins/Dict/plugin.py index 087054d17..ca6bfb526 100644 --- a/plugins/Dict/plugin.py +++ b/plugins/Dict/plugin.py @@ -134,10 +134,11 @@ class Dict(callbacks.Plugin): def synonym(self, irc, msg, args, words): """ [ ...] + Gets a random synonym from the Moby Thesaurus (moby-thes) database. - + If given many words, gets a random synonym for each of them. - + Quote phrases to have them treated as one lookup word. """ try: @@ -145,7 +146,7 @@ class Dict(callbacks.Plugin): conn = dictclient.Connection(server) except socket.error, e: irc.error(utils.web.strError(e), Raise=True) - + dictionary = 'moby-thes' response = [] for word in words: diff --git a/plugins/Factoids/locale/fr.po b/plugins/Factoids/locale/fr.po index 9cc269f84..9129f5fe8 100644 --- a/plugins/Factoids/locale/fr.po +++ b/plugins/Factoids/locale/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Supybot-fr\n" -"POT-Creation-Date: 2011-02-26 09:58+CET\n" +"POT-Creation-Date: 2011-06-28 19:40+CEST\n" "PO-Revision-Date: \n" "Last-Translator: Valentin Lorentz \n" "Language-Team: Supybot-fr \n" @@ -87,13 +87,13 @@ msgid "" msgstr "" #: plugin.py:257 -#: plugin.py:391 +#: plugin.py:386 msgid "That's not a valid number for that key." msgstr "Ce n'est pas un nombre valide pour cette clef." #: plugin.py:279 -#: plugin.py:377 -#: plugin.py:604 +#: plugin.py:372 +#: plugin.py:598 msgid "No factoid matches that key." msgstr "Aucune factoid ne correspond à cette clef." @@ -113,11 +113,11 @@ msgstr "" "Regarde la valeur de la dans la base de données de factoids. Si un est donné, retourne la factoid exacte.Si l'option --raw est donnée, aucune substitution de variable ne sera effectuée avant d'afficher la factoid. n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." #: plugin.py:321 -#: plugin.py:529 +#: plugin.py:523 msgid "key id" msgstr "id de clef" -#: plugin.py:339 +#: plugin.py:334 msgid "" "[] []\n" "\n" @@ -133,16 +133,16 @@ msgstr "" "\n" "Ajoute une à la factoid correspondant à l'.Le n'est nécessaire que si il y a plus d'une factoid associée à l'.La même action peut être accomplie en utilisant la fonction 'learn' avec la , sans le contenu actuel de la factoid." -#: plugin.py:386 -#: plugin.py:403 +#: plugin.py:381 +#: plugin.py:398 msgid "This key-factoid relationship already exists." msgstr "Cette relation clef-factoid existe déjà." -#: plugin.py:394 +#: plugin.py:389 msgid "This key has more than one factoid associated with it, but you have not provided a number." msgstr "Cette clef a plus d'une factoid associée, mais vous n'avez pas fourni un nombre." -#: plugin.py:409 +#: plugin.py:403 msgid "" "[] [--plain] [--alpha] []\n" "\n" @@ -164,7 +164,7 @@ msgstr "" "\n" "Retourne une liste des factoids les plus utilisées. Si le n'est pas fourni, il correspond par défaut au nombre de clefs de factoids défini dans la clef de registre rankListLength.Si --plain est donné, le numéro des rangs et le comptage des utilisations n'est pas inclu dans la sortie.Si --alpha est donné, en plus de --plain, les clefs seront triées alphabétiquement, au lieu de l'être par leur rang. n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." -#: plugin.py:454 +#: plugin.py:448 msgid "" "[] \n" "\n" @@ -177,7 +177,7 @@ msgstr "" "\n" "Verrouille la/les factoid(s) associé(e) à la , pour qu'elles ne puissent plus être supprimées ou modifiées. n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." -#: plugin.py:472 +#: plugin.py:466 msgid "" "[] \n" "\n" @@ -190,7 +190,7 @@ msgstr "" "\n" "Verrouille la/les factoid(s) associé(e) à la , pour qu'elles puissent être supprimées ou modifiées. n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." -#: plugin.py:511 +#: plugin.py:505 msgid "" "[] [|*]\n" "\n" @@ -210,19 +210,19 @@ msgstr "" "\n" "Enlève la factoid de la base de données. Si il y a plus d'une factoid avec cette clef, un est requis pour déterminer laquelle sera supprimée. Un joker * peut être utilisé pour enlever toutes les factoids avec cette clef.Si, en tant que résultat, la clef (factoid) n'a plus aucune relation avec une autre factoid (clef), elle devrait être supprimée de la base de données. n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." -#: plugin.py:543 +#: plugin.py:537 msgid "There is no such factoid." msgstr "Cette factoid n'existe pas." -#: plugin.py:553 +#: plugin.py:547 msgid "Invalid factoid number." msgstr "Numéro de factoid invalide." -#: plugin.py:558 +#: plugin.py:552 msgid "%s factoids have that key. Please specify which one to remove, or use * to designate all of them." msgstr "%s factoids ont cette clef. Veuillez spécifier laquelle vous voulez supprimer ou utiliser * pour toutes les désigner." -#: plugin.py:566 +#: plugin.py:560 msgid "" "[]\n" "\n" @@ -234,11 +234,11 @@ msgstr "" "\n" "Retourne une factoid aléatoire de la base de données pour le canal. n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." -#: plugin.py:588 +#: plugin.py:582 msgid "I couldn't find a factoid." msgstr "Je ne peux trouver une factoid" -#: plugin.py:593 +#: plugin.py:587 msgid "" "[] \n" "\n" @@ -251,15 +251,15 @@ msgstr "" "\n" "Donne des informations sur la/les factoid(s) associée(s) à la . n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." -#: plugin.py:619 +#: plugin.py:613 msgid "#%i was added by %s at %s, and has been recalled %n" msgstr "#%i a été ajouté par %s le %s, et il y a eu %n." -#: plugin.py:622 +#: plugin.py:616 msgid "time" msgstr "rappel" -#: plugin.py:632 +#: plugin.py:626 msgid "" "[] \n" "\n" @@ -271,11 +271,11 @@ msgstr "" "\n" "Change la factoid associée à la , en accord avec l'. n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." -#: plugin.py:646 +#: plugin.py:640 msgid "I couldn't find any key %q" msgstr "Je ne peux trouver de clef %q" -#: plugin.py:661 +#: plugin.py:655 msgid "" "[] [--values] [--{regexp} ] [ ...]\n" "\n" @@ -288,13 +288,13 @@ msgstr "" "\n" "Recherche les clefs correspondant au . Si --regexp est donné, recherche les clefs correspondantes à l'. Si --values est donné, recherche parmi les valeurs, plutôt que parmi les clefs. n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même." -#: plugin.py:698 -#: plugin.py:707 +#: plugin.py:692 +#: plugin.py:701 msgid "No keys matched that query." msgstr "Aucune clef ne correspond à cette requête." -#: plugin.py:703 -#: plugin.py:712 +#: plugin.py:697 +#: plugin.py:706 msgid "More than 100 keys matched that query; please narrow your query." msgstr "Plus de 100 clefs correspondent à votre requête ; veuillez la préciser." diff --git a/plugins/Factoids/messages.pot b/plugins/Factoids/messages.pot index d7f98ee95..a819f7d82 100644 --- a/plugins/Factoids/messages.pot +++ b/plugins/Factoids/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-26 09:58+CET\n" +"POT-Creation-Date: 2011-06-28 19:40+CEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -87,11 +87,11 @@ msgid "" " " msgstr "" -#: plugin.py:257 plugin.py:391 +#: plugin.py:257 plugin.py:386 msgid "That's not a valid number for that key." msgstr "" -#: plugin.py:279 plugin.py:377 plugin.py:604 +#: plugin.py:279 plugin.py:372 plugin.py:598 msgid "No factoid matches that key." msgstr "" @@ -108,11 +108,11 @@ msgid "" " " msgstr "" -#: plugin.py:321 plugin.py:529 +#: plugin.py:321 plugin.py:523 msgid "key id" msgstr "" -#: plugin.py:339 +#: plugin.py:334 #, docstring msgid "" "[] []\n" @@ -126,15 +126,15 @@ msgid "" " " msgstr "" -#: plugin.py:386 plugin.py:403 +#: plugin.py:381 plugin.py:398 msgid "This key-factoid relationship already exists." msgstr "" -#: plugin.py:394 +#: plugin.py:389 msgid "This key has more than one factoid associated with it, but you have not provided a number." msgstr "" -#: plugin.py:409 +#: plugin.py:403 #, docstring msgid "" "[] [--plain] [--alpha] []\n" @@ -154,7 +154,7 @@ msgid "" " " msgstr "" -#: plugin.py:454 +#: plugin.py:448 #, docstring msgid "" "[] \n" @@ -165,7 +165,7 @@ msgid "" " " msgstr "" -#: plugin.py:472 +#: plugin.py:466 #, docstring msgid "" "[] \n" @@ -176,7 +176,7 @@ msgid "" " " msgstr "" -#: plugin.py:511 +#: plugin.py:505 #, docstring msgid "" "[] [|*]\n" @@ -194,19 +194,19 @@ msgid "" " " msgstr "" -#: plugin.py:543 +#: plugin.py:537 msgid "There is no such factoid." msgstr "" -#: plugin.py:553 +#: plugin.py:547 msgid "Invalid factoid number." msgstr "" -#: plugin.py:558 +#: plugin.py:552 msgid "%s factoids have that key. Please specify which one to remove, or use * to designate all of them." msgstr "" -#: plugin.py:566 +#: plugin.py:560 #, docstring msgid "" "[]\n" @@ -216,11 +216,11 @@ msgid "" " " msgstr "" -#: plugin.py:588 +#: plugin.py:582 msgid "I couldn't find a factoid." msgstr "" -#: plugin.py:593 +#: plugin.py:587 #, docstring msgid "" "[] \n" @@ -231,15 +231,15 @@ msgid "" " " msgstr "" -#: plugin.py:619 +#: plugin.py:613 msgid "#%i was added by %s at %s, and has been recalled %n" msgstr "" -#: plugin.py:622 +#: plugin.py:616 msgid "time" msgstr "" -#: plugin.py:632 +#: plugin.py:626 #, docstring msgid "" "[] \n" @@ -249,11 +249,11 @@ msgid "" " " msgstr "" -#: plugin.py:646 +#: plugin.py:640 msgid "I couldn't find any key %q" msgstr "" -#: plugin.py:661 +#: plugin.py:655 #, docstring msgid "" "[] [--values] [--{regexp} ] [ ...]\n" @@ -264,11 +264,11 @@ msgid "" " " msgstr "" -#: plugin.py:698 plugin.py:707 +#: plugin.py:692 plugin.py:701 msgid "No keys matched that query." msgstr "" -#: plugin.py:703 plugin.py:712 +#: plugin.py:697 plugin.py:706 msgid "More than 100 keys matched that query; please narrow your query." msgstr "" diff --git a/plugins/Factoids/plugin.py b/plugins/Factoids/plugin.py index 20381e859..7ed3c89a6 100644 --- a/plugins/Factoids/plugin.py +++ b/plugins/Factoids/plugin.py @@ -129,7 +129,7 @@ class Factoids(callbacks.Plugin, plugins.ChannelDBHandler): doc=method._fake__doc__ % (s, s), name=callbacks.formatCommand(command)) return super(Factoids, self).getCommandHelp(command, simpleSyntax) - + def _getKeyAndFactId(self, channel, key, factoid): db = self.getDb(channel) cursor = db.cursor() diff --git a/plugins/MessageParser/locale/fr.po b/plugins/MessageParser/locale/fr.po index abddb5c84..ad75aae17 100644 --- a/plugins/MessageParser/locale/fr.po +++ b/plugins/MessageParser/locale/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Gribble\n" -"POT-Creation-Date: 2011-02-26 11:47+CET\n" +"POT-Creation-Date: 2011-06-28 19:39+CEST\n" "PO-Revision-Date: \n" "Last-Translator: Valentin Lorentz \n" "Language-Team: Supybot-fr \n" @@ -13,32 +13,32 @@ msgstr "" "X-Poedit-Country: France\n" "X-Poedit-SourceCharset: Gribble\n" -#: config.py:49 +#: config.py:57 msgid "" "Determines whether the\n" " message parser is enabled. If enabled, will trigger on regexps\n" " added to the regexp db." msgstr "Détermine si le parseur de messages est activé. S'il l'est, il réagira aux expressions régulières qui sont dans la base de données d'expressions régulières." -#: config.py:53 +#: config.py:61 msgid "" "Determines whether we keep updating the usage\n" " count for each regexp, for popularity ranking." msgstr "Détermine si on met à jour le compteur d'utilisation de chaque expression régulière, pour un classement de popularité" -#: config.py:56 +#: config.py:64 msgid "" "Determines the number of regexps returned\n" " by the triggerrank command." msgstr "Détermine le nombre d'expressions régulières retournées par la commande triggerrank" -#: config.py:59 +#: config.py:67 msgid "" "Determines the capability required (if any) to\n" " vacuum the database." msgstr "Détermine la capacité requise (s'il y en a une) pour faire un vacuum de la base de données." -#: config.py:62 +#: config.py:70 msgid "" "Determines the\n" " capabilities required (if any) to manage the regexp database,\n" @@ -48,7 +48,7 @@ msgid "" " capability." msgstr "Détermine les capacités requises (s'il y en a) pour gérer la base de données d'expressions régulières, ce qui inclue l'ajout, la suppression, le verrouillage, et le déverrouillage. Utilisez 'canal,capa' pour des capacités par canal. Notez que l'absence de toute anti-capacité explicite signifit que l'utilisateur peut le faire." -#: config.py:69 +#: config.py:77 msgid "" "Determines the separator used between rexeps when\n" " shown by the list command." @@ -84,7 +84,7 @@ msgid "" "\n" " Associates with . is only\n" " necessary if the message isn't sent on the channel\n" -" itself. Action is echoed upon regexp match, with variables $1, $2, \n" +" itself. Action is echoed upon regexp match, with variables $1, $2,\n" " etc. being interpolated from the regexp match groups." msgstr "" "[] \n" @@ -103,7 +103,7 @@ msgstr "Ce trigger est bloqué." msgid "" "[] [--id] ]\n" "\n" -" Removes the trigger for from the triggers database. \n" +" Removes the trigger for from the triggers database.\n" " is only necessary if\n" " the message isn't sent in the channel itself.\n" " If option --id specified, will retrieve by regexp id, not content.\n" @@ -156,7 +156,7 @@ msgid "" "[] [--id] \n" "\n" " Looks up the value of in the triggers database.\n" -" is only necessary if the message isn't sent in the channel \n" +" is only necessary if the message isn't sent in the channel\n" " itself.\n" " If option --id specified, will retrieve by regexp id, not content.\n" " " @@ -170,7 +170,7 @@ msgid "" "[] [--id] \n" "\n" " Display information about in the triggers database.\n" -" is only necessary if the message isn't sent in the channel \n" +" is only necessary if the message isn't sent in the channel\n" " itself.\n" " If option --id specified, will retrieve by regexp id, not content.\n" " " @@ -196,7 +196,7 @@ msgid "" "[]\n" "\n" " Lists regexps present in the triggers database.\n" -" is only necessary if the message isn't sent in the channel \n" +" is only necessary if the message isn't sent in the channel\n" " itself. Regexp ID listed in paretheses.\n" " " msgstr "" @@ -212,10 +212,10 @@ msgstr "Il n'y a pas d'expression régulière dans ma base de données." #: plugin.py:394 msgid "" "[]\n" -" \n" -" Returns a list of top-ranked regexps, sorted by usage count \n" -" (rank). The number of regexps returned is set by the \n" -" rankListLength registry value. is only necessary if the \n" +"\n" +" Returns a list of top-ranked regexps, sorted by usage count\n" +" (rank). The number of regexps returned is set by the\n" +" rankListLength registry value. is only necessary if the\n" " message isn't sent in the channel itself.\n" " " msgstr "" @@ -226,12 +226,12 @@ msgstr "" #: plugin.py:418 msgid "" "[]\n" -" \n" +"\n" " Vacuums the database for .\n" " See SQLite vacuum doc here: http://www.sqlite.org/lang_vacuum.html\n" -" is only necessary if the message isn't sent in \n" +" is only necessary if the message isn't sent in\n" " the channel itself.\n" -" First check if user has the required capability specified in plugin \n" +" First check if user has the required capability specified in plugin\n" " config requireVacuumCapability.\n" " " msgstr "" diff --git a/plugins/MessageParser/messages.pot b/plugins/MessageParser/messages.pot index 6a9766807..8cf2374c2 100644 --- a/plugins/MessageParser/messages.pot +++ b/plugins/MessageParser/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-26 11:47+CET\n" +"POT-Creation-Date: 2011-06-28 19:39+CEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,32 +15,32 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: config.py:49 +#: config.py:57 msgid "" "Determines whether the\n" " message parser is enabled. If enabled, will trigger on regexps\n" " added to the regexp db." msgstr "" -#: config.py:53 +#: config.py:61 msgid "" "Determines whether we keep updating the usage\n" " count for each regexp, for popularity ranking." msgstr "" -#: config.py:56 +#: config.py:64 msgid "" "Determines the number of regexps returned\n" " by the triggerrank command." msgstr "" -#: config.py:59 +#: config.py:67 msgid "" "Determines the capability required (if any) to\n" " vacuum the database." msgstr "" -#: config.py:62 +#: config.py:70 msgid "" "Determines the\n" " capabilities required (if any) to manage the regexp database,\n" @@ -50,7 +50,7 @@ msgid "" " capability." msgstr "" -#: config.py:69 +#: config.py:77 msgid "" "Determines the separator used between rexeps when\n" " shown by the list command." @@ -92,7 +92,7 @@ msgid "" "\n" " Associates with . is only\n" " necessary if the message isn't sent on the channel\n" -" itself. Action is echoed upon regexp match, with variables $1, $2, \n" +" itself. Action is echoed upon regexp match, with variables $1, $2,\n" " etc. being interpolated from the regexp match groups." msgstr "" @@ -109,7 +109,7 @@ msgstr "" msgid "" "[] [--id] ]\n" "\n" -" Removes the trigger for from the triggers database. \n" +" Removes the trigger for from the triggers database.\n" " is only necessary if\n" " the message isn't sent in the channel itself.\n" " If option --id specified, will retrieve by regexp id, not content.\n" @@ -152,7 +152,7 @@ msgid "" "[] [--id] \n" "\n" " Looks up the value of in the triggers database.\n" -" is only necessary if the message isn't sent in the channel \n" +" is only necessary if the message isn't sent in the channel\n" " itself.\n" " If option --id specified, will retrieve by regexp id, not content.\n" " " @@ -164,7 +164,7 @@ msgid "" "[] [--id] \n" "\n" " Display information about in the triggers database.\n" -" is only necessary if the message isn't sent in the channel \n" +" is only necessary if the message isn't sent in the channel\n" " itself.\n" " If option --id specified, will retrieve by regexp id, not content.\n" " " @@ -188,7 +188,7 @@ msgid "" "[]\n" "\n" " Lists regexps present in the triggers database.\n" -" is only necessary if the message isn't sent in the channel \n" +" is only necessary if the message isn't sent in the channel\n" " itself. Regexp ID listed in paretheses.\n" " " msgstr "" @@ -201,10 +201,10 @@ msgstr "" #, docstring msgid "" "[]\n" -" \n" -" Returns a list of top-ranked regexps, sorted by usage count \n" -" (rank). The number of regexps returned is set by the \n" -" rankListLength registry value. is only necessary if the \n" +"\n" +" Returns a list of top-ranked regexps, sorted by usage count\n" +" (rank). The number of regexps returned is set by the\n" +" rankListLength registry value. is only necessary if the\n" " message isn't sent in the channel itself.\n" " " msgstr "" @@ -213,12 +213,12 @@ msgstr "" #, docstring msgid "" "[]\n" -" \n" +"\n" " Vacuums the database for .\n" " See SQLite vacuum doc here: http://www.sqlite.org/lang_vacuum.html\n" -" is only necessary if the message isn't sent in \n" +" is only necessary if the message isn't sent in\n" " the channel itself.\n" -" First check if user has the required capability specified in plugin \n" +" First check if user has the required capability specified in plugin\n" " config requireVacuumCapability.\n" " " msgstr ""