9003-misc-libre.patch 26 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324
  1. diff --git a/browser/app/permissions b/browser/app/permissions
  2. index 991284081d..888cc811ce 100644
  3. --- a/browser/app/permissions
  4. +++ b/browser/app/permissions
  5. @@ -15,11 +15,5 @@ origin uitour 1 https://support.mozilla.org
  6. origin uitour 1 about:home
  7. origin uitour 1 about:newtab
  8. -# XPInstall
  9. -origin install 1 https://addons.mozilla.org
  10. -
  11. # Remote troubleshooting
  12. origin remote-troubleshooting 1 https://support.mozilla.org
  13. -
  14. -# addon install
  15. -origin install 1 https://fpn.firefox.com
  16. diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml
  17. index 7d37d26..4ebbc06 100644
  18. --- a/browser/components/preferences/sync.inc.xhtml
  19. +++ b/browser/components/preferences/sync.inc.xhtml
  20. @@ -35,22 +35,6 @@
  21. </hbox>
  22. </vbox>
  23. </hbox>
  24. - <label class="fxaMobilePromo" data-l10n-id="sync-mobile-promo">
  25. - <html:img
  26. - src="chrome://browser/skin/logo-android.svg"
  27. - data-l10n-name="android-icon"
  28. - class="androidIcon"/>
  29. - <html:a
  30. - data-l10n-name="android-link"
  31. - class="fxaMobilePromo-android text-link" target="_blank"/>
  32. - <html:img
  33. - src="chrome://browser/skin/logo-ios.svg"
  34. - data-l10n-name="ios-icon"
  35. - class="iOSIcon"/>
  36. - <html:a
  37. - data-l10n-name="ios-link"
  38. - class="fxaMobilePromo-ios text-link" target="_blank"/>
  39. - </label>
  40. </groupbox>
  41. <vbox id="hasFxaAccount">
  42. diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
  43. index dabfadc..3ce732e 100644
  44. --- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl
  45. +++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
  46. @@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation.
  47. policy-ExtensionUpdate = Enable or disable automatic extension updates.
  48. -policy-FirefoxHome = Configure Firefox Home.
  49. +policy-FirefoxHome = Configure Iceweasel Home.
  50. policy-FlashPlugin = Allow or deny usage of the Flash plugin.
  51. diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
  52. index 1b29e8d..6f7566c 100644
  53. --- a/browser/locales/en-US/browser/preferences/preferences.ftl
  54. +++ b/browser/locales/en-US/browser/preferences/preferences.ftl
  55. @@ -550,7 +550,7 @@ home-restore-defaults =
  56. # "Firefox" should be treated as a brand and kept in English,
  57. # while "Home" and "(Default)" can be localized.
  58. home-mode-choice-default =
  59. - .label = Firefox Home (Default)
  60. + .label = Iceweasel Home (Default)
  61. home-mode-choice-custom =
  62. .label = Custom URLs…
  63. @@ -577,10 +577,10 @@ choose-bookmark =
  64. .label = Use Bookmark…
  65. .accesskey = B
  66. -## Home Section - Firefox Home Content Customization
  67. +## Home Section - Iceweasel Home Content Customization
  68. -home-prefs-content-header = Firefox Home Content
  69. -home-prefs-content-description = Choose what content you want on your Firefox Home screen.
  70. +home-prefs-content-header = Iceweasel Home Content
  71. +home-prefs-content-description = Choose what content you want on your Iceweasel Home screen.
  72. home-prefs-search-header =
  73. .label = Web Search
  74. @@ -714,16 +714,6 @@ sync-signedout-account-signin2 =
  75. .label = Sign in to { -sync-brand-short-name }…
  76. .accesskey = i
  77. -# This message contains two links and two icon images.
  78. -# `<img data-l10n-name="android-icon"/>` - Android logo icon
  79. -# `<a data-l10n-name="android-link">` - Link to Android Download
  80. -# `<img data-l10n-name="ios-icon">` - iOS logo icon
  81. -# `<a data-l10n-name="ios-link">` - Link to iOS Download
  82. -#
  83. -# They can be moved within the sentence as needed to adapt
  84. -# to your language, but should not be changed or translated.
  85. -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.
  86. -
  87. ## Firefox Account - Signed in
  88. sync-profile-picture =
  89. diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
  90. index 2d3c7b4..00221d3 100644
  91. --- a/browser/locales/generic/profile/bookmarks.html.in
  92. +++ b/browser/locales/generic/profile/bookmarks.html.in
  93. @@ -1,15 +1,15 @@
  94. #filter substitution
  95. #include @BOOKMARKS_INCLUDE_PATH@
  96. -#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E
  97. +#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC
  98. -#define firefox_icon data:image/png;base64,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
  99. +#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC
  100. -#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==
  101. +#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC
  102. -#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC
  103. +#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC
  104. -#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII=
  105. +#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC
  106. <!-- This Source Code Form is subject to the terms of the Mozilla Public
  107. - License, v. 2.0. If a copy of the MPL was not distributed with this
  108. - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
  109. @@ -21,29 +21,21 @@
  110. <dl><p>
  111. <dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
  112. <dd>@bookmarks_toolbarfolder_description@
  113. -#ifndef NIGHTLY_BUILD
  114. <dl>
  115. - <p><dt><a href="https://www.mozilla.org/@AB_CD@/firefox/central/" icon="@firefox_icon@">@getting_started@</a></dt>
  116. + <p><dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt>
  117. </dl>
  118. - <p><dt><h3>@firefox_heading@</h3></dt>
  119. + <p><dt><h3>Parabola GNU/Linux-libre</h3></dt>
  120. <dl><p>
  121. - <dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@firefox_icon@">@firefox_get_help@</a>
  122. - <dt><a href="https://support.mozilla.org/@AB_CD@/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@">@firefox_customize@</a>
  123. - <dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
  124. - <dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a>
  125. + <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a>
  126. + <dt><a href="https://www.parabola.nu/packages/" icon="@parabola_icon@">Parabola GNU/Linux-libre Packages</a>
  127. + <dt><a href="https://wiki.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Wiki</a>
  128. + <dt><a href="https://labs.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Labs</a>
  129. </dl>
  130. -#else
  131. - <dl>
  132. - <p><dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a>
  133. - </dl>
  134. - <p><dt><h3>@nightly_heading@</h3></dt>
  135. + <p><dt><h3>Free Software Foundation</h3></dt>
  136. <dl><p>
  137. - <dt><a href="https://blog.nightly.mozilla.org/" icon="@mozilla_icon@">@nightly_blog@</a>
  138. - <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz">@bugzilla@</a>
  139. - <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn">@mdn@</a>
  140. - <dt><a href="https://addons.mozilla.org/@AB_CD@/firefox/addon/nightly-tester-tools/" icon="@addon_icon@">@nightly_tester_tools@</a>
  141. - <dt><a href="about:crashes" icon="@mozilla_icon@">@crashes@</a>
  142. - <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@">@planet@</a>
  143. + <dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a>
  144. + <dt><a href="https://www.gnu.org/" icon="@gnu_icon@">The GNU Operating System and the Free Software Movement</a>
  145. + <dt><a href="https://libreplanet.org/" icon="@libreplanet_icon@">LibrePlanet</a>
  146. + <dt><a href="https://www.h-node.org/" icon="@hnode_icon@">h-node</a>
  147. </dl>
  148. -#endif
  149. </dl>
  150. diff --git a/devtools/startup/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
  151. index 5b0709e..38ea275 100644
  152. --- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml
  153. +++ b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
  154. @@ -89,19 +89,6 @@
  155. <ul class="features-list">
  156. </ul>
  157. </div>
  158. -
  159. - <footer>
  160. - <img class="dev-edition-logo"
  161. - src="chrome://devtools-startup/content/aboutdevtools/images/dev-edition-logo.svg"
  162. - alt="" />
  163. - <div class="footer-message">
  164. - <h1 class="footer-message-title" data-l10n-id="footer-title"></h1>
  165. - <p data-l10n-id="footer-message"></p>
  166. - <a class="external footer-link"
  167. - href="https://www.mozilla.org/firefox/developer/"
  168. - target="_blank" data-l10n-id="footer-learn-more-link"></a>
  169. - </div>
  170. - </footer>
  171. </div>
  172. </body>
  173. diff --git a/devtools/startup/locales/en-US/aboutDevTools.ftl b/devtools/startup/locales/en-US/aboutDevTools.ftl
  174. index db2146d..e02ab58 100644
  175. --- a/devtools/startup/locales/en-US/aboutDevTools.ftl
  176. +++ b/devtools/startup/locales/en-US/aboutDevTools.ftl
  177. @@ -3,18 +3,18 @@
  178. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  179. head-title = About Developer Tools
  180. -enable-title = Enable Firefox Developer Tools
  181. -enable-inspect-element-title = Enable Firefox Developer Tools to use Inspect Element
  182. +enable-title = Enable Iceweasel Developer Tools
  183. +enable-inspect-element-title = Enable Iceweasel Developer Tools to use Inspect Element
  184. enable-inspect-element-message = Examine and edit HTML and CSS with the Developer Tools’ Inspector.
  185. -enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Firefox Developer Tools.
  186. +enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Iceweasel Developer Tools.
  187. enable-key-shortcut-message = You activated a Developer Tools shortcut. If that was a mistake, you can close this Tab.
  188. enable-menu-message = Perfect your website’s HTML, CSS, and JavaScript with tools like Inspector and Debugger.
  189. -enable-common-message = Firefox Developer Tools are disabled by default to give you more control over your browser.
  190. +enable-common-message = Iceweasel Developer Tools are disabled by default to give you more control over your browser.
  191. enable-learn-more-link = Learn more about Developer Tools
  192. enable-enable-button = Enable Developer Tools
  193. enable-close-button = Close this Tab
  194. -welcome-title = Welcome to Firefox Developer Tools!
  195. +welcome-title = Welcome to Iceweasel Developer Tools!
  196. newsletter-title = Mozilla Developer Newsletter
  197. newsletter-message = Get developer news, tricks and resources sent straight to your inbox.
  198. newsletter-email-placeholder =
  199. @@ -24,8 +24,6 @@ newsletter-subscribe-button = Subscribe
  200. newsletter-thanks-title = Thanks!
  201. 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.
  202. -footer-title = Firefox Developer Edition
  203. -footer-message = Looking for more than just Developer Tools? Check out the Firefox browser that is built specifically for developers and modern workflows.
  204. footer-learn-more-link = Learn more
  205. features-learn-more = Learn more
  206. diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
  207. index edd871b..77870fe 100644
  208. --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
  209. +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl
  210. @@ -7,7 +7,7 @@ addons-window =
  211. addons-page-title = Add-ons Manager
  212. search-header =
  213. - .placeholder = Search addons.mozilla.org
  214. + .placeholder = Search www.parabola.nu/packages
  215. .searchbuttonlabel = Search
  216. search-header-shortcut =
  217. @@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes
  218. default-heading-search-label = Find more add-ons
  219. addons-heading-search-input =
  220. - .placeholder = Search addons.mozilla.org
  221. + .placeholder = Search www.parabola.nu/packages
  222. addon-page-options-button =
  223. .title = Tools for all add-ons
  224. diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
  225. index 4c4ea76..e0f2880 100644
  226. --- a/browser/locales/en-US/chrome/browser-region/region.properties
  227. +++ b/browser/locales/en-US/chrome/browser-region/region.properties
  228. @@ -9,16 +9,3 @@
  229. # don't make any spelling errors here.
  230. gecko.handlerService.defaultHandlersVersion=4
  231. -# The default set of protocol handlers for mailto:
  232. -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
  233. -gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
  234. -gecko.handlerService.schemes.mailto.1.name=Gmail
  235. -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
  236. -
  237. -# The default set of protocol handlers for irc:
  238. -gecko.handlerService.schemes.irc.0.name=Mibbit
  239. -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
  240. -
  241. -# The default set of protocol handlers for ircs:
  242. -gecko.handlerService.schemes.ircs.0.name=Mibbit
  243. -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
  244. diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl
  245. index 5ac8a7b08c..fec81698e3 100644
  246. --- a/browser/components/protections/content/protections.ftl
  247. +++ b/browser/components/protections/content/protections.ftl
  248. @@ -18,7 +18,7 @@ get-vpn-link = Get { -mozilla-vpn-brand-name }
  249. vpn-title-subscribed = VPN: Subscribed
  250. # Note This text is not being translated, and the <br> will need to be removed if or when it does get translated
  251. -vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. Get the most from your subscription — add it from <br> the <a data-l10n-name="vpn-google-playstore-link">Google Play Store</a> or <a data-l10n-name="vpn-app-store-link">Apple App Store</a>.
  252. +vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices.
  253. vpn-banner-header = Protection that extends beyond the browser
  254. # Note This text is not being translated, and the <br> will need to be removed if or when it does get translated
  255. diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
  256. index e33c814f62..5698f2b3e9 100644
  257. --- a/browser/components/protections/content/protections.html
  258. +++ b/browser/components/protections/content/protections.html
  259. @@ -303,8 +303,6 @@
  260. </div>
  261. <p class="content" data-l10n-id="vpn-header-content"></p>
  262. <p class="content subscribed" data-l10n-id="vpn-header-content-subscribed">
  263. - <a target="_blank" id="vpn-google-playstore-link" data-l10n-name="vpn-google-playstore-link"></a>
  264. - <a target="_blank" id="vpn-app-store-link" data-l10n-name="vpn-app-store-link"></a>
  265. </p>
  266. </div>
  267. <a target="_blank" id="get-vpn-link" data-l10n-id="get-vpn-link"></a>
  268. diff --git a/browser/components/protections/content/vpn-card.js b/browser/components/protections/content/vpn-card.js
  269. index 2417f1a641..698c48ccc3 100644
  270. --- a/browser/components/protections/content/vpn-card.js
  271. +++ b/browser/components/protections/content/vpn-card.js
  272. @@ -23,22 +23,6 @@ export default class VPNCard {
  273. vpnLink.addEventListener("click", () => {
  274. this.doc.sendTelemetryEvent("click", "vpn_card_link");
  275. });
  276. - let androidVPNAppLink = document.getElementById(
  277. - "vpn-google-playstore-link"
  278. - );
  279. - androidVPNAppLink.href = RPMGetStringPref(
  280. - "browser.contentblocking.report.vpn-android.url"
  281. - );
  282. - androidVPNAppLink.addEventListener("click", () => {
  283. - document.sendTelemetryEvent("click", "vpn_app_link_android");
  284. - });
  285. - let iosVPNAppLink = document.getElementById("vpn-app-store-link");
  286. - iosVPNAppLink.href = RPMGetStringPref(
  287. - "browser.contentblocking.report.vpn-ios.url"
  288. - );
  289. - iosVPNAppLink.addEventListener("click", () => {
  290. - document.sendTelemetryEvent("click", "vpn_app_link_ios");
  291. - });
  292. const vpnBanner = this.doc.querySelector(".vpn-banner");
  293. const exitIcon = vpnBanner.querySelector(".exit-icon");