[evolution] I#239 - First run wizard doesn't provide a "collection account" option ][

[Milan Crha <mcrha src gnome org>]

commit 8182ef17c72e3ce4e64f1760c9aa4a6b8bd41887
Author: Milan Crha <mcrha redhat com>
Date:   Wed Dec 5 19:05:59 2018 +0100

    I#239 - First run wizard doesn't provide a "collection account" option ][
    
    Change the text wording to simpler one.
    
    Related to https://gitlab.gnome.org/GNOME/evolution/issues/239

 src/modules/startup-wizard/e-startup-assistant.c | 38 +++++++++++-------------
 1 file changed, 18 insertions(+), 20 deletions(-)
---
diff --git a/src/modules/startup-wizard/e-startup-assistant.c 
b/src/modules/startup-wizard/e-startup-assistant.c
index bab6133552..2f4e3161bc 100644
--- a/src/modules/startup-wizard/e-startup-assistant.c
+++ b/src/modules/startup-wizard/e-startup-assistant.c
@@ -188,24 +188,35 @@ startup_assistant_constructed (GObject *object)
                        "and to import files from other applications."));
 
                main_box = e_mail_config_welcome_page_get_main_box (E_MAIL_CONFIG_WELCOME_PAGE (nth_page));
+               settings = e_util_ref_settings ("org.gnome.evolution.mail");
+
+               checkbox = gtk_check_button_new_with_mnemonic (_("Do not _show this wizard again"));
+               gtk_widget_show (checkbox);
+
+               g_settings_bind (settings, "show-startup-wizard",
+                       checkbox, "active",
+                       G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
+
+               gtk_box_pack_end (main_box, checkbox, FALSE, FALSE, 4);
+
+               g_object_unref (settings);
 
                linkified = g_markup_printf_escaped ("<a href=\"" NEW_COLLECTION_ACCOUNT_URI "\">%s</a>",
-                       /* Translators: This is part of "Create Collection Account." sentence from the same 
translation context. */
-                       C_("wizard-ca-note", "Collection Account"));
-               /* Translators: The '%s' is replaced with "Collection Account" from the same translation 
context. */
-               text = g_strdup_printf (C_("wizard-ca-note", "Create %s. Collection accounts allow 
configuring groupware accounts"
-                       " which can provide more than just Mail account. This wizard will be shown again in 
case the collection account"
-                       " doesn't contain a Mail account, unless the above option is checked."), linkified);
+                       /* Translators: This is part of "Alternatively, you can %s (email, contacts and 
calendaring) instead." sentence from the same translation context. */
+                       C_("wizard-ca-note", "create a collection account"));
+               /* Translators: The '%s' is replaced with "create a collection account" from the same 
translation context. */
+               text = g_strdup_printf (C_("wizard-ca-note", "Alternatively, you can %s (email, contacts and 
calendaring) instead."), linkified);
                g_free (linkified);
 
                label = gtk_label_new (text);
                g_object_set (G_OBJECT (label),
                        "hexpand", TRUE,
-                       "halign", GTK_ALIGN_FILL,
+                       "halign", GTK_ALIGN_START,
                        "use-markup", TRUE,
                        "visible", TRUE,
                        "wrap", TRUE,
                        "wrap-mode", PANGO_WRAP_WORD_CHAR,
+                       "xalign", 0.0,
                        NULL);
 
                gtk_box_pack_end (main_box, label, FALSE, FALSE, 4);
@@ -215,19 +226,6 @@ startup_assistant_constructed (GObject *object)
 
                g_free (text);
 
-               settings = e_util_ref_settings ("org.gnome.evolution.mail");
-
-               checkbox = gtk_check_button_new_with_mnemonic (_("Do not _show this wizard again"));
-               gtk_widget_show (checkbox);
-
-               g_settings_bind (settings, "show-startup-wizard",
-                       checkbox, "active",
-                       G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
-
-               gtk_box_pack_end (main_box, checkbox, FALSE, FALSE, 4);
-
-               g_object_unref (settings);
-
                break;
        }
 }