diff options
-rw-r--r-- | po/cs.po | 7 | ||||
-rw-r--r-- | po/de.po | 7 | ||||
-rw-r--r-- | po/es.po | 7 | ||||
-rw-r--r-- | po/fr.po | 17 | ||||
-rw-r--r-- | po/hu.po | 7 | ||||
-rw-r--r-- | po/it.po | 7 | ||||
-rw-r--r-- | po/ja.po | 7 | ||||
-rw-r--r-- | po/pl.po | 7 | ||||
-rw-r--r-- | po/pt_BR.po | 7 | ||||
-rw-r--r-- | po/ru.po | 7 | ||||
-rw-r--r-- | po/tr.po | 7 | ||||
-rw-r--r-- | po/weechat.pot | 7 | ||||
-rw-r--r-- | src/plugins/trigger/trigger-config.c | 6 | ||||
-rw-r--r-- | src/plugins/trigger/trigger.c | 2 |
14 files changed, 44 insertions, 58 deletions
@@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:24+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9987,9 +9987,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:24+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -11128,9 +11128,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10251,9 +10251,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" -"PO-Revision-Date: 2014-03-02 08:15+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" +"PO-Revision-Date: 2014-03-02 08:36+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -10951,9 +10951,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" "remplacer du texte avec une expression régulière POSIX étendue (cela est " "fait seulement si les conditions sont OK, et avant d'exécuter la commande) " @@ -10962,10 +10961,10 @@ msgstr "" "de hachage à remplacer, elle est facultative), plusieurs expressions " "régulières peuvent être séparées par un espace, par exemple: \"/regex1/" "replace1/var1 /regex2/replace2/var2\"; le séparateur \"/\" peut être " -"remplacé par n'importe quel caractère (un ou plusieurs identiques), sauf " -"'\\' et les parenthèses; les groupes de correspondance peuvent être utilisés " -"dans le remplacement: $0 à $99, $+ pour le dernier groupe et $.cN pour " -"remplacer tous les caractères du groupe N par c" +"remplacé par n'importe quel caractère (un ou plusieurs identiques); les " +"groupes de correspondance peuvent être utilisés dans le remplacement: $0 à " +"$99, $+ pour le dernier groupe et $.cN pour remplacer tous les caractères du " +"groupe N par c" msgid "" "command(s) to run if conditions are OK, after regex replacements (many " @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9388,9 +9388,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10417,9 +10417,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/WeeChat>\n" @@ -10489,9 +10489,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -10674,9 +10674,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7653c522a..4cb62bec4 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-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9620,9 +9620,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-20 12:25+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9412,9 +9412,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2014-02-16 11:21+0100\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8458,9 +8458,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" diff --git a/po/weechat.pot b/po/weechat.pot index fef2e6fc4..1fa35baeb 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-03-02 08:13+0100\n" +"POT-Creation-Date: 2014-03-02 08:35+0100\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8403,9 +8403,8 @@ msgid "" "var\" (var is the hashtable variable to replace, it is optional), many regex " "can be separated by a space, for example: \"/regex1/replace1/var1 /regex2/" "replace2/var2\"; the separator \"/\" can be replaced by any char (one or " -"more identical chars), except '\\' and parentheses; matching groups can be " -"used in replace: $0 to $99, $+ for last match and $.cN to replace all chars " -"of group N by char c" +"more identical chars); matching groups can be used in replace: $0 to $99, $+ " +"for last match and $.cN to replace all chars of group N by char c" msgstr "" msgid "" diff --git a/src/plugins/trigger/trigger-config.c b/src/plugins/trigger/trigger-config.c index ff158a440..970929d77 100644 --- a/src/plugins/trigger/trigger-config.c +++ b/src/plugins/trigger/trigger-config.c @@ -310,9 +310,9 @@ trigger_config_create_trigger_option (const char *trigger_name, int index_option "many regex can be separated by a space, for example: " "\"/regex1/replace1/var1 /regex2/replace2/var2\"; the " "separator \"/\" can be replaced by any char (one or more " - "identical chars), except '\\' and parentheses; matching " - "groups can be used in replace: $0 to $99, $+ for last " - "match and $.cN to replace all chars of group N by char c"), + "identical chars); matching groups can be used in replace: " + "$0 to $99, $+ for last match and $.cN to replace all chars " + "of group N by char c"), NULL, 0, 0, value, NULL, 0, NULL, NULL, &trigger_config_change_trigger_regex, NULL, NULL, NULL); break; diff --git a/src/plugins/trigger/trigger.c b/src/plugins/trigger/trigger.c index 45953dcb1..acb5bb4e1 100644 --- a/src/plugins/trigger/trigger.c +++ b/src/plugins/trigger/trigger.c @@ -534,8 +534,6 @@ trigger_regex_split (const char *str_regex, delimiter = weechat_strndup (ptr_regex, pos - ptr_regex); if (!delimiter) goto memory_error; - if ((strcmp (delimiter, "\\") == 0) || (strcmp (delimiter, "(") == 0)) - goto format_error; length_delimiter = strlen (delimiter); |