Bug 1521168 - Export Screenshots 37.1.0 to Firefox (translations only); r=_6a68,flod
authorIan Bicking <ianb@colorstudy.com>
Tue, 05 Feb 2019 09:00:17 +0000
changeset 457642 61b408c4e663b4cffd7c40b3702bc7f79874c9c5
parent 457641 bd2e27b25f57df6cc351839b14aa0e81cb73dc50
child 457643 cc26e0ca64e8c8f29b0f10775c8f729220fd343e
push id35516
push userrmaries@mozilla.com
push dateFri, 08 Feb 2019 04:23:26 +0000
treeherdermozilla-central@d599d1a73a3a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers_6a68, flod
bugs1521168
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1521168 - Export Screenshots 37.1.0 to Firefox (translations only); r=_6a68,flod MozReview-Commit-ID: JNIGRJMNsyz Differential Revision: https://phabricator.services.mozilla.com/D18102
browser/extensions/screenshots/_locales/ar/messages.json
browser/extensions/screenshots/_locales/az/messages.json
browser/extensions/screenshots/_locales/be/messages.json
browser/extensions/screenshots/_locales/bg/messages.json
browser/extensions/screenshots/_locales/bn_BD/messages.json
browser/extensions/screenshots/_locales/br/messages.json
browser/extensions/screenshots/_locales/ca/messages.json
browser/extensions/screenshots/_locales/cs/messages.json
browser/extensions/screenshots/_locales/cy/messages.json
browser/extensions/screenshots/_locales/da/messages.json
browser/extensions/screenshots/_locales/de/messages.json
browser/extensions/screenshots/_locales/dsb/messages.json
browser/extensions/screenshots/_locales/el/messages.json
browser/extensions/screenshots/_locales/en_CA/messages.json
browser/extensions/screenshots/_locales/en_GB/messages.json
browser/extensions/screenshots/_locales/en_US/messages.json
browser/extensions/screenshots/_locales/eo/messages.json
browser/extensions/screenshots/_locales/es_AR/messages.json
browser/extensions/screenshots/_locales/es_CL/messages.json
browser/extensions/screenshots/_locales/es_ES/messages.json
browser/extensions/screenshots/_locales/es_MX/messages.json
browser/extensions/screenshots/_locales/et/messages.json
browser/extensions/screenshots/_locales/fa/messages.json
browser/extensions/screenshots/_locales/ff/messages.json
browser/extensions/screenshots/_locales/fi/messages.json
browser/extensions/screenshots/_locales/fr/messages.json
browser/extensions/screenshots/_locales/fy_NL/messages.json
browser/extensions/screenshots/_locales/gd/messages.json
browser/extensions/screenshots/_locales/gn/messages.json
browser/extensions/screenshots/_locales/gu_IN/messages.json
browser/extensions/screenshots/_locales/he/messages.json
browser/extensions/screenshots/_locales/hi_IN/messages.json
browser/extensions/screenshots/_locales/hr/messages.json
browser/extensions/screenshots/_locales/hsb/messages.json
browser/extensions/screenshots/_locales/hu/messages.json
browser/extensions/screenshots/_locales/ia/messages.json
browser/extensions/screenshots/_locales/id/messages.json
browser/extensions/screenshots/_locales/it/messages.json
browser/extensions/screenshots/_locales/ja/messages.json
browser/extensions/screenshots/_locales/ka/messages.json
browser/extensions/screenshots/_locales/kab/messages.json
browser/extensions/screenshots/_locales/kk/messages.json
browser/extensions/screenshots/_locales/lij/messages.json
browser/extensions/screenshots/_locales/lt/messages.json
browser/extensions/screenshots/_locales/ms/messages.json
browser/extensions/screenshots/_locales/my/messages.json
browser/extensions/screenshots/_locales/nb_NO/messages.json
browser/extensions/screenshots/_locales/nl/messages.json
browser/extensions/screenshots/_locales/nn_NO/messages.json
browser/extensions/screenshots/_locales/pl/messages.json
browser/extensions/screenshots/_locales/pt_BR/messages.json
browser/extensions/screenshots/_locales/pt_PT/messages.json
browser/extensions/screenshots/_locales/rm/messages.json
browser/extensions/screenshots/_locales/ro/messages.json
browser/extensions/screenshots/_locales/ru/messages.json
browser/extensions/screenshots/_locales/sk/messages.json
browser/extensions/screenshots/_locales/sl/messages.json
browser/extensions/screenshots/_locales/sq/messages.json
browser/extensions/screenshots/_locales/su/messages.json
browser/extensions/screenshots/_locales/sv_SE/messages.json
browser/extensions/screenshots/_locales/te/messages.json
browser/extensions/screenshots/_locales/th/messages.json
browser/extensions/screenshots/_locales/tr/messages.json
browser/extensions/screenshots/_locales/uk/messages.json
browser/extensions/screenshots/_locales/ur/messages.json
browser/extensions/screenshots/_locales/vi/messages.json
browser/extensions/screenshots/_locales/zh_CN/messages.json
browser/extensions/screenshots/_locales/zh_TW/messages.json
browser/extensions/screenshots/moz.build
--- a/browser/extensions/screenshots/_locales/ar/messages.json
+++ b/browser/extensions/screenshots/_locales/ar/messages.json
@@ -12,28 +12,34 @@
     "message": "لقطاتي"
   },
   "screenshotInstructions": {
     "message": "اسحب أو انقر في الصفحة لاختيار منطقة. اضغط ESC للإلغاء."
   },
   "saveScreenshotSelectedArea": {
     "message": "احفظ"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "ارفع"
+  },
   "saveScreenshotVisibleArea": {
     "message": "احفظ الجزء المرئي"
   },
   "saveScreenshotFullPage": {
     "message": "احفظ كل الصفحة"
   },
   "cancelScreenshot": {
     "message": "ألغِ"
   },
   "downloadScreenshot": {
     "message": "نزّل"
   },
+  "downloadScreenshotTitle": {
+    "message": "تنزيل لقطة الشاشة"
+  },
   "downloadOnlyNotice": {
     "message": "أنت حاليًا في وضع ”التنزيل فقط“."
   },
   "downloadOnlyDetails": {
     "message": "تنتقل لقطات فَيرفُكس تلقائيا إلى وضع ”التنزيل فقط“ في الحالات التالية:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "في نافذة تصفح خاص."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "انسخ"
   },
+  "copyScreenshotTitle": {
+    "message": "انسخ اللقطة إلى الحافظة"
+  },
   "notificationImageCopiedTitle": {
     "message": "نُسخت اللقطة"
   },
   "notificationImageCopiedDetails": {
     "message": "نُسخت اللقطة إلى الحافظة. اضغط $META_KEY$-V للصقها.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "نأسف على الإزعاج. نعمل على هذه الخاصية للإصدارات اللاحقة."
   },
   "genericErrorTitle": {
     "message": "هناك عطل في «لقطات شاشة فَيَرفُكس»."
   },
   "genericErrorDetails": {
     "message": "لسنا متأكدين ما المشكلة. أتمانع إعادة المحاولة أو أخذ لقطة لصفحة أخرى؟"
   },
