Skip to content

[pull] main from zaproxy:main #151

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 5, 2026
+0 −6
Merged

[pull] main from zaproxy:main #151

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
5702ca4
Remove unused resource messages
thc202 May 4, 2026
d1c0d67
Merge pull request #9325 from thc202/rm-msgs
psiinon May 5, 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: 0 additions & 2 deletions zap/src/main/java/org/zaproxy/zap/extension/stdmenus/ExtensionStdMenus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ public class ExtensionStdMenus extends ExtensionAdaptor implements ClipboardOwne
private PopupContextTreeMenu popupContextTreeMenuDelete = null;
private PopupContextTreeMenu popupContextTreeMenuExport;

// Still being developed
// private PopupMenuShowResponseInBrowser popupMenuShowResponseInBrowser = null;
private static final Logger LOGGER = LogManager.getLogger(ExtensionStdMenus.class);

public ExtensionStdMenus() {
Expand Down
4 changes: 0 additions & 4 deletions zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,6 @@ ascan.scripts.interface.active.error = The provided Active Rules script ({0}) do
ascan.scripts.skip.reason = no scripts enabled
ascan.scripts.type.active = Active Rules
ascan.scripts.type.active.desc = Active Rules scripts run when you run the Active Scanner.\n\nYou must enable them before they will be used.\n\n
ascan.site.popup = Active Scan Site
ascan.subtree.popup = Active Scan Subtree
ascan.toolbar.ascans.label = Current Scans:
ascan.toolbar.button.clear = Clean Completed Scans
ascan.toolbar.button.new = New Scan
Expand All @@ -624,7 +622,6 @@ ascan.toolbar.newalerts.label = New Alerts:
ascan.toolbar.progress.label = Progress:
ascan.toolbar.progress.select = --Select Scan--
ascan.toolbar.requests.label = Num Requests:
ascan.url.popup = Active Scan single URL

attack.site.popup = Attack

Expand Down Expand Up @@ -1714,7 +1711,6 @@ history.scan.warning = Error getting History.
history.scope.button.selected = Show all URLs
history.scope.button.unselected = Show only URLs in Scope
history.showinhistory.popup = Show in History Tab
history.showresponse.popup = Show response in Browser
history.tags.popup = Manage History Tags...

http.panel.component.all.tooltip = Combined Display for Header and Body
Expand Down
Loading