gnucash maint: Bug 792446 - Mixed languages in error dialog.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/26714d2e (commit)
	from  https://github.com/Gnucash/gnucash/commit/20942827 (commit)



commit 26714d2e1715139efb273ace96ecfb6e1ef036b4
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Sep 27 18:05:01 2018 -0700

    Bug 792446 - Mixed languages in error dialog.

diff --git a/gnucash/gnome/dialog-print-check.c b/gnucash/gnome/dialog-print-check.c
index 8ed5e86..d6f8ad0 100644
--- a/gnucash/gnome/dialog-print-check.c
+++ b/gnucash/gnome/dialog-print-check.c
@@ -818,7 +818,8 @@ pcd_save_custom_data(PrintCheckDialog *pcd, const gchar *title)
                                         GTK_BUTTONS_CLOSE, "%s",
                                         _("Cannot save check format file."));
         gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-                "%s", error->message);
+                                                 _("Cannot open file %s"),
+                                                 _(error->message));
         gtk_dialog_run(GTK_DIALOG(dialog));
         gtk_widget_destroy(dialog);
         g_error_free(error);
diff --git a/libgnucash/app-utils/gnc-state.c b/libgnucash/app-utils/gnc-state.c
index b21c6f7..8b2f8d9 100644
--- a/libgnucash/app-utils/gnc-state.c
+++ b/libgnucash/app-utils/gnc-state.c
@@ -240,8 +240,7 @@ void gnc_state_save (const QofSession *session)
 
     if (error)
     {
-        PERR ("Error: Failure saving state file.\n  %s",
-              error->message);
+        PERR ("Error: Cannot open state file %s", error->message);
         g_error_free (error);
     }
 }
diff --git a/libgnucash/core-utils/gnc-gkeyfile-utils.c b/libgnucash/core-utils/gnc-gkeyfile-utils.c
index 89215f8..7f0d4ec 100644
--- a/libgnucash/core-utils/gnc-gkeyfile-utils.c
+++ b/libgnucash/core-utils/gnc-gkeyfile-utils.c
@@ -122,7 +122,7 @@ gnc_key_file_save_to_file (const gchar *filename,
         if (error)
         {
             *error = g_error_new(G_FILE_ERROR, g_file_error_from_errno(errno),
-                                 "Cannot open file %s: %s", filename,
+                                 "%s: %s", filename,
                                  strerror(errno));
         }
         else



Summary of changes:
 gnucash/gnome/dialog-print-check.c         | 3 ++-
 libgnucash/app-utils/gnc-state.c           | 3 +--
 libgnucash/core-utils/gnc-gkeyfile-utils.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)