Bug 1239848 - Revert ProfileManager changes until a better UX/UI is ready, r=ehsan
authorAndrea Marchesini <amarchesini@mozilla.com>
Wed, 20 Jan 2016 09:16:49 +0000
changeset 5083 450dd735d7ebf4ba1265c2224d94ed113b98e1b2
parent 5076 f3aa1e2bdee1aea3d9e374992c634c466c2346d1
child 5089 76fa3977e5ee3bbd7845d521e32344cd360c6e72
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersehsan
bugs1239848
Bug 1239848 - Revert ProfileManager changes until a better UX/UI is ready, r=ehsan X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 1a29c77b2600d694d8cec8fb399ec184cbbdd0ba
toolkit/chrome/global/aboutProfiles.properties
toolkit/chrome/mozapps/profile/profileSelection.dtd
toolkit/chrome/mozapps/profile/profileSelection.properties
--- a/toolkit/chrome/global/aboutProfiles.properties
+++ b/toolkit/chrome/global/aboutProfiles.properties
@@ -12,17 +12,16 @@ rootDir = Root Directory
 # part of a backup scheme.)
 # In case localDIr and rootDir are equal, localDir is not shown.
 localDir = Local Directory
 currentProfile = This is the profile in use and it cannot be deleted.
 
 rename = Rename
 remove = Remove
 setAsDefault = Set as default profile
-open = Open
 
 yes = yes
 no = no
 
 renameProfileTitle = Rename Profile
 renameProfile = Rename profile %S
 
 invalidProfileNameTitle = Invalid profile name
--- a/toolkit/chrome/mozapps/profile/profileSelection.dtd
+++ b/toolkit/chrome/mozapps/profile/profileSelection.dtd
@@ -2,10 +2,30 @@
 <!--
 
  This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY            windowtitle.label      "&brandShortName; - Choose User Profile">
 
+<!ENTITY            profilename.label      "Profile Name:">
+
 <!ENTITY            start.label            "Start &brandShortName;">
 <!ENTITY            exit.label             "Exit">
+
+<!ENTITY            availprofiles.label    "Available Profiles">
+
+<!ENTITY            newButton.label        "Create Profile…">
+<!ENTITY            newButton.accesskey    "C">
+<!ENTITY            renameButton.label     "Rename Profile…">
+<!ENTITY            renameButton.accesskey "R">
+<!ENTITY            deleteButton.label     "Delete Profile…">
+<!ENTITY            deleteButton.accesskey "D">
+
+<!-- manager entities -->
+<!ENTITY            pmDescription.label    "&brandShortName; stores information about your settings, preferences, and other user items in your user profile.">
+
+<!ENTITY            offlineState.label    "Work offline">
+<!ENTITY            offlineState.accesskey "o">
+
+<!ENTITY            useSelected.label       "Use the selected profile without asking at startup">
+<!ENTITY            useSelected.accesskey   "s">
--- a/toolkit/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/chrome/mozapps/profile/profileSelection.properties
@@ -8,29 +8,44 @@
 # LOCALIZATION NOTE (restartTitle, restartMessageNoUnlocker, restartMessageUnlocker, restartMessageNoUnlockerMac, restartMessageUnlockerMac): Messages displayed when the application is running but is not responding to commands. %S is the application name.
 restartTitle=Close %S
 restartMessageNoUnlocker=%S is already running, but is not responding. To open a new window, you must first close the existing %S process, or restart your system.
 restartMessageUnlocker=%S is already running, but is not responding. The old %S process must be closed to open a new window.
 restartMessageNoUnlockerMac=A copy of %S is already open. Only one copy of %S can be open at a time.
 restartMessageUnlockerMac=A copy of %S is already open. The running copy of %S will quit in order to open this one.
 
 # Profile manager
+# LOCALIZATION NOTE (profileTooltip): First %S is the profile name, second %S is the path to the profile folder.
+profileTooltip=Profile: '%S' - Path: '%S'
+
+pleaseSelectTitle=Select Profile
+pleaseSelect=Please select a profile to begin %S, or create a new profile.
+
 profileLockedTitle=Profile In Use
 profileLocked2=%S cannot use the profile "%S" because it is in use.\n\nTo continue, close the running instance of %S or choose a different profile.
 
+renameProfileTitle=Rename Profile
+renameProfilePrompt=Rename the profile "%S" to:
+
+profileNameInvalidTitle=Invalid profile name
+profileNameInvalid=The profile name "%S" is not allowed.
+
 chooseFolder=Choose Profile Folder
 profileNameEmpty=An empty profile name is not allowed.
 invalidChar=The character "%S" is not allowed in profile names. Please choose a different name.
 
+deleteTitle=Delete Profile
+deleteProfileConfirm=Deleting a profile will remove the profile from the list of available profiles and cannot be undone.\nYou may also choose to delete the profile data files, including your settings, certificates and other user-related data. This option will delete the folder "%S" and cannot be undone.\nWould you like to delete the profile data files?
+deleteFiles=Delete Files
+dontDeleteFiles=Don't Delete Files
+
 profileCreationFailed=Profile couldn't be created. Probably the chosen folder isn't writable.
 profileCreationFailedTitle=Profile Creation failed
 profileExists=A profile with this name already exists. Please choose another name.
 profileExistsTitle=Profile Exists
 profileFinishText=Click Finish to create this new profile.
 profileFinishTextMac=Click Done to create this new profile.
 profileMissing=Your %S profile cannot be loaded. It may be missing or inaccessible.
 profileMissingTitle=Profile Missing
-pleaseSelectTitle=Select Profile
-pleaseSelect=Please select a profile to begin %S, or create a new profile.
 
 # 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