cross-channel content for 2022-08-16 23:03
authortrybld
Tue, 16 Aug 2022 23:08:27 +0000
changeset 14844 cf2118af9709819a0a857de35718b3efdfc0c69a
parent 14843 287807a072a640c0efec8ce4d9591a311c49e826
child 14845 96220c59ca7264d643de685d373b8a7b68dcbeb5
push id388
push userflodolo@mozilla.com
push dateWed, 17 Aug 2022 12:05:52 +0000
cross-channel content for 2022-08-16 23:03 X-Task-ID: W1UN_oRhQRGadSpmGgUuUA X-Channel-Repo: mozilla-central X-Channel-Revision: a51ffdf576ee6dde088f4a39c8e0d7d37844a830 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 00ace3fa39570ce31ee86082e34384fba7e4b1aa X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 49aca04549fde366ae1b790b1e45549a5255ae32 X-Channel-Repo: releases/mozilla-esr102 X-Channel-Revision: 205166b6f5991c3d06010a3636503c68a50f20c2 X-Channel-Repo: comm-central X-Channel-Revision: 01d457f9084d8a643395db39bcdcee9ee8f70b5c X-Channel-Repo: releases/comm-beta X-Channel-Revision: 30e14b5fc24179ee0da43935f03259a195be81a1 X-Channel-Repo: releases/comm-esr102 X-Channel-Revision: 3acf5b2c08655f493aa7242cc27a51faf277fd32
browser/browser/firefoxView.ftl
browser/browser/newtab/onboarding.ftl
mail/messenger/addressbook/vcard.ftl
toolkit/toolkit/intl/languageNames.ftl
--- a/browser/browser/firefoxView.ftl
+++ b/browser/browser/firefoxView.ftl
@@ -59,18 +59,16 @@ firefoxview-tabpickup-syncing = Sit tight while your tabs sync. It’ll be just a moment.
 firefoxview-mobile-promo-header = Grab tabs from your phone or tablet
 firefoxview-mobile-promo-description = To view your latest mobile tabs, sign in to { -brand-product-name } on iOS or Android.
 firefoxview-mobile-promo-primarybutton = Get { -brand-product-name } for mobile
 
 firefoxview-mobile-confirmation-header = 🎉 Good to go!
 firefoxview-mobile-confirmation-description = Now you can grab your { -brand-product-name } tabs from your tablet or phone.
 
 firefoxview-closed-tabs-title = Recently closed
-firefoxview-closed-tabs-collapse-button =
-  .title = Show or hide recently closed tabs list
 
 firefoxview-closed-tabs-description = Reopen pages you’ve closed on this device.
 firefoxview-closed-tabs-placeholder = <strong>No recently closed pages</strong><br/>Never fear losing a closed tab again. You can always retrieve it here.
 
 # refers to the last tab that was used
 firefoxview-pickup-tabs-badge = Last active
 
 # Variables:
@@ -83,8 +81,14 @@ firefoxview-no-current-colorway-collecti
 firefoxview-change-colorway-button = Change colorway
 
 # Variables:
 #  $intensity (String): Colorway intensity
 #  $collection (String): Colorway Collection name
 firefoxview-colorway-description = { $intensity } · { $collection }
 
 firefoxview-synced-tabs-placeholder = <strong>Nothing to see yet</strong><br/>The next time you open a page in { -brand-product-name } on another device, grab it here like magic.
+
+firefoxview-collapse-button-show =
+  .title = Show list
+
+firefoxview-collapse-button-hide =
+  .title = Hide list
--- a/browser/browser/newtab/onboarding.ftl
+++ b/browser/browser/newtab/onboarding.ftl
@@ -268,8 +268,19 @@ fx100-thank-you-pin-primary-button-label
 }
 
 fx100-upgrade-thanks-header = 100 Thank-Yous
 # Message shown with a start-browsing button. Emphasis <em> should be for "you"
 # but "Thank" can be used instead if there's no "you" in the translation.
 fx100-upgrade-thank-you-body = It’s our 100th release of { -brand-short-name }. Thank <em>you</em> for helping us build a better, healthier internet.
 # Message shown with either a pin-to-taskbar or set-default button.
 fx100-upgrade-thanks-keep-body = It’s our 100th release! Thanks for being a part of our community. Keep { -brand-short-name } one click away for the next 100.
+
+## MR2022 Upgrade Dialog screens
+## Pin private window screen shown only for users who don't have Firefox private pinned
+
+mr2022-onboarding-skip-step-button-label = Skip this step
+mr2022-upgrade-onboarding-pin-private-window-header = Get private browsing freedom in one click
+mr2022-upgrade-onboarding-pin-private-window-subtitle = No saved cookies or history, right from your desktop. Browse like no one’s watching.
+mr2022-upgrade-onboarding-pin-private-window-primary-button-label = { PLATFORM() ->
+    [macos] Keep { -brand-short-name } private browsing in Dock
+   *[other] Pin { -brand-short-name } private browsing to taskbar
+}
--- a/mail/messenger/addressbook/vcard.ftl
+++ b/mail/messenger/addressbook/vcard.ftl
@@ -111,20 +111,16 @@ vcard-date-year = Year
 vcard-adr-header = Addresses
 
 vcard-adr-add = Add address
 
 vcard-adr-label = Address
 
 vcard-adr-delivery-label = Delivery label
 
-vcard-adr-pobox = Post office box
-
-vcard-adr-ext = Extended address
-
 vcard-adr-street = Street address
 
 # Or "Locality"
 vcard-adr-locality = City
 
 # Or "Region"
 vcard-adr-region = State/Province
 
--- a/toolkit/toolkit/intl/languageNames.ftl
+++ b/toolkit/toolkit/intl/languageNames.ftl
@@ -158,17 +158,17 @@ language-name-ro = Romanian
 language-name-ru = Russian
 language-name-rw = Kinyarwanda
 language-name-sa = Sanskrit
 language-name-sc = Sardinian
 language-name-sco = Scots
 language-name-sd = Sindhi
 language-name-se = Northern Sami
 language-name-sg = Sango
-language-name-si = Singhalese
+language-name-si = Sinhala
 language-name-sk = Slovak
 language-name-sl = Slovenian
 language-name-sm = Samoan
 language-name-sn = Shona
 language-name-so = Somali
 language-name-son = Songhay
 language-name-sq = Albanian
 language-name-sr = Serbian