bug 463886 - Remove obsolete/unused entities in suite string files, common part, r+sr=Neil
authorVlado Valastiak <wladow@gmail.com>
Mon, 10 Nov 2008 13:11:05 +0100
changeset 1054 dd2de09976848b38a8918737e20f2a73e2870ddd
parent 1053 3c377a3fb7de1843724f28695264f55902af91c4
child 1055 5481635e0b6e254d4782b639e62a804bec635b00
push id790
push userkairo@kairo.at
push dateMon, 10 Nov 2008 12:09:42 +0000
treeherdercomm-central@dd2de0997684 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs463886
bug 463886 - Remove obsolete/unused entities in suite string files, common part, r+sr=Neil
suite/common/bookmarks/bookmarksManager.xul
suite/common/bookmarks/bookmarksOverlay.xul
suite/common/search/search-editor.xul
suite/locales/en-US/chrome/common/bookmarks/addBookmark.dtd
suite/locales/en-US/chrome/common/bookmarks/bookmarks.dtd
suite/locales/en-US/chrome/common/bookmarks/bookmarks.properties
suite/locales/en-US/chrome/common/contentAreaCommands.dtd
suite/locales/en-US/chrome/common/contentAreaCommands.properties
suite/locales/en-US/chrome/common/permissions/cookieViewer.dtd
suite/locales/en-US/chrome/common/permissions/permissionsNavigatorOverlay.dtd
suite/locales/en-US/chrome/common/pref/pref-certs.dtd
suite/locales/en-US/chrome/common/pref/pref-download.dtd
suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
suite/locales/en-US/chrome/common/pref/pref-images.dtd
suite/locales/en-US/chrome/common/pref/pref-popups.dtd
suite/locales/en-US/chrome/common/pref/pref-ssl.dtd
suite/locales/en-US/chrome/common/pref/preferences.dtd
suite/locales/en-US/chrome/common/pref/prefutilities.properties
suite/locales/en-US/chrome/common/search/search-panel.dtd
suite/locales/en-US/chrome/common/sidebar/preview.dtd
suite/locales/en-US/chrome/common/tasksOverlay.dtd
suite/locales/en-US/chrome/common/utilityOverlay.dtd
suite/locales/jar.mn
--- a/suite/common/bookmarks/bookmarksManager.xul
+++ b/suite/common/bookmarks/bookmarksManager.xul
@@ -109,23 +109,23 @@
 
   <toolbox id="bookmarks-toolbox">
     <menubar id="main-menubar" grippytooltiptext="&menuBar.tooltip;">
       <menu id="menu_File">
         <menupopup id="menu_FilePopup">
           <menu id="menu_New">
             <menupopup>
               <menuitem label="&menuitem.newBookmark.label;"
-                        accesskey="&command.newBookmark.accesskey;"
+                        accesskey="&menuitem.newBookmark.accesskey;"
                         observes="cmd_bm_newbookmark"/>
               <menuitem label="&menuitem.newFolder.label;"
-                        accesskey="&command.newFolder.accesskey;"
+                        accesskey="&menuitem.newFolder.accesskey;"
                         observes="cmd_bm_newfolder"/>
               <menuitem label="&menuitem.newSeparator.label;"
-                        accesskey="&command.newSeparator.accesskey;"
+                        accesskey="&menuitem.newSeparator.accesskey;"
                         observes="cmd_bm_newseparator"/>
             </menupopup>
           </menu>
           <menuitem label="&menuitem.open.label;"
                     accesskey="&menuitem.open.accesskey;"
                     oncommand="OpenBookmarksFile();"/>
           <menuitem id="menu_close"/>
         </menupopup>
@@ -147,30 +147,30 @@
           <menuitem id="menu_bm_delete"
                     label="&deleteCmd.label;" accesskey="&deleteCmd.accesskey;"
                     key="key_delete" command="cmd_bm_delete"/>
           <menuseparator/>
           <menuitem id="menu_bm_selectAll"
                     label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
                     key="key_selectAll" command="cmd_bm_selectAll"/>
           <menuseparator/>
-          <menuitem label="&command.moveBookmark.label;"
-                    accesskey="&command.moveBookmark.accesskey;"
+          <menuitem label="&menuitem.moveBookmark.label;"
+                    accesskey="&menuitem.moveBookmark.accesskey;"
                     command="cmd_bm_movebookmark"/>
           <menuseparator/>
           <menuitem label="&command.sortFolder.label;"
                     accesskey="&command.sortFolder.accesskey;"
                     key="bm_key_sortFolder"
                     command="cmd_bm_sortfolder"/>
           <menuitem label="&command.sortFolderByName.label;"
                     accesskey="&command.sortFolderByName.accesskey;"
                     command="cmd_bm_sortfolderbyname"/>
           <menuseparator/>
-          <menuitem label="&command.properties.label;"
-                    accesskey="&command.properties.accesskey;"
+          <menuitem label="&menuitem.properties.label;"
+                    accesskey="&menuitem.properties.accesskey;"
                     key="bm_key_properties"
                     command="cmd_bm_properties" />
         </menupopup>
       </menu>
 
       <menu id="menu_View">
         <menupopup>
           <menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
