From 34999c1d49b9058e32957739e802ce7d137f1034 Mon Sep 17 00:00:00 2001
From: Sam Macbeth <sammacbeth@users.noreply.github.com>
Date: Thu, 10 Sep 2020 20:26:46 +0200
Subject: [PATCH] Update text and links in about dialog (#116)

* Update text and links in about dialog

* Rename 0005-Update-text-in-about-dialog.patch to 0006-Update-text-in-about-dialog.patch

Co-authored-by: Krzysztof Jan Modras <chrmod@chrmod.net>
---
 patches/.index                                |  1 +
 .../0006-Update-text-in-about-dialog.patch    | 56 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 patches/0006-Update-text-in-about-dialog.patch

diff --git a/patches/.index b/patches/.index
index f1f14f733e..cc629d8015 100644
--- a/patches/.index
+++ b/patches/.index
@@ -3,3 +3,4 @@
 0003-Include-ghostery-extension-in-browser-bundle.patch
 0004-Set-update-URL.patch
 0005-Change-new-tab-page-and-home-page-url.patch
+0006-Update-text-in-about-dialog.patch
diff --git a/patches/0006-Update-text-in-about-dialog.patch b/patches/0006-Update-text-in-about-dialog.patch
new file mode 100644
index 0000000000..2a7ca954cf
--- /dev/null
+++ b/patches/0006-Update-text-in-about-dialog.patch
@@ -0,0 +1,56 @@
+From: Sam Macbeth <sam@cliqz.com>
+Date: Thu, 10 Sep 2020 17:52:19 +0200
+Subject: Update text in about dialog
+
+---
+ browser/base/content/aboutDialog.xhtml        | 6 +++---
+ browser/locales/en-US/browser/aboutDialog.ftl | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
+index 69cbf846bb..e8d8bd6b5d 100644
+--- a/browser/base/content/aboutDialog.xhtml
++++ b/browser/base/content/aboutDialog.xhtml
+@@ -133,12 +133,12 @@
+             </description>
+           </vbox>
+           <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
+-            <label is="text-link" href="http://www.mozilla.org/" data-l10n-name="community-mozillaLink"></label>
++            <label is="text-link" href="https://www.ghostery.com/" data-l10n-name="community-mozillaLink"></label>
+             <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"></label>
+           </description>
+           <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
+             <label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&#38;utm_medium=referral&#38;utm_campaign=firefox_about&#38;utm_content=firefox_about" data-l10n-name="helpus-donateLink"></label>
+-            <label is="text-link" href="http://www.mozilla.org/contribute/" data-l10n-name="helpus-getInvolvedLink"></label>
++            <label is="text-link" href="https://github.com/ghostery/user-agent-desktop" data-l10n-name="helpus-getInvolvedLink"></label>
+           </description>
+         </vbox>
+       </vbox>
+@@ -147,7 +147,7 @@
+       <hbox pack="center">
+         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"></label>
+         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"></label>
+-        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/" data-l10n-id="bottomLinks-privacy"></label>
++        <label is="text-link" class="bottom-link" href="https://www.ghostery.com/about-ghostery/privacy-statements/" data-l10n-id="bottomLinks-privacy"></label>
+       </hbox>
+       <description id="trademark" data-l10n-id="trademarkInfo"></description>
+     </vbox>
+diff --git a/browser/locales/en-US/browser/aboutDialog.ftl b/browser/locales/en-US/browser/aboutDialog.ftl
+index 157ab9470b..640aa92b37 100644
+--- a/browser/locales/en-US/browser/aboutDialog.ftl
++++ b/browser/locales/en-US/browser/aboutDialog.ftl
+@@ -39,9 +39,9 @@ warningDesc-version = { -brand-short-name } is experimental and may be unstable.
+ 
+ community-exp = <label data-l10n-name="community-exp-mozillaLink">{ -vendor-short-name }</label> is a <label data-l10n-name="community-exp-creditsLink">global community</label> working together to keep the Web open, public and accessible to all.
+ 
+-community-2 = { -brand-short-name } is designed by <label data-l10n-name="community-mozillaLink">{ -vendor-short-name }</label>, a <label data-l10n-name="community-creditsLink">global community</label> working together to keep the Web open, public and accessible to all.
++community-2 = { -brand-short-name } is designed by <label data-l10n-name="community-mozillaLink">{ -vendor-short-name }</label>, based on code from Mozilla Firefox.
+ 
+-helpus = Want to help? <label data-l10n-name="helpus-donateLink">Make a donation</label> or <label data-l10n-name="helpus-getInvolvedLink">get involved!</label>
++helpus = Want to help? Check out our code on <label data-l10n-name="helpus-getInvolvedLink">Github!</label>
+ 
+ bottomLinks-license = Licensing Information
+ bottomLinks-rights = End-User Rights
+-- 
+2.28.0
+