Backed out changeset 77dbf6f2d6d4 (bug 1529879) for Windows build bustages at Unified_cpp_toolkit_profile0.obj on a CLOSED TREE. draft
authorGurzau Raul <rgurzau@mozilla.com>
Thu, 18 Apr 2019 03:21:42 +0300
changeset 11390 8c000bedf50f377c1708ad2f4e947cc47979fe76
parent 11389 21436979ee109501cdf6ff04a8197c400de2318d
child 11391 2c9c013a83ef15ac7460a62b17039338eeac9315
push id202
push userflodolo@mozilla.com
push dateFri, 19 Apr 2019 11:15:43 +0000
bugs1529879
Backed out changeset 77dbf6f2d6d4 (bug 1529879) for Windows build bustages at Unified_cpp_toolkit_profile0.obj on a CLOSED TREE. X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: f5273f8e51966ff5d45588bfcd1826a5642ba8b4 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 7b5b8c302a1ab509c7e995254f0e7a809db07327 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 15f10287a218572a7fd47acabb40208645b4462d
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/toolkit/about/aboutProfiles.ftl
--- a/toolkit/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/chrome/mozapps/profile/profileSelection.properties
@@ -46,16 +46,8 @@ 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 (flushFailButton): $S is brandShortName.
-flushFailRestartButton=Restart %S
-flushFailExitButton=Exit
--- a/toolkit/toolkit/about/aboutProfiles.ftl
+++ b/toolkit/toolkit/about/aboutProfiles.ftl
@@ -5,22 +5,16 @@
 
 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