charset: fix /help charset.default.decode

The charset is used only when the message is not UTF-8 valid.

19 files changed, 48 insertions, 47 deletions

diff --git a/doc/de/autogen/user/charset_options.txt b/doc/de/autogen/user/charset_options.txt
index fd3a96e76..f56bc067e 100644
--- a/doc/de/autogen/user/charset_options.txt
+++ b/doc/de/autogen/user/charset_options.txt
@@ -1,5 +1,5 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** Beschreibung: `globale Zeichendekodierung: Zeichendekodierung die für eingehende Nachrichten genutzt werden soll (sollte keine Zeichendekodierung angegeben werden, wird UTF-8 verwendet, da WeeChat UTF-8 zur internen Dekodierung nutzt)`
+** Beschreibung: `global decoding charset: charset used to decode incoming messages when they are not UTF-8 valid`
 ** Typ: Zeichenkette
 ** Werte: beliebige Zeichenkette (Standardwert: `"iso-8859-1"`)
 
diff --git a/doc/en/autogen/user/charset_options.txt b/doc/en/autogen/user/charset_options.txt
index b17707e26..334dd145b 100644
--- a/doc/en/autogen/user/charset_options.txt
+++ b/doc/en/autogen/user/charset_options.txt
@@ -1,5 +1,5 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** description: `global decoding charset: charset used to decode incoming messages (if decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)`
+** description: `global decoding charset: charset used to decode incoming messages when they are not UTF-8 valid`
 ** type: string
 ** values: any string (default value: `"iso-8859-1"`)
 
diff --git a/doc/fr/autogen/user/charset_options.txt b/doc/fr/autogen/user/charset_options.txt
index cf06f7d75..9686159e9 100644
--- a/doc/fr/autogen/user/charset_options.txt
+++ b/doc/fr/autogen/user/charset_options.txt
@@ -1,5 +1,5 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** description: `charset de décodage global: charset utilisé pour décoder les messages entrants (si le décodage échoue, par défaut UTF-8 sera utilisé car c'est le charset interne de WeeChat)`
+** description: `charset de décodage global: charset utilisé pour décoder les messages entrants lorsqu'ils ne sont pas valides UTF-8`
 ** type: chaîne
 ** valeurs: toute chaîne (valeur par défaut: `"iso-8859-1"`)
 
diff --git a/doc/it/autogen/user/charset_options.txt b/doc/it/autogen/user/charset_options.txt
index 7a7ecf630..abff52db0 100644
--- a/doc/it/autogen/user/charset_options.txt
+++ b/doc/it/autogen/user/charset_options.txt
@@ -1,5 +1,5 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** descrizione: `global decoding charset: charset used to decode incoming messages (if decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)`
+** descrizione: `global decoding charset: charset used to decode incoming messages when they are not UTF-8 valid`
 ** tipo: stringa
 ** valori: qualsiasi stringa (valore predefinito: `"iso-8859-1"`)
 
diff --git a/doc/ja/autogen/user/charset_options.txt b/doc/ja/autogen/user/charset_options.txt
index e6a08e927..704888d4d 100644
--- a/doc/ja/autogen/user/charset_options.txt
+++ b/doc/ja/autogen/user/charset_options.txt
@@ -1,5 +1,5 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** 説明: `グローバルデコード文字セット: 受信メッセージをデコードする文字セット (デコードに失敗した場合、UTF-8 でデコードされます。UTF-8 は WeeChat の内部文字セットです)`
+** 説明: `global decoding charset: charset used to decode incoming messages when they are not UTF-8 valid`
 ** タイプ: 文字列
 ** 値: 未制約文字列 (デフォルト値: `"iso-8859-1"`)
 
diff --git a/doc/pl/autogen/user/charset_options.txt b/doc/pl/autogen/user/charset_options.txt
index 318dbf3c2..cbfc98409 100644
--- a/doc/pl/autogen/user/charset_options.txt
+++ b/doc/pl/autogen/user/charset_options.txt
@@ -1,5 +1,5 @@
 * [[option_charset.default.decode]] *charset.default.decode*
-** opis: `globalne dekodowanie: kodowanie użyte do dekodowania przychodzących wiadomości (jeśli się nie powiedzie, zostanie przywrócone UTF-8, ponieważ jest to domyślne kodowanie w WeeChat)`
+** opis: `global decoding charset: charset used to decode incoming messages when they are not UTF-8 valid`
 ** typ: ciąg
 ** wartości: dowolny ciąg (domyślna wartość: `"iso-8859-1"`)
 
diff --git a/po/cs.po b/po/cs.po
index 6c200458f..31b4ab748 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4518,8 +4518,8 @@ msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s%s: chyba vytváření znakové sady \"%s\" => \"%s\""
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 
 msgid ""
