diff -Nur a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css --- a/browser/base/content/abouthome/aboutHome.css 2015-10-29 19:17:46.000000000 -0300 +++ b/browser/base/content/abouthome/aboutHome.css 2015-11-05 02:05:34.656054627 -0300 @@ -347,26 +347,46 @@ width: 32px; } -#aboutMozilla { +#aboutGNU { display: block; - position: relative; /* pin wordmark to edge of document, not of viewport */ -moz-box-ordinal-group: 0; opacity: .5; transition: opacity 150ms; } -#aboutMozilla:hover { +#aboutGNU:hover { opacity: 1; } -#aboutMozilla::before { - content: url("chrome://browser/content/abouthome/mozilla.png"); +#aboutGNU::before { + content: url("chrome://browser/content/abouthome/gnu_headshadow.png"); display: block; position: absolute; top: 12px; right: 12px; - width: 69px; - height: 19px; + width: 200px; + height: 110px; +} + +#aboutDRMfree { + display: block; + -moz-box-ordinal-group: 0; + opacity: .5; + transition: opacity 150ms; +} + +#aboutDRMfree:hover { + opacity: 1; +} + +#aboutDRMfree::before { + content: url("chrome://browser/content/abouthome/drm-free.png"); + display: block; + position: absolute; + top: 12px; + left: 12px; + width: 120px; + height: 120px; } /* [HiDPI] @@ -443,9 +463,5 @@ transform: scale(-0.5, 0.5) translateX(24px); transform-origin: top center; } - - #aboutMozilla::before { - content: url("chrome://browser/content/abouthome/mozilla@2x.png"); - } } diff -Nur a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js --- a/browser/base/content/abouthome/aboutHome.js 2015-10-29 19:17:46.000000000 -0300 +++ b/browser/base/content/abouthome/aboutHome.js 2015-11-05 02:08:05.691711824 -0300 @@ -9,17 +9,13 @@ // * add a for it in aboutHome.xhtml // * add an entry here in the proper ordering (based on spans) // The part of the snippet will be linked to the corresponding url. -const DEFAULT_SNIPPETS_URLS = [ - "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet" -, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons" -]; +const DEFAULT_SNIPPETS_URLS = [ "" ]; -const SNIPPETS_UPDATE_INTERVAL_MS = 14400000; // 4 hours. +const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. // IndexedDB storage constants. const DATABASE_NAME = "abouthome"; const DATABASE_VERSION = 1; -const DATABASE_STORAGE = "persistent"; const SNIPPETS_OBJECTSTORE_NAME = "snippets"; // This global tracks if the page has been set up before, to prevent double inits diff -Nur a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml --- a/browser/base/content/abouthome/aboutHome.xhtml 2015-10-29 19:17:46.000000000 -0300 +++ b/browser/base/content/abouthome/aboutHome.xhtml 2015-11-05 02:21:42.590232015 -0300 @@ -48,10 +48,6 @@
-
@@ -74,6 +70,7 @@
- + + diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn 2015-10-29 19:17:46.000000000 -0300 +++ b/browser/base/jar.mn 2015-11-05 02:04:47.155135935 -0300 @@ -32,7 +32,8 @@ 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.png (content/abouthome/mozilla.png) + 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) content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) @@ -44,7 +45,6 @@ content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) - content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) content/browser/aboutNetError.xhtml (content/aboutNetError.xhtml) diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd --- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-10-29 19:17:49.000000000 -0300 +++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-11-05 02:42:55.632130642 -0300 @@ -11,14 +11,6 @@ - -latest features."> - -Choose from thousands of add-ons."> Know your rights…"> diff -Nur a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd --- a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd 2015-10-29 19:17:49.000000000 -0300 +++ b/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd 2015-11-05 02:04:47.171801755 -0300 @@ -24,7 +24,7 @@ - + diff -Nur a/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties b/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties --- a/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties 2015-10-29 19:17:50.000000000 -0300 +++ b/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties 2015-11-05 02:04:47.171801755 -0300 @@ -4,7 +4,7 @@ # LOCALIZATION NOTE These strings are used inside the Source Editor component. # This component is used whenever source code is displayed for the purpose of -# being edited, inside the Firefox developer tools - current examples are the +# being edited, inside the Iceweasel developer tools - current examples are the # Scratchpad and the Style Editor tools. # LOCALIZATION NOTE The correct localization of this file might be to keep it diff -Nur a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd --- a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-10-29 19:17:50.000000000 -0300 +++ b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd 2015-11-05 02:04:47.171801755 -0300 @@ -90,7 +90,7 @@ - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled - boolean preference in about:config, in the options panel. --> - + - + - + @@ -58,7 +58,7 @@ - + diff -Nur a/browser/locales/en-US/chrome/browser/devtools/webide.properties b/browser/locales/en-US/chrome/browser/devtools/webide.properties --- a/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-10-29 19:17:50.000000000 -0300 +++ b/browser/locales/en-US/chrome/browser/devtools/webide.properties 2015-11-05 02:04:47.171801755 -0300 @@ -2,8 +2,8 @@ # 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 runtimeButton_label=Select Runtime projectButton_label=Open App @@ -54,10 +54,10 @@ 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 diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties --- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-10-29 19:17:49.000000000 -0300 +++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-11-05 02:04:47.171801755 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine -browser.search.defaultenginename=Google +browser.search.defaultenginename=searx # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google -browser.search.order.2=Yahoo -browser.search.order.3=Bing - -# This is the default set of web based feed handlers shown in the reader -# selection UI -browser.contentHandlers.types.0.title=My Yahoo! -browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s +browser.search.order.1=searx +browser.search.order.2=DuckDuckGo HTML +browser.search.order.3=DuckDuckGo Lite # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the @@ -22,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=4 -# The default set of protocol handlers for webcal: -gecko.handlerService.schemes.webcal.0.name=30 Boxes -gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s - -# The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail -gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s - # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in --- a/browser/locales/generic/profile/bookmarks.html.in 2015-10-29 19:17:50.000000000 -0300 +++ b/browser/locales/generic/profile/bookmarks.html.in 2015-11-05 02:04:47.171801755 -0300 @@ -15,13 +15,20 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@