-  "tourBodyIntro": {
-    "message": "خذ لقطات الشاشة و احفظها و شاركها دون مغادرة فَيَرفُكس."
+  "tourBodyIntroServerless": {
+    "message": "خذ لقطات الشاشة و نزّلها و انسخها دون مغادرة فَيَرفُكس."
   },
   "tourHeaderPageAction": {
     "message": "طريقة جديدة لحفظ اللقطات بها"
   },
   "tourBodyPageAction": {
     "message": "وسّع قائمة إجراءات الصفحة في شريط العنوان لأخذ لقطة في أي وقت."
   },
   "tourHeaderClickAndDrag": {
@@ -138,22 +147,16 @@
     "message": "انقر و اسحب لالتقاط جزء معين من الصفحة. يمكنك أيضًا التحويم لإبراز التحديد."
   },
   "tourHeaderFullPage": {
     "message": "التقط النوافذ أو صفحات كاملة"
   },
   "tourBodyFullPage": {
     "message": "اختر الأزرار في أعلى اليمين لالتقاط المنطقة المرئية في النافذة أو الصفحة كلها."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "كما تريدها"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "احفظ اللقطات التي أخذتها على الوب لمشاركتها بسهولة، أو نزّلها على حاسوبك. يمكنك أيضًل النقر على زر ”لقطاتي“ للعثور على كل اللقطات التي أخذتها."
-  },
   "tourSkip": {
     "message": "تخطَّ"
   },
   "tourNext": {
     "message": "الشريحة التالية"
   },
   "tourPrevious": {
     "message": "الشريحة السابقة"
--- a/browser/extensions/screenshots/_locales/az/messages.json
+++ b/browser/extensions/screenshots/_locales/az/messages.json
@@ -12,16 +12,19 @@
     "message": "Ekran Görüntülərim"
   },
   "screenshotInstructions": {
     "message": "Səhifədə hər hansı bir yerdə sürüşdürərək və ya basaraq ərazini seçin. Ləğv etmək üçün ESC basın."
   },
   "saveScreenshotSelectedArea": {
     "message": "Saxla"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Yüklə"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Görünən ərazini saxla"
   },
   "saveScreenshotFullPage": {
     "message": "Tam səhifəni saxla"
   },
   "cancelScreenshot": {
     "message": "Ləğv et"
--- a/browser/extensions/screenshots/_locales/be/messages.json
+++ b/browser/extensions/screenshots/_locales/be/messages.json
@@ -12,16 +12,19 @@
     "message": "Мае здымкі"
   },
   "screenshotInstructions": {
     "message": "Пацягніце або пстрыкніце на старонцы для выбару вобласці. Для адмены націсніце ESC."
   },
   "saveScreenshotSelectedArea": {
     "message": "Захаваць"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Зацягнуць"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Захаваць бачную вобласць"
   },
   "saveScreenshotFullPage": {
     "message": "Захаваць усю старонку"
   },
   "cancelScreenshot": {
     "message": "Скасаваць"
--- a/browser/extensions/screenshots/_locales/bg/messages.json
+++ b/browser/extensions/screenshots/_locales/bg/messages.json
@@ -12,16 +12,19 @@
     "message": "Моите снимки"
   },
   "screenshotInstructions": {
     "message": "За да изберете участък влачете или щракнете с мишката в страницата. Натиснете ESC за отказ."
   },
   "saveScreenshotSelectedArea": {
     "message": "Запазване"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Качване"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Запазване на видимата област"
   },
   "saveScreenshotFullPage": {
     "message": "Запазване на цялата страница"
   },
   "cancelScreenshot": {
     "message": "Отказ"
@@ -144,16 +147,22 @@
     "message": "Използвайте бутоните в горния десен ъгъл, за да уловите само видимата част или цялата страница."
   },
   "tourHeaderDownloadUpload": {
     "message": "Както ви харесва"
   },
   "tourBodyDownloadUpload": {
     "message": "Запазвайте снимките на страници от Мрежата, за да ги споделяте по-лесно или ги изтегляйте на компютъра си. А бутонът „Моите снимки“ ще ви покаже всички направени от вас снимки."
   },
+  "tourHeaderAccounts": {
+    "message": "Снимки на екрана за из път"
+  },
+  "tourBodyAccounts": {
+    "message": "Впишете се в Снимки на екрана с вашия Firefox Account, за да получите достъп до вашите снимки на всички ваши устройства и за да запазите вашите любими снимки завинаги."
+  },
   "tourSkip": {
     "message": "Пропускане"
   },
   "tourNext": {
     "message": "Напред"
   },
   "tourPrevious": {
     "message": "Назад"
--- a/browser/extensions/screenshots/_locales/bn_BD/messages.json
+++ b/browser/extensions/screenshots/_locales/bn_BD/messages.json
@@ -1,39 +1,45 @@
 {
   "addonDescription": {
     "message": "ওয়েব থেকে ক্লিপ এবং স্ক্রিনশট নিন এবং সেগুলো সাময়িকভাবে বা স্থায়ীভাবে সংরক্ষণ করুন।"
   },
   "addonAuthorsList": {
     "message": "Mozilla <screenshots-feedback@mozilla.com>"
   },
   "contextMenuLabel": {
-    "message": "একটি স্ক্রীনশট নিন"
+    "message": "একটি স্ক্রিনশট নিন"
   },
   "myShotsLink": {
     "message": "আমার সটসমূহ"
   },
   "screenshotInstructions": {
     "message": "ড্রাগ করে অথবা পেজে ক্লিক করে একটি অংশ নির্বাচন করুন। বাতিল করতে ESC টিপুন।"
   },
   "saveScreenshotSelectedArea": {
     "message": "সংরক্ষণ"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "আপলোড"
+  },
   "saveScreenshotVisibleArea": {
     "message": "যতটুকু দেখা যাচ্ছে সংরক্ষণ করুন"
   },
   "saveScreenshotFullPage": {
     "message": "সম্পূর্ণ পেজ সংরক্ষণ করুন"
   },
   "cancelScreenshot": {
     "message": "বাতিল"
   },
   "downloadScreenshot": {
     "message": "ডাউনলোড"
   },
+  "downloadScreenshotTitle": {
+    "message": "স্ক্রিনশট ডাউনলোড করুন"
+  },
   "downloadOnlyNotice": {
     "message": "আপনি বর্তমানে Download-Only মোডে আছেন।"
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screeenshots স্বয়ংক্রিয়ভাবে Download-Only এ পরিবর্তণ হয় যেসব অবস্থায়:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "ব্যক্তিগত ব্রাউজিং উইন্ডোতে।"
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "অনুলিপি"
   },
+  "copyScreenshotTitle": {
+    "message": "ক্লিপবোর্ডে স্ক্রিনশট অনুলিপি করুন"
+  },
   "notificationImageCopiedTitle": {
     "message": "শট অনুলিপি করা হয়েছে"
   },
   "notificationImageCopiedDetails": {
     "message": "আপনার শট ক্লিপবোর্ডে অনুলিপি করা হয়েছে। প্রতিলেপন করতে $META_KEY$-V চাপুন।",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -97,17 +106,17 @@
   },
   "loginErrorDetails": {
     "message": "আমরা আপনার শট সংরক্ষণ করতে পারিনি কারণ সেখানে Firefox স্ক্রিণশট সেবার সমস্যা আছে। অনুগ্রহ করে আবার চেস্টা করুন।"
   },
   "unshootablePageErrorTitle": {
     "message": "আমার এই পেজের স্ক্রিনশট নিতে পারব না।"
   },
   "unshootablePageErrorDetails": {
-    "message": "এটা কোন আদর্শ ওয়েব পেজ না, তাই আপনি এটার স্ক্রিনশট তুলতে পারবেন না।"
+    "message": "এটা কোন প্রমিত ওয়েব পেজ না, তাই আপনি এটার স্ক্রিনশট তুলতে পারবেন না।"
   },
   "selfScreenshotErrorTitle": {
     "message": "আপনি Firefox স্ক্রিনশটের পেজের শট নিতে পারেন না!"
   },
   "emptySelectionErrorTitle": {
     "message": "আপনি অল্প স্থান নির্বাচন করেছেন"
   },
   "privateWindowErrorTitle": {
@@ -117,42 +126,36 @@
     "message": "অসুবিধার জন্য দুঃখিত। আমরা এই বৈশিষ্ট্যটি নিয়ে কাজ করছি, খুব শীঘ্রই রিলিজ করা হবে।"
   },
   "genericErrorTitle": {
     "message": "আয় হায়! Firefox স্ক্রিনশট পাগল হয়ে গেছে।"
   },
   "genericErrorDetails": {
     "message": "এই মাত্র কি ঘটেছে আমরা নিশ্চিত নই। আপনি কি অনুগ্রহ করে পুরনায় সট নেবেন কিংবা ভিন্ন একটি পেজে চেষ্টা করবেন?"
   },
-  "tourBodyIntro": {
-    "message": "Firefox ত্যাগ করা ছাড়াই স্ক্রিনশট তোল, সংরক্ষণ কর এবং শেয়ার কর।"
+  "tourBodyIntroServerless": {
+    "message": "Firefox থেকে না বের হয়েই স্ক্রিনশট নিন, অনুলিপি এবং ডাউনলোড করুন।"
   },
   "tourHeaderPageAction": {
     "message": "সংরক্ষণ করার এক নতুন পদ্ধতি"
   },
   "tourBodyPageAction": {
     "message": "আপনি যখন কোন স্ক্রিনশট নিবেন, এড্রেস বার থেকে একশন মেনু খুলে নিন।"
   },
   "tourHeaderClickAndDrag": {
     "message": "ক্যাপচার করুন আপনি যা চান"
   },
   "tourBodyClickAndDrag": {
-    "message": "একটি পেজের কিয়দংশ ক্যাপচার করতে ক্লিক করে ড্রাগ করুন। অতঃপর আপনি মাউজ হোভার করে আপনার নির্বাচিত অংশ হাইলাইট করতে পারবেন।"
+    "message": "পাতার কিয়দংশ ক্যাপচার করতে ক্লিক করে ড্রাগ করুন। অতঃপর আপনি মাউস হোভার করে আপনার নির্বাচিত অংশ হাইলাইট করতে পারবেন।"
   },
   "tourHeaderFullPage": {
-    "message": "উইন্ডো ক্যাপচার করুন অথবা পুরো পেজ"
+    "message": "উইন্ডো অথবা সম্পূর্ণ পাতা ক্যাপচার করুন"
   },
   "tourBodyFullPage": {
-    "message": "ইউন্ডোতে দৃশ্যমান অংশ অথবা সম্পূর্ণ পেজ ক্যাপচার করতে উপরে ডানদিকের বাটনগুলো থেকে নির্বাচন করুন।"
-  },
-  "tourHeaderDownloadUpload": {
-    "message": "আপনি যেমন পছন্দ করেন"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "আপনার ক্রপ করা সটসমূহ ওয়েবে রাখুন সহজে শেয়ার করার সুবিধার্থে, অথবা আপনার কম্পিউটারে ডাউনলোড করুন। আপনার সকল সটসমূহ খুঁজে পেতে আমার সটসমূহ বাটনে ক্লিক করুন।"
+    "message": "ইউন্ডোতে দৃশ্যমান অংশ অথবা সম্পূর্ণ পাতা ক্যাপচার করতে উপরে ডানদিকের বাটনগুলো থেকে নির্বাচন করুন।"
   },
   "tourSkip": {
     "message": "এড়িয়ে যান"
   },
   "tourNext": {
     "message": "পরবর্তী স্লাইড"
   },
   "tourPrevious": {
--- a/browser/extensions/screenshots/_locales/br/messages.json
+++ b/browser/extensions/screenshots/_locales/br/messages.json
@@ -12,28 +12,34 @@
     "message": "Ma zapadennoù"
   },
   "screenshotInstructions": {
     "message": "Riklit pe klikit war ar bajenn da ziuzañ ur vaezienn. Pouezit war ESC evit nullañ."
   },
   "saveScreenshotSelectedArea": {
     "message": "Enrollañ"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Pellgas"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Enrollañ ar pezh a vez gwelet"
   },
   "saveScreenshotFullPage": {
     "message": "Enrollañ ar bajenn glok"
   },
   "cancelScreenshot": {
     "message": "Nullañ"
   },
   "downloadScreenshot": {
     "message": "Pellgargañ"
   },
+  "downloadScreenshotTitle": {
+    "message": "Pellgargañ an dapadenn-skramm"
+  },
   "downloadOnlyNotice": {
     "message": "E mod pellgargañ hepken emaoc'h bremañ."
   },
   "downloadOnlyDetails": {
     "message": "Mont a raio Firefox Screenshots e mod pellgargañ hepken en degouezhioù da heul:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "En ur prenestr merdeiñ prevez."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Eilañ"
   },
+  "copyScreenshotTitle": {
+    "message": "Eilañ an dapadenn-skramm er golver"
+  },
   "notificationImageCopiedTitle": {
     "message": "Tapadenn eilet"
   },
   "notificationImageCopiedDetails": {
     "message": "Eilet eo bet ho tapadenn er golver. Pouezit war $META_KEY$-V evit pegañ.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Digarezit evit ar gudenn. Labourat a reomp war ar c'heweriuster-mañ evit ermaeziadennoù da zont."
   },
   "genericErrorTitle": {
     "message": "Chaous! Ur gudenn a zo savet gant Firefox Screenshots."
   },
   "genericErrorDetails": {
     "message": "N'omp ket sur eus ar pezh a zo c'hoarvezet. Gallout a rit adklask pe kemer ur dapadenn eus ur bajenn all."
   },
-  "tourBodyIntro": {
-    "message": "Kemerit, enrollit ha skignit tapadennoù-skramm he kuitaat Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Skeudennit, eilit ha pellgargit tapadennoù-skramm hep kuitaat Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Un doare nevez da enrollañ"
   },
   "tourBodyPageAction": {
     "message": "Kreskiñ lañser gweredoù ar bajenn er varrenn chomlec'h pa fell deoc'h kemer un dapadenn-skramm."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "Klikit ha riklit evit tapout ul lodenn eus ar bajenn hepken. Gallout a rit ivez tremen a-us evit usskediñ an diuzad."
   },
   "tourHeaderFullPage": {
     "message": "Tapit prenestroù pe pajennoù a-bezh"
   },
   "tourBodyFullPage": {
     "message": "Diuzit an afelloù a-us a-zehou evit skeudenniñ ar vaezienn welus er prenestr pe evit skeudenniñ ar bajenn a-bezh."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Evel ma fell deoc'h"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Enrollit ho tapadennoù didroc'het evit ar web evit skignañ aesoc'h, pe pellgargit anezho war ho urzhiataer. Gallout a rit ivez klikañ war an afell Ma zapadennoù evit kavout an holl dapadennoù kemeret ganeoc'h."
-  },
-  "tourHeaderAccounts": {
-    "message": "Tapadennoù da gas ganeoc'h"
-  },
-  "tourBodyAccounts": {
-    "message": "Kennaskit gant ho kont Firefox evit haeziñ ho tapadennoù war ho holl trevnadoù hag enrollañ pennrolloù da viken."
-  },
   "tourSkip": {
     "message": "TREMEN"
   },
   "tourNext": {
     "message": "Treyonenn da-heul"
   },
   "tourPrevious": {
     "message": "Treyonenn gent"
--- a/browser/extensions/screenshots/_locales/ca/messages.json
+++ b/browser/extensions/screenshots/_locales/ca/messages.json
@@ -12,16 +12,19 @@
     "message": "Les meves captures"
   },
   "screenshotInstructions": {
     "message": "Arrossegueu o feu clic a la pàgina per seleccionar una regió. Premeu ESC per cancel·lar."
   },
   "saveScreenshotSelectedArea": {
     "message": "Desa"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Puja"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Captura la part visible"
   },
   "saveScreenshotFullPage": {
     "message": "Captura tota la pàgina"
   },
   "cancelScreenshot": {
     "message": "Cancel·la"
--- a/browser/extensions/screenshots/_locales/cs/messages.json
+++ b/browser/extensions/screenshots/_locales/cs/messages.json
@@ -12,28 +12,34 @@
     "message": "Mé snímky"
   },
   "screenshotInstructions": {
     "message": "Oblast vyberete kliknutím nebo tahem myší. Pro zrušení stiskněte ESC."
   },
   "saveScreenshotSelectedArea": {
     "message": "Uložit"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Nahrát"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Uložit viditelnou oblast"
   },
   "saveScreenshotFullPage": {
     "message": "Uložit celou stránku"
   },
   "cancelScreenshot": {
     "message": "Zrušit"
   },
   "downloadScreenshot": {
     "message": "Stáhnout"
   },
+  "downloadScreenshotTitle": {
+    "message": "Stáhnout snímek"
+  },
   "downloadOnlyNotice": {
     "message": "Nyní jste v režimu pouze ke stažení."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots se automaticky přepne do režimu pouze ke stažení, pokud:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Jste v okně anonymního prohlížení."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopírovat"
   },
+  "copyScreenshotTitle": {
+    "message": "Zkopírovat snímek do schránky"
+  },
   "notificationImageCopiedTitle": {
     "message": "Snímek zkopírován"
   },
   "notificationImageCopiedDetails": {
     "message": "Váš snímek byl zkopírován do schránky. Pro vložení stiskněte $META_KEY$-V.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Omlouváme se za nepříjemnosti. Na této funkci pracujeme pro některé příští vydání."
   },
   "genericErrorTitle": {
     "message": "Jejda! Služba Firefox Screenshots přestala pracovat."
   },
   "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?"
   },
-  "tourBodyIntro": {
-    "message": "Pořizujte, ukládejte a sdílejte snímky webových stránek bez opuštění Firefoxu."
+  "tourBodyIntroServerless": {
+    "message": "Pořizujte, kopírujte a ukládejte snímky webových stránek bez opuštění Firefoxu."
   },
   "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": {
@@ -138,28 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Pořizujte snímky jen částí nebo i celých stránek"
   },
   "tourBodyFullPage": {
     "message": "Pomocí tlačítek vpravo nahoře můžete pořídit snímek jen viditelné části nebo úplně celé stránky."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Jak sami chcete"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Snímky stránek vždy s sebou"
-  },
-  "tourBodyAccounts": {
-    "message": "Pro přístup ke snímkům z jiných zařízení nebo jejich ukládání se prosím přihlaste svým účtem Firefoxu."
-  },
   "tourSkip": {
     "message": "Přeskočit"
   },
   "tourNext": {
     "message": "Další snímek"
   },
   "tourPrevious": {
     "message": "Předchozí snímek"
--- a/browser/extensions/screenshots/_locales/cy/messages.json
+++ b/browser/extensions/screenshots/_locales/cy/messages.json
@@ -12,28 +12,34 @@
     "message": "Fy Lluniau Sgrin"
   },
   "screenshotInstructions": {
     "message": "Llusgwch neu glicio ar y dudalen i ddewis adran. Pwyso ESC i ddiddymu."
   },
   "saveScreenshotSelectedArea": {
     "message": "Cadw"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Llwytho"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Cadw'r gweladwy"
   },
   "saveScreenshotFullPage": {
     "message": "Cadw tudalen lawn"
   },
   "cancelScreenshot": {
     "message": "Diddymu"
   },
   "downloadScreenshot": {
     "message": "Llwytho i Lawr"
   },
+  "downloadScreenshotTitle": {
+    "message": "Llwytho i lawr llun sgrin"
+  },
   "downloadOnlyNotice": {
     "message": "Rydych yn y modd Llwytho i Lawr yn Unig."
   },
   "downloadOnlyDetails": {
     "message": "Mae Firefox Screenshots yn newid yn awtomatig i'r modd Llwytho i Lawr y Unig yn y sefyllfaoedd hyn:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Mewn ffenestr Pori Prefat."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copïo"
   },
+  "copyScreenshotTitle": {
+    "message": "Copïo llun sgrin i'r clipfwrdd"
+  },
   "notificationImageCopiedTitle": {
     "message": "Copïwyd y Llun"
   },
   "notificationImageCopiedDetails": {
     "message": "Mae eich llun wedi ei gopïo i'r clipfwrdd. Pwyswch $META_KEY$-V i'w ludo.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Ymddiheuriadau am yr anhwylustod. Rydym yn gweithio ar y nodwedd hwn ar gyfer fersiynau'r dyfodol."
   },
   "genericErrorTitle": {
     "message": "Www! Mae Firefox Screenshots wedi mynd yn hurt."
   },
   "genericErrorDetails": {
     "message": "Nid ydym yn gwybod beth sydd wedi ddigwydd. Ceisiwch eto neu dynnu llun o dudalen wahanol?"
   },
-  "tourBodyIntro": {
-    "message": "Cymryd, cadw a rhannu lluniau sgrin heb adael Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Cymryd, cadw a llwytho i lawr lluniau sgrin heb adael Firefox."
   },
   "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": {
@@ -138,28 +147,16 @@
     "message": "Cliciwch a llusgo i gipio rhan o dudalen. Gallwch hofran i amlygu eich dewis."
   },
   "tourHeaderFullPage": {
     "message": "Cipio Ffenestri neu Dudalennau Cyfan"
   },
   "tourBodyFullPage": {
     "message": "Dewiswch y botymau ar y dde uchod i gipio ardal gweladwy mewn ffenestr neu i gipio tudalen gyfan."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Yn Ôl eich Dewis"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Lluniau i Fynd"
-  },
-  "tourBodyAccounts": {
-    "message": "Mewngofnodwch gyda'ch Cyfrif Firefox i gael mynediad i'ch lluniau ar eich holl ddyfeisiau a chadw eich hoff luniau am byth."
-  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "Sleid Nesaf"
   },
   "tourPrevious": {
     "message": "Sleid Flaenorol"
--- a/browser/extensions/screenshots/_locales/da/messages.json
+++ b/browser/extensions/screenshots/_locales/da/messages.json
@@ -12,28 +12,34 @@
     "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"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Upload"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Gem synligt område"
   },
   "saveScreenshotFullPage": {
     "message": "Gem hele siden"
   },
   "cancelScreenshot": {
     "message": "Fortryd"
   },
   "downloadScreenshot": {
     "message": "Hent"
   },
+  "downloadScreenshotTitle": {
+    "message": "Hent skærmbillede"
+  },
   "downloadOnlyNotice": {
     "message": "Du kan i øjeblikket kun hente skærmbilleder."
   },
   "downloadOnlyDetails": {
     "message": "I følgende situationer lader Firefox Screenshots dig kun hente skærmbilleder:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "I et privat browsing-vindue."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopier"
   },
+  "copyScreenshotTitle": {
+    "message": "Kopier skærmbillede til udklipsholder"
+  },
   "notificationImageCopiedTitle": {
     "message": "Skærmbillede kopieret"
   },
   "notificationImageCopiedDetails": {
     "message": "Dit skærmbillede er blevet kopieret til udklipsholderen. Tryk $META_KEY$-V for at indsætte.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Vi beklager ulejligheden. Vi arbejder på at få funktionen til at virke i fremtidige udgivelser."
   },
   "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?"
   },
-  "tourBodyIntro": {
-    "message": "Tag, gem og del skærmbilleder uden at forlade Firefox. "
+  "tourBodyIntroServerless": {
+    "message": "Tag, kopier og hent skærmbilleder uden af forlade Firefox."
   },
   "tourHeaderPageAction": {
     "message": "En ny måde at gemme på"
   },
   "tourBodyPageAction": {
     "message": "Klik på Sidehandlinger i adressefeltet, når du vil tage et skærmbillede."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Tag skærmbilleder af vinduer eller hele sider."
   },
   "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."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Som du vil have det."
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Skærmbilleder på farten"
-  },
-  "tourBodyAccounts": {
-    "message": "Log ind med din Firefox-konto for at få adgang til dine skærmbilleder på alle dine enheder, og gem dine favoritter for evigt."
-  },
   "tourSkip": {
     "message": "SPRING OVER"
   },
   "tourNext": {
     "message": "Næste side"
   },
   "tourPrevious": {
     "message": "Forrige side"
--- a/browser/extensions/screenshots/_locales/de/messages.json
+++ b/browser/extensions/screenshots/_locales/de/messages.json
@@ -12,28 +12,34 @@
     "message": "Meine Bildschirmfotos"
   },
   "screenshotInstructions": {
     "message": "Ziehen oder klicken Sie auf der Seite, um einen Bereich auszuwählen. Drücken Sie ESC zum Abbrechen."
   },
   "saveScreenshotSelectedArea": {
     "message": "Speichern"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Hochladen"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Sichtbaren Bereich speichern"
   },
   "saveScreenshotFullPage": {
     "message": "Gesamte Seite speichern"
   },
   "cancelScreenshot": {
     "message": "Abbrechen"
   },
   "downloadScreenshot": {
     "message": "Herunterladen"
   },
+  "downloadScreenshotTitle": {
+    "message": "Bildschirmfoto herunterladen"
+  },
   "downloadOnlyNotice": {
     "message": "Sie sind aktuell im Modus „Nur herunterladen“."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots schaltet in diesen Fällen automatisch in den Modus „Nur herunterladen“:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "In einem privaten Fenster."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopieren"
   },
+  "copyScreenshotTitle": {
+    "message": "Bildschirmfoto in Zwischenablage kopieren"
+  },
   "notificationImageCopiedTitle": {
     "message": "Bildschirmfoto kopiert"
   },
   "notificationImageCopiedDetails": {
     "message": "Ihr Bildschirmfoto wurde in die Zwischenablage kopiert. Drücken Sie Strg-V zum Einfügen.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Wir bitten um Entschuldigung für diese Unannehmlichkeiten. Wir arbeiten daran, diese Funktion in zukünftigen Versionen zur Verfügung zu stellen."
   },
   "genericErrorTitle": {
     "message": "Firefox Screenshots funktioniert nicht richtig."
   },
   "genericErrorDetails": {
     "message": "Wir wissen auch nicht, was gerade passiert ist. Könnten Sie das Bildschirmfoto erneut oder auf einer anderen Seite aufnehmen?"
   },
-  "tourBodyIntro": {
-    "message": "Bildschirmfotos aufnehmen, speichern und teilen, ohne Firefox zu verlassen."
+  "tourBodyIntroServerless": {
+    "message": "Bildschirmfotos aufnehmen, kopieren und herunterladen, ohne Firefox zu verlassen."
   },
   "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": {
@@ -138,28 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Fenster oder ganze Seiten speichern"
   },
   "tourBodyFullPage": {
     "message": "Nutzen Sie die Schaltflächen rechts oben, um den sichtbaren Bereich im Fenster oder eine ganze Seite zu speichern."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Wie Sie möchten"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Screenshots zum Mitnehmen"
-  },
-  "tourBodyAccounts": {
-    "message": "Melden Sie sich mit Ihrem Firefox-Konto an, um auf all Ihren Geräten auf Ihre Bildschirmfotos zuzugreifen und Ihre Favoriten dauerhaft zu speichern."
-  },
   "tourSkip": {
     "message": "Überspringen"
   },
   "tourNext": {
     "message": "Nächste Folie"
   },
   "tourPrevious": {
     "message": "Vorherige Folie"
--- a/browser/extensions/screenshots/_locales/dsb/messages.json
+++ b/browser/extensions/screenshots/_locales/dsb/messages.json
@@ -12,28 +12,34 @@
     "message": "Móje fota wobrazowki"
   },
   "screenshotInstructions": {
     "message": "Śěgniśo abo klikniśo na bok, aby wobcerk wubrał. Tłocćo na ESC, aby pśetergnuł."
   },
   "saveScreenshotSelectedArea": {
     "message": "Składowaś"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Nagraś"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Widobny wobcerk składowaś"
   },
   "saveScreenshotFullPage": {
     "message": "Ceły bok składowaś"
   },
   "cancelScreenshot": {
     "message": "Pśetergnuś"
   },
   "downloadScreenshot": {
     "message": "Ześěgnuś"
   },
+  "downloadScreenshotTitle": {
+    "message": "Foto wobrazowki ześěgnuś"
+  },
   "downloadOnlyNotice": {
     "message": "Tuchylu sćo w modusu „Jano ześěgnuś“."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots w slědujucych situacijach awtomatiski do modusa „Jano ześěgnuś“ pśešaltujo:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "W priwatnem woknje."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopěrowaś"
   },
+  "copyScreenshotTitle": {
+    "message": "Foto wobrazowki do mjazywótkłada kopěrowaś"
+  },
   "notificationImageCopiedTitle": {
     "message": "Foto kopěrowane"
   },
   "notificationImageCopiedDetails": {
     "message": "Wašo foto jo se do mjezywótkłada kopěrowało. Tłocćo $META_KEY$-V, aby jo zasajźił.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Wódajśo pšosym wobuznosći. Źěłamy na toś tej funkciji za pśichodne wersije."
   },
   "genericErrorTitle": {
     "message": "Hopla! Firefox Screenshots njeźěła."
   },
   "genericErrorDetails": {
     "message": "Njejsmy se wěste, což jo se stało. Cośo hyšći raz wopytaś abo cośo drugi bok fotografěrowaś?"
   },
-  "tourBodyIntro": {
-    "message": "Gótujśo, składujśo a źělśo fota wobrazowki mimo až Firefox spušćaśo."
+  "tourBodyIntroServerless": {
+    "message": "Napórajśo, kopěrujćśo a ześěgniśo fota wobrazowki, mimo aby Firefox spušćił."
   },
   "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": {
@@ -138,28 +147,16 @@
     "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ł."
   },
   "tourHeaderFullPage": {
     "message": "Wokna abo cełe boki składowaś"
   },
   "tourBodyFullPage": {
     "message": "Wubjeŕśo tłocašk górjejce napšawo, aby widobny wobcerk we woknje abo ceły bok fotografěrowaś."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Tak, kaž se wam spódoba"
-  },
-  "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ł."
-  },
-  "tourHeaderAccounts": {
-    "message": "Fota wobrazowki za drogu"
-  },
-  "tourBodyAccounts": {
-    "message": "Pśizjawśo se pla swójogo konta Firefox, aby pśistup k swójim fotam wobrazowki na wšych wašych rědach měł a składujśo swóje nejlubše fota wobrazowki na pśecej."
-  },
   "tourSkip": {
     "message": "Pśeskócyś"
   },
   "tourNext": {
     "message": "Pśiduce foto"
   },
   "tourPrevious": {
     "message": "Pjerwjejšne foto"
--- a/browser/extensions/screenshots/_locales/el/messages.json
+++ b/browser/extensions/screenshots/_locales/el/messages.json
@@ -12,28 +12,34 @@
     "message": "Οι λήψεις μου"
   },
   "screenshotInstructions": {
     "message": "Σύρετε ή κάντε κλικ στη σελίδα για να επιλέξετε μια περιοχή. Για ακύρωση πιέστε το πλήκτρο ESC."
   },
   "saveScreenshotSelectedArea": {
     "message": "Αποθήκευση"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Μεταφόρτωση"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Αποθήκευση ορατής περιοχής"
   },
   "saveScreenshotFullPage": {
     "message": "Αποθήκευση ολόκληρης σελίδας"
   },
   "cancelScreenshot": {
     "message": "Ακύρωση"
   },
   "downloadScreenshot": {
     "message": "Λήψη"
   },
+  "downloadScreenshotTitle": {
+    "message": "Λήψη στιγμιότυπου"
+  },
   "downloadOnlyNotice": {
     "message": "Αυτή τη στιγμή βρίσκεστε σε λειτουργία \"Μόνο-λήψη\"."
   },
   "downloadOnlyDetails": {
     "message": "Το Firefox Screenshots αλλάζει αυτόματα σε λειτουργία \"Μόνο-λήψη\" σε αυτές τις περιπτώσεις:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Σε ένα παράθυρο ιδιωτικής περιήγησης."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Αντιγραφή"
   },
+  "copyScreenshotTitle": {
+    "message": "Αντιγραφή στιγμιότυπου στο πρόχειρο"
+  },
   "notificationImageCopiedTitle": {
     "message": "Το στιγμιότυπο αντιγράφηκε"
   },
   "notificationImageCopiedDetails": {
     "message": "Το στιγμιότυπο έχει αντιγραφεί στο πρόχειρο. Πατήστε $META_KEY$-V για επικόλληση.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Λυπούμαστε για την ταλαιπωρία. Εργαζόμαστε πάνω σε αυτό το χαρακτηριστικό για μελλοντικές εκδόσεις."
   },
   "genericErrorTitle": {
     "message": "Ωχ! Κάτι πήγε στραβά στην υπηρεσία Firefox Screenshots."
   },
   "genericErrorDetails": {
     "message": "Δεν είμαστε σίγουροι για το τι ακριβώς συνέβη. Προσπαθήστε ξανά ή κάντε λήψη σε μια άλλη σελίδα."
   },
-  "tourBodyIntro": {
-    "message": "Λήψη, αποθήκευση και διαμοιρασμός στιγμιοτύπων μέσα από το Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Δημιουργία, αντιγραφή και λήψη στιγμιότυπων μέσα από το Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Ένας νέος τρόπος αποθήκευσης"
   },
   "tourBodyPageAction": {
     "message": "Αναπτύξτε το μενού ενεργειών σελίδας στη γραμμή διευθύνσεων όποτε θέλετε να κάνετε λήψη στιγμιότυπου."
   },
   "tourHeaderClickAndDrag": {
@@ -138,22 +147,16 @@
     "message": "Κάντε κλικ και σύρετε για την καταγραφή ενός τμήματος της σελίδας. Μπορείτε να επισημάνετε την επιλογή σας μετακινώντας τον ποντίκι σας επάνω της."
   },
   "tourHeaderFullPage": {
     "message": "Λήψη παραθύρων ή ολόκληρων σελίδων"
   },
   "tourBodyFullPage": {
     "message": "Επιλέξτε τα κουμπιά επάνω δεξιά για να καταγράψετε την ορατή περιοχή του παραθύρου ή να καταγράψετε μια ολόκληρη σελίδα."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Ακριβώς όπως το θέλετε"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Αποθηκεύστε της λήψεις σας στο Διαδίκτυο για ευκολότερο διαμοιρασμό, η λήψη τους στον υπολογιστή σας. Μπορείτε να βρείτε όλες τις λήψεις σας πατώντας στο κουμπί «Οι λήψεις μου»."
-  },
   "tourSkip": {
     "message": "Παράβλεψη"
   },
   "tourNext": {
     "message": "Επόμενη διαφάνεια"
   },
   "tourPrevious": {
     "message": "Προηγούμενη διαφάνεια"
deleted file mode 100644
--- a/browser/extensions/screenshots/_locales/en_CA/messages.json
+++ /dev/null
@@ -1,190 +0,0 @@
-{
-  "addonDescription": {
-    "message": "Take clips and screenshots from the Web and save them temporarily or permanently."
-  },
-  "addonAuthorsList": {
-    "message": "Mozilla <screenshots-feedback@mozilla.com>"
-  },
-  "contextMenuLabel": {
-    "message": "Take a Screenshot"
-  },
-  "myShotsLink": {
-    "message": "My Shots"
-  },
-  "screenshotInstructions": {
-    "message": "Drag or click on the page to select a region. Press ESC to cancel."
-  },
-  "saveScreenshotSelectedArea": {
-    "message": "Save"
-  },
-  "saveScreenshotVisibleArea": {
-    "message": "Save visible"
-  },
-  "saveScreenshotFullPage": {
-    "message": "Save full page"
-  },
-  "cancelScreenshot": {
-    "message": "Cancel"
-  },
-  "downloadScreenshot": {
-    "message": "Download"
-  },
-  "downloadOnlyNotice": {
-    "message": "You are currently in Download-Only mode."
-  },
-  "downloadOnlyDetails": {
-    "message": "Firefox Screenshots automatically changes to Download-Only mode in these situations:"
-  },
-  "downloadOnlyDetailsPrivate": {
-    "message": "In a Private Browsing window."
-  },
-  "downloadOnlyDetailsThirdParty": {
-    "message": "Third-party cookies are disabled."
-  },
-  "downloadOnlyDetailsNeverRemember": {
-    "message": "“Never remember history” is enabled."
-  },
-  "downloadOnlyDetailsESR": {
-    "message": "You are using Firefox ESR."
-  },
-  "downloadOnlyDetailsNoUploadPref": {
-    "message": "Uploads have been disabled."
-  },
-  "notificationLinkCopiedTitle": {
-    "message": "Link Copied"
-  },
-  "notificationLinkCopiedDetails": {
-    "message": "The link to your shot has been copied to the clipboard. Press $META_KEY$-V to paste.",
-    "placeholders": {
-      "meta_key": {
-        "content": "$1"
-      }
-    }
-  },
-  "copyScreenshot": {
-    "message": "Copy"
-  },
-  "notificationImageCopiedTitle": {
-    "message": "Shot Copied"
-  },
-  "notificationImageCopiedDetails": {
-    "message": "Your shot has been copied to the clipboard. Press $META_KEY$-V to paste.",
-    "placeholders": {
-      "meta_key": {
-        "content": "$1"
-      }
-    }
-  },
-  "imageCropPopupWarning": {
-    "message": "Saved image will be cropped to $PIXELS$px in height.",
-    "placeholders": {
-      "pixels": {
-        "content": "$1"
-      }
-    }
-  },
-  "requestErrorTitle": {
-    "message": "Out of order."
-  },
-  "requestErrorDetails": {
-    "message": "Sorry! We couldn’t save your shot. Please try again later."
-  },
-  "connectionErrorTitle": {
-    "message": "We can’t connect to your screenshots."
-  },
-  "connectionErrorDetails": {
-    "message": "Please check your Internet connection. If you are able to connect to the Internet, there may be a temporary problem with the Firefox Screenshots service."
-  },
-  "loginErrorDetails": {
-    "message": "We couldn’t save your shot because there is a problem with the Firefox Screenshots service. Please try again later."
-  },
-  "unshootablePageErrorTitle": {
-    "message": "We can’t screenshot this page."
-  },
-  "unshootablePageErrorDetails": {
-    "message": "This isn’t a standard Web page, so you can’t take a screenshot of it."
-  },
-  "selfScreenshotErrorTitle": {
-    "message": "You can’t take a shot of a Firefox Screenshots page!"
-  },
-  "emptySelectionErrorTitle": {
-    "message": "Your selection is too small"
-  },
-  "privateWindowErrorTitle": {
-    "message": "Screenshots is disabled in Private Browsing Mode"
-  },
-  "privateWindowErrorDetails": {
-    "message": "Sorry for the inconvenience. We are working on this feature for future releases."
-  },
-  "genericErrorTitle": {
-    "message": "Whoa! Firefox Screenshots went haywire."
-  },
-  "genericErrorDetails": {
-    "message": "We’re not sure what just happened. Care to try again or take a shot of a different page?"
-  },
-  "tourBodyIntro": {
-    "message": "Take, save, and share screenshots without leaving Firefox."
-  },
-  "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"
-  },
-  "tourBodyClickAndDrag": {
-    "message": "Click and drag to capture just a portion of a page. You can also hover to highlight your selection."
-  },
-  "tourHeaderFullPage": {
-    "message": "Capture Windows or Entire Pages"
-  },
-  "tourBodyFullPage": {
-    "message": "Select the buttons in the upper right to capture the visible area in the window or to capture an entire page."
-  },
-  "tourHeaderDownloadUpload": {
-    "message": "As You Like It"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Screenshots to Go"
-  },
-  "tourBodyAccounts": {
-    "message": "Sign in with your Firefox Account to access your shots on all of your devices and save your favourite shots forever."
-  },
-  "tourSkip": {
-    "message": "SKIP"
-  },
-  "tourNext": {
-    "message": "Next Slide"
-  },
-  "tourPrevious": {
-    "message": "Previous Slide"
-  },
-  "tourDone": {
-    "message": "Done"
-  },
-  "termsAndPrivacyNotice2": {
-    "message": "By using Firefox Screenshots, you agree to our $TERMSANDPRIVACYNOTICETERMSLINK$ and $TERMSANDPRIVACYNOTICEPRIVACYLINK$.",
-    "placeholders": {
-      "termsandprivacynoticetermslink": {
-        "content": "$1"
-      },
-      "termsandprivacynoticeprivacylink": {
-        "content": "$2"
-      }
-    }
-  },
-  "termsAndPrivacyNoticeTermsLink": {
-    "message": "Terms"
-  },
-  "termsAndPrivacyNoticyPrivacyLink": {
-    "message": "Privacy Notice"
-  },
-  "libraryLabel": {
-    "message": "Screenshots"
-  }
-}
\ No newline at end of file
--- a/browser/extensions/screenshots/_locales/en_GB/messages.json
+++ b/browser/extensions/screenshots/_locales/en_GB/messages.json
@@ -12,16 +12,19 @@
     "message": "My Shots"
   },
   "screenshotInstructions": {
     "message": "Drag or click on the page to select a region. Press ESC to cancel."
   },
   "saveScreenshotSelectedArea": {
     "message": "Save"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Upload"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Save visible"
   },
   "saveScreenshotFullPage": {
     "message": "Save full page"
   },
   "cancelScreenshot": {
     "message": "Cancel"
@@ -39,16 +42,22 @@
     "message": "In a Private Browsing window."
   },
   "downloadOnlyDetailsThirdParty": {
     "message": "Third-party cookies are disabled."
   },
   "downloadOnlyDetailsNeverRemember": {
     "message": "“Never remember history” is enabled."
   },
+  "downloadOnlyDetailsESR": {
+    "message": "You are using Firefox ESR."
+  },
+  "downloadOnlyDetailsNoUploadPref": {
+    "message": "Uploads have been disabled."
+  },
   "notificationLinkCopiedTitle": {
     "message": "Link Copied"
   },
   "notificationLinkCopiedDetails": {
     "message": "The link to your shot has been copied to the clipboard. Press $META_KEY$-V to paste.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -64,18 +73,23 @@
   "notificationImageCopiedDetails": {
     "message": "Your shot has been copied to the clipboard. Press $META_KEY$-V to paste.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
-  "imageCroppedWarning": {
-    "message": "This image has been cropped to {pixels}px."
+  "imageCropPopupWarning": {
+    "message": "Saved image will be cropped to $PIXELS$px in height.",
+    "placeholders": {
+      "pixels": {
+        "content": "$1"
+      }
+    }
   },
   "requestErrorTitle": {
     "message": "Out of order."
   },
   "requestErrorDetails": {
     "message": "Sorry! We couldn’t save your shot. Please try again later."
   },
   "connectionErrorTitle": {
@@ -133,16 +147,22 @@
     "message": "Select the buttons in the upper right to capture the visible area in the window or to capture an entire page."
   },
   "tourHeaderDownloadUpload": {
     "message": "As You Like It"
   },
   "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."
   },
+  "tourHeaderAccounts": {
+    "message": "Screenshots to Go"
+  },
+  "tourBodyAccounts": {
+    "message": "Sign in with your Firefox Account to access your shots on all of your devices and save your favourite shots forever."
+  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "Next Slide"
   },
   "tourPrevious": {
     "message": "Previous Slide"
--- a/browser/extensions/screenshots/_locales/en_US/messages.json
+++ b/browser/extensions/screenshots/_locales/en_US/messages.json
@@ -12,28 +12,34 @@
     "message": "My Shots"
   },
   "screenshotInstructions": {
     "message": "Drag or click on the page to select a region. Press ESC to cancel."
   },
   "saveScreenshotSelectedArea": {
     "message": "Save"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Upload"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Save visible"
   },
   "saveScreenshotFullPage": {
     "message": "Save full page"
   },
   "cancelScreenshot": {
     "message": "Cancel"
   },
   "downloadScreenshot": {
     "message": "Download"
   },
+  "downloadScreenshotTitle": {
+    "message": "Download screenshot"
+  },
   "downloadOnlyNotice": {
     "message": "You are currently in Download-Only mode."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots automatically changes to Download-Only mode in these situations:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "In a Private Browsing window."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copy"
   },
+  "copyScreenshotTitle": {
+    "message": "Copy screenshot to clipboard"
+  },
   "notificationImageCopiedTitle": {
     "message": "Shot Copied"
   },
   "notificationImageCopiedDetails": {
     "message": "Your shot has been copied to the clipboard. Press $META_KEY$-V to paste.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Sorry for the inconvenience. We are working on this feature for future releases."
   },
   "genericErrorTitle": {
     "message": "Whoa! Firefox Screenshots went haywire."
   },
   "genericErrorDetails": {
     "message": "We’re not sure what just happened. Care to try again or take a shot of a different page?"
   },
-  "tourBodyIntro": {
-    "message": "Take, save, and share screenshots without leaving Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Take, copy, and download screenshots without leaving Firefox."
   },
   "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": {
@@ -138,28 +147,16 @@
     "message": "Click and drag to capture just a portion of a page. You can also hover to highlight your selection."
   },
   "tourHeaderFullPage": {
     "message": "Capture Windows or Entire Pages"
   },
   "tourBodyFullPage": {
     "message": "Select the buttons in the upper right to capture the visible area in the window or to capture an entire page."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "As You Like It"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Screenshots to Go"
-  },
-  "tourBodyAccounts": {
-    "message": "Sign in with your Firefox Account to access your shots on all of your devices and save your favorite shots forever."
-  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "Next Slide"
   },
   "tourPrevious": {
     "message": "Previous Slide"
--- a/browser/extensions/screenshots/_locales/eo/messages.json
+++ b/browser/extensions/screenshots/_locales/eo/messages.json
@@ -12,28 +12,34 @@
     "message": "Miaj ekrankopioj"
   },
   "screenshotInstructions": {
     "message": "Trenu aŭ alklaku sur la paĝo por elekti areon. Premu ESK por nuligi."
   },
   "saveScreenshotSelectedArea": {
     "message": "Konservi"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Alŝuti"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Konservi tion, kio videblas"
   },
   "saveScreenshotFullPage": {
     "message": "Konservi tutan paĝon"
   },
   "cancelScreenshot": {
     "message": "Nuligi"
   },
   "downloadScreenshot": {
     "message": "Elŝuti"
   },
+  "downloadScreenshotTitle": {
+    "message": "Elŝuti ekrankopion"
+  },
   "downloadOnlyNotice": {
     "message": "Vi estas nun en la reĝimo \"Nur elŝutoj\"."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots aŭtomate transiras al reĝimo \"Nur elŝutoj\" en la jenaj situacioj:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "en fenestro de privata retumo"
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopii"
   },
+  "copyScreenshotTitle": {
+    "message": "Kopii ekrankopion al tondujo"
+  },
   "notificationImageCopiedTitle": {
     "message": "Ekrankopio kopiita"
   },
   "notificationImageCopiedDetails": {
     "message": "Via ekrankopio estis kopiita al la tondujo. Premu $META_KEY$-V por alglui.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Bonvolu pardoni la ĝenon. Ni prilaboras tiun ĉi trajton por venontaj eldonoj."
   },
   "genericErrorTitle": {
     "message": "Ŭoo! Firefox Screenshots tute frenezis."
   },
   "genericErrorDetails": {
     "message": "Ni ne tro certas, kio ĵus okazis. Ĉu vi povus klopodi denove aŭ fari ekrankopion de alia paĝo?"
   },
-  "tourBodyIntro": {
-    "message": "Faru, konservu kaj dividu ekrankopiojn sen forlasi Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Fari, kopii kaj elŝuti ekrankopiojn sen forlasi Firefox."
   },
   "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": {
@@ -138,22 +147,16 @@
     "message": "Alklaku kaj trenu por kopii nur parton de paĝo. Vi povas ankaŭ ŝvebi por elstarigi vian elekton."
   },
   "tourHeaderFullPage": {
     "message": "Kapti fenestrojn aŭ tutaj paĝojn"
   },
   "tourBodyFullPage": {
     "message": "Elektu la butonojn supre kaj dekstre por kapti la videblan areon en la fenestro aŭ por kapti tutan paĝon."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Kiel vi volas"
-  },
-  "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": {
     "message": "Pretersalti"
   },
   "tourNext": {
     "message": "Venonta ekrano"
   },
   "tourPrevious": {
     "message": "Antaŭa ekrano"
--- a/browser/extensions/screenshots/_locales/es_AR/messages.json
+++ b/browser/extensions/screenshots/_locales/es_AR/messages.json
@@ -12,28 +12,34 @@
     "message": "Mis capturas"
   },
   "screenshotInstructions": {
     "message": "Arrastrá o hacé clic en la página para seleccionar una región. Presioná ESC para cancelar."
   },
   "saveScreenshotSelectedArea": {
     "message": "Guardar"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Subir"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Guardar visible"
   },
   "saveScreenshotFullPage": {
     "message": "Guardar página completa"
   },
   "cancelScreenshot": {
     "message": "Cancelar"
   },
   "downloadScreenshot": {
     "message": "Descargar"
   },
+  "downloadScreenshotTitle": {
+    "message": "Descargar la captura de pantalla"
+  },
   "downloadOnlyNotice": {
     "message": "Estás actualmente en modo solo descargas."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots cambia automáticamente al modo solo descargas en estas situaciones:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "En una ventana de navegación privada."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copiar"
   },
+  "copyScreenshotTitle": {
+    "message": "Copiar la captura de pantalla al portapapeles"
+  },
   "notificationImageCopiedTitle": {
     "message": "Captura copiada"
   },
   "notificationImageCopiedDetails": {
     "message": "Tu captura ha sido copiada al portapapeles. Presioná $META_KEY$-V para pegar.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Lamentamos el inconveniente. Estamos trabajando en esta característica para versiones futuras."
   },
   "genericErrorTitle": {
     "message": "¡Apa! Firefox Screenshots se volvió loco."
   },
   "genericErrorDetails": {
     "message": "No estamos seguros de lo que pasó. ¿Querés intenar de nuevo o tomar una captura de una página diferente?"
   },
-  "tourBodyIntro": {
-    "message": "Hacer, guardar y compartir capturas de pantalla sin dejar Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Sacar, copiar y descargar capturas de pantalla sin dejar Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Una nueva forma de guardar"
   },
   "tourBodyPageAction": {
     "message": "Expandí el menú de acciones de página en la barra de direcciones cuando quieras tomar una captura."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Capturar ventanas o páginas enteras"
   },
   "tourBodyFullPage": {
     "message": "Seleccioná los botones arriba a la derecha para capturar el área visible en la ventana o la página completa."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Como te guste"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Screenshots siempre con vos"
-  },
-  "tourBodyAccounts": {
-    "message": "Iniciá sesión con tu cuenta de Firefox para acceder a tus fotos en todos los dispositivos y guardar tus fotos favoritas para siempre."
-  },
   "tourSkip": {
     "message": "SALTEAR"
   },
   "tourNext": {
     "message": "Próxima diapositiva"
   },
   "tourPrevious": {
     "message": "Diapositiva anterior"
--- a/browser/extensions/screenshots/_locales/es_CL/messages.json
+++ b/browser/extensions/screenshots/_locales/es_CL/messages.json
@@ -12,28 +12,34 @@
     "message": "Mis capturas"
   },
   "screenshotInstructions": {
     "message": "Arrastra o haz clic en la página para seleccionar una región. Presiona ESC para cancelar."
   },
   "saveScreenshotSelectedArea": {
     "message": "Guardar"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Subir"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Guardar lo visible"
   },
   "saveScreenshotFullPage": {
     "message": "Guardar la página completa"
   },
   "cancelScreenshot": {
     "message": "Cancelar"
   },
   "downloadScreenshot": {
     "message": "Descargar"
   },
+  "downloadScreenshotTitle": {
+    "message": "Descargar captura de pantalla"
+  },
   "downloadOnlyNotice": {
     "message": "Actualmente estás en el modo de solo descarga."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots cambia automáticamente al modo de solo descarga en estas situaciones:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "En una ventana de navegación privada."
@@ -117,19 +123,16 @@
     "message": "Disculpa las molestias. Estamos trabajando en esta función para una futura versión."
   },
   "genericErrorTitle": {
     "message": "¡Guau! Firefox Screenshots se copetió."
   },
   "genericErrorDetails": {
     "message": "No estamos seguros de lo que sucedió. ¿Te importaría volver a intentarlo o tomar una captura de una página diferente?"
   },
-  "tourBodyIntro": {
-    "message": "Toma, guarda y comparte capturas sin salir de Firefox."
-  },
   "tourHeaderPageAction": {
     "message": "Una nueva forma de guardar"
   },
   "tourBodyPageAction": {
     "message": "Expande el menú de acciones de página en la barra de direcciones en cualquier momento en que quieras tomar una captura."
   },
   "tourHeaderClickAndDrag": {
     "message": "Captura lo que necesitas"
@@ -138,28 +141,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Captura ventanas o páginas completas"
   },
   "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."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Como tu quieras"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Screenshots en todas partes"
-  },
-  "tourBodyAccounts": {
-    "message": "Conéctate con tu cuenta de Firefox para acceder a tus capturas en todos tus dispositivos y guardar tus favoritas para siempre."
-  },
   "tourSkip": {
     "message": "SALTAR"
   },
   "tourNext": {
     "message": "Siguiente diapositiva"
   },
   "tourPrevious": {
     "message": "Diapositiva anterior"
--- a/browser/extensions/screenshots/_locales/es_ES/messages.json
+++ b/browser/extensions/screenshots/_locales/es_ES/messages.json
@@ -12,28 +12,34 @@
     "message": "Mis capturas"
   },
   "screenshotInstructions": {
     "message": "Arrastra o haz clic en la página para seleccionar una región. Pulsa ESC para cancelar."
   },
   "saveScreenshotSelectedArea": {
     "message": "Guardar"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Enviar"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Guardar visible"
   },
   "saveScreenshotFullPage": {
     "message": "Guardar página completa"
   },
   "cancelScreenshot": {
     "message": "Cancelar"
   },
   "downloadScreenshot": {
     "message": "Descargar"
   },
+  "downloadScreenshotTitle": {
+    "message": "Descargar captura de pantalla"
+  },
   "downloadOnlyNotice": {
     "message": "Estás en modo Solo descargas."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots se cambia automáticamente al modo Solo descargas en los siguientes casos:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Durante la navegación privada."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copiar"
   },
+  "copyScreenshotTitle": {
+    "message": "Copiar la captura de pantalla al portapapeles"
+  },
   "notificationImageCopiedTitle": {
     "message": "Captura copiada"
   },
   "notificationImageCopiedDetails": {
     "message": "Tu captura ha ido copiada al portapapeles. Presiona $META_KEY$-V para pegar.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Sentimos las molestias. Estamos trabajando en esta característica para próximos lanzamientos."
   },
   "genericErrorTitle": {
     "message": "¡Vaya! Firefox Screenshots se ha vuelto loco."
   },
   "genericErrorDetails": {
     "message": "No estamos seguros de lo que acaba de pasar. ¿Te importa volver a intentarlo o hacer una captura de otra página?"
   },
-  "tourBodyIntro": {
-    "message": "Hacer, guardar y compartir capturas de pantalla sin salir de Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Haz, copia y descarga capturas de pantalla sin salir de Firefox."
   },
   "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": {
@@ -138,22 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Haz capturas de ventanas o de páginas completas"
   },
   "tourBodyFullPage": {
     "message": "Selecciona los botones de la parte superior derecha para capturar el área visible en la ventana o en la página completa."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Como más te guste"
-  },
-  "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": {
     "message": "Saltar"
   },
   "tourNext": {
     "message": "Diapositiva siguiente"
   },
   "tourPrevious": {
     "message": "Diapositiva anterior"
--- a/browser/extensions/screenshots/_locales/es_MX/messages.json
+++ b/browser/extensions/screenshots/_locales/es_MX/messages.json
@@ -12,16 +12,19 @@
     "message": "Mis capturas"
   },
   "screenshotInstructions": {
     "message": "Arrastra o haz clic en la página para seleccionar la región. Presiona ESC para cancelar."
   },
   "saveScreenshotSelectedArea": {
     "message": "Guardar"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Cargar"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Guardar visible"
   },
   "saveScreenshotFullPage": {
     "message": "Guardar página completa"
   },
   "cancelScreenshot": {
     "message": "Cancelar"
@@ -145,17 +148,17 @@
   },
   "tourHeaderDownloadUpload": {
     "message": "Como te gusta"
   },
   "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."
   },
   "tourHeaderAccounts": {
-    "message": "Screenshots to Go"
+    "message": "Capturas en todos los dispositivos"
   },
   "tourBodyAccounts": {
     "message": "Inicia sesión con tu cuenta de Firefox para acceder a tus capturas en todos tus dispositivos y guarda tus capturas favoritas para siempre."
   },
   "tourSkip": {
     "message": "Ignorar"
   },
   "tourNext": {
--- a/browser/extensions/screenshots/_locales/et/messages.json
+++ b/browser/extensions/screenshots/_locales/et/messages.json
@@ -12,16 +12,19 @@
     "message": "Minu pildid"
   },
   "screenshotInstructions": {
     "message": "Ala valimiseks klõpsavõi lohista lehel. Tühistamiseks vajuta ESC."
   },
   "saveScreenshotSelectedArea": {
     "message": "Salvesta"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Laadi üles"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Salvesta nähtav"
   },
   "saveScreenshotFullPage": {
     "message": "Salvesta terve leht"
   },
   "cancelScreenshot": {
     "message": "Tühista"
--- a/browser/extensions/screenshots/_locales/fa/messages.json
+++ b/browser/extensions/screenshots/_locales/fa/messages.json
@@ -12,16 +12,19 @@
     "message": "عکس‌های من"
   },
   "screenshotInstructions": {
     "message": "با کشیدن یا کلیک کردن روی صفحه یک منطقه را انتخاب کنید. برای لغو، ESC را فشار دهید."
   },
   "saveScreenshotSelectedArea": {
     "message": "ذخیره"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "بارگذاری"
+  },
   "saveScreenshotVisibleArea": {
     "message": "ذخیره ناحیه قابل مشاهده"
   },
   "saveScreenshotFullPage": {
     "message": "ذخیره صفحه کامل"
   },
   "cancelScreenshot": {
     "message": "لغو"
@@ -144,16 +147,22 @@
     "message": "برای گرفتن عکس از ناحیه قابل مشاهده در پنجره یا تمام صفحه از دکمه‌های بالا سمت راست استفاده کنید."
   },
   "tourHeaderDownloadUpload": {
     "message": "همانطور که می‌پسندید"
   },
   "tourBodyDownloadUpload": {
     "message": "عکس‌های بریده شده خود را برای به اشتراک‌گذاری راحت‌تر روی وب ذخیره کنید، یا آن‌ها را روی رایانه خود دریافت کنید. همچنین برای دیدن همهٔ عکس‌هایی که گرفتید می‌توانید روی دکمه «عکس‌های من» کلیک کنید."
   },
+  "tourHeaderAccounts": {
+    "message": "عکس از صفحه بلافاصله آماده برای استفاده"
+  },
+  "tourBodyAccounts": {
+    "message": "وارد حساب فایرفاکس خودتون بشید و به تمام تصاویر که توسط دستگاه‌های خودتون گرفتید دسترسی داشته باشید و تصویر مورد علاقه خودتون را برای همیشه ذخیره کنید."
+  },
   "tourSkip": {
     "message": "رد کردن"
   },
   "tourNext": {
     "message": "اسلاید بعدی"
   },
   "tourPrevious": {
     "message": "اسلاید قبلی"
--- a/browser/extensions/screenshots/_locales/ff/messages.json
+++ b/browser/extensions/screenshots/_locales/ff/messages.json
@@ -1,37 +1,170 @@
 {
   "addonDescription": {
     "message": "Ƴettu kilip walla nattal yaynirde rewrude e geese, ndaɗndaa ɗum e mudda walla e ko duumii."
   },
   "addonAuthorsList": {
     "message": "Mozilla <screenshots-feedback@mozilla.com>"
   },
+  "contextMenuLabel": {
+    "message": "Ƴettu nattal yaynirde"
+  },
+  "myShotsLink": {
+    "message": "Nattal Am"
+  },
+  "screenshotInstructions": {
+    "message": "Daas walla ndobo-ɗaa e hello hee ngam suɓaade nokku. Ñoƴƴu ESC ngam haaytude."
+  },
+  "saveScreenshotSelectedArea": {
+    "message": "Daɗndu"
+  },
+  "saveScreenshotVisibleArea": {
+    "message": "Daɗndu peeñɗo"
+  },
+  "saveScreenshotFullPage": {
+    "message": "Daɗndu timmal hello"
+  },
+  "cancelScreenshot": {
+    "message": "Momtu"
+  },
+  "downloadScreenshot": {
+    "message": "Awto"
+  },
   "downloadOnlyNotice": {
     "message": "Ngonɗaa e oo sahaa ko e mbaydi Aawto-Tan."
   },
   "downloadOnlyDetails": {
     "message": "Leƴƴande kuurgal Firefox ina wayla ɗoon e ɗoon e mbaydi Aawto-Tan e ɗii ngonkaaji:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Nder henorde Banngogol Suturo."
   },
   "downloadOnlyDetailsThirdParty": {
     "message": "Cuukiije jiggaaɗe ɗee ndaaƴaama."
   },
   "downloadOnlyDetailsNeverRemember": {
     "message": "“Woto siiftor aslol abadaa” hurminaama."
   },
+  "notificationLinkCopiedTitle": {
+    "message": "Jokkol hoɓɓitaama"
+  },
+  "notificationLinkCopiedDetails": {
+    "message": "Jokkol ngol ƴettu-ɗaa ngol konattanoongol e moggirgel. Ñoƴƴu e $META_KEY$-V ngam ɗakkude.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
   "copyScreenshot": {
     "message": "Natto"
   },
   "notificationImageCopiedTitle": {
     "message": "Natto ngoo nattaama"
   },
   "notificationImageCopiedDetails": {
     "message": "Natto maa nattaama e ɗakkitorde ndee. Ñoƴƴu $META_KEY$-V ngam ɗakkude.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
+  },
+  "requestErrorTitle": {
+    "message": "Nattii gollaade."
+  },
+  "requestErrorDetails": {
+    "message": "Ay haame! Min mbaawaa daɗndude nattal maa. Ennditoy yeeso."
+  },
+  "connectionErrorTitle": {
+    "message": "Min mbaawaa seŋaade e nattanɗe maa yaynirde."
+  },
+  "connectionErrorDetails": {
+    "message": "Tiiɗno ƴeewto ceŋol maa enternet. So a waawii seŋaade e enternet, tawata ko saɗeende joldunde e sarwiis nattagol yaynirde mo Firefox."
+  },
+  "loginErrorDetails": {
+    "message": "Min mbaawaa daɗndude natal maa sibu saɗeende heɓtiinde sarwiis nattagol yaynirde mo Firefox. Ennditoy ɗoo e ɓooyde."
+  },
+  "unshootablePageErrorTitle": {
+    "message": "Min mbaawaa nattaade yaynirde ngoo hello."
+  },
+  "unshootablePageErrorDetails": {
+    "message": "Ɗum wonaa hello geese aadoraango, ɗum tagi min mbaawaa nattaade ngo e yaynirde."
+  },
+  "selfScreenshotErrorTitle": {
+    "message": "A waawaa nattoraade yaynirde Firefox ngoo hello!"
+  },
+  "emptySelectionErrorTitle": {
+    "message": "Ko cuɓi-ɗaa koo ine famɗi no feewi"
+  },
+  "privateWindowErrorTitle": {
+    "message": "Nattal yaynirde ko ko daaƴaa e Fannu Banngagol sutura"
+  },
+  "privateWindowErrorDetails": {
+    "message": "Ay haame e saɗeende ndee. E min ngolloo e gollorgel wonande jame paaɗe."
+  },
+  "genericErrorTitle": {
+    "message": "Natte yaynirde Firefox ko paanɗe."
+  },
+  "genericErrorDetails": {
+    "message": "Min njenanaaka ko kewi koo. Aɗa waawi ennditde walla nattoro-ɗaa yaynirde hello woɗngo?"
+  },
+  "tourBodyIntro": {
+    "message": "Ƴettu, ndaɗndaa, lollinaa natte yaynirde tawa a yaltaani Firefox."
+  },
+  "tourHeaderPageAction": {
+    "message": "Feere hesere daɗndirde"
+  },
+  "tourBodyPageAction": {
+    "message": "Weɗɗit cuɓirgol golle hello ngoo nder palal ñiiɓirɗe kala nde njiɗ-ɗaa ƴettude nattal yaynirde."
+  },
+  "tourHeaderClickAndDrag": {
+    "message": "Natto ko njiɗ-ɗaa koo tan"
+  },
+  "tourBodyClickAndDrag": {
+    "message": "Dobo ndaasaa ngam nattaade huunde e hello ngoo tan. Aɗa waawi weeyde dow heen ngam jalbinde ko cuɓi-ɗaa koo."
+  },
+  "tourHeaderFullPage": {
+    "message": "Natto Windows walla kelle no ngoorunoo"
+  },
+  "tourBodyFullPage": {
+    "message": "Suɓo butone gonɗe to ñaamo dow ngam nattaade nokku jiyrotooɗo henorde ndee walla ngam nattaade hello timmungo."
+  },
+  "tourHeaderDownloadUpload": {
+    "message": "Hono no njiɗir-ɗaa ɗum nii"
+  },
+  "tourBodyDownloadUpload": {
+    "message": "Daɗndu fotooje maa ponnditaaɗe nder geese ɗee ngam newnude lollingol walla gawtagol majje nder ordinateer maa. Aɗa waawi kadi dobaade e butoŋ My Shots ngam yiytude ko ƴettuno-ɗaa koo fof."
+  },
+  "tourSkip": {
+    "message": "DIW"
+  },
+  "tourNext": {
+    "message": "Daasoo yeeso"
+  },
+  "tourPrevious": {
+    "message": "Daasoo caggal"
+  },
+  "tourDone": {
+    "message": "Timmii"
+  },
+  "termsAndPrivacyNotice2": {
+    "message": "So a huutoriima natte Firefox, a jaɓii $TERMSANDPRIVACYNOTICETERMSLINK$ e $TERMSANDPRIVACYNOTICEPRIVACYLINK$ amen.",
+    "placeholders": {
+      "termsandprivacynoticetermslink": {
+        "content": "$1"
+      },
+      "termsandprivacynoticeprivacylink": {
+        "content": "$2"
+      }
+    }
+  },
+  "termsAndPrivacyNoticeTermsLink": {
+    "message": "Sarɗiiji"
+  },
+  "termsAndPrivacyNoticyPrivacyLink": {
+    "message": "Tintinal keeringal"
+  },
+  "libraryLabel": {
+    "message": "Nattanɗe yaynirde"
   }
 }
\ No newline at end of file
--- a/browser/extensions/screenshots/_locales/fi/messages.json
+++ b/browser/extensions/screenshots/_locales/fi/messages.json
@@ -12,28 +12,34 @@
     "message": "Omat kaappaukset"
   },
   "screenshotInstructions": {
     "message": "Valitse alue vetämällä tai napsauttamalla sivua. Peruuta painamalla ESC."
   },
   "saveScreenshotSelectedArea": {
     "message": "Tallenna"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Lähetä"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Tallenna näkyvä alue"
   },
   "saveScreenshotFullPage": {
     "message": "Tallenna koko sivu"
   },
   "cancelScreenshot": {
     "message": "Peruuta"
   },
   "downloadScreenshot": {
     "message": "Lataa"
   },
+  "downloadScreenshotTitle": {
+    "message": "Lataa kuvakaappaus"
+  },
   "downloadOnlyNotice": {
     "message": "Olet vain lataus -tilassa."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots vaihtuu automaattisesti vain lataus -tilaan, kun"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "käytetään yksityisen selaamisen ikkunaa"
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopioi"
   },
+  "copyScreenshotTitle": {
+    "message": "Kopioi kuvakaappaus leikepöydälle"
+  },
   "notificationImageCopiedTitle": {
     "message": "Kaappaus kopioitu"
   },
   "notificationImageCopiedDetails": {
     "message": "Kaappauksesi on kopioitu leikepöydälle. Liitä se painamalla $META_KEY$-V.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,19 +126,16 @@
     "message": "Anteeksi häiriö. Tämä ominaisuus on vielä työn alla."
   },
   "genericErrorTitle": {
     "message": "Oho! Firefox Screenshots meni päin prinkkalaa."
   },
   "genericErrorDetails": {
     "message": "Emme oikein tiedä, mitä tapahtui. Haluatko yrittää uudestaan tai ottaa kuvan eri sivusta?"
   },
-  "tourBodyIntro": {
-    "message": "Ota, tallenna ja jaa kuvakaappaus poistumatta Firefoxista."
-  },
   "tourHeaderPageAction": {
     "message": "Uusi tapa tallentaa"
   },
   "tourBodyPageAction": {
     "message": "Avaa osoitepalkissa oleva Sivun toiminnot -valikko milloin vain, kun haluat ottaa kuvakaappauksen."
   },
   "tourHeaderClickAndDrag": {
     "message": "Kaappaa mitä haluat"
@@ -138,22 +144,16 @@
     "message": "Kaappaa vain osa sivusta napsauttamalla ja vetämällä. Voit myös korostaa valinnan pitämällä hiirtä sen päällä."
   },
   "tourHeaderFullPage": {
     "message": "Kaappaa näkyvä alue tai kokonainen sivu"
   },
   "tourBodyFullPage": {
     "message": "Valitse oikean yläkulman painikkeista joko ikkunassa näkyvän alueen tai koko sivun kaappaus."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Haluamallasi tavalla"
-  },
-  "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": {
     "message": "OHITA"
   },
   "tourNext": {
     "message": "Seuraava sivu"
   },
   "tourPrevious": {
     "message": "Edellinen sivu"
--- a/browser/extensions/screenshots/_locales/fr/messages.json
+++ b/browser/extensions/screenshots/_locales/fr/messages.json
@@ -12,16 +12,19 @@
     "message": "Mes captures d’écran"
   },
   "screenshotInstructions": {
     "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"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Envoyer en ligne"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Capturer la zone visible"
   },
   "saveScreenshotFullPage": {
     "message": "Capturer la page complète"
   },
   "cancelScreenshot": {
     "message": "Annuler"
--- a/browser/extensions/screenshots/_locales/fy_NL/messages.json
+++ b/browser/extensions/screenshots/_locales/fy_NL/messages.json
@@ -12,28 +12,34 @@
     "message": "Myn skermôfdrukken"
   },
   "screenshotInstructions": {
     "message": "Sleep of klik op de side om in gebiet te selektearjen. Druk op ESC om te annulearjen."
   },
   "saveScreenshotSelectedArea": {
     "message": "Bewarje"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Oplade"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Sichtbere bewarje"
   },
   "saveScreenshotFullPage": {
     "message": "Folsleine side bewarje"
   },
   "cancelScreenshot": {
     "message": "Annulearje"
   },
   "downloadScreenshot": {
     "message": "Downloade"
   },
+  "downloadScreenshotTitle": {
+    "message": "Skermôfbylding downloade"
+  },
   "downloadOnlyNotice": {
     "message": "Jo binne op dit stuit yn Allinnich-downloademodus."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots wikselet yn de folgjende situaasjes automatysk nei Allinnich-downloademodus:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Yn in priveenavigaasjefinster."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopiearje"
   },
+  "copyScreenshotTitle": {
+    "message": "Skermôfbylding nei klamboerd kopiearje"
+  },
   "notificationImageCopiedTitle": {
     "message": "Ofbylding kopiearre"
   },
   "notificationImageCopiedDetails": {
     "message": "Jo ôfbylding is nei it klamboerd kopiearre. Druk op $META_KEY$-V om te plakken.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Sorry foar it ûngemak. Foar takomstige útjeften wurdt oan dizze funksje wurke."
   },
   "genericErrorTitle": {
     "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 skermôfdruk fan in oare side meitsje?"
   },
-  "tourBodyIntro": {
-    "message": "Meitsje, bewarje en diel skermôfdrukken sûnder Firefox te ferlitten."
+  "tourBodyIntroServerless": {
+    "message": "Meitsje, kopiearje en download skermôfbyldingen sûnder Firefox te ferlitten."
   },
   "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": {
@@ -138,28 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Fetsje finsters of folsleine websiden"
   },
   "tourBodyFullPage": {
     "message": "Selektearje knoppen rjochts boppe-oan om it sichtbere gebiet yn it finster te fetsjen, of fetsje in folsleine side."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Nei jo winsk"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Skermôfbyldingen om mei te nimmen"
-  },
-  "tourBodyAccounts": {
-    "message": "Meld jo oan mei jo Firefox-account om jo ôfbyldingen op al jo apparaten te besjen en jo favorite ôfbyldingen foar altyd te bewarjen."
-  },
   "tourSkip": {
     "message": "Oerslaan"
   },
   "tourNext": {
     "message": "Folgjende ôfbylding"
   },
   "tourPrevious": {
     "message": "Foarige ôfbylding"
--- a/browser/extensions/screenshots/_locales/gd/messages.json
+++ b/browser/extensions/screenshots/_locales/gd/messages.json
@@ -12,16 +12,19 @@
     "message": "Na glacaidhean agam"
   },
   "screenshotInstructions": {
     "message": "Dèan briogadh no slaodadh air an duilleag airson raon a thaghadh. Brùth ESC airson sgur dheth."
   },
   "saveScreenshotSelectedArea": {
     "message": "Sàbhail"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Luchdaich suas"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Sàbhail na tha ri fhaicinn"
   },
   "saveScreenshotFullPage": {
     "message": "Sàbhail an duilleag shlàn"
   },
   "cancelScreenshot": {
     "message": "Sguir dheth"
@@ -70,18 +73,23 @@
   "notificationImageCopiedDetails": {
     "message": "Chaidh lethbhreac dhen ghlacadh agad a chur air an stòr-bhòrd. Brùth $META_KEY$-V airson a chur ann.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
-  "imageCroppedWarning": {
-    "message": "Chaidh an dealbh a bhearradh is tha e {pixels}px a-nis."
+  "imageCropPopupWarning": {
+    "message": "Thèid an dealbh a shàbhail thu a bhearradh ach am bith e $PIXELS$px a dh’àirde.",
+    "placeholders": {
+      "pixels": {
+        "content": "$1"
+      }
+    }
   },
   "requestErrorTitle": {
     "message": "Tuibriste."
   },
   "requestErrorDetails": {
     "message": "Tha sinn duilich! Cha b’ urrainn dhuinn an glacadh agad a shàbhaladh. Feuch ris a-rithist an ceann greis."
   },
   "connectionErrorTitle": {
@@ -139,16 +147,22 @@
     "message": "Tagh na putanan air an taobh deas gu h-àrd airson na tha ri fhaicinn san uinneag a ghlacadh no airson duilleag shlàn a ghlacadh."
   },
   "tourHeaderDownloadUpload": {
     "message": "Do thoil fhèin"
   },
   "tourBodyDownloadUpload": {
     "message": "Sàbhail na glacaidhean bearrte air an lìon ach am bi e furasta an co-roinneadh no luchdaich a-nuas iad dhan choimpiutair agad. ’S urrainn dhut briogadh air a’ phutan “Na glacaidhean agam” cuideachd is chì thu gach glacadh a thog thu."
   },
+  "tourHeaderAccounts": {
+    "message": "Thoir leat glacadh"
+  },
+  "tourBodyAccounts": {
+    "message": "Clàraich a-steach leis a’ chunntas Firefox agad a dh’fhaighinn greim air na glacaidhean uile agad air feadh nan uidheaman agad is sàbhail an fheadhainn chudromach gu buan."
+  },
   "tourSkip": {
     "message": "LEUM SEACHAD"
   },
   "tourNext": {
     "message": "An ath-shleamhnag"
   },
   "tourPrevious": {
     "message": "An t-sleamhnag roimhe"
--- a/browser/extensions/screenshots/_locales/gn/messages.json
+++ b/browser/extensions/screenshots/_locales/gn/messages.json
@@ -12,28 +12,34 @@
     "message": "Che japyhypy"
   },
   "screenshotInstructions": {
     "message": "Embosyryry térã eikutu kuatiaroguépe embasa'y hag̃ua peteĩ tendaguasu. Ejopy ESC eheja hag̃ua."
   },
   "saveScreenshotSelectedArea": {
     "message": "Ñongatu"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Hupi"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Ñongatu hechapy"
   },
   "saveScreenshotFullPage": {
     "message": "Kuatiarogue tuichavéva ñongatu"
   },
   "cancelScreenshot": {
     "message": "Heja"
   },
   "downloadScreenshot": {
     "message": "Mboguejy"
   },
+  "downloadScreenshotTitle": {
+    "message": "Emboguejy mba’erechaha japyhypyre"
+  },
   "downloadOnlyNotice": {
     "message": "Ko’ag̃aite eime ñemboguejy ayvúpe año."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots iñambue ijeheguínte ñemboguejy ayvúpe kóicha jave."
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Peteĩ ovetã kundaha ñemiguápe."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Monguatia"
   },
+  "copyScreenshotTitle": {
+    "message": "Embohasa mba’erechaha japyhypyre kuatiajokohápe"
+  },
   "notificationImageCopiedTitle": {
     "message": "Japyhypy monguatiapyre"
   },
   "notificationImageCopiedDetails": {
     "message": "Nde japyhypy ohóma kuatiajokohápe. Ejopy $META_KEY$ -V emboja hag̃ua.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Rombyasy ko'ã oikóva. Romba'apohína tembiapo pyahúre osẽ porã hag̃ua."
   },
   "genericErrorTitle": {
     "message": "¡Épa! Firefox Screenshots itavyraíma."
   },
   "genericErrorDetails": {
     "message": "Ndoroikuaái mba'etépa pe oikóva. ¿Ejapose jeýpa térã ejapyhy peteĩ kuatiarogue ambuévagui?"
   },
-  "tourBodyIntro": {
-    "message": "Ejapo, eñongatu ha emoherakuã mba'erechaha japyhypy eheja'ỹre Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Ejapo, emboguejy ha embokuatia mba’erechaha japyhypyre esẽ’ỹre Firefox-gui."
   },
   "tourHeaderPageAction": {
     "message": "Ñongatu ambue hendáicha"
   },
   "tourBodyPageAction": {
     "message": "Emyasãi pe kuatiarogue oku'éva poravorã kundaharape rendápe ejapyhyse vove."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "Ehesakutu ha embosyryry ejapyhy hag̃ua kuatiarogue vore. Ikatu avei ehasa hi’ári ehechauka hag̃ua poravopy."
   },
   "tourHeaderFullPage": {
     "message": "Ejapyhy ovetã térã kuatiarogue tuichaháicha"
   },
   "tourBodyFullPage": {
     "message": "Eiporavo umi votõ yvate akatúa gotyogua ejapyhy hag̃ua ovetãme térã kuatiarogue tuichaháicha."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Nde eipotaháicha"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Eñongatu nde japyhypy kytĩmbyre ñandutígui moherakuãrã térã ñemboguejyrã ne mohendahápe. Ikatu avei ehesakutu pe votõ Che japyhypy ejuhu hag̃ua opaite japyhypy ejapova'kue."
-  },
-  "tourHeaderAccounts": {
-    "message": "Ejapyhy mba'erechaha eho hag̃ua"
-  },
-  "tourBodyAccounts": {
-    "message": "Emoñepyrũ tembiapo ne mba’ete Firefox pegua ndive ehecha hag̃ua ne ra’anga opaite mba’e’okápe ha eñongatu ne ra’anga eguerohoryvéva opa árape g̃uarã."
-  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "Ta’angarechaha tenondegua"
   },
   "tourPrevious": {
     "message": "Ta’angarechaha mboyvegua"
--- a/browser/extensions/screenshots/_locales/gu_IN/messages.json
+++ b/browser/extensions/screenshots/_locales/gu_IN/messages.json
@@ -12,16 +12,19 @@
     "message": "મારા શોટ્સ"
   },
   "screenshotInstructions": {
     "message": "ખેંચો અથવા એક પ્રદેશ પસંદ કરવા માટે પાનાં પર ક્લિક કરો. રદ કરવા માટે ESC દબાવો."
   },
   "saveScreenshotSelectedArea": {
     "message": "સાચવો"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "અપલોડ કરો"
+  },
   "saveScreenshotVisibleArea": {
     "message": "દૃશ્યમાન સાચવો"
   },
   "saveScreenshotFullPage": {
     "message": "સંપૂર્ણ પૃષ્ઠ સાચવો"
   },
   "cancelScreenshot": {
     "message": "રદ"
@@ -144,16 +147,22 @@
     "message": "ઉપર જમણા બટનો પસંદ કરો વિન્ડોમાં દૃશ્યમાન વિસ્તાર મેળવવા માટે અથવા આખુ પાનું કેપ્ચર કરવા માટે."
   },
   "tourHeaderDownloadUpload": {
     "message": "તમને જે ગમે"
   },
   "tourBodyDownloadUpload": {
     "message": "સરળ શેરિંગ માટે વેબ પર તમારા કપાઈ શોટ સાચવો, અથવા તેમને તમારા કમ્પ્યુટર પર ડાઉનલોડ કરો. તમે બધા શોટ મેળવવા માટે મારું શોટ્સ બટન પર ક્લિક કરી પણ શકો છો બધા શોટ તમે લીધેલા શોધવા માટે."
   },
+  "tourHeaderAccounts": {
+    "message": "સ્ક્રીનશોટસ ઉપયોગ માટે તૈયાર છે"
+  },
+  "tourBodyAccounts": {
+    "message": "તમારા બધા ઉપકરણો પર તમારા શોટ્સને ઍક્સેસ કરવા માટે અને તમારા મનપસંદ શોટ્સ કાયમ માટે સાચવવા માટે તમારા Firefox એકાઉન્ટથી સાઇન ઇન કરો."
+  },
   "tourSkip": {
     "message": "છોડવા"
   },
   "tourNext": {
     "message": "આગલી સ્લાઇડ"
   },
   "tourPrevious": {
     "message": "પહેલાની સ્લાઇડ"
--- a/browser/extensions/screenshots/_locales/he/messages.json
+++ b/browser/extensions/screenshots/_locales/he/messages.json
@@ -12,16 +12,19 @@
     "message": "צילומי המסך שלי"
   },
   "screenshotInstructions": {
     "message": "נא לגרור או ללחוץ על הדף כדי לבחור תחום או על ESC לביטול."
   },
   "saveScreenshotSelectedArea": {
     "message": "שמירה"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "העלאה"
+  },
   "saveScreenshotVisibleArea": {
     "message": "שמירת התחום המוצג"
   },
   "saveScreenshotFullPage": {
     "message": "שמירת הדף במלואו"
   },
   "cancelScreenshot": {
     "message": "ביטול"
@@ -34,54 +37,59 @@
   },
   "downloadOnlyDetails": {
     "message": "‏Firefox Screenshots משתנה אוטומטית למצב הורדה בלבד במקרים הבאים:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "בחלון גלישה פרטית."
   },
   "downloadOnlyDetailsThirdParty": {
-    "message": "כשעוגיות צד שלישי מנוטרלות."
+    "message": "עוגיות צד שלישי מנוטרלות."
   },
   "downloadOnlyDetailsNeverRemember": {
     "message": "„לא לזכור היסטוריה” פעיל."
   },
   "downloadOnlyDetailsESR": {
     "message": "הגרסה שלך היא Firefox ESR."
   },
   "downloadOnlyDetailsNoUploadPref": {
     "message": "ההעלאות הושבתו."
   },
   "notificationLinkCopiedTitle": {
     "message": "הקישור הועתק"
   },
   "notificationLinkCopiedDetails": {
-    "message": "הקישור לתמונה שלך הועתק ללוח. נא ללחוץ על $META_KEY$-V כדי להדביק.",
+    "message": "הקישור לתמונה שלך הועתק ללוח. יש ללחוץ על $META_KEY$-V כדי להדביק.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "העתקה"
   },
   "notificationImageCopiedTitle": {
-    "message": "צילום המסך הועתק"
+    "message": "הצילום הועתק"
   },
   "notificationImageCopiedDetails": {
     "message": "צילום המסך שלך הועתק ללוח העריכה. יש ללחוץ על $META_KEY$-V כדי להדביק.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
-  "imageCroppedWarning": {
-    "message": "תמונה זו נחתכה לגודל של {pixels} פיקסלים."
+  "imageCropPopupWarning": {
+    "message": "התמונה שנשמרה תקוצר לגובה של $PIXELS$ פיקסלים.",
+    "placeholders": {
+      "pixels": {
+        "content": "$1"
+      }
+    }
   },
   "requestErrorTitle": {
     "message": "לא תקין."
   },
   "requestErrorDetails": {
     "message": "אנו מצטערים, אך לא ניתן היה לשמור את התמונה. נא לנסות שוב מאוחר יותר."
   },
   "connectionErrorTitle": {
@@ -137,17 +145,17 @@
   },
   "tourBodyFullPage": {
     "message": "בחרו בכפתורים שבחלק העליון כדי לצלם את האזור הגלוי בחלון או כדי לצלם את הדף כולו."
   },
   "tourHeaderDownloadUpload": {
     "message": "לפי טעמך"
   },
   "tourBodyDownloadUpload": {
-    "message": "שמירת הצילומים החתוכים שלך לאחסון מקוון לצורך שיתוף פשוט יותר, או להוריד אותם למחשב שלך. ניתן גם ללחוץ על כפתור הצילומים שלי כדי למצוא את כל הצילומים שצילמת."
+    "message": "ניתן לשמור את הצילומים החתוכים שלך באחסון מקוון לצורך שיתוף פשוט יותר, או להוריד אותם למחשב שלך. באפשרותך גם ללחוץ על הכפתור 'צילומי המסך שלי' כדי למצוא את כל הצילומים שצילמת."
   },
   "tourSkip": {
     "message": "דילוג"
   },
   "tourNext": {
     "message": "השקופית הבאה"
   },
   "tourPrevious": {
--- a/browser/extensions/screenshots/_locales/hi_IN/messages.json
+++ b/browser/extensions/screenshots/_locales/hi_IN/messages.json
@@ -12,28 +12,34 @@
     "message": "मेरे चित्र"
   },
   "screenshotInstructions": {
     "message": "किसी क्षेत्र को चुनने के लिए पृष्ठ पर खींचें या क्लिक करें. रद्द करने के लिए ESC दबाएँ."
   },
   "saveScreenshotSelectedArea": {
     "message": "सहेजें"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "अपलोड करें"
+  },
   "saveScreenshotVisibleArea": {
     "message": "दृश्यमान सहेजें"
   },
   "saveScreenshotFullPage": {
     "message": "पूर्ण पृष्ठ सहेजें"
   },
   "cancelScreenshot": {
     "message": "रद्द करें"
   },
   "downloadScreenshot": {
     "message": "डाउनलोड करें"
   },
+  "downloadScreenshotTitle": {
+    "message": "स्क्रीनशॉट डाउनलोड करें"
+  },
   "downloadOnlyNotice": {
     "message": "आप अभी केवल-डाउनलोड मोड में हैं."
   },
   "downloadOnlyDetails": {
     "message": "Firefox स्क्रीनशॉट स्वचालित रूप से इन स्थितियों में डाउनलोड-केवल मोड में बदल देता हैं:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "एक निजी ब्राउज़िंग विंडो में."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "प्रतिलिपि बनाएँ"
   },
+  "copyScreenshotTitle": {
+    "message": "स्क्रीनशॉट क्लिपबोर्ड पर काॅपी करें"
+  },
   "notificationImageCopiedTitle": {
     "message": "शॉट प्रतिलिपि बनाई गई"
   },
   "notificationImageCopiedDetails": {
     "message": "आपके शॉट के लिंक क्लिपबोर्ड पर कॉपी किए गए हैं. पेस्ट करने के लिए $META_KEY$-V दबाएँ.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,19 +126,16 @@
     "message": "असुविधा के लिए खेद हैं. हमलोग भविष्य संस्करण के लिए इस सुविधा पर काम कर रहे हैं."
   },
   "genericErrorTitle": {
     "message": "ओह! Firefox स्क्रीनशॉट बिगड़ गया."
   },
   "genericErrorDetails": {
     "message": "हम सुनिश्चित नहीं हैं कि अभी क्या हुआ. पुन: प्रयास या एक भिन्न पृष्ठ का एक शॉट लेना चाहते हैं?"
   },
-  "tourBodyIntro": {
-    "message": "Firefox छोड़े बिना स्क्रीनशॉट लें, सहेजें, और साझा करें."
-  },
   "tourHeaderPageAction": {
     "message": "सहेजने का एक नया तरीका"
   },
   "tourBodyPageAction": {
     "message": "किसी भी समय आप स्क्रीनशॉट लेना चाहते हैं तो पता पट्टी में पृष्ठ क्रियाएँ मेनू का विस्तार करें।"
   },
   "tourHeaderClickAndDrag": {
     "message": "जो आप चाहते हैं उसे कैद करें"
@@ -138,25 +144,16 @@
     "message": "पृष्ठ के बस एक हिस्से को कैद करने के लिए क्लिक करें और खींचें. आप अपने चयन को हाइलाइट करने के लिए भी जा सकते हैं."
   },
   "tourHeaderFullPage": {
     "message": "विंडोज़ या संपूर्ण पृष्ठों को कैद करें"
   },
   "tourBodyFullPage": {
     "message": "विंडो में दिखाई देने वाले क्षेत्र या एक पूरे पृष्ठ को कैद करने के लिए ऊपर में दाहिनी तरफ़ के बटन का चयन करें."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "जैसा आप इसे चाहते हैं"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "आसानी से साझा करने या उन्हें अपने कंप्यूटर पर डाउनलोड करने के लिए अपने क्रॉप किये गये शॉट को वेब पर सहेजें. आपके द्वारा लिए गये सभी शॉट्स को ढूंढने के लिए आप मेरे शॉट्स बटन पर भी क्लिक कर सकते हैं."
-  },
-  "tourBodyAccounts": {
-    "message": "हमेशा के लिए पसंदीदा स्क्रीनशॉटों को सहेजने तथा सभी उपकरणों पर अपने स्क्रीनशॉट एक्सेस करने हेतु अपने Firefox खाते में साइन इन करें।"
-  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "अगली स्लाइड"
   },
   "tourPrevious": {
     "message": "पिछली स्लाइड"
--- a/browser/extensions/screenshots/_locales/hr/messages.json
+++ b/browser/extensions/screenshots/_locales/hr/messages.json
@@ -12,39 +12,91 @@
     "message": "Moje snimke"
   },
   "screenshotInstructions": {
     "message": "Povucite ili kliknite na stranicu kako biste izabrali područje. Pritisnite ESC za otkazivanje radnje."
   },
   "saveScreenshotSelectedArea": {
     "message": "Spremi"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Učitaj"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Spremi vidljivo"
   },
   "saveScreenshotFullPage": {
     "message": "Spremi cijelu stranicu"
   },
   "cancelScreenshot": {
     "message": "Otkaži"
   },
   "downloadScreenshot": {
     "message": "Preuzmi"
   },
+  "downloadScreenshotTitle": {
+    "message": "Preuzmite snimku zaslona"
+  },
+  "downloadOnlyNotice": {
+    "message": "Trenutno ste u načinu za preuzimanje."
+  },
+  "downloadOnlyDetails": {
+    "message": "Firefox Screenshots se automatski stavlja u način za preuzimanje u ovim situacijama:"
+  },
+  "downloadOnlyDetailsPrivate": {
+    "message": "U prozoru privatnog pretraživanja."
+  },
+  "downloadOnlyDetailsThirdParty": {
+    "message": "Kolačići trećih strana su onemogućeni."
+  },
+  "downloadOnlyDetailsNeverRemember": {
+    "message": "“Nikad ne pamti povijest” je omogućeno."
+  },
+  "downloadOnlyDetailsESR": {
+    "message": "Koristite Firefox ESR."
+  },
+  "downloadOnlyDetailsNoUploadPref": {
+    "message": "Prijenosi su onemogućeni."
+  },
   "notificationLinkCopiedTitle": {
     "message": "Poveznica je kopirana"
   },
   "notificationLinkCopiedDetails": {
     "message": "Poveznica do vaše snimke je kopirana u međuspremnik. Pristinite $META_KEY$-V da ju zalijepite.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
+  "copyScreenshot": {
+    "message": "Kopiraj"
+  },
+  "copyScreenshotTitle": {
+    "message": "Kopiraj snimku zaslona u međuspremnik"
+  },
+  "notificationImageCopiedTitle": {
+    "message": "Snimka kopirana"
+  },
+  "notificationImageCopiedDetails": {
+    "message": "Vaša snimka je kopirana u međuspremnik. Pritisnite $META_KEY$-V da ju zalijepite.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
+  "imageCropPopupWarning": {
+    "message": "Spremljena slika biti će izrezana na visinu od $PIXELS$px.",
+    "placeholders": {
+      "pixels": {
+        "content": "$1"
+      }
+    }
+  },
   "requestErrorTitle": {
     "message": "Ne radi."
   },
   "requestErrorDetails": {
     "message": "Ups! Nismo uspjeli spremiti vašu snimku. Molimo pokušajte ponovo kasnije."
   },
   "connectionErrorTitle": {
     "message": "Ne možemo se spojiti s vašim snimkama."
@@ -74,18 +126,18 @@
     "message": "Žao nam je na neugodnosti. Radimo na ovoj mogućnosti za buduća izdanja."
   },
   "genericErrorTitle": {
     "message": "Uf! Firefox Screenshots se zbrkao."
   },
   "genericErrorDetails": {
     "message": "Nismo sigurno što se upravo dogodilo. Možete li pokušati ponovno ili snimiti drukčiju stranicu?"
   },
-  "tourBodyIntro": {
-    "message": "Snimite, spremite i dijelite snimke bez da napuštate Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Snimite, kopirajte i preuzmite snimke bez da napuštate Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Novi način za spremanje"
   },
   "tourBodyPageAction": {
     "message": "Proširite izbornik radnji stranice u adresnoj traci svaki puta kada želite snimiti ekran."
   },
   "tourHeaderClickAndDrag": {
@@ -95,22 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Baš kako vam se sviđa"
   },
   "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."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Snimajte prozore ili cijele stranice"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Odaberite gumbove na gornjem desnom kutu kako biste snimili vidljivo područje u prozoru ili cijelu stranicu."
-  },
   "tourSkip": {
     "message": "PRESKOČI"
   },
   "tourNext": {
     "message": "Sljedeći slajd"
   },
   "tourPrevious": {
     "message": "Prijašnji slajd"
--- a/browser/extensions/screenshots/_locales/hsb/messages.json
+++ b/browser/extensions/screenshots/_locales/hsb/messages.json
@@ -12,28 +12,34 @@
     "message": "Moje fota wobrazowki"
   },
   "screenshotInstructions": {
     "message": "Ćehńće abo klikńće na stronu, zo byšće wobwod wubrał. Tłóčće na ESC, zo byšće přetorhnył."
   },
   "saveScreenshotSelectedArea": {
     "message": "Składować"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Nahrać"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Widźomny wobwod składować"
   },
   "saveScreenshotFullPage": {
     "message": "Cyłu stronu składować"
   },
   "cancelScreenshot": {
     "message": "Přetorhnyć"
   },
   "downloadScreenshot": {
     "message": "Sćahnyć"
   },
+  "downloadScreenshotTitle": {
+    "message": "Foto wobrazowki sćahnyć"
+  },
   "downloadOnlyNotice": {
     "message": "Tuchwilu sće w modusu „Jenož sćahnyć“."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots w slědowacych situacijach awtomatisce do modusa „Jenož sćahnyć“ přepina:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "W priwatnym woknje."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopěrować"
   },
+  "copyScreenshotTitle": {
+    "message": "Foto wobrazowki do mjezyskłada kopěrować"
+  },
   "notificationImageCopiedTitle": {
     "message": "Foto kopěrowane"
   },
   "notificationImageCopiedDetails": {
     "message": "Waše foto je so do mjezyskłada kopěrowało. Tłóčće $META_KEY$-V, zo byšće jo zasadźił.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Wodajće prošu njepřijomnosće. Dźěłamy na tutej funkciji za přichodne wersije."
   },
   "genericErrorTitle": {
     "message": "Hopla! Firefox Screenshots njefunguje."
   },
   "genericErrorDetails": {
     "message": "Njejsmy sej wěsći, štož je so stało. Chceće hišće raz spytać abo chceće druhu stronu fotografować?"
   },
-  "tourBodyIntro": {
-    "message": "Čińće, składujće a dźělće fota wobrazowki bjez toho, zo byšće Firefox wopušćił."
+  "tourBodyIntroServerless": {
+    "message": "Wutworće, kopěrujće a sćehńće fota wobrazowki, bjeztoho zo byšće Firefox wopušćił."
   },
   "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": {
@@ -138,28 +147,16 @@
     "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ł."
   },
   "tourHeaderFullPage": {
     "message": "Wokna abo cyłe strony składować"
   },
   "tourBodyFullPage": {
     "message": "Wubjerće tłóčatka horjeka naprawo, zo byšće widźomny wobwod we woknje abo cyłu stronu fotografować."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Tak, kaž so wam spodoba"
-  },
-  "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ł."
-  },
-  "tourHeaderAccounts": {
-    "message": "Fota wobrazowki za puć"
-  },
-  "tourBodyAccounts": {
-    "message": "Přizjewće so pola swojeho konta Firefox, zo byšće přistup na swoje fota wobrazowki na wšěch wašich gratach měł a składujće swoje najlubše fota wobrazowki na přeco."
-  },
   "tourSkip": {
     "message": "Přeskočić"
   },
   "tourNext": {
     "message": "Přichodne foto"
   },
   "tourPrevious": {
     "message": "Předchadne foto"
--- a/browser/extensions/screenshots/_locales/hu/messages.json
+++ b/browser/extensions/screenshots/_locales/hu/messages.json
@@ -12,28 +12,34 @@
     "message": "Az Ön képei"
   },
   "screenshotInstructions": {
     "message": "Húzza, vagy kattintson a lapra a terület kiválasztásához. A megszakításhoz nyomja meg az ESC billentyűt."
   },
   "saveScreenshotSelectedArea": {
     "message": "Mentés"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Feltöltés"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Látható rész mentése"
   },
   "saveScreenshotFullPage": {
     "message": "Teljes oldal mentése"
   },
   "cancelScreenshot": {
     "message": "Mégse"
   },
   "downloadScreenshot": {
     "message": "Letöltés"
   },
+  "downloadScreenshotTitle": {
+    "message": "Képernyőkép letöltése"
+  },
   "downloadOnlyNotice": {
     "message": "Jelenleg csak letöltési módban van."
   },
   "downloadOnlyDetails": {
     "message": "A Firefox Screenshots ezekben az esetekben automatikusan csak letöltési módba vált:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Privát böngészési ablakban."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Másolás"
   },
+  "copyScreenshotTitle": {
+    "message": "Képernyőkép másolása a vágólapra"
+  },
   "notificationImageCopiedTitle": {
     "message": "Képernyőkép másolva"
   },
   "notificationImageCopiedDetails": {
     "message": "A képernyőkép a vágólapra lett másolva. Nyomjon $META_KEY$-V-t a beillesztéshez.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Sajnáljuk a kényelmetlenséget. Dolgozunk ezen a funkción a jövőbeli kiadásokhoz."
   },
   "genericErrorTitle": {
     "message": "Húha! A Firefox Screenshots megkergült."
   },
   "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."
   },
-  "tourBodyIntro": {
-    "message": "Készítsen, mentsen és osszon meg képernyőképeket, anélkül, hogy elhagyná a Firefoxot."
+  "tourBodyIntroServerless": {
+    "message": "Készítsen, másoljon és töltsön le képernyőképet a Firefox elhagyása nélkül."
   },
   "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": {
@@ -138,28 +147,16 @@
     "message": "Kattintson és húzzon, hogy csak a lap egy részét mentse el. Vagy csak rá is mutathat a kijelöléshez."
   },
   "tourHeaderFullPage": {
     "message": "Mentsen ablakokat vagy teljes lapokat"
   },
   "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."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Ahogy tetszik"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Hordozható képernyőképek"
-  },
-  "tourBodyAccounts": {
-    "message": "Jelentkezzen be a Firefox fiókjával, hogy elérje az összes képernyőképét az összes eszközén, és örökre elmentse a kedvenceit."
-  },
   "tourSkip": {
     "message": "Kihagyás"
   },
   "tourNext": {
     "message": "Következő dia"
   },
   "tourPrevious": {
     "message": "Előző dia"
--- a/browser/extensions/screenshots/_locales/ia/messages.json
+++ b/browser/extensions/screenshots/_locales/ia/messages.json
@@ -12,28 +12,34 @@
     "message": "Mi instantaneos"
   },
   "screenshotInstructions": {
     "message": "Trahe o clicca sur le pagina pro seliger un parte. Pulsa ESC pro cancellar."
   },
   "saveScreenshotSelectedArea": {
     "message": "Salvar"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Cargar"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Salvar le area visibile"
   },
   "saveScreenshotFullPage": {
     "message": "Salvar le pagina"
   },
   "cancelScreenshot": {
     "message": "Cancellar"
   },
   "downloadScreenshot": {
     "message": "Discargar"
   },
+  "downloadScreenshotTitle": {
+    "message": "Discargar instantaneo de schermo"
+  },
   "downloadOnlyNotice": {
     "message": "Tu es actualmente in modo solo-discargamento."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots automaticamente se converte al modo de solo discargamento in le situationes sequente:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "In un fenestra de Navigation Private."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copiar"
   },
+  "copyScreenshotTitle": {
+    "message": "Copiar instantaneo del schermo in le area de transferentia"
+  },
   "notificationImageCopiedTitle": {
     "message": "Instantaneo copiate"
   },
   "notificationImageCopiedDetails": {
     "message": "Tu instantaneo ha essite copiate al area de transferentia. Pulsa $META_KEY$-V pro collar.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Pardono pro le incommoditate. Nos labora sur iste functionalitate pro futur publicationes."
   },
   "genericErrorTitle": {
     "message": "Problemas de Firefox Screenshots!"
   },
   "genericErrorDetails": {
     "message": "Nos non sape lo que occurreva. Reprobar o capturar un instantaneo de un altere pagina?"
   },
-  "tourBodyIntro": {
-    "message": "Captura, salva e comparti instantaneos de schermo sin lassar Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Captura, copia e discarga instantaneos de schermo sin lassar Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Un nove modo pro salvar"
   },
   "tourBodyPageAction": {
     "message": "Aperi le menu del actiones de pagina in le barra de adresse quando tu desira prender un instantaneo de schermo."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "Clicca e trahe pro capturar justo un parte del pagina. Tu pote alsi passar supra pro evidentiar tu selection."
   },
   "tourHeaderFullPage": {
     "message": "Captura fenestras o paginas integre"
   },
   "tourBodyFullPage": {
     "message": "Elige le buttones in alto a dextra pro capturar le area visibile in le fenestra o pro capturar un pagina integre."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Como tu lo agrada"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Salvar tu instantaneos retaliate al web pro los compartir plus facilemente, o los discargar a tu computator. Tu alsi pote cliccar sur le button Mi Instantaneos pro trovar tote le instantaneos que tu ha prendite."
-  },
-  "tourHeaderAccounts": {
-    "message": "Tu instantaneos sempre con te"
-  },
-  "tourBodyAccounts": {
-    "message": "Authentica te con tu conto Firefox pro acceder a tu instantaneos sur tote tu apparatos e salva per sempre tu instantaneos favorite."
-  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "Diapositiva sequente"
   },
   "tourPrevious": {
     "message": "Previe diapositiva"
--- a/browser/extensions/screenshots/_locales/id/messages.json
+++ b/browser/extensions/screenshots/_locales/id/messages.json
@@ -12,16 +12,19 @@
     "message": "Tangkapan Saya"
   },
   "screenshotInstructions": {
     "message": "Seret atau klik pada laman untuk memilih area. Tekan ESC untuk membatalkan."
   },
   "saveScreenshotSelectedArea": {
     "message": "Simpan"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Unggah"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Simpan yang terlihat"
   },
   "saveScreenshotFullPage": {
     "message": "Simpan laman sepenuhnya"
   },
   "cancelScreenshot": {
     "message": "Batal"
--- a/browser/extensions/screenshots/_locales/it/messages.json
+++ b/browser/extensions/screenshots/_locales/it/messages.json
@@ -12,28 +12,34 @@
     "message": "Le mie immagini"
   },
   "screenshotInstructions": {
     "message": "Trascina o fai clic su una pagina per selezionare un’area della pagina. Premi ESC per annullare."
   },
   "saveScreenshotSelectedArea": {
     "message": "Salva"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Carica"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Salva l’area visibile"
   },
   "saveScreenshotFullPage": {
     "message": "Salva l’intera schermata"
   },
   "cancelScreenshot": {
     "message": "Annulla"
   },
   "downloadScreenshot": {
     "message": "Scarica"
   },
+  "downloadScreenshotTitle": {
+    "message": "Scarica screenshot"
+  },
   "downloadOnlyNotice": {
     "message": "Al momento è attiva la modalità “Solo download”."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots entra automaticamente in modalità “Solo download” nelle seguenti situazioni:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Se è attiva la modalità Navigazione anonima."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copia"
   },
+  "copyScreenshotTitle": {
+    "message": "Copia lo screenshot negli appunti"
+  },
   "notificationImageCopiedTitle": {
     "message": "Immagine copiata"
   },
   "notificationImageCopiedDetails": {
     "message": "L’immagine è stata copiata negli appunti. Premi $META_KEY$-V per incollarla.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Ci dispiace per l’inconveniente. Stiamo lavorando a questa funzione per le prossime versioni."
   },
   "genericErrorTitle": {
     "message": "Wow! Firefox Screenshots è andato in tilt"
   },
   "genericErrorDetails": {
     "message": "Non sappiamo che cosa sia successo. Riprova, magari con una pagina diversa."
   },
-  "tourBodyIntro": {
-    "message": "Cattura, salva e condividi schermate senza mai uscire da Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Cattura, copia e scarica schermate senza mai uscire da Firefox."
   },
   "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": {
@@ -138,28 +147,16 @@
     "message": "Fai clic e trascina per catturare solo una parte della pagina. Posiziona il mouse sopra all’area selezionata per evidenziarla."
   },
   "tourHeaderFullPage": {
     "message": "Cattura una finestra o una pagina intera"
   },
   "tourBodyFullPage": {
     "message": "Utilizza i pulsanti in alto a destra per catturare una parte della finestra o l’intera pagina."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Come piace a te"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Cattura una schermata di una pagina web, ritagliala e salvala online per condividerla in modo più veloce, oppure scaricala sul tuo computer. Puoi anche utilizzare il pulsante “Le mie immagini” per ritrovare tutte le immagini che hai salvato."
-  },
-  "tourHeaderAccounts": {
-    "message": "I tuoi screenshot, sempre con te"
-  },
-  "tourBodyAccounts": {
-    "message": "Accedi al tuo account Firefox per avere sempre a disposizione gli screenshot salvati su tutti i tuoi dispositivi e conservare le tue immagini preferite senza limiti di tempo."
-  },
   "tourSkip": {
     "message": "Ignora"
   },
   "tourNext": {
     "message": "Schermata successiva"
   },
   "tourPrevious": {
     "message": "Schermata precedente"
--- a/browser/extensions/screenshots/_locales/ja/messages.json
+++ b/browser/extensions/screenshots/_locales/ja/messages.json
@@ -12,16 +12,19 @@
     "message": "自分のショット"
   },
   "screenshotInstructions": {
     "message": "ページをドラッグまたはクリックして範囲を選択してください。ESC キーを押すとキャンセルできます。"
   },
   "saveScreenshotSelectedArea": {
     "message": "保存"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "アップロード"
+  },
   "saveScreenshotVisibleArea": {
     "message": "表示範囲を保存"
   },
   "saveScreenshotFullPage": {
     "message": "ページ全体を保存"
   },
   "cancelScreenshot": {
     "message": "キャンセル"
@@ -144,16 +147,22 @@
     "message": "右上のボタンを選択して、ウィンドウ内の表示範囲もしくはページ全体をキャプチャしましょう。"
   },
   "tourHeaderDownloadUpload": {
     "message": "お好きなように"
   },
   "tourBodyDownloadUpload": {
     "message": "切り取ったショットを簡単に共有できるようウェブ上に保存したり、手元へダウンロードしたり。また「自分のショット」ボタンをクリックすれば、これまでに撮ったすべてのショットを見られます。"
   },
+  "tourHeaderAccounts": {
+    "message": "Screenshots to Go"
+  },
+  "tourBodyAccounts": {
+    "message": "Firefox アカウントでログインすれば、お持ちのすべての端末からショットにアクセスでき、お気に入りのショットを保存しておけます。"
+  },
   "tourSkip": {
     "message": "スキップ"
   },
   "tourNext": {
     "message": "次のスライド"
   },
   "tourPrevious": {
     "message": "前のスライド"
--- a/browser/extensions/screenshots/_locales/ka/messages.json
+++ b/browser/extensions/screenshots/_locales/ka/messages.json
@@ -12,16 +12,19 @@
     "message": "ჩემი გადაღებულები"
   },
   "screenshotInstructions": {
     "message": "გადაადგილეთ ან დააწკაპეთ გვერდზე სივრცის მოსანიშნად. გასაუქმებლად დააჭირეთ ESC-ს."
   },
   "saveScreenshotSelectedArea": {
     "message": "შენახვა"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "ატვირთვა"
+  },
   "saveScreenshotVisibleArea": {
     "message": "ხილული ნაწილის შენახვა"
   },
   "saveScreenshotFullPage": {
     "message": "მთლიანი გვერდის შენახვა"
   },
   "cancelScreenshot": {
     "message": "გაუქმება"
@@ -46,34 +49,34 @@
   },
   "downloadOnlyDetailsESR": {
     "message": "თქვენ იყენებთ Firefox ESR-ს."
   },
   "downloadOnlyDetailsNoUploadPref": {
     "message": "ატვირთვა შეზღუდულია."
   },
   "notificationLinkCopiedTitle": {
-    "message": "ბმული დაკოპირებულია"
+    "message": "ბმულის ასლი აღებულია"
   },
   "notificationLinkCopiedDetails": {
-    "message": "თქვენი სურათის ბმული დაკოპირებულია. ჩასმისთვის დააწექით $META_KEY$-V.",
+    "message": "თქვენი სურათის ბმულის ასლი მზადაა. ჩასმისთვის დააწექით $META_KEY$-V.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
-    "message": "კოპირება"
+    "message": "ასლი"
   },
   "notificationImageCopiedTitle": {
-    "message": "სურათი დაკოპირებულია"
+    "message": "სურათის ასლი მზადაა"
   },
   "notificationImageCopiedDetails": {
-    "message": "თქვენი სურათი დაკოპირებულია. ჩასმისთვის დააწექით $META_KEY$-V.",
+    "message": "თქვენი სურათის ასლი მზადაა. ჩასმისთვის დააწექით $META_KEY$-V.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "imageCropPopupWarning": {
     "message": "შენახული სურათები მოიჭრება $PIXELS$px სიმაღლით.",
--- a/browser/extensions/screenshots/_locales/kab/messages.json
+++ b/browser/extensions/screenshots/_locales/kab/messages.json
@@ -12,16 +12,19 @@
     "message": "Tuṭṭfiwin-iw"
   },
   "screenshotInstructions": {
     "message": "Zuγer sakin sit γef af usebter akken ad tferneḍ tamnaṭ. Senned γef ESC akken ad tesfesxeḍ."
   },
   "saveScreenshotSelectedArea": {
     "message": "Sekles"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Sali"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Sekles ayen ibanen"
   },
   "saveScreenshotFullPage": {
     "message": "Sekles asebter meṛṛa"
   },
   "cancelScreenshot": {
     "message": "Sefsex"
--- a/browser/extensions/screenshots/_locales/kk/messages.json
+++ b/browser/extensions/screenshots/_locales/kk/messages.json
@@ -12,28 +12,34 @@
     "message": "Менің скриншоттарым"
   },
   "screenshotInstructions": {
     "message": "Аймақты таңдау үшін бетте шертіңіз. Бас тарту үшін ESC басыңыз."
   },
   "saveScreenshotSelectedArea": {
     "message": "Сақтау"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Жүктеу"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Көрінетінді сақтау"
   },
   "saveScreenshotFullPage": {
     "message": "Толық парақты сақтау"
   },
   "cancelScreenshot": {
     "message": "Бас тарту"
   },
   "downloadScreenshot": {
     "message": "Жүктеп алу"
   },
+  "downloadScreenshotTitle": {
+    "message": "Скриншотты жүктеп алу"
+  },
   "downloadOnlyNotice": {
     "message": "Сіз тек жүктеп алу режиміндесіз."
   },
   "downloadOnlyDetails": {
     "message": "Firefox скриншоттары тек жүктеп алу режиміне келесі жағдайларда ауысады:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Жекелік шолу терезесінде."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Көшіріп алу"
   },
+  "copyScreenshotTitle": {
+    "message": "Скриншотты алмасу буферіне көшіріп алу"
+  },
   "notificationImageCopiedTitle": {
     "message": "Скриншот көшірілді"
   },
   "notificationImageCopiedDetails": {
     "message": "Сіздің скриншотыңыз алмасу буферіне көшірілді. Кірістіру үшін $META_KEY$-V басыңыз.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,19 +126,16 @@
     "message": "Қолайсыздық үшін кешірім сұраймыз. Бұл мүмкіндікті болашақ шығарылымдарда іске асыруға жұмысты жасаймыз."
   },
   "genericErrorTitle": {
     "message": "Қап! Firefox скриншоттары жасамай қалған сияқты."
   },
   "genericErrorDetails": {
     "message": "Не болғанын білмейміз. Қайталап көресіз бе, немесе басқа парақтың скриншотын түсіріп көресіз бе?"
   },
-  "tourBodyIntro": {
-    "message": "Firefox ішінен скриншоттарды түсіру, сақтау және олармен бөлісу."
-  },
   "tourHeaderPageAction": {
     "message": "Сақтаудың жаңа жолы"
   },
   "tourBodyPageAction": {
     "message": "Скриншотты жасағыңыз келген уақытта адрестік жолақтың бет әрекеттері мәзірін ашыңыз."
   },
   "tourHeaderClickAndDrag": {
     "message": "Тек керек нәрсені түсіріңіз"
@@ -138,28 +144,16 @@
     "message": "Беттің тек бір бөлігін түсіру үшін тышқанды шертіп, тартыңыз. Таңдауыңызды түспен ерекшелеу үшін үстінен өткізсеңіз болады."
   },
   "tourHeaderFullPage": {
     "message": "Терезелер немесе толық беттерді түсіріңіз"
   },
   "tourBodyFullPage": {
     "message": "Жоғарғы оң жақта орналасқан батырмаларды терезенің көрінетін аймағын, немесе толық бетті түсіру үшін қолданыңыз."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Өзіңізге керек түрде"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Қиылған скриншоттармен оңай бөлісу үшін оларды интернетте сақтауға, немесе сіздің компьютеріңізге жүктеп алуға болады. Сонымен қатар, сіз жасаған барлық скриншоттарды табу үшін Менің скриншоттарым батырмасына шерте аласыз."
-  },
-  "tourHeaderAccounts": {
-    "message": "Ұстап жүретін скриншоттар"
-  },
-  "tourBodyAccounts": {
-    "message": "Барлық құрылғыларыңыздаға скриншоттарға қатынау және таңдамалы скриншоттарыңызды мәңгі сақтау үшін өз Firefox тіркелгіңізге кіріңіз."
-  },
   "tourSkip": {
     "message": "Аттап кету"
   },
   "tourNext": {
     "message": "Келесі слайд"
   },
   "tourPrevious": {
     "message": "Алдыңғы слайд"
--- a/browser/extensions/screenshots/_locales/lij/messages.json
+++ b/browser/extensions/screenshots/_locales/lij/messages.json
@@ -38,16 +38,24 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Còpia"
   },
+  "notificationImageCopiedDetails": {
+    "message": "A föto a l'é stæta copiâ inti aponti. Sciacca $META_KEY$-V pe incolâ.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
   "requestErrorTitle": {
     "message": "Feua serviçio."
   },
   "requestErrorDetails": {
     "message": "Ne spiaxe! No poemmo sarvâ l'inmagine. Pe piaxei preuva torna dòppo."
   },
   "connectionErrorTitle": {
     "message": "No poemmo conetise a-e teu föto do schermo."
--- a/browser/extensions/screenshots/_locales/lt/messages.json
+++ b/browser/extensions/screenshots/_locales/lt/messages.json
@@ -12,28 +12,34 @@
     "message": "Mano nuotraukos"
   },
   "screenshotInstructions": {
     "message": "Tempkite arba spustelėkite tinklalapyje norėdami pasirinkti regioną. Spustelėkite „ESC“ norėdami atsisakyti."
   },
   "saveScreenshotSelectedArea": {
     "message": "Įrašyti"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Įkelti"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Įrašyti matomą"
   },
   "saveScreenshotFullPage": {
     "message": "Įrašyti visą tinklalapį"
   },
   "cancelScreenshot": {
     "message": "Atsisakyti"
   },
   "downloadScreenshot": {
     "message": "Atsisiųsti"
   },
+  "downloadScreenshotTitle": {
+    "message": "Atsisiųsti ekrano nuotrauką"
+  },
   "downloadOnlyNotice": {
     "message": "Dabar esate tik atsiuntimo veiksenoje."
   },
   "downloadOnlyDetails": {
     "message": "„Firefox“ ekrano nuotraukos automatiškai įjungia tik atsiuntimo veikseną tokiais atvejais:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "privačiojo naršymo lange"
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopijuoti"
   },
+  "copyScreenshotTitle": {
+    "message": "Kopijuoti ekrano nutrauką į iškarpinę"
+  },
   "notificationImageCopiedTitle": {
     "message": "Nuotrauka nukopijuota"
   },
   "notificationImageCopiedDetails": {
     "message": "Jūsų nuotrauka nukopijuota į iškarpinę. Spustelėkite $META_KEY$-V, norėdami įdėti.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Atsiprašome už nepatogumą. Mes dirbame prie šio funkcionalumo vėlesnėms versijoms."
   },
   "genericErrorTitle": {
     "message": "Vau! „Firefox Screenshots“ sugedo."
   },
   "genericErrorDetails": {
     "message": "Mes nesame tikri, kas ką tik nutiko. Norite pabandyti dar kartą arba nufotografuoti kitą tinklalapį?"
   },
-  "tourBodyIntro": {
-    "message": "Darykite, įrašykite ir dalinkitės ekrano nuotraukomis nepalikdami „Firefox“."
+  "tourBodyIntroServerless": {
+    "message": "Fotografuokite, kopijuokite, ir atsisiųskite ekrano nuotraukas nepalikdami „Firefox“."
   },
   "tourHeaderPageAction": {
     "message": "Naujas būdas įrašyti"
   },
   "tourBodyPageAction": {
     "message": "Išskleiskite tinklalapio veiksmų meniu, esantį adreso juostoje, bet kada, kai norite padaryti ekrano nuotrauką."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "Spustelėkite ir tempkite, kad užfiksuotumėte tik dalį tinklalapio. Taip pat galite užvesti pelę, norėdami paryškinti savo pasirinkimą."
   },
   "tourHeaderFullPage": {
     "message": "Fiksuokite langus arba ištisus tinklalapius"
   },
   "tourBodyFullPage": {
     "message": "Pasirinkite mygtukus aukščiau dešinėje, norėdami užfiksuoti matomą lango dalį arba visą tinklalapį."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Kaip jums patogiau"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Įrašykite padarytas nuotraukas saityne patogesniam dalinimuisi, arba atsisiųskite jas į savo kompiuterį. Spustelėję mygtuką „Mano nuotraukos“, matysite visas savo padarytas nuotraukas."
-  },
-  "tourHeaderAccounts": {
-    "message": "Nuotraukos visur"
-  },
-  "tourBodyAccounts": {
-    "message": "Prisijungę su savo „Firefox“ paskyra, nuotraukas galėsite pasiekti visuose savo įrenginiuose, ir visam laikui įrašyti patinkančias."
-  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "Kita skaidrė"
   },
   "tourPrevious": {
     "message": "Buvusi skaidrė"
--- a/browser/extensions/screenshots/_locales/ms/messages.json
+++ b/browser/extensions/screenshots/_locales/ms/messages.json
@@ -12,16 +12,19 @@
     "message": "Syot Saya"
   },
   "screenshotInstructions": {
     "message": "Seret atau klik pada halaman untuk memilih kawasan. Tekan ESC untuk batalkan."
   },
   "saveScreenshotSelectedArea": {
     "message": "Simpan"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Muat naik"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Simpan yang terpapar"
   },
   "saveScreenshotFullPage": {
     "message": "Simpan halaman penuh"
   },
   "cancelScreenshot": {
     "message": "Batal"
--- a/browser/extensions/screenshots/_locales/my/messages.json
+++ b/browser/extensions/screenshots/_locales/my/messages.json
@@ -12,16 +12,19 @@
     "message": "ရိုက်ကူးထားသော ပုံများ"
   },
   "screenshotInstructions": {
     "message": "နယ်ပယ်ရွေးရန်စာမျက်နှာကို ဆွဲတင်သို့မဟုတ်ကလစ်နှိပ်ပါ. မလုပ်ဆောင်လိုလှျင်ESC နှိပ်ပါ"
   },
   "saveScreenshotSelectedArea": {
     "message": "သိမ်းရန်"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "တင်ပါ"
+  },
   "saveScreenshotVisibleArea": {
     "message": "မြင်ရသည်များကို သိမ်းပါ"
   },
   "saveScreenshotFullPage": {
     "message": "စာမျက်နှာတစ်ခုလုံးကို သိမ်းပါ"
   },
   "cancelScreenshot": {
     "message": "မဆောင်ရွက်တော့ပါ"
@@ -144,16 +147,22 @@
     "message": "ဝင်းဒိုးထဲရှိ မြင်ရသော အကျယ်အဝန်းကို ဖမ်းယူရန် သို့မဟုတ် စာမျက်နှာတစ်ခုလုံးကို ဖမ်းယူရန် ညာဘက်အပေါ်ဘက်ရှိ ခလုတ်များကို ရွေးပါ။"
   },
   "tourHeaderDownloadUpload": {
     "message": "နှစ်သက်သလို"
   },
   "tourBodyDownloadUpload": {
     "message": "ဝဘ်တွင် အလွယ်တကူ မျှဝေရန် သို့မဟုတ် ကွန်ပျူတာထဲသို့ ဆွဲယူကူးရန် ဖြတ်တောက်ထားသော ပုံဖမ်းချက်များကို သိမ်းပါ။ ရိုက်ထားသမျှပုံများအားလုံးကို ရှာဖွေကြည့်ရှုရန် ရိုက်ထားသောပုံများတွင်လည်း ကလစ်နှိပ်ကြည့်နိုင်သည်။"
   },
+  "tourHeaderAccounts": {
+    "message": "အသုံးပြုတိုင်း ရှိနေမည့် Screenshots"
+  },
+  "tourBodyAccounts": {
+    "message": "ကိရိယာအားလုံးရှိ မျက်နှာပြင်ရိုက်ချက်များကို အသုံးပြုရန် နှင့် သင်နှစ်သက်သည်များကို သိမ်းဆည်းရန် သင့် Firefox Account နှင့် ဝင်ရောက်ပါ။"
+  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "နောက်ဆလိုက်"
   },
   "tourPrevious": {
     "message": "အရင်ကဆလိုက်"
--- a/browser/extensions/screenshots/_locales/nb_NO/messages.json
+++ b/browser/extensions/screenshots/_locales/nb_NO/messages.json
@@ -12,16 +12,19 @@
     "message": "Mine skjermbilder"
   },
   "screenshotInstructions": {
     "message": "Dra eller klikk på siden for å velge et område. Trykk på ESC for å avbryte."
   },
   "saveScreenshotSelectedArea": {
     "message": "Lagre"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Last opp"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Lagre synlig område"
   },
   "saveScreenshotFullPage": {
     "message": "Lagre hele siden"
   },
   "cancelScreenshot": {
     "message": "Avbryt"
--- a/browser/extensions/screenshots/_locales/nl/messages.json
+++ b/browser/extensions/screenshots/_locales/nl/messages.json
@@ -12,28 +12,34 @@
     "message": "Mijn afbeeldingen"
   },
   "screenshotInstructions": {
     "message": "Sleep of klik op de pagina om een gebied te selecteren. Druk op ESC om te annuleren."
   },
   "saveScreenshotSelectedArea": {
     "message": "Opslaan"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Uploaden"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Zichtbaar gebied opslaan"
   },
   "saveScreenshotFullPage": {
     "message": "Volledige pagina opslaan"
   },
   "cancelScreenshot": {
     "message": "Annuleren"
   },
   "downloadScreenshot": {
     "message": "Downloaden"
   },
+  "downloadScreenshotTitle": {
+    "message": "Schermafbeelding downloaden"
+  },
   "downloadOnlyNotice": {
     "message": "U bevindt zich momenteel in Alleen-downloadenmodus."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots wisselt in de volgende situaties automatisch naar Alleen-downloadenmodus:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "In een privénavigatievenster."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopiëren"
   },
+  "copyScreenshotTitle": {
+    "message": "Schermafbeelding naar klembord kopiëren"
+  },
   "notificationImageCopiedTitle": {
     "message": "Afbeelding gekopieerd"
   },
   "notificationImageCopiedDetails": {
     "message": "Uw afbeelding is naar het klembord gekopieerd. Druk op $META_KEY$-V om te plakken.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -85,17 +94,17 @@
   },
   "requestErrorTitle": {
     "message": "Buiten werking."
   },
   "requestErrorDetails": {
     "message": "Sorry! Uw afbeelding kon niet worden opgeslagen. Probeer het later opnieuw."
   },
   "connectionErrorTitle": {
-    "message": "We kunnen geen verbinding met uw schermafdrukken maken."
+    "message": "We kunnen geen verbinding met uw schermafbeeldingen maken."
   },
   "connectionErrorDetails": {
     "message": "Controleer uw internetverbinding. Als u verbinding met het internet kunt maken, kan er sprake zijn van een tijdelijk probleem met de Firefox Screenshots-service."
   },
   "loginErrorDetails": {
     "message": "Uw afbeelding kon niet worden opgeslagen, omdat er een probleem is met de Firefox Screenshots-service. Probeer het later opnieuw."
   },
   "unshootablePageErrorTitle": {
@@ -117,18 +126,18 @@
     "message": "Sorry voor het ongemak. Voor toekomstige releases wordt aan deze functie gewerkt."
   },
   "genericErrorTitle": {
     "message": "Ho! Er is iets mis met Firefox Screenshots."
   },
   "genericErrorDetails": {
     "message": "We weten niet precies wat er zonet is gebeurd. Wilt u het nogmaals proberen, of een schermafbeelding van een andere pagina maken?"
   },
-  "tourBodyIntro": {
-    "message": "Maak, bewaar en deel schermafbeeldingen zonder Firefox te verlaten."
+  "tourBodyIntroServerless": {
+    "message": "Maak, kopieer en download schermafbeeldingen zonder Firefox te verlaten."
   },
   "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": {
@@ -138,28 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Leg vensters of hele pagina’s vast"
   },
   "tourBodyFullPage": {
     "message": "Selecteer de knoppen rechtsboven om het zichtbare gebied in het venster vast te leggen, of om een hele pagina vast te leggen."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Zoals u wilt"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Bewaar uw bijgesneden afbeeldingen 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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Schermafbeeldingen om mee te nemen"
-  },
-  "tourBodyAccounts": {
-    "message": "Meld u aan met uw Firefox-account om uw afbeeldingen op al uw apparaten te bekijken en uw favoriete afbeeldingen voor altijd te bewaren."
-  },
   "tourSkip": {
     "message": "Overslaan"
   },
   "tourNext": {
     "message": "Volgende slide"
   },
   "tourPrevious": {
     "message": "Vorige slide"
--- a/browser/extensions/screenshots/_locales/nn_NO/messages.json
+++ b/browser/extensions/screenshots/_locales/nn_NO/messages.json
@@ -12,16 +12,19 @@
     "message": "Mine skjermbilde"
   },
   "screenshotInstructions": {
     "message": "Drag eller klikk på sida for å velje eit område. Trykk på ESC for å avbryte."
   },
   "saveScreenshotSelectedArea": {
     "message": "Lagre"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Last opp"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Lagre synleg område"
   },
   "saveScreenshotFullPage": {
     "message": "Lagre heile sida"
   },
   "cancelScreenshot": {
     "message": "Avbryt"
--- a/browser/extensions/screenshots/_locales/pl/messages.json
+++ b/browser/extensions/screenshots/_locales/pl/messages.json
@@ -12,28 +12,34 @@
     "message": "Moje zrzuty"
   },
   "screenshotInstructions": {
     "message": "Przeciągnij lub kliknij na stronie, aby wybrać obszar. Naciśnij klawisz Esc, aby anulować."
   },
   "saveScreenshotSelectedArea": {
     "message": "Zapisz"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Wyślij"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Zapisz widoczne"
   },
   "saveScreenshotFullPage": {
     "message": "Zapisz całą stronę"
   },
   "cancelScreenshot": {
     "message": "Anuluj"
   },
   "downloadScreenshot": {
     "message": "Pobierz"
   },
+  "downloadScreenshotTitle": {
+    "message": "Pobierz zrzut ekranu"
+  },
   "downloadOnlyNotice": {
     "message": "Obecnie używany jest tryb umożliwiający tylko pobieranie."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots automatycznie przełącza na tryb umożliwiający tylko pobieranie w tych sytuacjach:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Okno jest prywatne."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopiuj"
   },
+  "copyScreenshotTitle": {
+    "message": "Skopiuj zrzut ekranu do schowka"
+  },
   "notificationImageCopiedTitle": {
     "message": "Skopiowano zrzut"
   },
   "notificationImageCopiedDetails": {
     "message": "Zrzut został skopiowany do schowka. Naciśnij $META_KEY$-V, aby go wkleić.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Przepraszamy za utrudnienia. Pracujemy nad dodaniem tej funkcji."
   },
   "genericErrorTitle": {
     "message": "Firefox Screenshots wymknął się spod kontroli."
   },
   "genericErrorDetails": {
     "message": "Nie bardzo wiemy, co się wydarzyło. Spróbujesz ponownie lub wykonasz zrzut innej strony?"
   },
-  "tourBodyIntro": {
-    "message": "Wykonuj, zapisuj i udostępniaj zrzuty ekranu bez wychodzenia z Firefoksa."
+  "tourBodyIntroServerless": {
+    "message": "Wykonuj, kopiuj i pobieraj zrzuty ekranu bez wychodzenia z Firefoksa."
   },
   "tourHeaderPageAction": {
     "message": "Nowy sposób zapisywania"
   },
   "tourBodyPageAction": {
     "message": "Rozwiń menu interakcji na pasku adresu, kiedy chcesz wykonać zrzut ekranu."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "Kliknij i przeciągnij, aby zapisać tylko część strony. Możesz także najechać, aby wyróżnić zaznaczony obszar."
   },
   "tourHeaderFullPage": {
     "message": "Zapisuj zrzuty okien lub całych stron"
   },
   "tourBodyFullPage": {
     "message": "Kliknij przycisk w górnym prawym rogu, aby zapisać obszar widoczny w oknie lub całą stronę."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Tak, jak lubisz"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Zrzuty ekranu na wynos"
-  },
-  "tourBodyAccounts": {
-    "message": "Zaloguj się na konto Firefoksa, aby mieć dostęp do swoich zrzutów na wszystkich urządzeniach i zachować ulubione na zawsze."
-  },
   "tourSkip": {
     "message": "Pomiń"
   },
   "tourNext": {
     "message": "Dalej"
   },
   "tourPrevious": {
     "message": "Wstecz"
--- a/browser/extensions/screenshots/_locales/pt_BR/messages.json
+++ b/browser/extensions/screenshots/_locales/pt_BR/messages.json
@@ -12,42 +12,48 @@
     "message": "Minhas capturas"
   },
   "screenshotInstructions": {
     "message": "Arraste ou clique na página para selecionar uma região. Pressione ESC para cancelar."
   },
   "saveScreenshotSelectedArea": {
     "message": "Salvar"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Enviar"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Salvar área visível"
   },
   "saveScreenshotFullPage": {
     "message": "Salvar página completa"
   },
   "cancelScreenshot": {
     "message": "Cancelar"
   },
   "downloadScreenshot": {
     "message": "Baixar"
   },
+  "downloadScreenshotTitle": {
+    "message": "Baixar captura"
+  },
   "downloadOnlyNotice": {
     "message": "Você está atualmente no modo somente baixar."
   },
   "downloadOnlyDetails": {
     "message": "O Firefox Screenshots muda automaticamente para o modo Somente baixar nessas situações:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Em uma janela de navegação privativa."
   },
   "downloadOnlyDetailsThirdParty": {
     "message": "Cookies de terceiros estão desabilitados."
   },
   "downloadOnlyDetailsNeverRemember": {
-    "message": "“Nunca lembrar o histórico” está habilitado."
+    "message": "“Nunca lembrar o histórico” está ativado."
   },
   "downloadOnlyDetailsESR": {
     "message": "Você está usando o Firefox ESR."
   },
   "downloadOnlyDetailsNoUploadPref": {
     "message": "Os envios foram desabilitados."
   },
   "notificationLinkCopiedTitle": {
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copiar"
   },
+  "copyScreenshotTitle": {
+    "message": "Copiar captura para área de transferência"
+  },
   "notificationImageCopiedTitle": {
     "message": "Capturado"
   },
   "notificationImageCopiedDetails": {
     "message": "Sua captura de tela foi copiada para a área de transferência. Pressione $META_KEY$-V para colar.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -97,17 +106,17 @@
   },
   "loginErrorDetails": {
     "message": "Não conseguimos salvar sua captura porque há um problema com o serviço Firefox Screenshots. Por favor, tente novamente mais tarde."
   },
   "unshootablePageErrorTitle": {
     "message": "Não conseguimos capturar a tela nesta página."
   },
   "unshootablePageErrorDetails": {
-    "message": "Esta não é uma página web padrão, por isso não podemos capturar sua tela."
+    "message": "Esta não é uma página web padrão, por isso você não pode tirar uma captura dela."
   },
   "selfScreenshotErrorTitle": {
     "message": "Você não pode capturar uma página do Firefox Screenshots!"
   },
   "emptySelectionErrorTitle": {
     "message": "Sua seleção é muito pequena"
   },
   "privateWindowErrorTitle": {
@@ -117,18 +126,18 @@
     "message": "Lamentamos o inconveniente. Estamos trabalhando neste recurso para lançamentos futuros."
   },
   "genericErrorTitle": {
     "message": "Uoou! O Firefox Screenshot enlouqueceu."
   },
   "genericErrorDetails": {
     "message": "Não temos certeza do que acabou de acontecer. Tentar novamente ou fazer uma captura de uma página diferente?"
   },
-  "tourBodyIntro": {
-    "message": "Capture, salve e compartilhe telas sem sair do Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Faça, copie e baixe capturas de tela sem deixar o Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Um novo jeito de salvar"
   },
   "tourBodyPageAction": {
     "message": "Abra o menu de ações da página na barra de endereços sempre que quiser fazer uma captura de tela."
   },
   "tourHeaderClickAndDrag": {
@@ -138,22 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Capture janelas ou páginas inteiras"
   },
   "tourBodyFullPage": {
     "message": "Selecione os botões no canto superior direito para capturar a área visível na janela ou capturar uma página inteira."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Como você quiser"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Salve 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 encontrar todas as capturas que tirou."
-  },
   "tourSkip": {
     "message": "Pular"
   },
   "tourNext": {
     "message": "Próximo slide"
   },
   "tourPrevious": {
     "message": "Slide anterior"
--- a/browser/extensions/screenshots/_locales/pt_PT/messages.json
+++ b/browser/extensions/screenshots/_locales/pt_PT/messages.json
@@ -12,28 +12,34 @@
     "message": "Minhas capturas"
   },
   "screenshotInstructions": {
     "message": "Arraste ou clique na página para selecionar uma região. Pressione ESC para cancelar."
   },
   "saveScreenshotSelectedArea": {
     "message": "Guardar"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Carregar"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Guardar visível"
   },
   "saveScreenshotFullPage": {
     "message": "Guardar página inteira"
   },
   "cancelScreenshot": {
     "message": "Cancelar"
   },
   "downloadScreenshot": {
     "message": "Transferir"
   },
+  "downloadScreenshotTitle": {
+    "message": "Transferir captura de ecrã"
+  },
   "downloadOnlyNotice": {
     "message": "Está atualmente no modo Transferências-apenas."
   },
   "downloadOnlyDetails": {
     "message": "O Firefox Screenshots muda automaticamente para o modo Transferências-apenas nestas situações:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Numa janela de navegação privada."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copiar"
   },
+  "copyScreenshotTitle": {
+    "message": "Copiar captura de ecrã para a área de transferência"
+  },
   "notificationImageCopiedTitle": {
     "message": "Captura copiada"
   },
   "notificationImageCopiedDetails": {
     "message": "A sua captura foi copiada para a área de transferência. Pressione $META_KEY$-V para colar.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Desculpe pela inconveniência. Estamos a trabalhar nesta funcionalidade para futuros lançamentos."
   },
   "genericErrorTitle": {
     "message": "Uau! Algo correu mal com o Firefox Screenshots."
   },
   "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?"
   },
-  "tourBodyIntro": {
-    "message": "Tire, guarde e partilhe capturas de ecrã sem sair do Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Tire, copie, e transfira capturas de ecrã sem sair do Firefox."
   },
   "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": {
@@ -138,25 +147,16 @@
     "message": "Clique e arraste para capturar apenas uma parte de uma página. Pode também pairar para destacar a sua seleção."
   },
   "tourHeaderFullPage": {
     "message": "Capture janelas ou páginas inteiras"
   },
   "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."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Como você gosta"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Guarde as suas capturas na web para partilhar mais facilmente ou transfira-as para o seu computador. Pode também clicar no botão Minhas capturas para encontrar todas as capturas que tirou."
-  },
-  "tourBodyAccounts": {
-    "message": "Inicie sessão com a sua Conta Firefox para aceder às suas capturas em todos os seus dispositivos e guardar as suas capturas favoritas para sempre."
-  },
   "tourSkip": {
     "message": "SALTAR"
   },
   "tourNext": {
     "message": "Diapositivo seguinte"
   },
   "tourPrevious": {
     "message": "Diapositivo anterior"
--- a/browser/extensions/screenshots/_locales/rm/messages.json
+++ b/browser/extensions/screenshots/_locales/rm/messages.json
@@ -12,28 +12,34 @@
     "message": "Mes maletgs da visur"
   },
   "screenshotInstructions": {
     "message": "Tira u clicca sin la pagina per tscherner ina regiun. Smatga ESC per interrumper."
   },
   "saveScreenshotSelectedArea": {
     "message": "Memorisar"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Transferir"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Memorisar la regiun visibla"
   },
   "saveScreenshotFullPage": {
     "message": "Memorisar la pagina cumpletta"
   },
   "cancelScreenshot": {
     "message": "Interrumper"
   },
   "downloadScreenshot": {
     "message": "Telechargiar"
   },
+  "downloadScreenshotTitle": {
+    "message": "Telechargiar il maletg dal visur"
+  },
   "downloadOnlyNotice": {
     "message": "Ti es actualmain en il modus che permetta mo da telechargiar."
   },
   "downloadOnlyDetails": {
     "message": "En suandantas situaziuns permetta Firefox Screenshots mo da telechargiar:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Sche ti navigheschas en il modus privat."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copiar"
   },
+  "copyScreenshotTitle": {
+    "message": "Copiar il maletg dal visur en l'archiv provisoric"
+  },
   "notificationImageCopiedTitle": {
     "message": "Copià il maletg"
   },
   "notificationImageCopiedDetails": {
     "message": "Tes maletg dal visur è vegnì copià en l'archiv provisoric. Smatga $META_KEY$-V per l'encollar.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Perstgisa las malempernaivladads. Nus furnin questa funcziun en ina da las proximas versiuns."
   },
   "genericErrorTitle": {
     "message": "Oh dieu! Firefox Screenshots ha il singlut."
   },
   "genericErrorDetails": {
     "message": "Nus na savain betg tge ch'è gist capità. Vuls empruvar anc ina giada, forsa cun in'autra pagina?"
   },
-  "tourBodyIntro": {
-    "message": "Far, memorisar e cundivider maletgs da visur senza bandunar Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Far, copiar e telechargiar maletgs dal visur senza bandunar Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Ina nova pussaivladad da memorisar"
   },
   "tourBodyPageAction": {
     "message": "Vuls far in maletg dal visur? Avra il menu da las «Acziuns da pagina» en la trav d'adressas."
   },
   "tourHeaderClickAndDrag": {
@@ -138,22 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Far maletgs da fanestras u paginas cumplettas"
   },
   "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."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Co che ti prefereschas"
-  },
-  "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": {
     "message": "Sursiglir"
   },
   "tourNext": {
     "message": "Proxim pass"
   },
   "tourPrevious": {
     "message": "Ultim pass"
--- a/browser/extensions/screenshots/_locales/ro/messages.json
+++ b/browser/extensions/screenshots/_locales/ro/messages.json
@@ -12,68 +12,77 @@
     "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ă"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Încarcă"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Salvează porțiunea vizibilă"
   },
   "saveScreenshotFullPage": {
     "message": "Salvează pagina completă"
   },
   "cancelScreenshot": {
     "message": "Renunță"
   },
   "downloadScreenshot": {
     "message": "Descarcă"
   },
+  "downloadScreenshotTitle": {
+    "message": "Descarcă captura de ecran"
+  },
   "downloadOnlyNotice": {
     "message": "În prezent ești în modul numai descărcare."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots se schimbă automat în modul numai descărcare în aceste situații:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "În fereastra de navigare privată."
   },
   "downloadOnlyDetailsThirdParty": {
     "message": "Atunci când cookie-urile terțe sunt dezactivate."
   },
   "downloadOnlyDetailsNeverRemember": {
-    "message": "Atunci când este activată opțiunea „Nu memora istoricul”."
+    "message": "Atunci când este activată opțiunea „Nu va memora istoricul niciodată”."
   },
   "downloadOnlyDetailsESR": {
     "message": "Acum folosești Firefox ESR."
   },
   "downloadOnlyDetailsNoUploadPref": {
     "message": "Încărcările au fost dezactivate."
   },
   "notificationLinkCopiedTitle": {
     "message": "Link copiat"
   },
   "notificationLinkCopiedDetails": {
-    "message": "Linkul către captura ta a fost copiat în clipboard. Apasă $META_KEY$-V pentru lipire.",
+    "message": "Linkul către captura ta a fost copiat în clipboard. Apasă $META_KEY$-V pentru a lipi.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Copiază"
   },
+  "copyScreenshotTitle": {
+    "message": "Copiază captura de ecran în clipboard"
+  },
   "notificationImageCopiedTitle": {
     "message": "Captură copiată"
   },
   "notificationImageCopiedDetails": {
-    "message": "Captura a fost copiată în clipboard. Apasă $META_KEY$-V pentru a lipi.",
+    "message": "Captura ți-a fost copiată în clipboard. Apasă $META_KEY$-V pentru a lipi.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "imageCropPopupWarning": {
     "message": "Imaginea salvată va fi decupată la înălțimea de $PIXELS$px.",
@@ -97,69 +106,57 @@
   },
   "loginErrorDetails": {
     "message": "Nu am putut să salvăm captura ta deoarece este o problemă cu serviciul Firefox Screenshots. Încearcă din nou mai târziu."
   },
   "unshootablePageErrorTitle": {
     "message": "Nu putem realiza o captură de ecran a acestei pagini."
   },
   "unshootablePageErrorDetails": {
-    "message": "Aceasta este o pagină web standard așa că nu putem lua o captură a acesteia."
+    "message": "Aceasta nu este o pagină web standard, deci nu poți realiza o captură de ecran a acesteia."
   },
   "selfScreenshotErrorTitle": {
     "message": "Nu poți realiza o captură a paginii Firefox Screenshots!"
   },
   "emptySelectionErrorTitle": {
     "message": "Selecția este prea mică"
   },
   "privateWindowErrorTitle": {
     "message": "Capturile de ecran sunt dezactivate în modul de navigare privată"
   },
   "privateWindowErrorDetails": {
     "message": "Ne pare rău pentru inconveniență. Lucrăm să introducem această funcție în versiunile viitoare."
   },
   "genericErrorTitle": {
-    "message": "Ups! Firefox Screenshots a întâmpinat o eroare."
+    "message": "Aaah! Firefox Screenshots a întâmpinat o eroare."
   },
   "genericErrorDetails": {
-    "message": "Nu știm ce s-a întâmplat. Poți încerca să iei o nouă captură sau o captură de la o altă pagină?"
+    "message": "Nu știm sigur ce s-a întâmplat. Ai vrea să încerci din nou sau realizezi o captură a altei pagini?"
   },
-  "tourBodyIntro": {
-    "message": "Preia, salvează și împărtășește capturi de ecran fără a părăsi Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Fă, copiază și descarcă capturi de ecran fără să ieși din Firefox."
   },
   "tourHeaderPageAction": {
     "message": "O nouă modalitate de salvare"
   },
   "tourBodyPageAction": {
-    "message": "Extinde meniul de acțiuni ale paginii în bara de adrese oricând vrei să faci o captură."
+    "message": "Extinde meniul de acțiuni pe pagină în bara de adresă oricând vrei să realizezi o captură de ecran."
   },
   "tourHeaderClickAndDrag": {
     "message": "Capturează întocmai ceea ce vrei"
   },
   "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."
+    "message": "Dă clic și trage pentru a captura doar o porțiune a unei pagini. Poți și să poziționezi cursorul deasupra 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"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Salvează capturile decupate pe web pentru a le împărtăși mai ușor, sau descarcă-le pe calculator. Mai poți face clic pe butonul My Shots (capturile mele) pentru a găsi toate capturile luate."
-  },
-  "tourHeaderAccounts": {
-    "message": "Capturi de ecran de luat cu tine"
-  },
-  "tourBodyAccounts": {
-    "message": "Autentifică-te în contul Firefox pentru accesarea capturilor de pe toate dispozitivele și salvează definitiv capturile favorite."
-  },
   "tourSkip": {
     "message": "OMITE"
   },
   "tourNext": {
     "message": "Diapozitivul următor"
   },
   "tourPrevious": {
     "message": "Diapozitivul anterior"
--- a/browser/extensions/screenshots/_locales/ru/messages.json
+++ b/browser/extensions/screenshots/_locales/ru/messages.json
@@ -12,28 +12,34 @@
     "message": "Мои снимки"
   },
   "screenshotInstructions": {
     "message": "Потяните мышью или щёлкните по странице, чтобы выбрать область. Нажмите ESC для отмены."
   },
   "saveScreenshotSelectedArea": {
     "message": "Сохранить"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Выгрузить"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Сохранить видимую область"
   },
   "saveScreenshotFullPage": {
     "message": "Сохранить всю страницу"
   },
   "cancelScreenshot": {
     "message": "Отмена"
   },
   "downloadScreenshot": {
     "message": "Загрузить"
   },
+  "downloadScreenshotTitle": {
+    "message": "Загрузить скриншот"
+  },
   "downloadOnlyNotice": {
     "message": "Сейчас вы в режиме только загрузки."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots автоматически переходит в режим только загрузки в следующих ситуациях:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "В приватном окне."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Копировать"
   },
+  "copyScreenshotTitle": {
+    "message": "Копировать скриншот в буфер обмена"
+  },
   "notificationImageCopiedTitle": {
     "message": "Снимок скопирован"
   },
   "notificationImageCopiedDetails": {
     "message": "Ваш снимок был скопирован в буфер обмена. Нажмите $META_KEY$-V для его вставки.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Приносим извинения за неудобства. Мы работаем над включением этой функции в будущие релизы."
   },
   "genericErrorTitle": {
     "message": "Ого! Скриншоты Firefox вышли из строя."
   },
   "genericErrorDetails": {
     "message": "Мы не уверены, в чём проблема. Попробуете ещё раз или сделаете снимок другой страницы?"
   },
-  "tourBodyIntro": {
-    "message": "Делайте, сохраняйте и делитесь скриншотами прямо в Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Создавайте, копируйте и загружайте скриншоты, не покидая Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Новый способ сохранения"
   },
   "tourBodyPageAction": {
     "message": "Раскройте меню действий на странице в адресной строке в любой момент, когда вы захотите сделать снимок экрана."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "Щелкните и потяните мышью для захвата части страницы. Вы также можете навести курсор мыши для подсветки выбранной области."
   },
   "tourHeaderFullPage": {
     "message": "Захватывайте окна или целые страницы"
   },
   "tourBodyFullPage": {
     "message": "С помощью кнопок в верхнем правом углу выбирайте захват видимой области окна или страницы целиком."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Как вам нравится"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Сохраняйте свои снимки в Интернете, чтобы легко ими делиться, или загружайте их на свой компьютер. Вы также можете просмотреть все сохранённые снимки, нажав на кнопку Мои снимки."
-  },
-  "tourHeaderAccounts": {
-    "message": "Скриншоты на ходу"
-  },
-  "tourBodyAccounts": {
-    "message": "Войдите в свой Аккаунт Firefox, чтобы получить доступ к вашим снимкам на всех ваших устройствах и сохраняйте любимые вами навсегда."
-  },
   "tourSkip": {
     "message": "Пропустить"
   },
   "tourNext": {
     "message": "Следующий слайд"
   },
   "tourPrevious": {
     "message": "Предыдущий слайд"
--- a/browser/extensions/screenshots/_locales/sk/messages.json
+++ b/browser/extensions/screenshots/_locales/sk/messages.json
@@ -12,16 +12,19 @@
     "message": "Moje snímky"
   },
   "screenshotInstructions": {
     "message": "Potiahnutím alebo kliknutím si vyberte oblasť, ktorú chcete zachytiť. Výber zrušíte stlačením klávesa ESC."
   },
   "saveScreenshotSelectedArea": {
     "message": "Uložiť"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Nahrať"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Uložiť viditeľnú časť"
   },
   "saveScreenshotFullPage": {
     "message": "Uložiť celú stránku"
   },
   "cancelScreenshot": {
     "message": "Zrušiť"
--- a/browser/extensions/screenshots/_locales/sl/messages.json
+++ b/browser/extensions/screenshots/_locales/sl/messages.json
@@ -12,16 +12,19 @@
     "message": "Moji posnetki"
   },
   "screenshotInstructions": {
     "message": "Povlecite ali kliknite na strani za izbiro območja. Pritisnite ESC za preklic."
   },
   "saveScreenshotSelectedArea": {
     "message": "Shrani"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Prenesi"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Shrani vidno"
   },
   "saveScreenshotFullPage": {
     "message": "Shrani celotno stran"
   },
   "cancelScreenshot": {
     "message": "Prekliči"
--- a/browser/extensions/screenshots/_locales/sq/messages.json
+++ b/browser/extensions/screenshots/_locales/sq/messages.json
@@ -12,16 +12,19 @@
     "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"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Ngarkoje"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Ruaj pjesën e dukshme"
   },
   "saveScreenshotFullPage": {
     "message": "Ruaj krejt faqen"
   },
   "cancelScreenshot": {
     "message": "Anuloje"
new file mode 100644
--- /dev/null
+++ b/browser/extensions/screenshots/_locales/su/messages.json
@@ -0,0 +1,187 @@
+{
+  "addonDescription": {
+    "message": "Cokot klip jeung téwakan layar ti Raramat turta teundeun saheulaanan atawa salilana."
+  },
+  "addonAuthorsList": {
+    "message": "Mozilla <screenshots-feedback@mozilla.com>"
+  },
+  "contextMenuLabel": {
+    "message": "Cokot Téwakan Layar"
+  },
+  "myShotsLink": {
+    "message": "Téwakan Kami"
+  },
+  "screenshotInstructions": {
+    "message": "Gusur atawa klik dina kaca pikeun milih téwakeun. Pencét ESC pikeun bolay."
+  },
+  "saveScreenshotSelectedArea": {
+    "message": "Teundeun"
+  },
+  "uploadScreenshotSelectedArea": {
+    "message": "Unggah"
+  },
+  "saveScreenshotVisibleArea": {
+    "message": "Teundeun nu katempo"
+  },
+  "saveScreenshotFullPage": {
+    "message": "Teundeun kaca lengkep"
+  },
+  "cancelScreenshot": {
+    "message": "Bolay"
+  },
+  "downloadScreenshot": {
+    "message": "Undeur"
+  },
+  "downloadScreenshotTitle": {
+    "message": "Unduh téwakan layar"
+  },
+  "downloadOnlyNotice": {
+    "message": "Anjeun ayeuna keur dina modeu Ukur-Undeur."
+  },
+  "downloadOnlyDetails": {
+    "message": "Firefox Screenshots otomatis robah ka mode Ukur-Ngundeur dina situasi ieu:"
+  },
+  "downloadOnlyDetailsPrivate": {
+    "message": "Dina jandéla Langlangan Nyamuni."
+  },
+  "downloadOnlyDetailsThirdParty": {
+    "message": "Kuki pihak katilu ditumpurkeun."
+  },
+  "downloadOnlyDetailsNeverRemember": {
+    "message": "“Ulah inget jujutan” diaktipkeun."
+  },
+  "downloadOnlyDetailsESR": {
+    "message": "Anjeun maké Firefox ESR."
+  },
+  "downloadOnlyDetailsNoUploadPref": {
+    "message": "Unggahan keur ditumpurkeun."
+  },
+  "notificationLinkCopiedTitle": {
+    "message": "Tutumbu Ditiron"
+  },
+  "notificationLinkCopiedDetails": {
+    "message": "Tutumbu ka téwakan anjeun geus ditiron kana papan klip. Pencét $META_KEY$-V pikeun napelkeun.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
+  "copyScreenshot": {
+    "message": "Tiron"
+  },
+  "copyScreenshotTitle": {
+    "message": "Tiron téwakan layar kana papan klip"
+  },
+  "notificationImageCopiedTitle": {
+    "message": "Téwakan Ditiron"
+  },
+  "notificationImageCopiedDetails": {
+    "message": "Téwakan anjeun geus ditiron kana papan klip. Pencét $META_KEY$-V pikeun napelkeun.",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
+  "imageCropPopupWarning": {
+    "message": "Gambar anu diteundeun bakal dipotong nepi ka jangkungna jadi $PIXELS$px.",
+    "placeholders": {
+      "pixels": {
+        "content": "$1"
+      }
+    }
+  },
+  "requestErrorTitle": {
+    "message": "Béakeun."
+  },
+  "requestErrorDetails": {
+    "message": "Hampura! Téwakan teu bisa diteundeun. Cobaan deui engké."
+  },
+  "connectionErrorTitle": {
+    "message": "Teu bisa nyambung ka téwakan layar anjeun."
+  },
+  "connectionErrorDetails": {
+    "message": "Pariksa sambungan Internétna. Lamun nyambung, sigana aya masalah témporér dina layanan Firefox Screenshotsna."
+  },
+  "loginErrorDetails": {
+    "message": "Téwakan teu bisa diteundeun alatan aya masalah dina layanan Firefox Screenshots. Cobaan deui engké."
+  },
+  "unshootablePageErrorTitle": {
+    "message": "Ieu kaca teu bisa ditéwak layarna."
+  },
+  "unshootablePageErrorDetails": {
+    "message": "Ieu lain kaca Raramat biasa, ku kituna anjeun teu bisa néwak layarna."
+  },
+  "selfScreenshotErrorTitle": {
+    "message": "Anjeun teu bisa néwak kaca Firefox Screenshots!"
+  },
+  "emptySelectionErrorTitle": {
+    "message": "Pilihan anjeun leutik teuing"
+  },
+  "privateWindowErrorTitle": {
+    "message": "Téwakan layar ditumpurkeun Mode Langlangan Nyamuni"
+  },
+  "privateWindowErrorDetails": {
+    "message": "Hampura. Fitur ieu keur dihanca pikeun rilis jaga."
+  },
+  "genericErrorTitle": {
+    "message": "Euleuh! Firefox Screenshotsna ngaco."
+  },
+  "genericErrorDetails": {
+    "message": "Teuing kunaon. Cobaan deui atawa coba téwak layar kaca lian?"
+  },
+  "tourBodyIntroServerless": {
+    "message": "Téwak, tiron, sarta undeur téwakan layar tanpa ninggalkeun FIrefox."
+  },
+  "tourHeaderPageAction": {
+    "message": "Cara anyar pikeun neundeun"
+  },
+  "tourBodyPageAction": {
+    "message": "Legaan menu peta kaca dina palang alamat iraha baé anjeun rék néwak layar."
+  },
+  "tourHeaderClickAndDrag": {
+    "message": "Téwak Sakahayang"
+  },
+  "tourBodyClickAndDrag": {
+    "message": "Klik jeung gusur pikeun néwak sabagian kaca. Anjeun ogé bisa nandaan pilihanana."
+  },
+  "tourHeaderFullPage": {
+    "message": "Téwak Jandéla atawa Sakabéh Kaca"
+  },
+  "tourBodyFullPage": {
+    "message": "Pilih tombol di luhur katuhu pikeun néwak anu katémbong dina layar atawa sakur eusi kaca."
+  },
+  "tourSkip": {
+    "message": "LIWAT"
+  },
+  "tourNext": {
+    "message": "Layar Saterusna"
+  },
+  "tourPrevious": {
+    "message": "Layar Saméméhna"
+  },
+  "tourDone": {
+    "message": "Anggeus"
+  },
+  "termsAndPrivacyNotice2": {
+    "message": "Ku maké Firefox Screenshots, anjeun satuju kana $TERMSANDPRIVACYNOTICETERMSLINK$ jeung $TERMSANDPRIVACYNOTICEPRIVACYLINK$.",
+    "placeholders": {
+      "termsandprivacynoticetermslink": {
+        "content": "$1"
+      },
+      "termsandprivacynoticeprivacylink": {
+        "content": "$2"
+      }
+    }
+  },
+  "termsAndPrivacyNoticeTermsLink": {
+    "message": "Katangtuan"
+  },
+  "termsAndPrivacyNoticyPrivacyLink": {
+    "message": "Wawar Privasi"
+  },
+  "libraryLabel": {
+    "message": "Screenshots"
+  }
+}
\ No newline at end of file
--- a/browser/extensions/screenshots/_locales/sv_SE/messages.json
+++ b/browser/extensions/screenshots/_locales/sv_SE/messages.json
@@ -12,28 +12,34 @@
     "message": "Mina skärmbilder"
   },
   "screenshotInstructions": {
     "message": "Dra eller klicka på sidan för att välja en region. Tryck på ESC för att avbryta."
   },
   "saveScreenshotSelectedArea": {
     "message": "Spara"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Ladda upp"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Spara synligt område"
   },
   "saveScreenshotFullPage": {
     "message": "Spara hela sidan"
   },
   "cancelScreenshot": {
     "message": "Avbryt"
   },
   "downloadScreenshot": {
     "message": "Ladda ner"
   },
+  "downloadScreenshotTitle": {
+    "message": "Ladda ner skärmbild"
+  },
   "downloadOnlyNotice": {
     "message": "Du är för närvarande i nedladdningsbart läge."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots ändrar automatiskt till nedladdningsbart läge i följande situationer:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "I ett privat surffönster."
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopiera"
   },
+  "copyScreenshotTitle": {
+    "message": "Kopiera skärmbild till urklipp"
+  },
   "notificationImageCopiedTitle": {
     "message": "Bild kopierad"
   },
   "notificationImageCopiedDetails": {
     "message": "Din bild har kopierats till urklipp. Tryck på $META_KEY$-V för att klistra in.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Ledsen för besväret. Vi arbetar med den här funktionen för framtida versioner."
   },
   "genericErrorTitle": {
     "message": "Oj! Firefox Screenshots verkar inte fungera korrekt."
   },
   "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?"
   },
-  "tourBodyIntro": {
-    "message": "Ta, spara, och dela skärmbilder utan att lämna Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Ta, kopiera och ladda ner skärmbilder utan att lämna Firefox."
   },
   "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": {
@@ -138,28 +147,16 @@
     "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."
   },
   "tourHeaderFullPage": {
     "message": "Fånga fönster eller hela sidor"
   },
   "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."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Som du vill ha det"
-  },
-  "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."
-  },
-  "tourHeaderAccounts": {
-    "message": "Skärmbilder att ta med"
-  },
-  "tourBodyAccounts": {
-    "message": "Logga in med ditt Firefox-konto för att komma åt dina bilder på alla dina enheter och spara dina favoritbilder för alltid."
-  },
   "tourSkip": {
     "message": "Hoppa över"
   },
   "tourNext": {
     "message": "Nästa sida"
   },
   "tourPrevious": {
     "message": "Föregående sida"
--- a/browser/extensions/screenshots/_locales/te/messages.json
+++ b/browser/extensions/screenshots/_locales/te/messages.json
@@ -12,16 +12,19 @@
     "message": "నా తెరపట్లు"
   },
   "screenshotInstructions": {
     "message": "ఒక ప్రాంతాన్ని ఎంచుకోవడానికి పేజీని లాగండి లేదా నొక్కండి. రద్దు చేయడానికి ESC నొక్కండి."
   },
   "saveScreenshotSelectedArea": {
     "message": "భద్రపరచు"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "ఎక్కించు"
+  },
   "saveScreenshotVisibleArea": {
     "message": "కనిపించే దానిని బద్రపరచండి"
   },
   "saveScreenshotFullPage": {
     "message": "పూర్తి పేజీని భద్రపరచు"
   },
   "cancelScreenshot": {
     "message": "రద్దుచేయి"
--- a/browser/extensions/screenshots/_locales/th/messages.json
+++ b/browser/extensions/screenshots/_locales/th/messages.json
@@ -12,40 +12,52 @@
     "message": "ภาพหน้าจอของฉัน"
   },
   "screenshotInstructions": {
     "message": "ลากหรือคลิกที่หน้าเพื่อเลือกบริเวณ กด ESC เพื่อยกเลิก"
   },
   "saveScreenshotSelectedArea": {
     "message": "บันทึก"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "อัปโหลด"
+  },
   "saveScreenshotVisibleArea": {
     "message": "บันทึกส่วนที่มองเห็น"
   },
   "saveScreenshotFullPage": {
     "message": "บันทึกเต็มหน้า"
   },
   "cancelScreenshot": {
     "message": "ยกเลิก"
   },
   "downloadScreenshot": {
     "message": "ดาวน์โหลด"
   },
   "downloadOnlyNotice": {
     "message": "คุณกำลังอยู่ในโหมดดาวน์โหลดเท่านั้น"
   },
+  "downloadOnlyDetails": {
+    "message": "Firefox Screenshots จะเปลี่ยนเป็นโหมดดาวน์โหลดอย่างเดียวโดยอัตโนมัติในสถานการณ์เหล่านี้:"
+  },
   "downloadOnlyDetailsPrivate": {
     "message": "ในหน้าต่างการท่องเว็บแบบส่วนตัว"
   },
   "downloadOnlyDetailsThirdParty": {
     "message": "คุกกี้บุคคลที่สามถูกปิดการใช้งาน"
   },
+  "downloadOnlyDetailsNeverRemember": {
+    "message": "“ไม่จดจำประวัติเสมอ” ถูกเปิดใช้งานอยู่"
+  },
   "downloadOnlyDetailsESR": {
     "message": "คุณกำลังใช้ Firefox ESR"
   },
+  "downloadOnlyDetailsNoUploadPref": {
+    "message": "อัปโหลดได้ถูกปิดใช้งาน"
+  },
   "notificationLinkCopiedTitle": {
     "message": "คัดลอกลิงก์แล้ว"
   },
   "notificationLinkCopiedDetails": {
     "message": "คัดลอกลิงก์ไปยังภาพหน้าจอของคุณไปยังคลิปบอร์ดแล้ว กด $META_KEY$-V เพื่อวาง",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -53,16 +65,24 @@
     }
   },
   "copyScreenshot": {
     "message": "คัดลอก"
   },
   "notificationImageCopiedTitle": {
     "message": "คัดลอกภาพหน้าจอแล้ว"
   },
+  "notificationImageCopiedDetails": {
+    "message": "คัดลอกภาพของคุณไปยังคลิปบอร์ดแล้ว กด $META_KEY$-V เพื่อวาง",
+    "placeholders": {
+      "meta_key": {
+        "content": "$1"
+      }
+    }
+  },
   "requestErrorTitle": {
     "message": "ใช้งานไม่ได้"
   },
   "requestErrorDetails": {
     "message": "ขออภัย! เราไม่สามารถบันทึกภาพหน้าจอของคุณ โปรดลองอีกครั้งในภายหลัง"
   },
   "connectionErrorTitle": {
     "message": "เราไม่สามารถเชื่อมต่อกับภาพหน้าจอของคุณ"
@@ -98,16 +118,19 @@
     "message": "เราไม่แน่ใจว่าเกิดอะไรขึ้น ต้องการลองอีกครั้งหรือจับภาพหน้าจอของหน้าอื่น?"
   },
   "tourBodyIntro": {
     "message": "จับ บันทึก และแบ่งปันภาพหน้าจอโดยไม่ต้องออกจาก Firefox"
   },
   "tourHeaderPageAction": {
     "message": "หนทางใหม่ในการบันทึก"
   },
+  "tourBodyPageAction": {
+    "message": "ขยายเมนูการกระทำหน้าในแถบที่อยู่ทุกครั้งที่คุณต้องการจับภาพหน้าจอ"
+  },
   "tourHeaderClickAndDrag": {
     "message": "จับภาพแค่สิ่งที่คุณต้องการ"
   },
   "tourBodyClickAndDrag": {
     "message": "คลิกแล้วลากเพื่อจับภาพแค่บางส่วนของหน้า คุณยังสามารถวางเมาส์เพื่อเน้นการเลือกของคุณ"
   },
   "tourHeaderFullPage": {
     "message": "จับภาพหน้าต่างหรือทั้งหน้า"
--- a/browser/extensions/screenshots/_locales/tr/messages.json
+++ b/browser/extensions/screenshots/_locales/tr/messages.json
@@ -12,28 +12,34 @@
     "message": "Ekran görüntülerim"
   },
   "screenshotInstructions": {
     "message": "Bir bölgeyi seçmek için işaretçiyi sürükleyin veya tıklayın. İptal etmek için ESC tuşuna basın."
   },
   "saveScreenshotSelectedArea": {
     "message": "Kaydet"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Yükle"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Görünür alanı kaydet"
   },
   "saveScreenshotFullPage": {
     "message": "Tüm sayfayı kaydet"
   },
   "cancelScreenshot": {
     "message": "Vazgeç"
   },
   "downloadScreenshot": {
     "message": "İndir"
   },
+  "downloadScreenshotTitle": {
+    "message": "Ekran görüntüsünü indir"
+  },
   "downloadOnlyNotice": {
     "message": "Şu anda Yalnızca İndirme modundasınız."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots şu durumlarda kendiliğinden Yalnızca İndirme moduna geçer:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Gizli Gezinti penceresindeyken"
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Kopyala"
   },
+  "copyScreenshotTitle": {
+    "message": "Ekran görüntüsünü panoya kopyala"
+  },
   "notificationImageCopiedTitle": {
     "message": "Görüntü kopyalandı"
   },
   "notificationImageCopiedDetails": {
     "message": "Ekran görüntünüz panoya kopyalandı. Yapıştırmak için $META_KEY$-V tuşlarına basabilirsiniz.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "Aksaklıktan dolayı özür dileriz. Gelecek sürümlerde bu özelliği devreye almak için çalışıyoruz."
   },
   "genericErrorTitle": {
     "message": "Firefox Screenshosts kafayı yedi!"
   },
   "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?"
   },
-  "tourBodyIntro": {
-    "message": "Firefox'tan çıkmadan ekran görüntüleri alın, kaydedin ve paylaşın."
+  "tourBodyIntroServerless": {
+    "message": "Firefox'tan ayrılmadan ekran görüntülerini yakalayın, kopyalayın ve indirin."
   },
   "tourHeaderPageAction": {
     "message": "Kaydetmenin yeni yolu"
   },
   "tourBodyPageAction": {
     "message": "Ekran görüntüsü almak istediğiniz zaman adres çubuğundaki sayfa eylemleri menüsünü açın."
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "Sayfanın belli bir kısmını yakalamak için tıklayıp sürükleyin. Seçiminizi işaretlemek için fareyle üzerine de gidebilirsiniz."
   },
   "tourHeaderFullPage": {
     "message": "Pencereleri veya sayfaların tamamını yakala"
   },
   "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."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "İstediğin gibi yakala"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Ekran görüntülerinizi daha kolay paylaşmak web’e kaydedebilir veya bilgisayarınıza indirebilirsiniz. Kaydettiğiniz tüm görüntüleri bulmak için “Ekran görüntülerim” düğmesine tıklayabilirsiniz."
-  },
-  "tourHeaderAccounts": {
-    "message": "Screenshots her yerde"
-  },
-  "tourBodyAccounts": {
-    "message": "Ekran görüntülerinize tüm cihazlarınızdan erişmek ve favori görüntülerinizi sonsuza dek saklamak için Firefox Hesabınıza giriş yapın."
-  },
   "tourSkip": {
     "message": "GEÇ"
   },
   "tourNext": {
     "message": "Sonraki slayt"
   },
   "tourPrevious": {
     "message": "Önceki slayt"
--- a/browser/extensions/screenshots/_locales/uk/messages.json
+++ b/browser/extensions/screenshots/_locales/uk/messages.json
@@ -12,16 +12,19 @@
     "message": "Мої знімки"
   },
   "screenshotInstructions": {
     "message": "Потягніть або клацніть на сторінці для вибору області. Натисніть ESC для скасування."
   },
   "saveScreenshotSelectedArea": {
     "message": "Зберегти"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Вивантажити"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Зберегти видиму область"
   },
   "saveScreenshotFullPage": {
     "message": "Зберегти всю сторінку"
   },
   "cancelScreenshot": {
     "message": "Скасувати"
--- a/browser/extensions/screenshots/_locales/ur/messages.json
+++ b/browser/extensions/screenshots/_locales/ur/messages.json
@@ -12,16 +12,19 @@
     "message": "میری شاٹس"
   },
   "screenshotInstructions": {
     "message": "علاقہ منتخب کرنے کے لیئے گھسیٹیں یا صفحہ پر کلک کریں۔ منسوخ کرنے کے لیئے ESC دبائیں۔"
   },
   "saveScreenshotSelectedArea": {
     "message": "محفوظ کریں"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "اپ لوڈ کریں"
+  },
   "saveScreenshotVisibleArea": {
     "message": "مرئی محفوظ کریں"
   },
   "saveScreenshotFullPage": {
     "message": "پورا صفحہ محفوظ کریں"
   },
   "cancelScreenshot": {
     "message": "منسوخ کریں"
--- a/browser/extensions/screenshots/_locales/vi/messages.json
+++ b/browser/extensions/screenshots/_locales/vi/messages.json
@@ -12,28 +12,34 @@
     "message": "Các ảnh chụp của tôi"
   },
   "screenshotInstructions": {
     "message": "Kéo hoặc nhấp vào trang để chọn một khu vực. Nhấn ESC để hủy bỏ."
   },
   "saveScreenshotSelectedArea": {
     "message": "Lưu lại"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "Tải lên"
+  },
   "saveScreenshotVisibleArea": {
     "message": "Lưu phần nhìn thấy"
   },
   "saveScreenshotFullPage": {
     "message": "Lưu toàn trang"
   },
   "cancelScreenshot": {
     "message": "Hủy bỏ"
   },
   "downloadScreenshot": {
     "message": "Tải xuống"
   },
+  "downloadScreenshotTitle": {
+    "message": "Tải về ảnh chụp màn hình"
+  },
   "downloadOnlyNotice": {
     "message": "Bạn hiện đang ở chế độ chỉ tải về."
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots sẽ tự động chuyển sang chế độ chỉ tải về trong các tình huống:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "Trong một cửa sổ duyệt web riêng tư."
@@ -59,27 +65,38 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "Sao chép"
   },
+  "copyScreenshotTitle": {
+    "message": "Sao chép ảnh chụp màn hình vào clipboard"
+  },
   "notificationImageCopiedTitle": {
     "message": "Ảnh chụp màn hình đã được sao chép"
   },
   "notificationImageCopiedDetails": {
     "message": "Ảnh chụp màn hình của bạn đã được sao chép vào clipboard. Nhấn $META_KEY$-V để dán.",
     "placeholders": {
       "meta_key": {
         "content": "$1"
       }
     }
   },
+  "imageCropPopupWarning": {
+    "message": "Ảnh đã lưu sẽ được cắt thành $PIXELS$px chiều cao.",
+    "placeholders": {
+      "pixels": {
+        "content": "$1"
+      }
+    }
+  },
   "requestErrorTitle": {
     "message": "Không sử dụng được."
   },
   "requestErrorDetails": {
     "message": "Xin lỗi! Chúng tôi không thể sao lưu ảnh chụp của bạn. Vui lòng thử lại sau."
   },
   "connectionErrorTitle": {
     "message": "Chúng tôi không thể kết nối với ảnh chụp màn hình của bạn."
@@ -109,18 +126,18 @@
     "message": "Xin lỗi vì sự bất tiện này. Chúng tôi đang làm việc trên các tính năng này cho bản phát hành trong tương lai."
   },
   "genericErrorTitle": {
     "message": "Whoa! Firefox Screenshots đã bị hoãn."
   },
   "genericErrorDetails": {
     "message": "Chúng tôi không chắc những gì vừa xảy ra. Thử lại hoặc chụp một trang khác?"
   },
-  "tourBodyIntro": {
-    "message": "Tạo, lưu và chia sẻ ảnh chụp màn hình mà không rời khỏi Firefox."
+  "tourBodyIntroServerless": {
+    "message": "Chụp, sao chép và tải về ảnh chụp màn hình mà không cần rời khỏi Firefox."
   },
   "tourHeaderPageAction": {
     "message": "Một cách mới để lưu"
   },
   "tourBodyPageAction": {
     "message": "Mở rộng trình đơn tác vụ trên trang trong thanh địa chỉ bất kỳ lúc nào bạn muốn chụp ảnh màn hình."
   },
   "tourHeaderClickAndDrag": {
@@ -130,25 +147,16 @@
     "message": "Nhấp và kéo để chụp một phần của một trang. Bạn cũng có thể di chuột để làm nổi bật lựa chọn của bạn."
   },
   "tourHeaderFullPage": {
     "message": "Chụp Windows hoặc Toàn bộ trang"
   },
   "tourBodyFullPage": {
     "message": "Chọn các nút ở phía trên bên phải để chụp khu vực nhìn thấy được trong cửa sổ hoặc để chụp toàn bộ trang."
   },
-  "tourHeaderDownloadUpload": {
-    "message": "Như bạn thích"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "Lưu ảnh đã cắt của bạn lên web để chia sẻ dễ dàng hơn hoặc tải chúng xuống máy tính của bạn. Bạn cũng có thể nhấp vào nút Ảnh chụp của tôi để tìm tất cả ảnh bạn đã chụp."
-  },
-  "tourBodyAccounts": {
-    "message": "Đăng nhập bằng tài khoản Firefox của bạn để truy cập các bức ảnh trên tất cả các thiết bị và lưu bức ảnh yêu thích của bạn mãi mãi."
-  },
   "tourSkip": {
     "message": "SKIP"
   },
   "tourNext": {
     "message": "Slide tiếp theo"
   },
   "tourPrevious": {
     "message": "Slide trước đó"
--- a/browser/extensions/screenshots/_locales/zh_CN/messages.json
+++ b/browser/extensions/screenshots/_locales/zh_CN/messages.json
@@ -12,28 +12,34 @@
     "message": "我的截图"
   },
   "screenshotInstructions": {
     "message": "在此页上拖拽或单击选择截图区域。按 ESC 键取消截图。"
   },
   "saveScreenshotSelectedArea": {
     "message": "保存"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "上传"
+  },
   "saveScreenshotVisibleArea": {
     "message": "截取可见范围"
   },
   "saveScreenshotFullPage": {
     "message": "截取整个页面"
   },
   "cancelScreenshot": {
     "message": "取消"
   },
   "downloadScreenshot": {
     "message": "下载"
   },
+  "downloadScreenshotTitle": {
+    "message": "下载截图"
+  },
   "downloadOnlyNotice": {
     "message": "您目前处在仅下载模式。"
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots 在如下情况将自动变更为仅下载模式:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "处于隐私浏览窗口。"
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "复制"
   },
+  "copyScreenshotTitle": {
+    "message": "复制截图到剪贴板"
+  },
   "notificationImageCopiedTitle": {
     "message": "截图已复制"
   },
   "notificationImageCopiedDetails": {
     "message": "已将您的截图复制到剪贴板。按 $META_KEY$-V 即可粘贴。",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "很抱歉因此带来的不便。我们将在后续版本中提供此功能。"
   },
   "genericErrorTitle": {
     "message": "哎呀,Firefox Screenshots 遇到问题。"
   },
   "genericErrorDetails": {
     "message": "我们不确定发生了什么。您可以再试一次或者试试另一个页面。"
   },
-  "tourBodyIntro": {
-    "message": "截取、保存和分享屏幕截图,无需 Firefox 以外的工具。"
+  "tourBodyIntroServerless": {
+    "message": "截取、复制、下载屏幕截图,不必离开 Firefox。"
   },
   "tourHeaderPageAction": {
     "message": "新的保存方法"
   },
   "tourBodyPageAction": {
     "message": "随时可以展开地址栏中的页面操作菜单来截图。"
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "单击并拖动以截取页面某个区域。您也可以把光标移到你要的地方,高亮后单击即可截图。"
   },
   "tourHeaderFullPage": {
     "message": "截取窗口或整个页面"
   },
   "tourBodyFullPage": {
     "message": "选择右上角的按钮可以截取窗口中的可见区域或者整个页面。"
   },
-  "tourHeaderDownloadUpload": {
-    "message": "做您所想"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "将您裁剪后的截图保存到网上以便共享,或者下载到您的计算机。您也可以点击“我的截图”按钮找到您截取的所有截图。"
-  },
-  "tourHeaderAccounts": {
-    "message": "Screenshots to Go"
-  },
-  "tourBodyAccounts": {
-    "message": "登录您的 Firefox 账户,即可访问您在所有设备上的截图,并永久保存您收藏的截图。"
-  },
   "tourSkip": {
     "message": "跳过"
   },
   "tourNext": {
     "message": "下一页"
   },
   "tourPrevious": {
     "message": "上一页"
--- a/browser/extensions/screenshots/_locales/zh_TW/messages.json
+++ b/browser/extensions/screenshots/_locales/zh_TW/messages.json
@@ -12,28 +12,34 @@
     "message": "我的擷圖"
   },
   "screenshotInstructions": {
     "message": "拖曳或點擊頁面來選擇區域,按下 ESC 取消。"
   },
   "saveScreenshotSelectedArea": {
     "message": "儲存"
   },
+  "uploadScreenshotSelectedArea": {
+    "message": "上傳"
+  },
   "saveScreenshotVisibleArea": {
     "message": "儲存可見範圍"
   },
   "saveScreenshotFullPage": {
     "message": "儲存完整頁面"
   },
   "cancelScreenshot": {
     "message": "取消"
   },
   "downloadScreenshot": {
     "message": "下載"
   },
+  "downloadScreenshotTitle": {
+    "message": "下載擷圖"
+  },
   "downloadOnlyNotice": {
     "message": "您目前處於「僅可下載模式」。"
   },
   "downloadOnlyDetails": {
     "message": "Firefox Screenshots 會在下列狀況時,進入「僅可下載模式」:"
   },
   "downloadOnlyDetailsPrivate": {
     "message": "使用隱私瀏覽模式開啟時。"
@@ -59,16 +65,19 @@
       "meta_key": {
         "content": "$1"
       }
     }
   },
   "copyScreenshot": {
     "message": "複製"
   },
+  "copyScreenshotTitle": {
+    "message": "將擷圖複製到剪貼簿"
+  },
   "notificationImageCopiedTitle": {
     "message": "已複製擷圖"
   },
   "notificationImageCopiedDetails": {
     "message": "已將擷圖複製到剪貼簿,按下 $META_KEY$-V 即可貼上。",
     "placeholders": {
       "meta_key": {
         "content": "$1"
@@ -117,18 +126,18 @@
     "message": "很抱歉帶來不便,我們將在未來提供此功能。"
   },
   "genericErrorTitle": {
     "message": "唉呀,Firefox Screenshots 有點秀逗了。"
   },
   "genericErrorDetails": {
     "message": "我們不確定剛剛發生了什麼事,您可以再試一次,或拍攝其他頁面的擷圖嗎?"
   },
-  "tourBodyIntro": {
-    "message": "不用離開 Firefox 就可以拍攝、儲存、分享畫面擷圖。"
+  "tourBodyIntroServerless": {
+    "message": "不用離開 Firefox 就可以拍攝、儲存、下載畫面擷圖。"
   },
   "tourHeaderPageAction": {
     "message": "全新的存檔方式"
   },
   "tourBodyPageAction": {
     "message": "想要拍攝擷圖時,打開網址列當中的頁面操作選單即可拍照。"
   },
   "tourHeaderClickAndDrag": {
@@ -138,28 +147,16 @@
     "message": "點擊並拖曳出要擷取的範圍。或者您也可以用滑鼠移上頁面中的各部分,擷取該範圍。"
   },
   "tourHeaderFullPage": {
     "message": "擷取可見範圍或整張網頁"
   },
   "tourBodyFullPage": {
     "message": "透過右上角的不同按鈕來選擇只拍攝視窗中的可見區域,或是整張網頁。"
   },
-  "tourHeaderDownloadUpload": {
-    "message": "用您想要的方式分享"
-  },
-  "tourBodyDownloadUpload": {
-    "message": "裁切過的擷圖,可直接傳到網路上方便分享,也能下載到電腦裡;也可以點擊「我的擷圖」按鈕,尋找拍過的所有擷圖。"
-  },
-  "tourHeaderAccounts": {
-    "message": "Screenshots to Go"
-  },
-  "tourBodyAccounts": {
-    "message": "使用您的 Firefox 帳號登入,即可存取您在所有裝置上拍攝的擷取圖,並永久保留您最愛的擷取圖。"
-  },
   "tourSkip": {
     "message": "略過"
   },
   "tourNext": {
     "message": "下一頁"
   },
   "tourPrevious": {
     "message": "上一頁"
--- a/browser/extensions/screenshots/moz.build
+++ b/browser/extensions/screenshots/moz.build
@@ -92,20 +92,16 @@ FINAL_TARGET_FILES.features['screenshots
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["dsb"] += [
   '_locales/dsb/messages.json'
 ]
 
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["el"] += [
   '_locales/el/messages.json'
 ]
 
-FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["en_CA"] += [
-  '_locales/en_CA/messages.json'
-]
-
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["en_GB"] += [
   '_locales/en_GB/messages.json'
 ]
 
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["en_US"] += [
   '_locales/en_US/messages.json'
 ]
 
@@ -340,16 +336,20 @@ FINAL_TARGET_FILES.features['screenshots
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["sq"] += [
   '_locales/sq/messages.json'
 ]
 
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["sr"] += [
   '_locales/sr/messages.json'
 ]
 
+FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["su"] += [
+  '_locales/su/messages.json'
+]
+
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["sv_SE"] += [
   '_locales/sv_SE/messages.json'
 ]
 
 FINAL_TARGET_FILES.features['screenshots@mozilla.org']["_locales"]["ta"] += [
   '_locales/ta/messages.json'
 ]