Merge branch 'testing' of github.com:ProgVal/Limnoria into testing

This commit is contained in:
Valentin Lorentz 2011-06-07 06:08:45 +02:00
commit 05f122a008
4 changed files with 91 additions and 65 deletions

View File

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Supybot-fr\n"
"POT-Creation-Date: 2010-10-17 15:35+CEST\n"
"POT-Creation-Date: 2011-06-06 19:05+CEST\n"
"PO-Revision-Date: \n"
"Last-Translator: Valentin Lorentz <progval@gmail.com>\n"
"Language-Team: Supybot-fr <progval@gmail.com>\n"
@ -123,19 +123,23 @@ msgstr ""
"\n"
"Retourne la version actuelle du bot"
#: plugin.py:217
msgid "The newest version available online is %s."
msgstr "La dernière version disponible en ligne est %s."
#: plugin.py:225
msgid "The newest versions available online are %s."
msgstr "Les dernières versions disponibles en ligne sont %s."
#: plugin.py:221
msgid "I couldn't fetch the newest version from the Supybot website."
msgstr "Je ne peux récupérer la dernière version sur le site de Supybot."
#: plugin.py:226
msgid "%s (in %s)"
msgstr "%s (dans %s)"
#: plugin.py:223
#: plugin.py:230
msgid "I couldn't fetch the newest version from the Limnoria repository."
msgstr "Je ne peux récupérer la dernière version sur le dépôt de Limnoria."
#: plugin.py:232
msgid "The current (running) version of this Supybot is %s. %s"
msgstr "La version de ce Supybot est %s. %s"
#: plugin.py:230
#: plugin.py:239
msgid ""
"takes no arguments\n"
"\n"
@ -146,11 +150,11 @@ msgstr ""
"\n"
"Retourne une URL disant où trouver Supybot."
#: plugin.py:234
#: plugin.py:243
msgid "My source is at http://supybot.com/"
msgstr "Ma source est disponible sur http://supybot.com/"
#: plugin.py:239
#: plugin.py:248
msgid ""
"[<nick>]\n"
"\n"
@ -164,23 +168,31 @@ msgstr ""
"\n"
"Si la dernière commande était tronquée par les limitations de taille des messages sur IRC, retourne le morceau suivant résultant de la dernière commande. Si le <nick> est donné, continue la dernière commande du <nick> plutôt que de la personne envoyant ce message."
#: plugin.py:253
#: plugin.py:262
msgid "%s has no public mores."
msgstr "%s n'a pas de 'more' public."
#: plugin.py:256
#: plugin.py:265
msgid "Sorry, I can't find any mores for %s"
msgstr "Désolé, je ne peux trouver de 'more' pour %s"
#: plugin.py:265
#: plugin.py:272
msgid "more message"
msgstr "autre message"
#: plugin.py:274
msgid "more messages"
msgstr "autres messages"
#: plugin.py:278
msgid "You haven't asked me a command; perhaps you want to see someone else's more. To do so, call this command with that person's nick."
msgstr "Vous ne m'avez donné aucune commande. Peut-être que vous voulez voir celle de quelqu'un d'autre. Pour cela, appelez cette commande en ajoutant le nick de cette personne."
#: plugin.py:269
#: plugin.py:282
msgid "That's all, there is no more."
msgstr "C'est tout, il n'y a plus de 'more'"
#: plugin.py:279
#: plugin.py:292
msgid ""
"[--{from,in,on,with,without,regexp} <value>] [--nolimit]\n"
"\n"
@ -197,11 +209,11 @@ msgstr ""
"\n"
"Retourne le dernier message correspondant aux critères donnés. --from requiert le nick de la personne qui a envoyé le message ; --in requiert le canal sur lequel a été envoyé le message ; --with requiert une chaîne qui doit être dans le message --regexp requiert une expression régulière à laquelle le message doit correspondre ; --nolimit retourne tous les messages qui peuvent être trouvés. Par défaut, recherche dans les logs du canal sur lequel est envoyée cette commande."
#: plugin.py:373
#: plugin.py:386
msgid "I couldn't find a message matching that criteria in my history of %s messages."
msgstr "Je ne peux trouver de message correspondant à ce critère dans mon historique de %s messages."
#: plugin.py:388
#: plugin.py:401
msgid ""
"<nick> <text>\n"
"\n"
@ -213,23 +225,23 @@ msgstr ""
"\n"
"Dit le <texte> au <nick>. Utile si vous utilisez des commandes imbriquées."
#: plugin.py:396
#: plugin.py:409
msgid "Dude, just give the command. No need for the tell."
msgstr "Mec, contentes-toi de me donner la commande. Pas besoin d'utiliser 'tell'."
#: plugin.py:401
#: plugin.py:414
msgid "You just told me, why should I tell myself?"
msgstr "Vous venez de me le dire, pourquoi devrais-je me le dire moi-même ?"
#: plugin.py:406
#: plugin.py:419
msgid "I haven't seen %s, I'll let you do the telling."
msgstr "Je n'ai pas vu %s, je vous laisse lui dire."
#: plugin.py:411
#: plugin.py:424
msgid "%s wants me to tell you: %s"
msgstr "%s veut que je vous dise : %s"
#: plugin.py:417
#: plugin.py:430
msgid ""
"takes no arguments\n"
"\n"
@ -240,7 +252,7 @@ msgstr ""
"\n"
"Vérifie si le bot est encore en vie."
#: plugin.py:421
#: plugin.py:434
msgid "pong"
msgstr "pong"

