diff options
Diffstat (limited to 'libre/iceweasel/libre.patch')
| -rw-r--r-- | libre/iceweasel/libre.patch | 175 |
1 files changed, 102 insertions, 73 deletions
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index ac2694740..41f16dd08 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -2,34 +2,27 @@ diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content index c0b02e257..dc726d41a 100644 --- a/browser/base/content/abouthome/aboutHome.css +++ b/browser/base/content/abouthome/aboutHome.css -@@ -354,26 +354,46 @@ body[narrow] #restorePreviousSession::before { +@@ -310,6 +310,48 @@ body[narrow] #restorePreviousSession::be width: 32px; } --#aboutMozilla { +#aboutGNU { - display: block; -- position: relative; /* pin wordmark to edge of document, not of viewport */ - -moz-box-ordinal-group: 0; - opacity: .2; - transition: opacity 150ms; - } - --#aboutMozilla:hover { ++ display: block; ++ -moz-box-ordinal-group: 0; ++ opacity: .2; ++ transition: opacity 150ms; ++} ++ +#aboutGNU:hover { - opacity: .6; - } - --#aboutMozilla::before { -- content: url("chrome://browser/content/abouthome/mozilla.svg"); ++ opacity: .6; ++} ++ +#aboutGNU::before { + content: url("chrome://browser/content/abouthome/gnu_headshadow.png"); - display: block; - position: absolute; - top: 12px; - offset-inline-end: 12px; -- width: 67px; -- height: 19px; ++ display: block; ++ position: absolute; ++ top: 12px; ++ offset-inline-end: 12px; + width: 200px; + height: 110px; +} @@ -53,9 +46,11 @@ index c0b02e257..dc726d41a 100644 + left: 12px; + width: 120px; + height: 120px; - } - ++} ++ /* [HiDPI] + * At resolutions above 1dppx, prefer downscaling the 2x Retina graphics + * rather than upscaling the original-size ones (bug 818940). diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js index 50f3e01cd..5df008555 100644 --- a/browser/base/content/abouthome/aboutHome.js @@ -84,7 +79,7 @@ diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/conte index c288e732e..6d14ee773 100644 --- a/browser/base/content/abouthome/aboutHome.xhtml +++ b/browser/base/content/abouthome/aboutHome.xhtml -@@ -48,10 +48,6 @@ +@@ -49,10 +49,6 @@ </div> <div id="snippetContainer"> @@ -95,12 +90,10 @@ index c288e732e..6d14ee773 100644 <span id="rightsSnippet" hidden="true">&abouthome.rightsSnippet;</span> <div id="snippets"/> </div> -@@ -73,7 +69,7 @@ +@@ -73,5 +69,7 @@ + <div id="restorePreviousSessionSeparator"/> <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button> </div> - -- <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&utm_medium=Referral" -- aria-label="&abouthome.aboutMozilla.label;"/> + <a id="aboutGNU" href="https://www.gnu.org"></a> + <a id="aboutDRMfree" href="https://www.defectivebydesign.org/drm-free"></a> </body> @@ -109,11 +102,10 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 4dcd47c95..219019b20 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -31,7 +31,8 @@ browser.jar: +@@ -27,6 +27,8 @@ browser.jar: content/browser/abouthome/settings.png (content/abouthome/settings.png) content/browser/abouthome/restore.png (content/abouthome/restore.png) content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) -- content/browser/abouthome/mozilla.svg (content/abouthome/mozilla.svg) + content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png) + content/browser/abouthome/drm-free.png (content/abouthome/drm-free.png) content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) @@ -262,11 +254,12 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index eff09189b..6d76d20f0 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -93,11 +93,6 @@ +@@ -97,12 +97,6 @@ locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json) #endif - locale/browser/searchplugins/images/amazon.ico (searchplugins/images/amazon.ico) +- locale/browser/searchplugins/images/ebay.ico (searchplugins/images/ebay.ico) - locale/browser/searchplugins/images/wikipedia.ico (searchplugins/images/wikipedia.ico) - locale/browser/searchplugins/images/yahoo.ico (searchplugins/images/yahoo.ico) - locale/browser/searchplugins/images/yandex-en.ico (searchplugins/images/yandex-en.ico) @@ -278,7 +271,7 @@ diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json index 544740a43..4961e5437 100644 --- a/browser/locales/search/list.json +++ b/browser/locales/search/list.json -@@ -1,753 +1,734 @@ +@@ -1,802 +1,748 @@ { "default": { "visibleDefaultEngines": [ @@ -291,7 +284,9 @@ index 544740a43..4961e5437 100644 - "google": "google-nocodes" }, "CA": { -- "google": "google-nocodes" +- "google": "google-nocodes", +- "ebay": "ebay-ca", +- "ebay-fr": "ebay-ca" }, "KZ": { - "google": "google-nocodes" @@ -313,18 +308,45 @@ index 544740a43..4961e5437 100644 }, "HK": { - "google": "google-nocodes" + }, + "AT": { +- "ebay-de": "ebay-at" + }, + "AU": { +- "ebay": "ebay-au", +- "ebay-uk": "ebay-au" + }, + "BE": { +- "ebay": "ebay-be", +- "ebay-nl": "ebay-be", +- "ebay-fr": "ebay-be" + }, + "CH": { +- "ebay": "ebay-ch", +- "ebay-de": "ebay-ch", +- "ebay-fr": "ebay-ch" + }, + "IE": { +- "ebay": "ebay-ie", +- "ebay-uk": "ebay-ie" + }, + "NL": { +- "ebay": "ebay-nl" + }, + "GB": { +- "ebay": "ebay-uk" } }, "locales": { "en-US": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia" +- "google", "yahoo", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" - ] - }, - "experimental-hidden": { - "visibleDefaultEngines": [ -- "yahoo-en-CA", "yandex-en" +- "amazon-ca", "amazon-au", "google-2018", "yahoo-en-CA", "yandex-en" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -348,7 +370,7 @@ index 544740a43..4961e5437 100644 "an": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-es", "bing", "wikipedia-an", "ddg", "twitter" +- "google", "yahoo-es", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -372,7 +394,7 @@ index 544740a43..4961e5437 100644 "ast": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-es", "bing", "diccionariu-alla", "ddg", "wikipedia-ast" +- "google", "yahoo-es", "bing", "diccionariu-alla", "ddg", "ebay-es", "wikipedia-ast" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -396,7 +418,7 @@ index 544740a43..4961e5437 100644 "bg": { "default": { "visibleDefaultEngines": [ -- "google", "diribg", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg" +- "google", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -420,7 +442,7 @@ index 544740a43..4961e5437 100644 "br": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-france", "amazon-france", "ddg", "freelang", "klask", "wikipedia-br" +- "google", "yahoo-france", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -436,7 +458,7 @@ index 544740a43..4961e5437 100644 "ca": { "default": { "visibleDefaultEngines": [ -- "google", "bing", "diec2", "ddg", "twitter", "wikipedia-ca" +- "google", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -460,7 +482,7 @@ index 544740a43..4961e5437 100644 "cy": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "palasprint", "termau", "wikipedia-cy" +- "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "ebay-uk", "palasprint", "termau", "wikipedia-cy" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -476,7 +498,7 @@ index 544740a43..4961e5437 100644 "de": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-de", "amazondotcom-de", "bing", "ddg", "leo_ende_de", "wikipedia-de" +- "google", "yahoo-de", "amazondotcom-de", "bing", "ddg", "ebay-de", "leo_ende_de", "wikipedia-de" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -484,7 +506,7 @@ index 544740a43..4961e5437 100644 "dsb": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-dsb" +- "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-dsb" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -500,7 +522,7 @@ index 544740a43..4961e5437 100644 "en-GB": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "twitter", "wikipedia" +- "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "twitter", "wikipedia" - ] - }, - "experimental-hidden": { @@ -545,7 +567,7 @@ index 544740a43..4961e5437 100644 "es-ES": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-es", "bing", "drae", "ddg", "twitter", "wikipedia-es" +- "google", "yahoo-es", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -554,6 +576,11 @@ index 544740a43..4961e5437 100644 "default": { "visibleDefaultEngines": [ - "google", "yahoo-mx", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" +- ] +- }, +- "experimental-hidden": { +- "visibleDefaultEngines": [ +- "amazon-mx" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -569,7 +596,7 @@ index 544740a43..4961e5437 100644 "eu": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazon-en-GB", "ddg", "elebila", "wikipedia-eu" +- "google", "yahoo", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -601,7 +628,7 @@ index 544740a43..4961e5437 100644 "fr": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr" +- "google", "yahoo-france", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "wikipedia-fr" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -609,7 +636,12 @@ index 544740a43..4961e5437 100644 "fy-NL": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "marktplaats-fy-NL", "wikipedia-fy-NL" +- "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" +- ] +- }, +- "experimental-hidden": { +- "visibleDefaultEngines": [ +- "amazon-nl" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -617,7 +649,7 @@ index 544740a43..4961e5437 100644 "ga-IE": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "tearma", "twitter", "wikipedia-ga-IE" +- "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "ebay-ie", "tearma", "twitter", "wikipedia-ga-IE" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -625,7 +657,7 @@ index 544740a43..4961e5437 100644 "gd": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-en-GB", "faclair-beag", "amazon-en-GB", "bbc-alba", "ddg", "wikipedia-gd" +- "google", "yahoo-en-GB", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -633,7 +665,7 @@ index 544740a43..4961e5437 100644 "gl": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-es", "amazon-en-GB", "ddg", "wikipedia-gl" +- "google", "yahoo-es", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -681,7 +713,7 @@ index 544740a43..4961e5437 100644 "hsb": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-hsb" +- "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "ebay-de", "leo_ende_de", "wikipedia-hsb" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -721,7 +753,7 @@ index 544740a43..4961e5437 100644 "it": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-it", "bing", "amazon-it", "ddg", "hoepli", "wikipedia-it" +- "google", "yahoo-it", "bing", "amazon-it", "ddg", "ebay-it", "hoepli", "wikipedia-it" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -793,7 +825,7 @@ index 544740a43..4961e5437 100644 "lij": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-it", "bing", "amazon-it", "ddg", "paroledigenova-lij", "wikipedia-lij" +- "google", "yahoo-it", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -897,7 +929,12 @@ index 544740a43..4961e5437 100644 "nl": { "default": { "visibleDefaultEngines": [ -- "google", "bing", "bolcom-nl", "ddg", "marktplaats-nl", "wikipedia-nl" +- "google", "bing", "bolcom-nl", "ddg", "ebay-nl", "marktplaats-nl", "wikipedia-nl" +- ] +- }, +- "experimental-hidden": { +- "visibleDefaultEngines": [ +- "amazon-nl" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -938,6 +975,11 @@ index 544740a43..4961e5437 100644 "default": { "visibleDefaultEngines": [ - "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt" +- ] +- }, +- "experimental-hidden": { +- "visibleDefaultEngines": [ +- "amazon-br" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -953,7 +995,7 @@ index 544740a43..4961e5437 100644 "rm": { "default": { "visibleDefaultEngines": [ -- "google", "yahoo-ch", "bing", "ddg", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm" +- "google", "yahoo-ch", "bing", "ddg", "ebay-ch", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm" + "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" ] } @@ -1164,15 +1206,15 @@ diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales index 6097fa82a..3dfe372db 100644 --- a/devtools/client/locales/en-US/toolbox.dtd +++ b/devtools/client/locales/en-US/toolbox.dtd -@@ -93,7 +93,7 @@ +@@ -80,7 +80,7 @@ - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled - boolean preference in about:config, in the options panel. --> <!ENTITY options.enableRemote.label3 "Enable remote debugging"> -<!ENTITY options.enableRemote.tooltip2 "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS"> +<!ENTITY options.enableRemote.tooltip2 "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS"> - <!-- LOCALIZATION NOTE (options.enableWorkers.label): This is the label for the - - checkbox that toggles worker debugging, i.e. devtools.debugger.workers + <!-- LOCALIZATION NOTE (options.disableJavaScript.label, + - options.disableJavaScript.tooltip): This is the options panel label and diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd index 5e1a80ccd..8f375da2e 100644 --- a/devtools/client/locales/en-US/webide.dtd @@ -1186,7 +1228,7 @@ index 5e1a80ccd..8f375da2e 100644 <!ENTITY projectMenu_label "Project"> <!ENTITY projectMenu_accesskey "P"> -@@ -59,7 +59,7 @@ +@@ -55,7 +55,7 @@ <!ENTITY projectButton_label "Open App"> <!ENTITY runtimeButton_label "Select Runtime"> @@ -1210,16 +1252,3 @@ index 2368ad7f1..05e39c74f 100644 runtimeButton_label=Select Runtime projectButton_label=Open App -@@ -54,10 +54,10 @@ error_runtimeVersionTooRecent=The connected runtime has a more recent build date - addons_stable=stable - addons_unstable=unstable - # LOCALIZATION NOTE (addons_simulator_label): This label is shown as the name of --# a given simulator version in the "Manage Simulators" pane. %1$S: Firefox OS -+# a given simulator version in the "Manage Simulators" pane. %1$S: Iceweasel OS - # version in the simulator, ex. 1.3. %2$S: Simulator stability label, ex. - # "stable" or "unstable". --addons_simulator_label=Firefox OS %1$S Simulator (%2$S) -+addons_simulator_label=Iceweasel OS %1$S Simulator (%2$S) - addons_install_button=install - addons_uninstall_button=uninstall - addons_adb_label=ADB Helper Add-on |