commit b6af820db5d77fe5bc9c9e2f02420a8b93c7eb4f Author: Sukhbir Singh <sukhbir@torproject.org> Date: Fri Aug 26 11:15:24 2016 -0400 Remove links from the about screen --- projects/instantbird/aboutDialog.dtd | 8 +++++--- projects/instantbird/aboutDialog.xul | 32 ++++++++------------------------ projects/instantbird/preferences.patch | 2 +- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/projects/instantbird/aboutDialog.dtd b/projects/instantbird/aboutDialog.dtd index 1562ebc..187cf5c 100644 --- a/projects/instantbird/aboutDialog.dtd +++ b/projects/instantbird/aboutDialog.dtd @@ -106,17 +106,19 @@ <!ENTITY channel.description.start "You are currently on the "> <!ENTITY channel.description.end " update channel. "> -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; is developed by"> <!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org --> <!ENTITY project.tpoLink "the &vendorShortName;"> <!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> <!ENTITY help.start "Want to help? "> <!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en --> -<!ENTITY help.donateLink "Donate"> +<!ENTITY help.donate "Donate:"> +<!ENTITY help.donateLink "https://www.torproject.org/donate"> <!ENTITY help.or " or "> <!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en --> -<!ENTITY help.getInvolvedLink "get involved"> +<!ENTITY help.getInvolved "Get Involved:"> +<!ENTITY help.getInvolvedLink "https://www.torproject.org/volunteer"> <!ENTITY help.end "!"> <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en --> <!ENTITY bottomLinks.questions "Questions?"> diff --git a/projects/instantbird/aboutDialog.xul b/projects/instantbird/aboutDialog.xul index 35dfdd6..5e1f51f 100644 --- a/projects/instantbird/aboutDialog.xul +++ b/projects/instantbird/aboutDialog.xul @@ -116,16 +116,14 @@ </label>&project.end; </description> <description class="text-blurb" id="helpDesc"> - &help.start; - <label class="text-link" - href="https://www.torproject.org/donate/donate.html.en"> - &help.donateLink; - </label> - &help.or; - <label class="text-link" - href="https://www.torproject.org/getinvolved/volunteer.html.en"> - &help.getInvolvedLink; - </label>&help.end; + &help.donate; + <textbox flex="1" class="plain" readonly="true" size="36" + value="&help.donateLink;" /> + </description> + <description class="text-blurb" id="getInvolvedLinkDesc"> + &help.getInvolved; + <textbox flex="1" class="plain" readonly="true" size="36" + value="&help.getInvolvedLink;" /> </description> </vbox> @@ -162,20 +160,6 @@ </hbox> <description id="trademark"></description> </vbox> - <hbox id="newBottom" pack="center" position="1"> - <label class="text-link bottom-link" - href="https://www.torproject.org/docs/faq.html.en"> - &bottomLinks.questions; - </label> - <label class="text-link bottom-link" - href="https://www.torproject.org/getinvolved/relays"> - &bottomLinks.grow; - </label> - <label class="text-link bottom-link" - href="about:license"> - &bottomLinks.license; - </label> - </hbox> <description id="trademarkTor" insertafter="trademark"> &tor.TrademarkStatement; </description> diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index f94c7ad..55d1439 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -50,7 +50,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // URL user can browse to manually if for some reason all update installation // attempts fail. -pref("app.update.url.manual", "http://www.instantbird.com/download.html"); -+pref("app.update.url.manual", "https://www.torproject.org/download/download-easy.html"); ++pref("app.update.url.manual", "https://www.torproject.org); // A default value for the "More information about this update" link // supplied in the "An update is available" page of the update wizard.