diff --git a/doc/de/autogen/user/trigger_commands.txt b/doc/de/autogen/user/trigger_commands.txt index 6d8eeb3b5..9c706aa7f 100644 --- a/doc/de/autogen/user/trigger_commands.txt +++ b/doc/de/autogen/user/trigger_commands.txt @@ -30,7 +30,7 @@ listdefault: list default triggers print: buffer, tags, message, strip colors command: command (required), description, arguments, description of arguments, completion command_run: command (required) - timer: interval (required), align on second (required), max calls (required) + timer: interval (required), align on second, max calls config: name of option (required) focus: name(s) of area (required) conditions: evaluated conditions for the trigger diff --git a/doc/en/autogen/user/trigger_commands.txt b/doc/en/autogen/user/trigger_commands.txt index 6d8eeb3b5..9c706aa7f 100644 --- a/doc/en/autogen/user/trigger_commands.txt +++ b/doc/en/autogen/user/trigger_commands.txt @@ -30,7 +30,7 @@ listdefault: list default triggers print: buffer, tags, message, strip colors command: command (required), description, arguments, description of arguments, completion command_run: command (required) - timer: interval (required), align on second (required), max calls (required) + timer: interval (required), align on second, max calls config: name of option (required) focus: name(s) of area (required) conditions: evaluated conditions for the trigger diff --git a/doc/fr/autogen/user/trigger_commands.txt b/doc/fr/autogen/user/trigger_commands.txt index e46d8915c..b9f56bc2d 100644 --- a/doc/fr/autogen/user/trigger_commands.txt +++ b/doc/fr/autogen/user/trigger_commands.txt @@ -30,7 +30,7 @@ listdefault: lister les triggers par défaut print: tampon, étiquettes, message, suppression des couleurs (0/1) command: commande (obligatoire), description, paramètres, description des paramètres, complétion command_run: commande (obligatoire) - timer: intervalle (obligatoire), alignement sur la seconde (obligatoire), nombre max d'appels (obligatoire) + timer: intervalle (obligatoire), alignement sur la seconde, nombre max d'appels config: nom de l'option (obligatoire) focus: nom(s) de la zone (obligatoire) conditions: conditions évaluées pour le trigger diff --git a/doc/it/autogen/user/trigger_commands.txt b/doc/it/autogen/user/trigger_commands.txt index 6d8eeb3b5..9c706aa7f 100644 --- a/doc/it/autogen/user/trigger_commands.txt +++ b/doc/it/autogen/user/trigger_commands.txt @@ -30,7 +30,7 @@ listdefault: list default triggers print: buffer, tags, message, strip colors command: command (required), description, arguments, description of arguments, completion command_run: command (required) - timer: interval (required), align on second (required), max calls (required) + timer: interval (required), align on second, max calls config: name of option (required) focus: name(s) of area (required) conditions: evaluated conditions for the trigger diff --git a/doc/ja/autogen/user/trigger_commands.txt b/doc/ja/autogen/user/trigger_commands.txt index 6d8eeb3b5..9c706aa7f 100644 --- a/doc/ja/autogen/user/trigger_commands.txt +++ b/doc/ja/autogen/user/trigger_commands.txt @@ -30,7 +30,7 @@ listdefault: list default triggers print: buffer, tags, message, strip colors command: command (required), description, arguments, description of arguments, completion command_run: command (required) - timer: interval (required), align on second (required), max calls (required) + timer: interval (required), align on second, max calls config: name of option (required) focus: name(s) of area (required) conditions: evaluated conditions for the trigger diff --git a/doc/pl/autogen/user/trigger_commands.txt b/doc/pl/autogen/user/trigger_commands.txt index 6d8eeb3b5..9c706aa7f 100644 --- a/doc/pl/autogen/user/trigger_commands.txt +++ b/doc/pl/autogen/user/trigger_commands.txt @@ -30,7 +30,7 @@ listdefault: list default triggers print: buffer, tags, message, strip colors command: command (required), description, arguments, description of arguments, completion command_run: command (required) - timer: interval (required), align on second (required), max calls (required) + timer: interval (required), align on second, max calls config: name of option (required) focus: name(s) of area (required) conditions: evaluated conditions for the trigger diff --git a/po/cs.po b/po/cs.po index 94bdfdb6c..abf4c8315 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:24+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -9853,8 +9853,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/de.po b/po/de.po index 0b1bce25f..5578f8733 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:24+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -10994,8 +10994,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/es.po b/po/es.po index e4090d67c..87d85cb5d 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -10117,8 +10117,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/fr.po b/po/fr.po index 648196be6..73933a005 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" -"PO-Revision-Date: 2014-02-28 14:58+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" +"PO-Revision-Date: 2014-03-01 17:22+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -10739,8 +10739,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" @@ -10817,8 +10816,8 @@ msgstr "" " command: commande (obligatoire), description, paramètres, " "description des paramètres, complétion\n" " command_run: commande (obligatoire)\n" -" timer: intervalle (obligatoire), alignement sur la seconde " -"(obligatoire), nombre max d'appels (obligatoire)\n" +" timer: intervalle (obligatoire), alignement sur la seconde, " +"nombre max d'appels\n" " config: nom de l'option (obligatoire)\n" " focus: nom(s) de la zone (obligatoire)\n" " conditions: conditions évaluées pour le trigger\n" diff --git a/po/hu.po b/po/hu.po index 308e26882..975af95a4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -9254,8 +9254,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/it.po b/po/it.po index 539af7797..856626952 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -10283,8 +10283,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/ja.po b/po/ja.po index 7f8851a83..488cf1899 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -10355,8 +10355,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/pl.po b/po/pl.po index a0844f2ef..13f458ab1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -10540,8 +10540,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 749de3326..94d4b1bd8 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -9487,8 +9487,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/ru.po b/po/ru.po index 1877b6029..3a596994e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -9278,8 +9278,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/tr.po b/po/tr.po index b324a6dac..e3d5cecea 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2014-02-16 11:21+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -8326,8 +8326,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/po/weechat.pot b/po/weechat.pot index 83acc1419..6116a57a6 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-02-28 14:57+0100\n" +"POT-Creation-Date: 2014-03-01 17:21+0100\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -8277,8 +8277,7 @@ msgid "" " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" -" timer: interval (required), align on second (required), max " -"calls (required)\n" +" timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/src/plugins/trigger/trigger-command.c b/src/plugins/trigger/trigger-command.c index 315757f9d..4a6e5e1a8 100644 --- a/src/plugins/trigger/trigger-command.c +++ b/src/plugins/trigger/trigger-command.c @@ -915,8 +915,7 @@ trigger_command_init () " command: command (required), description, arguments, " "description of arguments, completion\n" " command_run: command (required)\n" - " timer: interval (required), align on second (required), " - "max calls (required)\n" + " timer: interval (required), align on second, max calls\n" " config: name of option (required)\n" " focus: name(s) of area (required)\n" " conditions: evaluated conditions for the trigger\n" diff --git a/src/plugins/trigger/trigger.c b/src/plugins/trigger/trigger.c index 4a580469a..d74c2dda4 100644 --- a/src/plugins/trigger/trigger.c +++ b/src/plugins/trigger/trigger.c @@ -365,14 +365,14 @@ trigger_hook (struct t_trigger *trigger) } break; case TRIGGER_HOOK_TIMER: - if (argv && (argc >= 3)) + if (argv && (argc >= 1)) { error1 = NULL; error2 = NULL; error3 = NULL; interval = strtol (argv[0], &error1, 10); - align_second = strtol (argv[1], &error2, 10); - max_calls = strtol (argv[2], &error3, 10); + align_second = strtol ((argc >= 2) ? argv[1] : "0", &error2, 10); + max_calls = strtol ((argc >= 3) ? argv[2] : "0", &error3, 10); if (error1 && !error1[0] && error2 && !error2[0] && error3 && !error3[0]