503457 - Change "Reset bookmarks to Firefox defaults" to "Delete all bookmarks except for backups"

Status: VERIFIED FIXED

(Firefox :: General, defect)

Description

[Jason Spiro]

User-Agent:       Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.7) Gecko/2009030814 Iceweasel/3.0.9 (Debian-3.0.9-1)
Build Identifier: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.7) Gecko/2009030814 Iceweasel/3.0.9 (Debian-3.0.9-1)

== My request ==

One of the Safe Mode startup screen checkboxes says "Reset bookmarks to Firefox defaults".  Please change it to instead say "Erase all bookmarks except for backups".

== Why I chose the wording that I chose ==

*  The word "erase" is very important.  It makes it clear to inexperienced users that the bookmarks will be erased.  This helps stop them from accidentally losing them.

*  The words "except for backups" are to help users who have already used the checkbox and erased their bookmarks, and now want them back.  It tells them that their bookmarks are not really lost.  It points them towards the next step towards getting back their bookmarks.

*  You don't need to spend words to say the Firefox default bookmarks will be installed.  Just install them without telling users you're going to.  But if you insist, then feel free to make the dialog box wider, the string longer, and tell users you're going to install them.

Regards,
Jason Spiro (jspiro on irc.mozilla.org)

Reproducible: Always

Comment 1

[u264733]

Sounds good.

Comment 2

[Robert Strong (they/them - no direct email)]

The strings live in
http://mxr.mozilla.org/mozilla-central/source/browser/locales/en-US/chrome/browser/safeMode.dtd

so moving back to Firefox

Comment 3

[Tyler Downer [He/Him]]

Attachment: Patch v1

Robert, do you have peer review on this? Do we need a ui-review as well?

Comment 4

[Robert Strong (they/them - no direct email)]

Comment on attachment 388519 [details] [diff] [review]
Patch v1

This should have ui-review... requesting from faaborg.

If this change is approved I also think the accesskey should be changed to E since the first letter would no longer conflict with the one for resetToolbars.

If this gets ui-review+ you can request from me or someone else on the reviewers list
http://www.mozilla.org/projects/firefox/review.html

Comment 5

[Tyler Downer [He/Him]]

ok, sounds good. I can make the accesskey change too.

Comment 6

[Tyler Downer [He/Him]]

Attachment: Patch v1.1

This makes the accesskey "E" based on comment 4

Comment 7

[Alex Faaborg [:faaborg] (Firefox UX)]

Comment on attachment 388551 [details] [diff] [review]
Patch v1.1

Perhaps "delete" instead of "erase" we want to use consistent terminology throughout the app, and erase sometimes has connotations of writing random data over the existing data, which I believe isn't the case for this action.

Comment 8

[Tyler Downer [He/Him]]

Attachment: Patch v2

Makes it delete. The only question,. what would be a good accesskay, as "D" is already used?

Comment 9

[Robert Strong (they/them - no direct email)]

I'd keep it as b since D is already used.

Comment 10

[Tyler Downer [He/Him]]

Attachment: Patch v2.1

OK then, "b" it is :)

Comment 11

[Jennifer Morrow [:Boriss] (UX)]

Comment on attachment 388690 [details] [diff] [review]
Patch v2.1

Looks good - this string change makes the result of the action much clearer

Comment 12

[Robert Strong (they/them - no direct email)]

Comment on attachment 388690 [details] [diff] [review]
Patch v2.1

>diff --git a/browser/locales/en-US/chrome/browser/safeMode.dtd b/browser/locales/en-US/chrome/browser/safeMode.dtd
>--- a/browser/locales/en-US/chrome/browser/safeMode.dtd
>+++ b/browser/locales/en-US/chrome/browser/safeMode.dtd
>@@ -43,18 +43,18 @@
> <!ENTITY safeModeDescription2.label   "You can make some or all of these changes permanent:">
> 
> <!ENTITY disableAddons.label          "Disable all add-ons">
> <!ENTITY disableAddons.accesskey      "D">
> 
> <!ENTITY resetToolbars.label          "Reset toolbars and controls">
> <!ENTITY resetToolbars.accesskey      "R">
> 
>-<!ENTITY resetBookmarks.label         "Reset bookmarks to &brandShortName; defaults">
>-<!ENTITY resetBookmarks.accesskey     "b">
>+<!ENTITY deleteBookmarks.label         "Delete all bookmarks except for backups">
>+<!ENTITY deleteBookmarks.accesskey     "b">
nit: line these up with the rest for consistency

Comment 13

[Tyler Downer [He/Him]]

Comment on attachment 388690 [details] [diff] [review]
Patch v2.1

