diff options
Diffstat (limited to 'libre/iceweasel/libre.patch')
| -rw-r--r-- | libre/iceweasel/libre.patch | 297 |
1 files changed, 252 insertions, 45 deletions
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index ccb0f076a..53abc78b2 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -65,19 +65,6 @@ index dc67747620..00221d37a1 100644 </dl> -#endif </dl> -diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd -index 674a408d5e..d27e97fd58 100644 ---- a/devtools/client/locales/en-US/connection-screen.dtd -+++ b/devtools/client/locales/en-US/connection-screen.dtd -@@ -24,7 +24,7 @@ - <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix): - these strings will be concatenated in a single label, remoteDocumentation will - be used as text for a link to MDN. --> --<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the "> -+<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the "> - <!ENTITY remoteDocumentation "documentation"> - <!ENTITY remoteHelpSuffix "."> - diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties index 842d549f04..31dcb82e5a 100644 --- a/devtools/client/locales/en-US/sourceeditor.properties @@ -91,40 +78,260 @@ index 842d549f04..31dcb82e5a 100644 # Scratchpad and the Style Editor tools. # LOCALIZATION NOTE The correct localization of this file might be to keep it -diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd -index 7bdf151b6a..7ed5cc69de 100644 ---- a/devtools/client/locales/en-US/webide.dtd -+++ b/devtools/client/locales/en-US/webide.dtd -@@ -2,7 +2,7 @@ - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +diff --git a/browser/app/permissions b/browser/app/permissions +index f40a60e..c23fa76 100644 +--- a/browser/app/permissions ++++ b/browser/app/permissions +@@ -14,16 +14,9 @@ origin uitour 1 https://support.mozilla.org + origin uitour 1 about:home + origin uitour 1 about:newtab + +-# XPInstall +-origin install 1 https://addons.mozilla.org +- + # Remote troubleshooting + origin remote-troubleshooting 1 https://support.mozilla.org + + # Hybrid Content Telemetry - https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/collection/hybrid-content.html + # Adding hc_telemetry permission to a new domain requires Data Collection Review: https://wiki.mozilla.org/Firefox/Data_Collection + origin hc_telemetry 1 https://discovery.addons.mozilla.org +- +-# addon install +-origin install 1 https://private-network.firefox.com +-origin install 1 https://fpn.firefox.com +diff --git a/browser/components/preferences/in-content/sync.inc.xul b/browser/components/preferences/in-content/sync.inc.xul +index e444bf3..05e9824 100644 +--- a/browser/components/preferences/in-content/sync.inc.xul ++++ b/browser/components/preferences/in-content/sync.inc.xul +@@ -46,22 +46,6 @@ + </hbox> + </vbox> + </hbox> +- <label class="fxaMobilePromo" data-l10n-id="sync-mobile-promo"> +- <html:img +- src="chrome://browser/skin/preferences/in-content/logo-android.svg" +- data-l10n-name="android-icon" +- class="androidIcon"/> +- <html:a +- data-l10n-name="android-link" +- class="fxaMobilePromo-android text-link" target="_blank"/> +- <html:img +- src="chrome://browser/skin/preferences/in-content/logo-ios.svg" +- data-l10n-name="ios-icon" +- class="iOSIcon"/> +- <html:a +- data-l10n-name="ios-link" +- class="fxaMobilePromo-ios text-link" target="_blank"/> +- </label> + </groupbox> + + <vbox id="hasFxaAccount"> +diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl +index 8e0602d..cde6252 100644 +--- a/browser/locales/en-US/browser/preferences/preferences.ftl ++++ b/browser/locales/en-US/browser/preferences/preferences.ftl +@@ -719,16 +719,6 @@ sync-signedout-account-signin = + .label = Sign In… + .accesskey = I + +-# This message contains two links and two icon images. +-# `<img data-l10n-name="android-icon"/>` - Android logo icon +-# `<a data-l10n-name="android-link">` - Link to Android Download +-# `<img data-l10n-name="ios-icon">` - iOS logo icon +-# `<a data-l10n-name="ios-link">` - Link to iOS Download +-# +-# They can be moved within the sentence as needed to adapt +-# to your language, but should not be changed or translated. +-sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device. +- + ## Firefox Account - Signed in + + sync-profile-picture = +diff --git a/devtools/client/whats-new/src/main.js b/devtools/client/whats-new/src/main.js +index ad34ff9..3e937c6 100644 +--- a/devtools/client/whats-new/src/main.js ++++ b/devtools/client/whats-new/src/main.js +@@ -23,7 +23,7 @@ const aside = { + }; + + const release = { +- title: "What’s New in DevTools (Firefox 70 & 71)", ++ title: "What’s New in DevTools (Iceweasel 70 & 71)", + linkText: "Read more", + linkUrl: + "https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/71?utm_source=devtools&utm_medium=devtools_whatsnew", +@@ -83,20 +83,6 @@ const release = { + ], + }; + +-const dev = { +- title: "Experimental Features in Firefox Developer Edition", +- linkUrl: +- "https://www.mozilla.org/firefox/developer/?utm_medium=devtools_whatsnew&utm_source=devtools", +- linkText: "Get DevEdition", +- features: [ +- { +- header: `Debug Variables with Watchpoints`, +- description: `Debugger’s new Watchpoints feature lets you pause when properties get read or written. Right-click object properties in the Scopes pane when paused to use the new “Break on…” menu.`, +- href: `https://developer.mozilla.org/docs/Tools/Debugger/How_to/Set_a_watchpoint_on_a_property?utm_source=devtools&utm_medium=devtools_whatsnew`, +- }, +- ], +-}; +- + class Aside extends Component { + render() { + return dom.aside( +@@ -183,11 +169,6 @@ class App extends Component { + ...release.features + .filter(feature => !feature.hidden) + .map(feature => createFactory(Feature)(feature)) +- ), +- dom.h2({}, dom.span({}, dev.title), Link(dev.linkText, dev.linkUrl)), +- dom.ul( +- {}, +- ...dev.features.map(feature => createFactory(Feature)(feature)) + ) + ) + ); +diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml +index f69ffa3..5a5b4d2 100644 +--- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml ++++ b/devtools/startup/aboutdevtools/aboutdevtools.xhtml +@@ -89,19 +89,6 @@ + <ul class="features-list"> + </ul> + </div> +- +- <footer> +- <img class="dev-edition-logo" +- src="chrome://devtools-startup/content/aboutdevtools/images/dev-edition-logo.svg" +- alt="Firefox Developer Edition logo"/> +- <div class="footer-message"> +- <h1 class="footer-message-title" data-l10n-id="footer-title"></h1> +- <p data-l10n-id="footer-message"></p> +- <a class="external footer-link" +- href="https://www.mozilla.org/firefox/developer/" +- target="_blank" data-l10n-id="footer-learn-more-link"></a> +- </div> +- </footer> + </div> + + </body> +diff --git a/devtools/startup/locales/en-US/aboutDevTools.ftl b/devtools/startup/locales/en-US/aboutDevTools.ftl +index db2146d..e02ab58 100644 +--- a/devtools/startup/locales/en-US/aboutDevTools.ftl ++++ b/devtools/startup/locales/en-US/aboutDevTools.ftl +@@ -3,18 +3,18 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + head-title = About Developer Tools +-enable-title = Enable Firefox Developer Tools +-enable-inspect-element-title = Enable Firefox Developer Tools to use Inspect Element ++enable-title = Enable Iceweasel Developer Tools ++enable-inspect-element-title = Enable Iceweasel Developer Tools to use Inspect Element + enable-inspect-element-message = Examine and edit HTML and CSS with the Developer Tools’ Inspector. +-enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Firefox Developer Tools. ++enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Iceweasel Developer Tools. + enable-key-shortcut-message = You activated a Developer Tools shortcut. If that was a mistake, you can close this Tab. + enable-menu-message = Perfect your website’s HTML, CSS, and JavaScript with tools like Inspector and Debugger. +-enable-common-message = Firefox Developer Tools are disabled by default to give you more control over your browser. ++enable-common-message = Iceweasel Developer Tools are disabled by default to give you more control over your browser. + enable-learn-more-link = Learn more about Developer Tools + enable-enable-button = Enable Developer Tools + enable-close-button = Close this Tab +-welcome-title = Welcome to Firefox Developer Tools! ++welcome-title = Welcome to Iceweasel Developer Tools! + newsletter-title = Mozilla Developer Newsletter + newsletter-message = Get developer news, tricks and resources sent straight to your inbox. + newsletter-email-placeholder = +@@ -24,8 +24,6 @@ newsletter-subscribe-button = Subscribe + newsletter-thanks-title = Thanks! + newsletter-thanks-message = If you haven’t previously confirmed a subscription to a Mozilla-related newsletter you may have to do so. Please check your inbox or your spam filter for an email from us. --<!ENTITY windowTitle "Firefox WebIDE"> -+<!ENTITY windowTitle "Iceweasel WebIDE"> - - <!ENTITY projectMenu_label "Project"> - <!ENTITY projectMenu_accesskey "P"> -@@ -55,7 +55,7 @@ - <!ENTITY projectButton_label "Open App"> - <!ENTITY runtimeButton_label "Select Runtime"> - --<!-- We try to repicate Firefox' bindings: --> -+<!-- We try to repicate Iceweasel's bindings: --> - <!-- quit app --> - <!ENTITY key_quit "W"> - <!-- open menu --> -diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties -index 7899151563..ca84e535e1 100644 ---- a/devtools/client/locales/en-US/webide.properties -+++ b/devtools/client/locales/en-US/webide.properties -@@ -2,8 +2,8 @@ +-footer-title = Firefox Developer Edition +-footer-message = Looking for more than just Developer Tools? Check out the Firefox browser that is built specifically for developers and modern workflows. + footer-learn-more-link = Learn more + + features-learn-more = Learn more +diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl +index 0066077..801f2fb 100644 +--- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl ++++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl +@@ -6,7 +6,7 @@ addons-window = + .title = Add-ons Manager + + search-header = +- .placeholder = Search addons.mozilla.org ++ .placeholder = Search www.parabola.nu/packages + .searchbuttonlabel = Search + + search-header-shortcut = +diff --git a/browser/components/newtab/docs/index.rst b/browser/components/newtab/docs/index.rst +index ea1e42ae8..855b245a1 100644 +--- a/browser/components/newtab/docs/index.rst ++++ b/browser/components/newtab/docs/index.rst +@@ -1,8 +1,8 @@ + ====================== +-Firefox Home (New Tab) ++Iceweasel Home (New Tab) + ====================== + +-All files related to Firefox Home, which includes content that appears on `about:home`, ++All files related to Iceweasel Home, which includes content that appears on `about:home`, + `about:newtab`, and `about:welcome`, can we found in the `browser/components/newtab` directory. + Some of these source files (such as `.js`, `.jsx`, and `.sass`) require an additional build step. + We are working on migrating this to work with `mach`, but in the meantime, please +diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl b/browser/locales/en-US/browser/newtab/newtab.ftl +index d0f0fe0af..360e04b61 100644 +--- a/browser/locales/en-US/browser/newtab/newtab.ftl ++++ b/browser/locales/en-US/browser/newtab/newtab.ftl +@@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-### Firefox Home / New Tab strings for about:home / about:newtab. ++### Iceweasel Home / New Tab strings for about:home / about:newtab. + + newtab-page-title = New Tab + newtab-settings-button = +diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl +index dfee10e51..6402f5c85 100644 +--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl ++++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl +@@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation. + + policy-ExtensionUpdate = Enable or disable automatic extension updates. + +-policy-FirefoxHome = Configure Firefox Home. ++policy-FirefoxHome = Configure Iceweasel Home. + + policy-FlashPlugin = Allow or deny usage of the Flash plugin. + +diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl +index cde625248..662c15736 100644 +--- a/browser/locales/en-US/browser/preferences/preferences.ftl ++++ b/browser/locales/en-US/browser/preferences/preferences.ftl +@@ -551,7 +551,7 @@ home-restore-defaults = + # "Firefox" should be treated as a brand and kept in English, + # while "Home" and "(Default)" can be localized. + home-mode-choice-default = +- .label = Firefox Home (Default) ++ .label = Iceweasel Home (Default) + + home-mode-choice-custom = + .label = Custom URLs… +@@ -578,10 +578,10 @@ choose-bookmark = + .label = Use Bookmark… + .accesskey = B + +-## Home Section - Firefox Home Content Customization ++## Home Section - Iceweasel Home Content Customization + +-home-prefs-content-header = Firefox Home Content +-home-prefs-content-description = Choose what content you want on your Firefox Home screen. ++home-prefs-content-header = Iceweasel Home Content ++home-prefs-content-description = Choose what content you want on your Iceweasel Home screen. --title_noApp=Firefox WebIDE --title_app=Firefox WebIDE: %S -+title_noApp=Iceweasel WebIDE -+title_app=Iceweasel WebIDE: %S + home-prefs-search-header = + .label = Web Search - runtimeButton_label=Select Runtime - projectButton_label=Open App |