From 4dee973a0e838f148bc36853b6bb3d0d7be3cc44 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <timeless%mozdev.org>
Date: Tue, 29 Nov 2005 00:54:34 +0000
Subject: [PATCH] Bug 301562 A > Z Sort Order is confusing, should be
 Ascending/Descending patch by supernova_00@yahoo.com r=mconnor

---
 browser/components/bookmarks/content/bookmarksManager.xul | 8 ++++----
 .../locales/en-US/chrome/browser/bookmarks/bookmarks.dtd  | 8 ++++----
 xpfe/components/bookmarks/resources/sortFolder.xul        | 4 ++--
 xpfe/components/history/resources/history.xul             | 8 ++++----
 .../components/history/resources/locale/en-US/history.dtd | 8 ++++----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/browser/components/bookmarks/content/bookmarksManager.xul b/browser/components/bookmarks/content/bookmarksManager.xul
index 0bfaa537baa3..d86294852f03 100644
--- a/browser/components/bookmarks/content/bookmarksManager.xul
+++ b/browser/components/bookmarks/content/bookmarksManager.xul
@@ -185,12 +185,12 @@
                     type="radio"
                     resource="direction" name="sortSet"/>
           <menuseparator id="fill-before-this-node"/>
-          <menuitem id="ascending" label="&menuitem.view.ascending.label;"
-                    accesskey="&menuitem.view.ascending.accesskey;"
+          <menuitem id="ascending" label="&sortAscending.label;"
+                    accesskey="&sortAscending.accesskey;"
                     type="radio"
                     resource="direction" name="sortDirectionSet"/>
-          <menuitem id="descending" label="&menuitem.view.descending.label;"
-                    accesskey="&menuitem.view.descending.accesskey;"
+          <menuitem id="descending" label="&sortDescending.label;"
+                    accesskey="&sortDescending.accesskey;"
                     type="radio"
                     resource="direction" name="sortDirectionSet"/>
         </menupopup>
diff --git a/browser/locales/en-US/chrome/browser/bookmarks/bookmarks.dtd b/browser/locales/en-US/chrome/browser/bookmarks/bookmarks.dtd
index 1a98aa945195..ef6431038c25 100644
--- a/browser/locales/en-US/chrome/browser/bookmarks/bookmarks.dtd
+++ b/browser/locales/en-US/chrome/browser/bookmarks/bookmarks.dtd
@@ -84,10 +84,10 @@
 <!ENTITY menuitem.view.show_columns.accesskey       "S">
 <!ENTITY menuitem.view.unsorted.label               "Unsorted">
 <!ENTITY menuitem.view.unsorted.accesskey           "u">
-<!ENTITY menuitem.view.ascending.label              "A > Z Sort Order">
-<!ENTITY menuitem.view.ascending.accesskey          "a">
-<!ENTITY menuitem.view.descending.label             "Z > A Sort Order">
-<!ENTITY menuitem.view.descending.accesskey         "z">
+<!ENTITY sortAscending.label                        "Ascending">
+<!ENTITY sortAscending.accesskey                    "A">
+<!ENTITY sortDescending.label                       "Descending">
+<!ENTITY sortDescending.accesskey                   "D">
 <!ENTITY menuitem.personaltoolbarfolder.label       "Set as Bookmarks Toolbar Folder">
 <!ENTITY menuitem.personaltoolbarfolder.accesskey   "b">
 
diff --git a/xpfe/components/bookmarks/resources/sortFolder.xul b/xpfe/components/bookmarks/resources/sortFolder.xul
index 229206ce4bd2..6c00678c7988 100644
--- a/xpfe/components/bookmarks/resources/sortFolder.xul
+++ b/xpfe/components/bookmarks/resources/sortFolder.xul
@@ -94,8 +94,8 @@
               <label value="&sortOrder.label;"/>
               <menulist id="sortOrder">
                 <menupopup>
-                  <menuitem value="ascending" label="&sortOrder.ascending.label;"/>
-                  <menuitem value="descending" label="&sortOrder.descending.label;"/>
+                  <menuitem value="ascending" label="&sortAscending.label;"/>
+                  <menuitem value="descending" label="&sortDescending.label;"/>
                 </menupopup>
               </menulist>
             </row>
diff --git a/xpfe/components/history/resources/history.xul b/xpfe/components/history/resources/history.xul
index 3125838e6e99..dfa0c22aac7f 100644
--- a/xpfe/components/history/resources/history.xul
+++ b/xpfe/components/history/resources/history.xul
@@ -129,12 +129,12 @@
       <menuseparator id="fill_after_this_node"/>
       <menuseparator id="fill_before_this_node"/>
       <menuitem type="radio" name="sort_direction" id="sort_ascending"
-        label="&menuitem.view.ascending.label;"
-        accesskey="&menuitem.view.ascending.accesskey;"
+        label="&sortAscending.label;"
+        accesskey="&sortAscending.accesskey;"
         oncommand="return SortInNewDirection('ascending');"/>
       <menuitem type="radio" name="sort_direction" id="sort_descending"
-        label="&menuitem.view.descending.label;"
-        accesskey="&menuitem.view.descending.accesskey;"
+        label="&sortDescending.label;"
+        accesskey="&sortDescending.accesskey;"
         oncommand="return SortInNewDirection('descending');"/>
     </menupopup>
   </menu>
diff --git a/xpfe/components/history/resources/locale/en-US/history.dtd b/xpfe/components/history/resources/locale/en-US/history.dtd
index b3b4dc82cc01..3eaab3f6ecf0 100644
--- a/xpfe/components/history/resources/locale/en-US/history.dtd
+++ b/xpfe/components/history/resources/locale/en-US/history.dtd
@@ -27,9 +27,9 @@
 <!ENTITY historyWindowTitle.label   "History">
 <!ENTITY menuitem.view.unsorted.label "Unsorted">
 <!ENTITY menuitem.view.unsorted.accesskey "u">
-<!ENTITY menuitem.view.ascending.label "A > Z Sort Order">
-<!ENTITY menuitem.view.ascending.accesskey "a">
-<!ENTITY menuitem.view.descending.label "Z > A Sort Order">
-<!ENTITY menuitem.view.descending.accesskey "z">
+<!ENTITY sortAscending.label         "Ascending">
+<!ENTITY sortAscending.accesskey     "A">
+<!ENTITY sortDescending.label        "Descending">
+<!ENTITY sortDescending.accesskey    "D">
 <!ENTITY menuitem.view.show_columns.label "Show columns">
 <!ENTITY menuitem.view.show_columns.accesskey "S">