commit 970fcfe56478aa18fdeaf9ec902f016165dade62 Author: Matthew Finkel <Matthew.Finkel@gmail.com> Date: Mon Nov 19 20:56:22 2018 +0000 Bug 27125 - Move localized Tor Browser for Android strings into separate file Revert changed localized string we don't use anymore. --- .../android/base/locales/en-US/android_strings.dtd | 29 ++-------------------- .../base/locales/en-US/torbrowser_strings.dtd | 25 +++++++++++++++++++ mobile/android/base/locales/moz.build | 1 + mobile/android/base/strings.xml.in | 1 + .../mozbuild/action/generate_strings_xml.py | 3 ++- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index d7cded48fda4..bd55ce0a832f 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -4,8 +4,9 @@ <!ENTITY firstrun_panel_title_welcome "Welcome"> <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> -<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web."> +<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacy"> +<!--This string is modified and localized in torbrowser_strings.dtd --> <!--!ENTITY firstrun_privacy_message "Browse like no one\'s watching"--> <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing."> <!ENTITY firstrun_panel_title_customize "Customize"> @@ -43,32 +44,6 @@ <!ENTITY firstrun_account_title "You"> <!ENTITY firstrun_account_message "Have &brandShortName; on another device?"> -<!-- Location note: Tor First run messages --> -<!ENTITY firstrun_welcome_tab_title "Welcome"> -<!ENTITY firstrun_welcome_title "You\'re ready."> -<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> -<!ENTITY firstrun_welcome_next "Start now"> -<!ENTITY firstrun_privacy_tab_title "Privacy"> -<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> -<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> -<!ENTITY firstrun_privacy_next "Go to Tor Network"> -<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> -<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> -<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> -<!ENTITY firstrun_tornetwork_next "Next"> -<!ENTITY firstrun_secsettings_tab_title "Security"> -<!ENTITY firstrun_secsettings_title "Choose your experience."> -<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> -<!ENTITY firstrun_secsettings_next "Next"> -<!ENTITY firstrun_tips_tab_title "Tips"> -<!ENTITY firstrun_tips_title "Experience Tips."> -<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> -<!ENTITY firstrun_tips_next "Next"> -<!ENTITY firstrun_onionservices_tab_title "Onions"> -<!ENTITY firstrun_onionservices_title "Onion Services."> -<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> -<!ENTITY firstrun_onionservices_next "Go to explore"> - <!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;."> <!-- Localization note: These are used as the titles of different pages on the home screen. diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd b/mobile/android/base/locales/en-US/torbrowser_strings.dtd new file mode 100644 index 000000000000..5419f4942b3e --- /dev/null +++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd @@ -0,0 +1,25 @@ +<!-- Location note: Tor First run messages --> +<!ENTITY firstrun_welcome_tab_title "Welcome"> +<!ENTITY firstrun_welcome_title "You\'re ready."> +<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> +<!ENTITY firstrun_welcome_next "Start now"> +<!ENTITY firstrun_privacy_tab_title "Privacy"> +<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> +<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> +<!ENTITY firstrun_privacy_next "Go to Tor Network"> +<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> +<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> +<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> +<!ENTITY firstrun_tornetwork_next "Next"> +<!ENTITY firstrun_secsettings_tab_title "Security"> +<!ENTITY firstrun_secsettings_title "Choose your experience."> +<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> +<!ENTITY firstrun_secsettings_next "Next"> +<!ENTITY firstrun_tips_tab_title "Tips"> +<!ENTITY firstrun_tips_title "Experience Tips."> +<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> +<!ENTITY firstrun_tips_next "Next"> +<!ENTITY firstrun_onionservices_tab_title "Onions"> +<!ENTITY firstrun_onionservices_title "Onion Services."> +<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> +<!ENTITY firstrun_onionservices_next "Go to explore"> diff --git a/mobile/android/base/locales/moz.build b/mobile/android/base/locales/moz.build index 81edbea9425b..d863a3cc5680 100644 --- a/mobile/android/base/locales/moz.build +++ b/mobile/android/base/locales/moz.build @@ -65,4 +65,5 @@ for f in ['../res/values/strings.xml', # The `en-US/` will be rewritten to the locale-specific path. 'en-US/android_strings.dtd', 'en-US/sync_strings.dtd', + 'en-US/torbrowser_strings.dtd', ] diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index cfc7b5a137f8..2beb152ad5bb 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -8,6 +8,7 @@ #includesubst @BRANDPATH@ #includesubst @STRINGSPATH@ #includesubst @SYNCSTRINGSPATH@ +#includesubst @TBSTRINGSPATH@ <!-- C-style format strings. --> <!ENTITY formatI "%I"> diff --git a/python/mozbuild/mozbuild/action/generate_strings_xml.py b/python/mozbuild/mozbuild/action/generate_strings_xml.py index b60b480f0748..0b3ca6efb229 100644 --- a/python/mozbuild/mozbuild/action/generate_strings_xml.py +++ b/python/mozbuild/mozbuild/action/generate_strings_xml.py @@ -11,7 +11,7 @@ import buildconfig from mozbuild import preprocessor -def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None): +def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, torbrowser_strings_dtd, locale=None): if not locale: raise ValueError('locale must be specified!') @@ -23,6 +23,7 @@ def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None # Includes. defines['STRINGSPATH'] = android_strings_dtd defines['SYNCSTRINGSPATH'] = sync_strings_dtd + defines['TBSTRINGSPATH'] = torbrowser_strings_dtd # Fennec branding is en-US only: see # $(MOZ_BRANDING_DIRECTORY)/locales/jar.mn. defines['BRANDPATH'] = '{}/{}/locales/en-US/brand.dtd'.format(