@@ -221,27 +221,27 @@
     <toolbar class="chromeclass-toolbar" id="command-toolbar" grippytooltiptext="&bookmarkToolbar.tooltip;">
       <toolbarbutton id="newfolder" label="&button.newFolder.label;"
                      accesskey="&button.newFolder.accesskey;"
                      command="cmd_bm_newfolder"/>
       <toolbarbutton id="newseparator" label="&button.newSeparator.label;"
                      accesskey="&button.newSeparator.accesskey;"
                      command="cmd_bm_newseparator"/>
       <toolbarseparator/>
-      <toolbarbutton id="moveBookmark" label="&command.moveBookmarkShort.label;"
-                     accesskey="&command.moveBookmark.accesskey;"
+      <toolbarbutton id="moveBookmark" label="&button.moveBookmark.label;"
+                     accesskey="&button.moveBookmark.accesskey;"
                      command="cmd_bm_movebookmark"/>
       <toolbarseparator/>
-      <toolbarbutton id="properties" label="&command.properties.label;"
+      <toolbarbutton id="properties" label="&button.properties.label;"
                      accesskey="&button.properties.accesskey;"
                      command="cmd_bm_properties"/>
-      <toolbarbutton id="rename" label="&command.rename.label;"
+      <toolbarbutton id="rename" label="&button.rename.label;"
                      accesskey="&button.rename.accesskey;"
                      command="cmd_bm_rename"/>
-      <toolbarbutton id="delete" label="&command.delete.label;"
+      <toolbarbutton id="delete" label="&button.delete.label;"
                      accesskey="&button.delete.accesskey;"
                      command="cmd_bm_delete"/>
       <toolbarspring/>
       <toolbaritem id="bookmarks-search-box" align="center">
         <label value="&search.label;" accesskey="&search.accesskey;"
                control="search-box"/>
         <textbox id="search-box" type="search" clickSelectsAll="true"
                  oncommand="document.getElementById('bookmarks-view').searchBookmarks(this.value)"/>
--- a/suite/common/bookmarks/bookmarksOverlay.xul
+++ b/suite/common/bookmarks/bookmarksOverlay.xul
@@ -35,22 +35,17 @@
  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 ***** -->
 
-<!DOCTYPE overlay [
-<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd" >
-%utilDTD;
-<!ENTITY % bmDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
-%bmDTD;
-]>
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
 
 <overlay id="bookmarksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_bookmarks" src="chrome://communicator/locale/bookmarks/bookmarks.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
@@ -100,21 +95,21 @@
     <key id="key_selectAll" command="cmd_bm_selectAll"/>
 
     <!-- These keybindings do have a command specified in the overlay,
          which we need to correct in our Startup() function -->
     <key id="key_delete"/>
     <key id="key_delete2"/>
 
     <key id="bm_key_find"
-         key="&edit.find.keybinding;"
+         key="&menuitem.find.find.key;"
          command="cmd_bm_find" modifiers="accel"/>
 
     <key id="bm_key_sortFolder"
-         key="&edit.sortFolder.keybinding;"
+         key="&command.sortFolder.key;"
          command="cmd_bm_sortfolder" modifiers="accel"/>
 
     <key id="bm_key_properties"
-         key="&edit.properties.keybinding;"
+         key="&menuitem.properties.key;"
          command="cmd_bm_properties" modifiers="accel"/>
   </keyset>
 
 </overlay>
--- a/suite/common/search/search-editor.xul
+++ b/suite/common/search/search-editor.xul
@@ -76,41 +76,45 @@
                     loading="rdf:http://home.netscape.com/NC-rdf#loading"
                     image="rdf:http://home.netscape.com/NC-rdf#Icon"
                     label="rdf:http://home.netscape.com/NC-rdf#Name"/>
         </template>
     
       </listbox>
       
       <hbox>
-        <button id="add-button" oncommand="return AddEngine()" label="&add.label;" />
+        <button id="add-button" oncommand="return AddEngine()"
+                label="&add.label;" accesskey="&add.accesskey;"/>
       </hbox>
     </vbox>
     
     <separator class="groove" orient="vertical" style="width: 0px;"/>
         
     <vbox flex="1">
       <hbox align="center">
-        <label value="&category.label;" control="categoryList"/>
+        <label value="&category.label;" accesskey="&category.accesskey;" control="categoryList"/>
         <menulist id="categoryList" ref="NC:SearchCategoryRoot" datasources="rdf:null" flex="1">
           <template>
             <menupopup>
               <menuitem uri="rdf:*" oncommand="return chooseCategory(this);"
                         value="rdf:http://home.netscape.com/NC-rdf#category"
                         label="rdf:http://home.netscape.com/NC-rdf#title"/>
             </menupopup>
           </template>
           <menupopup id="categoryPopup"/>
         </menulist>
       </hbox>
       
       <hbox>
-        <button id="new-category-button" oncommand="NewCategory()" label="&new.category.label;" flex="1"/>
-        <button id="rename-category-button" oncommand="RenameCategory()" label="&rename.category.label;" flex="1"/>
-        <button id="remove-category.buttom" oncommand="RemoveCategory()" label="&remove.category.label;" flex="1"/>
+        <button id="new-category-button" oncommand="NewCategory()"
+                label="&new.category.label;" accesskey="&new.category.accesskey;" flex="1"/>
+        <button id="rename-category-button" oncommand="RenameCategory()"
+                label="&rename.category.label;" accesskey="&rename.category.accesskey;" flex="1"/>
+        <button id="remove-category.buttom" oncommand="RemoveCategory()"
+                label="&remove.category.label;" accesskey="&remove.category.accesskey;" flex="1"/>
       </hbox>
       
       <separator class="thin"/>
 
       <hbox flex="1">
         <listbox id="engineList" seltype="multiple" flex="1"
                  style="height: 0px;"
                  datasources="rdf:internetsearch"
