Bug 1400920 - The pocket section briefly shows up and causes the scrollbar to make the whole page flicker. r=ursula

MozReview-Commit-ID: DJk6cctA3nm

--HG--
extra : rebase_source : 97fbbca8560a6b62fff9297bc0ab4efc40dbacf7

browser/extensions/activity-stream/data/content/activity-stream.css

@@ -92,7 +92,8 @@ body {
   background: #F9F9FA;
   color: #0C0C0D;
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Ubuntu', 'Helvetica Neue', sans-serif;
-  font-size: 16px; }
+  font-size: 16px;
+  overflow-y: scroll; }
 
 h1,
 h2 {

browser/extensions/activity-stream/data/locales.json

@@ -2626,6 +2626,7 @@
     "default_label_loading": "’Ga luchdadh…",
     "header_top_sites": "Brod nan làrach",
     "header_stories": "Brod nan sgeul",
+    "header_highlights": "Sàr-roghainn",
     "header_visit_again": "Tadhail a-rithist",
     "header_bookmarks": "Comharran-lìn o chionn goirid",
     "header_recommended_by": "’Ga mholadh le {provider}",
@@ -2657,6 +2658,8 @@
     "search_web_placeholder": "Lorg air an lìon",
     "search_settings": "Atharraich roghainnean an luirg",
     "section_info_option": "Fiosrachadh",
+    "section_info_send_feedback": "Cuir thugainn do bheachdan",
+    "section_info_privacy_notice": "Sanas prìobhaideachd",
     "welcome_title": "Fàilte gun taba ùr",
     "welcome_body": "Seallaidh Firefox na comharran-lìn, artaigealan, videothan is duilleagan as iomchaidhe dhut, an fheadhainn air an do thadhail thu o chionn goirid, ach an ruig thu iad gu luath.",
     "welcome_label": "Ag aithneachadh nan highlights agad",
@@ -2666,7 +2669,7 @@
     "time_label_day": "{number}l",
     "settings_pane_button_label": "Gnàthaich duilleag nan tabaichean ùra agad",
     "settings_pane_header": "Roghainnean nan tabaichean ùra",
-    "settings_pane_body": "Tagh na chì thu nuair a dh’fhosglas tu taba ùr.",
+    "settings_pane_body2": "Tagh na chì thu air an duilleag seo.",
     "settings_pane_search_header": "Lorg",
     "settings_pane_search_body": "Lorg air an lìon on taba ùr agad.",
     "settings_pane_topsites_header": "Brod nan làrach",
@@ -2676,8 +2679,11 @@
     "settings_pane_bookmarks_body": "Na comharran-lìn ùra agad san aon àite ghoireasach.",
     "settings_pane_visit_again_header": "Tadhail a-rithist",
     "settings_pane_visit_again_body": "Seallaidh Firefox cuid dhen eachdraidh bhrabhsaidh agad dhut a bu toil leat cuimhneachadh no tadhal air a-rithist ma dh’fhaoidte.",
-    "settings_pane_pocketstories_header": "Brod nan sgeul",
-    "settings_pane_pocketstories_body": "Pocket, ball de theaghlach Mozilla, a cheanglas tu ri susbaint fhìor-mhath nach biodh tu air fhaicinn air dòigh eile.",
+    "settings_pane_highlights_header": "Sàr-roghainn",
+    "settings_pane_highlights_body2": "Faigh greim gu furasta air rudan inntinneach air an do thadhail thu roimhe no a rinn thu comharran-lìn dhiubh.",
+    "settings_pane_highlights_options_bookmarks": "Comharran-lìn",
+    "settings_pane_highlights_options_visited": "Làraichean a thadhladh orra",
+    "settings_pane_snippets_header": "Snippets",
     "settings_pane_done_button": "Deiseil",
     "edit_topsites_button_text": "Deasaich",
     "edit_topsites_button_label": "Gnàthaich earrann brod nan làrach agad",
@@ -2700,10 +2706,7 @@
     "pocket_read_more": "Cuspairean fèillmhor:",
     "pocket_read_even_more": "Seall barrachd sgeul",
     "pocket_feedback_header": "Brod an eadar-lìn, air a dheasachadh le barrachd air 25 millean duine.",
-    "pocket_feedback_body": "Pocket, ball de theaghlach Mozilla, a cheanglas tu ri susbaint fhìor-mhath nach biodh tu air fhaicinn air dòigh eile.",
-    "pocket_send_feedback": "Dè do bheachd air?",
     "topstories_empty_state": "Sin na naidheachdan uile o {provider} an-dràsta ach bidh barrachd ann a dh’aithghearr. No thoir sùil air cuspair air a bheil fèill mhòr is leugh na tha a’ dol mun cuairt air an lìon an-dràsta.",
-    "manual_migration_explanation": "Feuch Firefox leis na làraichean is comharran-lìn as fhearr leat o bhrabhsair eile.",
     "manual_migration_cancel_button": "Chan eil, tapadh leibh",
     "manual_migration_import_button": "Ion-phortaich an-dràsta"
   },

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.28.0389-b24927a8</em:version>
+    <em:version>2017.09.28.0954-66ebf91c</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>