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

@@ -185,12 +185,12 @@
                     type="radio"
                     resource="direction" name="sortSet"/>
           <menuseparator id="fill-before-this-node"/>
-          <menuitem id="ascending" label="&menuitem.view.ascending.label;"
+          <menuitem id="ascending" label="&sortAscending.label;"
-                    accesskey="&menuitem.view.ascending.accesskey;"
+                    accesskey="&sortAscending.accesskey;"
                     type="radio"
                     resource="direction" name="sortDirectionSet"/>
-          <menuitem id="descending" label="&menuitem.view.descending.label;"
+          <menuitem id="descending" label="&sortDescending.label;"
-                    accesskey="&menuitem.view.descending.accesskey;"
+                    accesskey="&sortDescending.accesskey;"
                     type="radio"
                     resource="direction" name="sortDirectionSet"/>
         </menupopup>

browser/locales/en-US/chrome/browser/bookmarks/bookmarks.dtd

@@ -1,118 +0,0 @@
-<!--
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 1999
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Stephen Lamm <slamm@netscape.com>
-#   Blake Ross <blaker@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
--->
-
-<!ENTITY fileMenu.label                 "File">
-<!ENTITY fileMenu.accesskey             "F">
-<!ENTITY viewMenu.label                 "View">
-<!ENTITY viewMenu.accesskey             "V">
-
-<!ENTITY closeCmd.label "Close">
-<!ENTITY closeCmd.accesskey "C">
-<!ENTITY closeCmd.commandkey "W">
-                                                                                             
-<!ENTITY menuitem.newBookmark.label    "New Bookmark...">
-<!ENTITY menuitem.newBookmark.accesskey "B">
-<!ENTITY menuitem.newLivemark.label    "New Live Bookmark...">
-<!ENTITY menuitem.newLivemark.accesskey "L">
-<!ENTITY menuitem.newFolder.label        "New Folder...">
-<!ENTITY menuitem.newFolder.accesskey    "o">
-<!ENTITY menuitem.newSeparator.label     "New Separator">
-<!ENTITY menuitem.newSeparator.accesskey "t">
-<!ENTITY menuitem.import.label         "Import...">
-<!ENTITY menuitem.import.accesskey     "i">
-<!ENTITY menuitem.export.label         "Export...">
-<!ENTITY menuitem.export.accesskey     "e">
-<!ENTITY menuitem.find.label           "Search Bookmarks...">
-<!ENTITY command.findBookmarks.label   "Search...">
-<!ENTITY menuitem.find.accesskey       "S">
-<!ENTITY edit.find.keybinding          "f">
-<!ENTITY command.properties.label      "Properties...">
-<!ENTITY command.properties.accesskey  "i">
-<!ENTITY edit.properties.keybinding    "i">
-<!ENTITY command.rename.label          "Rename...">
-<!ENTITY command.rename.accesskey      "R">
-<!ENTITY command.delete.label          "Delete">
-<!ENTITY command.delete.accesskey      "D">
-<!ENTITY command.moveBookmark.label    "Move Bookmark(s)...">
-<!ENTITY command.moveBookmarkShort.label "Move...">
-<!ENTITY command.moveBookmark.accesskey "M">
-<!ENTITY command.addBookmark.label     "Add...">
-<!ENTITY command.manageBookmarks.label "Manage">
-<!ENTITY command.refreshLivemark.label "Reload Live Bookmark">
-<!ENTITY command.refreshLivemark.accesskey "L">
-
-<!ENTITY menuitem.view.command.toolbar.label        "Toolbar">
-<!ENTITY menuitem.view.command.toolbar.accesskey    "t">
-<!ENTITY menuitem.view.show_columns.label           "Show columns">
-<!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 menuitem.personaltoolbarfolder.label       "Set as Bookmarks Toolbar Folder">
-<!ENTITY menuitem.personaltoolbarfolder.accesskey   "b">
-
-<!ENTITY treecol.name.label             "Name">
-<!ENTITY treecol.name.accesskey         "n">
-<!ENTITY treecol.url.label              "Location">
-<!ENTITY treecol.url.accesskey          "l">
-<!ENTITY treecol.shortcut.label         "Keyword">
-<!ENTITY treecol.shortcut.accesskey     "k">
-<!ENTITY treecol.addedon.label          "Added">
-<!ENTITY treecol.addedon.accesskey      "a">
-<!ENTITY treecol.lastmod.label          "Last Modified">
-<!ENTITY treecol.lastmod.accesskey      "m">
-<!ENTITY treecol.lastvisit.label        "Last Visited">
-<!ENTITY treecol.lastvisit.accesskey    "b">
-<!ENTITY treecol.description.label      "Description">
-<!ENTITY treecol.description.accesskey  "d">
-
-<!ENTITY bookmarksRoot.label            "Bookmarks">
-
-<!ENTITY bookmarksWindowTitle.label     "Bookmark Manager">
-
-<!ENTITY search.label                   "Search:">
-<!ENTITY search.accesskey               "S">
-
-<!-- selectBookmark.xul -->
-<!ENTITY selectBookmark.title      "Set Home Page">
-<!ENTITY selectBookmark.label      "Choose a Bookmark to be your Home Page. If you choose a folder, the Bookmarks in that folder will be opened in Tabs.">

