Bug 1368146 - Export Screenshots 8.1.0 to Firefox; r=ianb,standard8

--HG-- extra : rebase_source : f61e2842bdbed986a4a70bda10a9c91bba0439c1
2017-05-26 11:48:44 -07:00 · 2017-05-26 11:48:44 -07:00 · 937347d632
--- a/browser/extensions/screenshots/bootstrap.js
+++ b/browser/extensions/screenshots/bootstrap.js
@ -1,6 +1,3 @@
-/* globals AddonManager, Components, LegacyExtensionsUtils, Services,
-   XPCOMUtils */
-
 const OLD_ADDON_PREF_NAME = "extensions.jid1-NeEaf3sAHdKHPA@jetpack.deviceIdInfo";
 const OLD_ADDON_ID = "jid1-NeEaf3sAHdKHPA@jetpack";
 const ADDON_ID = "screenshots@mozilla.org";
@ -46,8 +43,28 @@ const prefObserver = {
  }
 };

+const appStartupObserver = {
+  register() {
+    Services.obs.addObserver(this, "sessionstore-windows-restored", false); // eslint-disable-line mozilla/no-useless-parameters
+  },
+
+  unregister() {
+    Services.obs.removeObserver(this, "sessionstore-windows-restored", false); // eslint-disable-line mozilla/no-useless-parameters
+  },
+
+  observe() {
+    appStartupDone();
+    this.unregister();
+  }
+}
+
+const APP_STARTUP = 1;
 function startup(data, reason) { // eslint-disable-line no-unused-vars
-  appStartupDone();
+  if (reason === APP_STARTUP) {
+    appStartupObserver.register();
+  } else {
+    appStartupDone();
+  }
  prefObserver.register();
  addonResourceURI = data.resourceURI;
  // eslint-disable-next-line promise/catch-or-return
--- a/browser/extensions/screenshots/install.rdf
+++ b/browser/extensions/screenshots/install.rdf
@ -12,7 +12,7 @@
      </Description>
    </em:targetApplication>
    <em:type>2</em:type>
-    <em:version>6.6.0</em:version>
+    <em:version>8.1.0</em:version>
    <em:bootstrap>true</em:bootstrap>
    <em:homepageURL>https://pageshot.net/</em:homepageURL>
    <em:multiprocessCompatible>true</em:multiprocessCompatible>
--- a/browser/extensions/screenshots/moz.build
+++ b/browser/extensions/screenshots/moz.build
@ -14,7 +14,6 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org'] += [
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"] += [
  'webextension/assertIsTrusted.js',
  'webextension/blank.html',
-  'webextension/buildSettings.js.template',
  'webextension/catcher.js',
  'webextension/clipboard.js',
  'webextension/domainFromUrl.js',
@ -53,6 +52,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales
  'webextension/_locales/cy/messages.json'
 ]

+FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["da"] += [
+  'webextension/_locales/da/messages.json'
+]
+
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["de"] += [
  'webextension/_locales/de/messages.json'
 ]
@ -304,16 +307,8 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["icons"]
  'webextension/icons/copy.png',
  'webextension/icons/done.svg',
  'webextension/icons/download.svg',
-  'webextension/icons/icon-128.png',
-  'webextension/icons/icon-16.png',
  'webextension/icons/icon-16.svg',
-  'webextension/icons/icon-19.png',
-  'webextension/icons/icon-256.png',
-  'webextension/icons/icon-32.png',
  'webextension/icons/icon-32.svg',
-  'webextension/icons/icon-38.png',
-  'webextension/icons/icon-48.png',
-  'webextension/icons/icon-64.png',
  'webextension/icons/icon-highlight-32.svg',
  'webextension/icons/icon-starred-32.svg',
  'webextension/icons/icon-welcome-face-without-eyes.svg',
--- a/browser/extensions/screenshots/test/browser/browser_screenshots_ui_check.js
+++ b/browser/extensions/screenshots/test/browser/browser_screenshots_ui_check.js
@ -6,14 +6,14 @@ function checkElements(expectPresent, l) {
  }
 }