@@ -133,15 +137,16 @@
         <vbox>
           <spacer flex="1"/>
           <button class="up" oncommand="MoveUp();" id="up" disabled="true"/>
           <button class="down" oncommand="MoveDown();" id="down" disabled="true"/>
           <spacer flex="1"/>
         </vbox>
       </hbox>          
       <hbox>
-        <button id="remove-button" oncommand="return RemoveEngine()" label="&remove.label;" />
+        <button id="remove-button" oncommand="return RemoveEngine()"
+                label="&remove.label;" accesskey="&remove.accesskey;"/>
       </hbox>    
       
     </vbox>
   
   </hbox>
 </dialog>
--- a/suite/locales/en-US/chrome/common/bookmarks/addBookmark.dtd
+++ b/suite/locales/en-US/chrome/common/bookmarks/addBookmark.dtd
@@ -39,13 +39,12 @@
 <!ENTITY selectFolder.title         "Choose Folder">
 <!ENTITY name.label                 "Name:">
 <!ENTITY name.accesskey             "N">
 <!ENTITY url.label                  "Location:">
 <!ENTITY url.accesskey              "L">
 <!ENTITY shortcutURL.label          "Keyword:">
 <!ENTITY shortcutURL.accesskey      "K">
 <!ENTITY destination.label          "Destination:">
-<!ENTITY destination.accesskey      "D">
 <!ENTITY newFolder.label            "New Folder…">
 <!ENTITY newFolder.accesskey        "w">
 <!ENTITY addGroup.label             "Bookmark this group of tabs">
 <!ENTITY addGroup.accesskey         "B">
--- a/suite/locales/en-US/chrome/common/bookmarks/bookmarks.dtd
+++ b/suite/locales/en-US/chrome/common/bookmarks/bookmarks.dtd
@@ -35,53 +35,54 @@
    - 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 ***** -->
 
 <!-- extracted from ./bookmarks.xul -->
 <!ENTITY menuBar.tooltip               "Menu Bar">
 <!ENTITY bookmarkToolbar.tooltip       "Bookmark Toolbar">
-<!ENTITY bookmarksSearch.tooltip       "Bookmarks Search Toolbar">
 <!ENTITY menuitem.newBookmark.label    "Bookmark">
-<!ENTITY command.newBookmark.accesskey "B">
+<!ENTITY menuitem.newBookmark.accesskey "B">
 <!ENTITY menuitem.newFolder.label      "Folder">
+<!ENTITY menuitem.newFolder.accesskey  "F">
 <!ENTITY button.newFolder.label        "New Folder">
 <!ENTITY button.newFolder.accesskey    "N">
-<!ENTITY command.newFolder.accesskey   "F">
 <!ENTITY menuitem.newSeparator.label   "Separator">
+<!ENTITY menuitem.newSeparator.accesskey "S">
 <!ENTITY button.newSeparator.label     "New Separator">
-<!ENTITY button.newSeparator.accesskey  "o">
-<!ENTITY command.newSeparator.accesskey "S">
+<!ENTITY button.newSeparator.accesskey "o">
 <!ENTITY menuitem.open.label           "Open Bookmarks File…">
 <!ENTITY menuitem.open.accesskey       "O">
 <!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 menuitem.find.accesskey       "S">
+<!ENTITY menuitem.find.find.key        "F">
 <!ENTITY command.findBookmarks.label   "Search…">
-<!ENTITY menuitem.find.accesskey       "S">
-<!ENTITY edit.find.keybinding          "f">
-<!ENTITY command.properties.label      "Properties…">
-<!ENTITY button.properties.accesskey  "P">
-<!ENTITY command.properties.accesskey  "o">
-<!ENTITY edit.properties.keybinding    "i">
-<!ENTITY command.rename.label          "Rename…">
-<!ENTITY button.rename.accesskey      "R">
-<!ENTITY command.delete.label          "Delete">
-<!ENTITY button.delete.accesskey      "D">
-<!ENTITY command.moveBookmark.label    "Move Bookmark(s)…">
-<!ENTITY command.moveBookmarkShort.label "Move…">
-<!ENTITY command.moveBookmark.accesskey "M">
+<!ENTITY menuitem.properties.label     "Properties…">
+<!ENTITY menuitem.properties.accesskey "o">
+<!ENTITY button.properties.label       "Properties…">
+<!ENTITY button.properties.accesskey   "P">
+<!ENTITY menuitem.properties.key       "I">
+<!ENTITY button.rename.label           "Rename…">
+<!ENTITY button.rename.accesskey       "R">
+<!ENTITY button.delete.label           "Delete">
+<!ENTITY button.delete.accesskey       "D">
+<!ENTITY menuitem.moveBookmark.label   "Move Bookmark(s)…">
+<!ENTITY menuitem.moveBookmark.accesskey "M">
+<!ENTITY button.moveBookmark.label     "Move…">
+<!ENTITY button.moveBookmark.accesskey "M">
 <!ENTITY command.addBookmark.label     "Add…">
 <!ENTITY command.manageBookmarks.label "Manage">
 <!ENTITY command.sortFolder.label      "Sort Folder…">
 <!ENTITY command.sortFolder.accesskey  "S">
