diff options
Diffstat (limited to 'application')
5 files changed, 4 insertions, 67 deletions
diff --git a/application/palemoon/components/about/AboutRedirector.cpp b/application/palemoon/components/about/AboutRedirector.cpp index 508202c7d..fbcad6094 100644 --- a/application/palemoon/components/about/AboutRedirector.cpp +++ b/application/palemoon/components/about/AboutRedirector.cpp @@ -70,12 +70,7 @@ static RedirEntry kRedirMap[] = { nsIAboutModule::ALLOW_SCRIPT }, { - "rights", -#ifdef MOZ_OFFICIAL_BRANDING - "chrome://global/content/aboutRights.xhtml", -#else - "chrome://global/content/aboutRights-unbranded.xhtml", -#endif + "rights", "chrome://global/content/aboutRights.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::MAKE_LINKABLE | nsIAboutModule::ALLOW_SCRIPT diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.dtd b/application/palemoon/locales/en-US/chrome/browser/browser.dtd index 3d5f22b33..2d80c8078 100644 --- a/application/palemoon/locales/en-US/chrome/browser/browser.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/browser.dtd @@ -204,67 +204,12 @@ These should match what Safari and other Apple applications use on OS X Lion. -- <!ENTITY webDeveloperMenu.label "Web Developer"> <!ENTITY webDeveloperMenu.accesskey "W"> -<!ENTITY devtoolsConnect.label "Connect…"> -<!ENTITY devtoolsConnect.accesskey "e"> - <!ENTITY errorConsoleCmd.label "Error Console"> <!ENTITY errorConsoleCmd.accesskey "C"> -<!ENTITY remoteWebConsoleCmd.label "Remote Web Console"> - -<!ENTITY browserConsoleCmd.label "Browser Console"> -<!ENTITY browserConsoleCmd.commandkey "j"> -<!ENTITY browserConsoleCmd.accesskey "B"> - <!ENTITY inspectContextMenu.label "Inspect Element"> <!ENTITY inspectContextMenu.accesskey "Q"> -<!ENTITY responsiveDesignTool.label "Responsive Design View"> -<!ENTITY responsiveDesignTool.accesskey "R"> -<!ENTITY responsiveDesignTool.commandkey "M"> - -<!ENTITY eyedropper.label "Eyedropper"> -<!ENTITY eyedropper.accesskey "Y"> - -<!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears - - in the Tools menu. See bug 653093. - - The Scratchpad is intended to provide a simple text editor for creating - - and evaluating bits of JavaScript code for the purposes of function - - prototyping, experimentation and convenient scripting. - - - - It's quite possible that you won't have a good analogue for the word - - "Scratchpad" in your locale. You should feel free to find a close - - approximation to it or choose a word (or words) that means - - "simple discardable text editor". --> -<!ENTITY scratchpad.label "Scratchpad"> -<!ENTITY scratchpad.accesskey "s"> -<!ENTITY scratchpad.keycode "VK_F4"> -<!ENTITY scratchpad.keytext "F4"> - -<!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the - - application menu item that opens the browser debugger UI in the Tools menu. --> -<!ENTITY chromeDebuggerMenu.label "Browser Debugger"> - -<!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar"> -<!ENTITY devToolbarMenu.label "Developer Toolbar"> -<!ENTITY devToolbarMenu.accesskey "v"> -<!ENTITY devAppMgrMenu.label "App Manager"> -<!ENTITY devAppMgrMenu.accesskey "A"> -<!ENTITY webide.label "WebIDE"> -<!ENTITY webide.accesskey "W"> -<!ENTITY webide.keycode "VK_F8"> -<!ENTITY webide.keytext "F8"> -<!ENTITY devToolbar.keycode "VK_F2"> -<!ENTITY devToolbar.keytext "F2"> -<!ENTITY devToolboxMenuItem.label "Toggle Tools"> -<!ENTITY devToolboxMenuItem.accesskey "T"> - -<!ENTITY devToolbarToolsButton.tooltip "Toggle developer tools"> -<!ENTITY devToolbarOtherToolsButton.label "More Tools"> - -<!ENTITY getMoreDevtoolsCmd.label "Get More Tools"> -<!ENTITY getMoreDevtoolsCmd.accesskey "M"> - <!ENTITY fileMenu.label "File"> <!ENTITY fileMenu.accesskey "F"> <!ENTITY newNavigatorCmd.label "New Window"> diff --git a/application/palemoon/themes/linux/browser.css b/application/palemoon/themes/linux/browser.css index 7d353685d..987406264 100644 --- a/application/palemoon/themes/linux/browser.css +++ b/application/palemoon/themes/linux/browser.css @@ -1223,8 +1223,7 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url(chrome://global/skin/icons/question-64.png); } -.popup-notification-icon[popupid="password-save"], -.popup-notification-icon[popupid="password-change"] { +.popup-notification-icon[popupid="password"] { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); } diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css index fe4cdbf11..8d3784afd 100644 --- a/application/palemoon/themes/osx/browser.css +++ b/application/palemoon/themes/osx/browser.css @@ -1914,8 +1914,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } -.popup-notification-icon[popupid="password-save"], -.popup-notification-icon[popupid="password-change"] { +.popup-notification-icon[popupid="password"] { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); } diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css index 5c044fdd4..1aefa428c 100644 --- a/application/palemoon/themes/windows/browser.css +++ b/application/palemoon/themes/windows/browser.css @@ -2401,8 +2401,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } -.popup-notification-icon[popupid="password-save"], -.popup-notification-icon[popupid="password-change"] { +.popup-notification-icon[popupid="password"] { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); } |