Bug 1315201: Dismiss -> Remove in AS context menu. r=liuche

MozReview-Commit-ID: 5avMlzXbGDk

--HG--
extra : rebase_source : cb553cff3c4928fb40dea359a1604832718b793d

mobile/android/app/src/main/res/menu/activitystream_contextmenu.xml

@@ -16,7 +16,7 @@
         <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"

mobile/android/base/locales/en-US/android_strings.dtd

@@ -843,10 +843,10 @@ Stream list for highlights sourced from th user's bookmarks. -->
 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">

mobile/android/base/strings.xml.in

@@ -625,7 +625,7 @@
   <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>