-<!ENTITY edit.sortFolder.keybinding    "S">
+<!ENTITY command.sortFolder.key        "S">
 <!ENTITY command.sortFolderByName.label "Sort Folder by Name">
 <!ENTITY command.sortFolderByName.accesskey "N">
 
 <!ENTITY menuitem.view.command.toolbar.label        "Toolbar">
 <!ENTITY menuitem.view.command.toolbar.accesskey    "t">
 <!ENTITY menuitem.view.command.searchbar.label      "Search bar">
 <!ENTITY menuitem.view.command.searchbar.accesskey  "S">
 <!ENTITY menuitem.view.show_columns.label           "Show columns">
@@ -89,33 +90,26 @@
 <!ENTITY menuitem.newbookmarkfolder.label           "Set as New Bookmark Folder">
 <!ENTITY menuitem.newbookmarkfolder.accesskey       "b">
 <!ENTITY menuitem.newinternetsearchfolder.label     "Set as New Internet Search Folder">
 <!ENTITY menuitem.newinternetsearchfolder.accesskey "i">
 <!ENTITY menuitem.personaltoolbarfolder.label       "Set as Personal Toolbar Folder">
 <!ENTITY menuitem.personaltoolbarfolder.accesskey   "p">
 
 <!ENTITY treecol.name.label             "Name">
-<!ENTITY treecol.name.accesskey         "n">
 <!ENTITY treecol.name.tooltip           "Click to sort by name">
 <!ENTITY treecol.url.label              "Location">
-<!ENTITY treecol.url.accesskey          "l">
 <!ENTITY treecol.url.tooltip            "Click to sort by location">
 <!ENTITY treecol.shortcut.label         "Keyword">
-<!ENTITY treecol.shortcut.accesskey     "k">
 <!ENTITY treecol.shortcut.tooltip       "Click to sort by keyword">
 <!ENTITY treecol.description.label      "Description">
-<!ENTITY treecol.description.accesskey  "d">
 <!ENTITY treecol.description.tooltip    "Click to sort by description">
 <!ENTITY treecol.addedon.label          "Added">
-<!ENTITY treecol.addedon.accesskey      "a">
 <!ENTITY treecol.addedon.tooltip        "Click to sort by added">
 <!ENTITY treecol.lastmod.label          "Last Modified">
-<!ENTITY treecol.lastmod.accesskey      "m">
 <!ENTITY treecol.lastmod.tooltip        "Click to sort by last modified">
 <!ENTITY treecol.lastvisit.label        "Last Visited">
-<!ENTITY treecol.lastvisit.accesskey    "b">
 <!ENTITY treecol.lastvisit.tooltip      "Click to sort by last visit">
 
 <!ENTITY bookmarksWindowTitle.label     "Bookmark Manager">
 
 <!ENTITY search.label                     "Search">
 <!ENTITY search.accesskey                 "S">
--- a/suite/locales/en-US/chrome/common/bookmarks/bookmarks.properties
+++ b/suite/locales/en-US/chrome/common/bookmarks/bookmarks.properties
@@ -64,37 +64,31 @@ cmd_bm_sortfolder.accesskey = S
 cmd_bm_openinnewwindow.label = Open in New Window
 cmd_bm_openinnewwindow.accesskey = W
 cmd_bm_openinnewtab.label = Open in New Tab 
 cmd_bm_openinnewtab.accesskey = T 
 cmd_bm_newfolder.label = New Folder…
 cmd_bm_newfolder.accesskey = F
 
 ile_newfolder = New Folder
-ile_newbookmark = New Bookmark
-newfolder_dialog_title = Create New Folder
-newfolder_dialog_msg = Create a New Folder named:
 
 window_title = %S - Bookmarks
 search_results_title = Search Results
 
-file_in = File in "%S"
-
 bookmarks_default_root = Bookmarks
 bookmarks_root = Bookmarks for %S
 bookmarks_title = Bookmark Manager
 status_foldercount = %S object(s)
 
 WebPageUpdated = The following web page has been updated:
 WebPageTitle = Title:
 WebPageURL = URL:
 WebPageAskDisplay = Would you like to display it?
 WebPageAskStopOption = Stop checking for updates on this web page
 
-pleaseEnterALocation = Please enter a location
 pleaseEnterADuration = Please enter a duration.
 pleaseSelectANotification = Please enter at least one notification method.
 
 SortMenuItem = Sorted by %S
 
 ShortFindTitle = Find: '%S'
 FindTitle = Find: %S %S '%S' in %S
 
--- a/suite/locales/en-US/chrome/common/contentAreaCommands.dtd
+++ b/suite/locales/en-US/chrome/common/contentAreaCommands.dtd
@@ -10,18 +10,16 @@
 <!ENTITY openLinkInWindowCmd.label    "Open">
 <!ENTITY openLinkInWindowCmd.accesskey "p">
 <!ENTITY openFrameCmd.label           "Open Frame in New Window">
 <!ENTITY openFrameCmd.accesskey       "W">
 <!ENTITY openFrameCmdInTab.label      "Open Frame in New Tab">
 <!ENTITY openFrameCmdInTab.accesskey  "T">
 <!ENTITY showOnlyThisFrameCmd.label     "Show Only This Frame">
 <!ENTITY showOnlyThisFrameCmd.accesskey "S">
