From d3a37ea948c4c74e1c32267c6c4701475ff87a5a Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sat, 17 Dec 2011 18:42:27 +0100 Subject: [PATCH] core: display an error and do nothing for command "/unset *" --- po/cs.po | 6 +++++- po/de.po | 6 +++++- po/es.po | 6 +++++- po/fr.po | 8 ++++++-- po/hu.po | 6 +++++- po/it.po | 6 +++++- po/pl.po | 6 +++++- po/pt_BR.po | 6 +++++- po/ru.po | 6 +++++- po/weechat.pot | 6 +++++- src/core/wee-command.c | 7 +++++++ 11 files changed, 58 insertions(+), 11 deletions(-) diff --git a/po/cs.po b/po/cs.po index 8b83bb99e..4c59d41e1 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: 2011-11-03 16:57+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -719,6 +719,10 @@ msgstr "Volba vytvořena: " msgid "Option changed" msgstr "Volba změněna" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%sSelhalo odnastavení volby \"%s\"" diff --git a/po/de.po b/po/de.po index cbbb672ed..0c5d63759 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: 2011-11-08 22:03+0100\n" "Last-Translator: Nils Görs\n" "Language-Team: weechat-dev \n" @@ -732,6 +732,10 @@ msgstr "Option erstellt: " msgid "Option changed" msgstr "Option geändert" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%sOption \"%s\" konnte nicht zurück gesetzt werden" diff --git a/po/es.po b/po/es.po index ceba7c9d5..decc2a87e 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: 2011-11-03 16:57+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -718,6 +718,10 @@ msgstr "Opción creada: " msgid "Option changed" msgstr "Opción cambiada" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%sNo se pudo deshacer la opción \"%s\"" diff --git a/po/fr.po b/po/fr.po index 923a830cc..9dea60cc1 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-12-17 18:30+0100\n" -"PO-Revision-Date: 2011-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" +"PO-Revision-Date: 2011-12-17 18:40+0100\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -722,6 +722,10 @@ msgstr "Option créée: " msgid "Option changed" msgstr "Option modifiée" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "%sLa réinitialisation de toutes les options n'est pas autorisée" + #, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%sImpossible de supprimer/réinitialiser l'option \"%s\"" diff --git a/po/hu.po b/po/hu.po index 255a61142..be69b5047 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: 2011-10-22 12:21+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -758,6 +758,10 @@ msgstr "nincs a szobában" msgid "Option changed" msgstr "nincs a szobában" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, fuzzy, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%s nem sikerült a modul opciókat elmenteni\n" diff --git a/po/it.po b/po/it.po index da51532c4..9f1c38def 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: 2011-11-15 19:37+0100\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -716,6 +716,10 @@ msgstr "Opzione creata: " msgid "Option changed" msgstr "Opzione modificata" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%sImpossibile disabilitare l'opzione \"%s\"" diff --git a/po/pl.po b/po/pl.po index 072b94818..964be358f 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: 2011-11-03 16:57+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -727,6 +727,10 @@ msgstr "Opcja utworzona: " msgid "Option changed" msgstr "Zmieniono opcję" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%sNie powiodło się wyzerowanie opcji \"%s\"" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6bf191ce7..61bc9b85d 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: 2011-11-03 16:58+0100\n" "Last-Translator: Ivan Sichmann Freitas \n" "Language-Team: weechat-dev \n" @@ -750,6 +750,10 @@ msgstr "Opção mudada: " msgid "Option changed" msgstr "Opção mudada" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%sFalhou ao desabilitar a opção \"%s\"" diff --git a/po/ru.po b/po/ru.po index 17f78d32b..483f429a9 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: 2011-10-22 12:21+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -765,6 +765,10 @@ msgstr "не на канале" msgid "Option changed" msgstr "не на канале" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, fuzzy, c-format msgid "%sFailed to unset option \"%s\"" msgstr "%s не могу сохранить конфигурационный файл pluginов\n" diff --git a/po/weechat.pot b/po/weechat.pot index a36f9d19d..8e3e82b53 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-12-17 18:30+0100\n" +"POT-Creation-Date: 2011-12-17 18:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -667,6 +667,10 @@ msgstr "" msgid "Option changed" msgstr "" +#, c-format +msgid "%sReset of all options is not allowed" +msgstr "" + #, c-format msgid "%sFailed to unset option \"%s\"" msgstr "" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 8c3f586d3..162f8d9fc 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -4489,6 +4489,13 @@ COMMAND_CALLBACK(unset) if (argc >= 2) { + if (strcmp (argv_eol[1], "*") == 0) + { + gui_chat_printf (NULL, + _("%sReset of all options is not allowed"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + return WEECHAT_RC_OK; + } for (ptr_config = config_files; ptr_config; ptr_config = ptr_config->next_config) {