Merge branch 'bilelmoussaoui/string-changes' into 'master'

src/widgets/pages/welcome.rs

@@ -148,17 +148,18 @@ impl WelcomePageWidget {
             );
         };
 
-        let name = glib::get_os_info("NAME").unwrap_or_else(|| "GNOME".into());
-        let version = glib::get_os_info("VERSION").unwrap_or_else(|| "".into());
-        // Translators: The following string is formated as "Welcome to GNOME 3.36" for example
-        let title = gtk::Label::new(Some(&i18n_f("Welcome to {} {}", &[&name, &version])));
+        let title = gtk::Label::new(Some(&gettext("Start the Tour")));
         title.set_margin_top(36);
         title.get_style_context().add_class("large-title");
         title.show();
         container.add(&title);
 
-        let text = gtk::Label::new(Some(&gettext(
-            "Learn about new and essential features in GNOME 40.",
+        let name = glib::get_os_info("NAME").unwrap_or_else(|| "GNOME".into());
+        let version = glib::get_os_info("VERSION").unwrap_or_else(|| "".into());
+        // Translators: The following string is formated as "Learn about new and essential features in GNOME 3.36" for example
+        let text = gtk::Label::new(Some(&i18n_f(
+            "Learn about new and essential features in {} {}.",
+            &[&name, &version],
         )));
         text.get_style_context().add_class("body");
         text.set_margin_top(12);

src/widgets/paginator.rs

@@ -151,6 +151,7 @@ impl PaginatorWidget {
         let start_overlay = gtk::Overlay::new();
         start_overlay.add(&self.start_btn);
         start_overlay.add_overlay(&next_overlay);
+        start_overlay.set_overlay_pass_through(&next_overlay, true);
         start_overlay.show();
 
         let btn_size_group = gtk::SizeGroup::new(gtk::SizeGroupMode::Horizontal);

src/widgets/window.rs

@@ -59,7 +59,7 @@ impl Window {
             ImagePageWidget::new(
                 "/org/gnome/Tour/makeyourown.svg",
                 gettext("Make Apps Your Own"),
-                gettext("Arrange your apps so they make sense for you."),
+                gettext("Arrange the app grid so it makes sense for you."),
             )
             .widget
             .upcast::<gtk::Widget>(),
@@ -96,10 +96,14 @@ impl Window {
         );
 
         let name = glib::get_os_info("NAME").unwrap_or_else(|| "GNOME".into());
+        let version = glib::get_os_info("VERSION").unwrap_or_else(|| "".into());
         let last_page = ImagePageWidget::new(
             "/org/gnome/Tour/ready-to-go.svg",
-            // Translators: The following string is formated as "We hope that you enjoy GNOME"
-            i18n_f("That's it! We hope that you enjoy {}.", &[&name]),
+            // Translators: The following string is formatted as "We hope that you enjoy GNOME 40"
+            i18n_f(
+                "That's it! We hope that you enjoy {} {}.",
+                &[&name, &version],
+            ),
             gettext("To get more advice and tips, see the Help app."),
         );
         last_page.widget.get_style_context().add_class("last-page");