Bug 1399615 - Export Screenshots 19.0.0 to Firefox. r=kmag

MozReview-Commit-ID: 1QFbWCThVeg

--HG--
rename : browser/extensions/screenshots/webextension/icons/onboarding-4.png => browser/extensions/screenshots/webextension/icons/onboarding-5.png
extra : transplant_source : 1%8AV%EBZ%A5%18%F9%BD%E9%EA%ADv%DEbm%BF%EF5N

browser/components/uitour/test/browser_UITour_availableTargets.js

@@ -157,11 +157,10 @@ var pageActionsHelper = {
 
 function ensureScreenshotsEnabled() {
   SpecialPowers.pushPrefEnv({ set: [
-    [ "extensions.screenshots.system", false ],
+    [ "extensions.screenshots.disabled", false ],
     [ "extensions.screenshots.system-disabled", false ]
   ]});
   return BrowserTestUtils.waitForCondition(() => {
-    return PageActions.actionForID("screenshots") &&
-           !CustomizableUI.getWidget("screenshots_mozilla_org-browser-action");
+    return PageActions.actionForID("screenshots");
   }, "Should enable Screenshots");
 }

browser/extensions/screenshots/bootstrap.js

@@ -1,4 +1,6 @@
 /* globals ADDON_DISABLE */
+// TODO: re-enable
+/* eslint-disable */
 const OLD_ADDON_PREF_NAME = "extensions.jid1-NeEaf3sAHdKHPA@jetpack.deviceIdInfo";
 const OLD_ADDON_ID = "jid1-NeEaf3sAHdKHPA@jetpack";
 const ADDON_ID = "screenshots@mozilla.org";
@@ -234,16 +236,8 @@ let photonPageAction;
 // Does nothing otherwise.  Ideally, in the future, WebExtension page actions
 // and Photon page actions would be one in the same, but they aren't right now.
 function initPhotonPageAction(api, webExtension) {
-  // The MOZ_PHOTON_THEME ifdef got removed, but we need to support 55 and 56 as well,
-  // so check if the property exists *and* is false before bailing.
-  if (typeof AppConstants.MOZ_PHOTON_THEME != "undefined" && !AppConstants.MOZ_PHOTON_THEME) {
-    // Photon not supported.  Use the WebExtension's browser action.
-    return;
-  }
-
   let id = "screenshots";
   let port = null;
-  let baseIconPath = addonResourceURI.spec + "webextension/";
 
   let {tabManager} = webExtension.extension;
 
@@ -251,7 +245,7 @@ function initPhotonPageAction(api, webExtension) {
   photonPageAction = PageActions.actionForID(id) || PageActions.addAction(new PageActions.Action({
     id,
     title: "Take a Screenshot",
-    iconURL: baseIconPath + "icons/icon-32-v2.svg",
+    iconURL: webExtension.extension.getURL("icons/icon-32-v2.svg"),
     _insertBeforeActionID: null,
     onCommand(event, buttonNode) {
       if (port) {
@@ -265,17 +259,6 @@ function initPhotonPageAction(api, webExtension) {
     },
   }));
 
-  // Remove the navbar button of the WebExtension's browser action.
-  let cuiWidgetID = "screenshots_mozilla_org-browser-action";
-  CustomizableUI.addListener({
-    onWidgetAfterCreation(wid, aArea) {
-      if (wid == cuiWidgetID) {
-        CustomizableUI.destroyWidget(cuiWidgetID);
-        CustomizableUI.removeListener(this);
-      }
-    },
-  });
-
   // Establish a port to the WebExtension side.
   api.browser.runtime.onConnect.addListener((listenerPort) => {
     if (listenerPort.name != "photonPageActionPort") {
@@ -289,7 +272,7 @@ function initPhotonPageAction(api, webExtension) {
           photonPageAction.title = message.title;
         }
         if (message.iconPath) {
-          photonPageAction.iconURL = baseIconPath + message.iconPath;
+          photonPageAction.iconURL = webExtension.extension.getURL(message.iconPath);
         }
         break;
       default:
@@ -297,13 +280,5 @@ function initPhotonPageAction(api, webExtension) {
         break;
       }
     });
-
-    // It's necessary to tell the WebExtension not to use its browser action,
-    // due to the CUI widget's removal.  Otherwise Firefox's WebExtension
-    // machinery throws exceptions.
-    port.postMessage({
-      type: "setUsePhotonPageAction",
-      value: true
-    });
   });
 }

browser/extensions/screenshots/install.rdf

@@ -7,12 +7,12 @@
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!--Firefox-->
-        <em:minVersion>51.0a1</em:minVersion>
+        <em:minVersion>57.0a1</em:minVersion>
         <em:maxVersion>*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:type>2</em:type>
-    <em:version>16.1.0</em:version>
+    <em:version>19.0.0</em:version>
     <em:bootstrap>true</em:bootstrap>
     <em:homepageURL>https://screenshots.firefox.com/</em:homepageURL>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>

browser/extensions/screenshots/moz.build

@@ -120,6 +120,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales
   'webextension/_locales/et/messages.json'
 ]
 
+FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["eu"] += [
+  'webextension/_locales/eu/messages.json'
+]
+
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["fa"] += [
   'webextension/_locales/fa/messages.json'
 ]
@@ -373,7 +377,8 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["icons"]
   'webextension/icons/onboarding-1.png',
   'webextension/icons/onboarding-2.png',
   'webextension/icons/onboarding-3.png',
-  'webextension/icons/onboarding-4.png'
+  'webextension/icons/onboarding-4.png',
+  'webextension/icons/onboarding-5.png'
 ]
 
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["onboarding"] += [

browser/extensions/screenshots/test/browser/.eslintrc.js

@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "plugin:mozilla/browser-test"
-  ]
-}

browser/extensions/screenshots/test/browser/.eslintrc.yml

@@ -0,0 +1,10 @@
+env:
+  node: true
+
+# TODO: re-enable
+#extends:
+#  - plugin:mozilla/browser-test
+
+rules:
+  no-unused-vars: off
+  no-undef: off

browser/extensions/screenshots/test/browser/browser_screenshots_ui_check.js

@@ -1,5 +1,8 @@
+/* eslint disable */
 "use strict";
 
+const BUTTON_ID = "pageAction-panel-screenshots";
+
 function checkElements(expectPresent, l) {
   for (let id of l) {
     is(!!document.getElementById(id), expectPresent, "element " + id + (expectPresent ? " is" : " is not") + " present");
@@ -13,13 +16,10 @@ add_task(async function() {
     await promiseScreenshotsReset();
   });
 
-  let onPhoton = (typeof AppConstants.MOZ_PHOTON_THEME == "undefined") ||
-                 AppConstants.MOZ_PHOTON_THEME;
-  let id = onPhoton ? "pageAction-panel-screenshots" : "screenshots_mozilla_org-browser-action";
 
   await BrowserTestUtils.waitForCondition(
-    () => document.getElementById(id),
+    () => document.getElementById(BUTTON_ID),
     "Screenshots button should be present", 100, 100);
 
-  checkElements(true, [id]);
+  checkElements(true, [BUTTON_ID]);
 });

browser/extensions/screenshots/test/browser/head.js

