Merge branch 'main' into danirabbit/sidebar-titlebuttons

elementary · Mar 1, 2024 · b2d0230 · b2d0230
2 parents 40b5409 + a7a0b50
commit b2d0230
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml
@@ -22,7 +22,7 @@ jobs:
         token: ${{ secrets.GIT_USER_TOKEN }}
 
     - name: Update Translation Files
-      uses: elementary/actions/gettext-template@next
+      uses: elementary/actions/gettext-template@main
       env:
         GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
         GIT_USER_NAME: "elementaryBot"

diff --git a/src/Application.vala b/src/Application.vala
@@ -94,7 +94,6 @@ namespace Switchboard {
             add_action (back_action);
             add_action (quit_action);
 
-            set_accels_for_action ("app.back", {"<Alt>Left", "Back"});
             set_accels_for_action ("app.quit", {"<Control>q"});
 
             back_action.activate.connect (action_navigate_back);
@@ -138,7 +137,7 @@ namespace Switchboard {
             navigation_button = new Gtk.Button.with_label (_(all_settings_label));
             navigation_button.action_name = "app.back";
             navigation_button.set_tooltip_markup (
-                Granite.markup_accel_tooltip (get_accels_for_action (navigation_button.action_name))
+                Granite.markup_accel_tooltip ({"<Alt>Left", "Back"})
             );
             navigation_button.get_style_context ().add_class ("back-button");