View File

@ -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-06 19:05+CEST\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -45,15 +45,15 @@ msgid ""
" command"
msgstr ""
#: plugin.py:80
#: plugin.py:81
msgid "You've given me %s invalid commands within the last minute; I'm now ignoring you for %s."
msgstr ""
#: plugin.py:92
#: plugin.py:93
msgid "The %q plugin is loaded, but there is no command named %q in it. Try \"list %s\" to see the commands in the %q plugin."
msgstr ""
#: plugin.py:118
#: plugin.py:119
#, docstring
msgid ""
"[--private] [<plugin>]\n"
@ -64,19 +64,19 @@ msgid ""
" "
msgstr ""
#: plugin.py:143
#: plugin.py:144
msgid "There are no private plugins."
msgstr ""
#: plugin.py:145
#: plugin.py:146
msgid "There are no public plugins."
msgstr ""
#: plugin.py:152
#: plugin.py:153
msgid "That plugin exists, but has no commands. This probably means that it has some configuration variables that can be changed in order to modify its behavior. Try \"config list supybot.plugins.%s\" to see what configuration variables it has."
msgstr ""
#: plugin.py:163
#: plugin.py:164
#, docstring
msgid ""
"<string>\n"
@ -86,11 +86,11 @@ msgid ""
" "
msgstr ""
#: plugin.py:182
#: plugin.py:183
msgid "No appropriate commands were found."
msgstr ""
#: plugin.py:187
#: plugin.py:188
#, docstring
msgid ""
"[<plugin>] [<command>]\n"
@ -100,15 +100,15 @@ msgid ""
" "
msgstr ""
#: plugin.py:197
#: plugin.py:198
msgid "That command exists in the %L plugins. Please specify exactly which plugin command you want help with."
msgstr ""
#: plugin.py:204
#: plugin.py:205
msgid "There is no command %q."
msgstr ""
#: plugin.py:210
#: plugin.py:211
#, docstring
msgid ""
"takes no arguments\n"
@ -117,19 +117,23 @@ msgid ""
" "
msgstr ""
#: plugin.py:216
msgid "The newest version available online is %s."
#: plugin.py:225
msgid "The newest versions available online are %s."
msgstr ""
#: plugin.py:220
msgid "I couldn't fetch the newest version from the Supybot website."
#: plugin.py:226
msgid "%s (in %s)"
msgstr ""
#: plugin.py:222
#: plugin.py:230
msgid "I couldn't fetch the newest version from the Limnoria repository."
msgstr ""
#: plugin.py:232
msgid "The current (running) version of this Supybot is %s. %s"
msgstr ""
#: plugin.py:229
#: plugin.py:239
#, docstring
msgid ""
"takes no arguments\n"
@ -138,11 +142,11 @@ msgid ""
" "
msgstr ""
#: plugin.py:233
#: plugin.py:243
msgid "My source is at http://supybot.com/"
msgstr ""
#: plugin.py:238
#: plugin.py:248
#, docstring
msgid ""
"[<nick>]\n"
@ -154,31 +158,31 @@ msgid ""
" "
msgstr ""
#: plugin.py:252
#: plugin.py:262
msgid "%s has no public mores."
msgstr ""
#: plugin.py:255
#: plugin.py:265
msgid "Sorry, I can't find any mores for %s"
msgstr ""
#: plugin.py:262
#: plugin.py:272
msgid "more message"
msgstr ""
#: plugin.py:264
#: plugin.py:274
msgid "more messages"
msgstr ""
#: plugin.py:268
#: plugin.py:278
msgid "You haven't asked me a command; perhaps you want to see someone else's more. To do so, call this command with that person's nick."
msgstr ""
#: plugin.py:272
#: plugin.py:282
msgid "That's all, there is no more."
msgstr ""
#: plugin.py:282
#: plugin.py:292
#, docstring
msgid ""
"[--{from,in,on,with,without,regexp} <value>] [--nolimit]\n"
@ -193,11 +197,11 @@ msgid ""
" "
msgstr ""
#: plugin.py:376
#: plugin.py:386
msgid "I couldn't find a message matching that criteria in my history of %s messages."
msgstr ""
#: plugin.py:391
#: plugin.py:401
#, docstring
msgid ""
"<nick> <text>\n"
@ -207,23 +211,23 @@ msgid ""
" "
msgstr ""
#: plugin.py:399
#: plugin.py:409
msgid "Dude, just give the command. No need for the tell."
msgstr ""
#: plugin.py:404
#: plugin.py:414
msgid "You just told me, why should I tell myself?"
msgstr ""
#: plugin.py:409
#: plugin.py:419
msgid "I haven't seen %s, I'll let you do the telling."
msgstr ""
#: plugin.py:414
#: plugin.py:424
msgid "%s wants me to tell you: %s"
msgstr ""
#: plugin.py:420
#: plugin.py:430
#, docstring
msgid ""
"takes no arguments\n"
@ -232,7 +236,7 @@ msgid ""
" "
msgstr ""
#: plugin.py:424
#: plugin.py:434
msgid "pong"
msgstr ""