@@ -15,18 +15,6 @@ function promiseScreenshotsEnabled() {
   }
   info("Screenshots is not enabled");
   return new Promise((resolve, reject) => {
-    if (AppConstants.hasOwnProperty("MOZ_PHOTON_THEME") && !AppConstants.MOZ_PHOTON_THEME) {
-      let listener = {
-        onWidgetAfterCreation(widgetid) {
-          if (widgetid == "screenshots_mozilla_org-browser-action") {
-            info("screenshots_mozilla_org-browser-action button created");
-            CustomizableUI.removeListener(listener);
-            resolve(false);
-          }
-        }
-      }
-      CustomizableUI.addListener(listener);
-    } else {
     let interval = setInterval(() => {
       let action = PageActions.actionForID("screenshots");
       if (action) {
@@ -35,7 +23,6 @@ function promiseScreenshotsEnabled() {
         resolve(false);
       }
     }, 100);
-    }
     info("Set Screenshots disabled pref to false.");
     Services.prefs.setBoolPref("extensions.screenshots.system-disabled", false);
   });
@@ -47,18 +34,6 @@ function promiseScreenshotsDisabled() {
     return Promise.resolve(true);
   }
   return new Promise((resolve, reject) => {
-    if (AppConstants.hasOwnProperty("MOZ_PHOTON_THEME") && !AppConstants.MOZ_PHOTON_THEME) {
-      let listener = {
-        onWidgetDestroyed(widgetid) {
-          if (widgetid == "screenshots_mozilla_org-browser-action") {
-            CustomizableUI.removeListener(listener);
-            info("screenshots_mozilla_org-browser-action destroyed");
-            resolve(false);
-          }
-        }
-      }
-      CustomizableUI.addListener(listener);
-    } else {
     let interval = setInterval(() => {
       let action = PageActions.actionForID("screenshots");
       if (!action) {
@@ -67,7 +42,6 @@ function promiseScreenshotsDisabled() {
         resolve(false);
       }
     }, 100);
-    }
     info("Set Screenshots disabled pref to true.");
     Services.prefs.setBoolPref("extensions.screenshots.system-disabled", true);
   });

browser/extensions/screenshots/webextension/_locales/ach/messages.json

@@ -73,25 +73,25 @@
   "genericErrorDetails": {
     "message": "Pe wa ngeyo ngo ma otime kombedi. Iromo temo ne doki onyo mako cal pa potbuk mukene?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Maki, gwoki, ki nywak cal me wang kio labongo weko Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Mak ngo ma imito keken"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Dii ka i ywar me mako cal pa but potbuk keken. Itwero bene wot iwiye me wero yer mamegi."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Mak dirica onyo Potbuk weng"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Yer mapeca ma i tung lacuc malo me mako kabedo ma nen i dirica onyo me mako potbuk weng."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Kit ma imito"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Gwok cal mamegi ma ki ngolo ii Kakube pi nywako i yoo ma yot, onyo gamo gi i kompiuta ni. Itwero bene diyo mapeca me Cal Na me nongo cal ma i mako weng."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ar/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "لسنا متأكدين ما المشكلة. أتمانع إعادة المحاولة أو أخذ لقطة لصفحة أخرى؟"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "خذ لقطات الشاشة و احفظها و شاركها دون مغادرة فَيَرفُكس."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "التقط ما تريده فقط"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "انقر و اسحب لالتقاط جزء معين من الصفحة. يمكنك أيضًا التحويم لإبراز التحديد."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "التقط النوافذ أو صفحات كاملة"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "اختر الأزرار في أعلى اليمين لالتقاط المنطقة المرئية في النافذة أو الصفحة كلها."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "كما تريدها"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "احفظ اللقطات التي أخذتها على الوب لمشاركتها بسهولة، أو نزّلها على حاسوبك. يمكنك أيضًل النقر على زر ”لقطاتي“ للعثور على كل اللقطات التي أخذتها."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ast/messages.json

@@ -2,6 +2,12 @@
   "addonAuthorsList": {
     "message": "Mozilla <screenshots-feedback@mozilla.com>"
   },
+  "contextMenuLabel": {
+    "message": "Facer una captura"
+  },
+  "myShotsLink": {
+    "message": "Les mios captures"
+  },
   "saveScreenshotSelectedArea": {
     "message": "Guardar"
   },
@@ -20,13 +26,31 @@
   "notificationLinkCopiedTitle": {
     "message": "Copióse l'enllaz"
   },
+  "requestErrorDetails": {
+    "message": "¡Perdón, pero nun pudimos guardar la to captura! Volvi tentalo más sero, por favor."
+  },
   "unshootablePageErrorTitle": {
     "message": "Nun pue capturase esta páxina."
   },
   "unshootablePageErrorDetails": {
     "message": "Esta páxina web nun ye estándar, asina que nun pues capturala."
   },
+  "tourHeaderClickAndDrag": {
+    "message": "Captura lo que quies"
+  },
+  "tourHeaderDownloadUpload": {
+    "message": "Como te preste"
+  },
+  "tourSkip": {
+    "message": "SALTAR"
+  },
   "tourDone": {
     "message": "Fecho"
+  },
+  "termsAndPrivacyNoticeTermsLink": {
+    "message": "Términos"
+  },
+  "libraryLabel": {
+    "message": "Captures de pantalla"
   }
 }

browser/extensions/screenshots/webextension/_locales/az/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Nə baş verdiyindən əmin deyilik. Bir daha yoxlayın və ya başqa səhifənin ekran görüntüsünü alaraq işləyib işləmədiyinə əmin olun."
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefoxu tərk etmədən ekran görüntüləri alın, saxlayın və paylaşın."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "İstədiyiniz hər şeyin görüntüsünü alın"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Səhifənin hər hansı bir hissəsini almaq üçün basın və ya sürüşdürün. Seçiminizi işıqlandırmaq üçün üzərinə gedin."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Pəncərəni və ya bütün səhifəni çəkin"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Sadəcə pəncərədə görünən hissəni və ya bütün səhifəni çəkmək üçün sağ üstdəki düymələrdən birini seçin."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "İstədiyiniz kimi"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Kəsdiyiniz hissələri rahat paylaşmaq üçün internetdə saxlayın və ya kompüterinizə endirin. Həmçinin Ekran Görüntülərim düyməsinə basaraq çəkdiyiniz bütün ekran görüntülərini görə bilərsiz."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/be/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Мы не ўпэўненыя, у чым праблема. Паспрабаваць яшчэ раз, ці зрабіць здымак іншай старонкі?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Рабіце здымкі экрана, захоўвайце і дзяліцеся імі не выходзячы з Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Рабіце скрыншоты чаго заўгодна"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Пстрыкніце і пацягніце мышшу для захопу часткі старонкі. Вы таксама можаце навесці курсор мышы для падсвятлення абранай вобласці."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Рабіце захоп вокнаў або цэлых старонак"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "З дапамогай кнопак у верхнім правым куце выбірайце захоп бачнай вобласці акна або старонкі цалкам."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Як вам падабаецца"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Захоўваеце свае здымкі ў Інтэрнэце, каб лёгка імі дзяліцца, або загружайце іх на свой камп'ютар. Вы таксама можаце прагледзець усе захаваныя здымкі, націснуўшы на кнопку Мае здымкі."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/bg/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Не сме сигурни какво точно се случи. Може да опитате отново, както и да снимате друга страница."
   },
-  "tourBodyOne": {
-    "message": "Правете, запазвайте и споделяйте снимки на екрана без да напускате Firefox."
+  "tourBodyIntro": {
+    "message": "Създавайте, запазвайте и споделяйте снимки на екрана без да напускате Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Уловете само нужното"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Щракнете с мишката или влачете, за да уловите части от страницата. А когато посочите елементи от страницата – те се осветяват."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Улавяйте прозорци и цели страници"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Използвайте бутоните в горния десен ъгъл, за да уловите само видимата част или цялата страница."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Както ви харесва"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Запазвайте снимките на страници от Мрежата, за да ги споделяте по-лесно или ги изтегляйте на компютъра си. А бутонът „Моите снимки“ ще ви покаже всички направени от вас снимки."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/bn_BD/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "এই মাত্র কি ঘটেছে আমরা নিশ্চিত নই। আপনি কি অনুগ্রহ করে পুরনায় সট নেবেন কিংবা ভিন্ন একটি পেজে চেষ্টা করবেন?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox ত্যাগ করা ছাড়াই স্ক্রিনশট তোল, সংরক্ষণ কর এবং শেয়ার কর।"
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "ক্যাপচার করুন আপনি যা চান"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "একটি পেজের কিয়দংশ ক্যাপচার করতে ক্লিক করে ড্রাগ করুন। অতঃপর আপনি মাউজ হোভার করে আপনার নির্বাচিত অংশ হাইলাইট করতে পারবেন।"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "উইন্ডো ক্যাপচার করুন অথবা পুরো পেজ"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "ইউন্ডোতে দৃশ্যমান অংশ অথবা সম্পূর্ণ পেজ ক্যাপচার করতে উপরে ডানদিকের বাটনগুলো থেকে নির্বাচন করুন।"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "আপনি যেমন পছন্দ করেন"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "আপনার ক্রপ করা সটসমূহ ওয়েবে রাখুন সহজে শেয়ার করার সুবিধার্থে, অথবা আপনার কম্পিউটারে ডাউনলোড করুন। আপনার সকল সটসমূহ খুঁজে পেতে আমার সটসমূহ বাটনে ক্লিক করুন।"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ca/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "S'ha produït un error inesperat. Torneu-ho a provar o captureu una altra pàgina."
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Feu, deseu i compartiu captures de pantalla sense sortir del Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Captureu tot allò que vulgueu"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Feu clic i arrossegueu per capturar només una part de la pàgina. També podeu moure el ratolí per sobre per ressaltar la vostra selecció."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Captureu la finestra o la pàgina sencera"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Seleccioneu amb els botons de la part superior dreta si voleu capturar l'àrea visible de la finestra o la pàgina sencera."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Com vulgueu"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Deseu les vostres captures al web per compartir-les fàcilment o baixeu-les a l'ordinador. També podeu fer clic al botó «Les meves captures» per veure totes les captures que heu fet."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/cak/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Man öj jikïl chi rij ri xk'ulwachitäj. ¿La nawajo' natojtob'ej chik o nachäp ruwachib'al jun chik ruxaq?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ke'achapa', ke'ayaka', chuqa' ke'akomonij chapoj taq wachib'äl rik'in man yatel ta el pa Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Jun k'ak'a' rub'anikil richin niyak"
+  },
+  "tourBodyPageAction": {
+    "message": "Tarik'a' ri ruk'utsamaj kisamaj taq ruxaq pa kik'ajtz'ik ochochib'äl xab'achike ramaj toq nawajo' nawelesaj jun chapoj wachib'äl."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Tachapa' ri Nawajo'"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Tapitz'a' chuqa' taqirirej richin nacha' xa jun peraj ruxaq. Chuqa' yatikïr yaq'axaj richin nipe retal ri acha'oj."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Chapoj Tzuwäch o Tz'aqät taq Ruxaq"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Ke'acha' ri ikim ajkiq'a' taq pitz'b'äl richin nachäp ri tz'etel ruk'ojlem tzuwäch o richin nachäp jun tz'aqät ruxaq."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Achi'el Niqa Chawäch"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Ke'ayaka' ri qupin taq awachib'al pa ajk'amaya'l richin man k'ayew ta ye'akomonij o ye'aqasaj pan akematz'ib'. Chuqa' yatikïr napïtz ri Taq Nuwachib'al richin ye'awïl konojel ri taq wachib'al e'elesan."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/cs/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Nejsme si jistí, co se právě stalo. Chcete to zkusit znovu, nebo zkusíte pořídit snímek na jiné stránce?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Pořizujte, ukládejte a sdílejte snímky webových stránek bez opuštění Firefoxu."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Nový způsob ukládání"
+  },
+  "tourBodyPageAction": {
+    "message": "Kdykoliv chcete pořídit snímek, otevřete nabídku akcí stránky v adresním řádku."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Zachyťte, cokoliv chcete"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Stiskem tlačítka myši a tahem můžete vybrat oblast stránky. Výběr můžete provést také najetím myši na prvek stránky."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Pořizujte snímky jen částí nebo i celých stránek"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Pomocí tlačítek vpravo nahoře můžete pořídit snímek jen viditelné části nebo úplně celé stránky."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Jak sami chcete"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Uložte si oříznutý snímek stránky na web pro rychlejší sdílení, nebo si ho stáhněte do počítače. Pro zobrazení všech snímků stačí klepnout na tlačítko Mé snímky."
   },
   "tourSkip": {
@@ -130,6 +136,6 @@
     "message": "zásadami ochrany osobních údajů"
   },
   "libraryLabel": {
-    "message": "Screenshots"
+    "message": "Snímky stránek"
   }
 }

browser/extensions/screenshots/webextension/_locales/cy/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Nid ydym yn gwybod beth sydd wedi ddigwydd. Ceisiwch eto neu dynnu llun o dudalen wahanol?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Cymryd, cadw a rhannu lluniau sgrin heb adael Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Ffordd newydd i gadw"
+  },
+  "tourBodyPageAction": {
+    "message": "Ehangwch y ddewislen gweithredoedd tudalen yn y bar cyfeiriad unrhyw bryd fyddwch am gymryd llun sgrin."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Cipio Dim ond Beth Rydych ei Angen"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Cliciwch a llusgo i gipio rhan o dudalen. Gallwch hofran i amlygu eich dewis."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Cipio Ffenestri neu Dudalennau Cyfan"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Dewiswch y botymau ar y dde uchod i gipio ardal gweladwy mewn ffenestr neu i gipio tudalen gyfan."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Yn Ôl eich Dewis"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Cadwch eich lluniau wedi eu golygu i'r We ar gyfer rhannu haws, neu eu llwytho i lawr i'ch cyfrifiadur. Gallwch hefyd glicio ar Fy Lluniau i weld pob llun sydd gennych."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/da/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Vi er ikke sikre på, hvad der lige skete. Vil du prøve igen - eller vil du tage et skærmbillede af en anden side?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Tag, gem og del skærmbilleder uden at forlade Firefox. "
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Gem lige hvad du vil."
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klik og træk for at tage et udklip af en del af en side. Du kan også holde markøren over for at fremhæve din markering."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Tag skærmbilleder af vinduer eller hele sider."
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Brug knapperne øverst til højre for at tage et skærmbillede af det synlige område i vinduet eller for at tage et skærmbillede af hele siden."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Som du vil have det."
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Gem dine beskårne skærmbilleder på nettet for nemmere at dele dem - eller hent dem ned på din computer. Du kan også klikke på knappen \"Mine skærmbilleder\" for at finde de skærmbilleder, du har taget."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/de/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Wir wissen auch nicht, was gerade passiert ist. Könnten Sie das Bildschirmfoto erneut oder auf einer anderen Seite aufnehmen?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Bildschirmfotos aufnehmen, speichern und teilen, ohne Firefox zu verlassen."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Neue Speichermöglichkeit"
+  },
+  "tourBodyPageAction": {
+    "message": "Erweitern Sie das Menü „Aktionen für Seite“ in der Adressleiste immer dann, wenn Sie ein Bildschirmfoto machen möchten."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Nehmen Sie auf, was Sie möchten"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klicken und ziehen Sie, um nur einen Teil einer Seite aufzunehmen. Sie können den Mauszeiger auch darüber bewegen, um Ihre Auswahl hervorzuheben."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Fenster oder ganze Seiten speichern"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Nutzen Sie die Schaltflächen rechts oben, um den sichtbaren Bereich im Fenster oder eine ganze Seite zu speichern."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Wie Sie möchten"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Speichern Sie Ihre zugeschnittenen Bildschirmfotos im Internet, sodass sie leicht zu teilen sind, oder laden Sie sie auf Ihren Computer herunter. Sie können auch auf die Schaltfläche „Meine Bildschirmfotos“ klicken, um alle Ihre Bildschirmfotos zu finden."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/dsb/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Njejsmy se wěste, což jo se stało. Cośo hyšći raz wopytaś abo cośo drugi bok fotografěrowaś?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Gótujśo, składujśo a źělśo fota wobrazowki mimo až Firefox spušćaśo."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Nowa wašnja składowanja"
+  },
+  "tourBodyPageAction": {
+    "message": "Wócyńśo meni akcijow boka w adresowem pólu kuždy raz, gaž cośo foto worazowki gótowaś."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Fotografěrujśo jadnorje, což cośo"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klikniśo a ześěgniśo, aby źěl boka fotografěrował. Móžośo teke špěrku myški nad nim gibaś, aby swój wuběr wuzwignuł."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Wokna abo cełe boki składowaś"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Wubjeŕśo tłocašk górjejce napšawo, aby widobny wobcerk we woknje abo ceły bok fotografěrowaś."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Tak, kaž se wam spódoba"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Składujśo swóje pśirězane fota wobrazowki w interneśe, aby je lažcej źělił, abo ześěgniśo je na swójo licadło. Móžośo teke na tłocašk „Móje fota wobrazowki“ kliknuś, abye wšě fota wobrazowki namakał, kótarež sćo gótował."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/el/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Δεν είμαστε σίγουροι για το τι ακριβώς συνέβη. Προσπαθήστε ξανά ή κάντε λήψη σε μια άλλη σελίδα."
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Λήψη, αποθήκευση και διαμοιρασμός στιγμιοτύπων μέσα από το Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Καταγράψτε αυτό που εσείς επιθυμείτε"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Κάντε κλικ και σύρετε για την καταγραφή ενός τμήματος της σελίδας. Μπορείτε να επισημάνετε την επιλογή σας μετακινώντας τον ποντίκι σας επάνω της."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Λήψη παραθύρων ή ολόκληρων σελίδων"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Επιλέξτε τα κουμπιά επάνω δεξιά για να καταγράψετε την ορατή περιοχή του παραθύρου ή να καταγράψετε μια ολόκληρη σελίδα."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Ακριβώς όπως το θέλετε"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Αποθηκεύστε της λήψεις σας στο Διαδίκτυο για ευκολότερο διαμοιρασμό, η λήψη τους στον υπολογιστή σας. Μπορείτε να βρείτε όλες τις λήψεις σας πατώντας στο κουμπί «Οι λήψεις μου»."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/en_GB/messages.json

@@ -70,25 +70,25 @@
   "genericErrorDetails": {
     "message": "We’re not sure what just happened. Care to try again or take a shot of a different page?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Take, save, and share screenshots without leaving Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Capture Just What You Want"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Click and drag to capture just a portion of a page. You can also hover to highlight your selection."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Capture Windows or Entire Pages"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Select the buttons in the upper right to capture the visible area in the window or to capture an entire page."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "As You Like It"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Save your cropped shots to the web for easier sharing, or download them to your computer. You also can click on the My Shots button to find all the shots you’ve taken."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/en_US/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "We’re not sure what just happened. Care to try again or take a shot of a different page?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Take, save, and share screenshots without leaving Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "A new way to save"
+  },
+  "tourBodyPageAction": {
+    "message": "Expand the page actions menu in the address bar any time you want to take a screenshot."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Capture Just What You Want"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Click and drag to capture just a portion of a page. You can also hover to highlight your selection."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Capture Windows or Entire Pages"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Select the buttons in the upper right to capture the visible area in the window or to capture an entire page."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "As You Like It"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Save your cropped shots to the web for easier sharing, or download them to your computer. You also can click on the My Shots button to find all the shots you’ve taken."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/eo/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Ni ne tro certas, kio ĵus okazis. Ĉu vi povus klopodi denove aŭ fari ekrankopion de alia paĝo?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Faru, konservu kaj dividu ekrankopiojn sen forlasi Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Nova maniero konservi ekrankopiojn"
+  },
+  "tourBodyPageAction": {
+    "message": "Kiam vi volas fari ekrankopion, iru al la menuo «Retpaĝaj agoj» en la adresa strio."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Kopiu nur tion, kion vi volas."
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Alklaku kaj trenu por kopii nur parton de paĝo. Vi povas ankaŭ ŝvebi por elstarigi vian elekton."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Kapti fenestrojn aŭ tutaj paĝojn"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Elektu la butonojn supre kaj dekstre por kapti la videblan areon en la fenestro aŭ por kapti tutan paĝon."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Kiel vi volas"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Konservu vian eltonditajn ekrankopiojn en la reto, por pli facile dividi ilin, aŭ elŝutu ilin al via komputilo. Vi ankaŭ povas alklaki la butonon 'Miaj ekrankopioj' por trovi ĉiujn ekrankopiojn faritajn de vi."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/es_AR/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "No estamos seguros de lo que pasó. ¿Querés intenar de nuevo o tomar una captura de una página diferente?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Hacer, guardar y compartir capturas de pantalla sin dejar Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Capturar sólo lo que querés"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Hacé clic y arrastrá para capturar una porción de la página. También podés pasar por encima para resaltar la selección."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Capturar ventanas o páginas enteras"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Seleccioná los botones arriba a la derecha para capturar el área visible en la ventana o la página completa."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Como te guste"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Guardá tus capturas recortadas a la web para compartir o descargarlas más fácilmente a tu computadora. También podés hacer clic en el botón Mis capturas para encontrar todas las capturas hechas."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/es_CL/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "No estamos seguros de lo que sucedió. ¿Te importaría volver a intentarlo o tomar una captura de una página diferente?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Toma, guarda y comparte capturas sin salir de Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Captura lo que necesitas"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Haz clic y arrastra para captura justo una parte de la página. También puedes colocarte sobre una parte para destacar tu selección."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Captura ventanas o páginas completas"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Selecciona los botones en la parte superior derecha para capturar el área visible ne la ventana o para capturar una página completa."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Como tu quieras"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Guarda tus capturas recortadas en la Web para compartirlas fácilmente o descargarlas a tu computador. También puedes hacer clic en el botón Mis capturas para encontrar todas las que hayas tomado."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/es_ES/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "No estamos seguros de lo que acaba de pasar. ¿Te importa volver a intentarlo o hacer una captura de otra página?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Hacer, guardar y compartir capturas de pantalla sin salir de Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Una nueva forma de guardar"
+  },
+  "tourBodyPageAction": {
+    "message": "Expande el menú de acciones de la página en la barra de direcciones cuando quieras hacer una captura."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Haz capturas solo de lo que tú quieras"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Haz clic y arrastra para capturar solo una parte de la página. También puedes pasar por encima para resaltar tu selección."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Haz capturas de Windows o páginas completas"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Selecciona los botones de la parte superior derecha para capturar el área visible en Windows o la página completa."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Como más te guste"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Guarda las capturas de la Web recortadas para compartirlas mejor o descárgalas en tu ordenador. También puedes hacer clic en Mis capturas para ver todas las capturas que has hecho."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/es_MX/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "No estamos seguros qué pasó. ¿Te importaría intentarlo de nuevo o tomar una captura de una página diferente?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Toma, guarda y comparte capturas de pantalla sin dejar Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Captura sólo lo que necesitas"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Haz clic y arrastra para capturas sólo una parte de la página. También puedes desplazarte para resaltar tu selección."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Captura ventanas o páginas enteras"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Selecciona los botones en la parte superior derecha para capturar el área visible en la ventana o para capturar una página completa."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Como te gusta"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Guarda tus capturas recortadas en la Web para compartirlas más fácilmente o descárgalas en tu computadora. También puedes hacer clic en el botón Mis Capturas para encontrar todas las fotos que has tomado."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/et/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Me pole kindlad, mis just juhtus. Proovid ehk uuesti või teed ekraanipildi mõnest teisest lehest?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Tee, salvesta ja jaga ekraanipilte Firefoxist lahkumata."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Salvesta just seda, mida soovid"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klõpsa ja lohista lehe osa valimiseks. Samuti võid valiku esile toomiseks kursorit selle kohal hoida."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Salvesta aknaid või terveid lehti"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Kasuta nuppe ülal paremal aknas nähtava ala või terve lehe salvestamiseks."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Nii, kuidas sulle meeldib"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Salvesta kärbitud pilte lihtsamaks jagamiseks veebi või laadi need alla enda arvutisse. Võid ka klõpsata Minu pildid nupul kõigi tehtud piltide vaatamiseks."
   },
   "tourSkip": {
@@ -128,5 +128,8 @@
   },
   "termsAndPrivacyNoticyPrivacyLink": {
     "message": "privaatsuspoliitikaga"
+  },
+  "libraryLabel": {
+    "message": "Ekraanipildid"
   }
 }

browser/extensions/screenshots/webextension/_locales/eu/messages.json