diff --git a/po/de.po b/po/de.po
index 24bde732f..331f33caa 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 21:06+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -5236,9 +5236,10 @@ msgstr ""
 msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s%s: Fehler bei der Erstellung des Zeichensatzes \"%s\" => \"%s\""
 
+#, fuzzy
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 "globale Zeichendekodierung: Zeichendekodierung die für eingehende "
 "Nachrichten genutzt werden soll (sollte keine Zeichendekodierung angegeben "
diff --git a/po/es.po b/po/es.po
index b5213f84f..1b66bab62 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4732,8 +4732,8 @@ msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s%s: error al crear el set de caracteres \"%s\" => \"%s\""
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 
 msgid ""
diff --git a/po/fr.po b/po/fr.po
index f7f2c71cd..c770d6a4b 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-04-12 13:23+0200\n"
-"PO-Revision-Date: 2014-04-12 13:24+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
+"PO-Revision-Date: 2014-04-12 17:30+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -5108,12 +5108,11 @@ msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s%s: erreur en création du charset \"%s\" => \"%s\""
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 "charset de décodage global: charset utilisé pour décoder les messages "
-"entrants (si le décodage échoue, par défaut UTF-8 sera utilisé car c'est le "
-"charset interne de WeeChat)"
+"entrants lorsqu'ils ne sont pas valides UTF-8"
 
 msgid ""
 "global encoding charset: charset used to encode outgoing messages (if empty, "
diff --git a/po/hu.po b/po/hu.po
index 70cc939d8..a3dac68cb 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4109,8 +4109,8 @@ msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s nincs elég memória az információs pult üzenethez\n"
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 
 msgid ""
diff --git a/po/it.po b/po/it.po
index 53b07d1db..990d2b0bd 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4871,8 +4871,8 @@ msgstr ""
 "%s%s: errore durante la creazione del set di caratteri \"%s\" => \"%s\""
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 
 msgid ""
diff --git a/po/ja.po b/po/ja.po
index 5e6cd5c2d..b535e09fb 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -4897,9 +4897,10 @@ msgstr ""
 msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s%s: 文字集合 \"%s\" => \"%s\" の作成中にエラー"
 
+#, fuzzy
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 "グローバルデコード文字セット: 受信メッセージをデコードする文字セット (デコー"
 "ドに失敗した場合、UTF-8 でデコードされます。UTF-8 は WeeChat の内部文字セット"
diff --git a/po/pl.po b/po/pl.po
index f72211a39..93c7f5191 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4986,9 +4986,10 @@ msgstr ""
 msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s%s: błąd przy tworzeniu zestawu znaków (kodowania) \"%s\" => \"%s\""
 
+#, fuzzy
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 "globalne dekodowanie: kodowanie użyte do dekodowania przychodzących "
 "wiadomości (jeśli się nie powiedzie, zostanie przywrócone UTF-8, ponieważ "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 94778898b..c9811a8c7 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4578,8 +4578,8 @@ msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s%s: erro ao criar charset \"%s\" => \"%s\""
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 
 msgid ""
diff --git a/po/ru.po b/po/ru.po
index 894ddeab9..694b4d113 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-04-05 16:12+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4142,8 +4142,8 @@ msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr "%s недостаточно памяти для сообщения в строке информации\n"
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 
 msgid ""
diff --git a/po/tr.po b/po/tr.po
index dccbc62df..20c7c3488 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\n"
 "PO-Revision-Date: 2014-03-24 14:23+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3701,8 +3701,8 @@ msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr ""
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 
 msgid ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 2fbeafd10..27793f61b 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-04-12 13:23+0200\n"
+"POT-Creation-Date: 2014-04-12 17:30+0200\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"
@@ -3703,8 +3703,8 @@ msgid "%s%s: error creating charset \"%s\" => \"%s\""
 msgstr ""
 
 msgid ""
-"global decoding charset: charset used to decode incoming messages (if "
-"decoding fails, fallback is UTF-8 because it is the WeeChat internal charset)"
+"global decoding charset: charset used to decode incoming messages when they "
+"are not UTF-8 valid"
 msgstr ""
 
 msgid ""
diff --git a/src/plugins/charset/charset.c b/src/plugins/charset/charset.c
index f9bd8d71d..b16252c1f 100644
--- a/src/plugins/charset/charset.c
+++ b/src/plugins/charset/charset.c
@@ -213,8 +213,7 @@ charset_config_init ()
         charset_config_file, ptr_section,
         "decode", "string",
         N_("global decoding charset: charset used to decode incoming messages "
-           "(if decoding fails, fallback is UTF-8 because it is the WeeChat "
-           "internal charset)"),
+           "when they are not UTF-8 valid"),
         NULL, 0, 0,
         (charset_terminal && charset_internal
          && (weechat_strcasecmp (charset_terminal,