From e6125608c01ce3e9115b9a98d14c7debdf04e866 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Mon, 4 Jun 2012 18:21:29 +0200 Subject: [PATCH] rmodifier: reallow names beginning with "#" for rmodifiers --- doc/de/autogen/user/alias_commands.txt | 43 +++++++++++----------- doc/de/autogen/user/rmodifier_commands.txt | 33 ++++++++--------- doc/en/autogen/user/alias_commands.txt | 1 - doc/en/autogen/user/rmodifier_commands.txt | 1 - doc/fr/autogen/user/alias_commands.txt | 1 - doc/fr/autogen/user/rmodifier_commands.txt | 1 - doc/it/autogen/user/alias_commands.txt | 43 +++++++++++----------- doc/it/autogen/user/rmodifier_commands.txt | 29 +++++++-------- po/cs.po | 18 ++++----- po/de.po | 21 ++++------- po/es.po | 21 ++++------- po/fr.po | 22 ++++------- po/hu.po | 20 +++++----- po/it.po | 21 ++++------- po/ja.po | 21 ++++------- po/pl.po | 21 ++++------- po/pt_BR.po | 15 ++------ po/ru.po | 20 +++++----- po/weechat.pot | 12 +----- src/plugins/rmodifier/rmodifier-command.c | 2 - src/plugins/rmodifier/rmodifier.c | 2 +- 21 files changed, 151 insertions(+), 217 deletions(-) diff --git a/doc/de/autogen/user/alias_commands.txt b/doc/de/autogen/user/alias_commands.txt index 50ce305cc..c45075a52 100644 --- a/doc/de/autogen/user/alias_commands.txt +++ b/doc/de/autogen/user/alias_commands.txt @@ -3,33 +3,32 @@ ........................................ /alias [-completion ] [ [;...]] -completion: completion for alias (optional, by default completion is done with target command) - note: you can use %%command to use completion of an existing command - alias: name of alias (can start or end with "*" for alias listing) - note: the name can not start with "#" - command: command name with arguments (many commands can be separated by semicolons) +completion: optionale Vervollständigung für einen Alias-Befehl (Standardverhalten: Vervollständigung wird auf den Zielbefehl angewendet) + Hinweis: Mit der Variablen "%%command" kann eine Vervollständigung eines vorhandenen Befehls durchgeführt werden + alias: Name des Alias (kann mit Joker "*" beginnen oder enden um Aliase aufzulisten) + command: Name des zuzuordnenden Befehls (WeeChat- oder IRC-Befehl ohne führenden '/', mehrere Befehle müssen durch Semikolon getrennt werden) -Without argument, this command lists all defined alias. +Ohne Angabe von Argumenten werden alle definierten Aliase angezeigt. -Note: in command, special variables are replaced: - $n: argument 'n' (between 1 and 9) - $-m: arguments from 1 to 'm' - $n-: arguments from 'n' to last - $n-m: arguments from 'n' to 'm' - $*: all arguments - $~: last argument - $nick: current nick - $channel: current channel - $server: current server +Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entsprechenden Wert ersetzt werden: + $n: Argument 'n' (zwischen 1 und 9) + $-m: Argumente von 1 bis 'm' + $n-: Argumente von 'n' bis zum letzten Argument + $n-m: Argumente von 'n' bis 'm' + $*: alle Argumente + $~: letztes Argument + $nick: aktueller Nick + $channel: aktueller Channel + $server: aktueller Server -To remove an alias, use command /unalias. +Um ein Alias zu löschen wird der Befehl "/unalias" genutzt. -Examples: - alias /split to split window horizontally: +Beispiele: + Alias "/split" wird anlegt um damit ein Fenster horizontal zu teilen: /alias split /window splith - alias /hello to say "hello" on all channels but not on #weechat: - /alias hello /allchan -exclude=#weechat msg * hello - alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin: + Alias "/hallo" wird angelegt um in allen Channels, außer im #weechat Channel, den Text "Hallo" auszugeben: + /alias hallo /allchan -exclude=#weechat msg * Hallo + Alias "/forcejoin" wird angelegt um den IRC Befehl "forcejoin" mit einer Vervollständigung von /sajoin auszuführen: /alias -completion %%sajoin forcejoin /quote forcejoin ........................................ diff --git a/doc/de/autogen/user/rmodifier_commands.txt b/doc/de/autogen/user/rmodifier_commands.txt index 3eb8f8461..1102dba2c 100644 --- a/doc/de/autogen/user/rmodifier_commands.txt +++ b/doc/de/autogen/user/rmodifier_commands.txt @@ -6,24 +6,23 @@ del |-all [...] default -yes - list: list all rmodifiers -listdefault: list default rmodifiers - add: add a rmodifier - name: name of rmodifier - note: the name can not start with "#" - modifiers: comma separated list of modifiers - groups: action on groups found: comma separated list of groups (from 1 to 9) with optional "*" after number to hide group - regex: regular expression (case insensitive, can start by "(?-i)" to become case sensitive) - del: delete a rmodifier - -all: delete all rmodifiers - default: restore default rmodifiers + list: zeigt alle rmodifier an +listdefault: zeigt die Standardeinstellung für rmodifier an + add: einen rmodifier hinzufügen + name: Name des rmodifier + modifiers: durch Kommata getrennte Liste der modifier + groups: Aktion auf Gruppen anwenden: durch Kommata getrennte Liste der Gruppen (von 1 bis 9). Optional kann nach der Nummer für die Gruppe ein "*" gesetzt werden um diese Gruppe auszublenden + regex: regulärer Ausdruck (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden) + del: löscht einen rmodifier Eintrag + -all: löscht alle rmodifiers Einträge + default: setzt die rmodifier auf seine Standardwerte zurück -Examples: - hide everything typed after a command /password: - /rmodifier add password input_text_display 1,2* ^(/password +)(.*) - delete rmodifier "password": - /rmodifier del password - delete all rmodifiers: +Beispiele: + verbirgt die Eingabe nach dem Befehl /passwort: + /rmodifier add passwort input_text_display 1,2* ^(/passwort +)(.*) + lösche rmodifier "passwort": + /rmodifier del passwort + lösche alle rmodifiers: /rmodifier del -all ........................................ diff --git a/doc/en/autogen/user/alias_commands.txt b/doc/en/autogen/user/alias_commands.txt index c877fd937..9db1ec962 100644 --- a/doc/en/autogen/user/alias_commands.txt +++ b/doc/en/autogen/user/alias_commands.txt @@ -6,7 +6,6 @@ completion: completion for alias (optional, by default completion is done with target command) note: you can use %%command to use completion of an existing command alias: name of alias (can start or end with "*" for alias listing) - note: the name can not start with "#" command: command name with arguments (many commands can be separated by semicolons) Without argument, this command lists all defined alias. diff --git a/doc/en/autogen/user/rmodifier_commands.txt b/doc/en/autogen/user/rmodifier_commands.txt index cd9e661a2..18906369e 100644 --- a/doc/en/autogen/user/rmodifier_commands.txt +++ b/doc/en/autogen/user/rmodifier_commands.txt @@ -10,7 +10,6 @@ listdefault: list default rmodifiers add: add a rmodifier name: name of rmodifier - note: the name can not start with "#" modifiers: comma separated list of modifiers groups: action on groups found: comma separated list of groups (from 1 to 9) with optional "*" after number to hide group regex: regular expression (case insensitive, can start by "(?-i)" to become case sensitive) diff --git a/doc/fr/autogen/user/alias_commands.txt b/doc/fr/autogen/user/alias_commands.txt index 6a1ec358a..739e4e718 100644 --- a/doc/fr/autogen/user/alias_commands.txt +++ b/doc/fr/autogen/user/alias_commands.txt @@ -6,7 +6,6 @@ complétion: complétion pour l'alias (optionnel, par défaut la complétion se fait avec la commande cible) note: vous pouvez utiliser %%commande pour utiliser la complétion d'une commande existante alias: nom de l'alias (peut démarrer ou se terminer par "*" pour une liste d'alias) - note: le nom ne peut pas commencer par "#" commande: nom de la commande avec les paramètres (plusieurs commandes peuvent être séparées par des points-virgules) Sans paramètre, cette commande liste tous les alias définis. diff --git a/doc/fr/autogen/user/rmodifier_commands.txt b/doc/fr/autogen/user/rmodifier_commands.txt index 9c8a1e2a7..6bfb7e012 100644 --- a/doc/fr/autogen/user/rmodifier_commands.txt +++ b/doc/fr/autogen/user/rmodifier_commands.txt @@ -10,7 +10,6 @@ listdefault: lister les rmodifiers par défaut add: ajouter un rmodifier name: nom du rmodifier - note: le nom ne peut pas commencer par "#" modifiers: liste de modifiers (séparés par une virgule) groupes: action sur les groupes trouvés: liste de groupes (séparés par une virgule) (de 1 à 9) avec en option "*" après le nombre pour cacher le groupe regex: expression régulière (insensible à la casse, peut commencer par "(?-i)" pour devenir sensible à la casse) diff --git a/doc/it/autogen/user/alias_commands.txt b/doc/it/autogen/user/alias_commands.txt index f4342586d..782799073 100644 --- a/doc/it/autogen/user/alias_commands.txt +++ b/doc/it/autogen/user/alias_commands.txt @@ -3,33 +3,32 @@ ........................................ /alias [-completion ] [ [;...]] -completion: completion for alias (optional, by default completion is done with target command) - note: you can use %%command to use completion of an existing command - alias: name of alias (can start or end with "*" for alias listing) - note: the name can not start with "#" - command: command name with arguments (many commands can be separated by semicolons) +completamento: completamento per l'alias (opzionale, per default il completamento viene eseguito con il comando di destinazione) + nota: è possibile usare %%comando per usare il completamento di un comando esistente + alias: nome dell'alias (può iniziare o terminare con "*" per elencare gli alias) + comando: nome del comando con gli argomenti (più comandi vanno separati da punto e virgola) -Without argument, this command lists all defined alias. +Senza argomento, questo comando elenca tutti gli alias definiti. -Note: in command, special variables are replaced: - $n: argument 'n' (between 1 and 9) - $-m: arguments from 1 to 'm' - $n-: arguments from 'n' to last - $n-m: arguments from 'n' to 'm' - $*: all arguments - $~: last argument - $nick: current nick - $channel: current channel - $server: current server +Nota: nel comando, vengono sostituite le variabili speciali: + $n: argomento 'n' (tra 1 e 9) + $-m: argomenti da 1 a 'm' + $n-: argomenti da 'n' all'ultimo + $n-m: argomenti da 'n' a 'm' + $*: tutti gli argomenti + $~: l'ultimo argomento + $nick: nick corrente + $channel: canale corrente + $server: server corrente -To remove an alias, use command /unalias. +Per rimuovere un alias, usare il comando /unalias. -Examples: - alias /split to split window horizontally: +Esempi: + alias /split per dividere la finestra orizzontalmente: /alias split /window splith - alias /hello to say "hello" on all channels but not on #weechat: - /alias hello /allchan -exclude=#weechat msg * hello - alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin: + alias /ciao per dire "ciao" su tutti i canali tranne #weechat: + /alias ciao /allchan -exclude=#weechat msg * ciao + alias /forcejoin per inviare il comando IRC "forcejoin" con il completamento di /sajoin: /alias -completion %%sajoin forcejoin /quote forcejoin ........................................ diff --git a/doc/it/autogen/user/rmodifier_commands.txt b/doc/it/autogen/user/rmodifier_commands.txt index 803e61a20..01fc67a9e 100644 --- a/doc/it/autogen/user/rmodifier_commands.txt +++ b/doc/it/autogen/user/rmodifier_commands.txt @@ -6,24 +6,23 @@ del |-all [...] default -yes - list: list all rmodifiers -listdefault: list default rmodifiers - add: add a rmodifier - name: name of rmodifier - note: the name can not start with "#" - modifiers: comma separated list of modifiers - groups: action on groups found: comma separated list of groups (from 1 to 9) with optional "*" after number to hide group - regex: regular expression (case insensitive, can start by "(?-i)" to become case sensitive) - del: delete a rmodifier - -all: delete all rmodifiers - default: restore default rmodifiers + list: elenca tutti gli rmodifier +listdefault: elenca gli rmodifier predefiniti + add: aggiunge un rmodifier + nome: nome rmodifier + modifier: elenco separato da virgole di modificatori + gruppi: azione sui gruppi trovati: elenco separato da virgole di gruppi (da 1 a 9) con "*" opzionale dopo il numero per nascondere il gruppo + regex: espressione regolare (non sensibile alle maiuscole, può iniziare con "(?-i)" per diventare sensibile alle maiuscole + del: elimina rmodifier + -all: elimina tutti gli rmodifier + default: ripristina gli rmodifier predefiniti -Examples: - hide everything typed after a command /password: +Esempi: + nasconde ciò che viene digitato dopo il comando /password: /rmodifier add password input_text_display 1,2* ^(/password +)(.*) - delete rmodifier "password": + elimina rmodifier "password": /rmodifier del password - delete all rmodifiers: + elimina tutti gli rmodifier: /rmodifier del -all ........................................ diff --git a/po/cs.po b/po/cs.po index a5f24c5aa..441289dd4 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -148,10 +148,6 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Žádné položky pole nejsou definovány" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%sChyba: jméno nemůže začínat na \"#\"" - #, c-format msgid "%sNot enough memory" msgstr "%sNedostatek paměti" @@ -3483,7 +3479,6 @@ msgid "" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -4084,10 +4079,6 @@ msgstr "Žádný server s \"%s\" nenalezen" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "%s%s: server \"%s\" již existuje, nemohu jej vytvořít!" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s%s: jméno nemůže začínat na \"#\"" - #, c-format msgid "%s%s: unable to create server" msgstr "%s%s: nemohu vytvořit server" @@ -7624,7 +7615,6 @@ msgid "" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -8353,6 +8343,12 @@ msgstr "" msgid "Constants" msgstr "" +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%sChyba: jméno nemůže začínat na \"#\"" + +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s%s: jméno nemůže začínat na \"#\"" + #~ msgid "string inserted after nick completion" #~ msgstr "řetězec vložený za přezdívku po doplnění" diff --git a/po/de.po b/po/de.po index 8b45f4532..65e631e4a 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -162,10 +162,6 @@ msgstr " %s (Erweiterung: %s)" msgid "No bar item defined" msgstr "Es wurde kein Bar-Item festgelegt" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%sFehler: Name darf nicht mit \"#\"beginnen" - #, c-format msgid "%sNot enough memory" msgstr "%sNicht genügend Speicher" @@ -3805,14 +3801,13 @@ msgstr "Einem Befehl wird ein Alias zugewiesen" msgid "[-completion ] [ [;...]]" msgstr "[-completion ] [ [;...]]" -#, fuzzy, c-format +#, c-format msgid "" "completion: completion for alias (optional, by default completion is done " "with target command)\n" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -4451,10 +4446,6 @@ msgstr "" "%s%s: Der Server \"%s\" existiert bereits und kann daher nicht angelegt " "werden!" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s%s: Name darf nicht mit \"#\" beginnen" - #, c-format msgid "%s%s: unable to create server" msgstr "%s%s: Server kann nicht anlegt werden" @@ -8144,13 +8135,11 @@ msgstr "" "list|listdefault || add || del |-" "all [...] || default -yes" -#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -8906,6 +8895,12 @@ msgstr "Type" msgid "Constants" msgstr "Konstanten" +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%sFehler: Name darf nicht mit \"#\"beginnen" + +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s%s: Name darf nicht mit \"#\" beginnen" + #~ msgid "string inserted after nick completion" #~ msgstr "Nach Nick-Vervollständigung anzufügende Zeichenfolge" diff --git a/po/es.po b/po/es.po index 241874d9e..b15b273bf 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -151,10 +151,6 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Ningún elemento definido" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%sError: el nombre no puede empezar con \"#\"" - #, c-format msgid "%sNot enough memory" msgstr "%sNo hay suficiente memoria" @@ -3660,14 +3656,13 @@ msgstr "crear un alias para un comando" msgid "[-completion ] [ [;...]]" msgstr "[-completion ] [ [;...]]" -#, fuzzy, c-format +#, c-format msgid "" "completion: completion for alias (optional, by default completion is done " "with target command)\n" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -4282,10 +4277,6 @@ msgstr "Ningún servidor encontrado con \"%s\"" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "%s%s: el servidor \"%s\" ya existe, ¡no se puede crear!" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s%s: nombre no puede empezar con \"#\"" - #, c-format msgid "%s%s: unable to create server" msgstr "%s%s: no es posible crear el servidor" @@ -7885,13 +7876,11 @@ msgstr "" "list|listdefault || add || del " "|-all [...] || default -yes" -#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -8637,6 +8626,12 @@ msgstr "Tipo" msgid "Constants" msgstr "Constantes" +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%sError: el nombre no puede empezar con \"#\"" + +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s%s: nombre no puede empezar con \"#\"" + #~ msgid "string inserted after nick completion" #~ msgstr "cadena insertada después de auto-completar un apodo" diff --git a/po/fr.po b/po/fr.po index b6f5e3a2b..465d5d454 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" -"PO-Revision-Date: 2012-06-04 09:59+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" +"PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -151,10 +151,6 @@ msgstr " %s (extension: %s)" msgid "No bar item defined" msgstr "Pas d'objet de barre défini" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%sErreur: le nom ne peut pas commencer par \"#\"" - #, c-format msgid "%sNot enough memory" msgstr "%sPas assez de mémoire" @@ -3699,7 +3695,6 @@ msgid "" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -3733,7 +3728,6 @@ msgstr "" "complétion d'une commande existante\n" " alias: nom de l'alias (peut démarrer ou se terminer par \"*\" pour une " "liste d'alias)\n" -" note: le nom ne peut pas commencer par \"#\"\n" " commande: nom de la commande avec les paramètres (plusieurs commandes " "peuvent être séparées par des points-virgules)\n" "\n" @@ -4324,10 +4318,6 @@ msgstr "Pas de serveur trouvé avec \"%s\"" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "%s%s: le serveur \"%s\" existe déjà, impossible de le créer !" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s%s: le nom ne peut pas commencer par \"#\"" - #, c-format msgid "%s%s: unable to create server" msgstr "%s%s: impossible de créer le serveur" @@ -7942,7 +7932,6 @@ msgid "" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -7964,7 +7953,6 @@ msgstr "" "listdefault: lister les rmodifiers par défaut\n" " add: ajouter un rmodifier\n" " name: nom du rmodifier\n" -" note: le nom ne peut pas commencer par \"#\"\n" " modifiers: liste de modifiers (séparés par une virgule)\n" " groupes: action sur les groupes trouvés: liste de groupes (séparés par " "une virgule) (de 1 à 9) avec en option \"*\" après le nombre pour cacher le " @@ -8693,6 +8681,12 @@ msgstr "Type" msgid "Constants" msgstr "Constantes" +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%sErreur: le nom ne peut pas commencer par \"#\"" + +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s%s: le nom ne peut pas commencer par \"#\"" + #~ msgid "string inserted after nick completion" #~ msgstr "chaîne affichée après la complétion des pseudos" diff --git a/po/hu.po b/po/hu.po index 31c60506c..d82759bdc 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -150,10 +150,6 @@ msgstr " (nem található bővítőmodul)\n" msgid "No bar item defined" msgstr "Nincs aliasz definiálva.\n" -#, fuzzy, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%s nem sikerült a \"%s\" fájlt létrehozni\n" - #, fuzzy, c-format msgid "%sNot enough memory" msgstr "Nincs elég memória az új sorhoz\n" @@ -3149,7 +3145,6 @@ msgid "" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -3709,10 +3704,6 @@ msgstr "Nem található '%s' szerver.\n" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "%s a \"%s\" szerver már létezik, nem hozhatja létre!\n" -#, fuzzy, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s nem sikerült a(z) \"%s\" fájlt elérni\n" - #, fuzzy, c-format msgid "%s%s: unable to create server" msgstr "%s nem sikerült a szervert létrehozni\n" @@ -7146,7 +7137,6 @@ msgid "" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -7874,6 +7864,14 @@ msgstr "" msgid "Constants" msgstr "" +#, fuzzy +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%s nem sikerült a \"%s\" fájlt létrehozni\n" + +#, fuzzy +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s nem sikerült a(z) \"%s\" fájlt elérni\n" + #, fuzzy #~ msgid " " #~ msgstr "név szoba" diff --git a/po/it.po b/po/it.po index fea5edae4..e17ca3697 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -149,10 +149,6 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Nessun elemento barra definito" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%sErrore: il nome non può iniziare con \"#\"" - #, c-format msgid "%sNot enough memory" msgstr "%sSpazio non sufficiente" @@ -3649,14 +3645,13 @@ msgstr "crea un alias per un comando" msgid "[-completion ] [ [;...]]" msgstr "[-completion ] [ [;...]]" -#, fuzzy, c-format +#, c-format msgid "" "completion: completion for alias (optional, by default completion is done " "with target command)\n" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -4276,10 +4271,6 @@ msgstr "Nessun server trovato con \"%s\"" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "%s%s: il server \"%s\" esiste già, impossibile crearlo!" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s%s: il nome non può iniziare con \"#\"" - #, c-format msgid "%s%s: unable to create server" msgstr "%s%s: impossibile creare il server" @@ -7867,13 +7858,11 @@ msgstr "" "list|listdefault || add || del |-" "all [...] || default -yes" -#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -8611,6 +8600,12 @@ msgstr "Tipo" msgid "Constants" msgstr "Costanti" +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%sErrore: il nome non può iniziare con \"#\"" + +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s%s: il nome non può iniziare con \"#\"" + #~ msgid "display '+' if prefix is truncated" #~ msgstr "mostra '+' se il prefisso è troncato" diff --git a/po/ja.po b/po/ja.po index 419783bc3..59aac6d58 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -148,10 +148,6 @@ msgstr " %s (プラグイン: %s)" msgid "No bar item defined" msgstr "バーアイテムが定義されていません" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%sエラー: \"#\" で始まる名前は使えません" - #, c-format msgid "%sNot enough memory" msgstr "%sメモリ不足" @@ -3555,14 +3551,13 @@ msgstr "コマンドの別名を作成" msgid "[-completion ] [ [;...]]" msgstr "[-completion ] [ [;...]]" -#, fuzzy, c-format +#, c-format msgid "" "completion: completion for alias (optional, by default completion is done " "with target command)\n" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -4167,10 +4162,6 @@ msgstr "\"%s\" にマッチするサーバが見つかりません" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "%s%s: サーバ \"%s\" は既に存在しており、作成できません" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s%s: \"#\" から始まる名前は使えません" - #, c-format msgid "%s%s: unable to create server" msgstr "%s%s: サーバの作成に失敗" @@ -7670,13 +7661,11 @@ msgstr "" "list|listdefault || add || del |-" "all [...] || default -yes" -#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -8405,6 +8394,12 @@ msgstr "タイプ" msgid "Constants" msgstr "定数" +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%sエラー: \"#\" で始まる名前は使えません" + +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s%s: \"#\" から始まる名前は使えません" + #~ msgid "string inserted after nick completion" #~ msgstr "ニックネーム補完の後に追加される文字列" diff --git a/po/pl.po b/po/pl.po index fd9873f3c..485bfccff 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -152,10 +152,6 @@ msgstr " %s (wtyczka: %s)" msgid "No bar item defined" msgstr "Nie zdefiniowano elementów paska" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%sBłąd: nazwa nie może się zaczynać od \"#\"" - #, c-format msgid "%sNot enough memory" msgstr "%sZa mało pamięci" @@ -3642,14 +3638,13 @@ msgstr "tworzy alias do komendy" msgid "[-completion ] [ [;...]]" msgstr "[-completion ] [ [;...]]" -#, fuzzy, c-format +#, c-format msgid "" "completion: completion for alias (optional, by default completion is done " "with target command)\n" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -4260,10 +4255,6 @@ msgstr "Nie znaleziono serwera z \"%s\"" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "%s%s: serwer \"%s\" już istnieje, nie mogę go utworzyć!" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s%s: nazwa nie może się zaczynać od \"#\"" - #, c-format msgid "%s%s: unable to create server" msgstr "%s%s: nie można utworzyć serwera" @@ -7809,13 +7800,11 @@ msgstr "" "list|listdefault || add || del " "|-all [...] || default -yes" -#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -8544,6 +8533,12 @@ msgstr "Typ" msgid "Constants" msgstr "Stałe" +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%sBłąd: nazwa nie może się zaczynać od \"#\"" + +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s%s: nazwa nie może się zaczynać od \"#\"" + #~ msgid "string inserted after nick completion" #~ msgstr "ciąg wstawiany po dopełnionym nicku" diff --git a/po/pt_BR.po b/po/pt_BR.po index b3031f8ad..a3a0776cb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -175,10 +175,6 @@ msgstr " %s (plugin: %s)" msgid "No bar item defined" msgstr "Nenhum item da barra definido" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%sErro: nome não pode começar com \"#\"" - #, c-format msgid "%sNot enough memory" msgstr "%sMemória insuficiente" @@ -3570,7 +3566,6 @@ msgid "" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -4118,10 +4113,6 @@ msgstr "" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "" - #, c-format msgid "%s%s: unable to create server" msgstr "" @@ -7275,7 +7266,6 @@ msgid "" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -7996,6 +7986,9 @@ msgstr "" msgid "Constants" msgstr "" +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%sErro: nome não pode começar com \"#\"" + # Find a better translation to string #, fuzzy #~ msgid "string inserted after nick completion" diff --git a/po/ru.po b/po/ru.po index 8c1169428..d8a4c7751 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -154,10 +154,6 @@ msgstr " (нет pluginа)\n" msgid "No bar item defined" msgstr "Сокращения не заданы.\n" -#, fuzzy, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "%s не могу создать файл \"%s\"\n" - #, fuzzy, c-format msgid "%sNot enough memory" msgstr "Недостаточно памяти для новой строчки\n" @@ -3180,7 +3176,6 @@ msgid "" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -3740,10 +3735,6 @@ msgstr "Серверы с '%s' не найдены.\n" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "%s сервер \"%s\" уже существует, не могу создать его!\n" -#, fuzzy, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "%s нет доступа к файлу \"%s\"\n" - #, fuzzy, c-format msgid "%s%s: unable to create server" msgstr "%s не могу создать сервер\n" @@ -7168,7 +7159,6 @@ msgid "" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" @@ -7892,6 +7882,14 @@ msgstr "" msgid "Constants" msgstr "" +#, fuzzy +#~ msgid "%sError: name can not start with \"#\"" +#~ msgstr "%s не могу создать файл \"%s\"\n" + +#, fuzzy +#~ msgid "%s%s: name can not start with \"#\"" +#~ msgstr "%s нет доступа к файлу \"%s\"\n" + #, fuzzy #~ msgid " " #~ msgstr "ник канал" diff --git a/po/weechat.pot b/po/weechat.pot index 28fdb5232..1fca5c6dd 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: 2012-06-04 10:02+0200\n" +"POT-Creation-Date: 2012-06-04 18:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -114,10 +114,6 @@ msgstr "" msgid "No bar item defined" msgstr "" -#, c-format -msgid "%sError: name can not start with \"#\"" -msgstr "" - #, c-format msgid "%sNot enough memory" msgstr "" @@ -2775,7 +2771,6 @@ msgid "" " note: you can use %%command to use completion of an existing " "command\n" " alias: name of alias (can start or end with \"*\" for alias listing)\n" -" note: the name can not start with \"#\"\n" " command: command name with arguments (many commands can be separated by " "semicolons)\n" "\n" @@ -3306,10 +3301,6 @@ msgstr "" msgid "%s%s: server \"%s\" already exists, can't create it!" msgstr "" -#, c-format -msgid "%s%s: name can not start with \"#\"" -msgstr "" - #, c-format msgid "%s%s: unable to create server" msgstr "" @@ -6270,7 +6261,6 @@ msgid "" "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" -" note: the name can not start with \"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated list of groups (from 1 " "to 9) with optional \"*\" after number to hide group\n" diff --git a/src/plugins/rmodifier/rmodifier-command.c b/src/plugins/rmodifier/rmodifier-command.c index f360e8f08..18990f9d0 100644 --- a/src/plugins/rmodifier/rmodifier-command.c +++ b/src/plugins/rmodifier/rmodifier-command.c @@ -242,8 +242,6 @@ rmodifier_command_init () "listdefault: list default rmodifiers\n" " add: add a rmodifier\n" " name: name of rmodifier\n" - " note: the name can not start with " - "\"#\"\n" " modifiers: comma separated list of modifiers\n" " groups: action on groups found: comma separated " "list of groups (from 1 to 9) with optional \"*\" " diff --git a/src/plugins/rmodifier/rmodifier.c b/src/plugins/rmodifier/rmodifier.c index 173bdacfc..a0783ffd3 100644 --- a/src/plugins/rmodifier/rmodifier.c +++ b/src/plugins/rmodifier/rmodifier.c @@ -263,7 +263,7 @@ rmodifier_new (const char *name, const char *modifiers, const char *str_regex, struct t_rmodifier *new_rmodifier, *ptr_rmodifier; regex_t *regex; - if (!name || !name[0] || (name[0] == '#') || !modifiers || !modifiers[0] + if (!name || !name[0] || !modifiers || !modifiers[0] || !str_regex || !str_regex[0]) { return NULL;