summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/cs.po20
-rw-r--r--po/de.po22
-rw-r--r--po/es.po20
-rw-r--r--po/fr.po21
-rw-r--r--po/hu.po12
-rw-r--r--po/it.po21
-rw-r--r--po/pl.po19
-rw-r--r--po/pt_BR.po20
-rw-r--r--po/ru.po12
-rw-r--r--po/weechat.pot8
-rw-r--r--src/core/wee-config-file.c30
11 files changed, 122 insertions, 83 deletions
diff --git a/po/cs.po b/po/cs.po
index 150e70f54..44d3ffe4a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: 2011-11-03 16:57+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2945,17 +2945,18 @@ msgstr "%sUpozornění: %s, řádek %d: nevalidní syntaxe, chybí \"]\""
msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr "%sUpozornění: %s, řádek %d: neznámý identifikátor sekce (\"%s\")"
-#, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr ""
"%sUpozornění: %s, řádek %d: nastavení \"%s\" je neznámé pro sekci \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
-msgstr "%sUpozornění: %s, řádek %d: neznámé nastavení \"%s\" (mimo sekci)"
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: option outside section: %s"
+msgstr ""
+"%sUpozornění: %s, řádek %d: nastavení \"%s\" je neznámé pro sekci \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr "%sUpozornění: %s, řádek %d: nevalidní hodnota pro nastavení \"%s\""
#, c-format
@@ -8148,5 +8149,8 @@ msgstr ""
msgid "Lists"
msgstr ""
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr "%sUpozornění: %s, řádek %d: neznámé nastavení \"%s\" (mimo sekci)"
+
#~ msgid "condition(s) for displaying bar (for bars of type \"window\")"
#~ msgstr "podmínka/podmínky pro zobrazení pole (pro pole typu \"window\")"
diff --git a/po/de.po b/po/de.po
index 20a8354b2..cb6fa4689 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: 2011-11-03 16:57+0100\n"
"Last-Translator: Nils Görs\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3213,17 +3213,16 @@ msgstr "%sWarnung: %s, Zeile %d: Syntaxfehler, \"]\" erwartet"
msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr "%sWarnung: %s, Zeile %d: unbekannte Sektion (\"%s\")"
-#, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr "%sWarnung: %s, Zeile %d: Option \"%s\" unbekannte Sektion \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
-msgstr ""
-"%sWarnung: %s, Zeile %d: unbekannte Option \"%s\" (außerhalb einer Sektion)"
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: option outside section: %s"
+msgstr "%sWarnung: %s, Zeile %d: Option \"%s\" unbekannte Sektion \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr "%sWarnung: %s, Zeile %d: ungültige Wert für Option \"%s\""
#, c-format
@@ -8582,6 +8581,11 @@ msgstr "Variablen"
msgid "Lists"
msgstr "Listen"
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr ""
+#~ "%sWarnung: %s, Zeile %d: unbekannte Option \"%s\" (außerhalb einer "
+#~ "Sektion)"
+
#~ msgid "condition(s) for displaying bar (for bars of type \"window\")"
#~ msgstr ""
#~ "Bedingung(en) für die Darstellung von Infobar(s) (für Infobars des Typs "
diff --git a/po/es.po b/po/es.po
index d9b766d38..b94045851 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: 2011-11-03 16:57+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3104,18 +3104,18 @@ msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr ""
"%sAtención: %s, línea %d: identificador de sección desconocido (\"%s\")"
-#, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr ""
"%sAtención: %s, línea %d: opción \"%s\" desconocida para la sección \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: option outside section: %s"
msgstr ""
-"%sAtención: %s, línea %d: opción desconocida \"%s\" (fuera de la sección)"
+"%sAtención: %s, línea %d: opción \"%s\" desconocida para la sección \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr "%sAtención: %s, línea %d: valor inválido para la opción \"%s\""
#, c-format
@@ -8361,6 +8361,10 @@ msgstr "Variables"
msgid "Lists"
msgstr "Listas"
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr ""
+#~ "%sAtención: %s, línea %d: opción desconocida \"%s\" (fuera de la sección)"
+
#~ msgid "condition(s) for displaying bar (for bars of type \"window\")"
#~ msgstr ""
#~ "condicion(es) para mostrar la barra (para barras del tipo \"window\""
diff --git a/po/fr.po b/po/fr.po
index dffbdefe7..f3c9fbe52 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
-"PO-Revision-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
+"PO-Revision-Date: 2011-11-05 16:04+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -3129,17 +3129,16 @@ msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr "%sAttention: %s, ligne %d: section inconnue (\"%s\")"
#, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
-msgstr ""
-"%sAttention: %s, ligne %d: option \"%s\" inconnue pour la section \"%s\""
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
+msgstr "%sAttention: %s, ligne %d: option inconnue pour la section \"%s\": %s"
#, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
-msgstr "%sAttention: %s, ligne %d: option \"%s\" inconnue (hors d'une section)"
+msgid "%sWarning: %s, line %d: option outside section: %s"
+msgstr "%sAttention: %s, ligne %d: option en dehors de la section: %s"
#, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
-msgstr "%sAttention: %s, ligne %d: valeur invalide pour l'option \"%s\""
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
+msgstr "%sAttention: %s, ligne %d: valeur invalide pour l'option: %s"
#, c-format
msgid "Reloading configuration file %s"
@@ -8417,6 +8416,10 @@ msgstr "Variables"
msgid "Lists"
msgstr "Listes"
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr ""
+#~ "%sAttention: %s, ligne %d: option \"%s\" inconnue (hors d'une section)"
+
#~ msgid "condition(s) for displaying bar (for bars of type \"window\")"
#~ msgstr ""
#~ "condition(s) pour afficher la barre (pour les barres de type \"window\")"
diff --git a/po/hu.po b/po/hu.po
index 1977e814b..483ac9df7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: 2011-10-22 12:21+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2614,15 +2614,15 @@ msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr "%s %s, %d. sor: ismeretlen csoportazonosító (\"%s\")\n"
#, fuzzy, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr "%s %s, %d. sor: ismeretlen csoportazonosító (\"%s\")\n"
#, fuzzy, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+msgid "%sWarning: %s, line %d: option outside section: %s"
msgstr "%s %s, %d. sor: ismeretlen csoportazonosító (\"%s\")\n"
#, fuzzy, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr "%s %s, %d. sor: érvénytelen opció: \"%s\"\n"
#, fuzzy, c-format
@@ -7680,3 +7680,7 @@ msgstr ""
msgid "Lists"
msgstr ""
+
+#, fuzzy
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr "%s %s, %d. sor: ismeretlen csoportazonosító (\"%s\")\n"
diff --git a/po/it.po b/po/it.po
index baae167e9..f10a6ab3a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: 2011-11-03 16:57+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3102,18 +3102,18 @@ msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr ""
"%sAttenzione: %s, riga %d: identificatore di sezione sconosciuto (\"%s\")"
-#, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr ""
"%sAttenzione: %s, riga %d: opzione \"%s\" sconosciuta per la sezione \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: option outside section: %s"
msgstr ""
-"%sAttenzione: %s, riga %d: opzione \"%s\" sconosciuta (fuori dalla sezione)"
+"%sAttenzione: %s, riga %d: opzione \"%s\" sconosciuta per la sezione \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr "%sAttenzione: %s, riga %d: valore non valido per l'opzione \"%s\""
#, c-format
@@ -8332,6 +8332,11 @@ msgstr "Variabili"
msgid "Lists"
msgstr "Liste"
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr ""
+#~ "%sAttenzione: %s, riga %d: opzione \"%s\" sconosciuta (fuori dalla "
+#~ "sezione)"
+
#~ msgid "condition(s) for displaying bar (for bars of type \"window\")"
#~ msgstr ""
#~ "condizione(i) per la visualizzazione della barra (barre di tipo \"window"
diff --git a/po/pl.po b/po/pl.po
index c5ef7df95..c62d840c0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: 2011-11-03 16:57+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3094,16 +3094,16 @@ msgstr "%sOstrzeżenie: %s, w linii %d: błędna składnia, brakuje \"]\""
msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr "%sOstrzeżenie: %s, w linii %d: nieznany identyfikator sekcji (\"%s\")"
-#, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr "%sOstrzeżenie: %s, w linii %d: nieznana opcja \"%s\" dla sekcji \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
-msgstr "%sOstrzeżenie: %s, w linii %d: nieznana opcja \"%s\" (poza sekcją)"
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: option outside section: %s"
+msgstr "%sOstrzeżenie: %s, w linii %d: nieznana opcja \"%s\" dla sekcji \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr "%sOstrzeżenie: %s, w linii %d: nieprawidłowa wartość opcji \"%s\""
#, c-format
@@ -8270,5 +8270,8 @@ msgstr "Zmienne"
msgid "Lists"
msgstr "Listy"
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr "%sOstrzeżenie: %s, w linii %d: nieznana opcja \"%s\" (poza sekcją)"
+
#~ msgid "condition(s) for displaying bar (for bars of type \"window\")"
#~ msgstr "warunek(i) wyświetlenia paska (dla pasków o typie \"window\")"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0504249f6..be9f0a26d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: 2011-11-03 16:58+0100\n"
"Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3058,16 +3058,16 @@ msgstr "%sAviso: %s, linha %d: sintaxe inválida, faltando \"]\""
msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr "%sAviso: %s, linha %d: identificador de seção desconhecido (\"%s\")"
-#, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr "%sAviso: %s, linha %d: opção \"%s\" desconhecido para seção \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
-msgstr "%sAviso: %s, linha %d: opção desconhedica \"%s\" (fora de uma seção)"
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: option outside section: %s"
+msgstr "%sAviso: %s, linha %d: opção \"%s\" desconhecido para seção \"%s\""
-#, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+#, fuzzy, c-format
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr "%sAviso: %s, linha %d: valor inválido para opção \"%s\""
#, c-format
@@ -7569,3 +7569,7 @@ msgstr ""
msgid "Lists"
msgstr ""
+
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr ""
+#~ "%sAviso: %s, linha %d: opção desconhedica \"%s\" (fora de uma seção)"
diff --git a/po/ru.po b/po/ru.po
index 02e01f44a..edf12296a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: 2011-10-22 12:21+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2628,15 +2628,15 @@ msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr "%s %s, строка %d: неизвестный идентификатор секции (\"%s\")\n"
#, fuzzy, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr "%s %s, строка %d: неизвестный идентификатор секции (\"%s\")\n"
#, fuzzy, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+msgid "%sWarning: %s, line %d: option outside section: %s"
msgstr "%s %s, строка %d: неизвестный идентификатор секции (\"%s\")\n"
#, fuzzy, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr "%s %s, строка %d: некорректный параметр \"%s\"\n"
#, fuzzy, c-format
@@ -7688,3 +7688,7 @@ msgstr ""
msgid "Lists"
msgstr ""
+
+#, fuzzy
+#~ msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+#~ msgstr "%s %s, строка %d: неизвестный идентификатор секции (\"%s\")\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index c74e85844..ce541c1c6 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: 2011-11-05 11:34+0100\n"
+"POT-Creation-Date: 2011-11-05 16:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2277,15 +2277,15 @@ msgid "%sWarning: %s, line %d: unknown section identifier (\"%s\")"
msgstr ""
#, c-format
-msgid "%sWarning: %s, line %d: option \"%s\" unknown for section \"%s\""
+msgid "%sWarning: %s, line %d: unknown option for section \"%s\": %s"
msgstr ""
#, c-format
-msgid "%sWarning: %s, line %d: unknown option \"%s\" (outside a section)"
+msgid "%sWarning: %s, line %d: option outside section: %s"
msgstr ""
#, c-format
-msgid "%sWarning: %s, line %d: invalid value for option \"%s\""
+msgid "%sWarning: %s, line %d: invalid value for option: %s"
msgstr ""
#, c-format
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index 4cdcb4123..6bb3673be 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -2111,14 +2111,14 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
/* encode line to internal charset */
ptr_line2 = string_iconv_to_internal (NULL, ptr_line);
if (ptr_line2)
- {
snprintf (line, sizeof (line) - 1, "%s", ptr_line2);
- free (ptr_line2);
- }
/* skip spaces */
while (ptr_line[0] == ' ')
+ {
ptr_line++;
+ }
+
/* not a comment and not an empty line */
if ((ptr_line[0] != '#') && (ptr_line[0] != '\r')
&& (ptr_line[0] != '\n'))
@@ -2255,32 +2255,36 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
if (ptr_section)
gui_chat_printf (NULL,
_("%sWarning: %s, line %d: "
- "option \"%s\" "
- "unknown for "
- "section \"%s\""),
+ "unknown option for section "
+ "\"%s\": %s"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
filename, line_number,
- line, ptr_section->name);
+ ptr_section->name,
+ ptr_line2);
else
gui_chat_printf (NULL,
_("%sWarning: %s, line %d: "
- "unknown option \"%s\" "
- "(outside a section)"),
+ "option outside section: "
+ "%s"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
filename, line_number,
- line);
+ ptr_line2);
break;
case WEECHAT_CONFIG_OPTION_SET_ERROR:
gui_chat_printf (NULL,
_("%sWarning: %s, line %d: "
- "invalid value for option "
- "\"%s\""),
+ "invalid value for option: "
+ "%s"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
- filename, line_number, line);
+ filename, line_number,
+ ptr_line2);
break;
}
}
}
+
+ if (ptr_line2)
+ free (ptr_line2);
}
}