Bug 1315201: Dismiss -> Remove in AS context menu. r=liuche draft
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 23 Aug 2017 12:01:52 -0700
changeset 651666 cb553cff3c4928fb40dea359a1604832718b793d
parent 651665 c20167ccb9cdba1350b81094cb1a4ffea7b842a9
child 727841 1009a179c281551e0e67cd628c28f088cffb6a18
push id75787
push usermichael.l.comella@gmail.com
push dateWed, 23 Aug 2017 22:00:44 +0000
reviewersliuche
bugs1315201
milestone57.0a1
Bug 1315201: Dismiss -> Remove in AS context menu. r=liuche MozReview-Commit-ID: 5avMlzXbGDk
mobile/android/app/src/main/res/menu/activitystream_contextmenu.xml
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/strings.xml.in
--- a/mobile/android/app/src/main/res/menu/activitystream_contextmenu.xml
+++ b/mobile/android/app/src/main/res/menu/activitystream_contextmenu.xml
@@ -11,17 +11,17 @@
             android:icon="@drawable/as_private"
             android:title="@string/contextmenu_open_private_tab"/>
     </group>
 
     <group android:id="@+id/group1">
         <item
             android:id="@+id/dismiss"
             android:icon="@drawable/as_dismiss"
-            android:title="@string/activity_stream_dismiss"/>
+            android:title="@string/activity_stream_remove"/>
 
         <item
             android:id="@+id/delete"
             android:icon="@drawable/as_bin"
             android:visible="false"
             android:title="@string/activity_stream_delete_history"/>
     </group>
 
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -833,20 +833,20 @@ just addresses the organization to follo
 
 <!-- LOCALIZATION NOTE (activity_stream_highlight_label_bookmarked): This label is shown in the Activity
 Stream list for highlights sourced from th user's bookmarks. -->
 <!ENTITY activity_stream_highlight_label_bookmarked "Bookmarked">
 <!-- LOCALIZATION NOTE (activity_stream_highlight_label_visited): This label is shown in the Activity
 Stream list for highlights sourced from th user's bookmarks. -->
 <!ENTITY activity_stream_highlight_label_visited "Visited">
 
-<!-- LOCALIZATION NOTE (activity_stream_dismiss): This label is shown in the Activity Stream context menu,
+<!-- LOCALIZATION NOTE (activity_stream_remove): This label is shown in the Activity Stream context menu,
 and allows hiding a URL/page from highlights or topsites. The page remains in history/bookmarks, but
 is simply hidden from the Activity Stream panel. -->
-<!ENTITY activity_stream_dismiss "Dismiss">
+<!ENTITY activity_stream_remove "Remove">
 <!ENTITY activity_stream_delete_history "Delete from History">
 
 <!ENTITY activity_stream_welcome_title "Welcome to your Highlights">
 <!ENTITY activity_stream_welcome_content1 "&brandShortName; now creates highlights of things you\'ve discovered on the web so you can find your way back to great articles, videos, bookmarks, and other pages.">
 <!ENTITY activity_stream_welcome_dismiss "Dismiss">
 
 <!ENTITY private_tab_panel_title "Private Browsing + Tracking Protection">
 <!ENTITY private_tab_panel_description "&brandShortName; blocks parts of the pages that may track your browsing activity.">
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -630,17 +630,17 @@
   <string name="helper_triple_readerview_open_title">&helper_triple_readerview_open_title;</string>
   <string name="helper_triple_readerview_open_message">&helper_triple_readerview_open_message;</string>
   <string name="helper_triple_readerview_open_button">&helper_triple_readerview_open_button;</string>
 
   <string name="activity_stream_topsites">&activity_stream_topsites;</string>
   <string name="activity_stream_highlights">&activity_stream_highlights;</string>
   <string name="activity_stream_highlight_label_bookmarked">&activity_stream_highlight_label_bookmarked;</string>
   <string name="activity_stream_highlight_label_visited">&activity_stream_highlight_label_visited;</string>
-  <string name="activity_stream_dismiss">&activity_stream_dismiss;</string>
+  <string name="activity_stream_remove">&activity_stream_remove;</string>
   <string name="activity_stream_delete_history">&activity_stream_delete_history;</string>
 
   <string name="activity_stream_welcome_title">&activity_stream_welcome_title;</string>
   <string name="activity_stream_welcome_content">&activity_stream_welcome_content1;</string>
   <string name="activity_stream_welcome_dismiss">&activity_stream_welcome_dismiss;</string>
 
   <string name="private_tab_panel_title">&private_tab_panel_title;</string>
   <string name="private_tab_panel_description">&private_tab_panel_description;</string>