From 76c73a57b910fd2a39d815be472af2f77196e666 Mon Sep 17 00:00:00 2001 From: Ken Spencer Date: Wed, 25 Oct 2017 15:19:37 -0400 Subject: [PATCH] Use a prefix-less help string, don't assume a '@' prefix (#1309) * Use a prefix-less help string, don't assume a '@' prefix * Nickometer: follow through on plugin.py with ` -> ' --- plugins/Aka/locales/fi.po | 4 ++-- plugins/Conditional/locales/fi.po | 4 ++-- plugins/Conditional/locales/fr.po | 2 +- plugins/Conditional/locales/it.po | 2 +- plugins/Internet/locales/fi.po | 4 ++-- plugins/Internet/locales/fr.po | 2 +- plugins/Internet/locales/it.po | 2 +- plugins/MoobotFactoids/locales/fi.po | 4 ++-- plugins/MoobotFactoids/locales/fr.po | 2 +- plugins/MoobotFactoids/locales/it.po | 2 +- plugins/Nickometer/locales/fi.po | 4 ++-- plugins/Nickometer/messages.pot | 2 +- plugins/Nickometer/plugin.py | 2 +- plugins/Owner/config.py | 2 +- plugins/PluginDownloader/locales/de.po | 2 +- plugins/PluginDownloader/locales/fi.po | 4 ++-- plugins/QuoteGrabs/locales/fi.po | 4 ++-- plugins/QuoteGrabs/locales/fr.po | 2 +- plugins/QuoteGrabs/locales/it.po | 2 +- plugins/Topic/locales/fi.po | 4 ++-- plugins/Topic/locales/fr.po | 4 ++-- plugins/Topic/messages.pot | 2 +- plugins/Topic/plugin.py | 2 +- plugins/Web/locales/de.po | 4 ++-- plugins/Web/locales/fi.po | 4 ++-- plugins/Web/locales/fr.po | 2 +- plugins/Web/locales/it.po | 2 +- plugins/Web/messages.pot | 2 +- plugins/Web/plugin.py | 2 +- 29 files changed, 40 insertions(+), 40 deletions(-) diff --git a/plugins/Aka/locales/fi.po b/plugins/Aka/locales/fi.po index 090688d92..5190f9994 100644 --- a/plugins/Aka/locales/fi.po +++ b/plugins/Aka/locales/fi.po @@ -250,8 +250,8 @@ msgid "Error occured when importing the %n: %L" msgstr "Virhe komennon %n tuomisessa: %L" #~ msgid "" -#~ "Add the help for \"@plugin help Aka\" here\n" +#~ "Add the help for 'plugin help Aka' here\n" #~ " This should describe *how* to use this plugin." #~ msgstr "" -#~ "Lisää ohje komentoa \"@plugin help Aka\" varten tähän.\n" +#~ "Lisää ohje komentoa 'plugin help Aka' varten tähän.\n" #~ " Tämän pitäisi kuvata *kuinka* tätä lisä-osaa käytetään." diff --git a/plugins/Conditional/locales/fi.po b/plugins/Conditional/locales/fi.po index 05fbbe72a..27a5ff2a3 100644 --- a/plugins/Conditional/locales/fi.po +++ b/plugins/Conditional/locales/fi.po @@ -282,8 +282,8 @@ msgstr "" " " #~ msgid "" -#~ "Add the help for \"@plugin help Conditional\" here\n" +#~ "Add the help for 'plugin help Conditional' here\n" #~ " This should describe *how* to use this plugin." #~ msgstr "" -#~ "Lisää ohje \"@plugin help Conditional\" tähän.\n" +#~ "Lisää ohje 'plugin help Conditional' tähän.\n" #~ " Tämän pitäisi kuvata *kuinka* tätä lisäosaa käytetään." diff --git a/plugins/Conditional/locales/fr.po b/plugins/Conditional/locales/fr.po index 3db0fef14..6b65ec347 100644 --- a/plugins/Conditional/locales/fr.po +++ b/plugins/Conditional/locales/fr.po @@ -14,7 +14,7 @@ msgstr "" #: plugin.py:57 msgid "" -"Add the help for \"@plugin help Conditional\" here\n" +"Add the help for 'plugin help Conditional' here\n" " This should describe *how* to use this plugin." msgstr "" diff --git a/plugins/Conditional/locales/it.po b/plugins/Conditional/locales/it.po index b6dc3df01..81562b65a 100644 --- a/plugins/Conditional/locales/it.po +++ b/plugins/Conditional/locales/it.po @@ -14,7 +14,7 @@ msgstr "" #: plugin.py:64 #, docstring msgid "" -"Add the help for \"@plugin help Conditional\" here\n" +"Add the help for 'plugin help Conditional' here\n" " This should describe *how* to use this plugin." msgstr "" diff --git a/plugins/Internet/locales/fi.po b/plugins/Internet/locales/fi.po index 900ac6a6a..41d6135a3 100644 --- a/plugins/Internet/locales/fi.po +++ b/plugins/Internet/locales/fi.po @@ -99,5 +99,5 @@ msgstr "" " Palauttaa IP:een heksadesimaalisen IP:een IP:lle.\n" " " -#~ msgid "Add the help for \"@help Internet\" here." -#~ msgstr "Lisää ohje \"@help Internet:ille\" tähän." +#~ msgid "Add the help for \"help Internet\" here." +#~ msgstr "Lisää ohje \"help Internet:ille\" tähän." diff --git a/plugins/Internet/locales/fr.po b/plugins/Internet/locales/fr.po index 68580af01..187550080 100644 --- a/plugins/Internet/locales/fr.po +++ b/plugins/Internet/locales/fr.po @@ -14,7 +14,7 @@ msgstr "" "X-Poedit-SourceCharset: ASCII\n" #: plugin.py:43 -msgid "Add the help for \"@help Internet\" here." +msgid "Add the help for \"help Internet\" here." msgstr "" #: plugin.py:47 diff --git a/plugins/Internet/locales/it.po b/plugins/Internet/locales/it.po index eb59aecfd..fcc38a401 100644 --- a/plugins/Internet/locales/it.po +++ b/plugins/Internet/locales/it.po @@ -12,7 +12,7 @@ msgstr "" #: plugin.py:42 #, docstring -msgid "Add the help for \"@help Internet\" here." +msgid "Add the help for \"help Internet\" here." msgstr "" #: plugin.py:46 diff --git a/plugins/MoobotFactoids/locales/fi.po b/plugins/MoobotFactoids/locales/fi.po index fb4859088..7dd6fbc8b 100644 --- a/plugins/MoobotFactoids/locales/fi.po +++ b/plugins/MoobotFactoids/locales/fi.po @@ -362,10 +362,10 @@ msgid "No factoids in the database." msgstr "Tietokannassa ei ole factoideja." #~ msgid "" -#~ "Add the help for \"@help MoobotFactoids\" here (assuming you don't " +#~ "Add the help for \"help MoobotFactoids\" here (assuming you don't " #~ "implement a MoobotFactoids\n" #~ " command). This should describe *how* to use this plugin." #~ msgstr "" -#~ "Lisää ohje \"@help MoobotFactoids\":lle tähän (olettaen ettet luo " +#~ "Lisää ohje \"help MoobotFactoids\":lle tähän (olettaen ettet luo " #~ "MoobotFactoids\n" #~ " komentoa). Tämän pitäisi kertoa *kuinka* tätä laajennusta käytetään." diff --git a/plugins/MoobotFactoids/locales/fr.po b/plugins/MoobotFactoids/locales/fr.po index a38eca34e..3762bb921 100644 --- a/plugins/MoobotFactoids/locales/fr.po +++ b/plugins/MoobotFactoids/locales/fr.po @@ -31,7 +31,7 @@ msgstr "" #: plugin.py:288 msgid "" -"Add the help for \"@help MoobotFactoids\" here (assuming you don't implement " +"Add the help for \"help MoobotFactoids\" here (assuming you don't implement " "a MoobotFactoids\n" " command). This should describe *how* to use this plugin." msgstr "" diff --git a/plugins/MoobotFactoids/locales/it.po b/plugins/MoobotFactoids/locales/it.po index 829a9dae8..9ee672dd3 100644 --- a/plugins/MoobotFactoids/locales/it.po +++ b/plugins/MoobotFactoids/locales/it.po @@ -28,7 +28,7 @@ msgstr "Determina quanti elementi mostrare con il comando \"most\"." #: plugin.py:289 #, docstring msgid "" -"Add the help for \"@help MoobotFactoids\" here (assuming you don't implement a MoobotFactoids\n" +"Add the help for \"help MoobotFactoids\" here (assuming you don't implement a MoobotFactoids\n" " command). This should describe *how* to use this plugin." msgstr "" diff --git a/plugins/Nickometer/locales/fi.po b/plugins/Nickometer/locales/fi.po index 5ee54dc11..7eacfd60d 100644 --- a/plugins/Nickometer/locales/fi.po +++ b/plugins/Nickometer/locales/fi.po @@ -18,10 +18,10 @@ msgstr "" "X-Generator: Poedit 1.6.10\n" #: plugin.py:81 -msgid "Will tell you how lame a nick is by the command `@nickometer [nick]`." +msgid "Will tell you how lame a nick is by the command 'nickometer [nick]'." msgstr "" "Kertoo kuinka laimea nimimerkki on komennolla\n" -" `@nickometer [nimimerkki]." +" 'nickometer [nimimerkki]'" #: plugin.py:88 msgid "" diff --git a/plugins/Nickometer/messages.pot b/plugins/Nickometer/messages.pot index 88e143cf4..75f20f789 100644 --- a/plugins/Nickometer/messages.pot +++ b/plugins/Nickometer/messages.pot @@ -17,7 +17,7 @@ msgstr "" #: plugin.py:81 #, docstring -msgid "Will tell you how lame a nick is by the command `@nickometer [nick]`." +msgid "Will tell you how lame a nick is by the command `nickometer [nick]`." msgstr "" #: plugin.py:88 diff --git a/plugins/Nickometer/plugin.py b/plugins/Nickometer/plugin.py index 8046dbccf..0bda1442c 100644 --- a/plugins/Nickometer/plugin.py +++ b/plugins/Nickometer/plugin.py @@ -79,7 +79,7 @@ def numberShifts(s): return len(s)-1 class Nickometer(callbacks.Plugin): - """Will tell you how lame a nick is by the command `@nickometer [nick]`.""" + """Will tell you how lame a nick is by the command 'nickometer [nick]'.""" def punish(self, damage, reason): self.log.debug('%s lameness points awarded: %s', damage, reason) return damage diff --git a/plugins/Owner/config.py b/plugins/Owner/config.py index 0a5d5b28c..fdd125bb8 100644 --- a/plugins/Owner/config.py +++ b/plugins/Owner/config.py @@ -47,7 +47,7 @@ conf.registerGlobalValue(Owner, 'public', visible.""")) conf.registerGlobalValue(Owner, 'announceFormat', registry.String('Announcement from my owner ($owner): $text', - """Determines the format of messages sent by the @announce command. + """Determines the format of messages sent by the 'announce' command. $owner may be used for the username of the owner calling this command, and $text for the announcement being made.""")) conf.registerGlobalValue(Owner, 'quitMsg', diff --git a/plugins/PluginDownloader/locales/de.po b/plugins/PluginDownloader/locales/de.po index a66178a8b..60d8965a0 100644 --- a/plugins/PluginDownloader/locales/de.po +++ b/plugins/PluginDownloader/locales/de.po @@ -13,7 +13,7 @@ msgstr "" #: plugin.py:219 msgid "" -"Add the help for \"@plugin help PluginDownloader\" here\n" +"Add the help for 'plugin help PluginDownloader' here\n" " This should describe *how* to use this plugin." msgstr "" diff --git a/plugins/PluginDownloader/locales/fi.po b/plugins/PluginDownloader/locales/fi.po index 33cba59c6..40d4cbbf8 100644 --- a/plugins/PluginDownloader/locales/fi.po +++ b/plugins/PluginDownloader/locales/fi.po @@ -118,8 +118,8 @@ msgid "This plugin has no description." msgstr "Tällä lisäosalla ei ole kuvausta." #~ msgid "" -#~ "Add the help for \"@plugin help PluginDownloader\" here\n" +#~ "Add the help for 'plugin help PluginDownloader' here\n" #~ " This should describe *how* to use this plugin." #~ msgstr "" -#~ "Lisää ohjeteksti komennolle \"@plugin help PluginDownloader\" tähän.\n" +#~ "Lisää ohjeteksti komennolle 'plugin help PluginDownloader' tähän.\n" #~ " Tämän pitäisi kuvata *kuinka* tätä lisäosaa käytetään." diff --git a/plugins/QuoteGrabs/locales/fi.po b/plugins/QuoteGrabs/locales/fi.po index c5f5b009d..26916353b 100755 --- a/plugins/QuoteGrabs/locales/fi.po +++ b/plugins/QuoteGrabs/locales/fi.po @@ -240,5 +240,5 @@ msgstr "" msgid "No quotegrabs matching %s" msgstr "Ei %s:ään täsmääviä lainauksia" -#~ msgid "Add the help for \"@help QuoteGrabs\" here." -#~ msgstr "Lisää ohje \"@help QuoteGrabs\"ille tähän." +#~ msgid "Add the help for \"help QuoteGrabs\" here." +#~ msgstr "Lisää ohje \"help QuoteGrabs\"ille tähän." diff --git a/plugins/QuoteGrabs/locales/fr.po b/plugins/QuoteGrabs/locales/fr.po index 74c9d1533..1bf73cfaa 100644 --- a/plugins/QuoteGrabs/locales/fr.po +++ b/plugins/QuoteGrabs/locales/fr.po @@ -47,7 +47,7 @@ msgid "%s (Said by: %s; grabbed by %s at %t)" msgstr "%s (Dit par %s ; récupéré par %s à %t)" #: plugin.py:210 -msgid "Add the help for \"@help QuoteGrabs\" here." +msgid "Add the help for \"help QuoteGrabs\" here." msgstr "" #: plugin.py:249 diff --git a/plugins/QuoteGrabs/locales/it.po b/plugins/QuoteGrabs/locales/it.po index a4c74c574..b09874906 100644 --- a/plugins/QuoteGrabs/locales/it.po +++ b/plugins/QuoteGrabs/locales/it.po @@ -55,7 +55,7 @@ msgstr "%s (Detto da: %s; pescato da %s il %t)" #: plugin.py:226 #, docstring -msgid "Add the help for \"@help QuoteGrabs\" here." +msgid "Add the help for \"help QuoteGrabs\" here." msgstr "" #: plugin.py:265 diff --git a/plugins/Topic/locales/fi.po b/plugins/Topic/locales/fi.po index 75d9c0fc7..ebe3cc97e 100644 --- a/plugins/Topic/locales/fi.po +++ b/plugins/Topic/locales/fi.po @@ -555,14 +555,14 @@ msgstr "Kieltäydyn vaihtamasta aiheen paikkaa sen itsensä kanssa." msgid "" "[]\n" "\n" -" Saves the topic in to be restored with @topic default\n" +" Saves the topic in to be restored with 'topic default'\n" " later. is only necessary if the message isn't sent in\n" " the channel itself.\n" " " msgstr "" "[]\n" "\n" -" Tallentaa aiheen , jotta se voidaan palauttaa \"@topic default\"—" +" Tallentaa aiheen , jotta se voidaan palauttaa 'topic default'—" "komennolla\n" " myöhemmin. on vaadittu vain, ellei viestiä lähetetä kanavalla " "itsellään." diff --git a/plugins/Topic/locales/fr.po b/plugins/Topic/locales/fr.po index bc9a4ea9e..6b958ab5e 100644 --- a/plugins/Topic/locales/fr.po +++ b/plugins/Topic/locales/fr.po @@ -459,14 +459,14 @@ msgstr "Je refuse d'échanger un topic avec lui-même." msgid "" "[]\n" "\n" -" Saves the topic in to be restored with @topic default\n" +" Saves the topic in to be restored with 'topic default'\n" " later. is only necessary if the message isn't sent in\n" " the channel itself.\n" " " msgstr "" "[]\n" "\n" -"Enregistre le topic du pour être restauré avec @topic default par la " +"Enregistre le topic du pour être restauré avec 'topic default' par la " "suite. n'est nécessaire que si vous n'exécutez pas la commande dans " "le canal lui-même." diff --git a/plugins/Topic/messages.pot b/plugins/Topic/messages.pot index 78e87ecf6..16f611fbe 100644 --- a/plugins/Topic/messages.pot +++ b/plugins/Topic/messages.pot @@ -374,7 +374,7 @@ msgstr "" msgid "" "[]\n" "\n" -" Saves the topic in to be restored with @topic default\n" +" Saves the topic in to be restored with 'topic default'\n" " later. is only necessary if the message isn't sent in\n" " the channel itself.\n" " " diff --git a/plugins/Topic/plugin.py b/plugins/Topic/plugin.py index d67214db8..76eb44dbc 100644 --- a/plugins/Topic/plugin.py +++ b/plugins/Topic/plugin.py @@ -577,7 +577,7 @@ class Topic(callbacks.Plugin): def save(self, irc, msg, args, channel): """[] - Saves the topic in to be restored with @topic default + Saves the topic in to be restored with 'topic default' later. is only necessary if the message isn't sent in the channel itself. """ diff --git a/plugins/Web/locales/de.po b/plugins/Web/locales/de.po index fd02e2d9d..7dcec1002 100644 --- a/plugins/Web/locales/de.po +++ b/plugins/Web/locales/de.po @@ -37,8 +37,8 @@ msgid "" msgstr "Legt die maximal Anzahl an Bytes fest die der Bot über den 'fetch' Befehl herunterläd." #: plugin.py:71 -msgid "Add the help for \"@help Web\" here." -msgstr "Füge die Hilfe für \"@help Web\" hier hinzu." +msgid "Add the help for \"help Web\" here." +msgstr "Füge die Hilfe für \"help Web\" hier hinzu." #: plugin.py:107 msgid "Title: %s (at %s)" diff --git a/plugins/Web/locales/fi.po b/plugins/Web/locales/fi.po index ab094669b..e43dfea9f 100644 --- a/plugins/Web/locales/fi.po +++ b/plugins/Web/locales/fi.po @@ -84,8 +84,8 @@ msgid "Display a nice error instead of \"An error has occurred\"." msgstr "Näytä kiva virheilmoitus ilmoitukset \"Virhe on tapahtunut\" sijaan." #: plugin.py:121 -msgid "Add the help for \"@help Web\" here." -msgstr "Lisää ohje komennolle \"@help Web\" tähän." +msgid "Add the help for \"help Web\" here." +msgstr "Lisää ohje komennolle \"help Web\" tähän." #: plugin.py:166 msgid "Title: %s (at %s)" diff --git a/plugins/Web/locales/fr.po b/plugins/Web/locales/fr.po index 01f4bab96..2e996e99a 100644 --- a/plugins/Web/locales/fr.po +++ b/plugins/Web/locales/fr.po @@ -71,7 +71,7 @@ msgid "Display a nice error instead of \"An error has occurred\"." msgstr "." #: plugin.py:116 -msgid "Add the help for \"@help Web\" here." +msgid "Add the help for \"help Web\" here." msgstr "" #: plugin.py:162 diff --git a/plugins/Web/locales/it.po b/plugins/Web/locales/it.po index c19dffadb..ac50764c0 100644 --- a/plugins/Web/locales/it.po +++ b/plugins/Web/locales/it.po @@ -36,7 +36,7 @@ msgstr "" #: plugin.py:71 #, docstring -msgid "Add the help for \"@help Web\" here." +msgid "Add the help for \"help Web\" here." msgstr "" #: plugin.py:107 diff --git a/plugins/Web/messages.pot b/plugins/Web/messages.pot index 966c2ef08..9c9740a16 100644 --- a/plugins/Web/messages.pot +++ b/plugins/Web/messages.pot @@ -65,7 +65,7 @@ msgstr "" #: plugin.py:121 #, docstring -msgid "Add the help for \"@help Web\" here." +msgid "Add the help for \"help Web\" here." msgstr "" #: plugin.py:166 diff --git a/plugins/Web/plugin.py b/plugins/Web/plugin.py index ebad498c9..c33300605 100644 --- a/plugins/Web/plugin.py +++ b/plugins/Web/plugin.py @@ -138,7 +138,7 @@ def catch_web_errors(f): return utils.python.changeFunctionName(newf, f.__name__, f.__doc__) class Web(callbacks.PluginRegexp): - """Add the help for "@help Web" here.""" + """Add the help for 'help Web' here.""" regexps = ['titleSnarfer'] threaded = True