From f40ffe37e4c74ac16e5f74bf4c6ea7287135bbde Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Sun, 17 Aug 2014 13:47:30 +0200 Subject: [PATCH] Admin: Clarify error on 435 numeric --- plugins/Admin/locales/de.po | 42 ++++++++++++++++++++----------------- plugins/Admin/locales/fi.po | 42 ++++++++++++++++++++----------------- plugins/Admin/locales/fr.po | 42 ++++++++++++++++++++----------------- plugins/Admin/locales/it.po | 42 ++++++++++++++++++++----------------- plugins/Admin/messages.pot | 36 +++++++++++++++---------------- plugins/Admin/plugin.py | 3 ++- 6 files changed, 112 insertions(+), 95 deletions(-) diff --git a/plugins/Admin/locales/de.po b/plugins/Admin/locales/de.po index cea1b7fa2..3dd26d2fb 100644 --- a/plugins/Admin/locales/de.po +++ b/plugins/Admin/locales/de.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Supybot\n" -"POT-Creation-Date: 2014-08-17 13:28+CEST\n" +"POT-Creation-Date: 2014-08-17 13:46+CEST\n" "PO-Revision-Date: 2011-10-31 13:37+0100\n" "Last-Translator: Florian Besser \n" "Language-Team: German \n" @@ -82,14 +82,15 @@ msgid "Someone else is already using that nick." msgstr "Jemand anderes benutzt diesen Nick schon." #: plugin.py:195 -msgid "That nick is currently banned." -msgstr "Dieser Nick ist momentan gebannt." +#, fuzzy +msgid "I can't change nick, I'm currently banned in %s." +msgstr "Ich kann meinen Nick nicht ändern, der Server sagte %q." -#: plugin.py:202 +#: plugin.py:203 msgid "I can't change nicks, the server said %q." msgstr "Ich kann meinen Nick nicht ändern, der Server sagte %q." -#: plugin.py:216 +#: plugin.py:217 #, fuzzy msgid "" "[] []\n" @@ -103,7 +104,7 @@ msgstr "" "Ändert den Nick des Bots zu . Falls nicht angegeben wird, wird " "der momentane Botnick zurückgegeben." -#: plugin.py:233 +#: plugin.py:234 msgid "" "[] []\n" "\n" @@ -121,11 +122,11 @@ msgstr "" "soll. Falls angegeben wird, wird dies als Verlassensnachricht " "verwendet." -#: plugin.py:251 +#: plugin.py:252 msgid "I'm not in %s." msgstr "Ich bin nicht in %s." -#: plugin.py:263 +#: plugin.py:264 msgid "" " \n" "\n" @@ -139,7 +140,7 @@ msgstr "" "Gibt dem angebenen Benutzer (oder dem auf den die " "zutrifft) die angegebene Fähigkeit." -#: plugin.py:283 +#: plugin.py:284 msgid "" "The \"owner\" capability can't be added in the bot. Use the supybot-adduser " "program (or edit the users.conf file yourself) to add an owner capability." @@ -148,11 +149,11 @@ msgstr "" "das supybot-adduser Programm (oder verändere users.conf per Hand) um die " "Besitzer Fähigkeit hinzuzufügen." -#: plugin.py:294 +#: plugin.py:295 msgid "You can't add capabilities you don't have." msgstr "Du kannst keine Fähigkeiten hinzufügen, die du nicht hast." -#: plugin.py:299 +#: plugin.py:300 msgid "" " \n" "\n" @@ -166,15 +167,15 @@ msgstr "" "Nimmt dem Benutzer der durch (oder dem Benutzer auf den momentan " " zeigt) angeben wird die angegeben Fähigkeit ." -#: plugin.py:311 +#: plugin.py:312 msgid "That user doesn't have that capability." msgstr "Der Benutzer hat diese Fähigkeit nicht." -#: plugin.py:313 +#: plugin.py:314 msgid "You can't remove capabilities you don't have." msgstr "Du kannst keine Fähigkeiten entfernen, die du nicht hast." -#: plugin.py:321 +#: plugin.py:322 msgid "" " []\n" "\n" @@ -193,7 +194,7 @@ msgstr "" "optional, das legt fest wann die Ignorierung abläuft;falls dies nicht " "angegeben wird, wird die Ignorierung niemals ablaufen." -#: plugin.py:334 +#: plugin.py:335 msgid "" "\n" "\n" @@ -206,11 +207,11 @@ msgstr "" "Wird die beständige Ignorierung, von oder der Hostmaske die " "momentan mit dem verbunden wird, aufheben." -#: plugin.py:343 +#: plugin.py:344 msgid "%s wasn't in the ignores database." msgstr "%s war nicht in der Datenbank für Ignorierungen." -#: plugin.py:348 +#: plugin.py:349 msgid "" "takes no arguments\n" "\n" @@ -221,11 +222,11 @@ msgstr "" "\n" "Listet die Hostmasken auf, die der Bot ignoriert." -#: plugin.py:356 +#: plugin.py:357 msgid "I'm not currently globally ignoring anyone." msgstr "Momentan ignoriere ich niemanden global." -#: plugin.py:360 +#: plugin.py:361 msgid "" "takes no arguments\n" "\n" @@ -235,3 +236,6 @@ msgstr "" "hat keine Argumente\n" "\n" "Leert die momentane Sendenwarteschlange für dieses Netzwerk." + +#~ msgid "That nick is currently banned." +#~ msgstr "Dieser Nick ist momentan gebannt." diff --git a/plugins/Admin/locales/fi.po b/plugins/Admin/locales/fi.po index e71c980fe..e5c1374c3 100644 --- a/plugins/Admin/locales/fi.po +++ b/plugins/Admin/locales/fi.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Finnish translation of Admin plugin in Supybot\n" -"POT-Creation-Date: 2014-03-22 12:41+EET\n" +"POT-Creation-Date: 2014-08-17 13:46+CEST\n" "PO-Revision-Date: 2014-03-22 12:46+0200\n" "Last-Translator: Mikaela Suomalainen \n" "Language-Team: \n" @@ -89,14 +89,15 @@ msgid "Someone else is already using that nick." msgstr "Joku muu käyttää jo tuota nimimerkkiä." #: plugin.py:195 -msgid "That nick is currently banned." -msgstr "Tuolla nimimerkillä on tällähetkellä porttikielto." +#, fuzzy +msgid "I can't change nick, I'm currently banned in %s." +msgstr "Minä en voi vaihtaa nimimerkkiä, koska palvelin sanoi %q" -#: plugin.py:202 +#: plugin.py:203 msgid "I can't change nicks, the server said %q." msgstr "Minä en voi vaihtaa nimimerkkiä, koska palvelin sanoi %q" -#: plugin.py:216 +#: plugin.py:217 msgid "" "[] []\n" "\n" @@ -111,7 +112,7 @@ msgstr "" " nimimerkki palautetaan.\n" " " -#: plugin.py:233 +#: plugin.py:234 msgid "" "[] []\n" "\n" @@ -130,11 +131,11 @@ msgstr "" " poistumisviestissä.\n" " " -#: plugin.py:251 +#: plugin.py:252 msgid "I'm not in %s." msgstr "Minä en ole kanavalla %s." -#: plugin.py:263 +#: plugin.py:264 msgid "" " \n" "\n" @@ -150,7 +151,7 @@ msgstr "" " ilmoittaa) määritetyn valtuuden \n" " " -#: plugin.py:283 +#: plugin.py:284 msgid "" "The \"owner\" capability can't be added in the bot. Use the supybot-adduser " "program (or edit the users.conf file yourself) to add an owner capability." @@ -158,11 +159,11 @@ msgstr "" "\"Owner\" valtuutta ei voi lisätä botissa. Käytä supybot-adduser ohjelmaa " "(tai muokkaa users.conf tiedostoa itse) lisätäksesi owner valtuuden." -#: plugin.py:294 +#: plugin.py:295 msgid "You can't add capabilities you don't have." msgstr "Et voi lisätä valtuuksia, joita sinulla ei ole." -#: plugin.py:299 +#: plugin.py:300 msgid "" " \n" "\n" @@ -178,15 +179,15 @@ msgstr "" " sopii) määritetyn valtuuden \n" " " -#: plugin.py:311 +#: plugin.py:312 msgid "That user doesn't have that capability." msgstr "Tuolla käyttäjällä ei tuota valtuutta." -#: plugin.py:313 +#: plugin.py:314 msgid "You can't remove capabilities you don't have." msgstr "Sinä et voi poistaa valtuuksia, joita sinulla ei ole." -#: plugin.py:321 +#: plugin.py:322 msgid "" " []\n" "\n" @@ -210,7 +211,7 @@ msgstr "" "automaattisesti.\n" " " -#: plugin.py:334 +#: plugin.py:335 msgid "" "\n" "\n" @@ -224,11 +225,11 @@ msgstr "" " hostmaskista joka on tällä hetkellä yhdistetty .\n" " " -#: plugin.py:343 +#: plugin.py:344 msgid "%s wasn't in the ignores database." msgstr "%s ei ollut huomiotta jätettävien tietokannassa." -#: plugin.py:348 +#: plugin.py:349 msgid "" "takes no arguments\n" "\n" @@ -240,11 +241,11 @@ msgstr "" " Luetteloi hostmaskit jotka ovat botin huomiotta jättämis listalla.\n" " " -#: plugin.py:356 +#: plugin.py:357 msgid "I'm not currently globally ignoring anyone." msgstr "En tällä hetkellä jätä ketään huomioitta globaalisti." -#: plugin.py:360 +#: plugin.py:361 msgid "" "takes no arguments\n" "\n" @@ -255,3 +256,6 @@ msgstr "" "\n" " Tyhjentää nykyisen lähetysjonon tälle verkolle.\n" " " + +#~ msgid "That nick is currently banned." +#~ msgstr "Tuolla nimimerkillä on tällähetkellä porttikielto." diff --git a/plugins/Admin/locales/fr.po b/plugins/Admin/locales/fr.po index b7ed4cb9e..53e3aaf0f 100644 --- a/plugins/Admin/locales/fr.po +++ b/plugins/Admin/locales/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" -"POT-Creation-Date: 2014-08-17 13:28+CEST\n" +"POT-Creation-Date: 2014-08-17 13:46+CEST\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: ProgVal \n" @@ -81,14 +81,15 @@ msgid "Someone else is already using that nick." msgstr "Quelqu'un d'autre utilise déjà ce nick." #: plugin.py:195 -msgid "That nick is currently banned." -msgstr "Ce nick est banni." +#, fuzzy +msgid "I can't change nick, I'm currently banned in %s." +msgstr "Je ne peux changer de nick, le serveur a dit %q." -#: plugin.py:202 +#: plugin.py:203 msgid "I can't change nicks, the server said %q." msgstr "Je ne peux changer de nick, le serveur a dit %q." -#: plugin.py:216 +#: plugin.py:217 msgid "" "[] []\n" "\n" @@ -101,7 +102,7 @@ msgstr "" "Change le nick du bot à . Si aucun nick n'est donné, retourne le nick " "actuel du bot." -#: plugin.py:233 +#: plugin.py:234 msgid "" "[] []\n" "\n" @@ -119,11 +120,11 @@ msgstr "" "l'actuel. Si la est spécifiée, elle est utilisée comme message de " "départ." -#: plugin.py:251 +#: plugin.py:252 msgid "I'm not in %s." msgstr "Je ne suis pas sur %s." -#: plugin.py:263 +#: plugin.py:264 msgid "" " \n" "\n" @@ -137,7 +138,7 @@ msgstr "" "Donne la à l'utilisateur spécifié par (ou l'utilisateur à " "qui correspond )." -#: plugin.py:283 +#: plugin.py:284 msgid "" "The \"owner\" capability can't be added in the bot. Use the supybot-adduser " "program (or edit the users.conf file yourself) to add an owner capability." @@ -146,11 +147,11 @@ msgstr "" "supybot-adduser (ou éditez le fichier users.conf vous-même) pour ajouter la " "capacité owner." -#: plugin.py:294 +#: plugin.py:295 msgid "You can't add capabilities you don't have." msgstr "Vous ne pouvez ajouter des capacités que vous n'avez pas." -#: plugin.py:299 +#: plugin.py:300 msgid "" " \n" "\n" @@ -164,15 +165,15 @@ msgstr "" "Retire la à l'utilisateur spécifié par le (ou celui à qui " "correspond le )." -#: plugin.py:311 +#: plugin.py:312 msgid "That user doesn't have that capability." msgstr "Cet utilisateur n'a pas cette capacité." -#: plugin.py:313 +#: plugin.py:314 msgid "You can't remove capabilities you don't have." msgstr "Vous ne pouvez retirer des capacités que vous n'avez pas." -#: plugin.py:321 +#: plugin.py:322 msgid "" " []\n" "\n" @@ -191,7 +192,7 @@ msgstr "" "quand (en \"secondes à partir de maintenant\") l'ignorance expirera ; si " "elle n'est pas donnée, l'ignorance n'expirera jamais." -#: plugin.py:334 +#: plugin.py:335 msgid "" "\n" "\n" @@ -204,11 +205,11 @@ msgstr "" "Ceci retirera le masque d'ignorance persistant sur le , ou " "sur le masque d'hôte associé au ." -#: plugin.py:343 +#: plugin.py:344 msgid "%s wasn't in the ignores database." msgstr "%s n'étais pas dans ma base de données d'ignorance." -#: plugin.py:348 +#: plugin.py:349 msgid "" "takes no arguments\n" "\n" @@ -219,11 +220,11 @@ msgstr "" "\n" "Liste les masques d'hôte que le bot ignore." -#: plugin.py:356 +#: plugin.py:357 msgid "I'm not currently globally ignoring anyone." msgstr "Je n'ignore actuellement personne globalement." -#: plugin.py:360 +#: plugin.py:361 msgid "" "takes no arguments\n" "\n" @@ -233,3 +234,6 @@ msgstr "" "Ne prend pas d'argument\n" "\n" "Vide la queue en attente pour ce réseau." + +#~ msgid "That nick is currently banned." +#~ msgstr "Ce nick est banni." diff --git a/plugins/Admin/locales/it.po b/plugins/Admin/locales/it.po index e42cb8f20..f21557a89 100644 --- a/plugins/Admin/locales/it.po +++ b/plugins/Admin/locales/it.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" -"POT-Creation-Date: 2014-08-17 13:28+CEST\n" +"POT-Creation-Date: 2014-08-17 13:46+CEST\n" "PO-Revision-Date: 2012-03-15 20:25+0100\n" "Last-Translator: skizzhg \n" "Language-Team: Italian \n" @@ -83,14 +83,15 @@ msgid "Someone else is already using that nick." msgstr "Qualcun altro sta utilizzando questo nick." #: plugin.py:195 -msgid "That nick is currently banned." -msgstr "Il nick è attualmente bannato." +#, fuzzy +msgid "I can't change nick, I'm currently banned in %s." +msgstr "Non posso cambiare nick, il server ha detto %q." -#: plugin.py:202 +#: plugin.py:203 msgid "I can't change nicks, the server said %q." msgstr "Non posso cambiare nick, il server ha detto %q." -#: plugin.py:216 +#: plugin.py:217 #, fuzzy msgid "" "[] []\n" @@ -106,7 +107,7 @@ msgstr "" " quello attuale.\n" " " -#: plugin.py:233 +#: plugin.py:234 msgid "" "[] []\n" "\n" @@ -127,11 +128,11 @@ msgstr "" "uscita.\n" " " -#: plugin.py:251 +#: plugin.py:252 msgid "I'm not in %s." msgstr "Non sono in %s." -#: plugin.py:263 +#: plugin.py:264 msgid "" " \n" "\n" @@ -146,7 +147,7 @@ msgstr "" " attualmente) la specificata.\n" " " -#: plugin.py:283 +#: plugin.py:284 msgid "" "The \"owner\" capability can't be added in the bot. Use the supybot-adduser " "program (or edit the users.conf file yourself) to add an owner capability." @@ -154,11 +155,11 @@ msgstr "" "La capacità \"owner\" non può essere aggiunta al bot. Utilizzare il " "programma supybot-adduser (o modificare il file users.conf) per aggiungerla." -#: plugin.py:294 +#: plugin.py:295 msgid "You can't add capabilities you don't have." msgstr "Non puoi aggiungere capacità che non hai." -#: plugin.py:299 +#: plugin.py:300 msgid "" " \n" "\n" @@ -174,15 +175,15 @@ msgstr "" " attualmente) la specificata\n" " " -#: plugin.py:311 +#: plugin.py:312 msgid "That user doesn't have that capability." msgstr "Questo utente non ha tale capacità." -#: plugin.py:313 +#: plugin.py:314 msgid "You can't remove capabilities you don't have." msgstr "Non puoi rimuovere capacità che non hai." -#: plugin.py:321 +#: plugin.py:322 msgid "" " []\n" "\n" @@ -205,7 +206,7 @@ msgstr "" " questo non scadrà mai.\n" " " -#: plugin.py:334 +#: plugin.py:335 msgid "" "\n" "\n" @@ -219,11 +220,11 @@ msgstr "" "associata a .\n" " " -#: plugin.py:343 +#: plugin.py:344 msgid "%s wasn't in the ignores database." msgstr "%s non è nel mio database degli ignorati." -#: plugin.py:348 +#: plugin.py:349 msgid "" "takes no arguments\n" "\n" @@ -235,11 +236,11 @@ msgstr "" " Elenca le hostmask che il bot sta ignorando.\n" " " -#: plugin.py:356 +#: plugin.py:357 msgid "I'm not currently globally ignoring anyone." msgstr "Al momento non sto ignorando nessuno." -#: plugin.py:360 +#: plugin.py:361 msgid "" "takes no arguments\n" "\n" @@ -251,3 +252,6 @@ msgstr "" " Pulisce l'attuale coda dei messaggi da inviare (interrompe il flood) " "per questa rete.\n" " " + +#~ msgid "That nick is currently banned." +#~ msgstr "Il nick è attualmente bannato." diff --git a/plugins/Admin/messages.pot b/plugins/Admin/messages.pot index c3a7ce7c9..6a390b14d 100644 --- a/plugins/Admin/messages.pot +++ b/plugins/Admin/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-03-22 16:34+EET\n" +"POT-Creation-Date: 2014-08-17 13:46+CEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -77,14 +77,14 @@ msgid "Someone else is already using that nick." msgstr "" #: plugin.py:195 -msgid "That nick is currently banned." +msgid "I can't change nick, I'm currently banned in %s." msgstr "" -#: plugin.py:202 +#: plugin.py:203 msgid "I can't change nicks, the server said %q." msgstr "" -#: plugin.py:216 +#: plugin.py:217 #, docstring msgid "" "[] []\n" @@ -94,7 +94,7 @@ msgid "" " " msgstr "" -#: plugin.py:233 +#: plugin.py:234 #, docstring msgid "" "[] []\n" @@ -106,11 +106,11 @@ msgid "" " " msgstr "" -#: plugin.py:251 +#: plugin.py:252 msgid "I'm not in %s." msgstr "" -#: plugin.py:263 +#: plugin.py:264 #, docstring msgid "" " \n" @@ -120,15 +120,15 @@ msgid "" " " msgstr "" -#: plugin.py:283 +#: plugin.py:284 msgid "The \"owner\" capability can't be added in the bot. Use the supybot-adduser program (or edit the users.conf file yourself) to add an owner capability." msgstr "" -#: plugin.py:294 +#: plugin.py:295 msgid "You can't add capabilities you don't have." msgstr "" -#: plugin.py:299 +#: plugin.py:300 #, docstring msgid "" " \n" @@ -138,15 +138,15 @@ msgid "" " " msgstr "" -#: plugin.py:311 +#: plugin.py:312 msgid "That user doesn't have that capability." msgstr "" -#: plugin.py:313 +#: plugin.py:314 msgid "You can't remove capabilities you don't have." msgstr "" -#: plugin.py:321 +#: plugin.py:322 #, docstring msgid "" " []\n" @@ -158,7 +158,7 @@ msgid "" " " msgstr "" -#: plugin.py:334 +#: plugin.py:335 #, docstring msgid "" "\n" @@ -168,11 +168,11 @@ msgid "" " " msgstr "" -#: plugin.py:343 +#: plugin.py:344 msgid "%s wasn't in the ignores database." msgstr "" -#: plugin.py:348 +#: plugin.py:349 #, docstring msgid "" "takes no arguments\n" @@ -181,11 +181,11 @@ msgid "" " " msgstr "" -#: plugin.py:356 +#: plugin.py:357 msgid "I'm not currently globally ignoring anyone." msgstr "" -#: plugin.py:360 +#: plugin.py:361 #, docstring msgid "" "takes no arguments\n" diff --git a/plugins/Admin/plugin.py b/plugins/Admin/plugin.py index c0c8e3815..d27713c7d 100644 --- a/plugins/Admin/plugin.py +++ b/plugins/Admin/plugin.py @@ -192,7 +192,8 @@ class Admin(callbacks.Plugin): def do435(self, irc, msg): irc = self.pendingNickChanges.get(irc, None) if irc is not None: - irc.error(_('That nick is currently banned.')) + irc.error(_('I can\'t change nick, I\'m currently banned in %s.') % + msg.args[2]) else: self.log.debug('Got 435 without Admin.nick being called.')