-<!ENTITY addToBookmarksCmd.label      "Bookmark This Page">
-<!ENTITY addToBookmarksCmd.accesskey  "B">
 <!ENTITY goBackCmd.label              "Back">
 <!ENTITY goBackCmd.accesskey          "B">
 <!ENTITY goForwardCmd.label           "Forward">
 <!ENTITY goForwardCmd.accesskey       "F">
 <!ENTITY goUpCmd.label                "Up">
 <!ENTITY goUpCmd.accesskey            "U">
 <!ENTITY reloadCmd.label              "Reload">
 <!ENTITY reloadCmd.accesskey          "R">
--- a/suite/locales/en-US/chrome/common/contentAreaCommands.properties
+++ b/suite/locales/en-US/chrome/common/contentAreaCommands.properties
@@ -3,17 +3,16 @@
 searchText=Search Web for "%S"
 searchText.accesskey=W
 
 blockImage=Block Images from %S
 blockImage.accesskey=B
 unblockImage=Unblock Images from %S
 unblockImage.accesskey=b
 
-SavePageTitle=Save Web Page
 SaveImageTitle=Save Image
 SaveVideoTitle=Save Video
 SaveAudioTitle=Save Audio
 SaveLinkTitle=Save As
 SaveAttachmentTitle=Save Attachment
 DefaultSaveFileName=index
 WebPageCompleteFilter=Web Page, complete
 WebPageHTMLOnlyFilter=Web Page, HTML only
@@ -21,11 +20,8 @@ WebPageXHTMLOnlyFilter=Web Page, XHTML o
 WebPageSVGOnlyFilter=Web Page, SVG only
 WebPageXMLOnlyFilter=Web Page, XML only
 
 # LOCALIZATION NOTE (filesFolder):
 #    This is the name of the folder that is created parallel to a HTML file 
 #    when it is saved "With Images". The %S section is replaced with the
 #    leaf name of the file being saved (minus extension).
 filesFolder=%S_files
-
-saveLinkErrorMsg=The link could not be saved.  The web page might have been removed or had its name changed.
-saveLinkErrorTitle=Save Link
--- a/suite/locales/en-US/chrome/common/permissions/cookieViewer.dtd
+++ b/suite/locales/en-US/chrome/common/permissions/cookieViewer.dtd
@@ -30,13 +30,10 @@
 <!ENTITY     allowSite.accesskey            "A">
 <!ENTITY     allowSiteSession.label         "Session">
 <!ENTITY     allowSiteSession.accesskey     "S">
 <!ENTITY     removepermission.label         "Remove Site">
 <!ENTITY     removepermission.accesskey     "R">
 <!ENTITY     removeallpermissions.label     "Remove All Sites">
 <!ENTITY     removeallpermissions.accesskey "e">
 
-<!ENTITY     canSet.label                   "can set cookies">
-<!ENTITY     cannotSet.label                "cannot set cookies">
-
 <!ENTITY     futureCookies.label            "Don't allow sites that set removed cookies to set future cookies">
 <!ENTITY     futureCookies.accesskey        "D">
--- a/suite/locales/en-US/chrome/common/permissions/permissionsNavigatorOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/permissions/permissionsNavigatorOverlay.dtd
@@ -29,17 +29,14 @@
 <!ENTITY cookieBlockImagesCmd.accesskey "B">
 <!ENTITY cookieBlockImagesMsg.label "Images from this site will never be downloaded.">
 
 <!ENTITY cookieAllowPopupsCmd.label                  "Allow Popups from This Site">
 <!ENTITY cookieAllowPopupsCmd.accesskey              "A">
 <!ENTITY cookieManagePopups.label                    "Manage Popups">
 <!ENTITY cookieManagePopups.accesskey                "M">
 
-<!ENTITY cookieTutorialCmd.label "Understanding Privacy">
-<!ENTITY cookieTutorialCmd.accesskey "u">
-
 <!ENTITY cookieCookieManager.label "Cookie Manager">
 <!ENTITY cookieCookieManager.accesskey "c">
 <!ENTITY cookieImageManager.label "Image Manager">
 <!ENTITY cookieImageManager.accesskey "i">
 <!ENTITY cookiePopupManager.label "Popup Manager">
 <!ENTITY cookiePopupManager.accesskey "o">
--- a/suite/locales/en-US/chrome/common/pref/pref-certs.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-certs.dtd
@@ -31,18 +31,16 @@
    - 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  resetsettings.label      "Reset Settings">
-<!ENTITY  resetpreferences.label   "Reset Preferences…">
 <!ENTITY  managecerts.caption      "Manage Certificates">
 <!ENTITY  managecerts.text         "Use the Certificate Manager to manage your personal certificates, as well as those of other people and certificate authorities.">
 <!ENTITY  managecerts.button       "Manage Certificates…">
 <!ENTITY  managecerts.accesskey    "M">
 <!ENTITY  managedevices.caption    "Manage Security Devices">
 <!ENTITY  managedevices.text       "Use this button to manage your security devices, such as smart cards.">
 <!ENTITY  managedevices.button     "Manage Security Devices…">
 <!ENTITY  managedevices.accesskey  "S">
