Merge mozilla-central to autoland. on a CLOSED TREE draft
authorAndreea Pavel <apavel@mozilla.com>
Fri, 19 Apr 2019 06:56:17 +0300
changeset 11402 4eda3663df566df32a77aa6576ef678fa727d60a
parent 11401 1b71105dd2cec9015a2858cbfd32eda9340a4e22 (current diff)
parent 11399 cba8b4961b10d8e67ce79e4d5e3095778b7e3de0 (diff)
child 11403 37589ae5e9b1716ee2e4796cad9a15c5c5607787
push id202
push userflodolo@mozilla.com
push dateFri, 19 Apr 2019 11:15:43 +0000
Merge mozilla-central to autoland. on a CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: cb9a0420ac32c5e52f52d1b4f3c18a8065935b68 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 7b5b8c302a1ab509c7e995254f0e7a809db07327 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 15f10287a218572a7fd47acabb40208645b4462d
--- a/devtools/shared/styleinspector.properties
+++ b/devtools/shared/styleinspector.properties
@@ -133,16 +133,21 @@ rule.classPanel.toggleClass.tooltip=Togg
 # LOCALIZATION NOTE (rule.classPanel.newClass.placeholder): This is the placeholder
 # shown inside the text field used to add a new class in the rule-view.
 rule.classPanel.newClass.placeholder=Add new class
 
 # LOCALIZATION NOTE (rule.classPanel.noClasses): This is the text displayed in the
 # class panel when the current element has no classes applied.
 rule.classPanel.noClasses=No classes on this element
 
+# LOCALIZATION NOTE (rule.printSimulation.tooltip):
+# This is the tooltip of the print simulation button in the Rule View toolbar
+# that toggles print simulation.
+rule.printSimulation.tooltip=Toggle print media simulation for the page
+
 # LOCALIZATION NOTE (styleinspector.contextmenu.copyColor): Text displayed in the rule
 # and computed view context menu when a color value was clicked.
 styleinspector.contextmenu.copyColor=Copy Color
 
 # LOCALIZATION NOTE (styleinspector.contextmenu.copyColor.accessKey): Access key for
 # the rule and computed view context menu "Copy Color" entry.
 styleinspector.contextmenu.copyColor.accessKey=L
 
--- a/toolkit/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/chrome/mozapps/profile/profileSelection.properties
@@ -46,8 +46,16 @@ profileFinishTextMac=Click Done to creat
 profileMissing=Your %S profile cannot be loaded. It may be missing or inaccessible.
 profileMissingTitle=Profile Missing
 profileDeletionFailed=Profile couldn’t be deleted as it may be in use.
 profileDeletionFailedTitle=Deletion Failed
 
 # Profile reset
 # LOCALIZATION NOTE (resetBackupDirectory): Directory name for the profile directory backup created during reset. This directory is placed in a location users will see it (ie. their desktop). %S is the application name.
 resetBackupDirectory=Old %S Data
+
+flushFailTitle=Changes not saved
+# LOCALIZATION NOTE (conflictMessage): %1$S is brandProductName, %2$S is brandShortName.
+conflictMessage=Another copy of %1$S has made changes to profiles. You must restart %2$S before making more changes.
+flushFailMessage=An unexpected error has prevented your changes from being saved.
+# LOCALIZATION NOTE (flushFailRestartButton): $S is brandShortName.
+flushFailRestartButton=Restart %S
+flushFailExitButton=Exit
--- a/toolkit/toolkit/about/aboutProfiles.ftl
+++ b/toolkit/toolkit/about/aboutProfiles.ftl
@@ -5,16 +5,22 @@
 
 profiles-title = About Profiles
 profiles-subtitle = This page helps you to manage your profiles. Each profile is a separate world which contains separate history, bookmarks, settings and add-ons.
 profiles-create = Create a New Profile
 profiles-restart-title = Restart
 profiles-restart-in-safe-mode = Restart with Add-ons Disabled…
 profiles-restart-normal = Restart normally…
 
+profiles-conflict = Another copy of { -brand-product-name } has made changes to profiles. You must restart { -brand-short-name } before making more changes.
+profiles-flush-fail-title = Changes not saved
+profiles-flush-conflict = { profiles-conflict }
+profiles-flush-failed = An unexpected error has prevented your changes from being saved.
+profiles-flush-restart-button = Restart { -brand-short-name }
+
 # Variables:
 #   $name (String) - Name of the profile
 profiles-name = Profile: { $name }
 profiles-is-default = Default Profile
 profiles-rootdir = Root Directory
 
 # localDir is used to show the directory corresponding to
 # the main profile directory that exists for the purpose of storing data on the