-

@getting_started@ +
Parabola GNU/Linux-libre

-

@firefox_heading@

+

Parabola GNU/Linux-libre

-

@firefox_help@ -
@firefox_customize@ -
@firefox_community@ -
@firefox_about@ +
Parabola GNU/Linux-libre +
Parabola GNU/Linux-libre Packages +
Parabola GNU/Linux-libre Wiki +
Parabola GNU/Linux-libre Labs +

+

Free Software Foundation

+

+

Free Software Foundation +
The GNU Operating System and the Free Software Movement +
LibrePlanet +
h-node

diff -Nur a/debian/branding/Makefile.in b/debian/branding/Makefile.in --- a/debian/branding/Makefile.in 2015-11-03 20:35:49.000000000 -0300 +++ b/debian/branding/Makefile.in 2015-11-05 04:24:34.326560824 -0300 @@ -32,9 +32,9 @@ GARBAGE += document_icon.png default64.png mozicon128.png default16.png default32.png default48.png default64.png: $(srcdir)/iceweasel_icon.svg - rsvg-convert -w $(SIZE) -h $(SIZE) -o $@ $< + convert -background none $< -resize $(SIZE)x$(SIZE)^ -gravity center -extent $(SIZE)x$(SIZE) $@ iceweasel_logo.png: $(srcdir)/iceweasel_logo.svg - rsvg-convert -w 256 -a -o $@ $< + convert -background none $< -resize 256x256^ -gravity center -extent 256x256 $@ GARBAGE += iceweasel_logo.png diff -Nur a/debian/branding/content/Makefile.in b/debian/branding/content/Makefile.in --- a/debian/branding/content/Makefile.in 2015-11-03 21:06:22.000000000 -0300 +++ b/debian/branding/content/Makefile.in 2015-11-05 04:26:53.849713418 -0300 @@ -23,10 +23,10 @@ convert - -define png:exclude-chunk=time +set date:create +set date:modify $@ about-logo.png: ../iceweasel_icon.svg - rsvg-convert -w 210 -h 210 -o $@ $< + convert -background none $< -resize 210x210^ -gravity center -extent 210x210 $@ about-logo@2x.png: ../iceweasel_icon.svg - rsvg-convert -w 420 -h 420 -o $@ $< + convert -background none $< -resize 420x420^ -gravity center -extent 420x420 $@ about-wordmark.svg: wordmark.xsl ../iceweasel_logo.svg xsltproc -o $@ $^