diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2013-08-02 20:16:47 +0200 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2013-08-02 20:16:47 +0200 |
| commit | 26fcc6695334f758b0d4c1757043c30269a06d5c (patch) | |
| tree | e0a78becc3f62f1075c877e1bdd495b30ffe8e28 /src/core | |
| parent | 663de422849a591c2b7fdf47fbabdf6e2ecb98da (diff) | |
| download | weechat-26fcc6695334f758b0d4c1757043c30269a06d5c.zip | |
core: update translations
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/wee-command.c | 16 | ||||
| -rw-r--r-- | src/core/wee-secure.c | 13 |
2 files changed, 14 insertions, 15 deletions
diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 0ed5eb6e1..d52d626b7 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -6813,22 +6813,20 @@ command_init () " || decrypt <passphrase>|-discard" " || set <name> <value>" " || del <name>"), - N_("passphrase: set or change the passphrase used for " - "encryption (without passphrase, data is stored as " - "plain text in file sec.conf)\n" + N_("passphrase: change the passphrase (without passphrase, " + "data is stored as plain text in file sec.conf)\n" " -delete: delete passphrase\n" " decrypt: decrypt data still encrypted (it happens only " - "if no passphrase was given for encrypted data on startup)\n" - " -discard: discard all encrypted data (WARNING: this " - "will clear the file sec.conf)\n" + "if passphrase was not given on startup)\n" + " -discard: discard all data still encrypted data\n" " set: add or change secured data\n" " del: delete secured data\n\n" "Without argument, this command displays secured data " "in a new buffer.\n\n" "When a passphrase is used (data encrypted), it is asked " "by WeeChat on startup.\n" - "It is possible to set environment variable \"" - SECURE_ENV_PASSPHRASE "\" to prevent the prompt (this same " + "It is possible to set environment variable " + "\"WEECHAT_PASSPHRASE\" to prevent the prompt (this same " "variable is used by WeeChat on /upgrade).\n\n" "Secured data with format ${sec.data.xxx} can be used in:\n" " - command line argument \"--run-command\"\n" @@ -6847,7 +6845,7 @@ command_init () " /secure set oftc mypassword\n" " /set irc.server.oftc.command \"/msg nickserv identify " "${sec.data.oftc}\"\n" - " alias to ghost \"mynick\":\n" + " alias to ghost the nick \"mynick\":\n" " /alias ghost /eval /msg -server freenode nickserv " "ghost mynick ${sec.data.freenode}"), "passphrase -delete" diff --git a/src/core/wee-secure.c b/src/core/wee-secure.c index 9053d76bd..ddab7b8ed 100644 --- a/src/core/wee-secure.c +++ b/src/core/wee-secure.c @@ -942,12 +942,13 @@ secure_init_options () secure_config_file, ptr_section, "passphrase_file", "string", N_("path to a file containing the passphrase to encrypt/decrypt secured " - "data (used only when reading file sec.conf); only first line of " - "file is used; this file is used only if the environment variable \"" - SECURE_ENV_PASSPHRASE "\" is not set (the environment variable has " - "higher priority); security note: it is recommended to keep this " - "file readable only by you and store it outside WeeChat home (for " - "example in your home); example: \"~/.weechat-passphrase\""), + "data; this option is used only when reading file sec.conf; only " + "first line of file is used; this file is used only if the " + "environment variable \"WEECHAT_PASSPHRASE\" is not set (the " + "environment variable has higher priority); security note: it is " + "recommended to keep this file readable only by you and store it " + "outside WeeChat home (for example in your home); example: " + "\"~/.weechat-passphrase\""), NULL, 0, 0, "", NULL, 0, &secure_check_crypt_passphrase_file, NULL, NULL, NULL, NULL, NULL); secure_config_crypt_salt = config_file_new_option ( |