diff options
| -rw-r--r-- | doc/de/autogen/user/irc_commands.txt | 27 | ||||
| -rw-r--r-- | doc/en/autogen/user/irc_commands.txt | 3 | ||||
| -rw-r--r-- | doc/fr/autogen/user/irc_commands.txt | 3 | ||||
| -rw-r--r-- | doc/it/autogen/user/irc_commands.txt | 33 | ||||
| -rw-r--r-- | po/cs.po | 8 | ||||
| -rw-r--r-- | po/de.po | 8 | ||||
| -rw-r--r-- | po/es.po | 8 | ||||
| -rw-r--r-- | po/fr.po | 15 | ||||
| -rw-r--r-- | po/hu.po | 7 | ||||
| -rw-r--r-- | po/it.po | 8 | ||||
| -rw-r--r-- | po/pl.po | 8 | ||||
| -rw-r--r-- | po/pt_BR.po | 7 | ||||
| -rw-r--r-- | po/ru.po | 7 | ||||
| -rw-r--r-- | po/weechat.pot | 7 | ||||
| -rw-r--r-- | src/plugins/irc/irc-command.c | 6 |
15 files changed, 71 insertions, 84 deletions
diff --git a/doc/de/autogen/user/irc_commands.txt b/doc/de/autogen/user/irc_commands.txt index 3338ff8e0..785f31df8 100644 --- a/doc/de/autogen/user/irc_commands.txt +++ b/doc/de/autogen/user/irc_commands.txt @@ -141,22 +141,21 @@ server: server name to disconnect add [re:]<nick> [<server> [<channel>]] del <number>|-all - list: zeigt alle Ignorierungen an - add: fügt eine Ignorierung hinzu - nick: Nick oder Hostname (kann ein regulärer Ausdruck sein, sofern "re:" angegeben wird) - del: entfernt eine Ignorierung - number: Nummer der Ignorierung die entfernt werden soll (nutze "list" um den entsprechenden Eintrag zu finden) - -all: entfernt alle Einträge -nick/host: Nick oder Host der ignoriert werden soll: Syntax ist "re:regex" oder "mask" (Eine Maske ist eine Zeichenkette in der mittels "*" ein- oder mehrere Zeichen ersetzt werden können) - server: interner Name des Server auf welchem die Ignorierung statt finden soll - channel: Name des Channel, in dem die Ignorierung statt finden soll - -Beispiele: - ignoriert den Nick "toto" global: + list: list all ignores + add: add an ignore + nick: nick or hostname (can be regular expression if "re:" is given or a mask using "*" to replace one or more chars) + del: delete an ignore + number: number of ignore to delete (look at list to find it) + -all: delete all ignores + server: internal server name where ignore is working + channel: channel name where ignore is working + +Examples: + ignore nick "toto" everywhere: /ignore add toto - ignoriert den Host "toto@domain.com" auf dem freenode Server: + ignore host "toto@domain.com" on freenode server: /ignore add toto@domain.com freenode - ignoriert den Host "toto*@*.domain.com" im Chat freenode/#weechat: + ignore host "toto*@*.domain.com" on freenode/#weechat: /ignore add toto*@*.domain.com freenode #weechat ........................................ diff --git a/doc/en/autogen/user/irc_commands.txt b/doc/en/autogen/user/irc_commands.txt index e7166c982..3fa5d0772 100644 --- a/doc/en/autogen/user/irc_commands.txt +++ b/doc/en/autogen/user/irc_commands.txt @@ -143,11 +143,10 @@ server: server name to disconnect list: list all ignores add: add an ignore - nick: nick or hostname (can be regular expression if "re:" is given) + nick: nick or hostname (can be regular expression if "re:" is given or a mask using "*" to replace one or more chars) del: delete an ignore number: number of ignore to delete (look at list to find it) -all: delete all ignores -nick/host: nick or host to ignore: syntax is "re:regex" or "mask" (a mask is a string with some "*" to replace one or more chars) server: internal server name where ignore is working channel: channel name where ignore is working diff --git a/doc/fr/autogen/user/irc_commands.txt b/doc/fr/autogen/user/irc_commands.txt index 83b04661e..b9a2967a8 100644 --- a/doc/fr/autogen/user/irc_commands.txt +++ b/doc/fr/autogen/user/irc_commands.txt @@ -143,11 +143,10 @@ serveur: nom du serveur pour se déconecter list: lister tous les ignores add: ajouter un ignore - pseudo: pseudo ou hôte (peut être une expression régulière si "re:" est donné) + pseudo: pseudo ou hôte (peut être une expression régulière si "re:" est donné ou un masque avec "*" pour remplacer un ou plusieurs caractères) del: supprimer un ignore numéro: numéro du ignore à supprimer (voir la liste des ignore pour le trouver) -all: supprimer tous les ignores -pseudo/hôte: pseudo ou hôte à ignorer: la syntaxe est "re:regex" ou "masque" (un masque est une chaîne avec des "*" pour remplacer un ou plusieurs caractères) serveur: nom de serveur interne où le ignore fonctionnera canal: canal où le ignore fonctionnera diff --git a/doc/it/autogen/user/irc_commands.txt b/doc/it/autogen/user/irc_commands.txt index b4c19e36e..2ba39c47c 100644 --- a/doc/it/autogen/user/irc_commands.txt +++ b/doc/it/autogen/user/irc_commands.txt @@ -141,23 +141,22 @@ server: nome del server da cui disconnettersi add [re:]<nick> [<server> [<canale>]] del <numero>|-all - list: elenca tutti gli ignore - add: aggiungi un ignore - nick: nick oppure hostname (può essere un'espressione regolare se forinito il parametro "-re:") - del: elimina un ignore - numero: numero di ignore da eliminare (nella lista) - -all: elimina tutti gli ignore -nick/host: nick o host da ignorare: la sintassi è "re:regex" o "mask" (una mask è una stringa con alcuni "*" per sostituire uno o più caratteri) - server: nome interno del server dove l'ignore è attivo - canale: nome del canale dove l'ignore è attivo - -Esempi: - ignora nick "tizio" su tutti gli host/canali: - /ignore add tizio - ignora l'host "tizio@dominio.com" sul server freenode: - /ignore add tizio@dominio.com freenode - ignora l'host "tizio*@*.dominio.com" su freenode/#weechat: - /ignore add tizio*@*.dominio.com freenode #weechat + list: list all ignores + add: add an ignore + nick: nick or hostname (can be regular expression if "re:" is given or a mask using "*" to replace one or more chars) + del: delete an ignore + number: number of ignore to delete (look at list to find it) + -all: delete all ignores + server: internal server name where ignore is working + channel: channel name where ignore is working + +Examples: + ignore nick "toto" everywhere: + /ignore add toto + ignore host "toto@domain.com" on freenode server: + /ignore add toto@domain.com freenode + ignore host "toto*@*.domain.com" on freenode/#weechat: + /ignore add toto*@*.domain.com freenode #weechat ........................................ [command]*`info`* ottieni informazioni sul server:: @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3937,15 +3937,15 @@ msgstr "ignorovat přezdívky/hosty na serveru nebo kanálu" msgid "list || add [re:]<nick> [<server> [<channel>]] || del <number>|-all" msgstr "list || add [re:]<nick> [<server> [<channel>]] || del <number>|-all" +#, fuzzy msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4125,15 +4125,15 @@ msgstr "Ignoriert Nicks/Hosts von Channels oder Servern" msgid "list || add [re:]<nick> [<server> [<channel>]] || del <number>|-all" msgstr "list || add [re:]<nick> [<server> [<channel>]] || del <number>|-all" +#, fuzzy msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4010,15 +4010,15 @@ msgid "list || add [re:]<nick> [<server> [<channel>]] || del <number>|-all" msgstr "list || add [re:]<apodo> [<servidor> [<canal>]] || del <número>|-all" # XXX nick is explained twice +#, fuzzy msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" -"PO-Revision-Date: 2011-05-15 10:51+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" +"PO-Revision-Date: 2011-05-15 11:13+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -4046,12 +4046,11 @@ msgstr "list || add [re:]<pseudo> [<serveur> [<canal>]] || del <numéro>|-all" msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" @@ -4066,14 +4065,12 @@ msgstr "" " list: lister tous les ignores\n" " add: ajouter un ignore\n" " pseudo: pseudo ou hôte (peut être une expression régulière si \"re:\" " -"est donné)\n" +"est donné ou un masque avec \"*\" pour remplacer un ou plusieurs " +"caractères)\n" " del: supprimer un ignore\n" " numéro: numéro du ignore à supprimer (voir la liste des ignore pour le " "trouver)\n" " -all: supprimer tous les ignores\n" -"pseudo/hôte: pseudo ou hôte à ignorer: la syntaxe est \"re:regex\" ou " -"\"masque\" (un masque est une chaîne avec des \"*\" pour remplacer un ou " -"plusieurs caractères)\n" " serveur: nom de serveur interne où le ignore fonctionnera\n" " canal: canal où le ignore fonctionnera\n" "\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3599,12 +3599,11 @@ msgstr "" msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4009,15 +4009,15 @@ msgstr "ignora nick/host dai server o dai canali" msgid "list || add [re:]<nick> [<server> [<channel>]] || del <number>|-all" msgstr "list || add [re:]<nick> [<server> [<canale>]] || del <numero>|-all" +#, fuzzy msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3981,15 +3981,15 @@ msgstr "ignoruje nicki/hosty z serwera lub kanałów" msgid "list || add [re:]<nick> [<server> [<channel>]] || del <number>|-all" msgstr "list || add [re:]<nick> [<serwer> [<kanał>]] || del <numer>|-all" +#, fuzzy msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 836ddde12..a2835906a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3764,12 +3764,11 @@ msgstr "" msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3618,12 +3618,11 @@ msgstr "" msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" diff --git a/po/weechat.pot b/po/weechat.pot index 974214f81..12a881e56 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-05-15 10:53+0200\n" +"POT-Creation-Date: 2011-05-15 11:12+0200\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" @@ -3159,12 +3159,11 @@ msgstr "" msgid "" " list: list all ignores\n" " add: add an ignore\n" -" nick: nick or hostname (can be regular expression if \"re:\" is given)\n" +" nick: nick or hostname (can be regular expression if \"re:\" is given " +"or a mask using \"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at list to find it)\n" " -all: delete all ignores\n" -"nick/host: nick or host to ignore: syntax is \"re:regex\" or \"mask\" (a " -"mask is a string with some \"*\" to replace one or more chars)\n" " server: internal server name where ignore is working\n" " channel: channel name where ignore is working\n" "\n" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 41e0188fb..f6ff4829a 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -4799,14 +4799,12 @@ irc_command_init () N_(" list: list all ignores\n" " add: add an ignore\n" " nick: nick or hostname (can be regular " - "expression if \"re:\" is given)\n" + "expression if \"re:\" is given or a mask using " + "\"*\" to replace one or more chars)\n" " del: delete an ignore\n" " number: number of ignore to delete (look at " "list to find it)\n" " -all: delete all ignores\n" - "nick/host: nick or host to ignore: syntax is " - "\"re:regex\" or \"mask\" (a mask is a string with " - "some \"*\" to replace one or more chars)\n" " server: internal server name where ignore " "is working\n" " channel: channel name where ignore is " |