@@ -0,0 +1,141 @@
+{
+  "addonDescription": {
+    "message": "Hartu webetik pantaila-zatiak eta -argazkiak eta gorde aldi baterako edo behin betiko."
+  },
+  "addonAuthorsList": {
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
+  },
+  "contextMenuLabel": {
+    "message": "Hartu pantaila-argazkia"
+  },
+  "myShotsLink": {
+    "message": "Nire argazkiak"
+  },
+  "screenshotInstructions": {
+    "message": "Eremu bat hautatzeko, arrastatu edo egin klik orrian. Uzteko, sakatu ESK."
+  },
+  "saveScreenshotSelectedArea": {
+    "message": "Gorde"
+  },
+  "saveScreenshotVisibleArea": {
+    "message": "Gorde ikusgai dagoena"
+  },
+  "saveScreenshotFullPage": {
+    "message": "Gorde orri osoa"
+  },
+  "cancelScreenshot": {
+    "message": "Utzi"
+  },
+  "downloadScreenshot": {
+    "message": "Deskargatu"
+  },
+  "notificationLinkCopiedTitle": {
+    "message": "Lotura kopiatuta"
+  },
+  "notificationLinkCopiedDetails": {
+    "message": "Zure argazkirako lotura arbelean kopiatu da. Itsasteko, sakatu $META_KEY$-V.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
+  "requestErrorTitle": {
+    "message": "Zerbitzuz kanpo."
+  },
+  "requestErrorDetails": {
+    "message": "Barkatu! Ezin izan dugu zure argazkia gorde. Saiatu berriro geroago."
+  },
+  "connectionErrorTitle": {
+    "message": "Ezin gara zure pantaila-argazkietara konektatu."
+  },
+  "connectionErrorDetails": {
+    "message": "Egiaztatu zure Internet-konexioa. Internetera konekta bazaitezke, aldi baterako arazo bat egon liteke Firefox Screenshots zerbitzuarekin."
+  },
+  "loginErrorDetails": {
+    "message": "Ezin izan dugu zure argazkia gorde Firefox Screenshots zerbitzuarekin arazo bat dagoelako. Saiatu berriro geroago mesedez."
+  },
+  "unshootablePageErrorTitle": {
+    "message": "Ezin dugu orri honen pantaila-argazkia hartu."
+  },
+  "unshootablePageErrorDetails": {
+    "message": "Hau ez da web orri arrunt bat eta beraz, ezin duzu bere pantaila-argazkirik hartu."
+  },
+  "selfScreenshotErrorTitle": {
+    "message": "Ezin duzu Firefox Screenshots-eko orri baten pantaila-argazkirik hartu!"
+  },
+  "emptySelectionErrorTitle": {
+    "message": "Zure hautapena txikiegia da"
+  },
+  "privateWindowErrorTitle": {
+    "message": "Pantaila-argazkien zerbitzua desgaituta dago nabigatze pribatuko moduan"
+  },
+  "privateWindowErrorDetails": {
+    "message": "Barkatu eragozpenak. Eginbide honetan lanean ari gara etorkizuneko bertsio baterako."
+  },
+  "genericErrorTitle": {
+    "message": "Kontxo! Firefox Screenshots zerbitzua pikutara joan da."
+  },
+  "genericErrorDetails": {
+    "message": "Ez gaude ziur zer gertatu den. Axola dizu berriro saiatzea edo beste orri baten argazkia hartzea?"
+  },
+  "tourBodyIntro": {
+    "message": "Hartu, gorde eta partekatu pantaila-argazkiak Firefox utzi gabe."
+  },
+  "tourHeaderPageAction": {
+    "message": "Gordetzeko modu berri bat"
+  },
+  "tourBodyPageAction": {
+    "message": "Pantaila-argazki bat hartu nahi duzun bakoitzean, zabaldu orri-ekintzen menua helbide-barran."
+  },
+  "tourHeaderClickAndDrag": {
+    "message": "Hartu soilik nahi duzunaren argazkia"
+  },
+  "tourBodyClickAndDrag": {
+    "message": "Egin klik eta arrastatu soilik orriaren zati baten argazkia hartzeko. Sagua gainean jar dezakezu zure hautapena nabarmentzeko."
+  },
+  "tourHeaderFullPage": {
+    "message": "Hartu leiho edo orri osoen argazkiak"
+  },
+  "tourBodyFullPage": {
+    "message": "Hautatu goian eskuinean dauden botoiak leihoko eremu ikusgarriaren edo orri osoaren argazkia hartzeko."
+  },
+  "tourHeaderDownloadUpload": {
+    "message": "Nahi duzun bezala"
+  },
+  "tourBodyDownloadUpload": {
+    "message": "Gorde webean zure moztutako argazkiak, hauek errazago partekatu edo zure ordenagailura deskargatzeko. 'Nire argazkiak' botoian klik eginda hartutako argazki guztiak aurkituko dituzu."
+  },
+  "tourSkip": {
+    "message": "SALTATU"
+  },
+  "tourNext": {
+    "message": "Hurrengo diapositiba"
+  },
+  "tourPrevious": {
+    "message": "Aurreko diapositiba"
+  },
+  "tourDone": {
+    "message": "Eginda"
+  },
+  "termsAndPrivacyNotice2": {
+    "message": "Firefox Screenshots erabilita, gure $TERMSANDPRIVACYNOTICETERMSLINK$ eta $TERMSANDPRIVACYNOTICEPRIVACYLINK$ onartzen dituzu.",
+    "placeholders": {
+      "termsandprivacynoticetermslink": {
+        "content": "$1"
+      },
+      "termsandprivacynoticeprivacylink": {
+        "content": "$2"
+      }
+    }
+  },
+  "termsAndPrivacyNoticeTermsLink": {
+    "message": "Baldintzak"
+  },
+  "termsAndPrivacyNoticyPrivacyLink": {
+    "message": "Pribatutasun-oharra"
+  },
+  "libraryLabel": {
+    "message": "Pantaila-argazkiak"
+  }
+}

browser/extensions/screenshots/webextension/_locales/fa/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "مطمئن نیستیم چه اتفاقی افتاده است. می‌خواهید دوباره امتحان کنید یا از یک صفحهٔ دیگر عکس بگیرید؟"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "بدون خارج شدن از فایرفاکس، عکس بگیرید، ذخیره کنید و به اشتراک بگذارید."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "ضبط آنچه شما می‌خواهید"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "کلیک کنید و بکشید تا فقط از قسمتی از صفحه عکس بگیرید. می‌توانید برای برجسته کردن روی ناحیه انتخاب شده حرکت کنید."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "ضبط پنجره یا کل صفحه‌ها"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "برای گرفتن عکس از ناحیه قابل مشاهده در پنجره یا تمام صفحه از دکمه‌های بالا سمت راست استفاده کنید."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "همانطور که می‌پسندید"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "عکس‌های بریده شده خود را برای به اشتراک‌گذاری راحت‌تر روی وب ذخیره کنید، یا آن‌ها را روی رایانه خود دریافت کنید. همچنین برای دیدن همهٔ عکس‌هایی که گرفتید می‌توانید روی دکمه «عکس‌های من» کلیک کنید."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/fi/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Emme oikein tiedä, mitä tapahtui. Haluatko yrittää uudestaan tai ottaa kuvan eri sivusta?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ota, tallenna ja jaa kuvakaappaus poistumatta Firefoxista."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Kaappaa mitä haluat"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Kaappaa vain osa sivusta napsauttamalla ja vetämällä. Voit myös korostaa valinnan pitämällä hiirtä sen päällä."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Kaappaa näkyvä alue tai kokonainen sivu"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Valitse oikean yläkulman painikkeista joko ikkunassa näkyvän alueen tai koko sivun kaappaus."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Haluamallasi tavalla"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Tallenna rajaamasi kuvat verkkoon helpompaa jakamista varten tai lataa ne tietokoneellesi. Voit myös napsauttaa Omat kaappaukset -painiketta ja nähdä kaikki ottamasi kuvat."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/fr/messages.json

@@ -12,7 +12,7 @@
     "message": "Mes captures d’écran"
   },
   "screenshotInstructions": {
-    "message": "Sélectionnez une zone de la page par cliquer-glisser. Appuyez sur Échap pour annuler."
+    "message": "Sélectionnez une zone de la page par cliquer-glisser ou en cliquant sur l’élément à sélectionner. Appuyez sur Échap pour annuler."
   },
   "saveScreenshotSelectedArea": {
     "message": "Enregistrer"
@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Un problème non identifié est survenu. Vous pouvez réessayer ou effectuer une capture d’écran d’une autre page."
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Effectuez des captures d’écran, enregistrez et partagez-les sans quitter Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Une nouvelle façon d’enregistrer ses captures"
+  },
+  "tourBodyPageAction": {
+    "message": "Dès que vous voulez effectuer une capture d’écran, il vous suffit d’ouvrir le menu d’actions de la page, depuis la barre d’adresse."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Capturez ce que vous voulez"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Cliquez et glissez pour capturer seulement une partie de la page. Vous pouvez aussi survoler une zone avec votre curseur pour surligner votre sélection."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Effectuez des captures d’écran de fenêtres ou de pages entières"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Utilisez les boutons en haut à droite pour capturer au choix la zone visible dans la fenêtre ou la page entière."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "À votre guise"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Sauvegardez en ligne vos captures recadrées pour les partager plus facilement, ou téléchargez-les sur votre ordinateur. Vous pouvez aussi cliquer sur « Mes captures d’écran » pour retrouver toutes vos captures."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/fy_NL/messages.json

@@ -1,15 +1,15 @@
 {
   "addonDescription": {
-    "message": "Meitsje skermprintsjes of klips fan it web en bewarje se tydlik of permanint."
+    "message": "Meitsje skermôfdrukken of klips fan it web en bewarje se tydlik of permanint."
   },
   "addonAuthorsList": {
     "message": "Mozilla <screenshots-feedback@mozilla.com>"
   },
   "contextMenuLabel": {
-    "message": "Meitsje in skermprintsje"
+    "message": "Skermôfdruk meitsje"
   },
   "myShotsLink": {
-    "message": "Myn skermprintsjes"
+    "message": "Myn skermôfdrukken"
   },
   "screenshotInstructions": {
     "message": "Sleep of klik op de side om in gebiet te selektearjen. Druk op ESC om te annulearjen."
@@ -33,7 +33,7 @@
     "message": "Keppeling kopiearre"
   },
   "notificationLinkCopiedDetails": {
-    "message": "De keppeling nei jo skermprintsje is nei it klamboerd kopiearre. Brûk $META_KEY$-V om te plakken.",
+    "message": "De keppeling nei jo skermôfdruk is nei it klamboerd kopiearre. Brûk $META_KEY$-V om te plakken.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -44,25 +44,25 @@
     "message": "Bûten tsjinst."
   },
   "requestErrorDetails": {
-    "message": "Sorry! Wy koene jo skermprintsje net bewarje. Probearje it letter nochris."
+    "message": "Sorry! Wy koene jo skermôfdruk net bewarje. Probearje it letter nochris."
   },
   "connectionErrorTitle": {
-    "message": "Wy kinne net ferbine nei jo skermprintsjes."
+    "message": "Wy kinne net ferbine nei jo skermôfdrukken."
   },
   "connectionErrorDetails": {
     "message": "Kontrolearje jo ynternetferbining. As jo wol ferbining meitsje kinne mei it ynternet, kin it wêze dat der tydlik in probleem is mei de tsjinst Firefox Screenshots."
   },
   "loginErrorDetails": {
-    "message": "Wy koene jo skermprintsje net bewarje, omdat der in probleem is mei de tsjinst Firefox Screenshots. Probearje it letter nochris."
+    "message": "Wy koene jo skermôfdruk net bewarje, omdat der in probleem is mei de tsjinst Firefox Screenshots. Probearje it letter nochris."
   },
   "unshootablePageErrorTitle": {
-    "message": "It is net mooglik in skermprintsje fan dizze side te meitsjen."
+    "message": "It is net mooglik in skermôfdruk fan dizze side te meitsjen."
   },
   "unshootablePageErrorDetails": {
-    "message": "Dit is net in standert webside, dus jo kinne der net in skermprintsje fan meitsje."
+    "message": "Dit is net in standert webside, dus jo kinne der net in skermôfdruk fan meitsje."
   },
   "selfScreenshotErrorTitle": {
-    "message": "Jo kinne net in skermprintsje meitsje fan in Firefox Screenshots-side!"
+    "message": "Jo kinne net in skermôfdruk meitsje fan in Firefox Screenshots-side!"
   },
   "emptySelectionErrorTitle": {
     "message": "Jo seleksje is te lyts"
@@ -77,28 +77,34 @@
     "message": "Oeps! Firefox Screenshots is yn 'e war."
   },
   "genericErrorDetails": {
-    "message": "Wy binne net wis wat der krekt bard is. Wolle jo it nochris probearje of in skermprintsje fan in oare side meitsje?"
+    "message": "Wy binne net wis wat der krekt bard is. Wolle jo it nochris probearje of in skermôfdruk fan in oare side meitsje?"
   },
-  "tourBodyOne": {
-    "message": "Meitsje, bewarje en diel skermprintsjes sûnder Firefox te ferlitten."
+  "tourBodyIntro": {
+    "message": "Meitsje, bewarje en diel skermôfdrukken sûnder Firefox te ferlitten."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "In nije manier om te bewarjen"
+  },
+  "tourBodyPageAction": {
+    "message": "Klap it menu Side-aksjes yn de adresbalke út sa gau as jo in skermôfbylding meitsje wolle."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Fetsje wat jo wolle"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klik en sleep om in part fan in side te fetsjen. Jo kinne ek oer in gebiet gean om jo seleksje út te ljochtsjen."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Fetsje finsters of folsleine websiden"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Selektearje knoppen rjochts boppe-oan om it sichtbere gebiet yn it finster te fetsjen, of fetsje in folsleine side."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Nei jo winsk"
   },
-  "tourBodyFour": {
-    "message": "Bewarje jo byknippe skermprintsjes nei it web om se maklik te dielen, of download se nei jo kompjûter. Jo kinne ek op de knop Myn skermprintsjes klikke om al jo makke skermprintsjes te finen."
+  "tourBodyDownloadUpload": {
+    "message": "Bewarje jo byknippe skermôfdrukken nei it web om se maklik te dielen, of download se nei jo kompjûter. Jo kinne ek op de knop Myn skermôfdrukken klikke om al jo makke skermôfdrukken te finen."
   },
   "tourSkip": {
     "message": "Oerslaan"

browser/extensions/screenshots/webextension/_locales/ga_IE/messages.json

@@ -73,25 +73,25 @@
   "genericErrorDetails": {
     "message": "Nílimid cinnte cad a tharla. An bhfuil fonn ort triail eile a bhaint as, nó gabháil scáileáin eile a ghlacadh?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Glac, sábháil, agus comhroinn gabhálacha scáileáin gan Firefox a fhágáil."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "An rud atá uait a ghabháil"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Cliceáil agus tarraing le cuid de leathanach a ghabháil. Nó is féidir leat an luch a chur os cionn an réigiúin le gabháil."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Fuinneoga nó leathanaigh iomlána a ghabháil"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Úsáid na cnaipí ag barr na fuinneoige ar dheis chun an réigiún infheicthe san fhuinneog a ghabháil, nó an leathanach iomlán."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Go díreach mar is áil leat"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Is féidir leat gabhálacha a bhearradh agus a shábháil ar an nGréasán, nó iad a íoslódáil ar do ríomhaire. Is féidir teacht orthu go léir leis an gcnaipe Mo Chuid Gabhálacha."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/gu_IN/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "અમે ખાતરી નથીકે શું માત્ર થયું છે . ફરી પ્રયાસ કરો અથવા એક અલગ પૃષ્ઠ એક શોટ લેવા માટે કાળજી કરો?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "લેવા, સાચવેલા, અને વહેંચાયેલ સ્ક્રીનશૉટ્સ Firefox છોડ્યાં વિના."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "સાચવવાનો એક નવો રસ્તો"
+  },
+  "tourBodyPageAction": {
+    "message": "જ્યારે પણ સ્ક્રીનશૉટ લેવા માંગો ત્યારે સરનામાં બારમાં પૃષ્ઠ ક્રિયાઓ મેનૂને વિસ્તૃત કરો."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "કેદ કરો તમને જોઈએ તે"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "પાનાંના માત્ર એક ભાગ મેળવવા માટે ક્લિક કરો અને ખેંચો. તમે પણ તમારી પસંદગી પ્રકાશિત કરવા માટે હૉવર કરી શકો છો."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "વિન્ડોઝ અથવા સમગ્ર પાના કેદ કરો"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "ઉપર જમણા બટનો પસંદ કરો વિન્ડોમાં દૃશ્યમાન વિસ્તાર મેળવવા માટે અથવા આખુ પાનું કેપ્ચર કરવા માટે."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "તમને જે ગમે"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "સરળ શેરિંગ માટે વેબ પર તમારા કપાઈ શોટ સાચવો, અથવા તેમને તમારા કમ્પ્યુટર પર ડાઉનલોડ કરો. તમે બધા શોટ મેળવવા માટે મારું શોટ્સ બટન પર ક્લિક કરી પણ શકો છો બધા શોટ તમે લીધેલા શોધવા માટે."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/he/messages.json

@@ -73,25 +73,25 @@
   "genericErrorDetails": {
     "message": "אנחנו לא בטוחים מה קרה פה הרגע. אכפת לך לנסות שוב או לצלם דף אחר?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "צילום, שמירה ושיתוף של צילומי מסך מבלי לעזוב את Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "לצלם רק את מה שנחוץ לך"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "ניתן ללחוץ ולגרור כדי לצלם רק מקטע מהעמוד. ניתן גם לרחף מעל כדי לסמן את הבחירה שלך."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "לצלם חלונות או דפים שלמים"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "בחרו בכפתורים שבחלק העליון כדי לצלם את האזור הגלוי בחלון או כדי לצלם את הדף כולו."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "לפי טעמך"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "שמירת הצילומים החתוכים שלך לאחסון מקוון לצורך שיתוף פשוט יותר, או להוריד אותם למחשב שלך. ניתן גם ללחוץ על כפתור הצילומים שלי כדי למצוא את כל הצילומים שצילמת."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/hi_IN/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "हम सुनिश्चित नहीं हैं कि अभी क्या हुआ. पुन: प्रयास या एक भिन्न पृष्ठ का एक शॉट लेना चाहते हैं?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox छोड़े बिना स्क्रीनशॉट लें, सहेजें, और साझा करें."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "जो आप चाहते हैं उसे कैद करें"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "पृष्ठ के बस एक हिस्से को कैद करने के लिए क्लिक करें और खींचें. आप अपने चयन को हाइलाइट करने के लिए भी जा सकते हैं."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "विंडोज़ या संपूर्ण पृष्ठों को कैद करें"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "विंडो में दिखाई देने वाले क्षेत्र या एक पूरे पृष्ठ को कैद करने के लिए ऊपर में दाहिनी तरफ़ के बटन का चयन करें."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "जैसा आप इसे चाहते हैं"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "आसानी से साझा करने या उन्हें अपने कंप्यूटर पर डाउनलोड करने के लिए अपने क्रॉप किये गये शॉट को वेब पर सहेजें. आपके द्वारा लिए गये सभी शॉट्स को ढूंढने के लिए आप मेरे शॉट्स बटन पर भी क्लिक कर सकते हैं."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/hr/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Nismo sigurno što se upravo dogodilo. Možete li pokušati ponovno ili snimiti drukčiju stranicu?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Snimite, spremite i dijelite snimke bez da napuštate Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Snimite ono što želite"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Kliknite i povucite ako želite snimiti samo dio stranice. Također možete označiti vaš odabir tako da preko njega stavite pokazivač miša."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Baš kako vam se sviđa"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Spremite vaše odrezane snimke na Web kako biste ih jednostavnije dijelili, ili ih jednostavno skinite na vaše računalo. Također možete kliknuti gumb Moje snimke kako biste pronašli sve vaše dosadašnje snimke."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Snimajte prozore ili cijele stranice"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Odaberite gumbove na gornjem desnom kutu kako biste snimili vidljivo područje u prozoru ili cijelu stranicu."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/hsb/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Njejsmy sej wěsći, štož je so stało. Chceće hišće raz spytać abo chceće druhu stronu fotografować?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Čińće, składujće a dźělće fota wobrazowki bjez toho, zo byšće Firefox wopušćił."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Nowe wašnje składowanja"
+  },
+  "tourBodyPageAction": {
+    "message": "Wočińće meni akcijow strony w adresowym polu kóždy raz, hdyž chceće foto wobrazowki činić."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Fotografujće prosće, štož chceće"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klikńće a ćehńće, zo byšće dźěl strony fotografował. Móžeće tež pokazowak myški nad nim pohibować, zo byšće swój wuběr wuzběhnył."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Wokna abo cyłe strony składować"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Wubjerće tłóčatka horjeka naprawo, zo byšće widźomny wobwod we woknje abo cyłu stronu fotografować."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Tak, kaž so wam spodoba"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Składujće swoje přitřihane fota wobrazowki w interneće, zo byšće je lóšo dźělił, abo sćehńće je na swój ličak. Móžeće tež na tłóčatko „Moje fota wobrazowki“ kliknyć, zo byšće wšě fota wobrazowki namakał, kotrež sće činił."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/hu/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Nem vagyunk benne biztosak, hogy mi történt. Próbálja újra, vagy készítsen képet egy másik oldalról."
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Készítsen, mentsen és osszon meg képernyőképeket, anélkül, hogy elhagyná a Firefoxot."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "A mentés új módja"
+  },
+  "tourBodyPageAction": {
+    "message": "Nyissa le a lapműveletek menüt a címsávban bármikor, ha képernyőképet akar készíteni."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Csak azt mentse, amit szeretne"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Kattintson és húzzon, hogy csak a lap egy részét mentse el. Vagy csak rá is mutathat a kijelöléshez."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Mentsen ablakokat vagy teljes lapokat"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Válassza a jobb felső sarokban lévő gombokat, hogy egy látható területet mentsen az ablakból, vagy elmentsen egy teljes oldalt."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Ahogy tetszik"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Mentse a kivágott képeket a webre a könnyebb megosztáshoz, vagy töltse le a számítógépére. Rá is kattinthat a Képernyőképek gombra, hogy megtalálja az összes képét."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/hy_AM/messages.json

@@ -73,25 +73,25 @@
   "genericErrorDetails": {
     "message": "Մենք վստահ չենք, թե ինչ է տեղի ունեցնել: Կրկին փորձեք կամ փորձեք ստանալ մեկ այլ էջի պատկերը:"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ստացեք, պահպանեք և համօգտագործեք էկրանի հանույթները՝ առանց Firefox-ը լքելու:"
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Ստացեք միայն այն, ինչ Ձեզ պետք է:"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Սեղմեք և քաշեք՝ ստանալու համար միայն էջի մի մասը: Նաև կարող եք վրայով անցկացնել՝ գունանշելու համար ընտրումը:"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Ստանալ պատուհանը կամ ամբողջ էջեր"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Ընտրեք կոճակները վերևի աջ մասում՝ տեսանելի հատվածը ստանալու համար պատուհանում կամ ամբողջ էջը ստանալու համար:"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Ինչպես որ հավանում եք այն"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Պահպանեք ձեր եզրատած որոշ պատկերներ վեբում՝ դրանք հեշտությամբ համօգտագործելու կամ ներբեռնելու համար ձեր համակարգչում: Նաև կարող եք սեղմել Իմ պատկերները՝ գտնելու ձեր բոլոր ֆայլերը:"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/id/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Kami tidak yakin akan apa yang terjadi. Ingin mencoba lagi atau merekam gambar dari laman yang berbeda?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ambil, simpan, dan bagikan tangkapan layar tanpa meninggalkan Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Rekam Bagian Yang Anda Inginkan"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klik dan seret untuk merekam sebagian area laman. Anda juga dapat menggeser kursor untuk menyoroti pilihan Anda."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Rekam Jendela atau Seluruh Laman"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Pilih tombol di kanan atas untuk merekam area yang terlihat pada jendela atau rekam seluruh laman."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Sesuka Anda"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Simpan potongan tangkapan Anda ke Web agar mudah dibagikan, atau unduh ke komputer. Anda pun dapat mengeklik pada tombol Gambar Saya untuk menemukan semua tangkapan yang pernah Anda rekam."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/it/messages.json

@@ -12,7 +12,7 @@
     "message": "I miei screenshot"
   },
   "screenshotInstructions": {
-    "message": "Trascina o fai clic su una pagina per selezionare una regione. Premi ESC per annullare."
+    "message": "Trascina o fai clic su una pagina per selezionare un’area della pagina. Premi ESC per annullare."
   },
   "saveScreenshotSelectedArea": {
     "message": "Salva"
@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Non sappiamo che cosa sia successo. Riprova, magari con una pagina diversa."
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Cattura, salva e condividi screenshot senza mai uscire da Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Un nuovo modo per salvare informazioni"
+  },
+  "tourBodyPageAction": {
+    "message": "Hai bisogno di catturare un’istantanea della pagina? Ti basta aprire il menu nella barra degli indirizzi."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Cattura solo ciò che ti serve"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Fai clic e trascina per catturare solo una parte della pagina. Posiziona il mouse sopra all’area selezionata per evidenziarla."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Cattura una finestra o una pagina intera"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Utilizza i pulsanti in alto a destra per catturare una parte della finestra o l’intera pagina."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Come piace a te"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Cattura lo screenshot di una pagina web, ritaglialo e salvalo online per condividerlo in modo più veloce, oppure scaricalo sul tuo computer. Puoi anche utilizzare il pulsante “I miei screenshot” per ritrovare tutte le immagini che hai salvato."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ja/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "何か問題が発生したようです。再度試すか、別のページのショットを撮ってみてください。"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox を離れることなく、スクリーンショットを撮影、保存、共有。"
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "新たな保存方法"
+  },
+  "tourBodyPageAction": {
+    "message": "スクリーンショットを撮りたいときは、いつでもアドレスバー内のページアクションメニューを開いてください。"
+  },
+  "tourHeaderClickAndDrag": {
     "message": "必要な部分だけをキャプチャ"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "クリック＆ドラッグでページの一部だけをキャプチャできます。また、マウスを当てれば選択範囲が強調表示されます。"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "ウィンドウもしくはページ全体をキャプチャ"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "右上のボタンを選択して、ウィンドウ内の表示範囲もしくはページ全体をキャプチャしましょう。"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "お好きなように"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "切り取ったショットを簡単に共有できるようウェブ上に保存したり、手元へダウンロードしたり。また「自分のショット」ボタンをクリックすれば、これまでに撮ったすべてのショットを見られます。"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ka/messages.json

@@ -12,7 +12,7 @@
     "message": "ჩემი გადაღებულები"
   },
   "screenshotInstructions": {
-    "message": "გადაადგილეთ ან დააწკაპეთ გვერდზე არეალის მოსანიშნად. გასაუქმებლად დააჭირეთ ESC-ს."
+    "message": "გადაადგილეთ ან დააწკაპეთ გვერდზე სივრცის მოსანიშნად. გასაუქმებლად დააჭირეთ ESC-ს."
   },
   "saveScreenshotSelectedArea": {
     "message": "შენახვა"
@@ -53,7 +53,7 @@
     "message": "გთხოვთ შეამოწმოთ ქსელთან კავშირი. თუ ინტერნეტში თავისუფლად გადიხართ, ე.ი. Firefox Screenshot-ის მომსახურებას აქვს დროებითი პრობლემა."
   },
   "loginErrorDetails": {
-    "message": "თქვენი სურათის შენახვა ვერ ხერხდება, რადგან შეფერხებაა Firefox Screenshots მომსახურებასთან დაკავშირებით. გთხოვთ, სცადოთ მოგვიანებით."
+    "message": "თქვენი სურათის შენახვა ვერ ხერხდება, რადგან შეფერხებაა Firefox Screenshots მომსახურებასთან დაკავშირებით. გთხოვთ სცადოთ მოგვიანებით."
   },
   "unshootablePageErrorTitle": {
     "message": "ამ გვერდისთვის სურათის გადაღება ვერ ხერხდება."
@@ -65,7 +65,7 @@
     "message": "Firefox Screenshots-ის გვერდისთვის სურათის გადაღება არ შეგიძლიათ!"
   },
   "emptySelectionErrorTitle": {
-    "message": "შერჩეული არეალი ძალიან პატარაა"
+    "message": "შერჩეული სივრცე ძალიან მცირეა"
   },
   "privateWindowErrorTitle": {
     "message": "Screenshots გათიშულია პირადი თვალიერების რეჟიმისას"
@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "გაუგებარია რა მოხდა. ისევ ცდით ხელახლა თუ სხვა ვებ-გვერდს გადაუღებთ სურათს?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "გადაიღეთ, შეინახეთ და გააზიარეთ ეკრანის სურათები Firefox-იდან გაუსვლელად."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "გადაუღეთ სურათი რასაც გინდათ"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "გადაადგილეთ ან დააწკაპეთ გვერდზე გადასაღები ნაწილის შესარჩევად. ასევე, კურსორის გადატარებით შეგიძლიათ მონიშნოთ სასურველი არეალი."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "გადაუღეთ სურათები ფანჯრებს ან მთლიან ვებ-გვერდებს"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "მარჯვენა ზედა კუთხეში არსებული ღილაკების საშუალებით, შეგიძლიათ გადაუღოთ სურათი ხილულ ნაწილს, ან მთლიან გვერდს."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "როგორც გენებოთ"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "ამოჭრილი სურათების შენახვა შეგიძლიათ ინტერნეტში, მარტივად გასაზიარებლად, ან შეგიძლიათ კომპიუტერში ჩამოტვირთვა. ასევე, ღილაკზე \"ჩემი გადაღებულები\" დაწკაპებით, იხილავთ თქვენს მიერ გადაღებულ ყველა სურათს."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/kab/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Ur neẓri ara acu yeḍran. Ɛreḍ tikelt-nniḍen neɣ ṭṭef agdil n usebter-nniḍen?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ṭṭef, sekles, bḍu igdilen war ma teffɣeḍ si Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Abrid amaynut i wsekles"
+  },
+  "tourBodyPageAction": {
+    "message": "Mi tebγiḍ ad teṭṭfeḍ agdil ldi umuγ n tigawin n usebter illan deg ufeggag n tansiwin."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Ṭṭef kan ayen tebγiḍ"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Sit sakin zuɣer akken ad teṭṭfeḍ aḥric seg usebter. Tzemreḍ daɣen ad tesrifgeḍ akken ad tsebṛuṛqeḍ afran-ik."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Ṭṭef isfuyla neγ isebtar meṛṛa"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Fren tiqeffalin s afella ayeffus akken ad teṭṭfeḍ tamnaṭ yettbanen deg usfaylu neɣ asebter i meṛṛa."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Akken tebγiḍ"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Sekles tuṭṭfiwin-ik ar Web i beṭṭu fessusen, neɣ sider-itent-id ar uselkim-ik. Tzemr€d daɣen ad tiseḍ ɣef tqeffalt Tiṭṭfiwin-iw akken ad tafeḍ akk tuṭṭfiwin n ugdil i teggid."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/kk/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Не болғанын білмейміз. Қайталап көресіз бе, немесе басқа парақтың скриншотын түсіріп көресіз бе?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox ішінен скриншоттарды түсіру, сақтау және олармен бөлісу."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Тек керек нәрсені түсіріңіз"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Беттің тек бір бөлігін түсіру үшін тышқанды шертіп, тартыңыз. Таңдауыңызды түспен ерекшелеу үшін үстінен өткізсеңіз болады."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Терезелер немесе толық беттерді түсіріңіз"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Жоғарғы оң жақта орналасқан батырмаларды терезенің көрінетін аймағын, немесе толық бетті түсіру үшін қолданыңыз."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Өзіңізге керек түрде"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Қиылған скриншоттарыңыздбен оңай бөлісу үшін оларды интернетте сақтаңыз, немесе өз компьютеріңізге жүктеп алыңыз. Сонымен қатар, сіз жасаған барлық скриншоттарды табу үшін Менің скриншоттарым батырмасына шерте аласыз."
   },
   "tourSkip": {
@@ -128,5 +128,8 @@
   },
   "termsAndPrivacyNoticyPrivacyLink": {
     "message": "Жекелік ескертуі"
+  },
+  "libraryLabel": {
+    "message": "Скриншоттар"
   }
 }

browser/extensions/screenshots/webextension/_locales/ko/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "무슨 일이 있었는지 모르겠네요. 다시 시도하시거나 다른 페이지 스크린샷을 찍어 보시겠어요?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox를 떠나지 않은 채로 찍고, 저장하고, 공유하세요."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "원하는 것을 캡춰하세요"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "캡춰할 페이지의 부분을 클릭해서 드래그 해 보세요. 마우스를 올려서 선택한 부분을 확인할 수 있습니다."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "창이나 페이지 전체를 캡춰할 수 있습니다"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "우측 위에 있는 버튼을 눌러 창을 캡처하거나 페이지 전체를 캡처할 수 있습니다."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "내가 원하는 대로"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "스크린샷을 공유하거나, 컴퓨터로 다운로드할 수도 있습니다. 내 스크린샷 버튼을 눌러서 지금까지 찍었던 모든 스크린샷을 찾을 수도 있습니다."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/lij/messages.json

@@ -70,25 +70,25 @@
   "genericErrorDetails": {
     "message": "Niatri no emmo ben acapio cöse l'é sucesso. Ti peu miga preuvâ co-ina pagina dispægia?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Fanni, sarva e condividdi föto do schermo sensa sciortî da Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Catua solo quello che t'eu"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Sciacca e rebela pe catuâ solo 'na porçion de 'na pagina. Ti peu anche anâ co-o ratto sorvia l'area seleçionâ pe evidençiala."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Catua 'n barcon ò 'na pagina intrega"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Seleçionn-a i pomelli de d'ato a drita pe catuâ l'area vixibile into barcon ò a pagina intrega."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Comme te piaxe"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Sarva 'n ritaggio de 'na pagina Web pe condividila in mòddo ciù façile ò scaregala into teu computer. Ti peu anche sciacâ into pomello  “E mæ föto do schermo pe atrovâ” quello che t'æ za pigiou."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/lo/messages.json

@@ -73,25 +73,25 @@
   "genericErrorDetails": {
     "message": "ພວກເຮົາບໍ່ແນ່ໃຈວ່າມັນຫາກະເກີດຫຍັງຂື້ນ. ກະລຸນາລອງໃຫມ່ອີກຄັ້ງ ຫລື ຖ່າຍພາບຫນ້າຈໍອື່ນລອງເບິງ"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "ຖ່າຍ, ບັນທຶກ ແລະ ແບ່ງປັນພາບຫນ້າຈໍໂດຍບໍ່ຕ້ອງອອກຈາກ Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "ຖ່າຍພາບຕາມທີ່ທ່ານຕ້ອງການ"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "ຄິກ ຫລື ລາກເພື່ອຖ່າຍພາບສະເພາະບາງສ່ວນຂອງຫນ້າເວັບ. ພ້ອມດຽວກັນນັ້ນທ່ານຍັງສາມາດເລື່ອນມາເພື່ອເນັ້ນພາບທີ່ທ່ານເລືອກ."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "ຖ່າຍພາບວິນໂດ ຫລື ຫມົດທັ້ງຫນ້າ"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "ເລືອກປຸ່ມກົດທີ່ຢູ່ເທິງເບື້ອງຂວາມືເພື່ອຈັບພາບໃນບໍລິເວນທີ່ເບິງເຫັນໄດ້ໃນວິນໂດ ຫລື ເພື່ອຈັບພາບທັງຫມົດໃນຫນ້າເວັບ."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "ຕາມທີ່ທ່ານມັກ"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "ບັນທຶກຮູບພາບທີ່ທ່ານໄດ້ຄັອບເອົາໄວ້ລົງໄປໄວ້ໃນເວັບເພື່ອເຮັດໃຫ້ແບ່ງປັນໄດ້ງ່າຍ ຫລື ດາວໂຫລດໄປໄວ້ໃນຄອມພິວເຕີຂອງທ່ານ. ທ່ານຍັງສາມາດຄິກໃສ່ໃນປຸ່ມກົດ \"ຮູບພາບຂອງຂ້ອຍ\" ເພື່ອຊອກຫາຮູບພາບທັງຫມົດທີ່ທ່ານໄດ້ຖ່າຍເອົາໄວ້."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/lt/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Mes nesame tikri, kas ką tik nutiko. Norite pabandyti dar kartą arba nufotografuoti kitą tinklalapį?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Darykite, įrašykite ir dalinkitės ekrano nuotraukomis nepalikdami „Firefox“."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Užfiksuokite būtent tai, ką norite"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Spustelėkite ir tempkite, kad užfiksuotumėte tik dalį tinklalapio. Taip pat galite užvesti pelę, norėdami paryškinti savo pasirinkimą."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Fiksuokite langus arba ištisus tinklalapius"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Pasirinkite mygtukus aukščiau dešinėje, norėdami užfiksuoti matomą lango dalį arba visą tinklalapį."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Kaip jums patogiau"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Įrašykite padarytas nuotraukas saityne patogesniam dalinimuisi, arba atsisiųskite jas į savo kompiuterį. Spustelėję mygtuką „Mano kadrai“, matysite visas savo padarytas nuotraukas."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/mk/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Не сме баш сигурни што се случи. Сакате да се обидете повторно или да направите слика од друга страница?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Фаќајте, снимајте и споделувајте слики од екран без да го напуштите Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Фатете слика од тоа што сакате"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Кликнете и влечете за да фатите само дел од страницата. Исто така можете да означите дел и со покажувачот."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Фатете слика од прозорци или цели страници"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Кликнете на копчињата во горниот десен дел за да го снимите видливиот дел на прозорецот или пак, целата страница."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Како што Вие сакате"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Снимете ги Вашите исечоци на Интернет за полесно споделување или преземете ги на Вашиот компјутер. Исто така можете да кликнете на копчето Мои слики за да ги најдете сите слики што ги имате направено."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/mr/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "काय घडले याची आम्हाला खात्री नाही. पुन्हा प्रयत्न करा किंवा भिन्न पृष्ठाचा शॉट घ्या?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox न सोडता स्क्रीनशॉट घ्या, जतन करा आणि सामायिक करा."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "आपल्याला पाहिजे असलेल्या गोष्टी फक्त कॅप्चर करा"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "पृष्ठाचा फक्त एक भाग कॅप्चर करण्यासाठी क्लिक आणि ड्रॅग करा. आपण आपल्या निवडीवर ठळकपणे होव्हर देखील करू शकता."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Windows किंवा संपूर्ण पृष्ठे कॅप्चर करा"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "पटलामध्ये दृश्यमान क्षेत्र कॅप्चर करण्यासाठी किंवा संपूर्ण पृष्ठ कॅप्चर करण्यासाठी वरील उजवीकडील बटणे निवडा."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "जसे आपल्याला आवडते"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "आपले क्रॉप केलेले शॉट्स वेबवर सुलभ सामायिक करण्यासाठी जतन करा, किंवा त्यांना आपल्या संगणकावर डाउनलोड करा. आपण घेतलेले सर्व शॉट्स शोधण्यासाठी आपण माझे शॉट्स बटणावर क्लिक करू शकता."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ms/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Kami tidak pasti apa yang baru berlaku. Anda mahu cuba lagi atau mengambil gambar halaman lain?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ambil, simpan, dan kongsi skrinsyot tanpa meninggalkan pelayar Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Satu cara baru untuk menyimpan"
+  },
+  "tourBodyPageAction": {
+    "message": "Kembangkan menu tindakan halaman di dalam bar alamat apabila anda mahu mengambil skrinsyot."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Ambil gambar hanya yang anda mahu"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klik dan seret untuk mengambil gambar sebahagian daripada halaman. Anda boleh juga serlahkan pilihan anda."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Tangkap Tetingkap atau Keseluruhan Halaman"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Pilih butang di bahagian atas kanan untuk merakam kawasan paparan dalam tetingkap atau untuk merakamkan keseluruhan halaman."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Seperti Yang Anda Suka"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Simpan rakaman yang dipotong ke Web, cara yang lebih mudah untuk berkongsi, atau memuat turun ke komputer anda. Anda juga boleh klik pada butang Syot Saya untuk mencari semua rakaman yang telah dibuat."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/my/messages.json

@@ -41,16 +41,16 @@
   "unshootablePageErrorTitle": {
     "message": "ဒီစာမျက်နှာ၏ မျက်နှာပြင်ပုံရိပ်ကို မရိုက်ကူးနိုင်ပါ။"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox ကနေ ထွက်ခွာရန် မလိုဘဲ မျက်နှာပြင်ပုံရိပ်များကို ရိုက်ကူး၊ သိမ်းဆည်း၊ မျှဝေပါ။"
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "ကိုယ်နှစ်သက်ရာ စာမျက်နှာများကို ဖမ်းယူပါ"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "ဝင်ဒိုးများ သို့မဟုတ် စာမျက်နှာတစ်ခုလုံးကို ဖမ်းယူပါ"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "နှစ်သက်သလို"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/nb_NO/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Vi er ikke sikre på hva som hendte. Kan du prøve igjen eller ta et bilde av en annen side?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ta, lagre og del skjermbilder uten å forlate Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "En ny måte å lagre på"
+  },
+  "tourBodyPageAction": {
+    "message": "Utvid sidehandlingsmenyen i adresselinjen når du vil ta et skjermbilde."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Ta bilde av akkurat hva du vil"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klikk for å dra og ta skjermbilde av bare en del av siden. Du kan også føre musen over for å framheve merket område."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Ta skjermbilde av vinduer eller hele sider."
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Bruk knappene i det øvre høyre hjørnet for å ta skjermbilde av det synlige området i vinduet eller for å ta skjermbilde av en hel side."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Som du vil ha det"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Lagre de beskjærte skjermbildene dine på nettet for enklere deling, eller last de ned til din datamaskin. Du kan også klikke på knappen Mine skjermbilde for å finne alle skjermbildene du har tatt."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/nl/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "We weten niet precies wat er zonet is gebeurd. Wilt u het nogmaals proberen, of een schermafbeelding van een andere pagina maken?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Maak, bewaar en deel schermafbeeldingen zonder Firefox te verlaten."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Een nieuwe manier om op te slaan"
+  },
+  "tourBodyPageAction": {
+    "message": "Vouw het menu Pagina-acties in de adresbalk uit zodra u een schermafbeelding wilt maken."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Leg alleen vast wat u wilt"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klik en sleep om alleen een gedeelte van een pagina vast te leggen. U kunt ook de muisaanwijzer boven een gebied houden om uw selectie te accentueren."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Leg vensters of hele pagina’s vast"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Selecteer de knoppen rechtsboven om het zichtbare gebied in het venster vast te leggen, of om een hele pagina vast te leggen."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Zoals u wilt"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Sla uw bijgesneden afbeeldingen op op het web voor makkelijker delen, of download ze naar uw computer. U kunt ook op de knop Mijn afbeeldingen klikken om al uw gemaakte afbeeldingen te vinden."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/nn_NO/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Vi er ikkje sikre på kva som hende. Kan du prøve igjen eller ta eit bilde på ei anna side?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ta, lagre og del skjermbilde utan å forlate Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Ein ny måte å lagre på"
+  },
+  "tourBodyPageAction": {
+    "message": "Utvid sidehandlingsmenyen i adresselinja når du vil ta eit skjermbilde."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Knips akkurat det du vil"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klikk for å drage og knipse berre ein del av sida. Du kan også føre musa over for å framheve merkt område."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Knips vindauge eller heile sider"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Vel knappane i det øvre høgre hjørnet for å knipse det synlege området i vindauget eller for å knipse ei heil side."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Som du vil ha det"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Lagre dei tilskjerte bilda dine på nettet for enklare deling, eller last dei ned til datamaskina di. Du kan også klikke på knappen Mine skjermbilde for å finne alle bilda du har tatt."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/pl/messages.json

@@ -74,30 +74,36 @@
     "message": "Przepraszamy za utrudnienia. Pracujemy nad dodaniem tej funkcji."
   },
   "genericErrorTitle": {
-    "message": "Firefox Screenshots wymknęło się spod kontroli."
+    "message": "Firefox Screenshots wymknął się spod kontroli."
   },
   "genericErrorDetails": {
     "message": "Nie bardzo wiemy, co się wydarzyło. Spróbujesz ponownie lub wykonasz zrzut innej strony?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Wykonuj, zapisuj i udostępniaj zrzuty ekranu bez wychodzenia z Firefoksa."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Nowy sposób zapisywania"
+  },
+  "tourBodyPageAction": {
+    "message": "Rozwiń menu interakcji na pasku adresu, kiedy chcesz wykonać zrzut ekranu."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Zapisuj tylko to, co potrzebujesz"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Kliknij i przeciągnij, aby zapisać tylko część strony. Możesz także najechać, aby wyróżnić zaznaczony obszar."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Zapisuj zrzuty okien lub całych stron"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Kliknij przycisk w górnym prawym rogu, aby zapisać obszar widoczny w oknie lub całą stronę."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Tak, jak lubisz"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Zapisuj przycięte zrzuty w Internecie, aby łatwiej je udostępniać, albo pobierz je na swój komputer. Możesz też kliknąć przycisk „Moje zrzuty”, aby przeglądać wszystkie wykonane zrzuty."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/pt_BR/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Não temos certeza do que acabou de acontecer. Tentar novamente ou fazer uma captura de uma página diferente?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Capture, salve e compartilhe telas sem sair do Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Capture apenas o que você quer"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Clique e arraste para capturar apenas uma parte de uma página. Você também pode passar o mouse para realçar sua seleção."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Capture janelas ou páginas inteiras"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Selecione os botões no canto superior direito para capturar a área visível na janela ou capturar uma página inteira."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Como você quiser"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Salve as suas capturas na Web para compartilhar mais facilmente ou baixe-as no seu computador. Você também pode clicar no botão Minhas capturas para encontras todas as capturas que tirou."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/pt_PT/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Não temos a certeza do que acabou de acontecer. Importa-se de tentar novamente ou tirar uma captura de uma página diferente?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Tire, guarde, e partilhe capturas de ecrã sem sair do Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Uma nova maneira de guardar"
+  },
+  "tourBodyPageAction": {
+    "message": "Expanda o menu de ações da página na barra de endereço sempre que quiser tirar uma captura de ecrã."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Capture aquilo mesmo que pretende"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Clique e arraste para capturar apenas uma porção de uma página. Pode também pairar para destacar a sua seleção."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Capture janelas ou páginas inteiras"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Selecione os botões no canto superior direito para capturar a área visível na janela ou para capturar uma página inteira."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Como você gostar"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Guarde as suas capturas na Web para partilhar mais facilmente, ou descarregue-as para o seu computador. Pode também clicar no botão Minhas capturas para encontrar todas as capturas que tirou."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/rm/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Nus na savain betg tge ch'è gist capità. Vuls empruvar anc ina giada, forsa cun in'autra pagina?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Far, memorisar e cundivider maletgs da visur senza bandunar Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Far maletgs da visur da tut che vi vuls"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Clicca e tira per far in maletg da be ina part da la pagina. Ti pos posiziunar la mieur sur la selecziun per la relevar."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Far maletgs da fanestras u paginas cumplettas"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Tscherna il buttun sura dretg per far in maletg da la part visibla en la fanestra u per far in maletg da la pagina cumpletta."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Co che ti prefereschas"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Memorisescha ils maletgs da visur en il web per als pudair cundivider u telechargiar sin tes computer. Ti pos era cliccar sin il buttun «Mes maletgs da visur» per vesair tut ils maletgs dal visur che ti has fatg."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ro/messages.json

@@ -2,15 +2,27 @@
   "addonDescription": {
     "message": "Realizează decupaje și capturi de ecran de pe web și salvează-le temporar sau permanent."
   },
+  "addonAuthorsList": {
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
+  },
   "contextMenuLabel": {
     "message": "Realizează o captură de ecran"
   },
   "myShotsLink": {
     "message": "Capturile mele"
   },
+  "screenshotInstructions": {
+    "message": "Trage sau dă clic pe pagină pentru a selecta o regiune. Apasă ESC pentru a renunța."
+  },
   "saveScreenshotSelectedArea": {
     "message": "Salvează"
   },
+  "saveScreenshotVisibleArea": {
+    "message": "Salvează porțiunea vizibilă"
+  },
+  "saveScreenshotFullPage": {
+    "message": "Salvează pagina completă"
+  },
   "cancelScreenshot": {
     "message": "Renunță"
   },
@@ -20,6 +32,38 @@
   "notificationLinkCopiedTitle": {
     "message": "Link copiat"
   },
+  "notificationLinkCopiedDetails": {
+    "message": "Linkul către captura ta a fost copiat în clipboard. Apasă $META_KEY$-V pentru lipire.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
+  "requestErrorTitle": {
+    "message": "Nefuncțional."
+  },
+  "unshootablePageErrorTitle": {
+    "message": "Nu putem realiza o captură de ecran a acestei pagini."
+  },
+  "emptySelectionErrorTitle": {
+    "message": "Selecția este prea mică"
+  },
+  "tourHeaderClickAndDrag": {
+    "message": "Capturează întocmai ceea ce dorești"
+  },
+  "tourBodyClickAndDrag": {
+    "message": "Clic și trage pentru a captura doar o porțiune a unei pagini. Poți și să poziționezi cursorul peste porțiune pentru a evidenția selecția."
+  },
+  "tourHeaderFullPage": {
+    "message": "Capturează ferestre sau pagini întregi"
+  },
+  "tourBodyFullPage": {
+    "message": "Selectează butoanele din partea dreaptă sus pentru a captura zona vizibilă din fereastră sau pentru a captura o pagină întreagă."
+  },
+  "tourHeaderDownloadUpload": {
+    "message": "Pe placul tău"
+  },
   "tourSkip": {
     "message": "OMITE"
   },
@@ -29,10 +73,27 @@
   "tourPrevious": {
     "message": "Diapozitivul anterior"
   },
+  "tourDone": {
+    "message": "Terminat"
+  },
+  "termsAndPrivacyNotice2": {
+    "message": "Folosind Firefox Screenshots, ești de acord cu $TERMSANDPRIVACYNOTICETERMSLINK$ și $TERMSANDPRIVACYNOTICEPRIVACYLINK$.",
+    "placeholders": {
+      "termsandprivacynoticetermslink": {
+        "content": "$1"
+      },
+      "termsandprivacynoticeprivacylink": {
+        "content": "$2"
+      }
+    }
+  },
   "termsAndPrivacyNoticeTermsLink": {
     "message": "Termenii"
   },
   "termsAndPrivacyNoticyPrivacyLink": {
     "message": "Politica de confidenţialitate"
+  },
+  "libraryLabel": {
+    "message": "Capturi de ecran"
   }
 }

browser/extensions/screenshots/webextension/_locales/ru/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Мы не уверены, в чём проблема. Попробуете ещё раз или сделаете снимок другой страницы?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Делайте, сохраняйте и делитесь скриншотами прямо в Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Делайте снимки чего угодно"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Щелкните и потяните мышью для захвата части страницы. Вы также можете навести курсор мыши для подсветки выбранной области."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Захватывайте окна или целые страницы"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "С помощью кнопок в верхнем правом углу выбирайте захват видимой области окна или страницы целиком."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Как вам нравится"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Сохраняйте свои снимки в Интернете, чтобы легко ими делиться, или загружайте их на свой компьютер. Вы также можете просмотреть все сохранённые снимки, нажав на кнопку Мои снимки."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/sk/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Nie sme si istí, čo sa práve stalo. Chcete tú skúsiť znova alebo chcete vytvoriť snímku inej stránky?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Tvorte, ukladajte a zdieľajte snímky obrazovky bez toho, aby ste museli opustiť Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Nový spôsob ukladania"
+  },
+  "tourBodyPageAction": {
+    "message": "Kedykoľvek chcete urobiť snímku, otvorte ponuku akcii stránky v paneli s adresou."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Zachyťte to, čo chcete"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Ak chcete zachytiť časť stránky, urobíte to kliknutím a potiahnutím. Váš výber zvýrazníte tak, že sa naň presuniete myšou."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Zachyťte okná alebo celé webové stránky"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Kliknutím na tlačidlo v pravom hornom rohu môžete zachytiť viditeľnú časť stránky. Pomocou ďalšieho tlačidla zachytíte celú stránku."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Urobte to, čo chcete"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Uložte si orezanú snímku na web, aby ste ju mohli ľahšie zdieľať alebo si ju prevziať do počítača. Môžete si taktiež pozrieť všetky vaše snímky - stačí, ak kliknete na tlačidlo Moje snímky."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/sl/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Ne vemo točno, kaj se je pravkar zgodilo. Bi radi poskusili znova ali pa zajeli posnetek kakšne druge strani?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Zajemite, shranite in delite zaslonske posnetke, ne da bi zapustili Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Nov način shranjevanja"
+  },
+  "tourBodyPageAction": {
+    "message": "Kadarkoli želite zajeti posnetek zaslona, v naslovni vrstici razširite meni dejanj strani."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Zajemite to, kar hočete"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Kliknite in povlecite, če želite zajeti samo del strani. Svojo izbiro lahko tudi poudarite, tako da preko nje povlečete miškin kazalec."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Zajemite okna ali celotne strani"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "V zgornjem desnem kotu izberite gumb za zajem vidnega območja v oknu ali celotne strani."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Kot vi želite"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Shranite obrezane posnetke na splet za lažje deljenje ali jih prenesite na svoj računalnik. Vse zajete posnetke lahko najdete s klikom na gumb Moji posnetki."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/sq/messages.json

@@ -58,13 +58,13 @@
   "unshootablePageErrorTitle": {
     "message": "S’bëjmë dot foto të kësaj faqeje."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Fiksoni Në Foto Aq Sa Doni"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Fiksoni Dritare ose Krejt Faqet"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Si T’ju Pëlqejë"
   },
   "tourDone": {

browser/extensions/screenshots/webextension/_locales/sr/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Нисмо сигурни шта се управо догодило. Желите ли покушати поново или да усликате другачију страницу?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Забележите, сачувајте и поделите снимке екрана без напуштања Firefox-а."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Нови начин да сачувате"
+  },
+  "tourBodyPageAction": {
+    "message": "Проширите страницу из менија у адресној траци кад год желите да усликате екран."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Усликајте баш оно што желите"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Кликните и превуците да усликате само део странице. Такође можете означити вашу селекцију."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Усликајте прозоре или целе странице"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Изаберите дугмад у горњем десном углу да усликате видљиве делове прозора или да усликате целу страницу."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Као што волите"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Сачувајте ваш исечени снимак на веб ради лакшег дељења или преузимања на ваш рачунар. Такође можете кликнути на дугме \"Моји снимци\" да пронађете све ваше снимке."
   },
   "tourSkip": {
@@ -128,5 +134,8 @@
   },
   "termsAndPrivacyNoticyPrivacyLink": {
     "message": "обавештење о приватности"
+  },
+  "libraryLabel": {
+    "message": "Снимци екрана"
   }
 }

browser/extensions/screenshots/webextension/_locales/sv_SE/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "Vi är inte säkra på vad som just hände. Kan du försöka igen eller ta en bild på en annan sida?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Ta, spara, och dela skärmbilder utan att lämna Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "Ett nytt sätt att spara"
+  },
+  "tourBodyPageAction": {
+    "message": "Expandera sidåtgärdsmenyn i adressfältet när du vill ta en skärmbild."
+  },
+  "tourHeaderClickAndDrag": {
     "message": "Fånga precis vad du vill"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Klicka och dra för att fånga bara en del av en sida. Du kan också hovra för att markera ditt val."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Fånga fönster eller hela sidor"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Välj knapparna i det övre högra hörnet för att fånga det synliga området i fönstret eller för att fånga en hel sida."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Som du vill ha det"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Spara dina beskurna bilder till webben för enklare delning, eller hämta dem till datorn. Du kan också klicka på knappen Mina skärmbilder för att hitta alla bilder du tagit."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ta/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "என்ன நடந்தது என எங்களுக்குத் தெரியவில்லை. முடிந்தால் மீண்டும் முயற்சியுங்கள் (அ) வேறொரு பக்கத்தில் முயற்சியுங்கள்?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "பயர்பாஃசை விட்டு வெளியேறாமல் திரைப்பிடிப்புகளை எடுக்கலாம், சேமித்து மற்றவருடன் பகிர்ந்துக்கொள்ளலாம்."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "உங்களுக்கு என்ன வேண்டுமோ அதைக் கைப்பற்றுங்கள்"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "சொடுக்கி இழுத்து சும்மா ஒரு பகுதியைத் தேர்வுச்செய்க. நீங்கள் இங்கும் அங்குமாக நகர்த்திக் கூட நீங்கள் தேர்வுச்செய்த பக்கத்தை மிளிர்க்கச் செய்யலாம்."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "சாளரங்களை (அ) முழுப் பக்கங்களை கைப்பற்றவும்"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "வலது மேல்முனையில் உள்ள கத்திரிகோல் போன்ற பயன்படுத்தி பார்வையில் இருக்கும் வலைப்பக்கத்தையோ (அ) முழு பக்கத்தையோ திரைப்பிடிப்புச் செய்யுங்கள்."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "நீங்கள் விரும்பியவாறே"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "நீங்கள் எடுத்த வெட்டிய திரைப்பிடிப்புகளை இணையத்தில் எளிதில் சேமித்து பகிரவோ (அ) கணினியில் பதிவிறக்கவோ முடியும். 'எனது பிடிப்புகள்' மீது சொடுக்கி உங்களின் திரைப்பிடிப்புகளைக் காணலாம்."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/te/messages.json

@@ -50,13 +50,13 @@
   "genericErrorTitle": {
     "message": "అయ్యో! Firefox స్క్రీన్షాట్లు haywire వెళ్ళింది."
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox ను వదలకుండా స్క్రీన్షాట్లను తీసుకోండి, సేవ్ చేయండి మరియు పంచండి."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": ""
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "మీకు నచ్చినట్టుగా"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/th/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "เราไม่แน่ใจว่าเกิดอะไรขึ้น ต้องการลองอีกครั้งหรือจับภาพของหน้าอื่น?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "จับ บันทึก และแบ่งปันภาพหน้าจอโดยไม่ต้องออกจาก Firefox"
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "จับภาพแค่สิ่งที่คุณต้องการ"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "คลิกแล้วลากเพื่อจับภาพแค่บางส่วนของหน้า คุณยังสามารถวางเมาส์เพื่อเน้นการเลือกของคุณ"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "จับภาพหน้าต่างหรือทั้งหน้า"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "คลิกที่ปุ่มด้านบนขวาเพื่อจับภาพพื้นที่ที่มองเห็นในหน้าต่างหรือเพื่อจับภาพทั้งหน้า"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "ตามใจชอบ"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "บันทึกภาพที่ครอบตัดของคุณไปยังเว็บเพื่อการแบ่งปันที่ง่ายขึ้น หรือดาวน์โหลดไปยังคอมพิวเตอร์ของคุณ คุณยังสามารถคลิกที่ปุ่ม ภาพของฉัน เพื่อค้นหาภาพทั้งหมดที่คุณจับไว้"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/tl/messages.json

@@ -70,25 +70,25 @@
   "genericErrorDetails": {
     "message": "Hindi kami sigurado kung ano ang nangyari. Pag-aalaga upang subukang muli o kumuha ng isang shot ng isang iba't ibang mga pahina?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Dumaan, i-save, at ibahagi ang mga screenshot nang hindi umaalis sa Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Kunan Kung Ano Ang Gusto Mo"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "I-click at i-drag upang makuha lamang ang isang bahagi ng isang pahina. Maaari mo ring i-hover upang i-highlight ang iyong pagpili."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "I-capture ang Windows o Buong Pahina"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Piliin ang pindutan sa kanang itaas upang makuha ang nakikitang lugar sa window o upang makuha ang isang buong pahina."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Bilang Nagustuhan Mo ito"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "I-save ang iyong crop shot sa Web para sa madaling pagbabahagi, o i-download ito sa iyong computer. Maaari mo ring i-click sa pindutan ng My Shots upang mahanap ang lahat ng mga pag-shot na kinunan mo."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/tr/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Ne olduğunu biz de anlamadık. Bir daha denemeye veya başka bir sayfanın ekran görüntüsünü almaya ne dersiniz?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Firefox'tan çıkmadan ekran görüntüleri alın, kaydedin ve paylaşın."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "İstediğini yakala"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Sayfanın belli bir kısmını yakalamak için işaretçiyi tıklayıp sürükleyin. Seçiminizi vurgulamak için fareyle üzerine gelebilirsiniz."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Pencereleri veya sayfaların tamamını yakala"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "Yalnızca pencerede gördüğünüz alanı veya sayfanın tamamını yakalamak için sağ üstteki düğmelerden uygun olanı seçin."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "İstediğin gibi yakala"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Ekran görüntülerinizi daha kolay paylaşmak veya bilgisayarınıza indirmek için web’e kaydedin. Kaydettiğiniz tüm görüntüleri bulmak için \"Ekran görüntülerim\" düğmesine tıklayabilirsiniz."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/uk/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "Ми не впевнені, в чому проблема. Спробувати ще раз, або ж зробити знімок іншої сторінки?"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "Робіть знімки екрану, зберігайте та діліться ними прямо в Firefox."
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "Робіть знімки чого завгодно"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "Клацніть і потягніть мишею для захоплення частини сторінки. Ви також можете навести курсор миші для підсвічення вибраної області."
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "Захоплюйте вікна або цілі сторінки"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "За допомогою кнопок у верхній правій частині обирайте захоплення видимої області вікна, або сторінки повністю."
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "Як вам подобається"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "Зберігайте свої знімки в Інтернеті, щоб легко ними ділитися, або завантажуйте їх на свій комп'ютер. Ви також можете переглянути всі збережені знімки, натиснувши на кнопку Мої знімки."
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/ur/messages.json

@@ -73,25 +73,25 @@
   "genericErrorDetails": {
     "message": "ہمیں یقین نہیں کہ کیا ہوا تھا۔ خیال رکھ کر پھر کوشش کریں یا بھر مختلف صفحہ کی تصویرلیں؟"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "۔Firefox کو چھوڑے بغیر اسکرینشاٹس لیں، محفوظ کریں اور شیئر کریں۔"
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "جو آپ چاہتے ہیں وہ گرفت کریں"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "صفحہ کا ایک حصہ گرفت کرنے کے لیئے گھسیتیں اور کلک کریں.آُپ اپنے انتخاب کو نمایاں کرنے کے لیئے منڈلا سکتے ہیں۔"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "دریچہ ہا مکمل صفحہ گرفت کریں"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "دریچہ میں نظر آنے والے علاقے یا مکمل صفحہ کو گرفت کرنے کے لیئے بالائی دائیں جانب بٹن کا انتخاب کریں۔"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "جس طرح آپ کو پسند ہے"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "اپنے کمپیوٹڑ میں ڈائونلوڈ کرنے یا ویب پر آسانی سے شیئر کرنے کے لیئےاپنی کتری ہوئی شاٹس محفوظ کریں۔ آپ میری شاٹس کے بٹن پ کلک کر کے بھی اتمام پنی لی گئی شاٹس ڈھّونڈ سکتےہیں۔"
   },
   "tourSkip": {
@@ -111,5 +111,8 @@
   },
   "termsAndPrivacyNoticyPrivacyLink": {
     "message": "اطلاع نامہ نجی نوعیت"
+  },
+  "libraryLabel": {
+    "message": "اسکرین شاٹس"
   }
 }

browser/extensions/screenshots/webextension/_locales/vi/messages.json

@@ -26,7 +26,10 @@
   "notificationLinkCopiedTitle": {
     "message": "Đã sao chép liên kết"
   },
-  "tourHeaderFour": {
+  "emptySelectionErrorTitle": {
+    "message": "Vùng chọn của bạn quá nhỏ"
+  },
+  "tourHeaderDownloadUpload": {
     "message": "Như bạn thích"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/zh_CN/messages.json

@@ -79,25 +79,25 @@
   "genericErrorDetails": {
     "message": "我们不确定发生了什么。您可以再试一次或者试试另一个页面。"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "截取、保存和分享屏幕截图，无需 Firefox 以外的工具。"
   },
-  "tourHeaderTwo": {
+  "tourHeaderClickAndDrag": {
     "message": "截取你所需"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "单击并拖动以截取页面某个区域。您也可以把光标移到你要的地方，高亮后单击即可截图。"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "截取窗口或整个页面"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "选择右上角的按钮可以截取窗口中的可见区域或者整个页面。"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "做您所想"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "将您裁剪后的截图保存到网上以便共享，或者下载到您的计算机。您也可以点击“我的截图”按钮找到您截取的所有截图。"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/_locales/zh_TW/messages.json

@@ -79,25 +79,31 @@
   "genericErrorDetails": {
     "message": "我們不確定剛剛發生了什麼事，您可以再試一次，或拍攝其他頁面的擷圖嗎？"
   },
-  "tourBodyOne": {
+  "tourBodyIntro": {
     "message": "不用離開 Firefox 就可以拍攝、儲存、分享畫面擷圖。"
   },
-  "tourHeaderTwo": {
+  "tourHeaderPageAction": {
+    "message": "全新的存檔方式"
+  },
+  "tourBodyPageAction": {
+    "message": "想要拍攝擷圖時，打開網址列當中的頁面操作選單即可拍照。"
+  },
+  "tourHeaderClickAndDrag": {
     "message": "只拍你想拍的"
   },
-  "tourBodyTwo": {
+  "tourBodyClickAndDrag": {
     "message": "點擊並拖曳出要擷取的範圍。或者您也可以用滑鼠移上頁面中的各部分，擷取該範圍。"
   },
-  "tourHeaderThree": {
+  "tourHeaderFullPage": {
     "message": "擷取可見範圍或整張網頁"
   },
-  "tourBodyThree": {
+  "tourBodyFullPage": {
     "message": "透過右上角的不同按鈕來選擇只拍攝視窗中的可見區域，或是整張網頁。"
   },
-  "tourHeaderFour": {
+  "tourHeaderDownloadUpload": {
     "message": "用您想要的方式分享"
   },
-  "tourBodyFour": {
+  "tourBodyDownloadUpload": {
     "message": "裁切過的擷圖，可直接傳到網路上方便分享，也能下載到電腦裡。您也可以點擊「我的擷圖」按鈕，尋找您拍過的所有擷圖。"
   },
   "tourSkip": {

browser/extensions/screenshots/webextension/background/main.js

@@ -18,17 +18,11 @@ this.main = (function() {
     if (!hasSeenOnboarding) {
       setIconActive(false, null);
       // Note that the branded name 'Firefox Screenshots' is not localized:
-      if (!startBackground.usePhotonPageAction) {
-        browser.browserAction.setTitle({
-          title: "Firefox Screenshots"
-        });
-      } else {
       startBackground.photonPageActionPort.postMessage({
         type: "setProperties",
         title: "Firefox Screenshots"
       });
     }
-    }
   }).catch((error) => {
     log.error("Error getting hasSeenOnboarding:", error);
   });
@@ -62,22 +56,11 @@ this.main = (function() {
     if ((!hasSeenOnboarding) && !active) {
       path = "icons/icon-starred-32-v2.svg";
     }
-    if (!startBackground.usePhotonPageAction) {
-      browser.browserAction.setIcon({path, tabId}).catch((error) => {
-        // FIXME: use errorCode
-        if (error.message && /Invalid tab ID/.test(error.message)) {
-          // This is a normal exception that we can ignore
-        } else {
-          catcher.unhandled(error);
-        }
-      });
-    } else {
     startBackground.photonPageActionPort.postMessage({
       type: "setProperties",
       iconPath: path
     });
   }
-  }
 
   function toggleSelector(tab) {
     return analytics.refreshTelemetryPref()
@@ -111,8 +94,7 @@ this.main = (function() {
     return /^about:(?:newtab|blank|home)/i.test(url) || /^resource:\/\/activity-streams\//i.test(url);
   }
 
-  // This is called by startBackground.js, directly in response to browser.browserAction.onClicked
-  // and clicks on the Photon page action
+  // This is called by startBackground.js, directly in response to clicks on the Photon page action
   exports.onClicked = catcher.watchFunction((tab) => {
     if (tab.incognito) {
       senderror.showError({
@@ -289,16 +271,10 @@ this.main = (function() {
     hasSeenOnboarding = true;
     catcher.watchPromise(browser.storage.local.set({hasSeenOnboarding}));
     setIconActive(false, null);
-    if (!startBackground.usePhotonPageAction) {
-      browser.browserAction.setTitle({
-        title: browser.i18n.getMessage("contextMenuLabel")
-      });
-    } else {
     startBackground.photonPageActionPort.postMessage({
       type: "setProperties",
       title: browser.i18n.getMessage("contextMenuLabel")
     });
-    }
   });
 
   communication.register("abortFrameset", () => {

browser/extensions/screenshots/webextension/background/senderror.js

@@ -107,10 +107,12 @@ this.senderror = (function() {
 
     // To improve Sentry reporting & grouping, replace the
     // moz-extension://$uuid base URL with a generic resource:// URL.
+    if (exception.stack) {
       exception.stack = exception.stack.replace(
         /moz-extension:\/\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/g,
         "resource://screenshots-addon"
       );
+    }
     let rest = {};
     for (let attr in e) {
       if (!["name", "message", "stack", "multilineStack", "popupMessage", "version", "sentryPublicDSN", "help", "fromMakeError"].includes(attr)) {

browser/extensions/screenshots/webextension/background/startBackground.js

@@ -1,6 +1,5 @@
 /* globals browser, main, communication */
 /* This file handles:
-     browser.browserAction.onClicked
      clicks on the Photon page action
      browser.contextMenus.onClicked
      browser.runtime.onMessage
@@ -30,14 +29,6 @@ this.startBackground = (function() {
   // Maximum milliseconds to wait before checking for migration possibility
   const CHECK_MIGRATION_DELAY = 2000;
 
-  browser.browserAction.onClicked.addListener((tab) => {
-    loadIfNecessary().then(() => {
-      main.onClicked(tab);
-    }).catch((error) => {
-      console.error("Error loading Screenshots:", error);
-    });
-  });
-
   browser.contextMenus.create({
     id: "create-screenshot",
     title: browser.i18n.getMessage("contextMenuLabel"),
@@ -59,11 +50,7 @@ this.startBackground = (function() {
   browser.storage.local.get(["hasSeenOnboarding"]).then((result) => {
     let hasSeenOnboarding = !!result.hasSeenOnboarding;
     if (!hasSeenOnboarding) {
-      let path = "icons/icon-starred-32-v2.svg";
-      if (!usePhotonPageAction) {
-        browser.browserAction.setIcon({path});
-      } else {
-        iconPath = path;
+      iconPath = "icons/icon-starred-32-v2.svg";
       if (photonPageActionPort) {
         photonPageActionPort.postMessage({
           type: "setProperties",
@@ -71,7 +58,6 @@ this.startBackground = (function() {
         });
       }
     }
-    }
   }).catch((error) => {
     console.error("Error loading Screenshots onboarding flag:", error);
   });
@@ -85,7 +71,6 @@ this.startBackground = (function() {
     return true;
   });
 
-  let usePhotonPageAction = false;
   let photonPageActionPort = null;
   initPhotonPageAction();
 
@@ -147,9 +132,6 @@ this.startBackground = (function() {
     photonPageActionPort = browser.runtime.connect({ name: "photonPageActionPort" });
     photonPageActionPort.onMessage.addListener((message) => {
       switch (message.type) {
-      case "setUsePhotonPageAction":
-        usePhotonPageAction = message.value;
-        break;
       case "click":
         loadIfNecessary().then(() => {
           main.onClicked(message.tab);
@@ -175,12 +157,6 @@ this.startBackground = (function() {
         get() {
           return photonPageActionPort;
         }
-      },
-      "usePhotonPageAction": {
-        enumerable: true,
-        get() {
-          return usePhotonPageAction;
-        }
       }
     });
   }

browser/extensions/screenshots/webextension/background/takeshot.js

@@ -1,4 +1,4 @@
-/* globals communication, shot, main, auth, catcher, analytics */
+/* globals communication, shot, main, auth, catcher, analytics, buildSettings */
 
 "use strict";
 
@@ -8,7 +8,7 @@ this.takeshot = (function() {
   const { sendEvent } = analytics;
 
   communication.register("takeShot", catcher.watchFunction((sender, options) => {
-    let { captureType, captureText, scroll, selectedPos, shotId, shot } = options;
+    let { captureType, captureText, scroll, selectedPos, shotId, shot, imageBlob } = options;
     shot = new Shot(main.getBackend(), shotId, shot);
     shot.favicon = sender.tab.favIconUrl;
     let capturePromise = Promise.resolve();
@@ -19,7 +19,7 @@ this.takeshot = (function() {
         shot.addClip({
           createdDate: Date.now(),
           image: {
-            url: dataUrl,
+            url: "data:",
             captureType,
             text: captureText,
             location: selectedPos,
@@ -31,6 +31,16 @@ this.takeshot = (function() {
         });
       });
     }
+    let convertBlobPromise = Promise.resolve();
+    if (buildSettings.uploadBinary && !imageBlob) {
+      imageBlob = base64ToBinary(shot.getClip(shot.clipNames()[0]).image.url);
+      shot.getClip(shot.clipNames()[0]).image.url = "";
+    } else if (!buildSettings.uploadBinary && imageBlob) {
+      convertBlobPromise = blobToDataUrl(imageBlob).then((dataUrl) => {
+        shot.getClip(shot.clipNames()[0]).image.url = dataUrl;
+      });
+      imageBlob = null;
+    }
     let shotAbTests = {};
     let abTests = auth.getAbTests();
     for (let testName of Object.keys(abTests)) {
@@ -42,10 +52,12 @@ this.takeshot = (function() {
       shot.abTests = shotAbTests;
     }
     return catcher.watchPromise(capturePromise.then(() => {
+      return convertBlobPromise;
+    }).then(() => {
       return browser.tabs.create({url: shot.creatingUrl})
     }).then((tab) => {
       openedTab = tab;
-      return uploadShot(shot);
+      return uploadShot(shot, imageBlob);
     }).then(() => {
       return browser.tabs.update(openedTab.id, {url: shot.viewUrl}).then(
         null,
@@ -108,16 +120,99 @@ this.takeshot = (function() {
     }));
   }
 
-  function uploadShot(shot) {
-    return auth.authHeaders().then((headers) => {
-      headers["content-type"] = "application/json";
-      let body = JSON.stringify(shot.asJson());
-      sendEvent("upload", "started", {eventValue: Math.floor(body.length / 1000)});
+  function base64ToBinary(url) {
+    const binary = atob(url.split(',')[1]);
+    const data = Uint8Array.from(binary, char => char.charCodeAt(0));
+    const blob = new Blob([data], {type: "image/png"});
+    return blob;
+  }
+
+  /** Combines two buffers or Uint8Array's */
+  function concatBuffers(buffer1, buffer2) {
+    var tmp = new Uint8Array(buffer1.byteLength + buffer2.byteLength);
+    tmp.set(new Uint8Array(buffer1), 0);
+    tmp.set(new Uint8Array(buffer2), buffer1.byteLength);
+    return tmp.buffer;
+  }
+
+  /** Returns a promise that converts a Blob to a TypedArray */
+  function blobToArray(blob) {
+    return new Promise((resolve, reject) => {
+      let reader = new FileReader();
+      reader.addEventListener("loadend", function() {
+        resolve(reader.result);
+      });
+      reader.readAsArrayBuffer(blob);
+    });
+  }
+
+  function blobToDataUrl(blob) {
+    return new Promise((resolve, reject) => {
+      let reader = new FileReader();
+      reader.addEventListener("loadend", function() {
+        resolve(reader.result);
+      });
+      reader.readAsDataURL(blob);
+    });
+  }
+
+  /** Creates a multipart TypedArray, given {name: value} fields
+      and {name: blob} files
+
+      Returns {body, "content-type"}
+      */
+  function createMultipart(fields, fileField, fileFilename, blob) {
+    let boundary = "---------------------------ScreenshotBoundary" + Date.now();
+    return blobToArray(blob).then((blobAsBuffer) => {
+      let body = [];
+      for (let name in fields) {
+        body.push("--" + boundary);
+        body.push(`Content-Disposition: form-data; name="${name}"`);
+        body.push("");
+        body.push(fields[name]);
+      }
+      body.push("--" + boundary);
+      body.push(`Content-Disposition: form-data; name="${fileField}"; filename="${fileFilename}"`);
+      body.push(`Content-Type: ${blob.type}`);
+      body.push("");
+      body.push("");
+      body = body.join("\r\n");
+      let enc = new TextEncoder("utf-8");
+      body = enc.encode(body);
+      body = concatBuffers(body.buffer, blobAsBuffer);
+      let tail = "\r\n" + "--" + boundary + "--";
+      tail = enc.encode(tail);
+      body = concatBuffers(body, tail.buffer);
+      return {
+        "content-type": `multipart/form-data; boundary=${boundary}`,
+        body
+      };
+    });
+  }
+
+  function uploadShot(shot, blob) {
+    let headers;
+    return auth.authHeaders().then((_headers) => {
+      headers = _headers;
+      if (blob) {
+        return createMultipart(
+          {shot: JSON.stringify(shot.asJson())},
+          "blob", "screenshot.png", blob
+        );
+      } else {
+        return {
+          "content-type": "application/json",
+          body: JSON.stringify(shot.asJson())
+        };
+      }
+    }).then((submission) => {
+      headers["content-type"] = submission["content-type"];
+      sendEvent("upload", "started", {eventValue: Math.floor(submission.body.length / 1000)});
       return fetch(shot.jsonUrl, {
         method: "PUT",
         mode: "cors",
         headers,
-        body
+        body: submission.body
       });
     }).then((resp) => {
       if (!resp.ok) {

browser/extensions/screenshots/webextension/build/buildSettings.js

@@ -1,7 +1,8 @@
 window.buildSettings = {
   defaultSentryDsn: "https://904ccdd4866247c092ae8fc1a4764a63:940d44bdc71d4daea133c19080ccd38d@sentry.prod.mozaws.net/224",
   logLevel: "" || "warn",
-  captureText: ("" === "true")
+  captureText: ("" === "true"),
+  uploadBinary: ("" === "true")
 };
 null;
 

browser/extensions/screenshots/webextension/build/inlineSelectionCss.js

@@ -5,7 +5,7 @@ window.inlineSelectionCss = `
   align-items: center;
   justify-content: center;
   border: 0;
-  border-radius: 1px;
+  border-radius: 3px;
   cursor: pointer;
   font-size: 16px;
   font-weight: 400;
@@ -28,7 +28,7 @@ window.inlineSelectionCss = `
     height: 26px;
     border: 1px solid #c7c7c7; }
     .button.tiny:hover, .tiny.highlight-button-cancel:hover, .tiny.highlight-button-save:hover, .tiny.highlight-button-download:hover, .tiny.preview-button-save:hover, .button.tiny:focus, .tiny.highlight-button-cancel:focus, .tiny.highlight-button-save:focus, .tiny.highlight-button-download:focus, .tiny.preview-button-save:focus {
-      background: #ebebeb;
+      background: #ededf0;
       border-color: #989898; }
     .button.tiny:active, .tiny.highlight-button-cancel:active, .tiny.highlight-button-save:active, .tiny.highlight-button-download:active, .tiny.preview-button-save:active {
       background: #dedede;
@@ -55,48 +55,55 @@ window.inlineSelectionCss = `
         margin-right: 10px;
         padding: 0 5px; } }
     .button.block-button:hover, .block-button.highlight-button-cancel:hover, .block-button.highlight-button-save:hover, .block-button.highlight-button-download:hover, .block-button.preview-button-save:hover {
-      background: #ebebeb; }
+      background: #ededf0; }
     .button.block-button:active, .block-button.highlight-button-cancel:active, .block-button.highlight-button-save:active, .block-button.highlight-button-download:active, .block-button.preview-button-save:active {
       background: #dedede; }
-  .button.download, .download.highlight-button-cancel, .download.highlight-button-save, .download.highlight-button-download, .download.preview-button-save, .button.trash, .trash.highlight-button-cancel, .trash.highlight-button-save, .trash.highlight-button-download, .trash.preview-button-save, .button.share, .share.highlight-button-cancel, .share.highlight-button-save, .share.highlight-button-download, .share.preview-button-save, .button.flag, .flag.highlight-button-cancel, .flag.highlight-button-save, .flag.highlight-button-download, .flag.preview-button-save {
-    background-image: url("../img/icon-sprite.svg");
-    background-size: 480px 40px;
+  .button.download, .download.highlight-button-cancel, .download.highlight-button-save, .download.highlight-button-download, .download.preview-button-save, .button.edit, .edit.highlight-button-cancel, .edit.highlight-button-save, .edit.highlight-button-download, .edit.preview-button-save, .button.trash, .trash.highlight-button-cancel, .trash.highlight-button-save, .trash.highlight-button-download, .trash.preview-button-save, .button.share, .share.highlight-button-cancel, .share.highlight-button-save, .share.highlight-button-download, .share.preview-button-save, .button.flag, .flag.highlight-button-cancel, .flag.highlight-button-save, .flag.highlight-button-download, .flag.preview-button-save {
     background-repeat: no-repeat;
-    background-position: 0 0;
+    background-size: 50%;
+    background-position: center;
     margin-right: 10px;
     transition: background-color 150ms cubic-bezier(0.07, 0.95, 0, 1); }
+  .button.download, .download.highlight-button-cancel, .download.highlight-button-save, .download.highlight-button-download, .download.preview-button-save {
+    background-image: url("../img/icon-download.svg"); }
     .button.download:hover, .download.highlight-button-cancel:hover, .download.highlight-button-save:hover, .download.highlight-button-download:hover, .download.preview-button-save:hover {
-    background-position: -40px 0; }
+      background-color: #ededf0; }
     .button.download:active, .download.highlight-button-cancel:active, .download.highlight-button-save:active, .download.highlight-button-download:active, .download.preview-button-save:active {
-    background-position: -80px 0; }
+      background-color: #dedede; }
   .button.share, .share.highlight-button-cancel, .share.highlight-button-save, .share.highlight-button-download, .share.preview-button-save {
-    background-position: -120px 0; }
+    background-image: url("../img/icon-share.svg"); }
     .button.share:hover, .share.highlight-button-cancel:hover, .share.highlight-button-save:hover, .share.highlight-button-download:hover, .share.preview-button-save:hover {
-      background-position: -160px 0; }
-    .button.share:active, .share.highlight-button-cancel:active, .share.highlight-button-save:active, .share.highlight-button-download:active, .share.preview-button-save:active, .button.share.active, .share.active.highlight-button-cancel, .share.active.highlight-button-save, .share.active.highlight-button-download, .share.active.preview-button-save {
-      background-position: -200px 0; }
+      background-color: #ededf0; }
+    .button.share.active, .share.active.highlight-button-cancel, .share.active.highlight-button-save, .share.active.highlight-button-download, .share.active.preview-button-save, .button.share:active, .share.highlight-button-cancel:active, .share.highlight-button-save:active, .share.highlight-button-download:active, .share.preview-button-save:active {
+      background-color: #dedede; }
   .button.trash, .trash.highlight-button-cancel, .trash.highlight-button-save, .trash.highlight-button-download, .trash.preview-button-save {
-    background-position: -240px 0; }
+    background-image: url("../img/icon-trash.svg"); }
     .button.trash:hover, .trash.highlight-button-cancel:hover, .trash.highlight-button-save:hover, .trash.highlight-button-download:hover, .trash.preview-button-save:hover {
-      background-position: -280px 0; }
+      background-color: #ededf0; }
     .button.trash:active, .trash.highlight-button-cancel:active, .trash.highlight-button-save:active, .trash.highlight-button-download:active, .trash.preview-button-save:active {
-      background-position: -320px 0; }
+      background-color: #dedede; }
+  .button.edit, .edit.highlight-button-cancel, .edit.highlight-button-save, .edit.highlight-button-download, .edit.preview-button-save {
+    background-image: url("../img/icon-edit.svg"); }
+    .button.edit:hover, .edit.highlight-button-cancel:hover, .edit.highlight-button-save:hover, .edit.highlight-button-download:hover, .edit.preview-button-save:hover {
+      background-color: #ededf0; }
+    .button.edit:active, .edit.highlight-button-cancel:active, .edit.highlight-button-save:active, .edit.highlight-button-download:active, .edit.preview-button-save:active {
+      background-color: #dedede; }
   .button.flag, .flag.highlight-button-cancel, .flag.highlight-button-save, .flag.highlight-button-download, .flag.preview-button-save {
-    background-position: -360px 0; }
+    background-image: url("../img/icon-flag.svg"); }
     .button.flag:hover, .flag.highlight-button-cancel:hover, .flag.highlight-button-save:hover, .flag.highlight-button-download:hover, .flag.preview-button-save:hover {
-      background-position: -400px 0; }
+      background-color: #ededf0; }
     .button.flag:active, .flag.highlight-button-cancel:active, .flag.highlight-button-save:active, .flag.highlight-button-download:active, .flag.preview-button-save:active {
-      background-position: -440px 0; }
+      background-color: #dedede; }
 
 .inverse-color-scheme {
-  background: #3e3d40;
-  color: #f6f6f8; }
+  background: #38383d;
+  color: #f9f9fa; }
   .inverse-color-scheme a {
     color: #e1e1e6; }
 
 .default-color-scheme {
-  background: #f6f6f8;
-  color: #3e3d40; }
+  background: #f9f9fa;
+  color: #38383d; }
   .default-color-scheme a {
     color: #009ec0; }
 
@@ -108,8 +115,8 @@ window.inlineSelectionCss = `
     text-decoration: underline; }
 
 .alt-color-scheme {
-  background: #31365a;
-  color: #f6f6f8; }
+  background: #38383d;
+  color: #f9f9fa; }
   .alt-color-scheme h1 {
     color: #6f7fb6; }
   .alt-color-scheme a {
@@ -125,18 +132,20 @@ window.inlineSelectionCss = `
     background-color: #006c83; }
 
 .button.secondary, .highlight-button-cancel, .secondary.highlight-button-save, .highlight-button-download, .secondary.preview-button-save {
-  background-color: #f6f6f8;
-  color: #3e3d40; }
+  background-color: #f9f9fa;
+  color: #38383d; }
   .button.secondary:hover, .highlight-button-cancel:hover, .secondary.highlight-button-save:hover, .highlight-button-download:hover, .secondary.preview-button-save:hover {
-    background-color: #ebebeb; }
+    background-color: #ededf0; }
   .button.secondary:active, .highlight-button-cancel:active, .secondary.highlight-button-save:active, .highlight-button-download:active, .secondary.preview-button-save:active {
     background-color: #dedede; }
 
 .button.transparent, .transparent.highlight-button-cancel, .transparent.highlight-button-save, .transparent.highlight-button-download, .transparent.preview-button-save {
   background-color: transparent;
-  color: #3e3d40; }
-  .button.transparent:hover, .transparent.highlight-button-cancel:hover, .transparent.highlight-button-save:hover, .transparent.highlight-button-download:hover, .transparent.preview-button-save:hover, .button.transparent:focus, .transparent.highlight-button-cancel:focus, .transparent.highlight-button-save:focus, .transparent.highlight-button-download:focus, .transparent.preview-button-save:focus, .button.transparent:active, .transparent.highlight-button-cancel:active, .transparent.highlight-button-save:active, .transparent.highlight-button-download:active, .transparent.preview-button-save:active {
-    background-color: rgba(0, 0, 0, 0.05); }
+  color: #38383d; }
+  .button.transparent:hover, .transparent.highlight-button-cancel:hover, .transparent.highlight-button-save:hover, .transparent.highlight-button-download:hover, .transparent.preview-button-save:hover {
+    background-color: #ededf0; }
+  .button.transparent:focus, .transparent.highlight-button-cancel:focus, .transparent.highlight-button-save:focus, .transparent.highlight-button-download:focus, .transparent.preview-button-save:focus, .button.transparent:active, .transparent.highlight-button-cancel:active, .transparent.highlight-button-save:active, .transparent.highlight-button-download:active, .transparent.preview-button-save:active {
+    background-color: #dedede; }
 
 .button.warning, .warning.highlight-button-cancel, .warning.highlight-button-save, .warning.highlight-button-download, .warning.preview-button-save {
   color: #fff;
@@ -378,8 +387,11 @@ window.inlineSelectionCss = `
   justify-content: center;
   bottom: -55px;
   position: absolute;
-  right: 5px;
   z-index: 6; }
+  html[dir="rtl"] .highlight-buttons {
+    left: 5px; }
+  html[dir="ltr"] .highlight-buttons {
+    right: 5px; }
   .bottom-selection .highlight-buttons {
     bottom: 5px; }
   .left-selection .highlight-buttons {
@@ -397,13 +409,19 @@ window.inlineSelectionCss = `
 
 .highlight-button-save {
   background-image: url("MOZ_EXTENSION/icons/cloud.svg");
-  background-position: 8px center;
   background-repeat: no-repeat;
   background-size: 20px 18px;
   font-size: 18px;
   margin: 5px;
-  min-width: 80px;
+  min-width: 80px; }
+  html[dir="ltr"] .highlight-button-save {
+    background-position: 8px center; }
+  html[dir="rtl"] .highlight-button-save {
+    background-position: 65px center; }
+  html[dir="ltr"] .highlight-button-save {
     padding-left: 34px; }
+  html[dir="rtl"] .highlight-button-save {
+    padding-right: 40px; }
 
 .highlight-button-download {
   background-image: url("MOZ_EXTENSION/icons/download.svg");

browser/extensions/screenshots/webextension/build/onboardingCss.js

@@ -96,7 +96,7 @@ body {
   align-items: center;
   flex-direction: column;
   justify-content: center;
-  background-color: #f6f6f8;
+  background-color: #f9f9fa;
   border-radius: 5px;
   height: 520px;
   overflow: hidden;
@@ -168,7 +168,8 @@ body {
 .active-slide-1 .slide-1,
 .active-slide-2 .slide-2,
 .active-slide-3 .slide-3,
-.active-slide-4 .slide-4 {
+.active-slide-4 .slide-4,
+.active-slide-5 .slide-5 {
   display: flex; }
 
 #slide-status-container {
@@ -179,7 +180,7 @@ body {
 
 .goto-slide {
   background: transparent;
-  background-color: #f6f6f8;
+  background-color: #f9f9fa;
   border-radius: 50%;
   border: 0;
   flex: 0 0 9px;
@@ -195,7 +196,8 @@ body {
 .active-slide-1 .goto-slide-1,
 .active-slide-2 .goto-slide-2,
 .active-slide-3 .goto-slide-3,
-.active-slide-4 .goto-slide-4 {
+.active-slide-4 .goto-slide-4,
+.active-slide-5 .goto-slide-5 {
   opacity: 1;
   transform: scale(1.1); }
 
@@ -216,13 +218,21 @@ body {
 
 #prev {
   background-image: url("MOZ_EXTENSION/icons/back.svg");
-  left: 50%;
+  left: 50%; }
+  html[dir="ltr"] #prev {
     margin-left: -385px; }
+  html[dir="rtl"] #prev {
+    margin-left: 315px; }
 
 #next,
 #done {
-  left: 50%;
+  left: 50%; }
+  html[dir="ltr"] #next, html[dir="ltr"]
+  #done {
     margin-left: 315px; }
+  html[dir="rtl"] #next, html[dir="rtl"]
+  #done {
+    margin-left: -385px; }
 
 #prev,
 #next,
@@ -265,14 +275,14 @@ body {
   opacity: 1; }
 
 .active-slide-1 #prev,
-.active-slide-4 #next {
+.active-slide-5 #next {
   display: none; }
 
 #done {
   background-image: url("MOZ_EXTENSION/icons/done.svg");
   display: none; }
 
-.active-slide-4 #done {
+.active-slide-5 #done {
   display: inline-block; }
 
 /* for smaller screen sizes */

browser/extensions/screenshots/webextension/build/onboardingHtml.js

@@ -10,14 +10,14 @@ window.onboardingHtml = `
   <body>
     <div id="slide-overlay">
       <!-- The current slide is set by having .active-slide-1, .active-slide-2, etc on #slide element: -->
-      <div id="slide-container" data-number-of-slides="4" class="active-slide-1">
+      <div id="slide-container" data-number-of-slides="5" class="active-slide-1">
         <div class="slide slide-1">
           <!-- Note: all images must be listed in manifest.json.template under web_accessible_resources -->
           <div class="slide-image" style="background-image: url('MOZ_EXTENSION/icons/onboarding-1.png');"></div>
           <div class="slide-content">
             <div class="slide-content-aligner">
               <h1><span><strong>Firefox</strong> Screenshots</span><sup>Beta</sup></h1>
-              <p data-l10n-id="tourBodyOne"></p>
+              <p data-l10n-id="tourBodyIntro"></p>
             </div>
             <p class="onboarding-legal-notice"><!-- Substituted with termsAndPrivacyNotice --></p>
           </div>
@@ -25,22 +25,29 @@ window.onboardingHtml = `
         <div class="slide slide-2">
           <div class="slide-image" style="background-image: url('MOZ_EXTENSION/icons/onboarding-2.png');"></div>
           <div class="slide-content">
-            <h1 data-l10n-id="tourHeaderTwo"></h1>
-            <p data-l10n-id="tourBodyTwo"></p>
+            <h1 data-l10n-id="tourHeaderPageAction"></h1>
+            <p data-l10n-id="tourBodyPageAction"></p>
           </div>
         </div>
         <div class="slide slide-3">
           <div class="slide-image" style="background-image: url('MOZ_EXTENSION/icons/onboarding-3.png');"></div>
           <div class="slide-content">
-            <h1 data-l10n-id="tourHeaderThree"></h1>
-            <p data-l10n-id="tourBodyThree"></p>
+            <h1 data-l10n-id="tourHeaderClickAndDrag"></h1>
+            <p data-l10n-id="tourBodyClickAndDrag"></p>
           </div>
         </div>
         <div class="slide slide-4">
           <div class="slide-image" style="background-image: url('MOZ_EXTENSION/icons/onboarding-4.png');"></div>
           <div class="slide-content">
-            <h1 data-l10n-id="tourHeaderFour"></h1>
-            <p data-l10n-id="tourBodyFour"></p>
+            <h1 data-l10n-id="tourHeaderFullPage"></h1>
+            <p data-l10n-id="tourBodyFullPage"></p>
+          </div>
+        </div>
+        <div class="slide slide-5">
+          <div class="slide-image" style="background-image: url('MOZ_EXTENSION/icons/onboarding-5.png');"></div>
+          <div class="slide-content">
+            <h1 data-l10n-id="tourHeaderDownloadUpload"></h1>
+            <p data-l10n-id="tourBodyDownloadUpload"></p>
           </div>
         </div>
 
@@ -54,6 +61,7 @@ window.onboardingHtml = `
           <button class="goto-slide goto-slide-2" data-number="2" tabindex=5></button>
           <button class="goto-slide goto-slide-3" data-number="3" tabindex=6></button>
           <button class="goto-slide goto-slide-4" data-number="4" tabindex=7></button>
+          <button class="goto-slide goto-slide-5" data-number="5" tabindex=8></button>
         </div>
         <!-- FIXME: Need to put in privacy / etc links -->
       </div>

browser/extensions/screenshots/webextension/build/shot.js

@@ -32,6 +32,10 @@ function isUrl(url) {
   return (/^https?:\/\/[a-z0-9.-]{1,8000}[a-z0-9](:[0-9]{1,8000})?\/?/i).test(url);
 }
 
+function isValidClipImageUrl(url) {
+    return isUrl(url) && !(url.indexOf(')') > -1);
+}
+
 function assertUrl(url) {
   if (!url) {
     throw new Error("Empty value is not URL");
@@ -43,6 +47,10 @@ function assertUrl(url) {
   }
 }
 
+function isSecureWebUri(url) {
+  return (/^https?:\/\/[a-z0-9.-]{1,8000}[a-z0-9](:[0-9]{1,8000})?\/?/i).test(url);
+}
+
 function assertOrigin(url) {
   assertUrl(url);
   if (url.search(/^https?:/i) != -1) {
@@ -210,6 +218,12 @@ class AbstractShot {
       console.warn("Received deprecated attribute .url");
       this.fullUrl = attrs.url;
     }
+    if (this.origin && !isSecureWebUri(this.origin)) {
+      this.origin = "";
+    }
+    if (this.fullUrl && !isSecureWebUri(this.fullUrl)) {
+      this.fullUrl = "";
+    }
     this.docTitle = attrs.docTitle || null;
     this.userTitle = attrs.userTitle || null;
     this.createdDate = attrs.createdDate || Date.now();
@@ -685,7 +699,7 @@ class _Clip {
       return;
     }
     assert(checkObject(image, ["url"], ["dimensions", "text", "location", "captureType"]), "Bad attrs for Clip Image:", Object.keys(image));
-    assert(isUrl(image.url), "Bad Clip image URL:", image.url);
+    assert(isValidClipImageUrl(image.url), "Bad Clip image URL:", image.url);
     assert(image.captureType == "madeSelection" || image.captureType == "selection" || image.captureType == "visible" || image.captureType == "auto" || image.captureType == "fullPage" || !image.captureType, "Bad image.captureType:", image.captureType);
     assert(typeof image.text == "string" || !image.text, "Bad Clip image text:", image.text);
     if (image.dimensions) {
@@ -733,6 +747,7 @@ AbstractShot.prototype.Clip = _Clip;
 if (typeof exports != "undefined") {
   exports.AbstractShot = AbstractShot;
   exports.originFromUrl = originFromUrl;
+  exports.isValidClipImageUrl = isValidClipImageUrl;
 }
 
 return exports;

browser/extensions/screenshots/webextension/clipboard.js

@@ -21,7 +21,19 @@ this.clipboard = (function() {
           let el = doc.createElement("textarea");
           doc.body.appendChild(el);
           el.value = text;
+          if (!text) {
+            let exc = new Error("Clipboard copy given empty text");
+            exc.noPopup = true;
+            catcher.unhandled(exc);
+          }
           el.select();
+          if (doc.activeElement !== el) {
+            let unhandledTag = doc.activeElement ? doc.activeElement.tagName : "No active element";
+            let exc = new Error("Clipboard el.select failed");
+            exc.activeElement = unhandledTag;
+            exc.noPopup = true;
+            catcher.unhandled(exc);
+          }
           const copied = doc.execCommand("copy");
           if (!copied) {
             catcher.unhandled(new Error("Clipboard copy failed"));

browser/extensions/screenshots/webextension/icons/back-highlight.svg

@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#009EC0;}
-</style>
-<path id="path-1_1_" class="st0" fill="#3D3D40" d="M18.8,8.5H4.2l5.4-5.4c0.5-0.5,0.5-1.2,0-1.8s-1.2-0.5-1.8,0L0.4,8.9c-0.5,0.5-0.5,1.2,0,1.8
-	l7.5,7.5c0.2,0.2,0.5,0.4,0.9,0.4s0.6-0.1,0.9-0.4c0.5-0.5,0.5-1.2,0-1.8L4.2,11h14.5c0.8,0,1.2-0.5,1.2-1.2S19.5,8.5,18.8,8.5z"/>
-</svg>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><style>.st0{fill:#009ec0}</style><path id="path-1_1_" class="st0" fill="#3D3D40" d="M18.8 8.5H4.2l5.4-5.4c.5-.5.5-1.2 0-1.8s-1.2-.5-1.8 0L.4 8.9c-.5.5-.5 1.2 0 1.8l7.5 7.5c.2.2.5.4.9.4s.6-.1.9-.4c.5-.5.5-1.2 0-1.8L4.2 11h14.5c.8 0 1.2-.5 1.2-1.2s-.4-1.3-1.1-1.3z"/></svg>

browser/extensions/screenshots/webextension/icons/back.svg

@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#3D3D40;}
-</style>
-<path id="path-1_1_" class="st0" fill="#3D3D40" d="M18.8,8.5H4.2l5.4-5.4c0.5-0.5,0.5-1.2,0-1.8s-1.2-0.5-1.8,0L0.4,8.9c-0.5,0.5-0.5,1.2,0,1.8
-	l7.5,7.5c0.2,0.2,0.5,0.4,0.9,0.4s0.6-0.1,0.9-0.4c0.5-0.5,0.5-1.2,0-1.8L4.2,11h14.5c0.8,0,1.2-0.5,1.2-1.2S19.5,8.5,18.8,8.5z"/>
-</svg>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><style>.st0{fill:#3d3d40}</style><path id="path-1_1_" class="st0" fill="#3D3D40" d="M18.8 8.5H4.2l5.4-5.4c.5-.5.5-1.2 0-1.8s-1.2-.5-1.8 0L.4 8.9c-.5.5-.5 1.2 0 1.8l7.5 7.5c.2.2.5.4.9.4s.6-.1.9-.4c.5-.5.5-1.2 0-1.8L4.2 11h14.5c.8 0 1.2-.5 1.2-1.2s-.4-1.3-1.1-1.3z"/></svg>

browser/extensions/screenshots/webextension/icons/cancel.svg

@@ -1,11 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#3E3D40;}
-</style>
-<path id="Combined-Shape" class="st0" d="M10.5,8.7L5.2,3.3c-0.5-0.5-1.3-0.5-1.8,0l0,0c-0.5,0.5-0.5,1.3,0,1.8l5.3,5.3l-5.3,5.3
-	c-0.5,0.5-0.5,1.3,0,1.8l0,0c0.5,0.5,1.3,0.5,1.8,0l5.3-5.3l5.3,5.3c0.5,0.5,1.3,0.5,1.8,0l0,0c0.5-0.5,0.5-1.3,0-1.8l-5.3-5.3
-	l5.3-5.3c0.5-0.5,0.5-1.3,0-1.8l0,0c-0.5-0.5-1.3-0.5-1.8,0L10.5,8.7z"/>
-</svg>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><style>.st0{fill:#3e3d40}</style><path id="Combined-Shape" class="st0" d="M10.5 8.7L5.2 3.3c-.5-.5-1.3-.5-1.8 0s-.5 1.3 0 1.8l5.3 5.3-5.3 5.3c-.5.5-.5 1.3 0 1.8s1.3.5 1.8 0l5.3-5.3 5.3 5.3c.5.5 1.3.5 1.8 0s.5-1.3 0-1.8l-5.3-5.3 5.3-5.3c.5-.5.5-1.3 0-1.8s-1.3-.5-1.8 0l-5.3 5.4z"/></svg>

browser/extensions/screenshots/webextension/icons/done.svg

@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#009EC0;}
-</style>
-<path class="st0" d="M19.5,4c-0.6-0.6-1.6-0.6-2.2,0l-10,10L2.7,9.4c-0.6-0.6-1.6-0.6-2.2,0c-0.6,0.6-0.6,1.6,0,2.2l5.8,5.8
-	c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0.3,0.3,0.7,0.5,1.1,0.5c0.4,0,0.8-0.2,1.1-0.5L19.5,6.3C20.2,5.7,20.2,4.7,19.5,4z"/>
-</svg>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><style>.st0{fill:#009ec0}</style><path class="st0" d="M19.5 4c-.6-.6-1.6-.6-2.2 0l-10 10-4.6-4.6c-.6-.6-1.6-.6-2.2 0-.6.6-.6 1.6 0 2.2l5.8 5.8c.3.3.7.5 1.1.5.4 0 .8-.2 1.1-.5l11-11.1c.7-.6.7-1.6 0-2.3z"/></svg>

browser/extensions/screenshots/webextension/icons/download.svg

@@ -1,11 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#3E3D40;}
-</style>
-<path id="Combined-Shape" class="st0" d="M9.1,12L4.9,7.9c-0.5-0.5-1.3-0.5-1.8,0s-0.5,1.3,0,1.8l6.2,6.2c0.5,0.5,1.3,0.5,1.8,0
-	l6.2-6.2c0.5-0.5,0.5-1.3,0-1.8s-1.3-0.5-1.8,0L11.6,12V1.2C11.6,0.6,11,0,10.3,0C9.6,0,9.1,0.6,9.1,1.2V12z M4,20
-	c-0.7,0-1.2-0.6-1.2-1.2s0.6-1.2,1.2-1.2h12.5c0.7,0,1.2,0.6,1.2,1.2S17.2,20,16.5,20H4z"/>
-</svg>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><style>.st0{fill:#3e3d40}</style><path id="Combined-Shape" class="st0" d="M9.1 12L4.9 7.9c-.5-.5-1.3-.5-1.8 0s-.5 1.3 0 1.8l6.2 6.2c.5.5 1.3.5 1.8 0l6.2-6.2c.5-.5.5-1.3 0-1.8s-1.3-.5-1.8 0L11.6 12V1.2C11.6.6 11 0 10.3 0c-.7 0-1.2.6-1.2 1.2V12zM4 20c-.7 0-1.2-.6-1.2-1.2s.6-1.2 1.2-1.2h12.5c.7 0 1.2.6 1.2 1.2s-.5 1.2-1.2 1.2H4z"/></svg>

browser/extensions/screenshots/webextension/icons/icon-16-v2.svg

@@ -1 +1 @@
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" fill="context-fill"><title>icon-16</title><path d="M8 2a4 4 0 0 0-4 4h4V2zm12 0h-4v4h4V2zm8 0v4h4a4 4 0 0 0-4-4zM14 2h-4v4h4V2zm12 0h-4v4h4V2zm2 10h4V8h-4v4zm0 12a4 4 0 0 0 4-4h-4v4zm0-6h4v-4h-4v4zm-.882-4.334a4 4 0 0 0-5.57-.984l-7.67 5.662-3.936-2.76c.031-.193.05-.388.058-.584a4.976 4.976 0 0 0-2-3.978V8H4v2.1a5 5 0 1 0 3.916 8.948l2.484 1.738-2.8 1.964a4.988 4.988 0 1 0 2.3 3.266l17.218-12.35zM5 17.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm0 12a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm10.8-4.858l6.034 4.6a4 4 0 0 0 5.57-.984L19.28 22.2l-3.48 2.442z"/></svg>
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity"><title>icon-16</title><path d="M8 2a4 4 0 0 0-4 4h4V2zm12 0h-4v4h4V2zm8 0v4h4a4 4 0 0 0-4-4zM14 2h-4v4h4V2zm12 0h-4v4h4V2zm2 10h4V8h-4v4zm0 12a4 4 0 0 0 4-4h-4v4zm0-6h4v-4h-4v4zm-.882-4.334a4 4 0 0 0-5.57-.984l-7.67 5.662-3.936-2.76c.031-.193.05-.388.058-.584a4.976 4.976 0 0 0-2-3.978V8H4v2.1a5 5 0 1 0 3.916 8.948l2.484 1.738-2.8 1.964a4.988 4.988 0 1 0 2.3 3.266l17.218-12.35zM5 17.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm0 12a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm10.8-4.858l6.034 4.6a4 4 0 0 0 5.57-.984L19.28 22.2l-3.48 2.442z"/></svg>

browser/extensions/screenshots/webextension/icons/icon-32-v2.svg

@@ -1 +1 @@
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" fill="context-fill"><title>icon-32</title><path d="M8 2a4 4 0 0 0-4 4h4V2zm12 0h-4v4h4V2zm8 0v4h4a4 4 0 0 0-4-4zM14 2h-4v4h4V2zm12 0h-4v4h4V2zm2 10h4V8h-4v4zm0 12a4 4 0 0 0 4-4h-4v4zm0-6h4v-4h-4v4zm-.882-4.334a4 4 0 0 0-5.57-.984l-7.67 5.662-3.936-2.76c.031-.193.05-.388.058-.584a4.976 4.976 0 0 0-2-3.978V8H4v2.1a5 5 0 1 0 3.916 8.948l2.484 1.738-2.8 1.964a4.988 4.988 0 1 0 2.3 3.266l17.218-12.35zM5 17.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm0 12a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm10.8-4.858l6.034 4.6a4 4 0 0 0 5.57-.984L19.28 22.2l-3.48 2.442z"/></svg>
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity"><title>icon-32</title><path d="M8 2a4 4 0 0 0-4 4h4V2zm12 0h-4v4h4V2zm8 0v4h4a4 4 0 0 0-4-4zM14 2h-4v4h4V2zm12 0h-4v4h4V2zm2 10h4V8h-4v4zm0 12a4 4 0 0 0 4-4h-4v4zm0-6h4v-4h-4v4zm-.882-4.334a4 4 0 0 0-5.57-.984l-7.67 5.662-3.936-2.76c.031-.193.05-.388.058-.584a4.976 4.976 0 0 0-2-3.978V8H4v2.1a5 5 0 1 0 3.916 8.948l2.484 1.738-2.8 1.964a4.988 4.988 0 1 0 2.3 3.266l17.218-12.35zM5 17.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm0 12a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm10.8-4.858l6.034 4.6a4 4 0 0 0 5.57-.984L19.28 22.2l-3.48 2.442z"/></svg>

browser/extensions/screenshots/webextension/icons/icon-highlight-32-v2.svg

@@ -1 +1 @@
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><title>icon-32</title><path d="M8 2a4 4 0 0 0-4 4h4V2zm12 0h-4v4h4V2zm8 0v4h4a4 4 0 0 0-4-4zM14 2h-4v4h4V2zm12 0h-4v4h4V2zm2 10h4V8h-4v4zm0 12a4 4 0 0 0 4-4h-4v4zm0-6h4v-4h-4v4zm-.882-4.334a4 4 0 0 0-5.57-.984l-7.67 5.662-3.936-2.76c.031-.193.05-.388.058-.584a4.976 4.976 0 0 0-2-3.978V8H4v2.1a5 5 0 1 0 3.916 8.948l2.484 1.738-2.8 1.964a4.988 4.988 0 1 0 2.3 3.266l17.218-12.35zM5 17.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm0 12a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm10.8-4.858l6.034 4.6a4 4 0 0 0 5.57-.984L19.28 22.2l-3.48 2.442z" fill-rule="nonzero" fill="#989898"/></svg>
+<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><title>icon-32</title><path d="M8 2a4 4 0 0 0-4 4h4V2zm12 0h-4v4h4V2zm8 0v4h4a4 4 0 0 0-4-4zM14 2h-4v4h4V2zm12 0h-4v4h4V2zm2 10h4V8h-4v4zm0 12a4 4 0 0 0 4-4h-4v4zm0-6h4v-4h-4v4zm-.882-4.334a4 4 0 0 0-5.57-.984l-7.67 5.662-3.936-2.76c.031-.193.05-.388.058-.584a4.976 4.976 0 0 0-2-3.978V8H4v2.1a5 5 0 1 0 3.916 8.948l2.484 1.738-2.8 1.964a4.988 4.988 0 1 0 2.3 3.266l17.218-12.35zM5 17.5a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm0 12a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm10.8-4.858l6.034 4.6a4 4 0 0 0 5.57-.984L19.28 22.2l-3.48 2.442z" fill="#989898"/></svg>