Bug 1406096 - Fix flash of untranslated content on Activity Stream search bar. r=k88hudson

MozReview-Commit-ID: H7ebg6plOvc

--HG--
extra : rebase_source : 6b1f4dc99ddce50c466e4a836c0f3cd34b766a1d

browser/extensions/activity-stream/data/content/activity-stream-initial-state.js

@@ -45,7 +45,7 @@
       "search_for_something_with": " ",
       "search_button": " ",
       "search_header": " ",
-      "search_web_placeholder": "Search the Web",
+      "search_web_placeholder": " ",
       "search_settings": " ",
       "section_info_option": " ",
       "section_info_send_feedback": " ",

browser/extensions/activity-stream/install.rdf.in

@@ -8,7 +8,7 @@
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:unpack>false</em:unpack>
-    <em:version>2017.09.29.0895-52552f5e</em:version>
+    <em:version>2017.10.05.1055-5420afb0</em:version>
     <em:name>Activity Stream</em:name>
     <em:description>A rich visual history feed and a reimagined home page make it easier than ever to find exactly what you're looking for in Firefox.</em:description>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>

browser/extensions/activity-stream/test/unit/activity-stream-prerender.test.jsx

@@ -60,11 +60,4 @@ describe("prerender", () => {
     assert.equal(state.App.locale, "en-PRERENDER");
     assert.equal(state.App.strings.newtab_page_title, " ");
   });
-  // # TODO: Remove when #3370 is resolved.
-  it("should render a real English string for search_web_placeholder", () => {
-    const {store} = prerender();
-
-    const state = store.getState();
-    assert.equal(state.App.strings.search_web_placeholder, "Search the Web");
-  });
 });