--- a/suite/locales/en-US/chrome/common/pref/pref-download.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-download.dtd
@@ -22,10 +22,8 @@
 <!ENTITY playSound.label                "Play a sound">
 <!ENTITY playSound.accesskey            "s">
 <!ENTITY showAlert.label                "Show an alert">
 <!ENTITY showAlert.accesskey            "n">
 <!ENTITY browse.label                   "Browse…">
 <!ENTITY browse.accesskey               "B">
 <!ENTITY preview.label                  "Preview">
 <!ENTITY preview.accesskey              "v">
-<!ENTITY soundURL.label                 "Sound URL:">
-<!ENTITY soundURL.accesskey             "U">
--- a/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
@@ -19,18 +19,16 @@
 <!ENTITY  monospace.label                         "Monospace:">
 <!ENTITY  monospace.accesskey                     "m">
 <!-- LOCALIZATION NOTE (fantasy.label): 'Fantasy' means 'Ornate' -->
 <!ENTITY  fantasy.label                           "Fantasy:">
 <!ENTITY  fantasy.accesskey                       "f">
 <!ENTITY  cursive.label                           "Cursive:">
 <!ENTITY  cursive.accesskey                       "c">
 
-<!ENTITY  fontsize.units                          "pixels">
-
 <!ENTITY  font.langGroup.latin1                   "Western">
 <!ENTITY  font.langGroup.latin2                   "Central European">
 <!ENTITY  font.langGroup.japanese                 "Japanese">
 <!ENTITY  font.langGroup.trad-chinese             "Traditional Chinese(Taiwan)">
 <!ENTITY  font.langGroup.simpl-chinese            "Simplified Chinese">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Traditional Chinese(Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Korean">
 <!ENTITY  font.langGroup.cyrillic                 "Cyrillic">
@@ -57,24 +55,16 @@
 <!ENTITY minSize.label                            "Minimum font size:">
 <!ENTITY minSize.accesskey                        "z">
 <!ENTITY minSize.none                             "None">
 
 <!-- default font type -->
 <!ENTITY  useDefaultFontSerif.label               "Serif">
 <!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
 
-<!ENTITY  newLanguages.label                      "New languages can be configured using the Languages Panel.">
-
 <!ENTITY  useDocumentFonts.label                  "Allow documents to use other fonts">
 <!ENTITY  useDocumentFonts.accesskey              "o">
 
 <!-- leaving this stuff in for now -->
 
 <!ENTITY  header2                                 "When a webpage chooses its own fonts">
 <!ENTITY  useDefaultFont.label                    "Use my default fonts, ignoring the fonts the page has chosen">
 <!ENTITY  useDefaultFont.accesskey                "u">
-<!-- LOCALIZATION NOTE (useDocFontNonDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
-<!ENTITY  useDocFontNonDynamic.label              "Use the fonts chosen by the page">
-<!ENTITY  useDocFontNonDynamic.accesskey          "p">
-<!-- LOCALIZATION NOTE (useDocFontDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
-<!ENTITY  useDocFontDynamic.label                 "Use all the fonts chosen by the page">
-<!ENTITY  useDocFontDynamic.accesskey             "a">
--- a/suite/locales/en-US/chrome/common/pref/pref-images.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-images.dtd
@@ -9,17 +9,16 @@
 <!ENTITY imageDetails                   "Specify how &brandShortName; handles images.">
 
 <!ENTITY accAllImagesRadio.label        "Accept all images">
 <!ENTITY accAllImagesRadio.accesskey    "A">
 <!ENTITY accOrgImagesRadio.label        "Accept images that come from the originating server only">
 <!ENTITY accOrgImagesRadio.accesskey    "r">
 <!ENTITY disableImages.label            "Do not load any images">
 <!ENTITY disableImages.accesskey        "n">
-<!ENTITY viewImagesExplanation.label    "View list of sites about which image acceptance information is stored">
 <!ENTITY viewImages.label               "Manage Image Permissions">
 <!ENTITY viewImages.accesskey           "P">
 <!ENTITY animLoopingTitle.label         "Animated images should loop">
 <!ENTITY animLoopAsSpecified.label      "As many times as the image specifies">
 <!ENTITY animLoopAsSpecified.accesskey  "m">
 <!ENTITY animLoopOnce.label             "Once">
 <!ENTITY animLoopOnce.accesskey         "O">
 <!ENTITY animLoopNever.label            "Never">
--- a/suite/locales/en-US/chrome/common/pref/pref-popups.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-popups.dtd
@@ -1,14 +1,12 @@
 <!ENTITY pref.popups.title              "Popup Windows">
 
 <!ENTITY pref.popups.caption            "Popup Windows">
 
-<!ENTITY popupDesc.label                "Specify how to handle popup windows that appear on top of or under the current browser window:">
-
 <!ENTITY popupBlock.label               "Block unrequested popup windows">
 <!ENTITY popupBlock.accesskey           "B">
 
 <!ENTITY popupExceptions.label          "Allowed Sites…">
 <!ENTITY popupExceptions.accesskey      "A">
 
 <!ENTITY whenBlock.description          "When a popup window has been blocked:">
 <!ENTITY playSound.label                "Play a sound:">
--- a/suite/locales/en-US/chrome/common/pref/pref-ssl.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-ssl.dtd
@@ -50,18 +50,16 @@
 <!ENTITY warn.enteringsecure                "Loading a page that supports encryption">
 <!ENTITY warn.enteringsecure.accesskey      "L">
 <!ENTITY warn.enteringweak                  "Loading a page that uses low-grade encryption">
 <!ENTITY warn.enteringweak.accesskey        "o">
 <!ENTITY warn.insecurepost                  "Sending form data from an unencrypted page to an unencrypted page">
 <!ENTITY warn.insecurepost.accesskey        "S">
 <!ENTITY warn.leavingsecure                 "Leaving a page that supports encryption">
 <!ENTITY warn.leavingsecure.accesskey       "a">
-<!ENTITY warn.secureredirect                "Redirecting from one encrypted page to another">
-<!ENTITY warn.secureredirecttoinsecure      "Redirecting from an encrypted page to an unencrypted page">
 <!ENTITY warn.viewmixed                     "Viewing a page with an encrypted/unencrypted mix">
 <!ENTITY warn.viewmixed.accesskey           "V">
 
 <!ENTITY certselect.description             "Decide how &brandShortName; selects a security certificate to present to web sites that require one:">
 <!ENTITY certselect.auto                    "Select Automatically">
 <!ENTITY certselect.auto.accesskey          "A">
 <!ENTITY certselect.ask                     "Ask Every Time">
 <!ENTITY certselect.ask.accesskey           "E">
--- a/suite/locales/en-US/chrome/common/pref/preferences.dtd
+++ b/suite/locales/en-US/chrome/common/pref/preferences.dtd
@@ -2,24 +2,20 @@
 <!ENTITY prefWindow.title "Preferences">
 <!ENTITY categoryHeader "Category">
 <!ENTITY appear.label "Appearance">
 <!ENTITY content.label "Content">
 <!ENTITY fonts.label "Fonts">
 <!ENTITY colors.label "Colors">
 <!ENTITY navigator.label "Browser">
 <!ENTITY history.label "History">
-<!ENTITY bidi.label "Bidi Options">
 <!ENTITY languages.label "Languages">
 <!ENTITY applications.label "Helper Applications">
 <!ENTITY locationBar.label "Location Bar">
 <!ENTITY tabWindows.label "Tabbed Browsing">
-<!ENTITY compose.label "Composer">
-<!ENTITY editing.label "New Page Settings">
-<!ENTITY publish.label "Publish">
 <!ENTITY offline.label "Offline">
 <!ENTITY security.label "Privacy &amp; Security">
 <!ENTITY cookies.label "Cookies">
 <!ENTITY images.label "Images">
 <!ENTITY popups.label "Popup Windows">
 <!ENTITY passwords.label "Passwords">
 <!ENTITY masterpass.label "Master Passwords">
 <!ENTITY ssl.label "SSL">
--- a/suite/locales/en-US/chrome/common/pref/prefutilities.properties
+++ b/suite/locales/en-US/chrome/common/pref/prefutilities.properties
@@ -1,19 +1,8 @@
 cachefolder=Choose Cache Folder
 choosehomepage=Choose Home Page
-choosefile=Choose a file
 downloadfolder=Choose a Download Folder
 choosesound=Choose a sound
-viewrow=View…
-hiderow=Hide
 
 SoundFiles=Sounds
 
-oldTheme=You have selected a theme which was designed for an earlier version of %brand% and is incompatible with your current %brand% version. Please check %brand% theme sites for an updated version of the theme. You can uninstall this theme by clicking \"Uninstall Theme\" button.
-
-languageAlert=Please restart %brand% to use the new preferred language or region setting.
-languageTitle=Change Language
-
-prefSaveFailedAlert=Failed to save the preferences file. Any preference changes will be lost at the end of this session.
-prefSaveFailedTitle=Save Error
-
 labelDefaultFont=Default (%font_family%)
--- a/suite/locales/en-US/chrome/common/search/search-panel.dtd
+++ b/suite/locales/en-US/chrome/common/search/search-panel.dtd
@@ -31,25 +31,20 @@
    - 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 search.button.label      "Search">
-<!ENTITY search.results.tab       "Apply">
-<!ENTITY search.advanced.tab      "Settings for ">
 <!ENTITY allengines.label         "All Engines">
 <!ENTITY within.label             "within">
 <!ENTITY using.label              "using">
 <!ENTITY choose.label             "Choose search engines, then click Search">
 <!ENTITY results.label            "Search Results">
 <!ENTITY engine.column.label      "Search Engines">
-<!ENTITY checkbox.column.label    "Use">
-<!ENTITY stop.button.label        "Stop">
-<!ENTITY customize.menuitem.label   "Edit Categories …">
-<!ENTITY savesearch.button.label  "Bookmark this Search">
+<!ENTITY customize.menuitem.label "Edit Categories …">
 <!ENTITY next.button.label        "Next">
 <!ENTITY previous.button.label    "Previous">
 <!ENTITY next.button.tooltip      "Show next search results">
 <!ENTITY previous.button.tooltip  "Show previous search results">
 
--- a/suite/locales/en-US/chrome/common/sidebar/preview.dtd
+++ b/suite/locales/en-US/chrome/common/sidebar/preview.dtd
@@ -31,9 +31,8 @@
    - 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 sidebar.preview.title.label          "Tab Preview">
-<!ENTITY sidebar.preview.close.label          "Close">
--- a/suite/locales/en-US/chrome/common/tasksOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/tasksOverlay.dtd
@@ -2,31 +2,24 @@
 <!ENTITY navigatorCmd.label "Browser">
 <!ENTITY navigatorCmd.accesskey "B">
 <!ENTITY navigatorCmd.commandkey "1">
 <!-- LOCALIZATION NOTE (editorCmd.label): DONT_TRANSLATE -->
 <!ENTITY editorCmd.label					"Composer">
 <!ENTITY editorCmd.accesskey				"c">
 <!ENTITY editorCmd.commandkey				"4">
 
-<!ENTITY securityInfoCmd.label					".Security Info">  
-<!ENTITY securityInfoCmd.accesskey				"s">
 <!ENTITY javaConsoleCmd.label					"Java Console">
 <!ENTITY javaConsoleCmd.accesskey				"j">
 
 <!ENTITY errorConsoleCmd.label                                  "Error Console">
 <!ENTITY errorConsoleCmd.accesskey				"C">
 
-<!-- LOCALIZATION NOTE (privacyMenu.label): DONT_TRANSLATE -->
-<!ENTITY privacyMenu.label "Privacy &amp; Security">
-<!ENTITY privacyMenu.accesskey "p">
-
 <!ENTITY taskNavigator.tooltip  "Browser">
 <!ENTITY taskComposer.tooltip  "Composer">
-<!ENTITY taskBar.tooltip  "Status Bar">
 
 <!ENTITY webDevelopment.label "Web Development">
 <!ENTITY webDevelopment.accesskey "W">
 
 <!ENTITY windowMenu.label "Window">
 <!ENTITY windowMenu.accesskey "W">
 
 <!ENTITY tasksMenu.label "Tools">
--- a/suite/locales/en-US/chrome/common/utilityOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/utilityOverlay.dtd
@@ -32,17 +32,16 @@
 <!ENTITY cutCmd.accesskey					"t"> 
 <!ENTITY copyCmd.label						"Copy">  
 <!ENTITY copyCmd.key						"C">  
 <!ENTITY copyCmd.accesskey					"c"> 
 <!ENTITY pasteCmd.label						"Paste">  
 <!ENTITY pasteCmd.key						"V">  
 <!ENTITY pasteCmd.accesskey					"p"> 
 <!ENTITY deleteCmd.label					"Delete">  
-<!ENTITY deleteCmd.key						"D">  
 <!ENTITY deleteCmd.accesskey				"d"> 
 <!ENTITY selectAllCmd.label					"Select All">  
 <!ENTITY selectAllCmd.key					"A">  
 <!ENTITY selectAllCmd.accesskey				"a"> 
 <!ENTITY preferencesCmd.label				"Preferences…">
 <!ENTITY preferencesCmd.key					"E">  
 <!ENTITY preferencesCmd.accesskey			"e"> 
 <!ENTITY findTypeTextCmd.label "Find Text As You Type">
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -35,17 +35,16 @@
   locale/@AB_CD@/communicator/utilityOverlay.dtd                            (%chrome/common/utilityOverlay.dtd)
   locale/@AB_CD@/communicator/utilityOverlay.properties                     (%chrome/common/utilityOverlay.properties)
   locale/@AB_CD@/communicator/viewZoomOverlay.dtd                           (%chrome/common/viewZoomOverlay.dtd)
   locale/@AB_CD@/communicator/viewZoomOverlay.properties                    (%chrome/common/viewZoomOverlay.properties)
   locale/@AB_CD@/communicator/bookmarks/addBookmark.dtd                     (%chrome/common/bookmarks/addBookmark.dtd)
   locale/@AB_CD@/communicator/bookmarks/bm-props.dtd                        (%chrome/common/bookmarks/bm-props.dtd)
   locale/@AB_CD@/communicator/bookmarks/bookmarks.dtd                       (%chrome/common/bookmarks/bookmarks.dtd)
   locale/@AB_CD@/communicator/bookmarks/bookmarks.properties                (%chrome/common/bookmarks/bookmarks.properties)
-  locale/@AB_CD@/communicator/bookmarks/bookmarksOverlay.dtd                (%chrome/common/bookmarks/bookmarksOverlay.dtd)
   locale/@AB_CD@/communicator/bookmarks/findBookmark.dtd                    (%chrome/common/bookmarks/findBookmark.dtd)
   locale/@AB_CD@/communicator/bookmarks/sortFolder.dtd                      (%chrome/common/bookmarks/sortFolder.dtd)
   locale/@AB_CD@/communicator/directory/directory.dtd                       (%chrome/common/directory/directory.dtd)
   locale/@AB_CD@/communicator/help/cert_dialog_help.xhtml                   (%chrome/common/help/cert_dialog_help.xhtml)
   locale/@AB_CD@/communicator/help/certs_help.xhtml                         (%chrome/common/help/certs_help.xhtml)
   locale/@AB_CD@/communicator/help/certs_prefs_help.xhtml                   (%chrome/common/help/certs_prefs_help.xhtml)
   locale/@AB_CD@/communicator/help/composer_help.xhtml                      (%chrome/common/help/composer_help.xhtml)
   locale/@AB_CD@/communicator/help/cs_nav_prefs_advanced.xhtml              (%chrome/common/help/cs_nav_prefs_advanced.xhtml)