diff options
-rw-r--r-- | ChangeLog.asciidoc | 1 | ||||
-rw-r--r-- | po/cs.po | 5 | ||||
-rw-r--r-- | po/de.po | 8 | ||||
-rw-r--r-- | po/es.po | 5 | ||||
-rw-r--r-- | po/fr.po | 8 | ||||
-rw-r--r-- | po/hu.po | 5 | ||||
-rw-r--r-- | po/it.po | 8 | ||||
-rw-r--r-- | po/ja.po | 8 | ||||
-rw-r--r-- | po/pl.po | 8 | ||||
-rw-r--r-- | po/pt_BR.po | 5 | ||||
-rw-r--r-- | po/ru.po | 5 | ||||
-rw-r--r-- | po/tr.po | 5 | ||||
-rw-r--r-- | po/weechat.pot | 5 | ||||
-rw-r--r-- | src/core/wee-secure.c | 24 |
14 files changed, 31 insertions, 69 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 8dbc2edb7..aec33fbba 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -15,6 +15,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] == Version 1.0 (under dev) +* core: do not display content of passphrase on /secure buffer * core: add option "env" in command /set (manage environment variables) * core: fix potential memory leak with infolists not freed in plugins (debian #751108) @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-19 07:45+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3867,9 +3867,6 @@ msgstr "na" msgid "off" msgstr "off" -msgid "Passphrase" -msgstr "" - msgid "Passphrase is set" msgstr "" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-27 22:39+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -4535,9 +4535,6 @@ msgstr "an" msgid "off" msgstr "aus" -msgid "Passphrase" -msgstr "Passphrase" - msgid "Passphrase is set" msgstr "Passphrase ist festgelegt" @@ -12080,3 +12077,6 @@ msgstr "" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s" + +#~ msgid "Passphrase" +#~ msgstr "Passphrase" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-19 07:45+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4077,9 +4077,6 @@ msgstr "activo" msgid "off" msgstr "inactivo" -msgid "Passphrase" -msgstr "" - msgid "Passphrase is set" msgstr "" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-27 22:02+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4434,9 +4434,6 @@ msgstr "activé" msgid "off" msgstr "désactivé" -msgid "Passphrase" -msgstr "Phrase de chiffrement" - msgid "Passphrase is set" msgstr "La phrase de chiffrement est définie" @@ -11832,6 +11829,9 @@ msgstr "" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" +#~ msgid "Passphrase" +#~ msgstr "Phrase de chiffrement" + #~ msgid "%s unset" #~ msgstr "%s réinitialisée" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+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" @@ -3490,9 +3490,6 @@ msgstr "be" msgid "off" msgstr "ki" -msgid "Passphrase" -msgstr "" - msgid "Passphrase is set" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-19 07:46+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4199,9 +4199,6 @@ msgstr "attivo" msgid "off" msgstr "non attivo" -msgid "Passphrase" -msgstr "Chiave di cifratura" - msgid "Passphrase is set" msgstr "La chiave di cifratura è impostata" @@ -11169,6 +11166,9 @@ msgstr "" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: timeout per \"%s\" con %s" +#~ msgid "Passphrase" +#~ msgstr "Chiave di cifratura" + #~ msgid "set config options" #~ msgstr "imposta le opzioni di configurazione" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-19 07:46+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" @@ -4245,9 +4245,6 @@ msgstr "オン" msgid "off" msgstr "オフ" -msgid "Passphrase" -msgstr "パスフレーズ" - msgid "Passphrase is set" msgstr "パスフレーズが設定されています" @@ -11377,6 +11374,9 @@ msgstr "%s%s: ソケットにオプション \"nonblock\" を設定できませ msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: \"%s\" のタイムアウト %s" +#~ msgid "Passphrase" +#~ msgstr "パスフレーズ" + #~ msgid "set config options" #~ msgstr "オプションの設定" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-19 07:46+0200\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4321,9 +4321,6 @@ msgstr "włączone" msgid "off" msgstr "wyłączone" -msgid "Passphrase" -msgstr "Hasło" - msgid "Passphrase is set" msgstr "Hasło zostało ustawione" @@ -11437,6 +11434,9 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda: błąd %d %s" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: przekroczono czas na \"%s\" z %s" +#~ msgid "Passphrase" +#~ msgstr "Hasło" + #~ msgid "set config options" #~ msgstr "ustawia opcje konfiguracyjne" diff --git a/po/pt_BR.po b/po/pt_BR.po index e208412ce..2e5eb71b5 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-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-19 07:46+0200\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3967,9 +3967,6 @@ msgstr "ligado" msgid "off" msgstr "desligado" -msgid "Passphrase" -msgstr "" - msgid "Passphrase is set" msgstr "" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+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" @@ -3519,9 +3519,6 @@ msgstr "вкл." msgid "off" msgstr "выкл." -msgid "Passphrase" -msgstr "" - msgid "Passphrase is set" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+0200\n" "PO-Revision-Date: 2014-06-19 07:48+0200\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3131,9 +3131,6 @@ msgstr "" msgid "off" msgstr "" -msgid "Passphrase" -msgstr "" - msgid "Passphrase is set" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 51218472e..fc7cf67a0 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-06-27 21:59+0200\n" +"POT-Creation-Date: 2014-06-28 13:14+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" @@ -3131,9 +3131,6 @@ msgstr "" msgid "off" msgstr "" -msgid "Passphrase" -msgstr "" - msgid "Passphrase is set" msgstr "" diff --git a/src/core/wee-secure.c b/src/core/wee-secure.c index 55d851e8b..5944dd383 100644 --- a/src/core/wee-secure.c +++ b/src/core/wee-secure.c @@ -1215,27 +1215,9 @@ secure_buffer_display () /* display passphrase */ line++; - if (secure_passphrase) - { - if (secure_buffer_display_values) - { - gui_chat_printf_y (secure_buffer, line++, - "%s%s = %s\"%s%s%s\"", - _("Passphrase"), - GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS), - GUI_COLOR(GUI_COLOR_CHAT), - GUI_COLOR(GUI_COLOR_CHAT_VALUE), - secure_passphrase, - GUI_COLOR(GUI_COLOR_CHAT)); - } - else - gui_chat_printf_y (secure_buffer, line++, _("Passphrase is set")); - } - else - { - gui_chat_printf_y (secure_buffer, line++, - _("Passphrase is NOT set")); - } + gui_chat_printf_y (secure_buffer, line++, + (secure_passphrase) ? + _("Passphrase is set") : _("Passphrase is NOT set")); /* display secured data */ count = secure_hashtable_data->items_count; |