Bug 1315201: Add activity_stream_welcome_dismiss str. r=liuche
activity_stream_dismiss was being used to dismiss the welcome screen before but
this string is intended to be used in a different location for a different
purpose and thus should never have been set to the same string.
It's necessary to change the String here so we can modify the contents of the
activity_stream_dismiss String.
MozReview-Commit-ID: 87zaHQ5TJjN
--- a/mobile/android/app/src/main/res/layout/activity_stream_main_welcomepanel_content.xml
+++ b/mobile/android/app/src/main/res/layout/activity_stream_main_welcomepanel_content.xml
@@ -56,12 +56,12 @@
<Button
android:id="@+id/dismiss_welcomepanel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/welcome_fox"
android:layout_alignLeft="@+id/title_welcome"
android:layout_alignStart="@+id/title_welcome"
android:elevation="1dp"
- android:text="@string/activity_stream_dismiss"
+ android:text="@string/activity_stream_welcome_dismiss"
android:theme="@style/ActivityStreamButton"/>
</RelativeLayout>
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -841,13 +841,14 @@ Stream list for highlights sourced from
<!-- LOCALIZATION NOTE (activity_stream_dismiss): 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_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.">
<!ENTITY private_tab_panel_description2 "We won\'t remember any history, but downloaded files and new bookmarks will still be saved to your device.">
<!ENTITY private_tab_learn_more "Want to learn more?">
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -635,14 +635,15 @@
<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_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>
<string name="private_tab_panel_description2">&private_tab_panel_description2;</string>
<string name="private_tab_learn_more">&private_tab_learn_more;</string>
</resources>