Merge mozilla-central to autoland. a=merge CLOSED TREE
authorCosmin Sabou <csabou@mozilla.com>
Fri, 20 Apr 2018 01:52:27 +0300
changeset 785559 f7eaee35dcd2dab819bcadcdb9bba2ed53cc697f
parent 785558 a24163782fb72468fa3f83aacd9c15278ff060f3 (current diff)
parent 785383 ea3555cf12afff38370e7a697db81f181e15dbf6 (diff)
child 785560 962aeddcff620280ae2107e1454416c1a7acc45a
push id107257
push userdgottwald@mozilla.com
push dateFri, 20 Apr 2018 10:55:57 +0000
reviewersmerge
milestone61.0a1
Merge mozilla-central to autoland. a=merge CLOSED TREE
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -277,23 +277,16 @@
 
 <!ENTITY pref_tracking_protection_enabled "Enabled">
 <!ENTITY pref_tracking_protection_enabled_pb "Enabled in Private Browsing">
 <!ENTITY pref_tracking_protection_disabled "Disabled">
 
 <!ENTITY pref_whats_new_notification "What\'s new in &brandShortName;">
 <!ENTITY pref_whats_new_notification_summary "Learn about new features after an update">
 
-<!-- Localization note (pref_feature_tips_notification): Title of a new toggleable setting in Settings-Notifications screen.
-     Similar to the already existing "pref_whats_new_notification"-->
-<!ENTITY pref_feature_tips_notification "Product and feature tips">
-<!-- Localization note (pref_feature_tips_notification_summary): Description of a new toggleable setting in Settings-Notifications screen.
-     Similar to the already existing "pref_whats_new_notification_summary"-->
-<!ENTITY pref_feature_tips_notification_summary "Learn more about using &brandShortName; and other &vendorShortName; products">
-
 <!-- Localization note (pref_category_experimental): Title of a sub category in the 'advanced' category
      for experimental features. -->
 <!ENTITY pref_category_experimental "Experimental features">
 
 <!-- Custom Tabs is an Android API for allowing third-party apps to open URLs in a customized UI.
      Instead of switching to the browser it appears as if the user stays in the third-party app.
      For more see: https://developer.chrome.com/multidevice/android/customtabs -->
 <!ENTITY pref_custom_tabs2 "Custom Tabs">
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -220,20 +220,16 @@
 
   <string name="pref_tracking_protection_enabled">&pref_tracking_protection_enabled;</string>
   <string name="pref_tracking_protection_enabled_pb">&pref_tracking_protection_enabled_pb;</string>
   <string name="pref_tracking_protection_disabled">&pref_tracking_protection_disabled;</string>
 
   <string name="pref_whats_new_notification">&pref_whats_new_notification;</string>
   <string name="pref_whats_new_notification_summary">&pref_whats_new_notification_summary;</string>
 
-
-  <string name="pref_feature_tips_notification">&pref_feature_tips_notification;</string>
-  <string name="pref_feature_tips_notification_summary">&pref_feature_tips_notification_summary;</string>
-
   <string name="pref_category_experimental">&pref_category_experimental;</string>
 
   <string name="pref_custom_tabs">&pref_custom_tabs2;</string>
   <string name="pref_custom_tabs_summary">&pref_custom_tabs_summary4;</string>
 
   <string name="custom_tabs_menu_item_open_in">&custom_tabs_menu_item_open_in;</string>
   <string name="custom_tabs_menu_footer">&custom_tabs_menu_footer;</string>
   <string name="custom_tabs_hint_url_copy">&custom_tabs_hint_url_copy;</string>