Bug 1452228 - Add dark-theme tweaks, custom-image restrictions and bug fixes to Activity Stream. r=ursula

MozReview-Commit-ID: 5u7251DxLp2

--HG--
extra : rebase_source : 03f919628be3cd0a474b0c1670d450e2a67d1cab

browser/extensions/activity-stream/css/activity-stream-linux.css

@@ -30,7 +30,7 @@ input {
   --newtab-border-secondary-color: #D7D7DB;
   --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: inherit;
-  --newtab-element-active-color: rgba(237, 237, 240, 0.6);
+  --newtab-element-active-color: #EDEDF0;
   --newtab-icon-primary-color: rgba(12, 12, 13, 0.8);
   --newtab-icon-secondary-color: rgba(12, 12, 13, 0.6);
   --newtab-icon-tertiary-color: #D7D7DB;
@@ -50,18 +50,17 @@ input {
   --newtab-section-active-contextmenu-color: #0C0C0D;
   --newtab-search-background-color: #FFF;
   --newtab-search-border-color: transparent;
-  --newtab-search-focus-border-color: #0A84FF;
   --newtab-search-icon-color: rgba(12, 12, 13, 0.4);
-  --newtab-search-text-color: inherit;
   --newtab-topsites-label-color: inherit;
   --newtab-card-background-color: #FFF;
-  --newtab-card-active-outline-color: #D7D7DB; }
+  --newtab-card-active-outline-color: #D7D7DB;
+  --newtab-card-hairline-color: rgba(0, 0, 0, 0.1); }
 
 .outer-wrapper.dark-theme {
   --newtab-background-color: #2A2A2E;
   --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
   --newtab-border-secondary-color: rgba(249, 249, 250, 0.2);
-  --newtab-button-primary-color: #45A1FF;
+  --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: #38383D;
   --newtab-element-active-color: #4A4A4F;
   --newtab-icon-primary-color: rgba(249, 249, 250, 0.8);
@@ -82,13 +81,12 @@ input {
   --newtab-section-navigation-text-color: rgba(249, 249, 250, 0.8);
   --newtab-section-active-contextmenu-color: #FFF;
   --newtab-search-background-color: #4A4A4F;
-  --newtab-search-border-color: rgba(249, 249, 250, 0.4);
+  --newtab-search-border-color: rgba(249, 249, 250, 0.2);
-  --newtab-search-focus-border-color: #45A1FF;
   --newtab-search-icon-color: rgba(249, 249, 250, 0.6);
-  --newtab-search-text-color: rgba(249, 249, 250, 0.6);
   --newtab-topsites-label-color: rgba(249, 249, 250, 0.8);
   --newtab-card-background-color: #0C0C0D;
-  --newtab-card-active-outline-color: #4A4A4F; }
+  --newtab-card-active-outline-color: #4A4A4F;
+  --newtab-card-hairline-color: rgba(249, 249, 250, 0.2); }
 
 .icon {
   background-position: center center;
@@ -486,7 +484,7 @@ main {
     .top-site-outer .screenshot.active {
       opacity: 1; }
   .top-site-outer .top-site-icon {
-    background-color: var(--newtab-background-color);
+    background-color: #FFF;
     background-position: center center;
     background-repeat: no-repeat;
     border-radius: 6px;
@@ -840,7 +838,6 @@ main {
     border: solid 1px var(--newtab-search-border-color);
     border-radius: 3px;
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.15);
-    color: var(--newtab-search-text-color);
     font-size: 15px;
     padding: 0;
     padding-inline-end: 36px;
@@ -850,7 +847,7 @@ main {
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.25); }
   .search-wrapper:active input,
   .search-wrapper input:focus {
-    box-shadow: 0 0 0 3px var(--newtab-search-focus-border-color); }
+    box-shadow: 0 0 0 3px #0060DF; }
   .search-wrapper .search-label {
     background: url("chrome://browser/skin/search-glass.svg") no-repeat 12px center/16px;
     -moz-context-properties: fill;
@@ -879,16 +876,20 @@ main {
       transform: scaleX(-1); }
 
 .contentSearchSuggestionTable {
-  background-color: var(--newtab-search-background-color);
+  background-color: var(--newtab-modal-color);
   border: 0;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
   transform: translateY(3px); }
   .contentSearchSuggestionTable .contentSearchHeader {
     background-color: var(--newtab-background-color);
     color: var(--newtab-text-secondary-color); }
-  .contentSearchSuggestionTable .contentSearchHeader, .contentSearchSuggestionTable .contentSearchSuggestionsList {
+  .contentSearchSuggestionTable .contentSearchHeader, .contentSearchSuggestionTable .contentSearchSuggestionsList, .contentSearchSuggestionTable .contentSearchSettingsButton {
-    border-color: var(--newtab-border-primary-color); }
+    border-color: var(--newtab-border-secondary-color); }
   .contentSearchSuggestionTable .contentSearchSearchWithHeaderSearchText {
     color: var(--newtab-text-primary-color); }
+  .contentSearchSuggestionTable .contentSearchSettingsButton:hover {
+    background: var(--newtab-element-active-color);
+    color: var(--newtab-text-primary-color); }
 
 .context-menu {
   background: var(--newtab-background-color);
@@ -921,14 +922,7 @@ main {
         padding: 3px 12px;
         white-space: nowrap; }
         .context-menu > ul > li > a:-moz-any(:focus, :hover) {
-          background: var(--newtab-link-primary-color);
+          background: var(--newtab-element-active-color); }
-          color: #FFF; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover) a {
-            color: #0C0C0D; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover) .icon {
-            fill: #FFF; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover):-moz-any(:focus, :hover) {
-            color: #FFF; }
         .context-menu > ul > li > a.disabled {
           opacity: 0.4;
           pointer-events: none; }
@@ -1047,13 +1041,12 @@ main {
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .card-title {
       color: var(--newtab-link-primary-color); }
   .card-outer .card-preview-image-outer {
-    background-color: var(--newtab-background-color);
     border-radius: 3px 3px 0 0;
     height: 122px;
     overflow: hidden;
     position: relative; }
     .card-outer .card-preview-image-outer::after {
-      border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+      border-bottom: 1px solid var(--newtab-card-hairline-color);
       bottom: 0;
       content: '';
       position: absolute;
@@ -1268,7 +1261,7 @@ main {
       font-weight: bold;
       padding-left: 3px; }
     .collapsible-section .section-disclaimer button {
-      background: transparent;
+      background: var(--newtab-button-secondary-color);
       border: 1px solid #B1B1B3;
       border-radius: 4px;
       cursor: pointer;
@@ -1301,7 +1294,9 @@ main {
 .messages-admin {
   max-width: 996px;
   margin: 0 auto;
-  font-size: 14px; }
+  font-size: 14px;
+  display: inherit;
+  padding: 0; }
   .messages-admin h1 {
     font-weight: 200;
     font-size: 32px; }

browser/extensions/activity-stream/css/activity-stream-mac.css

@@ -30,7 +30,7 @@ input {
   --newtab-border-secondary-color: #D7D7DB;
   --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: inherit;
-  --newtab-element-active-color: rgba(237, 237, 240, 0.6);
+  --newtab-element-active-color: #EDEDF0;
   --newtab-icon-primary-color: rgba(12, 12, 13, 0.8);
   --newtab-icon-secondary-color: rgba(12, 12, 13, 0.6);
   --newtab-icon-tertiary-color: #D7D7DB;
@@ -50,18 +50,17 @@ input {
   --newtab-section-active-contextmenu-color: #0C0C0D;
   --newtab-search-background-color: #FFF;
   --newtab-search-border-color: transparent;
-  --newtab-search-focus-border-color: #0A84FF;
   --newtab-search-icon-color: rgba(12, 12, 13, 0.4);
-  --newtab-search-text-color: inherit;
   --newtab-topsites-label-color: inherit;
   --newtab-card-background-color: #FFF;
-  --newtab-card-active-outline-color: #D7D7DB; }
+  --newtab-card-active-outline-color: #D7D7DB;
+  --newtab-card-hairline-color: rgba(0, 0, 0, 0.1); }
 
 .outer-wrapper.dark-theme {
   --newtab-background-color: #2A2A2E;
   --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
   --newtab-border-secondary-color: rgba(249, 249, 250, 0.2);
-  --newtab-button-primary-color: #45A1FF;
+  --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: #38383D;
   --newtab-element-active-color: #4A4A4F;
   --newtab-icon-primary-color: rgba(249, 249, 250, 0.8);
@@ -82,13 +81,12 @@ input {
   --newtab-section-navigation-text-color: rgba(249, 249, 250, 0.8);
   --newtab-section-active-contextmenu-color: #FFF;
   --newtab-search-background-color: #4A4A4F;
-  --newtab-search-border-color: rgba(249, 249, 250, 0.4);
+  --newtab-search-border-color: rgba(249, 249, 250, 0.2);
-  --newtab-search-focus-border-color: #45A1FF;
   --newtab-search-icon-color: rgba(249, 249, 250, 0.6);
-  --newtab-search-text-color: rgba(249, 249, 250, 0.6);
   --newtab-topsites-label-color: rgba(249, 249, 250, 0.8);
   --newtab-card-background-color: #0C0C0D;
-  --newtab-card-active-outline-color: #4A4A4F; }
+  --newtab-card-active-outline-color: #4A4A4F;
+  --newtab-card-hairline-color: rgba(249, 249, 250, 0.2); }
 
 .icon {
   background-position: center center;
@@ -486,7 +484,7 @@ main {
     .top-site-outer .screenshot.active {
       opacity: 1; }
   .top-site-outer .top-site-icon {
-    background-color: var(--newtab-background-color);
+    background-color: #FFF;
     background-position: center center;
     background-repeat: no-repeat;
     border-radius: 6px;
@@ -840,7 +838,6 @@ main {
     border: solid 1px var(--newtab-search-border-color);
     border-radius: 3px;
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.15);
-    color: var(--newtab-search-text-color);
     font-size: 15px;
     padding: 0;
     padding-inline-end: 36px;
@@ -850,7 +847,7 @@ main {
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.25); }
   .search-wrapper:active input,
   .search-wrapper input:focus {
-    box-shadow: 0 0 0 3px var(--newtab-search-focus-border-color); }
+    box-shadow: 0 0 0 3px #0060DF; }
   .search-wrapper .search-label {
     background: url("chrome://browser/skin/search-glass.svg") no-repeat 12px center/16px;
     -moz-context-properties: fill;
@@ -879,16 +876,20 @@ main {
       transform: scaleX(-1); }
 
 .contentSearchSuggestionTable {
-  background-color: var(--newtab-search-background-color);
+  background-color: var(--newtab-modal-color);
   border: 0;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
   transform: translateY(3px); }
   .contentSearchSuggestionTable .contentSearchHeader {
     background-color: var(--newtab-background-color);
     color: var(--newtab-text-secondary-color); }
-  .contentSearchSuggestionTable .contentSearchHeader, .contentSearchSuggestionTable .contentSearchSuggestionsList {
+  .contentSearchSuggestionTable .contentSearchHeader, .contentSearchSuggestionTable .contentSearchSuggestionsList, .contentSearchSuggestionTable .contentSearchSettingsButton {
-    border-color: var(--newtab-border-primary-color); }
+    border-color: var(--newtab-border-secondary-color); }
   .contentSearchSuggestionTable .contentSearchSearchWithHeaderSearchText {
     color: var(--newtab-text-primary-color); }
+  .contentSearchSuggestionTable .contentSearchSettingsButton:hover {
+    background: var(--newtab-element-active-color);
+    color: var(--newtab-text-primary-color); }
 
 .context-menu {
   background: var(--newtab-background-color);
@@ -921,14 +922,7 @@ main {
         padding: 3px 12px;
         white-space: nowrap; }
         .context-menu > ul > li > a:-moz-any(:focus, :hover) {
-          background: var(--newtab-link-primary-color);
+          background: var(--newtab-element-active-color); }
-          color: #FFF; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover) a {
-            color: #0C0C0D; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover) .icon {
-            fill: #FFF; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover):-moz-any(:focus, :hover) {
-            color: #FFF; }
         .context-menu > ul > li > a.disabled {
           opacity: 0.4;
           pointer-events: none; }
@@ -1047,13 +1041,12 @@ main {
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .card-title {
       color: var(--newtab-link-primary-color); }
   .card-outer .card-preview-image-outer {
-    background-color: var(--newtab-background-color);
     border-radius: 3px 3px 0 0;
     height: 122px;
     overflow: hidden;
     position: relative; }
     .card-outer .card-preview-image-outer::after {
-      border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+      border-bottom: 1px solid var(--newtab-card-hairline-color);
       bottom: 0;
       content: '';
       position: absolute;
@@ -1268,7 +1261,7 @@ main {
       font-weight: bold;
       padding-left: 3px; }
     .collapsible-section .section-disclaimer button {
-      background: transparent;
+      background: var(--newtab-button-secondary-color);
       border: 1px solid #B1B1B3;
       border-radius: 4px;
       cursor: pointer;
@@ -1301,7 +1294,9 @@ main {
 .messages-admin {
   max-width: 996px;
   margin: 0 auto;
-  font-size: 14px; }
+  font-size: 14px;
+  display: inherit;
+  padding: 0; }
   .messages-admin h1 {
     font-weight: 200;
     font-size: 32px; }

browser/extensions/activity-stream/css/activity-stream-windows.css

@@ -30,7 +30,7 @@ input {
   --newtab-border-secondary-color: #D7D7DB;
   --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: inherit;
-  --newtab-element-active-color: rgba(237, 237, 240, 0.6);
+  --newtab-element-active-color: #EDEDF0;
   --newtab-icon-primary-color: rgba(12, 12, 13, 0.8);
   --newtab-icon-secondary-color: rgba(12, 12, 13, 0.6);
   --newtab-icon-tertiary-color: #D7D7DB;
@@ -50,18 +50,17 @@ input {
   --newtab-section-active-contextmenu-color: #0C0C0D;
   --newtab-search-background-color: #FFF;
   --newtab-search-border-color: transparent;
-  --newtab-search-focus-border-color: #0A84FF;
   --newtab-search-icon-color: rgba(12, 12, 13, 0.4);
-  --newtab-search-text-color: inherit;
   --newtab-topsites-label-color: inherit;
   --newtab-card-background-color: #FFF;
-  --newtab-card-active-outline-color: #D7D7DB; }
+  --newtab-card-active-outline-color: #D7D7DB;
+  --newtab-card-hairline-color: rgba(0, 0, 0, 0.1); }
 
 .outer-wrapper.dark-theme {
   --newtab-background-color: #2A2A2E;
   --newtab-border-primary-color: rgba(249, 249, 250, 0.8);
   --newtab-border-secondary-color: rgba(249, 249, 250, 0.2);
-  --newtab-button-primary-color: #45A1FF;
+  --newtab-button-primary-color: #0060DF;
   --newtab-button-secondary-color: #38383D;
   --newtab-element-active-color: #4A4A4F;
   --newtab-icon-primary-color: rgba(249, 249, 250, 0.8);
@@ -82,13 +81,12 @@ input {
   --newtab-section-navigation-text-color: rgba(249, 249, 250, 0.8);
   --newtab-section-active-contextmenu-color: #FFF;
   --newtab-search-background-color: #4A4A4F;
-  --newtab-search-border-color: rgba(249, 249, 250, 0.4);
+  --newtab-search-border-color: rgba(249, 249, 250, 0.2);
-  --newtab-search-focus-border-color: #45A1FF;
   --newtab-search-icon-color: rgba(249, 249, 250, 0.6);
-  --newtab-search-text-color: rgba(249, 249, 250, 0.6);
   --newtab-topsites-label-color: rgba(249, 249, 250, 0.8);
   --newtab-card-background-color: #0C0C0D;
-  --newtab-card-active-outline-color: #4A4A4F; }
+  --newtab-card-active-outline-color: #4A4A4F;
+  --newtab-card-hairline-color: rgba(249, 249, 250, 0.2); }
 
 .icon {
   background-position: center center;
@@ -486,7 +484,7 @@ main {
     .top-site-outer .screenshot.active {
       opacity: 1; }
   .top-site-outer .top-site-icon {
-    background-color: var(--newtab-background-color);
+    background-color: #FFF;
     background-position: center center;
     background-repeat: no-repeat;
     border-radius: 6px;
@@ -840,7 +838,6 @@ main {
     border: solid 1px var(--newtab-search-border-color);
     border-radius: 3px;
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.15);
-    color: var(--newtab-search-text-color);
     font-size: 15px;
     padding: 0;
     padding-inline-end: 36px;
@@ -850,7 +847,7 @@ main {
     box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1), 0 0 0 1px rgba(0, 0, 0, 0.25); }
   .search-wrapper:active input,
   .search-wrapper input:focus {
-    box-shadow: 0 0 0 1px var(--newtab-search-focus-border-color); }
+    box-shadow: 0 0 0 1px #0060DF; }
   .search-wrapper .search-label {
     background: url("chrome://browser/skin/search-glass.svg") no-repeat 12px center/16px;
     -moz-context-properties: fill;
@@ -879,16 +876,20 @@ main {
       transform: scaleX(-1); }
 
 .contentSearchSuggestionTable {
-  background-color: var(--newtab-search-background-color);
+  background-color: var(--newtab-modal-color);
   border: 0;
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(0, 0, 0, 0.2);
   transform: translateY(3px); }
   .contentSearchSuggestionTable .contentSearchHeader {
     background-color: var(--newtab-background-color);
     color: var(--newtab-text-secondary-color); }
-  .contentSearchSuggestionTable .contentSearchHeader, .contentSearchSuggestionTable .contentSearchSuggestionsList {
+  .contentSearchSuggestionTable .contentSearchHeader, .contentSearchSuggestionTable .contentSearchSuggestionsList, .contentSearchSuggestionTable .contentSearchSettingsButton {
-    border-color: var(--newtab-border-primary-color); }
+    border-color: var(--newtab-border-secondary-color); }
   .contentSearchSuggestionTable .contentSearchSearchWithHeaderSearchText {
     color: var(--newtab-text-primary-color); }
+  .contentSearchSuggestionTable .contentSearchSettingsButton:hover {
+    background: var(--newtab-element-active-color);
+    color: var(--newtab-text-primary-color); }
 
 .context-menu {
   background: var(--newtab-background-color);
@@ -921,14 +922,7 @@ main {
         padding: 3px 12px;
         white-space: nowrap; }
         .context-menu > ul > li > a:-moz-any(:focus, :hover) {
-          background: var(--newtab-link-primary-color);
+          background: var(--newtab-element-active-color); }
-          color: #FFF; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover) a {
-            color: #0C0C0D; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover) .icon {
-            fill: #FFF; }
-          .context-menu > ul > li > a:-moz-any(:focus, :hover):-moz-any(:focus, :hover) {
-            color: #FFF; }
         .context-menu > ul > li > a.disabled {
           opacity: 0.4;
           pointer-events: none; }
@@ -1047,13 +1041,12 @@ main {
     .card-outer:-moz-any(:hover, :focus, .active):not(.placeholder) .card-title {
       color: var(--newtab-link-primary-color); }
   .card-outer .card-preview-image-outer {
-    background-color: var(--newtab-background-color);
     border-radius: 3px 3px 0 0;
     height: 122px;
     overflow: hidden;
     position: relative; }
     .card-outer .card-preview-image-outer::after {
-      border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+      border-bottom: 1px solid var(--newtab-card-hairline-color);
       bottom: 0;
       content: '';
       position: absolute;
@@ -1268,7 +1261,7 @@ main {
       font-weight: bold;
       padding-left: 3px; }
     .collapsible-section .section-disclaimer button {
-      background: transparent;
+      background: var(--newtab-button-secondary-color);
       border: 1px solid #B1B1B3;
       border-radius: 4px;
       cursor: pointer;
@@ -1301,7 +1294,9 @@ main {
 .messages-admin {
   max-width: 996px;
   margin: 0 auto;
-  font-size: 14px; }
+  font-size: 14px;
+  display: inherit;
+  padding: 0; }
   .messages-admin h1 {
     font-weight: 200;
     font-size: 32px; }

browser/extensions/activity-stream/data/content/activity-stream.bundle.js

@@ -1420,7 +1420,7 @@ class Disclaimer extends __WEBPACK_IMPORTED_MODULE_3_react___default.a.PureCompo
 
   onAcknowledge() {
     this.props.dispatch(__WEBPACK_IMPORTED_MODULE_1_common_Actions_jsm__["a" /* actionCreators */].SetPref(this.props.disclaimerPref, false));
-    this.props.dispatch(__WEBPACK_IMPORTED_MODULE_1_common_Actions_jsm__["a" /* actionCreators */].UserEvent({ event: "SECTION_DISCLAIMER_ACKNOWLEDGED", source: this.props.eventSource }));
+    this.props.dispatch(__WEBPACK_IMPORTED_MODULE_1_common_Actions_jsm__["a" /* actionCreators */].UserEvent({ event: "DISCLAIMER_ACKED", source: this.props.eventSource }));
   }
 
   render() {
@@ -1661,7 +1661,7 @@ const SectionMenuOptions = {
       type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].SECTION_MOVE,
       data: { id: section.id, direction: -1 }
     }),
-    userEvent: "SECTION_MENU_MOVE_UP",
+    userEvent: "MENU_MOVE_UP",
     disabled: !!section.isFirst
   }),
   MoveDown: section => ({
@@ -1671,38 +1671,38 @@ const SectionMenuOptions = {
       type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].SECTION_MOVE,
       data: { id: section.id, direction: +1 }
     }),
-    userEvent: "SECTION_MENU_MOVE_DOWN",
+    userEvent: "MENU_MOVE_DOWN",
     disabled: !!section.isLast
   }),
   RemoveSection: section => ({
     id: "section_menu_action_remove_section",
     icon: "dismiss",
     action: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].SetPref(section.showPrefName, false),
-    userEvent: "SECTION_MENU_REMOVE"
+    userEvent: "MENU_REMOVE"
   }),
   CollapseSection: section => ({
     id: "section_menu_action_collapse_section",
     icon: "minimize",
     action: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].OnlyToMain({ type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].UPDATE_SECTION_PREFS, data: { id: section.id, value: { collapsed: true } } }),
-    userEvent: "SECTION_MENU_COLLAPSE"
+    userEvent: "MENU_COLLAPSE"
   }),
   ExpandSection: section => ({
     id: "section_menu_action_expand_section",
     icon: "maximize",
     action: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].OnlyToMain({ type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].UPDATE_SECTION_PREFS, data: { id: section.id, value: { collapsed: false } } }),
-    userEvent: "SECTION_MENU_EXPAND"
+    userEvent: "MENU_EXPAND"
   }),
   ManageSection: section => ({
     id: "section_menu_action_manage_section",
     icon: "settings",
     action: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["a" /* actionCreators */].OnlyToMain({ type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].SETTINGS_OPEN }),
-    userEvent: "SECTION_MENU_MANAGE"
+    userEvent: "MENU_MANAGE"
   }),
   AddTopSite: section => ({
     id: "section_menu_action_add_topsite",
     icon: "add",
     action: { type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].TOP_SITES_EDIT, data: { index: -1 } },
-    userEvent: "SECTION_MENU_ADD_TOPSITE"
+    userEvent: "MENU_ADD_TOPSITE"
   }),
   PrivacyNotice: section => ({
     id: "section_menu_action_privacy_notice",
@@ -1711,7 +1711,7 @@ const SectionMenuOptions = {
       type: __WEBPACK_IMPORTED_MODULE_0_common_Actions_jsm__["b" /* actionTypes */].OPEN_LINK,
       data: { url: section.privacyNoticeURL }
     }),
-    userEvent: "SECTION_MENU_PRIVACY_NOTICE"
+    userEvent: "MENU_PRIVACY_NOTICE"
   }),
   CheckCollapsed: section => section.collapsed ? SectionMenuOptions.ExpandSection(section) : SectionMenuOptions.CollapseSection(section)
 };
@@ -3364,7 +3364,7 @@ class MessageCenterAdmin_MessageCenterAdmin extends external__React__default.a.P
   render() {
     return external__React__default.a.createElement(
       "div",
-      { className: "messages-admin" },
+      { className: "messages-admin outer-wrapper" },
       external__React__default.a.createElement(
         "h1",
         null,
@@ -3690,7 +3690,7 @@ class Base_BaseContent extends external__React__default.a.PureComponent {
 
     const shouldBeFixedToTop = PrerenderData.arePrefsValid(name => prefs[name]);
 
-    const outerClassName = `outer-wrapper ${Theme.className}${shouldBeFixedToTop ? " fixed-to-top" : ""} ${prefs.enableWideLayout ? "wide-layout-enabled" : "wide-layout-disabled"}`;
+    const outerClassName = ["outer-wrapper", Theme.className, shouldBeFixedToTop && "fixed-to-top", prefs.enableWideLayout ? "wide-layout-enabled" : "wide-layout-disabled"].filter(v => v).join(" ");
 
     return external__React__default.a.createElement(
       "div",
@@ -4802,14 +4802,21 @@ class TopSiteForm_TopSiteForm extends external__React__default.a.PureComponent {
     return url;
   }
 
-  validateUrl(url) {
+  _tryParseUrl(url) {
     try {
-      return !!new URL(this.cleanUrl(url));
+      return new URL(url);
     } catch (e) {
-      return false;
+      return null;
     }
   }
 
+  validateUrl(url) {
+    const validProtocols = ["http:", "https:"];
+    const urlObj = this._tryParseUrl(url) || this._tryParseUrl(this.cleanUrl(url));
+
+    return urlObj && validProtocols.includes(urlObj.protocol);
+  }
+
   validateCustomScreenshotUrl() {
     const { customScreenshotUrl } = this.state;
     return !customScreenshotUrl || this.validateUrl(customScreenshotUrl);

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>2018.03.29.1163-6170061b</em:version>
+    <em:version>2018.04.06.1270-55062cee</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/lib/UserDomainAffinityProvider.jsm

@@ -5,7 +5,8 @@
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-const history = Cc["@mozilla.org/browser/nav-history-service;1"].getService(Ci.nsINavHistoryService);
+ChromeUtils.defineModuleGetter(this, "PlacesUtils",
+  "resource://gre/modules/PlacesUtils.jsm");
 
 const DEFAULT_TIME_SEGMENTS = [
   {"id": "hour", "startTime": 3600, "endTime": 0, "weightPosition": 1},
@@ -243,7 +244,7 @@ this.UserDomainAffinityProvider = class UserDomainAffinityProvider {
    */
   queryVisits(ts) {
     const visitCounts = {};
-    const query = history.getNewQuery();
+    const query = PlacesUtils.history.getNewQuery();
     const wwwRegEx = /^www\./;
 
     query.beginTimeReference = query.TIME_RELATIVE_NOW;
@@ -252,11 +253,11 @@ this.UserDomainAffinityProvider = class UserDomainAffinityProvider {
     query.endTimeReference = query.TIME_RELATIVE_NOW;
     query.endTime = (ts.endTime && ts.endTime !== 0) ? -(ts.endTime * 1000 * 1000) : 0;
 
-    const options = history.getNewQueryOptions();
+    const options = PlacesUtils.history.getNewQueryOptions();
     options.sortingMode = options.SORT_BY_VISITCOUNT_DESCENDING;
     options.maxResults = this.maxHistoryQueryResults;
 
-    const {root} = history.executeQuery(query, options);
+    const {root} = PlacesUtils.history.executeQuery(query, options);
     root.containerOpen = true;
     for (let i = 0; i < root.childCount; i++) {
       let node = root.getChild(i);

browser/extensions/activity-stream/prerendered/locales/cs/activity-stream-strings.js

@@ -65,7 +65,7 @@ window.gActivityStreamStrings = {
   "topsites_form_url_label": "URL",
   "topsites_form_image_url_label": "URL adresa vlastního obrázku",
   "topsites_form_url_placeholder": "Zadejte nebo vložte URL adresu",
-  "topsites_form_use_image_link": "Používejte vlastní obrázek…",
+  "topsites_form_use_image_link": "Použít vlastní obrázek…",
   "topsites_form_preview_button": "Náhled",
   "topsites_form_add_button": "Přidat",
   "topsites_form_save_button": "Uložit",

browser/extensions/activity-stream/prerendered/locales/eu/activity-stream-strings.js

@@ -29,8 +29,8 @@ window.gActivityStreamStrings = {
   "section_disclaimer_topstories": "Webeko istorio interesgarrienen hautapena, irakurtzen duzunean oinarrituta. Orain Mozillaren zati den Pocket bidez datoz.",
   "section_disclaimer_topstories_linktext": "Ikasi nola dabilen.",
   "section_disclaimer_topstories_buttontext": "Ulertuta",
-  "prefs_home_header": "Firefox Home Content",
+  "prefs_home_header": "Firefoxen hasiera-orriko edukia",
-  "prefs_home_description": "Choose what content you want on your Firefox Home screen.",
+  "prefs_home_description": "Aukeratu zein eduki nahi duzun Firefoxen hasiera-orriko pantailan.",
   "prefs_restore_defaults_button": "Berrezarri lehenespenak",
   "prefs_section_rows_option": "Errenkada bat;{num} errenkada",
   "prefs_search_header": "Web bilaketa",

browser/extensions/activity-stream/prerendered/locales/gu-IN/activity-stream-strings.js

@@ -1,15 +1,15 @@
 // Note - this is a generated file.
 window.gActivityStreamStrings = {
-  "newtab_page_title": "નવું ટૅબ",
+  "newtab_page_title": "નવી ટૅબ",
-  "header_top_sites": "ટોપ સાઇટ્સ",
+  "header_top_sites": "ટોચની સાઇટ્સ",
-  "header_highlights": "વીતી ગયેલું",
+  "header_highlights": "હાઇલાઇટ્સ",
   "header_recommended_by": "દ્વારા ભલામણ",
   "context_menu_button_sr": "{title} માટે સંદર્ભ મેનૂ ખોલો",
-  "section_context_menu_button_sr": "Open the section context menu",
+  "section_context_menu_button_sr": "વિભાગ સંદર્ભ મેનૂ ખોલો",
   "type_label_visited": "જોવામા આવેલ:",
   "type_label_bookmarked": "બુકમાર્ક્સ",
   "type_label_recommended": "વલણ",
-  "type_label_pocket": "Saved to Pocket",
+  "type_label_pocket": "પોકેટ પર સાચવ્યું",
   "menu_action_bookmark": "બુકમાર્ક",
   "menu_action_remove_bookmark": "બુકમાર્ક કાઢો",
   "menu_action_open_new_window": "નવી વિન્ડોમાં ખોલો",
@@ -21,25 +21,25 @@ window.gActivityStreamStrings = {
   "confirm_history_delete_p1": "શું તમે ખરેખર તમારા ઇતિહાસમાંથી આ પૃષ્ઠનાં દરેક ઘટકને કાઢી નાખવા માંગો છો?",
   "confirm_history_delete_notice_p2": "આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.",
   "menu_action_save_to_pocket": "પોકેટમાં સાચવો",
-  "menu_action_delete_pocket": "Delete from Pocket",
+  "menu_action_delete_pocket": "પોકેટમાંથી કાઢી નાંખો",
-  "menu_action_archive_pocket": "Archive in Pocket",
+  "menu_action_archive_pocket": "પોકેટમાં આર્કાઇવ",
   "search_button": "શોધો",
   "search_header": "{search_engine_name} શોધ કરો",
   "search_web_placeholder": "વેબ પર શોધો",
   "section_disclaimer_topstories": "વેબ પરની સૌથી રસપ્રદ વાર્તાઓ, તમે જે વાંચો છો તેના આધારે પસંદ કરેલ છે. Pocket થી, હવે Mozilla નો ભાગ.",
   "section_disclaimer_topstories_linktext": "તે કેવી રીતે કાર્ય કરે છે તે જાણો.",
   "section_disclaimer_topstories_buttontext": "ઠીક છે, સમજાઇ ગયું",
-  "prefs_home_header": "Firefox Home Content",
+  "prefs_home_header": "Firefox મુખ્ય સામગ્રી",
-  "prefs_home_description": "Choose what content you want on your Firefox Home screen.",
+  "prefs_home_description": "તમારી Firefox મુખ્ય સ્ક્રીન પર કઈ સામગ્રી તમે ઇચ્છો તે પસંદ કરો.",
-  "prefs_restore_defaults_button": "Restore Defaults",
+  "prefs_restore_defaults_button": "મૂળભૂતને પુન:સંગ્રહો",
-  "prefs_section_rows_option": "{num} row;{num} rows",
+  "prefs_section_rows_option": "{num} પંક્તિ;{num} પંક્તિઓ",
-  "prefs_search_header": "Web Search",
+  "prefs_search_header": "વેબ શોધ",
-  "prefs_topsites_description": "The sites you visit most",
+  "prefs_topsites_description": "તમે સૌથી વધુ મુલાકાત લો છો તે સાઇટ્સ",
   "prefs_topstories_description2": "Great content from around the web, personalized for you",
-  "prefs_topstories_show_sponsored_label": "{provider} Sponsored Stories",
+  "prefs_topstories_show_sponsored_label": "{provider} પ્રાયોજિત વાર્તાઓ",
-  "prefs_topstories_sponsored_learn_more": "Learn more",
+  "prefs_topstories_sponsored_learn_more": "વધુ શીખો",
-  "prefs_highlights_description": "A selection of sites that you’ve saved or visited",
+  "prefs_highlights_description": "સાઇટ્સની પસંદગી કે જે તમે સાચવી અથવા મુલાકાત લીધી છે",
-  "prefs_snippets_description": "Updates from Mozilla and Firefox",
+  "prefs_snippets_description": "Mozilla અને Firefox તરફથી અપડેટ્સ",
   "settings_pane_button_label": "તમારા નવા ટૅબ પૃષ્ઠને કસ્ટમાઇઝ કરો",
   "settings_pane_header": "નવી ટેબ પસંદગીઓ",
   "settings_pane_body2": "તમે આ પૃષ્ઠ પર જે જુઓ છો તે પસંદ કરો.",
@@ -60,18 +60,18 @@ window.gActivityStreamStrings = {
   "edit_topsites_edit_button": "આ સાઇટને સંપાદિત કરો",
   "topsites_form_add_header": "નવી ટોચની સાઇટ",
   "topsites_form_edit_header": "ટોચની સાઇટ સંપાદિત કરો",
-  "topsites_form_title_label": "Title",
+  "topsites_form_title_label": "શીર્ષક",
   "topsites_form_title_placeholder": "શીર્ષક દાખલ કરો",
   "topsites_form_url_label": "URL",
-  "topsites_form_image_url_label": "Custom Image URL",
+  "topsites_form_image_url_label": "વૈવિધ્યપૂર્ણ છબી URL",
   "topsites_form_url_placeholder": "URL ટાઇપ કરો અથવા પેસ્ટ કરો",
-  "topsites_form_use_image_link": "Use a custom image…",
+  "topsites_form_use_image_link": "વૈવિધ્યપૂર્ણ છબીનો ઉપયોગ કરો…",
-  "topsites_form_preview_button": "Preview",
+  "topsites_form_preview_button": "પૂર્વદર્શન",
   "topsites_form_add_button": "ઉમેરો",
   "topsites_form_save_button": "સાચવો",
   "topsites_form_cancel_button": "રદ કરો",
   "topsites_form_url_validation": "માન્ય URL આવશ્યક છે",
-  "topsites_form_image_validation": "Image failed to load. Try a different URL.",
+  "topsites_form_image_validation": "છબી લોડ થવામાં નિષ્ફળ. એક અલગ URL અજમાવી જુઓ.",
   "pocket_read_more": "લોકપ્રિય વિષયો:",
   "pocket_read_even_more": "વધુ વાર્તાઓ જુઓ",
   "pocket_description": "ઉચ્ચ ગુણવત્તાવાળી સામગ્રી શોધો અન્યથા તમે ચૂકી જશો, પોકેટની સહાયથી, હવે મોઝિલાનો એક ભાગ છે.",
@@ -80,52 +80,15 @@ window.gActivityStreamStrings = {
   "manual_migration_explanation2": "અન્ય બ્રાઉઝરથી બુકમાર્ક્સ, ઇતિહાસ અને પાસવર્ડ્સ સાથે ફાયરફોક્સ અજમાવો.",
   "manual_migration_cancel_button": "ના અભાર",
   "manual_migration_import_button": "હવે આયાત કરો",
-  "error_fallback_default_info": "Oops, something went wrong loading this content.",
+  "error_fallback_default_info": "ઊફ્ફ, આ સામગ્રીને લોડ કરવામાં કંઈક ખોટું થયું.",
-  "error_fallback_default_refresh_suggestion": "Refresh page to try again.",
+  "error_fallback_default_refresh_suggestion": "ફરી પ્રયાસ કરવા માટે પૃષ્ઠને તાજું કરો.",
-  "section_menu_action_remove_section": "Remove Section",
+  "section_menu_action_remove_section": "વિભાગ દૂર કરો",
-  "section_menu_action_collapse_section": "Collapse Section",
+  "section_menu_action_collapse_section": "વિભાગ સંકુચિત કરો",
-  "section_menu_action_expand_section": "Expand Section",
+  "section_menu_action_expand_section": "વિભાગ વિસ્તૃત કરો",
-  "section_menu_action_manage_section": "Manage Section",
+  "section_menu_action_manage_section": "વિભાગ સંચાલિત કરો",
-  "section_menu_action_add_topsite": "Add Top Site",
+  "section_menu_action_add_topsite": "ટોચની સાઇટ ઉમેરો",
-  "section_menu_action_move_up": "Move Up",
+  "section_menu_action_move_up": "ઉપર કરો",
-  "section_menu_action_move_down": "Move Down",
+  "section_menu_action_move_down": "નીચે કરો",
-  "section_menu_action_privacy_notice": "Privacy Notice",
+  "section_menu_action_privacy_notice": "ખાનગી સૂચના",
-  "default_label_loading": "લોડ કરી રહ્યું છે...",
+  "prefs_topstories_description": "ઉચ્ચ ગુણવત્તાવાળી સામગ્રી તમે અન્યથા ચૂકી શકો છો"
-  "header_stories": "શીર્ષ વાર્તાઓ",
-  "header_visit_again": "ફરી મુલાકાત",
-  "header_bookmarks": "તાજેતરના બુકમાર્ક્સ",
-  "header_bookmarks_placeholder": "તમારી પાસે હજી સુધી કોઈ બુકમાર્ક્સ નથી.",
-  "header_stories_from": "થી",
-  "type_label_synced": "બીજા ઉપકરણ થી સમન્વયિત કરેલ છે",
-  "type_label_open": "ખોલો",
-  "type_label_topic": "વિષય",
-  "type_label_now": "હવે",
-  "menu_action_copy_address": "સરનામું કૉપિ કરો",
-  "menu_action_email_link": "ઇમેલ કડી…",
-  "search_for_something_with": "શોધ કરો {search_term} ની સાથે:",
-  "search_settings": "શોધ ના સેટિંગ્સ બદલો",
-  "section_info_option": "માહિતી",
-  "section_info_send_feedback": "પ્રતિસાદ મોકલ",
-  "section_info_privacy_notice": "ગોપનીયતા સૂચના",
-  "welcome_title": "નવી વિન્ડોમાં આપનું સ્વાગત છે",
-  "welcome_body": "ફાયરફોક્સ, તમારા સૌથી સંબંધિત બુકમાર્ક્સ, લેખો, વિડિઓઝ, અને પૃષ્ઠો જે તમે તાજેતરમાં મુલાકાત લીધી એ બતાવવા માટે આ જગ્યાનો ઉપયોગ કરશે જેથી તમે પાછા તેમને સરળતાથી મેળવી શકો છો.",
-  "welcome_label": "તમારા હાઇલાઇટ્સ ઓળખવા",
-  "time_label_less_than_minute": "<1મિનિટ",
-  "time_label_minute": "{number}મિનિટ",
-  "time_label_hour": "{number}કલાક",
-  "time_label_day": "{number}દિવસ",
-  "settings_pane_bookmarks_header": "તાજેતરના બુકમાર્ક્સ",
-  "settings_pane_bookmarks_body": "તમારા નવા બનાવેલ બુકમાર્ક્સ એક હાથમાં સ્થાનમાં.",
-  "settings_pane_visit_again_header": "ફરી મુલાકાત",
-  "settings_pane_visit_again_body": "ફાયરફોક્સ તમને તમારા બ્રાઉઝિંગ હિસ્ટરીનાં ભાગો બતાવશે જે તમે યાદ રાખવા અથવા પાછા આવવા ઇચ્છતા હોવ.",
-  "edit_topsites_button_label": "તમારા ટોચના સાઇટ્સ વિભાગને કસ્ટમાઇઝ કરો",
-  "edit_topsites_showmore_button": "વધારે બતાવો",
-  "edit_topsites_showless_button": "થોડું બતાવો",
-  "edit_topsites_done_button": "પૂરું",
-  "edit_topsites_pin_button": "આ સાઇટને પિન કરો",
-  "edit_topsites_unpin_button": "આ સાઇટ અનપિન કરો",
-  "edit_topsites_dismiss_button": "આ સાઇટને કાઢી નાખો",
-  "edit_topsites_add_button": "ઉમેરો",
-  "edit_topsites_add_button_tooltip": "ટોચની સાઇટ ઉમેરો",
-  "pocket_feedback_header": "2.5 કરોડ વધુ લોકો દ્વારા બનાવાયેલા શ્રેષ્ઠ વેબ."
 };

browser/extensions/activity-stream/prerendered/locales/gu-IN/activity-stream.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="Content-Security-Policy-Report-Only" content="script-src 'unsafe-inline'; img-src http: https: data: blob:; style-src 'unsafe-inline'; child-src 'none'; object-src 'none'; report-uri https://tiles.services.mozilla.com/v4/links/activity-stream/csp">
-    <title>નવું ટૅબ</title>
+    <title>નવી ટૅબ</title>
     <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
     <link rel="stylesheet" href="resource://activity-stream/css/activity-stream.css" />

browser/extensions/activity-stream/prerendered/locales/ka/activity-stream-strings.js

@@ -11,7 +11,7 @@ window.gActivityStreamStrings = {
   "type_label_recommended": "პოპულარული",
   "type_label_pocket": "შენახულია Pocket-ში",
   "menu_action_bookmark": "ჩანიშვნა",
-  "menu_action_remove_bookmark": "სანიშნებიდან ამოღება",
+  "menu_action_remove_bookmark": "სანიშნებიდან ამოშლა",
   "menu_action_open_new_window": "ახალ ფანჯარაში გახსნა",
   "menu_action_open_private_window": "ახალ პირად ფანჯარაში გახსნა",
   "menu_action_dismiss": "დამალვა",
@@ -82,7 +82,7 @@ window.gActivityStreamStrings = {
   "manual_migration_import_button": "ახლავე გადმოტანა",
   "error_fallback_default_info": "სამწუხაროდ, შიგთავსის ჩატვირთვისას რაღაც ხარვეზი წარმოიქმნა.",
   "error_fallback_default_refresh_suggestion": "განაახლეთ გვერდი და სცადეთ ხელახლა.",
-  "section_menu_action_remove_section": "ამ ნაწილის ამოღება",
+  "section_menu_action_remove_section": "ამ ნაწილის მოცილება",
   "section_menu_action_collapse_section": "ამ ნაწილის აკეცვა",
   "section_menu_action_expand_section": "ამ ნაწილის გაშლა",
   "section_menu_action_manage_section": "გვერდის ნაწილების მართვა",

browser/extensions/activity-stream/prerendered/locales/ko/activity-stream-strings.js

@@ -29,17 +29,17 @@ window.gActivityStreamStrings = {
   "section_disclaimer_topstories": "Pocket을 통해서 사용자가 읽은 글을 기반으로 가장 재미있는 글을 찾아주는 글들을 읽어보세요. 이제 Mozilla와 함께 합니다.",
   "section_disclaimer_topstories_linktext": "어떻게 작동 하는지 알아봅시다.",
   "section_disclaimer_topstories_buttontext": "알겠습니다.",
-  "prefs_home_header": "Firefox Home Content",
+  "prefs_home_header": "Firefox 홈 콘텐츠",
-  "prefs_home_description": "Choose what content you want on your Firefox Home screen.",
+  "prefs_home_description": "Firefox 홈 화면에 나올 콘텐츠를 선택하세요.",
-  "prefs_restore_defaults_button": "Restore Defaults",
+  "prefs_restore_defaults_button": "기본값으로 복원",
-  "prefs_section_rows_option": "{num} row;{num} rows",
+  "prefs_section_rows_option": "{num} 행",
-  "prefs_search_header": "Web Search",
+  "prefs_search_header": "웹 검색",
-  "prefs_topsites_description": "The sites you visit most",
+  "prefs_topsites_description": "가장 많이 방문한 사이트",
   "prefs_topstories_description2": "Great content from around the web, personalized for you",
-  "prefs_topstories_show_sponsored_label": "{provider} Sponsored Stories",
+  "prefs_topstories_show_sponsored_label": "{provider} 제공 이야기",
-  "prefs_topstories_sponsored_learn_more": "Learn more",
+  "prefs_topstories_sponsored_learn_more": "자세히 보기",
-  "prefs_highlights_description": "A selection of sites that you’ve saved or visited",
+  "prefs_highlights_description": "저장하거나 방문한 사이트 모음",
-  "prefs_snippets_description": "Updates from Mozilla and Firefox",
+  "prefs_snippets_description": "Mozilla와 Firefox 소식",
   "settings_pane_button_label": "새 탭 페이지 꾸미기",
   "settings_pane_header": "새 탭 설정",
   "settings_pane_body2": "이 페이지에서 볼 것을 선택하세요.",
@@ -63,15 +63,15 @@ window.gActivityStreamStrings = {
   "topsites_form_title_label": "제목",
   "topsites_form_title_placeholder": "제목 입력",
   "topsites_form_url_label": "URL",
-  "topsites_form_image_url_label": "Custom Image URL",
+  "topsites_form_image_url_label": "개인화 이미지 URL",
   "topsites_form_url_placeholder": "URL 입력 또는 붙여 넣기",
-  "topsites_form_use_image_link": "Use a custom image…",
+  "topsites_form_use_image_link": "개인화 이미지 사용…",
-  "topsites_form_preview_button": "Preview",
+  "topsites_form_preview_button": "미리보기",
   "topsites_form_add_button": "추가",
   "topsites_form_save_button": "저장",
   "topsites_form_cancel_button": "취소",
   "topsites_form_url_validation": "유효한 URL이 필요합니다",
-  "topsites_form_image_validation": "Image failed to load. Try a different URL.",
+  "topsites_form_image_validation": "이미지를 읽어오지 못했습니다. 다른 URL을 시도해 주세요.",
   "pocket_read_more": "인기 주제:",
   "pocket_read_even_more": "더 많은 이야기 보기",
   "pocket_description": "Mozilla와 하나가 된 Pocket의 도움으로 놓칠지도 모르는 고품질의 컨텐츠를 접해보세요.",
@@ -80,14 +80,15 @@ window.gActivityStreamStrings = {
   "manual_migration_explanation2": "다른 브라우저에 있는 북마크, 기록, 비밀번호를 사용해 Firefox를 이용해 보세요.",
   "manual_migration_cancel_button": "괜찮습니다",
   "manual_migration_import_button": "지금 가져오기",
-  "error_fallback_default_info": "Oops, something went wrong loading this content.",
+  "error_fallback_default_info": "이 콘텐츠를 불러오는데 오류가 발생하였습니다.",
-  "error_fallback_default_refresh_suggestion": "Refresh page to try again.",
+  "error_fallback_default_refresh_suggestion": "페이지를 새로고침해서 다시 시도해 주세요.",
-  "section_menu_action_remove_section": "Remove Section",
+  "section_menu_action_remove_section": "섹션 삭제",
-  "section_menu_action_collapse_section": "Collapse Section",
+  "section_menu_action_collapse_section": "섹션 닫기",
-  "section_menu_action_expand_section": "Expand Section",
+  "section_menu_action_expand_section": "섹션 열기",
-  "section_menu_action_manage_section": "Manage Section",
+  "section_menu_action_manage_section": "섹션 관리",
-  "section_menu_action_add_topsite": "Add Top Site",
+  "section_menu_action_add_topsite": "인기 사이트 추가",
-  "section_menu_action_move_up": "Move Up",
+  "section_menu_action_move_up": "위로 이동",
-  "section_menu_action_move_down": "Move Down",
+  "section_menu_action_move_down": "아래로 이동",
-  "section_menu_action_privacy_notice": "Privacy Notice"
+  "section_menu_action_privacy_notice": "개인 정보 보호 정책",
+  "prefs_topstories_description": "놓칠 수 있는 높은 품질의 콘텐츠"
 };

browser/extensions/activity-stream/prerendered/locales/nn-NO/activity-stream-strings.js

@@ -5,7 +5,7 @@ window.gActivityStreamStrings = {
   "header_highlights": "Høgdepunkt",
   "header_recommended_by": "Tilrådd av {provider}",
   "context_menu_button_sr": "Opne kontekstmeny for {title}",
-  "section_context_menu_button_sr": "Open the section context menu",
+  "section_context_menu_button_sr": "Opne seksjonens kontekstmeny",
   "type_label_visited": "Besøkt",
   "type_label_bookmarked": "Bokmerkte",
   "type_label_recommended": "Trendar",
@@ -18,35 +18,35 @@ window.gActivityStreamStrings = {
   "menu_action_delete": "Slett frå historikk",
   "menu_action_pin": "Fest",
   "menu_action_unpin": "L:ys",
-  "confirm_history_delete_p1": "Er du sikker på at du vil slette alle førekomstar av denne sida frå historikken din?",
+  "confirm_history_delete_p1": "Er du sikker på at du vil sletta alle førekomstar av denne sida frå historikken din?",
   "confirm_history_delete_notice_p2": "Denne handlinga kan ikkje angrast.",
-  "menu_action_save_to_pocket": "Lagre til Pocket",
+  "menu_action_save_to_pocket": "Lagra til Pocket",
   "menu_action_delete_pocket": "Slett frå Pocket",
   "menu_action_archive_pocket": "Arkiver i Pocket",
   "search_button": "Søk",
   "search_header": "{search_engine_name}",
   "search_web_placeholder": "Søk på nettet",
   "section_disclaimer_topstories": "Dei mest interessante historiane på nettet, utvalde basert på kva du les. Frå Pocket, no ein del av Mozilla.",
-  "section_disclaimer_topstories_linktext": "Sjå korleis det fungerar.",
+  "section_disclaimer_topstories_linktext": "Sjå korleis det fungerer.",
   "section_disclaimer_topstories_buttontext": "OK, eg forstår det!",
-  "prefs_home_header": "Firefox Home Content",
+  "prefs_home_header": "Innhald Firefox-startside",
-  "prefs_home_description": "Choose what content you want on your Firefox Home screen.",
+  "prefs_home_description": "Vel kva for innhald du vil ha på Firefox-startsida di.",
-  "prefs_restore_defaults_button": "Restore Defaults",
+  "prefs_restore_defaults_button": "Gjenopprett standard",
-  "prefs_section_rows_option": "{num} row;{num} rows",
+  "prefs_section_rows_option": "{num} rekke;{num} rekkjer",
-  "prefs_search_header": "Web Search",
+  "prefs_search_header": "Nettsøk",
-  "prefs_topsites_description": "The sites you visit most",
+  "prefs_topsites_description": "Sidene du besøker mest",
   "prefs_topstories_description2": "Great content from around the web, personalized for you",
-  "prefs_topstories_show_sponsored_label": "{provider} Sponsored Stories",
+  "prefs_topstories_show_sponsored_label": "Sponsa nyheiter frå {provider}",
-  "prefs_topstories_sponsored_learn_more": "Learn more",
+  "prefs_topstories_sponsored_learn_more": "Les meir",
-  "prefs_highlights_description": "A selection of sites that you’ve saved or visited",
+  "prefs_highlights_description": "Eit utval av nettsider som du har lagra eller besøkt",
-  "prefs_snippets_description": "Updates from Mozilla and Firefox",
+  "prefs_snippets_description": "Oppdateringar frå Mozilla og Firefox",
   "settings_pane_button_label": "Tilpass sida for Ny fane",
   "settings_pane_header": "Innstillingar for Ny fane",
-  "settings_pane_body2": "Vel kva du skal vise på denne sida.",
+  "settings_pane_body2": "Vel kva du vil sjå på denne sida.",
   "settings_pane_search_header": "Søk",
   "settings_pane_search_body": "Søk på nettet frå den nye fana di.",
   "settings_pane_topsites_header": "Mest besøkte",
-  "settings_pane_topsites_body": "Tilgang til nettsidene du besøkjer mest.",
+  "settings_pane_topsites_body": "Tilgang til nettsidene du besøker mest.",
   "settings_pane_topsites_options_showmore": "Vis to rader",
   "settings_pane_highlights_header": "Høgdepunkt",
   "settings_pane_highlights_body2": "Finn vegen tilbake til interessante ting du nyleg har besøkt eller bokmerka.",
@@ -63,15 +63,15 @@ window.gActivityStreamStrings = {
   "topsites_form_title_label": "Tittel",
   "topsites_form_title_placeholder": "Skriv inn ein tittel",
   "topsites_form_url_label": "URL",
-  "topsites_form_image_url_label": "Custom Image URL",
+  "topsites_form_image_url_label": "Tilpassa bilde-URL",
   "topsites_form_url_placeholder": "Skriv eller lim inn ein URL",
-  "topsites_form_use_image_link": "Use a custom image…",
+  "topsites_form_use_image_link": "Bruk eit tilpassa bilde…",
-  "topsites_form_preview_button": "Preview",
+  "topsites_form_preview_button": "Førehandsvis",
   "topsites_form_add_button": "Legg til",
   "topsites_form_save_button": "Lagre",
   "topsites_form_cancel_button": "Avbryt",
   "topsites_form_url_validation": "Gyldig URL er påkravd",
-  "topsites_form_image_validation": "Image failed to load. Try a different URL.",
+  "topsites_form_image_validation": "Klarte ikkje å lesa bildet. Prøv ein annan URL.",
   "pocket_read_more": "Populære emne:",
   "pocket_read_even_more": "Vis fleire saker",
   "pocket_description": "Oppdag høgkvalitetsinnhald som du elles ville gå glipp av, ved hjelp av Pocket, som no er ein del av Mozilla.",
@@ -80,51 +80,15 @@ window.gActivityStreamStrings = {
   "manual_migration_explanation2": "Prøv Firefox med bokmerka, historikk og passord frå ein annan nettlesar.",
   "manual_migration_cancel_button": "Nei takk",
   "manual_migration_import_button": "Importer no",
-  "error_fallback_default_info": "Oops, something went wrong loading this content.",
+  "error_fallback_default_info": "Ops, noko gjekk gale då innhaldet skulle lastast inn.",
-  "error_fallback_default_refresh_suggestion": "Refresh page to try again.",
+  "error_fallback_default_refresh_suggestion": "Oppdater sida for å prøve på nytt.",
-  "section_menu_action_remove_section": "Remove Section",
+  "section_menu_action_remove_section": "Fjern seksjon",
-  "section_menu_action_collapse_section": "Collapse Section",
+  "section_menu_action_collapse_section": "Slå saman seksjon",
-  "section_menu_action_expand_section": "Expand Section",
+  "section_menu_action_expand_section": "Utvid seksjon",
-  "section_menu_action_manage_section": "Manage Section",
+  "section_menu_action_manage_section": "Handter seksjon",
-  "section_menu_action_add_topsite": "Add Top Site",
+  "section_menu_action_add_topsite": "Legg til mest besøkte",
   "section_menu_action_move_up": "Flytt opp",
   "section_menu_action_move_down": "Flytt ned",
   "section_menu_action_privacy_notice": "Personvernmerknad",
-  "default_label_loading": "Lastar…",
+  "prefs_topstories_description": "Høgkvalitetsinnhald du kanskje elles ville ha oversett"
-  "header_stories": "Hovudsakene",
-  "header_visit_again": "Besøk igjen",
-  "header_bookmarks": "Nylege bokmerke",
-  "header_bookmarks_placeholder": "Du har ingen bokmerke enno.",
-  "header_stories_from": "frå",
-  "type_label_synced": "Synkronisert frå ei anna eining",
-  "type_label_open": "Opne",
-  "type_label_topic": "Emne",
-  "type_label_now": "No",
-  "menu_action_copy_address": "Kopier adresse",
-  "menu_action_email_link": "E-postlenke…",
-  "search_for_something_with": "Søk etter {search_term} med:",
-  "search_settings": "Endra søkjeinnstillingar",
-  "section_info_option": "Info",
-  "section_info_send_feedback": "Send tilbakemelding",
-  "section_info_privacy_notice": "Personvernerklæring",
-  "welcome_title": "Velkomen til ny fane",
-  "welcome_body": "Firefox vil bruke denne plassen til å vise deg dei mest relevante bokmerka, artiklane, videoane og sidene du nettopp har vitja, slik at du enkelt kan finne tilbake til dei.",
-  "welcome_label": "Identifiserer høgdepunkta dine",
-  "time_label_less_than_minute": "<1 min.",
-  "time_label_minute": "{number} m",
-  "time_label_hour": "{number} t",
-  "time_label_day": "{number} d",
-  "settings_pane_bookmarks_header": "Nylege bokmerke",
-  "settings_pane_bookmarks_body": "Dei nyaste bokmerka dine på ein plass.",
-  "settings_pane_visit_again_header": "Besøk igjen",
-  "settings_pane_visit_again_body": "Firefox viser deg delar av surfehistorikken din som du kanskje ønskjer å hugse eller kome tilbake til.",
-  "edit_topsites_button_label": "Tilpass seksjonen Mest besøkte",
-  "edit_topsites_showmore_button": "Vis meir",
-  "edit_topsites_showless_button": "Vis mindre",
-  "edit_topsites_done_button": "Ferdig",
-  "edit_topsites_pin_button": "Fest sida",
-  "edit_topsites_unpin_button": "Løys frå denne nettsida",
-  "edit_topsites_dismiss_button": "Avvis denne nettsida",
-  "edit_topsites_add_button": "Legg til",
-  "pocket_feedback_header": "Det beste av nettet, sett saman av over 25 millioner menneske."
 };

browser/extensions/activity-stream/prerendered/locales/ro/activity-stream-strings.js

@@ -63,9 +63,9 @@ window.gActivityStreamStrings = {
   "topsites_form_title_label": "Titlu",
   "topsites_form_title_placeholder": "Introdu un titlu",
   "topsites_form_url_label": "URL",
-  "topsites_form_image_url_label": "Adresă web pentru imagine proprie",
+  "topsites_form_image_url_label": "URL pentru imagine personalizată",
   "topsites_form_url_placeholder": "Tastează sau lipește un URL",
-  "topsites_form_use_image_link": "Folosește o imagine proprie…",
+  "topsites_form_use_image_link": "Folosește o imagine personalizată…",
   "topsites_form_preview_button": "Previzualizare",
   "topsites_form_add_button": "Adaugă",
   "topsites_form_save_button": "Salvează",

browser/extensions/activity-stream/prerendered/locales/sr/activity-stream-strings.js

@@ -34,7 +34,7 @@ window.gActivityStreamStrings = {
   "prefs_restore_defaults_button": "Врати подразумевано",
   "prefs_section_rows_option": "{num} ред;{num} реда;{num} редова",
   "prefs_search_header": "Веб претрага",
-  "prefs_topsites_description": "Сајтови које сте највише посетили",
+  "prefs_topsites_description": "Сајтови које највише посећујете",
   "prefs_topstories_description2": "Great content from around the web, personalized for you",
   "prefs_topstories_show_sponsored_label": "Чланци од спонзора {provider}",
   "prefs_topstories_sponsored_learn_more": "Сазнајте више",
@@ -90,42 +90,5 @@ window.gActivityStreamStrings = {
   "section_menu_action_move_up": "Помери горе",
   "section_menu_action_move_down": "Помери доле",
   "section_menu_action_privacy_notice": "Обавештење о приватности",
-  "default_label_loading": "Учитавање…",
+  "prefs_topstories_description": "Веома квалитетан садржај који би вам можда промакао"
-  "header_stories": "Популарне приче",
-  "header_visit_again": "Посетите поново",
-  "header_bookmarks": "Недавне забелешке",
-  "header_bookmarks_placeholder": "Још увек немате забелешке.",
-  "header_stories_from": "од",
-  "type_label_synced": "Синхронизовано са другог уређаја",
-  "type_label_open": "Отвори",
-  "type_label_topic": "Тема",
-  "type_label_now": "Сада",
-  "menu_action_copy_address": "Копирај адресу",
-  "menu_action_email_link": "Веза е-поште…",
-  "search_for_something_with": "Претражите {search_term} са:",
-  "search_settings": "Измените подешавања претраге",
-  "section_info_option": "Инфо",
-  "section_info_send_feedback": "Пошаљите повратне податке",
-  "section_info_privacy_notice": "Обавештење о приватности",
-  "welcome_title": "Добродошли на нови језичак",
-  "welcome_body": "Firefox ће користити овај простор да вам приказује најрелевантне језичке, чланке, видео клипове и странице које сте недавно посетили, како бисте им се лако могли вратити.",
-  "welcome_label": "Учитавам ваше истакнуте ставке",
-  "time_label_less_than_minute": "<1m",
-  "time_label_minute": "{number}m",
-  "time_label_hour": "{number}h",
-  "time_label_day": "{number}d",
-  "prefs_topstories_description": "Веома квалитетан садржај који би вам можда промакао",
-  "settings_pane_bookmarks_header": "Недавне забелешке",
-  "settings_pane_bookmarks_body": "Ваша нова забелешка на јединственом месту.",
-  "settings_pane_visit_again_header": "Посетите поново",
-  "settings_pane_visit_again_body": "Firefox ће вам приказивати делове ваше историје прегледања коју можда желите да запамтите или да им се вратите.",
-  "edit_topsites_button_label": "Прилагодите секцију омиљених сајтова",
-  "edit_topsites_showmore_button": "Прикажи више",
-  "edit_topsites_showless_button": "Прикажи мање",
-  "edit_topsites_done_button": "Готово",
-  "edit_topsites_pin_button": "Закачи овај сајт",
-  "edit_topsites_unpin_button": "Откачи овај сајт",
-  "edit_topsites_dismiss_button": "Уклони овај сајт",
-  "edit_topsites_add_button": "Додај",
-  "pocket_feedback_header": "Најбоље од веба од преко 25 милиона кустоса."
 };