[Dev] Orphan Libre package [iceweasel] marked out-of-date
grizzlyuser
grizzlyuser at protonmail.com
Fri Dec 6 22:47:42 GMT 2019
Hello,
Below is a patch to update Iceweasel to 71.0. Built and tested it
on x86_64 with brand new fresh profile after ~/.mozilla folder
removal. I didn't try to make it build on other architectures,
as according to package search on Arch Linux ARM & 32 websites,
they have not yet updated theirs.
Please remove the following files manually, because otherwise
the patch would be quite huge:
firefox-70.0-update-bindgen.patch
no-relinking.patch
Added a few changes that remove or disable questionable
recommendations / whitelisting included in vanilla Firefox. Feel
free to omit any of those. Most of vendor.js preferences from
PKGBUILD still need to be reviewed. Needed to build with !debug
in makepkg.conf OPTIONS, because current build of clang didn't
recognize -fvar-tracking-assignments flag added along with
others when debugging is turned on.
It's not clear if newly added links to Mozilla services and apps
Firefox Monitor, Firefox Send and Firefox Lockwise are up to
FSDG and Parabola guidelines. At first glance these appear to be
MPL-2.0 licensed (server and client code), but it's not clear
whether their trademarks and dependencies are free. More
research is needed.
Changed:
1. Merge changes from Arch Linux firefox 71.0-1 except those
related to Mozilla bug 1212502;
In PKGBUILD:
2. Update pkgver and checksums;
3. Add back --disable-eme build flag and removed EME-related
vendor.js additions. browser.eme.ui.enabled and
media.eme.enabled are set to false with this build flag anyway,
and media.eme.apiVisible looks likely to be not available
anymore (at least full source search for 'apiVisible' returns
nothing). However I'm not sure if all this does the trick for
FSDG compliance, since if Parabola is to distribute the full
source code, EME support implementation would still be there.
And you can see in the build logs that some EME related stuff is
still built even if the flag is set.
4. Remove code related to crashreporter symbols as it's already
disabled by --disable-crashreporter flag and appropriate files
are not generated after build in this case;
5. Remove browser.newtabpage.activity-stream.enabled according
to upstream [1];
6. Remove browser.newtabpage.enhanced, full text search returns
only one test file that contains both 'newtabpage' and
'enhanced';
7. Override browser.newtabpage.activity-stream.default.sites to
include links to Parabola and other free software sites Abrowser
from Trisquel includes. Not sure about what is the licensing of
Wikipedia website client code, but it uses MediaWiki, which is
licensed under GPLv2+;
8. Disable "Recommend extensions as you browse" in
about:preferences#general
(browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons);
9. Set URL for 'Find more extensions / themes' in about:addons
page to search in Parabola packages
(extensions.getAddons.search.browseURL) as addons.mozilla.org is
not FSDG compliant per my understanding;
10. Make extensions work on Mozilla domains that are whitelisted
and not affected by extensions at all in vanilla FF
(extensions.webextensions.restrictedDomains);
In iceweasel.desktop:
11. Changed text case of the value of StartupWMClass similar to
firefox.desktop from Arch;
In libre.patch
12. Remove patching of DevTools connect page and WebIDE since
removed upstream [2];
13. Remove Mozilla domains from Preferences -> Privacy &
Security -> "Warn you when websites try to install add-ons"
exception list, because Mozilla is not committed to only include
free software in their repositories (especially AMO), so these
look like against FSDG;
14. Remove Preferences -> Sync promo text with links that says
"Download Firefox for Android or iOS". There appears to be no
Iceweasel version for either of those mobile OS. iOS link leads
to nonfree Firefox. Android link leads to IceCat on F-Droid, but
it's outdated and has known critical security vulnerabilities,
so cannot recommend it either;
15. Change wording from Firefox to Iceweasel and remove page
sections with links to download nonfree Firefox Developer
Edition - from DevTools 'What's New' tab and about:devtools.
'What's New' tab looks problematic, as it would need to be
patched each new FF release;
16. Rebrand about:preferences#home from Firefox to Iceweasel.
[1] https://bugzilla.mozilla.org/show_bug.cgi?id=1433324
[2] https://bugzilla.mozilla.org/show_bug.cgi?id=1539462
diff --git a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
index 8cc378636..165a532f4 100644
--- a/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/libre/iceweasel/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -1,5 +1,4 @@
-From 1cab10b39cfda068100cab8c598f1ca0f50e4131 Mon Sep 17 00:00:00 2001
-Message-Id: <1cab10b39cfda068100cab8c598f1ca0f50e4131.1553597287.git.jan.steffens at gmail.com>
+From 83f234464554c7f4393cd1dbdeb3a68d3ae0ccae Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
Date: Mon, 25 Mar 2019 20:30:11 +0100
Subject: [PATCH] Use remoting name for GDK application names
@@ -10,10 +9,10 @@ Subject: [PATCH] Use remoting name for GDK application names
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 0b808ef215f06..28911c0ffeaec 100644
+index 984b998133bd..b6c9f013940c 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3728,11 +3728,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -3746,11 +3746,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
// consistently.
// Set program name to the one defined in application.ini.
@@ -27,7 +26,7 @@ index 0b808ef215f06..28911c0ffeaec 100644
// Initialize GTK here for splash.
diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
-index 0686ff814916b..ae4a4ea55f420 100644
+index 0daa78fdbbad..49038d0bb1c8 100644
--- a/widget/gtk/nsAppShell.cpp
+++ b/widget/gtk/nsAppShell.cpp
@@ -24,6 +24,7 @@
@@ -38,7 +37,7 @@ index 0686ff814916b..ae4a4ea55f420 100644
#include "ScreenHelperGTK.h"
#include "HeadlessScreenHelper.h"
#include "mozilla/widget/ScreenManager.h"
-@@ -171,10 +172,8 @@ nsresult nsAppShell::Init() {
+@@ -175,10 +176,8 @@ nsresult nsAppShell::Init() {
// option when program uses gdk_set_program_class().
//
// See https://bugzilla.gnome.org/show_bug.cgi?id=747634
@@ -52,5 +51,5 @@ index 0686ff814916b..ae4a4ea55f420 100644
}
--
-2.21.0
+2.24.0
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 88c99a7ba..7b4e53cce 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -40,7 +40,7 @@
pkgname=iceweasel
replaces=('firefox')
epoch=1
-pkgver=70.0.1
+pkgver=71.0
pkgrel=1
pkgrel+=.parabola1
_brandingver=70.0
@@ -65,24 +65,20 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'hunspell-en_US: Spell checking, American English')
options=(!emptydirs !makeflags !strip)
source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
- no-relinking.patch
0001-Use-remoting-name-for-GDK-application-names.patch
$pkgname.desktop)
source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
- firefox-70.0-update-bindgen.patch
firefox-70.0-add-distro.patch
libre.patch
libre-searchengines.patch)
-sha256sums=('f2e9bb26af7682b31e82fdfc3a4b3e04fd1caa8b004469ea608185d33e35691b'
+sha256sums=('78304cd58229e7103b56b34718aad051c9a4db30c266512a64f501ba58da7fbe'
'SKIP'
- '2dc9d1aa5eb7798c89f46478f254ae61e4122b4d1956d6044426288627d8a014'
- 'ab07ab26617ff76fce68e07c66b8aa9b96c2d3e5b5517e51a3c3eac2edd88894'
- 'e439117380218898cd5c60a8da8947847efbd0fe64cc06b129d6ca20a392cb3d'
+ '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
+ 'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
'e90956067d8549f02864d612369ed8714d7173f0ee07bbfb4374a7323b4a733e'
'SKIP'
- 'bde80a158f42f6afd01d9f3ce1ff9c8ecb89db96b6b7398f2acfb03436234eeb'
'41ab298519dfdf86e1599990cd2a2e4d939a2a1d77de829caa0593d0d2e8f0e8'
- '783e1b7c2f6f8719cc8a0751aacc823a5029c2326ac0b5ff7c659d831e286387'
+ '698e73d66bb94d82cc11bc0a56cb59455b3b0b51798a48ad7a7b4c429104647e'
'dfed11d97f1d4198a3dc608be159b6b53a11054f376cdb73bb0fe9a487ae9418')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
@@ -91,15 +87,9 @@ prepare() {
mkdir mozbuild
cd firefox-$pkgver
- # Avoid relinking during buildsymbols
- patch -Np1 -i ../no-relinking.patch
-
# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1583471
- patch -Np1 -i ../firefox-70.0-update-bindgen.patch
-
# https://bugzilla.mozilla.org/show_bug.cgi?id=1212502
patch -Np1 -i ../firefox-70.0-add-distro.patch
@@ -139,6 +129,7 @@ ac_add_options --disable-crashreporter
ac_add_options --disable-gconf
ac_add_options --disable-updater
ac_add_options --disable-tests
+ac_add_options --disable-eme
END
if [[ $CARCH = arm* ]]; then
@@ -257,7 +248,7 @@ END
xvfb-run -a -n 92 -s "-screen 0 1600x1200x24" \
./mach python build/pgo/profileserver.py
- if ! compgen -G '*.profraw' >&2; then
+ if [[ ! -s merged.profdata ]]; then
error "No profile data produced."
return 1
fi
@@ -274,7 +265,7 @@ END
cat >.mozconfig ../mozconfig - <<END
ac_add_options --enable-lto=cross
ac_add_options --enable-profile-use=cross
-ac_add_options --with-pgo-profile-path=${PWD at Q}
+ac_add_options --with-pgo-profile-path=${PWD at Q}/merged.profdata
ac_add_options --with-pgo-jarlog=${PWD at Q}/jarlog
END
./mach build
@@ -290,7 +281,6 @@ package() {
cd firefox-$pkgver
DESTDIR="$pkgdir" ./mach install
- find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
local vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
install -Dvm644 /dev/stdin "$vendorjs" <<END
@@ -328,12 +318,6 @@ pref("geo.enabled", false);
// Make sure that the request URL of the GeoLocation backend is empty
pref("geo.wifi.uri", "");
-// Disable Freedom Violating DRM Feature
-pref("browser.eme.ui.enabled", false);
-// EME
-pref("media.eme.enabled", false);
-pref("media.eme.apiVisible", false);
-
// Google Widevine DRM
// https://blog.mozilla.org/futurereleases/2016/04/08/mozilla-to-test-widevine-cdm-in-firefox-nightly/
// https://wiki.mozilla.org/QA/Widevine_CDM
@@ -342,9 +326,9 @@ pref("media.gmp-widevinecdm.visible", false);
pref("media.gmp-widevinecdm.enabled", false);
pref("media.gmp-widevinecdm.autoupdate", false);
-// Default to classic view for about:newtab
-pref("browser.newtabpage.enhanced", false);
-pref("browser.newtabpage.activity-stream.enabled", false);
+// Default sites for about:newtab
+// Sites from Firefox (Facebook, Amazon etc.) are not likely to serve only libre JavaScript
+pref("browser.newtabpage.activity-stream.default.sites", "https://www.parabola.nu/,https://www.gnu.org/,https://www.fsf.org/,https://libreplanet.org/,https://www.wikipedia.org/");
// Poodle attack
pref("security.tls.version.min", 1);
@@ -620,6 +604,15 @@ pref("security.sandbox.content.syscall_whitelist", "16");
// https://labs.parabola.nu/issues/2409
pref("extensions.htmlaboutaddons.discover.enabled", false);
pref("extensions.htmlaboutaddons.recommendations.enabled", false);
+
+// Disable "Recommend extensions as you browse" in about:preferences#general
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
+
+// URL for 'Find more extensions / themes' in about:addons page
+pref("extensions.getAddons.search.browseURL", "https://www.parabola.nu/packages/?q=%TERMS%");
+
+// Make extensions work on Mozilla domains
+pref("extensions.webextensions.restrictedDomains", "");
END
local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
@@ -661,14 +654,6 @@ END
if [[ -e $nssckbi ]]; then
ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
fi
-
- if [[ -f "$startdir/.crash-stats-api.token" ]]; then
- find . -name '*crashreporter-symbols-full.zip' -exec \
- "$startdir/upload-symbol-archive" "$startdir/.crash-stats-api.token" {} +
- else
- find . -name '*crashreporter-symbols-full.zip' -exec \
- cp -fvt "$startdir" {} +
- fi
}
# vim:set sw=2 et:
diff --git a/libre/iceweasel/iceweasel.desktop b/libre/iceweasel/iceweasel.desktop
index 8d69f828c..1e9917e79 100644
--- a/libre/iceweasel/iceweasel.desktop
+++ b/libre/iceweasel/iceweasel.desktop
@@ -119,7 +119,7 @@ X-MultipleArgs=false
Type=Application
MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;
StartupNotify=true
-StartupWMClass=Iceweasel
+StartupWMClass=iceweasel
Categories=Network;WebBrowser;
Actions=new-window;new-private-window;
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index ccb0f076a..284de964a 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
--<!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 @@
+-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.
+
+-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/.
--title_noApp=Firefox WebIDE
--title_app=Firefox WebIDE: %S
-+title_noApp=Iceweasel WebIDE
-+title_app=Iceweasel WebIDE: %S
+-### 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.
- runtimeButton_label=Select Runtime
- projectButton_label=Open App
+ home-prefs-search-header =
+ .label = Web Search
More information about the Dev
mailing list