From 44d74dbfa6fbdec91253389f1dec9c2bf991ce5e Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 May 2014 16:41:06 +0300 Subject: [PATCH 1/6] Relay: make default config better. Enable colours: most of people want them and they are supported by all IRC clients used nowadays. Show hostmask: that is standard behaviour of relaybots which I am seeing. Punish other relaybots: Does this even need explaining? "Let 2009-11-24 be a lesson to you: turn *on* supybot.plugins.Relay.punishOtherRelayBots." Don't join on all networks: I think that people mostly want to relay specific networks, not all of them. This is also a method to evade limitation of LinkRelay ( ProgVal/Supybot-plugins#11 ). Use notices with nonprivmsgs: This is also standard behaviour and makes it easier to see the difference between PRIVMSGs and everything else. --- plugins/Relay/config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/Relay/config.py b/plugins/Relay/config.py index 2bcbef095..e64002586 100644 --- a/plugins/Relay/config.py +++ b/plugins/Relay/config.py @@ -56,13 +56,13 @@ class Networks(registry.SpaceSeparatedListOf): Relay = conf.registerPlugin('Relay') conf.registerChannelValue(Relay, 'color', - registry.Boolean(False, _("""Determines whether the bot will color relayed + registry.Boolean(True, _("""Determines whether the bot will color relayed PRIVMSGs so as to make the messages easier to read."""))) conf.registerChannelValue(Relay, 'topicSync', registry.Boolean(True, _("""Determines whether the bot will synchronize topics between networks in the channels it relays."""))) conf.registerChannelValue(Relay, 'hostmasks', - registry.Boolean(False, _("""Determines whether the bot will relay the + registry.Boolean(True, _("""Determines whether the bot will relay the hostmask of the person joining or parting the channel when he or she joins or parts."""))) conf.registerChannelValue(Relay, 'includeNetwork', @@ -70,20 +70,20 @@ conf.registerChannelValue(Relay, 'includeNetwork', network in relayed PRIVMSGs; if you're only relaying between two networks, it's somewhat redundant, and you may wish to save the space."""))) conf.registerChannelValue(Relay, 'punishOtherRelayBots', - registry.Boolean(False, _("""Determines whether the bot will detect other + registry.Boolean(True, _("""Determines whether the bot will detect other bots relaying and respond by kickbanning them."""))) conf.registerGlobalValue(Relay, 'channels', conf.SpaceSeparatedSetOfChannels([], _("""Determines which channels the bot will relay in."""))) conf.registerChannelValue(Relay.channels, 'joinOnAllNetworks', - registry.Boolean(True, _("""Determines whether the bot + registry.Boolean(False, _("""Determines whether the bot will always join the channel(s) it relays for on all networks the bot is connected to."""))) conf.registerChannelValue(Relay, 'ignores', Ignores([], _("""Determines what hostmasks will not be relayed on a channel."""))) conf.registerChannelValue(Relay, 'noticeNonPrivmsgs', - registry.Boolean(False, _("""Determines whether the bot will used NOTICEs + registry.Boolean(True, _("""Determines whether the bot will used NOTICEs rather than PRIVMSGs for non-PRIVMSG relay messages (i.e., joins, parts, nicks, quits, modes, etc.)"""))) From e1a1a31e2d8c833478db141776ae7614a2f74f37 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 May 2014 16:47:32 +0300 Subject: [PATCH 2/6] Relay: fix gender neutral pronoun & update messages.pot --- plugins/Relay/config.py | 2 +- plugins/Relay/messages.pot | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Relay/config.py b/plugins/Relay/config.py index e64002586..b834d927a 100644 --- a/plugins/Relay/config.py +++ b/plugins/Relay/config.py @@ -63,7 +63,7 @@ conf.registerChannelValue(Relay, 'topicSync', topics between networks in the channels it relays."""))) conf.registerChannelValue(Relay, 'hostmasks', registry.Boolean(True, _("""Determines whether the bot will relay the - hostmask of the person joining or parting the channel when he or she joins + hostmask of the person joining or parting the channel when they join or parts."""))) conf.registerChannelValue(Relay, 'includeNetwork', registry.Boolean(True, _("""Determines whether the bot will include the diff --git a/plugins/Relay/messages.pot b/plugins/Relay/messages.pot index caaa541a8..00f70d7b6 100644 --- a/plugins/Relay/messages.pot +++ b/plugins/Relay/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-05-11 16:47+EEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,7 +42,7 @@ msgstr "" #: config.py:65 msgid "" "Determines whether the bot will relay the\n" -" hostmask of the person joining or parting the channel when he or she joins\n" +" hostmask of the person joining or parting the channel when they join\n" " or parts." msgstr "" From 4505060e0403d689692a496acea8efb176a66297 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 May 2014 16:48:49 +0300 Subject: [PATCH 3/6] README.txt: add note about joining manually on relayed networks. --- plugins/Relay/README.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/Relay/README.txt b/plugins/Relay/README.txt index 7687f9361..91623145b 100644 --- a/plugins/Relay/README.txt +++ b/plugins/Relay/README.txt @@ -1 +1,4 @@ -This plugin allows you to setup a relay between networks. \ No newline at end of file +This plugin allows you to setup a relay between networks. + +Note that you must tell the bot to join the channel you wish to relay on + all networks with the "join" command or "network command join " From 19a8bf556fb7f14c65e5ec6499cf68299aa30dc0 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 May 2014 16:57:45 +0300 Subject: [PATCH 4/6] Relay: fix typo (parts --> part). --- plugins/Relay/config.py | 2 +- plugins/Relay/messages.pot | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/Relay/config.py b/plugins/Relay/config.py index b834d927a..05d68baa0 100644 --- a/plugins/Relay/config.py +++ b/plugins/Relay/config.py @@ -64,7 +64,7 @@ conf.registerChannelValue(Relay, 'topicSync', conf.registerChannelValue(Relay, 'hostmasks', registry.Boolean(True, _("""Determines whether the bot will relay the hostmask of the person joining or parting the channel when they join - or parts."""))) + or part."""))) conf.registerChannelValue(Relay, 'includeNetwork', registry.Boolean(True, _("""Determines whether the bot will include the network in relayed PRIVMSGs; if you're only relaying between two networks, diff --git a/plugins/Relay/messages.pot b/plugins/Relay/messages.pot index 00f70d7b6..70f97f24d 100644 --- a/plugins/Relay/messages.pot +++ b/plugins/Relay/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-05-11 16:47+EEST\n" +"POT-Creation-Date: 2014-05-11 16:57+EEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -43,7 +43,7 @@ msgstr "" msgid "" "Determines whether the bot will relay the\n" " hostmask of the person joining or parting the channel when they join\n" -" or parts." +" or part." msgstr "" #: config.py:69 From d01ab9968adedeee1441bda9a7fd1c724bc5e26f Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 May 2014 17:50:58 +0300 Subject: [PATCH 5/6] Relay: update *.po --- plugins/Relay/locales/fi.po | 63 +++++++++++++++--------- plugins/Relay/locales/fr.po | 92 +++++++++++++++++++++++------------ plugins/Relay/locales/it.po | 97 ++++++++++++++++++++++++------------- 3 files changed, 162 insertions(+), 90 deletions(-) diff --git a/plugins/Relay/locales/fi.po b/plugins/Relay/locales/fi.po index b11b3209d..c2c1d462e 100644 --- a/plugins/Relay/locales/fi.po +++ b/plugins/Relay/locales/fi.po @@ -5,14 +5,15 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-02-26 09:49+CET\n" -"PO-Revision-Date: 2011-07-30 17:05+0200\n" +"POT-Creation-Date: 2014-05-11 16:57+EEST\n" +"PO-Revision-Date: 2014-05-11 17:50+0200\n" "Last-Translator: Mikaela Suomalainen \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" +"X-Generator: Poedit 1.5.4\n" #: config.py:39 msgid "Would you like to relay between any channels?" @@ -43,18 +44,21 @@ msgstr "" " aiheet kanavilla, joita se välittää kaikkiin verkkoihin." #: config.py:65 +#, fuzzy msgid "" "Determines whether the bot will relay the\n" -" hostmask of the person joining or parting the channel when he or she joins\n" -" or parts." +" hostmask of the person joining or parting the channel when they join\n" +" or part." msgstr "" "Määrittää välittääkö botti\n" -" liittyvän tai poistuvan henkilön hostmaskin, kun hän liittyy tai poistuu.\n" +" liittyvän tai poistuvan henkilön hostmaskin, kun hän liittyy tai " +"poistuu.\n" #: config.py:69 msgid "" "Determines whether the bot will include the\n" -" network in relayed PRIVMSGs; if you're only relaying between two networks,\n" +" network in relayed PRIVMSGs; if you're only relaying between two " +"networks,\n" " it's somewhat redundant, and you may wish to save the space." msgstr "" "Määrittää sisällyttääkö botti\n" @@ -67,7 +71,8 @@ msgid "" " bots relaying and respond by kickbanning them." msgstr "" "Määrittää havaitseeko botti toiset\n" -" välittävät botit ja vastaa potkimalla ne ja antamalla niille porttikiellon." +" välittävät botit ja vastaa potkimalla ne ja antamalla niille " +"porttikiellon." #: config.py:76 msgid "" @@ -80,11 +85,13 @@ msgstr "" #: config.py:79 msgid "" "Determines whether the bot\n" -" will always join the channel(s) it relays for on all networks the bot is\n" +" will always join the channel(s) it relays for on all networks the bot " +"is\n" " connected to." msgstr "" "Määrittää liittyykö botti aina\n" -" kanavalle( tai kanaville), joita se välittää, kaikissa verkoissa, joihin\n" +" kanavalle( tai kanaville), joita se välittää, kaikissa verkoissa, " +"joihin\n" " botti on yhdistänyt." #: config.py:83 @@ -98,32 +105,40 @@ msgstr "" #: config.py:86 msgid "" "Determines whether the bot will used NOTICEs\n" -" rather than PRIVMSGs for non-PRIVMSG relay messages (i.e., joins, parts,\n" +" rather than PRIVMSGs for non-PRIVMSG relay messages (i.e., joins, " +"parts,\n" " nicks, quits, modes, etc.)" msgstr "" "Määrittää käyttääkö botti huomautuksia (NOTICE)\n" -" mielummin kuin PRIVMSG:ssiä muissa kuin PRIVMSG välitysviesteissä (esim. liittymiset, poistumiset\n" +" mielummin kuin PRIVMSG:ssiä muissa kuin PRIVMSG välitysviesteissä (esim. " +"liittymiset, poistumiset\n" " nimimerkit, lopetukset, tilat, jne.)" #: plugin.py:99 msgid "" "[]\n" "\n" -" Starts relaying between the channel on all networks. If on a\n" +" Starts relaying between the channel on all networks. If " +"on a\n" " network the bot isn't in , he'll join. This commands is\n" -" required even if the bot is in the channel on both networks; he won't\n" +" required even if the bot is in the channel on both networks; he " +"won't\n" " relay between those channels unless he's told to join both\n" -" channels. If is not given, starts relaying on the channel\n" +" channels. If is not given, starts relaying on the " +"channel\n" " the message was sent in.\n" " " msgstr "" "[]\n" "\n" " Alkaa välittämään kaikissa verkoissa. Jos botti ei ole\n" -" jossain verkossa, se liittyy. Tämä komento on vaadittu, jopa jos\n" +" jossain verkossa, se liittyy. Tämä komento on vaadittu, " +"jopa jos\n" " botti on kanavalla molemmissa verkoissa; se ei välitä\n" -" noiden kanavien välillä, ennen kuin se on käsketty liittymään molemmille\n" -" kanaville. Jos ei ole annettu, botti alkaa välittämään kanavaa, jolla\n" +" noiden kanavien välillä, ennen kuin se on käsketty liittymään " +"molemmille\n" +" kanaville. Jos ei ole annettu, botti alkaa välittämään " +"kanavaa, jolla\n" " viesti lähetettiin.\n" " " @@ -131,7 +146,8 @@ msgstr "" msgid "" "\n" "\n" -" Ceases relaying between the channel on all networks. The bot\n" +" Ceases relaying between the channel on all networks. The " +"bot\n" " will part from the channel on all networks in which it is on the\n" " channel.\n" " " @@ -147,8 +163,10 @@ msgstr "" msgid "" "[]\n" "\n" -" Returns the nicks of the people in the channel on the various networks\n" -" the bot is connected to. is only necessary if the message\n" +" Returns the nicks of the people in the channel on the various " +"networks\n" +" the bot is connected to. is only necessary if the " +"message\n" " isn't sent on the channel itself.\n" " " msgstr "" @@ -183,9 +201,7 @@ msgstr "on myös kanavalla %L" msgid "isn't on any non-secret channels" msgstr "ei ole yhdelläkään ei salaisella kanavalla" -#: plugin.py:241 -#: plugin.py:242 -#: plugin.py:246 +#: plugin.py:241 plugin.py:242 plugin.py:246 msgid "" msgstr "" @@ -252,4 +268,3 @@ msgstr "%on lopettanut %s." #: plugin.py:498 msgid "disconnected from %s: %s" msgstr "yhteys katkaistu verkosta %s: %s" - diff --git a/plugins/Relay/locales/fr.po b/plugins/Relay/locales/fr.po index 24ed15b7b..58207f48f 100644 --- a/plugins/Relay/locales/fr.po +++ b/plugins/Relay/locales/fr.po @@ -1,17 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" -"POT-Creation-Date: 2010-10-19 19:27+CEST\n" +"POT-Creation-Date: 2014-05-11 16:57+EEST\n" "PO-Revision-Date: \n" -"Last-Translator: Valentin Lorentz \n" +"Last-Translator: Mikaela Suomalainen \n" "Language-Team: Limnoria \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Français\n" -"X-Poedit-Country: France\n" "X-Poedit-SourceCharset: ASCII\n" +"X-Generator: Poedit 1.5.4\n" #: config.py:39 msgid "Would you like to relay between any channels?" @@ -29,33 +27,46 @@ msgstr "Voulez-vous utiliser de la couleur pour distinguer les nicks ?" msgid "" "Determines whether the bot will color relayed\n" " PRIVMSGs so as to make the messages easier to read." -msgstr "Détermine si le bot colorera les PRIVMSGs relayez, pour rendre les messages plus faciles à lire." +msgstr "" +"Détermine si le bot colorera les PRIVMSGs relayez, pour rendre les messages " +"plus faciles à lire." #: config.py:62 msgid "" "Determines whether the bot will synchronize\n" " topics between networks in the channels it relays." -msgstr "Détermine si le bot synchronisera les topics entre les réseaux sur les canaux qu'il relaye." +msgstr "" +"Détermine si le bot synchronisera les topics entre les réseaux sur les " +"canaux qu'il relaye." #: config.py:65 +#, fuzzy msgid "" "Determines whether the bot will relay the\n" -" hostmask of the person joining or parting the channel when he or she joins\n" -" or parts." -msgstr "Détermine si le bot relayera le masque d'hôte d'une personne joignant ou partant d'un canal." +" hostmask of the person joining or parting the channel when they join\n" +" or part." +msgstr "" +"Détermine si le bot relayera le masque d'hôte d'une personne joignant ou " +"partant d'un canal." #: config.py:69 msgid "" "Determines whether the bot will include the\n" -" network in relayed PRIVMSGs; if you're only relaying between two networks,\n" +" network in relayed PRIVMSGs; if you're only relaying between two " +"networks,\n" " it's somewhat redundant, and you may wish to save the space." -msgstr "Détermine si le bot inclurera le réseau dans les PRIVMSG relayés ; si vous ne relayez qu'entre deux réseaux, ce sera quelque chose de redondant que vous pouvez supprimer pour gagner de la place." +msgstr "" +"Détermine si le bot inclurera le réseau dans les PRIVMSG relayés ; si vous " +"ne relayez qu'entre deux réseaux, ce sera quelque chose de redondant que " +"vous pouvez supprimer pour gagner de la place." #: config.py:73 msgid "" "Determines whether the bot will detect other\n" " bots relaying and respond by kickbanning them." -msgstr "Détermine si le bot détectera d'autres bots relayant et y répondra en les kickbannissant." +msgstr "" +"Détermine si le bot détectera d'autres bots relayant et y répondra en les " +"kickbannissant." #: config.py:76 msgid "" @@ -66,9 +77,12 @@ msgstr "Détermine sur quels canaux le bot relayera." #: config.py:79 msgid "" "Determines whether the bot\n" -" will always join the channel(s) it relays for on all networks the bot is\n" +" will always join the channel(s) it relays for on all networks the bot " +"is\n" " connected to." -msgstr "Détermine si le bot rejoindra toujours le(s) canal(aux) qu'il relaye sur tous les réseaux auxquels il est connecté." +msgstr "" +"Détermine si le bot rejoindra toujours le(s) canal(aux) qu'il relaye sur " +"tous les réseaux auxquels il est connecté." #: config.py:83 msgid "" @@ -79,51 +93,69 @@ msgstr "Détermine quels masques d'hôte ne seront pas relayés sur un canal." #: config.py:86 msgid "" "Determines whether the bot will used NOTICEs\n" -" rather than PRIVMSGs for non-PRIVMSG relay messages (i.e., joins, parts,\n" +" rather than PRIVMSGs for non-PRIVMSG relay messages (i.e., joins, " +"parts,\n" " nicks, quits, modes, etc.)" -msgstr "Détermine si le bot utilisera des NOTICEs plutôt que des PRIVMSG pour les messages relayés qui ne concernent pas un PRIVMSG (arrivée, départ, changement de nick, quits, modes, etc.)" +msgstr "" +"Détermine si le bot utilisera des NOTICEs plutôt que des PRIVMSG pour les " +"messages relayés qui ne concernent pas un PRIVMSG (arrivée, départ, " +"changement de nick, quits, modes, etc.)" #: plugin.py:99 msgid "" "[]\n" "\n" -" Starts relaying between the channel on all networks. If on a\n" +" Starts relaying between the channel on all networks. If " +"on a\n" " network the bot isn't in , he'll join. This commands is\n" -" required even if the bot is in the channel on both networks; he won't\n" +" required even if the bot is in the channel on both networks; he " +"won't\n" " relay between those channels unless he's told to join both\n" -" channels. If is not given, starts relaying on the channel\n" +" channels. If is not given, starts relaying on the " +"channel\n" " the message was sent in.\n" " " msgstr "" "[]\n" "\n" -"Commence à relayer le canal sur tous les réseaux. Si il y a un réseau sur lequel le bot n'est pas sur , il y entrera. Cette commande est requise même si le bot est sur le canal sur tous les réseaux ; il ne relayera pas tant qu'on ne lui a pas dit de rejoindre les canaux sur tous les réseaux. Si n'est pas donné, il commencera à relayer sur le canal où a été envoyé le message." +"Commence à relayer le canal sur tous les réseaux. Si il y a un " +"réseau sur lequel le bot n'est pas sur , il y entrera. Cette commande " +"est requise même si le bot est sur le canal sur tous les réseaux ; il ne " +"relayera pas tant qu'on ne lui a pas dit de rejoindre les canaux sur tous " +"les réseaux. Si n'est pas donné, il commencera à relayer sur le " +"canal où a été envoyé le message." #: plugin.py:118 msgid "" "\n" "\n" -" Ceases relaying between the channel on all networks. The bot\n" +" Ceases relaying between the channel on all networks. The " +"bot\n" " will part from the channel on all networks in which it is on the\n" " channel.\n" " " msgstr "" "\n" "\n" -"Cesse de relayer entre les canaux sur tous les réseaux. Le bot partira de ces canaux sur tous les réseaux si il y est." +"Cesse de relayer entre les canaux sur tous les réseaux. Le bot " +"partira de ces canaux sur tous les réseaux si il y est." #: plugin.py:133 msgid "" "[]\n" "\n" -" Returns the nicks of the people in the channel on the various networks\n" -" the bot is connected to. is only necessary if the message\n" +" Returns the nicks of the people in the channel on the various " +"networks\n" +" the bot is connected to. is only necessary if the " +"message\n" " isn't sent on the channel itself.\n" " " msgstr "" "[]\n" "\n" -"Retourne les nicks des personnes sur le canal sur les différents réseaux sur lesquels est connecté le bot. n'est nécessaire que si l'on n'est pas sur le canal lui-même." +"Retourne les nicks des personnes sur le canal sur les différents réseaux sur " +"lesquels est connecté le bot. n'est nécessaire que si l'on n'est pas " +"sur le canal lui-même." #: plugin.py:223 msgid "is an op on %L" @@ -149,9 +181,7 @@ msgstr "est sur %L" msgid "isn't on any non-secret channels" msgstr "n'est sur aucun canal non-secret" -#: plugin.py:241 -#: plugin.py:242 -#: plugin.py:246 +#: plugin.py:241 plugin.py:242 plugin.py:246 msgid "" msgstr "" @@ -165,7 +195,8 @@ msgstr "identifié" #: plugin.py:258 msgid "%s (%s) has been%s on server %s since %s (idle for %s) and %s.%s" -msgstr "%s (%s) a été vu%s sur le serveur %s depuis %s (idle depuis %s) et %s.%s" +msgstr "" +"%s (%s) a été vu%s sur le serveur %s depuis %s (idle depuis %s) et %s.%s" #: plugin.py:273 msgid "There is no %s on %s." @@ -218,4 +249,3 @@ msgstr "%s a quitté %s." #: plugin.py:498 msgid "disconnected from %s: %s" msgstr "déconnecté de %s : %s" - diff --git a/plugins/Relay/locales/it.po b/plugins/Relay/locales/it.po index c881178e2..e09ed09d2 100644 --- a/plugins/Relay/locales/it.po +++ b/plugins/Relay/locales/it.po @@ -1,15 +1,15 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" -"POT-Creation-Date: 2011-02-26 09:49+CET\n" -"PO-Revision-Date: 2011-07-10 11:17+0200\n" -"Last-Translator: skizzhg \n" +"POT-Creation-Date: 2014-05-11 16:57+EEST\n" +"PO-Revision-Date: 2014-05-11 17:50+0200\n" +"Last-Translator: Mikaela Suomalainen \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" - +"X-Generator: Poedit 1.5.4\n" #: config.py:39 msgid "Would you like to relay between any channels?" @@ -27,35 +27,47 @@ msgstr "Vuoi usare colori per distinguere i nick?" msgid "" "Determines whether the bot will color relayed\n" " PRIVMSGs so as to make the messages easier to read." -msgstr "Determina se il bot colorerà i PRIVMSG inoltrati per renderne più semplice la lettura." +msgstr "" +"Determina se il bot colorerà i PRIVMSG inoltrati per renderne più semplice " +"la lettura." #: config.py:62 msgid "" "Determines whether the bot will synchronize\n" " topics between networks in the channels it relays." -msgstr "Determina se il bot sincronizzerà i topic tra le reti nei canali in cui inoltra." +msgstr "" +"Determina se il bot sincronizzerà i topic tra le reti nei canali in cui " +"inoltra." #: config.py:65 +#, fuzzy msgid "" "Determines whether the bot will relay the\n" -" hostmask of the person joining or parting the channel when he or she joins\n" -" or parts." -msgstr "Determina se il bot inoltrerà l'hostmask dell'utente che entra o esce dal canale." +" hostmask of the person joining or parting the channel when they join\n" +" or part." +msgstr "" +"Determina se il bot inoltrerà l'hostmask dell'utente che entra o esce dal " +"canale." #: config.py:69 msgid "" "Determines whether the bot will include the\n" -" network in relayed PRIVMSGs; if you're only relaying between two networks,\n" +" network in relayed PRIVMSGs; if you're only relaying between two " +"networks,\n" " it's somewhat redundant, and you may wish to save the space." msgstr "" -"Determina se il bot includerà la rete nei PRIVMSG inoltrati; se si trasmette\n" -" tra due sole reti è alquanto ridondante e si preferirà risparmiare spazio." +"Determina se il bot includerà la rete nei PRIVMSG inoltrati; se si " +"trasmette\n" +" tra due sole reti è alquanto ridondante e si preferirà risparmiare " +"spazio." #: config.py:73 msgid "" "Determines whether the bot will detect other\n" " bots relaying and respond by kickbanning them." -msgstr "Determina se il bot rileverà altri bot che stanno inoltrando rispondendo con un kickban." +msgstr "" +"Determina se il bot rileverà altri bot che stanno inoltrando rispondendo con " +"un kickban." #: config.py:76 msgid "" @@ -66,9 +78,12 @@ msgstr "Determina in quale canale il bot inoltrerà i messaggi." #: config.py:79 msgid "" "Determines whether the bot\n" -" will always join the channel(s) it relays for on all networks the bot is\n" +" will always join the channel(s) it relays for on all networks the bot " +"is\n" " connected to." -msgstr "Determina se il bot entrerà sempre nei canali in cui trasmette per tutte le reti a cui è connesso." +msgstr "" +"Determina se il bot entrerà sempre nei canali in cui trasmette per tutte le " +"reti a cui è connesso." #: config.py:83 msgid "" @@ -79,40 +94,50 @@ msgstr "Determina quale hostmask non verrà inoltrata su un canale." #: config.py:86 msgid "" "Determines whether the bot will used NOTICEs\n" -" rather than PRIVMSGs for non-PRIVMSG relay messages (i.e., joins, parts,\n" +" rather than PRIVMSGs for non-PRIVMSG relay messages (i.e., joins, " +"parts,\n" " nicks, quits, modes, etc.)" msgstr "" -"Determina se il bot userà i NOTICE piuttosto che i PRIVMSG per messaggi che non\n" -" riguardano le comunicazioni tra utenti (join, part, nick, quit, mode, ecc.)" +"Determina se il bot userà i NOTICE piuttosto che i PRIVMSG per messaggi che " +"non\n" +" riguardano le comunicazioni tra utenti (join, part, nick, quit, mode, " +"ecc.)" #: plugin.py:99 -#, docstring msgid "" "[]\n" "\n" -" Starts relaying between the channel on all networks. If on a\n" +" Starts relaying between the channel on all networks. If " +"on a\n" " network the bot isn't in , he'll join. This commands is\n" -" required even if the bot is in the channel on both networks; he won't\n" +" required even if the bot is in the channel on both networks; he " +"won't\n" " relay between those channels unless he's told to join both\n" -" channels. If is not given, starts relaying on the channel\n" +" channels. If is not given, starts relaying on the " +"channel\n" " the message was sent in.\n" " " msgstr "" "[]\n" "\n" -" Inizia l'inoltro dei messaggi di su tutte le reti. Se su una rete\n" -" il bot non è in , ci entrerà. Questo comando è necessario anche se\n" -" il bot è presente nel canale di entrambe le reti; non trasmetterà i messaggi\n" -" a meno che gli sia stato detto di entrare su entrambi i canali. Se \n" -" non è specificato, inizia l'inoltro sul canale in cui è stato inviato il messaggio.\n" +" Inizia l'inoltro dei messaggi di su tutte le reti. Se su " +"una rete\n" +" il bot non è in , ci entrerà. Questo comando è necessario " +"anche se\n" +" il bot è presente nel canale di entrambe le reti; non trasmetterà i " +"messaggi\n" +" a meno che gli sia stato detto di entrare su entrambi i canali. Se " +"\n" +" non è specificato, inizia l'inoltro sul canale in cui è stato " +"inviato il messaggio.\n" " " #: plugin.py:118 -#, docstring msgid "" "\n" "\n" -" Ceases relaying between the channel on all networks. The bot\n" +" Ceases relaying between the channel on all networks. The " +"bot\n" " will part from the channel on all networks in which it is on the\n" " channel.\n" " " @@ -124,19 +149,22 @@ msgstr "" " " #: plugin.py:133 -#, docstring msgid "" "[]\n" "\n" -" Returns the nicks of the people in the channel on the various networks\n" -" the bot is connected to. is only necessary if the message\n" +" Returns the nicks of the people in the channel on the various " +"networks\n" +" the bot is connected to. is only necessary if the " +"message\n" " isn't sent on the channel itself.\n" " " msgstr "" "[]\n" "\n" -" Riporta i nick degli utenti presenti nel canale sulle diverse reti alle quali è connesso\n" -" il bot. è necessario solo se il messaggio non viene inviato nel canale stesso.\n" +" Riporta i nick degli utenti presenti nel canale sulle diverse reti " +"alle quali è connesso\n" +" il bot. è necessario solo se il messaggio non viene inviato " +"nel canale stesso.\n" " " #: plugin.py:223 @@ -230,4 +258,3 @@ msgstr "%s è uscito da %s." #: plugin.py:498 msgid "disconnected from %s: %s" msgstr "disconnesso da %s: %s" - From 940b36fdf6c6a3eb80cca2ad1218310f74452b2a Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 May 2014 18:33:51 +0300 Subject: [PATCH 6/6] Relay: fix l10n-fi. --- plugins/Relay/locales/fi.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/Relay/locales/fi.po b/plugins/Relay/locales/fi.po index c2c1d462e..db01c7631 100644 --- a/plugins/Relay/locales/fi.po +++ b/plugins/Relay/locales/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2014-05-11 16:57+EEST\n" -"PO-Revision-Date: 2014-05-11 17:50+0200\n" +"PO-Revision-Date: 2014-05-11 18:33+0200\n" "Last-Translator: Mikaela Suomalainen \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -44,15 +44,14 @@ msgstr "" " aiheet kanavilla, joita se välittää kaikkiin verkkoihin." #: config.py:65 -#, fuzzy msgid "" "Determines whether the bot will relay the\n" " hostmask of the person joining or parting the channel when they join\n" " or part." msgstr "" "Määrittää välittääkö botti\n" -" liittyvän tai poistuvan henkilön hostmaskin, kun hän liittyy tai " -"poistuu.\n" +" liittyvän tai poistuvan henkilön hostmaskin, hänen liittyessään/" +"poistuessaan." #: config.py:69 msgid ""