[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/sfx2 sfx2/source

[Thorsten Behrens]

 include/sfx2/strings.hrc             |    1 +
 sfx2/source/dialog/filedlghelper.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d595a081b38bbfda7a64fd1c2680c24880f02025
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Fri Dec 8 00:34:06 2017 +0100

    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 at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit d46dc8e547810208287aab77f0313f1971901464)
    Reviewed-on: https://gerrit.libreoffice.org/46084
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

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)")
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 6e997d92ebc5..3820ee4107c9 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();
                         }
                     }