summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2014-01-13 16:09:01 +0100
committerSebastien Helleu <flashcode@flashtux.org>2014-01-13 16:09:01 +0100
commit31e1b28c9070f19ed6b58cd62d68db3668798818 (patch)
tree9134c161a50b0792d5854193725b048c5334b0a0
parenta8bb074fe714d62c43b68448dc809dba2c062850 (diff)
downloadweechat-31e1b28c9070f19ed6b58cd62d68db3668798818.zip
core: fix typo in /help weechat.look.highlight_regex
-rw-r--r--doc/de/autogen/user/weechat_options.txt2
-rw-r--r--doc/en/autogen/user/weechat_options.txt2
-rw-r--r--doc/en/weechat_plugin_api.en.txt2
-rw-r--r--doc/fr/autogen/user/weechat_options.txt2
-rw-r--r--doc/fr/weechat_plugin_api.fr.txt2
-rw-r--r--doc/it/autogen/user/weechat_options.txt2
-rw-r--r--doc/it/weechat_plugin_api.it.txt2
-rw-r--r--doc/ja/autogen/user/weechat_options.txt2
-rw-r--r--doc/ja/weechat_plugin_api.ja.txt5
-rw-r--r--doc/pl/autogen/user/weechat_options.txt2
-rw-r--r--po/cs.po8
-rw-r--r--po/de.po8
-rw-r--r--po/es.po8
-rw-r--r--po/fr.po18
-rw-r--r--po/hu.po8
-rw-r--r--po/it.po8
-rw-r--r--po/ja.po23
-rw-r--r--po/pl.po8
-rw-r--r--po/pt_BR.po8
-rw-r--r--po/ru.po8
-rw-r--r--po/tr.po8
-rw-r--r--po/weechat.pot8
-rw-r--r--src/core/wee-config.c8
-rw-r--r--src/core/wee-string.c4
24 files changed, 79 insertions, 77 deletions
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index de0b627c4..9bbb0f95c 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -539,7 +539,7 @@
** Werte: beliebige Zeichenkette (Standardwert: `""`)
* [[option_weechat.look.highlight_regex]] *weechat.look.highlight_regex*
-** Beschreibung: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by word chars (alphanumeric, "-", "_" or "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
+** Beschreibung: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by delimiters (chars different from: alphanumeric, "-", "_" and "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 472a2bfd2..df22664d3 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -539,7 +539,7 @@
** values: any string (default value: `""`)
* [[option_weechat.look.highlight_regex]] *weechat.look.highlight_regex*
-** description: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by word chars (alphanumeric, "-", "_" or "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
+** description: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by delimiters (chars different from: alphanumeric, "-", "_" and "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
** type: string
** values: any string (default value: `""`)
diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index 93844de12..523d68cf3 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -1174,7 +1174,7 @@ _WeeChat ≥ 0.3.4._
Check if a string has one or more highlights, using a POSIX extended regular
expression. +
For at least one match of regular expression on string, it must be surrounded
-by word chars (alphanumeric character, "-", "_" or "|").
+by delimiters (chars different from: alphanumeric, "-", "_" and "|").
Prototype:
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 0d2124d0e..000589914 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -539,7 +539,7 @@
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_weechat.look.highlight_regex]] *weechat.look.highlight_regex*
-** description: `expression régulière POSIX étendue utilisée pour vérifier si un message a un "highlight" ou non, au moins une correspondance dans la chaîne doit être entourée de caractères de mot (alphanumérique, "-", "_" ou "|"), l'expression régulière est insensible à la casse (utilisez "(?-i)" au début pour la rendre sensible à la casse), exemples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
+** description: `expression régulière POSIX étendue utilisée pour vérifier si un message a un "highlight" ou non, au moins une correspondance dans la chaîne doit être entourée de délimiteurs (caractères différents de: alphanumérique, "-", "_" et "|"), l'expression régulière est insensible à la casse (utilisez "(?-i)" au début pour la rendre sensible à la casse), exemples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt
index baa3ea70c..cbed6a89e 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -1190,7 +1190,7 @@ _WeeChat ≥ 0.3.4._
Vérifier si une chaîne a un ou plusieurs "highlights", en utilisant une
expression régulière POSIX étendue. +
Pour au moins une correspondance dans la chaîne, elle doit être entourée de
-caractères de mot (caractère alphanumérique, "-", "_" ou "|").
+délimiteurs (caractères différents de: alphanumérique, "-", "_" et "|").
Prototype :
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 987dff8e9..7a2c50a02 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -539,7 +539,7 @@
** valori: qualsiasi stringa (valore predefinito: `""`)
* [[option_weechat.look.highlight_regex]] *weechat.look.highlight_regex*
-** descrizione: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by word chars (alphanumeric, "-", "_" or "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
+** descrizione: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by delimiters (chars different from: alphanumeric, "-", "_" and "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
diff --git a/doc/it/weechat_plugin_api.it.txt b/doc/it/weechat_plugin_api.it.txt
index de4388e80..347e3b8f0 100644
--- a/doc/it/weechat_plugin_api.it.txt
+++ b/doc/it/weechat_plugin_api.it.txt
@@ -1204,7 +1204,7 @@ _WeeChat ≥ 0.3.4._
Check if a string has one or more highlights, using a POSIX extended regular
expression. +
For at least one match of regular expression on string, it must be surrounded
-by word chars (alphanumeric character, "-", "_" or "|").
+by delimiters (chars different from: alphanumeric, "-", "_" and "|").
Prototipo:
diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt
index 0379377ed..1860c6fb3 100644
--- a/doc/ja/autogen/user/weechat_options.txt
+++ b/doc/ja/autogen/user/weechat_options.txt
@@ -539,7 +539,7 @@
** 値: 未制約文字列 (デフォルト値: `""`)
* [[option_weechat.look.highlight_regex]] *weechat.look.highlight_regex*
-** 説明: `メッセージに含まれるハイライト箇所の有無を判断する POSIX 拡張正規表現、1 回以上マッチすればハイライトされる (英数字、"-"、"_"、"|")、正規表現は大文字小文字を区別しない (最初に "(?-i)" がある場合は区別する)、例: "flashcode|flashy"、"(?-i)FlashCode|flashy"`
+** 説明: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by delimiters (chars different from: alphanumeric, "-", "_" and "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
diff --git a/doc/ja/weechat_plugin_api.ja.txt b/doc/ja/weechat_plugin_api.ja.txt
index 5e875717b..d2d0fa627 100644
--- a/doc/ja/weechat_plugin_api.ja.txt
+++ b/doc/ja/weechat_plugin_api.ja.txt
@@ -1169,10 +1169,11 @@ highlight = weechat.string_has_highlight("my test string", "test,word2") # 1
_WeeChat バージョン 0.3.4 以上で利用可。_
+// TRANSLATION MISSING
POSIX 拡張正規表現を使って、文字列中から正規表現にマッチする部分が 1
つ以上あるか確認。 +
-文字列中から正規表現にマッチする部分が少なくとも 1 つ以上あるためには、マッチ部分は単語文字
-(アルファベット、"-"、"_"、"|") で囲まれていなければなりません。
+For at least one match of regular expression on string, it must be surrounded
+by delimiters (chars different from: alphanumeric, "-", "_" and "|").
プロトタイプ:
diff --git a/doc/pl/autogen/user/weechat_options.txt b/doc/pl/autogen/user/weechat_options.txt
index 22976218c..4e49e7899 100644
--- a/doc/pl/autogen/user/weechat_options.txt
+++ b/doc/pl/autogen/user/weechat_options.txt
@@ -539,7 +539,7 @@
** wartości: dowolny ciąg (domyślna wartość: `""`)
* [[option_weechat.look.highlight_regex]] *weechat.look.highlight_regex*
-** opis: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by word chars (alphanumeric, "-", "_" or "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
+** opis: `POSIX extended regular expression used to check if a message has highlight or not, at least one match in string must be surrounded by delimiters (chars different from: alphanumeric, "-", "_" and "|"), regular expression is case insensitive (use "(?-i)" at beginning to make it case sensitive), examples: "flashcode|flashy", "(?-i)FlashCode|flashy"`
** typ: ciąg
** wartości: dowolny ciąg (domyślna wartość: `""`)
diff --git a/po/cs.po b/po/cs.po
index dcf77cf0b..89b6b7df3 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:16+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2740,9 +2740,9 @@ msgstr ""
#, fuzzy
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
"regulární výraz pro zkontrolování zda má zpráva být zvýrazněna nebo ne, "
diff --git a/po/de.po b/po/de.po
index ed05ab62f..0cd6498f8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.3-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:16+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -3164,9 +3164,9 @@ msgstr ""
#, fuzzy
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
"Suchmuster (regulärer Ausdruck) welches genutzt werden soll, um zu "
diff --git a/po/es.po b/po/es.po
index 060f71615..4d0969d51 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:16+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2898,9 +2898,9 @@ msgstr ""
#, fuzzy
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
"expresión regular usada para ver si un mensaje tiene un resalte o no, al "
diff --git a/po/fr.po b/po/fr.po
index e746c6cb3..6b990b099 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-01-09 16:10+0100\n"
-"PO-Revision-Date: 2014-01-09 17:02+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
+"PO-Revision-Date: 2014-01-13 15:41+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -3069,17 +3069,17 @@ msgstr ""
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
"expression régulière POSIX étendue utilisée pour vérifier si un message a un "
"\"highlight\" ou non, au moins une correspondance dans la chaîne doit être "
-"entourée de caractères de mot (alphanumérique, \"-\", \"_\" ou \"|\"), "
-"l'expression régulière est insensible à la casse (utilisez \"(?-i)\" au "
-"début pour la rendre sensible à la casse), exemples: \"flashcode|flashy\", "
-"\"(?-i)FlashCode|flashy\""
+"entourée de délimiteurs (caractères différents de: alphanumérique, \"-\", \"_"
+"\" et \"|\"), l'expression régulière est insensible à la casse (utilisez "
+"\"(?-i)\" au début pour la rendre sensible à la casse), exemples: "
+"\"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgid ""
"comma separated list of tags to highlight; case insensitive comparison; each "
diff --git a/po/hu.po b/po/hu.po
index 26af8be6c..01d450c2f 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:16+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2386,9 +2386,9 @@ msgstr ""
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
diff --git a/po/it.po b/po/it.po
index 7b2ec41fa..92cceb1c1 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:16+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2986,9 +2986,9 @@ msgstr ""
#, fuzzy
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
"espressione regolare usata per verificare se un messaggio contiene una "
diff --git a/po/ja.po b/po/ja.po
index 573e2f34b..a118b2c20 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-13 10:55+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -366,11 +366,11 @@ msgid "color"
msgstr "色"
msgid ""
-"a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)"
-"green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal "
-"color number or an alias; attributes are allowed before color (for text "
-"color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" for "
-"italic, \"_\" for underline"
+"a WeeChat color name (default, black, (dark)gray, white, (light)red, "
+"(light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a "
+"terminal color number or an alias; attributes are allowed before color (for "
+"text color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" "
+"for italic, \"_\" for underline"
msgstr ""
"WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、"
"brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号ま"
@@ -2979,11 +2979,12 @@ msgstr ""
"に \"(?-i)\" をつければ区別有り)、部分マッチさせるには単語の最初か最後に \"*"
"\" をつける; 例: \"test,(?-i)*toto*,flash*\""
+#, fuzzy
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
"メッセージに含まれるハイライト箇所の有無を判断する POSIX 拡張正規表現、1 回以"
@@ -5250,8 +5251,8 @@ msgstr ""
" - 内部サーバ名 (/server add で作成されたもの、利用推奨)\n"
" - ホスト名/ポート番号、又は IP アドレス/ポート番号 (これは一時的"
"サーバを作る)、デフォルトのポート番号は 6667\n"
-" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:password]@]"
-"irc.example.org[:port][/#channel1][,#channel2[...]]\n"
+" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:"
+"password]@]irc.example.org[:port][/#channel1][,#channel2[...]]\n"
" option: サーバに関するオプション (ブール型オプションでは、value は無視さ"
"れる)\n"
" nooption: ブール型オプションを 'off' にする (例: -nossl)\n"
diff --git a/po/pl.po b/po/pl.po
index a9128c792..9eef45e11 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:17+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3052,9 +3052,9 @@ msgstr ""
#, fuzzy
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
"wyrażenie regularne używane do sprawdzenia, czy wiadomość posiada "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index abed99ef8..8400807da 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:17+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2824,9 +2824,9 @@ msgstr ""
#, fuzzy
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
"expressão regular usada para verificar se a mensagem tem destaque ou não, "
diff --git a/po/ru.po b/po/ru.po
index 7b87ca62c..6f1fdbc3c 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:17+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2409,9 +2409,9 @@ msgstr ""
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 8dc8b2375..bb8d7a89a 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+0100\n"
"PO-Revision-Date: 2014-01-06 10:17+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2143,9 +2143,9 @@ msgstr ""
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 4ed4ff7b6..e7b1d068d 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-01-09 16:10+0100\n"
+"POT-Creation-Date: 2014-01-13 15:40+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"
@@ -2146,9 +2146,9 @@ msgstr ""
msgid ""
"POSIX extended regular expression used to check if a message has highlight "
-"or not, at least one match in string must be surrounded by word chars "
-"(alphanumeric, \"-\", \"_\" or \"|\"), regular expression is case "
-"insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
+"or not, at least one match in string must be surrounded by delimiters (chars "
+"different from: alphanumeric, \"-\", \"_\" and \"|\"), regular expression is "
+"case insensitive (use \"(?-i)\" at beginning to make it case sensitive), "
"examples: \"flashcode|flashy\", \"(?-i)FlashCode|flashy\""
msgstr ""
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 34ded8019..02bdc6fa4 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -2226,10 +2226,10 @@ config_weechat_init_options ()
"highlight_regex", "string",
N_("POSIX extended regular expression used to check if a message has "
"highlight or not, at least one match in string must be surrounded "
- "by word chars (alphanumeric, \"-\", \"_\" or \"|\"), regular "
- "expression is case insensitive (use \"(?-i)\" at beginning to make "
- "it case sensitive), examples: \"flashcode|flashy\", "
- "\"(?-i)FlashCode|flashy\""),
+ "by delimiters (chars different from: alphanumeric, \"-\", \"_\" "
+ "and \"|\"), regular expression is case insensitive (use \"(?-i)\" "
+ "at beginning to make it case sensitive), examples: "
+ "\"flashcode|flashy\", \"(?-i)FlashCode|flashy\""),
NULL, 0, 0, "", NULL, 0, NULL, NULL, &config_change_highlight_regex, NULL, NULL, NULL);
config_look_highlight_tags = config_file_new_option (
weechat_config_file, ptr_section,
diff --git a/src/core/wee-string.c b/src/core/wee-string.c
index b9bf36850..bfd1105f0 100644
--- a/src/core/wee-string.c
+++ b/src/core/wee-string.c
@@ -985,7 +985,7 @@ string_has_highlight (const char *string, const char *highlight_words)
/*
* Checks if a string has a highlight using a compiled regular expression (any
- * match in string must be surrounded by word chars).
+ * match in string must be surrounded by delimiters).
*/
int
@@ -1034,7 +1034,7 @@ string_has_highlight_regex_compiled (const char *string, regex_t *regex)
/*
* Checks if a string has a highlight using a regular expression (any match in
- * string must be surrounded by word chars).
+ * string must be surrounded by delimiters).
*/
int