View File

@ -28,6 +28,7 @@
# POSSIBILITY OF SUCH DAMAGE.
###
import re
import os
import sys
import time
@ -212,13 +213,22 @@ class Misc(callbacks.Plugin):
Returns the version of the current bot.
"""
try:
newest = utils.web.getUrl('http://supybot.sf.net/version.txt')
newest = _('The newest version available online is %s.') % \
newest.strip()
newestUrl = 'https://github.com/ProgVal/Limnoria/raw/%s/' + \
'src/version.py'
versions = {}
for branch in ('master', 'testing'):
file = utils.web.getUrl(newestUrl % branch)
match = re.search(r"^version = '([^']+)'$", file, re.M)
if match is None:
continue
versions[branch] = match.group(1)
newest = _('The newest versions available online are %s.') % \
', '.join([_('%s (in %s)') % (y,x)
for x,y in versions.items()])
except utils.web.Error, e:
self.log.info('Couldn\'t get website version: %s', e)
newest = _('I couldn\'t fetch the newest version '
'from the Supybot website.')
'from the Limnoria repository.')
s = _('The current (running) version of this Supybot is %s. %s') % \
(conf.version, newest)
irc.reply(s)

View File

@ -1,3 +1,3 @@
"""stick the various versioning attributes in here, so we only have to change
them once."""
version = '0.83.4.1+limnoria (2011-05-27T18:16:23+0200)'
version = '0.83.4.1+limnoria (2011-06-05T20:30:31+0200)'