>diff --git a/browser/base/content/safeMode.js b/browser/base/content/safeMode.js
>--- a/browser/base/content/safeMode.js
>+++ b/browser/base/content/safeMode.js
>@@ -106,17 +106,17 @@ function restoreDefaultSearchEngines() {
> 
>   searchService.restoreDefaultEngines();
> }
> 
> function onOK() {
>   try {
>     if (document.getElementById("resetUserPrefs").checked)
>       clearAllPrefs();
>-    if (document.getElementById("resetBookmarks").checked)
>+    if (document.getElementById("deleteBookmarks").checked)
>       restoreDefaultBookmarks();
>     if (document.getElementById("resetToolbars").checked)
>       deleteLocalstore();
>     if (document.getElementById("disableAddons").checked)
>       disableAddons();
>     if (document.getElementById("restoreSearch").checked)
>       restoreDefaultSearchEngines();
>   } catch(e) {
>@@ -134,13 +134,13 @@ function onLoad() {
> function onLoad() {
>   document.getElementById("tasks")
>           .addEventListener("CheckboxStateChange", UpdateOKButtonState, false);
> }
> 
> function UpdateOKButtonState() {
>   document.documentElement.getButton("accept").disabled = 
>     !document.getElementById("resetUserPrefs").checked &&
>-    !document.getElementById("resetBookmarks").checked &&
>+    !document.getElementById("deleteBookmarks").checked &&
>     !document.getElementById("resetToolbars").checked &&
>     !document.getElementById("disableAddons").checked &&
>     !document.getElementById("restoreSearch").checked;
> }
>diff --git a/browser/base/content/safeMode.xul b/browser/base/content/safeMode.xul
>--- a/browser/base/content/safeMode.xul
>+++ b/browser/base/content/safeMode.xul
>@@ -74,15 +74,15 @@
>   <description>&safeModeDescription.label;</description>
> 
>   <separator class="thin"/>
> 
>   <label value="&safeModeDescription2.label;"/>
>   <vbox id="tasks">
>     <checkbox id="disableAddons"  label="&disableAddons.label;"  accesskey="&disableAddons.accesskey;"/>
>     <checkbox id="resetToolbars"  label="&resetToolbars.label;"  accesskey="&resetToolbars.accesskey;"/>
>-    <checkbox id="resetBookmarks" label="&resetBookmarks.label;" accesskey="&resetBookmarks.accesskey;"/>
>+    <checkbox id="deleteBookmarks" label="&deleteBookmarks.label;" accesskey="&deleteBookmarks.accesskey;"/>
>     <checkbox id="resetUserPrefs" label="&resetUserPrefs.label;" accesskey="&resetUserPrefs.accesskey;"/>
>     <checkbox id="restoreSearch"  label="&restoreSearch.label;"  accesskey="&restoreSearch.accesskey;"/>
>   </vbox>
>      
>   <separator class="thin"/>
> </dialog>
>diff --git a/browser/locales/en-US/chrome/browser/safeMode.dtd b/browser/locales/en-US/chrome/browser/safeMode.dtd
>--- a/browser/locales/en-US/chrome/browser/safeMode.dtd
>+++ b/browser/locales/en-US/chrome/browser/safeMode.dtd
>@@ -43,18 +43,18 @@
> <!ENTITY safeModeDescription2.label   "You can make some or all of these changes permanent:">
> 
> <!ENTITY disableAddons.label          "Disable all add-ons">
> <!ENTITY disableAddons.accesskey      "D">
> 
> <!ENTITY resetToolbars.label          "Reset toolbars and controls">
> <!ENTITY resetToolbars.accesskey      "R">
> 
>-<!ENTITY resetBookmarks.label         "Reset bookmarks to &brandShortName; defaults">
>-<!ENTITY resetBookmarks.accesskey     "b">
>+<!ENTITY deleteBookmarks.label        "Delete all bookmarks except for backups">
>+<!ENTITY deleteBookmarks.accesskey    "b">
> 
> <!ENTITY resetUserPrefs.label         "Reset all user preferences to &brandShortName; defaults">
> <!ENTITY resetUserPrefs.accesskey     "p">
> 
> <!ENTITY restoreSearch.label          "Restore default search engines">
> <!ENTITY restoreSearch.accesskey      "s">
> 
> <!ENTITY changeAndRestartButton.label "Make Changes and Restart">

Comment 14

[Tyler Downer [He/Him]]

Attachment: for checkin

Sorry about that comment before, my bad.
Think this is good to go.

Comment 15

[Dão Gottwald [:dao]]

http://hg.mozilla.org/mozilla-central/rev/cf345e0a7cf9

Comment 16

[Tyler Downer [He/Him]]

V. Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2a1pre) Gecko/20090801 Minefield/3.6a1pre (.NET CLR 3.5.30729) ID:20090801042759