xpfe/components/bookmarks/resources/sortFolder.xul

@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is mozilla.org code.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2003
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Jan Varga <varga@ku.sk>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % sortFolderDTD SYSTEM "chrome://communicator/locale/bookmarks/sortFolder.dtd">
-%sortFolderDTD;
-]>
-
-<dialog id="sortFolder"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&window.title;"
-        style="width: 30em;"
-        buttons="accept,cancel"
-	ondialogaccept="return onAccept();">
-
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/sortFolder.js"/>
-
-  <tabbox>
-    <tabs>
-      <tab label="&sortOptions.label;"/>
-    </tabs>
-    <tabpanels>
-      <vbox>
-        <separator class="thin"/>
-        <hbox align="start">
-          <image class="message-icon"/>
-          <separator class="thin" orient="vertical"/>
-          <description flex="1">
-            &description.label;
-          </description>
-        </hbox>
-        <separator class="thin"/>
-        <grid>
-          <columns>
-            <column/>
-            <column flex="1"/>
-          </columns>
-          <rows>
-            <row align="center">
-              <label value="&sortBy.label;"/>
-              <menulist id="sortBy" oncommand="onSortByChanged()">
-                <menupopup>
-                  <menuitem value="Name" label="&sortBy.name.label;"/>
-                  <menuitem value="URL" label="&sortBy.url.label;"/>
-                  <menuitem value="ShortcutURL" label="&sortBy.shortcutUrl.label;"/>
-                  <menuitem value="Description" label="&sortBy.description.label;"/>
-                  <menuitem value="BookmarkAddDate" label="&sortBy.bookmarkAddDate.label;"/>
-                  <menuitem value="LastModifiedDate" label="&sortBy.lastModifiedDate.label;"/>
-                  <menuitem value="LastVisitDate" label="&sortBy.lastVisitDate.label;"/>
-                </menupopup>
-              </menulist>
-            </row>
-            <row align="center">
-              <label value="&sortOrder.label;"/>
-              <menulist id="sortOrder">
-                <menupopup>
-                  <menuitem value="ascending" label="&sortOrder.ascending.label;"/>
-                  <menuitem value="descending" label="&sortOrder.descending.label;"/>
-                </menupopup>
-              </menulist>
-            </row>
-          </rows>
-        </grid>
-        <separator class="thin"/>
-        <checkbox id="sortFoldersFirst" label="&sortFoldersFirst.label;"
-                  checked="true"/>
-        <checkbox id="sortRecursively" label="&sortRecursively.label;"/>
-        <separator class="thin"/>
-      </vbox>
-    </tabpanels>
-  </tabbox> 
-  
-</dialog>

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;"
+        label="&sortAscending.label;"
-        accesskey="&menuitem.view.ascending.accesskey;"
+        accesskey="&sortAscending.accesskey;"
         oncommand="return SortInNewDirection('ascending');"/>
       <menuitem type="radio" name="sort_direction" id="sort_descending"
-        label="&menuitem.view.descending.label;"
+        label="&sortDescending.label;"
-        accesskey="&menuitem.view.descending.accesskey;"
+        accesskey="&sortDescending.accesskey;"
         oncommand="return SortInNewDirection('descending');"/>
     </menupopup>
   </menu>

xpfe/components/history/resources/locale/en-US/history.dtd

@@ -1,35 +0,0 @@
-<!-- extracted from ./history.xul -->
-
-<!ENTITY menuBar.tooltip            "Menu Bar">
-<!ENTITY fileMenu.label             "File">
-<!ENTITY closeCmd.label             "Close">
-<!ENTITY editMenu.label             "Edit"> 
-<!ENTITY undoCmd.label              "Undo">
-<!ENTITY redoCmd.label              "Redo">
-<!ENTITY cutCmd.label               "Cut">
-<!ENTITY copyCmd.label              "Copy">
-<!ENTITY pasteCmd.label             "Paste">
-<!ENTITY deleteCmd.label            "Delete">
-<!ENTITY deleteHostnameCmd.accesskey "H">
-<!ENTITY deleteDomainCmd.accesskey  "s">
-<!ENTITY selAllCmd.label            "Select All">
-<!ENTITY findHisCmd.label           "Search History...">
-<!ENTITY findHisCmd.commandkey      "f">
-<!ENTITY findHisCmd.accesskey       "S">
-<!ENTITY groupBy.label              "Group By">
-<!ENTITY groupBy.accesskey          "G">
-<!ENTITY groupByDay.label           "Day">
-<!ENTITY groupByDay.accesskey       "D">
-<!ENTITY groupBySite.label          "Site">
-<!ENTITY groupBySite.accesskey      "S">
-<!ENTITY groupByNone.label          "None">
-<!ENTITY groupByNone.accesskey      "N">
-<!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 menuitem.view.show_columns.label "Show columns">
-<!ENTITY menuitem.view.show_columns.accesskey "S">