Bug 1200665 - Restricted profiles: Update SUMO URL. r=margaret
authorSebastian Kaspari <s.kaspari@gmail.com>
Wed, 02 Sep 2015 11:36:34 +0200
changeset 295584 47f4d82b8129c8183fb4e3566850510e59b60acb
parent 295459 888d001bcc3c17043e0800bc13c08274a1fec0ae
child 295585 c868ce24344c8a59f703d4a0cb64067288c7512c
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs1200665
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1200665 - Restricted profiles: Update SUMO URL. r=margaret
mobile/android/base/firstrun/RestrictedWelcomePanel.java
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/strings.xml.in
mobile/locales/en-US/chrome/region.properties
--- a/mobile/android/base/firstrun/RestrictedWelcomePanel.java
+++ b/mobile/android/base/firstrun/RestrictedWelcomePanel.java
@@ -16,17 +16,17 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import java.util.EnumSet;
 
 public class RestrictedWelcomePanel extends FirstrunPanel {
     public static final int TITLE_RES = R.string.firstrun_panel_title_welcome;
 
-    private static final String LEARN_MORE_URL = "https://support.mozilla.org/kb/kids";
+    private static final String LEARN_MORE_URL = "https://support.mozilla.org/kb/controlledaccess";
 
     private HomePager.OnUrlOpenListener onUrlOpenListener;
 
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
 
         try {
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -718,12 +718,12 @@ just addresses the organization to follo
 <!-- LOCALIZATION NOTE (bookmarks_about_browser): link title for about:fennec -->
 <!ENTITY bookmarks_about_browser "Firefox: About your browser">
 <!-- LOCALIZATION NOTE (bookmarks_addons): link title for https://addons.mozilla.org/en-US/mobile -->
 <!ENTITY bookmarks_addons "Firefox: Customize with add-ons">
 <!-- LOCALIZATION NOTE (bookmarks_support): link title for https://support.mozilla.org/ -->
 <!ENTITY bookmarks_support "Firefox: Support">
 <!--LOCALIZATION NOTE (bookmarks_marketplace):link title for https://marketplace.firefox.com -->
 <!ENTITY bookmarks_marketplace "Firefox Marketplace">
-<!-- LOCALIZATION NOTE (bookmarks_restricted_support): link title for https://support.mozilla.org/kb/kids -->
+<!-- LOCALIZATION NOTE (bookmarks_restricted_support): link title for https://support.mozilla.org/kb/controlledaccess -->
 <!ENTITY bookmarks_restricted_support "Firefox Help and Support for a simplified kid-friendly version of Firefox">
 <!-- LOCALIZATION NOTE (bookmarks_restricted_webmaker):link title for https://webmaker.org -->
 <!ENTITY bookmarks_restricted_webmaker "Learn the Web: Mozilla Webmaker">
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -468,17 +468,17 @@
   <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_marketplace -->
   <string name="bookmarkdefaults_title_marketplace">&bookmarks_marketplace;</string>
   <string name="bookmarkdefaults_url_marketplace">https://marketplace.firefox.com/</string>
 
   <string name="bookmarkdefaults_title_restricted_webmaker">&bookmarks_restricted_webmaker;</string>
   <string name="bookmarkdefaults_url_restricted_webmaker">https://webmaker.org/</string>
 
   <string name="bookmarkdefaults_title_restricted_support">&bookmarks_restricted_support;</string>
-  <string name="bookmarkdefaults_url_restricted_support">https://support.mozilla.org/kb/kids</string>
+  <string name="bookmarkdefaults_url_restricted_support">https://support.mozilla.org/kb/controlledaccess</string>
 
   <!-- Site identity popup -->
   <string name="identity_connection_secure">&identity_connection_secure;</string>
   <string name="identity_connection_insecure">&identity_connection_insecure;</string>
 
   <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string>
   <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</string>
   <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</string>
--- a/mobile/locales/en-US/chrome/region.properties
+++ b/mobile/locales/en-US/chrome/region.properties
@@ -71,17 +71,17 @@ browser.suggestedsites.fxsupport.url=htt
 browser.suggestedsites.fxsupport.bgcolor=#f37c00
 browser.suggestedsites.fxsupport.trackingid=631
 
 browser.suggestedsites.restricted.list.0=restricted_fxsupport
 browser.suggestedsites.restricted.list.1=webmaker
 browser.suggestedsites.restricted.list.2=restricted_mozilla
 
 browser.suggestedsites.restricted_fxsupport.title=Firefox Help and Support for a simplified kid-friendly version of Firefox
-browser.suggestedsites.restricted_fxsupport.url=https://support.mozilla.org/kb/kids
+browser.suggestedsites.restricted_fxsupport.url=https://support.mozilla.org/kb/controlledaccess
 browser.suggestedsites.restricted_fxsupport.bgcolor=#f37c00
 
 browser.suggestedsites.webmaker.title=Learn the Web: Mozilla Webmaker
 browser.suggestedsites.webmaker.url=https://webmaker.org/
 browser.suggestedsites.webmaker.bgcolor=#f37c00
 
 # LOCALIZATION NOTE: browser.suggestedsites.restricted_mozilla.url must be different from browser.suggestedsites.mozilla.url
 browser.suggestedsites.restricted_mozilla.title=The Mozilla Project