Skip to content

[pull] master from Open-Shell:master #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
May 30, 2026
Merged

[pull] master from Open-Shell:master #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f15a0fb
Adjust wording of IDS_STARTSCREEN_ITEM
ge0rdi May 29, 2026
9518c3b
Make sure to run `release` step only on manual builds from master
ge0rdi May 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
!Src/Setup/Final/OpenShellLoc.zip

release:
if: github.event_name == 'workflow_dispatch' # Only manual master builds
if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
needs: build
runs-on: ubuntu-latest # Cheaper/faster than windows for just uploading
permissions:
Expand Down
4 changes: 2 additions & 2 deletions Src/StartMenu/StartMenuDLL/StartMenuDLL.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,9 +1081,9 @@ BEGIN
IDS_RIGHT_SHIFT_TIP "When this is checked, right-click on the start button will open the standard Windows context menu instead of the Open-Shell menu. Otherwise Shift+right-click will open it"
IDS_RIGHT_SHIFTX "Right click opens Win+X menu"
IDS_RIGHT_SHIFTX_TIP "When this is checked, right-click on the start button will open the Win+X power menu instead of the Open-Shell menu. Otherwise Shift+right-click will open it"
IDS_STARTSCREEN_ITEM "Show Start screen shortcut"
IDS_STARTSCREEN_ITEM "Show Start Menu/Screen shortcut"
IDS_STARTSCREEN_ITEM_TIP
"When this is checked, the main menu will contain a shortcut to open the Start screen"
"When this is checked, the main menu will contain a shortcut to open original Start menu/screen"
IDS_MIN_HEIGHT "Minimum menu height"
IDS_MIN_HEIGHT_TIP "The main menu will be at least as tall as this many search results"
IDS_GLASS_OVERRIDE "Override glass color"
Expand Down