From 4abc35dbfcdbbacd55d97e323a25e56d8c683cd0 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 13 Aug 2014 21:30:30 +0300 Subject: [PATCH] src: update help text of commands.nested.brackets The shift part only applied to people on American keyboard and not all users are on that, so it only caused confusion. Strong historical motivations should be enough for most of people as I wasn't able to remember the correct brackets when I tried changing them to `<>` which I feel are the easiest to type on Finnish/Swedish keyboard. Also update messages.pot & l10n-fi. --- locales/fi.po | 43 +++++++++++++++++++------------------------ locales/messages.pot | 24 ++++++++++++------------ src/conf.py | 12 ++++++------ 3 files changed, 37 insertions(+), 42 deletions(-) diff --git a/locales/fi.po b/locales/fi.po index 826a3d70c..57207617d 100644 --- a/locales/fi.po +++ b/locales/fi.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2014-08-01 20:08+EEST\n" -"PO-Revision-Date: 2014-08-01 20:16+0200\n" +"POT-Creation-Date: 2014-08-13 21:40+EEST\n" +"PO-Revision-Date: 2014-08-13 21:43+0200\n" "Last-Translator: Mikaela Suomalainen \n" "Language-Team: Finnish <>\n" "Language: fi\n" @@ -1095,26 +1095,21 @@ msgstr "" #: src/conf.py:680 msgid "" -"Supybot allows you to specify what brackets are\n" -" used for your nested commands. Valid sets of brackets include [], <>, " -"and\n" -" {} (). [] has strong historical motivation, as well as being the " -"brackets\n" -" that don't require shift. <> or () might be slightly superior because " -"they\n" -" cannot occur in a nick. If this string is empty, nested commands will\n" -" not be allowed in this channel." +"Supybot allows you to specify what brackets\n" +" are used for your nested commands. Valid sets of brackets include\n" +" [], <>, and {} (). [] has strong historical motivation, but <> or\n" +" () might be slightly superior because they cannot occur in a nick.\n" +" If this string is empty, nested commands will not be allowed in this\n" +" channel." msgstr "" "Supybot sallii sinun määrittää millaisia sulkuja käytetään sisäkkäisille " "komennoille.\n" -" Kelvollinen sarja sulkuja sisältää merkit [], <> ja {} (). []:lla on vahva\n" -" historiallinen motivaatio, kuten myös suluilla, jotka eivät vaadi \"vaihto" -"\"-näppäimen\n" -" käyttöä. <> tai () voivat olla huomattavasti parempia, koska ne eivät voi " -"olla\n" -" nimimerkeissä. Jos tämä merkkiketju on tyhjä, sisäkkäisiä komentoja ei " -"sallita tällä\n" -" kanavalla." +" Kelvolliset sulkusarjat ovat [], <> ja {} (). []:lla on vahva\n" +" historiallinen motivaatio mutta <> tai () voi olla huomattavasti parempi, " +"koska se\n" +" ei voi olla nimimerkissä. Mikäli tämä asetusarvo on tyhjä, sisäkkäiset " +"komennot\n" +" eivät ole sallittuja kanavalla." #: src/conf.py:687 msgid "" @@ -1856,7 +1851,7 @@ msgstr "" "tälle\n" " pyynnölle ole määritetty käsittelijää." -#: src/httpserver.py:300 +#: src/httpserver.py:309 msgid "" "\n" " I am a pretty clever IRC bot, but I suck at serving Web pages, " @@ -1873,19 +1868,19 @@ msgstr "" "virheen, ja minua ei ole koulutettu\n" " auttamaan sinua sellaisessa tapauksessa." -#: src/httpserver.py:321 +#: src/httpserver.py:330 msgid "Request not handled." msgstr "Pyyntöä ei hyväksytty." -#: src/httpserver.py:325 +#: src/httpserver.py:334 msgid "No plugins available." msgstr "Ei lisäosia saatavilla." -#: src/httpserver.py:342 src/httpserver.py:359 +#: src/httpserver.py:351 src/httpserver.py:368 msgid "Request not handled" msgstr "Pyyntöä ei käsitelty." -#: src/httpserver.py:384 +#: src/httpserver.py:393 #, fuzzy msgid "No favicon set." msgstr "Faviconia ei ole asetettu." diff --git a/locales/messages.pot b/locales/messages.pot index 55631c685..2ed30863c 100644 --- a/locales/messages.pot +++ b/locales/messages.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2014-08-01 20:08+EEST\n" +"POT-Creation-Date: 2014-08-13 21:40+EEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -750,12 +750,12 @@ msgstr "" #: src/conf.py:680 msgid "" -"Supybot allows you to specify what brackets are\n" -" used for your nested commands. Valid sets of brackets include [], <>, and\n" -" {} (). [] has strong historical motivation, as well as being the brackets\n" -" that don't require shift. <> or () might be slightly superior because they\n" -" cannot occur in a nick. If this string is empty, nested commands will\n" -" not be allowed in this channel." +"Supybot allows you to specify what brackets\n" +" are used for your nested commands. Valid sets of brackets include\n" +" [], <>, and {} (). [] has strong historical motivation, but <> or\n" +" () might be slightly superior because they cannot occur in a nick.\n" +" If this string is empty, nested commands will not be allowed in this\n" +" channel." msgstr "" #: src/conf.py:687 @@ -1197,7 +1197,7 @@ msgid "" " neither overriden this message or defined an handler for this query." msgstr "" -#: src/httpserver.py:300 +#: src/httpserver.py:309 msgid "" "\n" " I am a pretty clever IRC bot, but I suck at serving Web pages, particulary\n" @@ -1206,19 +1206,19 @@ msgid "" " trained to help you in such a case." msgstr "" -#: src/httpserver.py:321 +#: src/httpserver.py:330 msgid "Request not handled." msgstr "" -#: src/httpserver.py:325 +#: src/httpserver.py:334 msgid "No plugins available." msgstr "" -#: src/httpserver.py:342 src/httpserver.py:359 +#: src/httpserver.py:351 src/httpserver.py:368 msgid "Request not handled" msgstr "" -#: src/httpserver.py:384 +#: src/httpserver.py:393 msgid "No favicon set." msgstr "" diff --git a/src/conf.py b/src/conf.py index 3a59e3d19..e4cd9c40e 100644 --- a/src/conf.py +++ b/src/conf.py @@ -677,12 +677,12 @@ class ValidBrackets(registry.OnlySomeStrings): validStrings = ('', '[]', '<>', '{}', '()') registerChannelValue(supybot.commands.nested, 'brackets', - ValidBrackets('[]', _("""Supybot allows you to specify what brackets are - used for your nested commands. Valid sets of brackets include [], <>, and - {} (). [] has strong historical motivation, as well as being the brackets - that don't require shift. <> or () might be slightly superior because they - cannot occur in a nick. If this string is empty, nested commands will - not be allowed in this channel."""))) + ValidBrackets('[]', _("""Supybot allows you to specify what brackets + are used for your nested commands. Valid sets of brackets include + [], <>, and {} (). [] has strong historical motivation, but <> or + () might be slightly superior because they cannot occur in a nick. + If this string is empty, nested commands will not be allowed in this + channel."""))) registerChannelValue(supybot.commands.nested, 'pipeSyntax', registry.Boolean(False, _("""Supybot allows nested commands. Enabling this option will allow nested commands with a syntax similar to UNIX pipes, for