diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-08 00:34:06 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-08 23:28:30 +0100 |
commit | d595a081b38bbfda7a64fd1c2680c24880f02025 (patch) | |
tree | 79aa465e7efeaed2296c869b5e3349283edc78fa /include | |
parent | 955b59e8720951821ed84ba79d8e8c22999b2bd3 (diff) |
gpg4libre: add error string for failed/untrusted encryption
There's one rather common failure mode with gpg, in that untrusted
keys are not accepted by gpgme for encryption.
A user can override that with --trust-model config or cmd line
params, but we can't do much from the gpgme client side:
https://www.gnupg.org/documentation/manuals/gnupg/GPG-Configuration-Options.html
Change-Id: Ia140a7fd25bd3f428aa11a7ceb0b7bdc47b2c900
Reviewed-on: https://gerrit.libreoffice.org/46060
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit d46dc8e547810208287aab77f0313f1971901464)
Reviewed-on: https://gerrit.libreoffice.org/46084
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/strings.hrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 9f0b9657a729..aceb597db301 100644 --- a/include/sfx2/strings.hrc +++ b/include/sfx2/strings.hrc @@ -169,6 +169,7 @@ #define RID_SVXSTR_GRFILTER_FILTERERROR NC_("RID_SVXSTR_GRFILTER_FILTERERROR", "Image filter not found") #define RID_SVXSTR_END_REDLINING_WARNING NC_("RID_SVXSTR_END_REDLINING_WARNING", "This action will exit the change recording mode.\nAny information about changes will be lost.\n\nExit change recording mode?\n\n") #define RID_SVXSTR_INCORRECT_PASSWORD NC_("RID_SVXSTR_INCORRECT_PASSWORD", "Incorrect password") +#define RID_SVXSTR_GPG_ENCRYPT_FAILURE NC_("RID_SVXSTR_GPG_ENCRYPT_FAILURE", "OpenPGP key not trusted, damaged, or encryption failure. Please try again.") #define STR_PASSWD_MIN_LEN NC_("STR_PASSWD_MIN_LEN", "(Minimum $(MINLEN) characters)") #define STR_PASSWD_MIN_LEN1 NC_("STR_PASSWD_MIN_LEN1", "(Minimum 1 character)") |