-add_task(async function() {
-  await promiseScreenshotsEnabled();
+add_task(function*() {
+  yield promiseScreenshotsEnabled();

-  registerCleanupFunction(async function() {
-    await promiseScreenshotsReset();
+  registerCleanupFunction(function* () {
+    yield promiseScreenshotsReset();
  });

-  await BrowserTestUtils.waitForCondition(
+  yield BrowserTestUtils.waitForCondition(
    () => document.getElementById("screenshots_mozilla_org-browser-action"),
    "Screenshots button should be present", 100, 100);

--- a/browser/extensions/screenshots/test/browser/head.js
+++ b/browser/extensions/screenshots/test/browser/head.js
@ -1,5 +1,3 @@
-/* global CustomizableUI, info, Services */
-
 // Currently Screenshots is disabled in tests.  We want these tests to work under
 // either case that Screenshots is disabled or enabled on startup of the browser,
 // and that at the end we're reset to the correct state.
--- a/browser/extensions/screenshots/webextension/_locales/ach/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/ach/messages.json
@ -3,7 +3,7 @@
    "message": "Mak vidio ma ki ngolo macego cego ki cal me wang kio ki i Kakube ka igwok gi pi tutunu onyo matwal."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Mak cal me wang kio"
--- a/browser/extensions/screenshots/webextension/_locales/az/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/az/messages.json
@ -1,6 +1,12 @@
 {
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
+  },
+  "contextMenuLabel": {
+    "message": "Ekran görüntüsü al"
+  },
+  "myShotsLink": {
+    "message": "Ekran Görüntülərim"
  },
  "saveScreenshotSelectedArea": {
    "message": "Saxla"
@ -8,6 +14,9 @@
  "saveScreenshotVisibleArea": {
    "message": "Görünən ərazini saxla"
  },
+  "saveScreenshotFullPage": {
+    "message": "Tam səhifəni saxla"
+  },
  "cancelScreenshot": {
    "message": "Ləğv et"
  },
@ -16,5 +25,23 @@
  },
  "notificationLinkCopiedTitle": {
    "message": "Keçid köçürüldü"
+  },
+  "tourSkip": {
+    "message": "Ötür"
+  },
+  "tourNext": {
+    "message": "Növbəti Slayd"
+  },
+  "tourPrevious": {
+    "message": "Əvvəlki Slayd"
+  },
+  "tourDone": {
+    "message": "Tamamlandı"
+  },
+  "termsAndPrivacyNoticeTermsLink": {
+    "message": "Şərtlər"
+  },
+  "termsAndPrivacyNoticyPrivacyLink": {
+    "message": "Məxfilik Bildirişi"
  }
 }
--- a/browser/extensions/screenshots/webextension/_locales/be/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/be/messages.json
@ -3,7 +3,7 @@
    "message": "Рабіце кліпы і здымкі экрана ў Сеціве і захоўвайце іх часова або назаўжды."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Зрабіць здымак экрана"
@ -83,7 +83,7 @@
    "message": "Як вам падабаецца"
  },
  "tourBodyThree": {
-    "message": "Захоўваеце свае здымкі ў Інтэрнэце, каб лёгка імі дзяліцца, або загружайце іх на свой кампутар. Вы таксама можаце прагледзець усе захаваныя здымкі, націснуўшы на кнопку Мае здымкі."
+    "message": "Захоўваеце свае здымкі ў Інтэрнэце, каб лёгка імі дзяліцца, або загружайце іх на свой камп'ютар. Вы таксама можаце прагледзець усе захаваныя здымкі, націснуўшы на кнопку Мае здымкі."
  },
  "tourHeaderFour": {
    "message": "Рабіце захоп вокнаў або цэлых старонак"
--- a/browser/extensions/screenshots/webextension/_locales/bg/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/bg/messages.json
@ -3,7 +3,7 @@
    "message": "Прави клипове и снимки на уебстраница и ги запазва временно или за постоянно."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Снимка на екрана"
@ -77,7 +77,7 @@
    "message": "Уловете само нужното"
  },
  "tourBodyTwo": {
-    "message": "Щракнете с мишката или влачете, за да уловите части от страницата. Посочвайки елементите на страницата те се осветяват."
+    "message": "Щракнете с мишката или влачете, за да уловите части от страницата. Посочвайки елементи от страницата – те се осветяват."
  },
  "tourHeaderThree": {
    "message": "Както ви харесва"
--- a/browser/extensions/screenshots/webextension/_locales/bn_BD/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/bn_BD/messages.json
@ -3,7 +3,7 @@
    "message": "ওয়েব থেকে ক্লিপ এবং স্ক্রিনশট নিন এবং সেগুলো সাময়িকভাবে বা স্থায়ীভাবে সংরক্ষণ করুন।"
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "একটি স্ক্রীনশট নিন"
@ -103,6 +103,17 @@
  "tourDone": {
    "message": "সম্পন্ন"
  },
+  "termsAndPrivacyNoticeCloudServices": {
+    "message": "Firefox Screenshots ব্যবহারে, আপনি Firefox Cloud Services এর $TERMSANDPRIVACYNOTICETERMSLINK$ এবং $TERMSANDPRIVACYNOTICEPRIVACYLINK$ নীতিতে সম্মত হয়েছেন।",
+    "placeholders": {
+      "termsandprivacynoticetermslink": {
+        "content": "$1"
+      },
+      "termsandprivacynoticeprivacylink": {
+        "content": "$2"
+      }
+    }
+  },
  "termsAndPrivacyNoticeTermsLink": {
    "message": "শর্তাবলী"
  },
--- a/browser/extensions/screenshots/webextension/_locales/cs/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/cs/messages.json
@ -3,7 +3,7 @@
    "message": "Pořizujte snímky webových stránek a ukládejte je dočasně nebo natrvalo."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Pořídit snímek obrazovky"
@ -12,7 +12,7 @@
    "message": "Mé snímky"
  },
  "screenshotInstructions": {
-    "message": "Stiskněte tlačítko myši a tahem označte oblast snímku. Pro zrušení výběru stiskněte klávesu ESC."
+    "message": "Oblast vyberete kliknutím nebo tahem myší. Pro zrušení stiskněte ESC."
  },
  "saveScreenshotSelectedArea": {
    "message": "Uložit"
--- a/browser/extensions/screenshots/webextension/_locales/cy/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/cy/messages.json
@ -3,7 +3,7 @@
    "message": "Cymrwch clipiau a lluniau sgrin o'r We a'u cadw dros dro neu'n barhaol."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Cymryd Llun Sgrin Screenshot"
--- a/browser/extensions/screenshots/webextension/_locales/da/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/da/messages.json
@ -0,0 +1,123 @@
+{
+  "addonDescription": {
+    "message": "Tag udklip og skærmbilleder fra nettet og gem dem midlertidigt eller permanent."
+  },
+  "addonAuthorsList": {
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
+  },
+  "contextMenuLabel": {
+    "message": "Tag et skærmbillede"
+  },
+  "myShotsLink": {
+    "message": "Mine skærmbilleder"
+  },
+  "screenshotInstructions": {
+    "message": "Træk eller klik på siden for at vælge et område. Tryk på ESC for at fortryde."
+  },
+  "saveScreenshotSelectedArea": {
+    "message": "Gem"
+  },
+  "saveScreenshotVisibleArea": {
+    "message": "Gem synligt område"
+  },
+  "saveScreenshotFullPage": {
+    "message": "Gem hele siden"
+  },
+  "cancelScreenshot": {
+    "message": "Fortryd"
+  },
+  "downloadScreenshot": {
+    "message": "Hent"
+  },
+  "notificationLinkCopiedTitle": {
+    "message": "Link kopieret"
+  },
+  "notificationLinkCopiedDetails": {
+    "message": "Linket til dit skærmbillede er blevet gemt i udklipsholderen. Tryk på $META_KEY$-V for at sætte ind. ",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
+  "requestErrorTitle": {
+    "message": "Ude af funktion"
+  },
+  "requestErrorDetails": {
+    "message": "Vi kunne desværre ikke gemme dit skærmbillede. Prøv igen senere."
+  },
+  "connectionErrorTitle": {
+    "message": "Vi kan ikke oprette forbindelse til dine skærmbilleder."
+  },
+  "connectionErrorDetails": {
+    "message": "Kontroller din internet-forbindelse. Hvis du ikke kan oprette forbindelse til internettet, kan der være et midlertidigt teknisk problem med Firefox Screenshots. "
+  },
+  "loginErrorDetails": {
+    "message": "Vi kunne ikke gemme dit skærmbillede, fordi der er et teknisk problem med Firefox Screenshots. Prøv igen senere. "
+  },
+  "unshootablePageErrorTitle": {
+    "message": "Vi kan ikke tage et skærmbillede af denne side. "
+  },
+  "unshootablePageErrorDetails": {
+    "message": "Dette er ikke en almindelig webside, så du kan ikke tage skærmbilleder af den. "
+  },
+  "selfScreenshotErrorTitle": {
+    "message": "Du kan ikke tage skærmbilleder af en side i Firefox Screenshots."
+  },
+  "genericErrorTitle": {
+    "message": "Hov! Noget gik helt galt med Firefox Screenshots."
+  },
+  "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": {
+    "message": "Tag, gem og del skærmbilleder uden at forlade Firefox. "
+  },
+  "tourHeaderTwo": {
+    "message": "Gem lige hvad du vil."
+  },
+  "tourBodyTwo": {
+    "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": {
+    "message": "Som du vil have det."
+  },
+  "tourBodyThree": {
+    "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."
+  },
+  "tourHeaderFour": {
+    "message": "Tag skærmbilleder af vinduer eller hele sider."
+  },
+  "tourBodyFour": {
+    "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."
+  },
+  "tourSkip": {
+    "message": "SPRING OVER"
+  },
+  "tourNext": {
+    "message": "Næste side"
+  },
+  "tourPrevious": {
+    "message": "Forrige side"
+  },
+  "tourDone": {
+    "message": "Færdig"
+  },
+  "termsAndPrivacyNoticeCloudServices": {
+    "message": "Ved at anvende Firefox Screenshots godkender du $TERMSANDPRIVACYNOTICETERMSLINK$ og $TERMSANDPRIVACYNOTICEPRIVACYLINK$ for Firefox Cloud Services.",
+    "placeholders": {
+      "termsandprivacynoticetermslink": {
+        "content": "$1"
+      },
+      "termsandprivacynoticeprivacylink": {
+        "content": "$2"
+      }
+    }
+  },
+  "termsAndPrivacyNoticeTermsLink": {
+    "message": "vilkår"
+  },
+  "termsAndPrivacyNoticyPrivacyLink": {
+    "message": "privatlivspolitik"
+  }
+}
--- a/browser/extensions/screenshots/webextension/_locales/de/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/de/messages.json
@ -3,7 +3,7 @@
    "message": "Speichern Sie Ausschnitte und Bildschirmfotos von Webseiten, die Sie temporär oder dauerhaft speichern können."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Bildschirmfoto aufnehmen"
--- a/browser/extensions/screenshots/webextension/_locales/dsb/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/dsb/messages.json
@ -3,7 +3,7 @@
    "message": "Wzejśo klipy a fota wobrazowki z weba a składujśo je nachylu abo na pśecej."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Foto wobrazowki gótowaś"
--- a/browser/extensions/screenshots/webextension/_locales/el/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/el/messages.json
@ -3,7 +3,7 @@
    "message": "Πραγματοποιήστε λήψη στιγμιοτύπων από το Διαδίκτυο και αποθηκεύστε τα προσωρινά ή μόνιμα."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Λήψη στιγμιότυπου"
@ -30,7 +30,7 @@
    "message": "Λήψη"
  },
  "notificationLinkCopiedTitle": {
-    "message": "Αντιγραφή Συνδέσμου"
+    "message": "Ο σύνδεσμος αντιγράφηκε"
  },
  "notificationLinkCopiedDetails": {
    "message": "Ο σύνδεσμος προς την λήψη σας αντιγράφηκε στο πρόχειρο. Πατήστε $META_KEY$-V για επικόλληση.",
@ -74,7 +74,7 @@
    "message": "Λήψη, αποθήκευση και διαμοιρασμός στιγμιοτύπων μέσα από το Firefox."
  },
  "tourHeaderTwo": {
-    "message": "Καταγράψτε αυτό που Εσείς Επιθυμείτε"
+    "message": "Καταγράψτε αυτό που εσείς επιθυμείτε"
  },
  "tourBodyTwo": {
    "message": "Κάντε κλικ και σύρετε για την καταγραφή ενός τμήματος της σελίδας. Μπορείτε να επισημάνετε την επιλογή σας μετακινώντας τον ποντίκι σας επάνω της."
@ -86,7 +86,7 @@
    "message": "Αποθηκεύστε της λήψεις σας στο Διαδίκτυο για ευκολότερο διαμοιρασμό, η λήψη τους στον υπολογιστή σας. Μπορείτε να βρείτε όλες τις λήψεις σας πατώντας στο κουμπί «Οι λήψεις μου»."
  },
  "tourHeaderFour": {
-    "message": "Καταγράψτε Παράθυρα ή Ολόκληρες Σελίδες"
+    "message": "Λήψη παραθύρων ή ολόκληρων σελίδων"
  },
  "tourBodyFour": {
    "message": "Επιλέξτε τα κουμπιά επάνω δεξιά για να καταγράψετε την ορατή περιοχή του παραθύρου ή να καταγράψετε μια ολόκληρη σελίδα."
--- a/browser/extensions/screenshots/webextension/_locales/en_GB/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/en_GB/messages.json
@ -3,7 +3,7 @@
    "message": "Take clips and screenshots from the Web and save them temporarily or permanently."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Take a Screenshot"
--- a/browser/extensions/screenshots/webextension/_locales/en_US/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/en_US/messages.json
@ -3,7 +3,7 @@
    "message": "Take clips and screenshots from the Web and save them temporarily or permanently."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Take a Screenshot"
--- a/browser/extensions/screenshots/webextension/_locales/es_AR/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/es_AR/messages.json
@ -3,7 +3,7 @@
    "message": "Tomá imágenes y capturas de la web y guardalos temporal o permanentemente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Hacer captura de pantalla"
--- a/browser/extensions/screenshots/webextension/_locales/es_CL/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/es_CL/messages.json
@ -3,7 +3,7 @@
    "message": "Toma capturas de un sitio Web para guardarlas de forma temporal o permanentemente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Toma una captura de pantalla"
--- a/browser/extensions/screenshots/webextension/_locales/es_ES/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/es_ES/messages.json
@ -3,7 +3,7 @@
    "message": "Haz capturas y recortes de la web y guárdalos temporal o permanentemente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Hacer una captura de pantalla"
--- a/browser/extensions/screenshots/webextension/_locales/es_MX/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/es_MX/messages.json
@ -3,7 +3,7 @@
    "message": "Tomar clips y capturas de pantalla de la web y guardarlos temporalmente o permanentemente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Tomar captura de pantalla"
--- a/browser/extensions/screenshots/webextension/_locales/et/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/et/messages.json
@ -3,7 +3,7 @@
    "message": "Tee veebist klippe või ekraanipilte ning salvesta need ajutiselt või püsivalt."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Tee ekraanipilt"
--- a/browser/extensions/screenshots/webextension/_locales/fa/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/fa/messages.json
@ -3,7 +3,7 @@
    "message": "از وب عکس بگیرید و کلیپ بسازید و به صورت موقت یا دایمی ذخیره کنید."
  },
  "addonAuthorsList": {
-    "message": "موزیلا <screenshots-feedback@mozilla.org>"
+    "message": "موزیلا <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "از صفحه عکس بگیرید"
--- a/browser/extensions/screenshots/webextension/_locales/fi/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/fi/messages.json
@ -1,6 +1,18 @@
 {
+  "addonDescription": {
+    "message": "Ota leikkeitä ja kuvakaappauksia verkosta ja tallenna ne tilapäisesti tai pysyvästi."
+  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
+  },
+  "contextMenuLabel": {
+    "message": "Ota kuvakaappaus"
+  },
+  "myShotsLink": {
+    "message": "Omat kaappaukset"
+  },
+  "screenshotInstructions": {
+    "message": "Valitse alue vetämällä tai napsauttamalla sivua. Peruuta painamalla ESC."
  },
  "saveScreenshotSelectedArea": {
    "message": "Tallenna"
@ -19,5 +31,93 @@
  },
  "notificationLinkCopiedTitle": {
    "message": "Linkki kopioitu"
+  },
+  "notificationLinkCopiedDetails": {
+    "message": "Linkki kuvaasi on kopioitu leikepöydälle. Voit liittää sen painamalla $META_KEY$-V.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
+  "requestErrorTitle": {
+    "message": "Epäkunnossa."
+  },
+  "requestErrorDetails": {
+    "message": "Kuvan tallentaminen epäonnistui. Yritä myöhemmin uudestaan."
+  },
+  "connectionErrorTitle": {
+    "message": "Emme saa yhteyttä kuvakaappauksiisi."
+  },
+  "connectionErrorDetails": {
+    "message": "Tarkista internetyhteytesi. Jos olet yhteydessä internetiin, Firefox Screenshots -palvelussa voi olla tilapäinen häiriö."
+  },
+  "loginErrorDetails": {
+    "message": "Emme pystyneet tallentamaan kuvaasi, koska Firefox Screenshots -palvelussa on ongelma. Yritä myöhemmin uudestaan."
+  },
+  "unshootablePageErrorTitle": {
+    "message": "Tästä sivusta ei voi ottaa kuvaa."
+  },
+  "unshootablePageErrorDetails": {
+    "message": "Tämä ei ole tavallinen verkkosivu, joten et voi ottaa kuvaa siitä."
+  },
+  "selfScreenshotErrorTitle": {
+    "message": "Et voi ottaa kuvaa Firefox Screenshots -sivusta!"
+  },
+  "genericErrorTitle": {
+    "message": "Oho! Firefox Screenshots meni päin prinkkalaa."
+  },
+  "genericErrorDetails": {
+    "message": "Emme oikein tiedä, mitä tapahtui. Haluatko yrittää uudestaan tai ottaa kuvan eri sivusta?"
+  },
+  "tourBodyOne": {
+    "message": "Ota, tallenna ja jaa kuvakaappaus poistumatta Firefoxista."
+  },
+  "tourHeaderTwo": {
+    "message": "Kaappaa mitä haluat"
+  },
+  "tourBodyTwo": {
+    "message": "Kaappaa vain osa sivusta napsauttamalla ja vetämällä. Voit myös korostaa valinnan pitämällä hiirtä sen päällä."
+  },
+  "tourHeaderThree": {
+    "message": "Haluamallasi tavalla"
+  },
+  "tourBodyThree": {
+    "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."
+  },
+  "tourHeaderFour": {
+    "message": "Kaappaa ikkunoita tai kokonaisia sivuja"
+  },
+  "tourBodyFour": {
+    "message": "Valitse oikean yläkulman painikkeista joko ikkunassa näkyvän alueen kaappaus tai koko sivun kaappaus."
+  },
+  "tourSkip": {
+    "message": "OHITA"
+  },
+  "tourNext": {
+    "message": "Seuraava sivu"
+  },
+  "tourPrevious": {
+    "message": "Edellinen sivu"
+  },
+  "tourDone": {
+    "message": "Valmis"
+  },
+  "termsAndPrivacyNoticeCloudServices": {
+    "message": "Käyttämällä Firefox Screenshots –ominaisuutta hyväksyt Firefoxin pilvipalveluiden $TERMSANDPRIVACYNOTICETERMSLINK$ ja $TERMSANDPRIVACYNOTICEPRIVACYLINK$.",
+    "placeholders": {
+      "termsandprivacynoticetermslink": {
+        "content": "$1"
+      },
+      "termsandprivacynoticeprivacylink": {
+        "content": "$2"
+      }
+    }
+  },
+  "termsAndPrivacyNoticeTermsLink": {
+    "message": "käyttöehdot"
+  },
+  "termsAndPrivacyNoticyPrivacyLink": {
+    "message": "tietosuojakäytännön"
  }
 }
--- a/browser/extensions/screenshots/webextension/_locales/fr/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/fr/messages.json
@ -3,7 +3,7 @@
    "message": "Effectuez des captures d’écran sur le Web et sauvegardez-les de manière temporaire ou permanente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Effectuer une capture d’écran"
@ -56,7 +56,7 @@
    "message": "Nous n’avons pas pu enregistrer votre capture d’écran, car le service de Firefox Screenshot rencontre des difficultés. Veuillez réessayer plus tard."
  },
  "unshootablePageErrorTitle": {
-    "message": "Impossible d’effectuer une capture d’écran de cette page."
+    "message": "Impossible d’effectuer une capture de cette page."
  },
  "unshootablePageErrorDetails": {
    "message": "Impossible d’effectuer une capture d’écran, car cette page web n’est pas standard."
--- a/browser/extensions/screenshots/webextension/_locales/fy_NL/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/fy_NL/messages.json
@ -3,7 +3,7 @@
    "message": "Meitsje skermprintsjes of klips fan it web en bewarje se tydlik of permanint."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Meitsje in skermprintsje"
--- a/browser/extensions/screenshots/webextension/_locales/gu_IN/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/gu_IN/messages.json
@ -3,7 +3,7 @@
    "message": "વેબમાંથી ક્લિપ્સ અને સ્ક્રીનશૉટ્સ લો અને તેમને કામચલાઉ અથવા કાયમી રીતે સાચવો."
  },
  "addonAuthorsList": {
-    "message": "Mozilla<screenshots-feedback@mozilla.org>"
+    "message": "Mozilla<screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "સ્ક્રીનશૉટ લેવા"
--- a/browser/extensions/screenshots/webextension/_locales/he/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/he/messages.json
@ -3,7 +3,7 @@
    "message": "יצירת צילומי מסך של דפי אינטרנט ושמירה שלהם באופן זמני או קבוע."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "צילום מסך"
@ -89,7 +89,7 @@
    "message": "לצלם חלונות או דפים שלמים"
  },
  "tourBodyFour": {
-    "message": "נא לבחור בכפתורים שבחלק העליון כדי לצלם את האזור הגלוי בחלון או לצלם את הדף כולו."
+    "message": "בחרו בכפתורים שבחלק העליון כדי לצלם את האזור הגלוי בחלון או כדי לצלם את הדף כולו."
  },
  "tourSkip": {
    "message": "דילוג"
--- a/browser/extensions/screenshots/webextension/_locales/hi_IN/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/hi_IN/messages.json
@ -3,7 +3,7 @@
    "message": "वेब से फ़ोटो और स्क्रीनशॉट लें और उन्हें अस्थायी या स्थायी रूप से सहेजें."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "स्क्रीनशॉट लें"
--- a/browser/extensions/screenshots/webextension/_locales/hsb/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/hsb/messages.json
@ -3,7 +3,7 @@
    "message": "Wzmiće klipy a fota wobrazowki z weba a składujće je nachwilu abo na přeco."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Foto wobrazowki činić"
--- a/browser/extensions/screenshots/webextension/_locales/hu/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/hu/messages.json
@ -3,7 +3,7 @@
    "message": "Készítsen videoklipeket és képernyőképeket a webről, és mentse őket ideiglenesen vagy véglegesen."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Készítsen képernyőképet"
--- a/browser/extensions/screenshots/webextension/_locales/hy_AM/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/hy_AM/messages.json
@ -3,7 +3,7 @@
    "message": "Ստացեք հոլովակներ և էկրանի հանույթներ վեբից և պահպանեք դանք ժամանակավոր կամ մշտապես:"
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Ստանալ էկրանի պատկերը"
@ -71,7 +71,7 @@
    "message": "Մենք վստահ չենք, թե ինչ է տեղի ունեցնել: Կրկին փորձեք կամ փորձեք ստանալ մեկ այլ էջի պատկերը:"
  },
  "tourBodyOne": {
-    "message": "Ստացեք, պահպանեք և համօգտագործեք էկրանի հանույթները՝ առանց Firefox-ը լքելու: "
+    "message": "Ստացեք, պահպանեք և համօգտագործեք էկրանի հանույթները՝ առանց Firefox-ը լքելու:"
  },
  "tourHeaderTwo": {
    "message": "Ստացեք միայն այն, ինչ Ձեզ պետք է:"
--- a/browser/extensions/screenshots/webextension/_locales/id/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/id/messages.json
@ -3,7 +3,7 @@
    "message": "Rekam klip dan tangkapan layar dari Web dan simpan untuk sementara atau secara permanen."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Buat Tangkapan layar"
--- a/browser/extensions/screenshots/webextension/_locales/it/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/it/messages.json
@ -3,7 +3,7 @@
    "message": "Crea screenshot di contenuti sul Web e salvali, solo per un periodo di tempo o in modo permanente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Cattura screenshot"
--- a/browser/extensions/screenshots/webextension/_locales/ja/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/ja/messages.json
@ -3,7 +3,7 @@
    "message": "ウェブからスクリーンショットを撮って、一時的または永久にそれを保存しましょう。"
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "スクリーンショットを撮る"
--- a/browser/extensions/screenshots/webextension/_locales/kab/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/kab/messages.json
@ -3,7 +3,7 @@
    "message": "Ṭṭef imrayen akked igdilen si Web sakin sekles-iten s wudem askudan neγ s wudem yezgan."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Ṭṭef agdil"
--- a/browser/extensions/screenshots/webextension/_locales/kk/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/kk/messages.json
@ -3,7 +3,7 @@
    "message": "Интернеттен скриншоттарды түсіріп, оларды уақытша немесе тұрақты түрде сақтаңыз."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Скриншотты түсіру"
--- a/browser/extensions/screenshots/webextension/_locales/ko/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/ko/messages.json
@ -3,7 +3,7 @@
    "message": "웹 페이지를 찍거나 영상으로 만들어 임시로, 혹은 영구히 보관하세요."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "스크린샷 찍기"
--- a/browser/extensions/screenshots/webextension/_locales/lij/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/lij/messages.json
@ -3,7 +3,7 @@
    "message": "Fanni de föto do schermo da-o Web e sarvale in mòddo tenporaneo ò cin mòddo che restan."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Fanni 'na föto do schermo"
--- a/browser/extensions/screenshots/webextension/_locales/lo/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/lo/messages.json
@ -3,7 +3,7 @@
    "message": "ຖ່າຍຄຣິບ ແລະ ພາບຫນ້າຈໍຈາກຫນ້າເວັບ ແລ້ວບັນທຶກໄວ້ຊົ່ວຄາວ ຫລື ຖາວອນ."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "ຖ່າຍພາບຫນ້າຈໍ"
@ -24,7 +24,7 @@
    "message": "ບັນທຶກຫມົດຫນ້າ"
  },
  "cancelScreenshot": {
-    "message": ""
+    "message": "ຍົກເລີກ"
  },
  "downloadScreenshot": {
    "message": "ດາວໂຫລດ"
--- a/browser/extensions/screenshots/webextension/_locales/lt/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/lt/messages.json
@ -3,7 +3,7 @@
    "message": "Darykite iškarpas ir ekrano nuotraukos su interneto turiniu bei saugokite jas laikinai arba visąlaik."
  },
  "addonAuthorsList": {
-    "message": "„Mozilla“ <screenshots-feedback@mozilla.org>"
+    "message": "„Mozilla“ <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Padaryti ekrano nuotrauką"
--- a/browser/extensions/screenshots/webextension/_locales/ms/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/ms/messages.json
@ -3,7 +3,7 @@
    "message": "Ambil klip dan skrinshot dari Web dan simpan untuk sementara waktu atau kekal."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Ambil skrinshot"
--- a/browser/extensions/screenshots/webextension/_locales/my/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/my/messages.json
@ -3,7 +3,7 @@
    "message": "ဝဘ်ထံမှ ဓါတ်ပုံများနှင့် မျက်နှာပြင်ပုံဖမ်းချက်များကို ရိုက်ယူပြီး ယာယီ သို့မဟုတ် အမြဲတမ်းသိုလှောင်ရာတွင် သိမ်းဆည်းပါ။"
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "မျက်နှာပြင်ပုံရိပ် ဖမ်းယူပါ"
--- a/browser/extensions/screenshots/webextension/_locales/nb_NO/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/nb_NO/messages.json
@ -3,7 +3,7 @@
    "message": "Ta klipp og skjermbilder fra nettet og lagre de midlertidig eller permanent."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Ta et skjermbilde"
--- a/browser/extensions/screenshots/webextension/_locales/nl/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/nl/messages.json
@ -3,7 +3,7 @@
    "message": "Maak clips en schermafbeeldingen van het web en sla deze tijdelijk of permanent op."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Een schermafbeelding maken"
--- a/browser/extensions/screenshots/webextension/_locales/nn_NO/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/nn_NO/messages.json
@ -3,7 +3,7 @@
    "message": "Ta klipp og skjermbilde frå nettet og lagre dei mellombels eller permanent."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Ta eit skjermbilde"
--- a/browser/extensions/screenshots/webextension/_locales/pa_IN/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/pa_IN/messages.json
@ -1,6 +1,6 @@
 {
  "addonAuthorsList": {
-    "message": "ਮੌਜ਼ੀਲਾ <screenshots-feedback@mozilla.org>"
+    "message": "ਮੌਜ਼ੀਲਾ <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "ਸਕਰੀਨ-ਸ਼ਾਟ ਲਵੋ"
--- a/browser/extensions/screenshots/webextension/_locales/pl/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/pl/messages.json
@ -3,7 +3,7 @@
    "message": "Twórz wycinki i zrzuty stron internetowych i zapisuj je tymczasowo lub trwale."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Wykonaj zrzut ekranu"
--- a/browser/extensions/screenshots/webextension/_locales/pt_BR/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/pt_BR/messages.json
@ -3,7 +3,7 @@
    "message": "Tire clipes e capturas de tela da Web e guarde-as temporariamente ou permanentemente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Tirar uma captura de tela"
--- a/browser/extensions/screenshots/webextension/_locales/pt_PT/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/pt_PT/messages.json
@ -3,7 +3,7 @@
    "message": "Tire clipes e capturas de ecrã da Web e guarde-as temporariamente ou permanentemente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Tirar uma captura de ecrã"
@ -33,7 +33,7 @@
    "message": "Ligação copiada"
  },
  "notificationLinkCopiedDetails": {
-    "message": "A ligação à sua captura foi copiada para a área de transferência. Pressione $META_KEY$-V para colar.",
+    "message": "A ligação para a sua captura foi copiada para a área de transferência. Pressione $META_KEY$-V para colar.",
    "placeholders": {
      "meta_key": {
        "content": "$1"
@ -50,25 +50,25 @@
    "message": "Não conseguimos ligar às suas capturas de ecrã."
  },
  "connectionErrorDetails": {
-    "message": "Por favor verifique a sua ligação à Internet. Se consegue ligar-se à Internet, pode existir um problema temporário com o serviço Capturas de ecrã Firefox."
+    "message": "Por favor verifique a sua ligação à Internet. Se consegue ligar-se à Internet, pode existir um problema temporário com o serviço Firefox Screenshots."
  },
  "loginErrorDetails": {
-    "message": "Não conseguimos guardar a sua captura porque existe um problema com o serviço Capturas de ecrã Firefox. Por favor tente novamente mais tarde."
+    "message": "Não conseguimos guardar a sua captura porque existe um problema com o serviço Firefox Screenshots. Por favor tente novamente mais tarde."
  },
  "unshootablePageErrorTitle": {
    "message": "Não conseguimos capturar o ecrã nesta página."
  },
  "unshootablePageErrorDetails": {
-    "message": "Esta não é uma página web padrão, por isso não podemos tirar uma captura de ecrã da mesma."
+    "message": "Esta não é uma página Web padrão, por isso não podemos tirar uma captura de ecrã da mesma."
  },
  "selfScreenshotErrorTitle": {
-    "message": "Não pode tirar uma captura duma página Capturas de ecrã Firefox!"
+    "message": "Não pode tirar uma captura de uma página Firefox Screenshots!"
  },
  "genericErrorTitle": {
-    "message": "Uau! Algo correu mal com o Capturas de ecrã Firefox."
+    "message": "Uau! Algo correu mal com o Firefox Screenshots."
  },
  "genericErrorDetails": {
-    "message": "Não temos a certeza do que acabou de acontecer. Tentar novamente ou tirar uma captura de uma página diferente?"
+    "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": {
    "message": "Tire, guarde, e partilhe capturas de ecrã sem sair do Firefox."
@ -89,10 +89,10 @@
    "message": "Capture janelas ou páginas inteiras"
  },
  "tourBodyFour": {
-    "message": "Selecione os botões no canto superior direito para capturar a área visível na janela ou capturar uma página inteira."
+    "message": "Selecione os botões no canto superior direito para capturar a área visível na janela ou para capturar uma página inteira."
  },
  "tourSkip": {
-    "message": "Saltar"
+    "message": "SALTAR"
  },
  "tourNext": {
    "message": "Diapositivo seguinte"
@ -104,7 +104,7 @@
    "message": "Feito"
  },
  "termsAndPrivacyNoticeCloudServices": {
-    "message": "Ao utilizar as Capturas de ecrã Firefox, você concorda com os $TERMSANDPRIVACYNOTICETERMSLINK$ e a $TERMSANDPRIVACYNOTICEPRIVACYLINK$ do Firefox Cloud Services.",
+    "message": "Ao utilizar o Firefox Screenshots, você concorda com os $TERMSANDPRIVACYNOTICETERMSLINK$ e com o $TERMSANDPRIVACYNOTICEPRIVACYLINK$ do Firefox Cloud Services.",
    "placeholders": {
      "termsandprivacynoticetermslink": {
        "content": "$1"
@ -118,6 +118,6 @@
    "message": "Termos"
  },
  "termsAndPrivacyNoticyPrivacyLink": {
-    "message": "Nota de privacidade"
+    "message": "Aviso de privacidade"
  }
 }
--- a/browser/extensions/screenshots/webextension/_locales/rm/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/rm/messages.json
@ -3,7 +3,7 @@
    "message": "Fai maletgs da visur dal web ed als memorisescha temporarmain u permanentamain."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Far in maletg dal visur"
--- a/browser/extensions/screenshots/webextension/_locales/ru/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/ru/messages.json
@ -3,7 +3,7 @@
    "message": "Делайте вырезки и скриншоты из Интернета и сохраняйте их временно или навсегда."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Сделать скриншот"
--- a/browser/extensions/screenshots/webextension/_locales/sk/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/sk/messages.json
@ -3,7 +3,7 @@
    "message": "Vytvorte si snímky obrazovky na webe a uložte si ich dočasne či navždy."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Urobiť snímku obrazovky"
--- a/browser/extensions/screenshots/webextension/_locales/sl/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/sl/messages.json
@ -3,7 +3,7 @@
    "message": "Zajemajte posnetke zaslona s spleta ter jih shranite začasno ali trajno."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Zajemi posnetek zaslona"
--- a/browser/extensions/screenshots/webextension/_locales/sq/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/sq/messages.json
@ -1,6 +1,9 @@
 {
+  "addonDescription": {
+    "message": "Përftoni copëza dhe bëni foto në Web dhe ruajini ato përkohësisht ose përfundimisht."
+  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Bëni një Foto"
@ -8,6 +11,9 @@
  "myShotsLink": {
    "message": "Shkrepjet e Mia"
  },
+  "screenshotInstructions": {
+    "message": "Tërhiqni kursorin ose klikoni te faqja që të përzgjidhni një zonë. Shtypni ESC që të anulohet."
+  },
  "saveScreenshotSelectedArea": {
    "message": "Ruaje"
  },
@ -26,12 +32,29 @@
  "notificationLinkCopiedTitle": {
    "message": "Lidhja u Kopjua"
  },
+  "notificationLinkCopiedDetails": {
+    "message": "Lidhja për te fotoja juaj u kopjua në të papastër. Shtypni $META_KEY$-V për ta ngjitur diku.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
+  "requestErrorTitle": {
+    "message": "S’ka gjendje."
+  },
  "requestErrorDetails": {
    "message": "Na ndjeni! S’e ruajtëm dot foton tuaj. Ju lutemi, riprovoni më vonë."
  },
  "connectionErrorTitle": {
    "message": "S’lidhemi dot te fotot tuaja."
  },
+  "connectionErrorDetails": {
+    "message": "Ju lutemi, kontrolloni lidhjen tuaj Internet. Nëse jeni në gjendje të lidheni në Internet, mund të bëhet fjalë për një problem të përkohshëm me shërbimin Firefox Screenshots."
+  },
+  "loginErrorDetails": {
+    "message": "S’e ruajtëm dot foton tuaj, ngaqë pati një problem me shërbimin Firefox Screenshots. Ju lutemi, riprovoni më vonë."
+  },
  "unshootablePageErrorTitle": {
    "message": "S’bëjmë dot foto të kësaj faqeje."
  },
--- a/browser/extensions/screenshots/webextension/_locales/sr/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/sr/messages.json
@ -3,7 +3,7 @@
    "message": "Бележите снимке екрана са веба и сачувајте их привремено или трајно."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Усликајте екран"
@ -12,7 +12,7 @@
    "message": "Моји снимци"
  },
  "screenshotInstructions": {
-    "message": "Превуците или кликните на страници да изаберете област. Притисните ESC да прекинете."
+    "message": "Превуците или кликните на страницу да изаберете област. Притисните ESC да прекинете."
  },
  "saveScreenshotSelectedArea": {
    "message": "Сачувај"
@ -115,9 +115,9 @@
    }
  },
  "termsAndPrivacyNoticeTermsLink": {
-    "message": "условима"
+    "message": "услове"
  },
  "termsAndPrivacyNoticyPrivacyLink": {
-    "message": "обавештењем о приватности"
+    "message": "обавештење о приватности"
  }
 }
--- a/browser/extensions/screenshots/webextension/_locales/sv_SE/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/sv_SE/messages.json
@ -3,7 +3,7 @@
    "message": "Ta klipp och skärmbilder från webben och spara dem tillfälligt eller permanent."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Ta en skärmbild"
--- a/browser/extensions/screenshots/webextension/_locales/te/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/te/messages.json
@ -1,6 +1,6 @@
 {
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "ఒక తెరపట్టు తీసుకోండి"
--- a/browser/extensions/screenshots/webextension/_locales/th/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/th/messages.json
@ -3,7 +3,7 @@
    "message": "จับภาพหน้าจอจากเว็บและบันทึกไว้ชั่วคราวหรือถาวร"
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "จับภาพหน้าจอ"
@ -12,13 +12,13 @@
    "message": "ภาพของฉัน"
  },
  "screenshotInstructions": {
-    "message": "ลากหรือคลิกหน้าเว็บเพื่อเลือกบริเวณ กด ESC เพื่อยกเลิก"
+    "message": "ลากหรือคลิกที่หน้าเพื่อเลือกบริเวณ กด ESC เพื่อยกเลิก"
  },
  "saveScreenshotSelectedArea": {
    "message": "บันทึก"
  },
  "saveScreenshotVisibleArea": {
-    "message": "บันทึกส่วนที่เห็น"
+    "message": "บันทึกส่วนที่มองเห็น"
  },
  "saveScreenshotFullPage": {
    "message": "บันทึกเต็มหน้า"
@ -33,7 +33,7 @@
    "message": "คัดลอกลิงก์แล้ว"
  },
  "notificationLinkCopiedDetails": {
-    "message": "คัดลอกลิงก์ภาพของไว้ในคลิปบอร์ดแล้ว กด $META_KEY$-V เพื่อวาง",
+    "message": "คัดลอกลิงก์ไปยังภาพของคุณไปยังคลิปบอร์ดแล้ว กด $META_KEY$-V เพื่อวาง",
    "placeholders": {
      "meta_key": {
        "content": "$1"
@ -44,52 +44,52 @@
    "message": "ใช้งานไม่ได้"
  },
  "requestErrorDetails": {
-    "message": "ขออภัย! เราไม่สามารถบันทึกภาพของคุณได้ โปรดลองอีกครั้งหลังจากนี้"
+    "message": "ขออภัย! เราไม่สามารถบันทึกภาพของคุณ โปรดลองอีกครั้งในภายหลัง"
  },
  "connectionErrorTitle": {
-    "message": "เราเชื่อมต่อภาพหน้าจอของคุณไม่ได้"
+    "message": "เราไม่สามารถเชื่อมต่อกับภาพหน้าจอของคุณ"
  },
  "connectionErrorDetails": {
-    "message": "กรุณาตรวจสอบการเชื่อมต่ออินเทอร์เน็ต หากคุณสามารถเชื่อมต่อกับอินเทอร์เน็ต บริการ Firefox Screenshots อาจมีปัญหาชั่วคราว "
+    "message": "โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณ หากคุณสามารถเชื่อมต่ออินเทอร์เน็ต บริการ Firefox Screenshots อาจมีปัญหาชั่วคราว"
  },
  "loginErrorDetails": {
-    "message": "เราไม่สามารถบันทึกภาพได้เพราะมีปัญหากับบริการ Firefox Screenshots โปรดลองใหม่ภายหลัง"
+    "message": "เราไม่สามารถบันทึกภาพของคุณเนื่องจากบริการ Firefox Screenshots มีปัญหา โปรดลองอีกครั้งในภายหลัง"
  },
  "unshootablePageErrorTitle": {
    "message": "เราไม่สามารถจับภาพหน้าจอหน้านี้"
  },
  "unshootablePageErrorDetails": {
-    "message": "นี่ไม่ใช่หน้าเว็บมาตรฐานดังนั้นคุณไม่สามารถจับภาพได้"
+    "message": "นี่ไม่ใช่หน้าเว็บมาตรฐาน คุณจึงไม่สามารถจับภาพหน้าจอได้"
  },
  "selfScreenshotErrorTitle": {
-    "message": "คุณไม่สามารถจับภาพหน้าจอของหน้า Firefox Screenshots"
+    "message": "คุณไม่สามารถจับภาพของหน้า Firefox Screenshots!"
  },
  "genericErrorTitle": {
    "message": "โอ๊ย! Firefox Screenshots รวน"
  },
  "genericErrorDetails": {
-    "message": "เราไม่แน่ใจว่าเกิดอะไรขึ้น โปรดลองอีกครั้งหรือจับภาพของหน้าอื่น"
+    "message": "เราไม่แน่ใจว่าเกิดอะไรขึ้น ต้องการลองอีกครั้งหรือจับภาพของหน้าอื่น?"
  },
  "tourBodyOne": {
-    "message": "จับ บันทึกและแบ่งปันภาพหน้าจอโดยที่ไม่ต้องออกจาก Firefox"
+    "message": "จับ บันทึก และแบ่งปันภาพหน้าจอโดยไม่ต้องออกจาก Firefox"
  },
  "tourHeaderTwo": {
-    "message": "จับภาพตามที่คุณต้องการ"
+    "message": "จับภาพแค่สิ่งที่คุณต้องการ"
  },
  "tourBodyTwo": {
-    "message": "คลิกหรือลากเพื่อจับภาพเฉพาะบางส่วนของหน้าเว็บ คุณสามารถเลื่อนมาชี้เพื่อเน้นภาพส่วนที่คุณเลือก"
+    "message": "คลิกแล้วลากเพื่อจับภาพแค่บางส่วนของหน้า คุณยังสามารถวางเมาส์เพื่อเน้นการเลือกของคุณ"
  },
  "tourHeaderThree": {
-    "message": "ตามที่คุณโปรด"
+    "message": "ตามใจชอบ"
  },
  "tourBodyThree": {
-    "message": "บันทึกและครอปภาพลงในเว็บเพื่อให้แบ่งปันได้ง่าย หรือดาวน์โหลดลงคอมพิวเตอร์ของคุณ คุณยังสามารถคลิกที่ปุ่มภาพของฉันเพื่อที่จะหาภาพที่คุณจับไว้"
+    "message": "บันทึกภาพที่ครอบตัดของคุณไปยังเว็บเพื่อการแบ่งปันที่ง่ายขึ้น หรือดาวน์โหลดไปยังคอมพิวเตอร์ของคุณ คุณยังสามารถคลิกที่ปุ่ม ภาพของฉัน เพื่อค้นหาภาพทั้งหมดที่คุณจับไว้"
  },
  "tourHeaderFour": {
    "message": "จับภาพหน้าต่างหรือทั้งหน้า"
  },
  "tourBodyFour": {
-    "message": "กดปุ่มด้านบนขวาเพื่อจับภาพบริเวณที่มองเห็นในหน้าต่างหรือทั้งหน้าเว็บ"
+    "message": "คลิกที่ปุ่มด้านบนขวาเพื่อจับภาพพื้นที่ที่มองเห็นในหน้าต่างหรือเพื่อจับภาพทั้งหน้า"
  },
  "tourSkip": {
    "message": "ข้าม"
@ -104,7 +104,7 @@
    "message": "เสร็จสิ้น"
  },
  "termsAndPrivacyNoticeCloudServices": {
-    "message": "สำหรับการใช้งาน Firefox Screenshots คุณยอมรับใน Firefox Cloud Services $TERMSANDPRIVACYNOTICETERMSLINK$ และ $TERMSANDPRIVACYNOTICEPRIVACYLINK$",
+    "message": "เพื่อใช้ Firefox Screenshots คุณยอมรับ $TERMSANDPRIVACYNOTICETERMSLINK$ และ $TERMSANDPRIVACYNOTICEPRIVACYLINK$ ของบริการกลุ่มเมฆ Firefox",
    "placeholders": {
      "termsandprivacynoticetermslink": {
        "content": "$1"
--- a/browser/extensions/screenshots/webextension/_locales/tl/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/tl/messages.json
@ -3,7 +3,7 @@
    "message": "Dalhin ang clip at mga screenshot mula sa Web at i-save ang mga ito pansamantala o permanente."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Kumuha ng Screenshot"
--- a/browser/extensions/screenshots/webextension/_locales/tr/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/tr/messages.json
@ -3,7 +3,7 @@
    "message": "Web sayfalarının ekran görüntülerini alın, ister geçici ister kalıcı olarak kaydedin."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Ekran görüntüsü al"
@ -83,13 +83,13 @@
    "message": "İstediğin gibi yakala"
  },
  "tourBodyThree": {
-    "message": "Ekran görüntülerinizi daha kolay paylşamak 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."
+    "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."
  },
  "tourHeaderFour": {
    "message": "Pencereleri veya sayfaların tamamını yakala"
  },
  "tourBodyFour": {
-    "message": "Yalnızda pencerede gördüğünüz alanı veya sayfanın tamamını yakalamak için sağ üstteki düğmelerden uygun olanı seçin."
+    "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."
  },
  "tourSkip": {
    "message": "GEÇ"
--- a/browser/extensions/screenshots/webextension/_locales/uk/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/uk/messages.json
@ -3,7 +3,7 @@
    "message": "Робіть вирізки та знімки екрану в Інтернеті та зберігайте їх для подальшої роботи."
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Зробити знімок екрану"
--- a/browser/extensions/screenshots/webextension/_locales/ur/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/ur/messages.json
@ -3,7 +3,7 @@
    "message": "ویب سے کللبس یاا اسکرین شاٹیں لیں اور ان کو عارظی یا مستقل طور پر محفوظ کریں۔"
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "ایک سکرین شاٹ لیں"
@ -53,7 +53,7 @@
    "message": "براہ مہربانی اپنے انٹرنیٹ کنکشن کی پڑتال کریں۔ اگر آپ انٹرنیٹ سے جڑنے کے قابل ہیں، تو شاید Firefox اسکرین شاٹ خدمات کے ساتھ عارظی مسلہ ہو۔"
  },
  "loginErrorDetails": {
-    "message": "ہم آُپ کی شاٹ محفوظ نہیں کر سکے کیونکہ Firefox اسکرین شاٹ خدمت کے ساتھ مسلہ ہے۔ براہ مہربانی کچھ دیربعد کوشش کیجیئے۔ "
+    "message": "ہم آُپ کی شاٹ محفوظ نہیں کر سکے کیونکہ Firefox اسکرین شاٹ خدمت کے ساتھ مسلہ ہے۔ براہ مہربانی کچھ دیربعد کوشش کیجیئے۔"
  },
  "unshootablePageErrorTitle": {
    "message": "ہم اس صفحہ کی اسکرین شاٹ نہیں کر سکتے۔"
@ -92,7 +92,7 @@
    "message": "دریچہ میں نظر آنے والے علاقے یا مکمل صفحہ کو گرفت کرنے کے لیئے بالائی دائیں جانب بٹن کا انتخاب کریں۔"
  },
  "tourSkip": {
-    "message": "اچٹیں\t "
+    "message": "اچٹیں"
  },
  "tourNext": {
    "message": "اگلى سلائيڈ"
--- a/browser/extensions/screenshots/webextension/_locales/uz/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/uz/messages.json
@ -1,6 +1,6 @@
 {
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "Rasmini olish"
--- a/browser/extensions/screenshots/webextension/_locales/zh_CN/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/zh_CN/messages.json
@ -1,18 +1,18 @@
 {
  "addonDescription": {
-    "message": "剪辑和拍摄 Web 截图，临时或永久保存它们。"
+    "message": "临时或永久保存网页截图。"
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
-    "message": "拍摄截图"
+    "message": "截图"
  },
  "myShotsLink": {
    "message": "我的截图"
  },
  "screenshotInstructions": {
-    "message": "在页面上拖动或点击以选择范围。按 ESC 取消。"
+    "message": "在页面上拖动或单击以选择范围。按 ESC 键取消。"
  },
  "saveScreenshotSelectedArea": {
    "message": "保存"
@ -62,7 +62,7 @@
    "message": "这不是一个标准的网页，所以无法截图。"
  },
  "selfScreenshotErrorTitle": {
-    "message": "您不能拍摄 Firefox Screenshots 的页面！"
+    "message": "您不能截取 Firefox Screenshots 的页面！"
  },
  "genericErrorTitle": {
    "message": "哎呀，Firefox Screenshots 遇到问题。"
@ -71,25 +71,25 @@
    "message": "我们不确定发生了什么。您可以再试一次或者试试另一个页面。"
  },
  "tourBodyOne": {
-    "message": "拍摄、保存和分享屏幕截图，无需 Firefox 以外的工具。"
+    "message": "截取、保存和分享屏幕截图，无需 Firefox 以外的工具。"
  },
  "tourHeaderTwo": {
-    "message": "只拍摄想要的部分"
+    "message": "只截取想要的部分"
  },
  "tourBodyTwo": {
-    "message": "单击并拖动以只拍摄页面某个区域。您也可以悬停以高亮您的选择范围。"
+    "message": "单击并拖动以截取页面某个区域。您也可以悬停以高亮您的选择范围。"
  },
  "tourHeaderThree": {
-    "message": "做你所想"
+    "message": "做您所想"
  },
  "tourBodyThree": {
-    "message": "将您裁剪后的截图保存到网上以便共享，或者下载到您的计算机。您也可以点击“我的截图”按钮找到您拍摄的所有截图。"
+    "message": "将您裁剪后的截图保存到网上以便共享，或者下载到您的计算机。您也可以点击“我的截图”按钮找到您截取的所有截图。"
  },
  "tourHeaderFour": {
-    "message": "拍摄窗口或整个页面"
+    "message": "截取窗口或整个页面"
  },
  "tourBodyFour": {
-    "message": "选择右上角的按钮可以拍摄窗口中的可见区域或者整个页面。"
+    "message": "选择右上角的按钮可以截取窗口中的可见区域或者整个页面。"
  },
  "tourSkip": {
    "message": "跳过"
--- a/browser/extensions/screenshots/webextension/_locales/zh_TW/messages.json
+++ b/browser/extensions/screenshots/webextension/_locales/zh_TW/messages.json
@ -3,7 +3,7 @@
    "message": "拍攝網頁的擷圖，可暫時儲存或永久儲存。"
  },
  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.org>"
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
  },
  "contextMenuLabel": {
    "message": "拍攝畫面擷圖"
--- a/browser/extensions/screenshots/webextension/background/auth.js
+++ b/browser/extensions/screenshots/webextension/background/auth.js
@ -1,4 +1,4 @@
-/* globals browser, log */
+/* globals log */
 /* globals main, makeUuid, deviceInfo, analytics, catcher, buildSettings, communication */

 "use strict";
--- a/browser/extensions/screenshots/webextension/background/communication.js
+++ b/browser/extensions/screenshots/webextension/background/communication.js
@ -1,4 +1,4 @@
-/* globals browser, catcher, log */
+/* globals catcher, log */

 "use strict";

--- a/browser/extensions/screenshots/webextension/background/deviceInfo.js
+++ b/browser/extensions/screenshots/webextension/background/deviceInfo.js
@ -1,4 +1,4 @@
-/* globals browser, catcher */
+/* globals catcher */

 "use strict";

--- a/browser/extensions/screenshots/webextension/background/main.js
+++ b/browser/extensions/screenshots/webextension/background/main.js
@ -1,4 +1,3 @@
-/* globals browser, XMLHttpRequest, Image, document, setTimeout, navigator */
 /* globals selectorLoader, analytics, communication, catcher, log, makeUuid, auth, senderror */

 "use strict";
--- a/browser/extensions/screenshots/webextension/background/selectorLoader.js
+++ b/browser/extensions/screenshots/webextension/background/selectorLoader.js
@ -1,4 +1,4 @@
-/* globals browser, catcher, log */
+/* globals catcher, log */

 "use strict";

--- a/browser/extensions/screenshots/webextension/background/senderror.js
+++ b/browser/extensions/screenshots/webextension/background/senderror.js
@ -1,4 +1,4 @@
-/* globals analytics, browser, communication, makeUuid, Raven, catcher, auth, log */
+/* globals analytics, communication, makeUuid, Raven, catcher, auth, log */

 "use strict";

--- a/browser/extensions/screenshots/webextension/background/takeshot.js
+++ b/browser/extensions/screenshots/webextension/background/takeshot.js
@ -1,4 +1,4 @@
-/* globals communication, shot, main, auth, catcher, analytics, browser */
+/* globals communication, shot, main, auth, catcher, analytics */

 "use strict";

@ -47,7 +47,18 @@ this.takeshot = (function() {
      openedTab = tab;
      return uploadShot(shot);
    }).then(() => {
-      return browser.tabs.update(openedTab.id, {url: shot.viewUrl});
+      return browser.tabs.update(openedTab.id, {url: shot.viewUrl}).then(
+        null,
+        (error) => {
+          // FIXME: If https://bugzilla.mozilla.org/show_bug.cgi?id=1365718 is resolved,
+          // use the errorCode added as an additional check:
+          if ((/invalid tab id/i).test(error)) {
+            // This happens if the tab was closed before the upload completed
+            return browser.tabs.create({url: shot.viewUrl});
+          }
+          throw error;
+        }
+      );
    }).then(() => {
      return shot.viewUrl;
    }).catch((error) => {
--- a/browser/extensions/screenshots/webextension/build/inlineSelectionCss.js
+++ b/browser/extensions/screenshots/webextension/build/inlineSelectionCss.js
@ -33,8 +33,6 @@ window.inlineSelectionCss = `
    .button.tiny:active, .tiny.highlight-button-cancel:active, .tiny.highlight-button-save:active, .tiny.highlight-button-download:active {
      background: #dedede;
      border-color: #989898; }
-  .button.set-width--medium, .set-width--medium.highlight-button-cancel, .set-width--medium.highlight-button-save, .set-width--medium.highlight-button-download {
-    max-width: 200px; }
  .button.block-button, .block-button.highlight-button-cancel, .block-button.highlight-button-save, .block-button.highlight-button-download {
    display: flex;
    align-items: center;
@ -47,15 +45,15 @@ window.inlineSelectionCss = `
    flex-shrink: 0;
    font-size: 20px;
    height: 100px;
-    line-height: 100%; }
+    line-height: 100%;
+    overflow: hidden; }
    @media (max-width: 719px) {
      .button.block-button, .block-button.highlight-button-cancel, .block-button.highlight-button-save, .block-button.highlight-button-download {
        justify-content: flex-start;
-        padding: 10px;
        font-size: 16px;
        height: 72px;
-        flex: 1 0;
-        margin-right: 10px; } }
+        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 {
      background: #ebebeb; }
    .button.block-button:active, .block-button.highlight-button-cancel:active, .block-button.highlight-button-save:active, .block-button.highlight-button-download:active {
@ -80,6 +78,15 @@ window.inlineSelectionCss = `
    color: #fff;
    text-decoration: underline; }

+.alt-color-scheme {
+  background: #31365A;
+  color: #f5f5f7; }
+  .alt-color-scheme h1 {
+    color: #6F7FB6; }
+  .alt-color-scheme a {
+    color: #e1e1e6;
+    text-decoration: underline; }
+
 .button.primary, .primary.highlight-button-cancel, .highlight-button-save, .primary.highlight-button-download {
  background-color: #009ec0;
  color: #fff; }
@ -96,6 +103,12 @@ window.inlineSelectionCss = `
  .button.secondary:hover, .highlight-button-cancel:hover, .secondary.highlight-button-save:hover, .highlight-button-download:hover {
    background-color: #dedede; }

+.button.transparent, .transparent.highlight-button-cancel, .transparent.highlight-button-save, .transparent.highlight-button-download {
+  background-color: transparent;
+  color: #3e3d40; }
+  .button.transparent:hover, .transparent.highlight-button-cancel:hover, .transparent.highlight-button-save:hover, .transparent.highlight-button-download:hover, .button.transparent:focus, .transparent.highlight-button-cancel:focus, .transparent.highlight-button-save:focus, .transparent.highlight-button-download:focus, .button.transparent:active, .transparent.highlight-button-cancel:active, .transparent.highlight-button-save:active, .transparent.highlight-button-download:active {
+    background-color: rgba(0, 0, 0, 0.05); }
+
 .button.warning, .warning.highlight-button-cancel, .warning.highlight-button-save, .warning.highlight-button-download {
  color: #fff;
  background: #d92215; }
@ -336,26 +349,27 @@ window.inlineSelectionCss = `
 .fixed-container {
  align-items: center;
  display: flex;
-  height: 100%;
+  flex-direction: column;
+  height: 100vh;
  justify-content: center;
  left: 0;
  margin: 0;
  padding: 0;
  pointer-events: none;
-  position: absolute;
+  position: fixed;
  top: 0;
  width: 100%; }

 .face-container {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  margin: auto;
+  position: relative;
  width: 64px;
-  height: 64px;
-  transform: translateY(-45px); }
+  height: 64px; }
+
+.face {
+  width: 62.4px;
+  height: 62.4px;
+  display: block;
+  background-image: url("MOZ_EXTENSION/icons/icon-welcome-face-without-eyes.svg"); }

 .eye {
  background-color: #fff;
@ -383,12 +397,6 @@ window.inlineSelectionCss = `
 .right {
  margin-left: 20px; }

-.face {
-  width: 62.4px;
-  height: 62.4px;
-  display: block;
-  background-image: url("MOZ_EXTENSION/icons/icon-welcome-face-without-eyes.svg"); }
-
 .preview-instructions {
  display: flex;
  align-items: center;
@ -399,8 +407,8 @@ window.inlineSelectionCss = `
  font-size: 24px;
  line-height: 32px;
  text-align: center;
-  width: 400px;
-  margin-top: 45px; }
+  padding-top: 20px;
+  width: 400px; }

 .myshots-all-buttons-container {
  display: flex;
@ -455,16 +463,6 @@ window.inlineSelectionCss = `
  align-items: center;
  justify-content: center; }

-/* styleMyShotsButton test: */
-.styleMyShotsButton-bright .myshots-button {
-  color: #fff;
-  background: #009ec0; }
-
-.styleMyShotsButton-bright .myshots-text-pre,
-.styleMyShotsButton-bright .myshots-text-post {
-  filter: brightness(20); }
-
-/* end styleMyShotsButton test */
@keyframes pulse {
  0% {
    transform: scale(1); }
--- a/browser/extensions/screenshots/webextension/build/shot.js
+++ b/browser/extensions/screenshots/webextension/build/shot.js
@ -1,6 +1,5 @@
 window.shot = (function () {let exports={}; // Note: in this library we can't use any "system" dependencies because this can be used from multiple
 // environments
-/* globals console */

 /** Throws an error if the condition isn't true.  Any extra arguments after the condition
    are used as console.error() arguments. */
@ -9,7 +8,7 @@ function assert(condition, ...args) {
    return;
  }
  console.error("Failed assertion", ...args);
-  throw new Error("Failed assertion", ...args);
+  throw new Error(`Failed assertion: ${args.join(" ")}`);
 }

 /** True if `url` is a valid URL */
--- a/browser/extensions/screenshots/webextension/buildSettings.js.template
+++ b/browser/extensions/screenshots/webextension/buildSettings.js.template
@ -1,5 +0,0 @@
-window.buildSettings = {
-  defaultSentryDsn: process.env.SCREENSHOTS_SENTRY,
-  logLevel: process.env.SCREENSHOTS_LOG_LEVEL || "warn"
-};
-null;
--- a/browser/extensions/screenshots/webextension/catcher.js
+++ b/browser/extensions/screenshots/webextension/catcher.js
@ -46,12 +46,14 @@ this.catcher = (function() {
  }

  /** Wrap the function, and if it raises any exceptions then call unhandled() */
-  exports.watchFunction = function watchFunction(func) {
+  exports.watchFunction = function watchFunction(func, quiet) {
    return function() {
      try {
        return func.apply(this, arguments);
      } catch (e) {
-        exports.unhandled(e);
+        if (!quiet) {
+          exports.unhandled(e);
+        }
        throw e;
      }
    };
--- a/browser/extensions/screenshots/webextension/icons/icon-128.png
+++ b/browser/extensions/screenshots/webextension/icons/icon-128.png
--- a/browser/extensions/screenshots/webextension/icons/icon-16.png
+++ b/browser/extensions/screenshots/webextension/icons/icon-16.png
--- a/browser/extensions/screenshots/webextension/icons/icon-19.png
+++ b/browser/extensions/screenshots/webextension/icons/icon-19.png
--- a/browser/extensions/screenshots/webextension/icons/icon-256.png
+++ b/browser/extensions/screenshots/webextension/icons/icon-256.png
--- a/browser/extensions/screenshots/webextension/icons/icon-32.png
+++ b/browser/extensions/screenshots/webextension/icons/icon-32.png
--- a/browser/extensions/screenshots/webextension/icons/icon-38.png
+++ b/browser/extensions/screenshots/webextension/icons/icon-38.png
--- a/browser/extensions/screenshots/webextension/icons/icon-48.png
+++ b/browser/extensions/screenshots/webextension/icons/icon-48.png
--- a/browser/extensions/screenshots/webextension/icons/icon-64.png
+++ b/browser/extensions/screenshots/webextension/icons/icon-64.png
--- a/browser/extensions/screenshots/webextension/log.js
+++ b/browser/extensions/screenshots/webextension/log.js
@ -1,4 +1,5 @@
 /* globals buildSettings */
+/* eslint-disable no-console */

 "use strict";

--- a/browser/extensions/screenshots/webextension/manifest.json
+++ b/browser/extensions/screenshots/webextension/manifest.json
@ -1,7 +1,7 @@
 {
  "manifest_version": 2,
  "name": "Firefox Screenshots",
-  "version": "6.6.0",
+  "version": "8.1.0",
  "description": "__MSG_addonDescription__",
  "author": "__MSG_addonAuthorsList__",
  "homepage_url": "https://github.com/mozilla-services/screenshots",
@ -11,14 +11,6 @@
    }
  },
  "default_locale": "en_US",
-  "icons": {
-    "16": "icons/icon-16.png",
-    "32": "icons/icon-32.png",
-    "48": "icons/icon-48.png",
-    "64": "icons/icon-64.png",
-    "128": "icons/icon-128.png",
-    "256": "icons/icon-256.png"
-  },
  "browser_action": {
    "default_icon": {
      "16": "icons/icon-16.svg",
--- a/browser/extensions/screenshots/webextension/onboarding/slides.js
+++ b/browser/extensions/screenshots/webextension/onboarding/slides.js
@ -1,4 +1,4 @@
-/* globals log, catcher, onboardingHtml, onboardingCss, browser, util, shooter, callBackground, assertIsTrusted */
+/* globals log, catcher, onboardingHtml, onboardingCss, util, shooter, callBackground, assertIsTrusted */

 "use strict";

--- a/browser/extensions/screenshots/webextension/selector/callBackground.js
+++ b/browser/extensions/screenshots/webextension/selector/callBackground.js
@ -1,4 +1,4 @@
-/* globals browser, log */
+/* globals log */

 "use strict";

--- a/browser/extensions/screenshots/webextension/selector/shooter.js
+++ b/browser/extensions/screenshots/webextension/selector/shooter.js
@ -1,6 +1,5 @@
 /* globals global, documentMetadata, util, uicontrol, ui, catcher */
-/* globals XMLHttpRequest, window, location, alert, domainFromUrl, randomString */
-/* globals document, setTimeout, location */
+/* globals domainFromUrl, randomString */

 "use strict";

--- a/browser/extensions/screenshots/webextension/selector/ui.js
+++ b/browser/extensions/screenshots/webextension/selector/ui.js
@ -1,4 +1,3 @@
-/* globals window, document, browser */
 /* globals log, util, catcher, inlineSelectionCss, callBackground, assertIsTrusted */

 "use strict";
--- a/browser/extensions/screenshots/webextension/selector/uicontrol.js
+++ b/browser/extensions/screenshots/webextension/selector/uicontrol.js
@ -1,5 +1,5 @@
 /* globals log, catcher, util, ui, slides */
-/* globals window, document, location, shooter, callBackground, selectorLoader, assertIsTrusted */
+/* globals shooter, callBackground, selectorLoader, assertIsTrusted */

 "use strict";

@ -815,10 +815,6 @@ this.uicontrol = (function() {
      return;
    }
    addHandlers();
-    // FIXME: self.options is gone
-    if (self.options && self.options.styleMyShotsButton) {
-      ui.iframe.addClassName = `styleMyShotsButton-${self.options.styleMyShotsButton.value}`;
-    }
    if (shouldOnboard) {
      setState("onboarding");
    } else {