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

--HG--
extra : rebase_source : 98b7fcc041063668df57d0f51f36ddd7e30da5e3

mobile/android/app/src/main/res/layout/activity_stream_main_welcomepanel_content.xml

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

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

@@ -851,6 +851,7 @@ is simply hidden from the Activity Stream panel. -->
 
 <!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.">

mobile/android/base/strings.xml.in

@@ -630,6 +630,7 @@
 
   <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>