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 11:22:49 +0100 |
| commit | d46dc8e547810208287aab77f0313f1971901464 (patch) | |
| tree | 747ff156bb111596ad14d4c0a6dd257d4a3ebb5f | |
| parent | e235dbcb4b2999f5a3f9f42dc723ac7510053a63 (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>
| -rw-r--r-- | include/sfx2/strings.hrc | 1 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc index 9dadd7078b90..b857ae44ea41 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)") diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 84e248bfa390..4fbec31928ae 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1534,7 +1534,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, { ScopedVclPtrInstance< MessageDialog > aBox( mpPreferredParentWindow, - SfxResId(RID_SVXSTR_INCORRECT_PASSWORD)); + SfxResId(RID_SVXSTR_GPG_ENCRYPT_FAILURE)); aBox->Execute(); } } |