diff options
author | Pale Moon <git-repo@palemoon.org> | 2016-09-11 15:45:04 +0200 |
---|---|---|
committer | Pale Moon <git-repo@palemoon.org> | 2016-09-11 15:45:04 +0200 |
commit | ca8c0acd3925db97eed614e20aebb16445c42383 (patch) | |
tree | 888dac7b74710fbe47cd7e2285043da8bd1d67db | |
parent | 6c25c90fa73a7ba83fcdf722e18f1df05ec312f3 (diff) | |
download | palemoon-gre-ca8c0acd3925db97eed614e20aebb16445c42383.tar.gz |
Remove "patch" DTD file for Pale Moon menu entries and prefs.
This folds the strings into the appropriate DTD files.
-rw-r--r-- | browser/base/content/browser-appmenu.inc | 2 | ||||
-rw-r--r-- | browser/base/content/browser-context.inc | 8 | ||||
-rw-r--r-- | browser/base/content/browser-doctype.inc | 2 | ||||
-rw-r--r-- | browser/base/content/browser-menubar.inc | 2 | ||||
-rw-r--r-- | browser/base/content/browser.xul | 4 | ||||
-rw-r--r-- | browser/base/content/web-panels.xul | 2 | ||||
-rw-r--r-- | browser/components/preferences/advanced.xul | 42 | ||||
-rw-r--r-- | browser/components/preferences/content.xul | 10 | ||||
-rw-r--r-- | browser/components/preferences/main.xul | 2 | ||||
-rw-r--r-- | browser/components/preferences/tabs.xul | 20 | ||||
-rw-r--r-- | browser/locales/en-US/chrome/browser/browser.dtd | 7 | ||||
-rw-r--r-- | browser/locales/en-US/chrome/browser/palemoon.dtd | 50 | ||||
-rw-r--r-- | browser/locales/en-US/chrome/browser/preferences/advanced.dtd | 19 | ||||
-rw-r--r-- | browser/locales/en-US/chrome/browser/preferences/content.dtd | 14 | ||||
-rw-r--r-- | browser/locales/en-US/chrome/browser/preferences/main.dtd | 2 | ||||
-rw-r--r-- | browser/locales/en-US/chrome/browser/preferences/tabs.dtd | 12 | ||||
-rw-r--r-- | browser/locales/jar.mn | 1 |
17 files changed, 90 insertions, 109 deletions
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc index 11f5a06c7..8bad2a7a2 100644 --- a/browser/base/content/browser-appmenu.inc +++ b/browser/base/content/browser-appmenu.inc @@ -212,7 +212,7 @@ popupsinherittooltip="true"> <menuitem id="appmenu_showAllBookmarks" class="menuitem-iconic" - label="&palemoon.menu.allBookmarks.label;" + label="&organizeBookmarks.label;" command="Browser:ShowAllBookmarks" context="" key="manBookmarkKb"/> diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc index b9314a823..fcf3337ce 100644 --- a/browser/base/content/browser-context.inc +++ b/browser/base/content/browser-context.inc @@ -42,8 +42,8 @@ accesskey="&saveLinkCmd.accesskey;" oncommand="gContextMenu.saveLink();"/> <menuitem id="context-sendlink" - label="&palemoon.sendLinkCmd.label;" - accesskey="&palemoon.sendLinkCmd.accesskey;" + label="&sendLinkCmd.label;" + accesskey="&sendLinkCmd.accesskey;" oncommand="gContextMenu.sendLink();"/> <menuitem id="context-copyemail" label="©EmailCmd.label;" @@ -231,8 +231,8 @@ accesskey="&savePageCmd.accesskey2;" oncommand="gContextMenu.savePageAs();"/> <menuitem id="context-sendpage" - label="&palemoon.sendPageCmd.label;" - accesskey="&palemoon.sendPageCmd.accesskey;" + label="&sendPageCmd.label;" + accesskey="&sendPageCmd.accesskey;" oncommand="gContextMenu.sendPage();"/> <menuseparator id="context-sep-viewbgimage"/> <menuitem id="context-viewbgimage" diff --git a/browser/base/content/browser-doctype.inc b/browser/base/content/browser-doctype.inc index d4e2d5692..bd0cd28b7 100644 --- a/browser/base/content/browser-doctype.inc +++ b/browser/base/content/browser-doctype.inc @@ -3,8 +3,6 @@ %brandDTD; <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" > %browserDTD; -<!ENTITY % palemoonDTD SYSTEM "chrome://browser/locale/palemoon.dtd" > -%palemoonDTD; <!ENTITY % baseMenuDTD SYSTEM "chrome://browser/locale/baseMenuOverlay.dtd" > %baseMenuDTD; <!ENTITY % charsetDTD SYSTEM "chrome://browser/locale/charsetMenu.dtd" > diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index db591faa4..d1fa251e9 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -430,7 +430,7 @@ #ifndef XP_MACOSX class="menuitem-iconic" #endif - label="&palemoon.menu.allBookmarks.label;" + label="&organizeBookmarks.label;" command="Browser:ShowAllBookmarks" key="manBookmarkKb"/> <menuseparator id="organizeBookmarksSeparator"/> diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index a7f7728e7..b64a781ac 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -562,7 +562,7 @@ #ifndef XP_MACOSX class="menuitem-iconic" #endif - label="&palemoon.menu.allBookmarks.label;" + label="&organizeBookmarks.label;" command="Browser:ShowAllBookmarks" key="manBookmarkKb"/> <menuseparator/> @@ -1000,7 +1000,7 @@ #endif <toolbar id="addon-bar" - toolbarname="&palemoon.menu.statusBar.label;" accesskey="&palemoon.menu.statusBar.accesskey;" + toolbarname="&statusBar.label;" accesskey="&statusBar.accesskey;" collapsed="true" class="toolbar-primary chromeclass-toolbar" context="toolbar-context-menu" toolboxid="navigator-toolbox" diff --git a/browser/base/content/web-panels.xul b/browser/base/content/web-panels.xul index 8be808cca..4a520befe 100644 --- a/browser/base/content/web-panels.xul +++ b/browser/base/content/web-panels.xul @@ -12,8 +12,6 @@ <!DOCTYPE page [ <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd"> %browserDTD; -<!ENTITY % palemoonDTD SYSTEM "chrome://browser/locale/palemoon.dtd" > -%palemoonDTD; <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd"> %textcontextDTD; ]> diff --git a/browser/components/preferences/advanced.xul b/browser/components/preferences/advanced.xul index df71b64fb..dcf098d60 100644 --- a/browser/components/preferences/advanced.xul +++ b/browser/components/preferences/advanced.xul @@ -12,8 +12,6 @@ %advancedDTD; <!ENTITY % privacyDTD SYSTEM "chrome://browser/locale/preferences/privacy.dtd"> %privacyDTD; -<!ENTITY % palemoonDTD SYSTEM "chrome://browser/locale/palemoon.dtd"> -%palemoonDTD; ]> <overlay id="AdvancedPaneOverlay" @@ -118,7 +116,7 @@ <tab id="networkTab" label="&networkTab.label;" helpTopic="prefs-advanced-network"/> <tab id="updateTab" label="&updateTab.label;" helpTopic="prefs-advanced-update"/> <tab id="encryptionTab" label="&certificateTab.label;" helpTopic="prefs-advanced-encryption"/> - <tab id="scrollparamTab" label="&palemoon.scrollparamTab.label;" helpTopic="prefs-advanced-scrollparams"/> + <tab id="scrollparamTab" label="&scrollparamTab.label;" helpTopic="prefs-advanced-scrollparams"/> </tabs> <tabpanels flex="1"> @@ -185,14 +183,14 @@ </groupbox> #endif <groupbox id="UACompatGroup" orient="vertical"> - <caption label="&palemoon.UACompatGroup.label;"/> + <caption label="&UACompatGroup.label;"/> <hbox align="center"> - <label id="UACompat" control="UACompat-menu">&palemoon.UACompat.label;</label> + <label id="UACompat" control="UACompat-menu">&UACompat.label;</label> <menulist id="UACompat-menu" preference="pref.general.compatmode" sizetopopup="always"> <menupopup> - <menuitem label="&palemoon.UACompat.Native;" value="0" /> - <menuitem label="&palemoon.UACompat.Gecko;" value="1" /> - <menuitem label="&palemoon.UACompat.Firefox;" value="2" /> + <menuitem label="&UACompat.Native;" value="0" /> + <menuitem label="&UACompat.Gecko;" value="1" /> + <menuitem label="&UACompat.Firefox;" value="2" /> </menupopup> </menulist> </hbox> @@ -372,50 +370,50 @@ accesskey="&useSmoothScrolling.accesskey;" preference="general.smoothScroll"/> - <label>&palemoon.smoothscroll.explain.label;</label> + <label>&smoothscroll.explain.label;</label> <groupbox> - <caption label="&palemoon.smoothscroll.params.label;"/> + <caption label="&smoothscroll.params.label;"/> - <checkbox label="&palemoon.smoothscroll.mousewheel.label;" preference="general.smoothScroll.mouseWheel"/> + <checkbox label="&smoothscroll.mousewheel.label;" preference="general.smoothScroll.mouseWheel"/> <hbox align="center" class="indent"> - <label value="&palemoon.smoothscroll.mousewheel.duration;"/> + <label value="&smoothscroll.mousewheel.duration;"/> <textbox type="number" size="3" max="500" preference="general.smoothScroll.mouseWheel.durationMinMS"/> - <label>&palemoon.smoothscroll.to;</label> + <label>&smoothscroll.to;</label> <textbox type="number" size="4" max="2000" preference="general.smoothScroll.mouseWheel.durationMaxMS"/> <label flex="1">ms.</label> </hbox> - <checkbox label="&palemoon.smoothscroll.arrowkeys.label;" preference="general.smoothScroll.lines"/> + <checkbox label="&smoothscroll.arrowkeys.label;" preference="general.smoothScroll.lines"/> <hbox align="center" class="indent"> - <label value="&palemoon.smoothscroll.arrowkeys.duration;"/> + <label value="&smoothscroll.arrowkeys.duration;"/> <textbox type="number" size="3" max="500" preference="general.smoothScroll.lines.durationMinMS"/> - <label>&palemoon.smoothscroll.to;</label> + <label>&smoothscroll.to;</label> <textbox type="number" size="4" max="2000" preference="general.smoothScroll.lines.durationMaxMS"/> <label flex="1">ms.</label> </hbox> - <checkbox label="&palemoon.smoothscroll.pagekeys.label;" preference="general.smoothScroll.pages"/> + <checkbox label="&smoothscroll.pagekeys.label;" preference="general.smoothScroll.pages"/> <hbox align="center" class="indent"> - <label value="&palemoon.smoothscroll.pagekeys.duration;"/> + <label value="&smoothscroll.pagekeys.duration;"/> <textbox type="number" size="3" max="500" preference="general.smoothScroll.pages.durationMinMS"/> - <label>&palemoon.smoothscroll.to;</label> + <label>&smoothscroll.to;</label> <textbox type="number" size="4" max="2000" preference="general.smoothScroll.pages.durationMaxMS"/> <label flex="1">ms.</label> </hbox> - <checkbox label="&palemoon.smoothscroll.scrollbar.label;" preference="general.smoothScroll.scrollbars"/> + <checkbox label="&smoothscroll.scrollbar.label;" preference="general.smoothScroll.scrollbars"/> <hbox align="center" class="indent"> - <label value="&palemoon.smoothscroll.scrollbar.duration;"/> + <label value="&smoothscroll.scrollbar.duration;"/> <textbox type="number" size="3" max="500" preference="general.smoothScroll.scrollbars.durationMinMS"/> - <label>&palemoon.smoothscroll.to;</label> + <label>&smoothscroll.to;</label> <textbox type="number" size="4" max="2000" preference="general.smoothScroll.scrollbars.durationMaxMS"/> <label flex="1">ms.</label> diff --git a/browser/components/preferences/content.xul b/browser/components/preferences/content.xul index 827d6d9d8..94201edbf 100644 --- a/browser/components/preferences/content.xul +++ b/browser/components/preferences/content.xul @@ -10,8 +10,6 @@ <!ENTITY % contentDTD SYSTEM "chrome://browser/locale/preferences/content.dtd"> %brandDTD; %contentDTD; - <!ENTITY % palemoonDTD SYSTEM "chrome://browser/locale/palemoon.dtd"> - %palemoonDTD; ]> <overlay id="ContentPaneOverlay" @@ -61,12 +59,12 @@ </row> <row id="enableImagesRow"> <hbox align="center"> - <label id="loadImages" control="loadImages-menu">&palemoon.loadImages.label;</label> + <label id="loadImages" control="loadImages-menu">&loadImages.label;</label> <menulist id="loadImages-menu" preference="permissions.default.image" sizetopopup="always"> <menupopup> - <menuitem label="&palemoon.loadImages.always;" value="1" /> - <menuitem label="&palemoon.loadImages.never;" value="2" /> - <menuitem label="&palemoon.loadImages.no3rdparty;" value="3" /> + <menuitem label="&loadImages.always;" value="1" /> + <menuitem label="&loadImages.never;" value="2" /> + <menuitem label="&loadImages.no3rdparty;" value="3" /> </menupopup> </menulist> </hbox> diff --git a/browser/components/preferences/main.xul b/browser/components/preferences/main.xul index ed82b8515..4a59d3599 100644 --- a/browser/components/preferences/main.xul +++ b/browser/components/preferences/main.xul @@ -9,11 +9,9 @@ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> <!ENTITY % mainDTD SYSTEM "chrome://browser/locale/preferences/main.dtd"> <!ENTITY % aboutHomeDTD SYSTEM "chrome://browser/locale/aboutHome.dtd"> - <!ENTITY % palemoonDTD SYSTEM "chrome://browser/locale/palemoon.dtd"> %brandDTD; %mainDTD; %aboutHomeDTD; - %palemoonDTD; ]> <overlay id="MainPaneOverlay" diff --git a/browser/components/preferences/tabs.xul b/browser/components/preferences/tabs.xul index 55f0183e8..87d98fb79 100644 --- a/browser/components/preferences/tabs.xul +++ b/browser/components/preferences/tabs.xul @@ -10,8 +10,6 @@ %brandDTD; <!ENTITY % tabsDTD SYSTEM "chrome://browser/locale/preferences/tabs.dtd"> %tabsDTD; -<!ENTITY % palemoonDTD SYSTEM "chrome://browser/locale/palemoon.dtd"> -%palemoonDTD; ]> <overlay id="TabsPaneOverlay" @@ -59,8 +57,8 @@ <checkbox id="warnOpenMany" label="&warnOpenManyTabs.label;" accesskey="&warnOpenManyTabs.accesskey;" preference="browser.tabs.warnOnOpen"/> - <checkbox id="showTabBar" label="&palemoon.showTabBar.label;" - accesskey="&palemoon.showTabBar.accesskey;" + <checkbox id="showTabBar" label="&showTabBar.label;" + accesskey="&showTabBar.accesskey;" preference="browser.tabs.autoHide"/> <checkbox id="restoreOnDemand" label="&restoreTabsOnDemand.label;" accesskey="&restoreTabsOnDemand.accesskey;" @@ -74,19 +72,19 @@ preference="browser.taskbar.previews.enable"/> #endif <!-- Pale Moon additions --> - <checkbox id="insertRelatedAfterCurrent" label="&palemoon.insertRelatedAfterCurrent.label;" + <checkbox id="insertRelatedAfterCurrent" label="&insertRelatedAfterCurrent.label;" preference="browser.tabs.insertRelatedAfterCurrent"/> - <checkbox id="contextLoadInBackground" label="&palemoon.contextLoadInBackground.label;" + <checkbox id="contextLoadInBackground" label="&contextLoadInBackground.label;" preference="browser.search.context.loadInBackground"/> - <checkbox id="closeWindowWithLastTab" label="&palemoon.closeWindowWithLastTab.label;" + <checkbox id="closeWindowWithLastTab" label="&closeWindowWithLastTab.label;" preference="browser.tabs.closeWindowWithLastTab"/> <hbox align="center"> - <label value="&palemoon.newtabPage.label;"/> + <label value="&newtabPage.label;"/> <menulist id="newtabPage" preference="browser.newtab.url"> <menupopup> - <menuitem label="&palemoon.newtabPage.blank.label;" value="about:logopage" id="newtabPageBlank"/> - <menuitem label="&palemoon.newtabPage.home.label;" value="http://start.palemoon.org/" id="newtabPageHome"/> - <menuitem label="&palemoon.newtabPage.quickdial.label;" value="about:newtab" id="newtabPageQuickdial"/> + <menuitem label="&newtabPage.blank.label;" value="about:logopage" id="newtabPageBlank"/> + <menuitem label="&newtabPage.home.label;" value="https://start.palemoon.org/" id="newtabPageHome"/> + <menuitem label="&newtabPage.quickdial.label;" value="about:newtab" id="newtabPageQuickdial"/> </menupopup> </menulist> </hbox> diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd index efffb3bfc..70f8011e5 100644 --- a/browser/locales/en-US/chrome/browser/browser.dtd +++ b/browser/locales/en-US/chrome/browser/browser.dtd @@ -76,6 +76,8 @@ can reach it easily. --> <!ENTITY bookmarksToolbarItem.label "Bookmarks Toolbar Items"> <!ENTITY addonBarCmd.label "Add-on Bar"> <!ENTITY addonBarCmd.accesskey "A"> +<!ENTITY statusBar.label "Status Bar"> +<!ENTITY statusBar.accesskey "S"> <!ENTITY pageSourceCmd.label "Page Source"> <!ENTITY pageSourceCmd.accesskey "o"> @@ -122,6 +124,7 @@ These should match what Safari and other Apple applications use on OS X Lion. -- <!ENTITY subscribeToPageMenuitem.label "Subscribe to This Page…"> <!ENTITY addCurPagesCmd.label "Bookmark All Tabs…"> <!ENTITY showAllBookmarks2.label "Show All Bookmarks"> +<!ENTITY organizeBookmarks.label "Organize Bookmarks"> <!ENTITY unsortedBookmarksCmd.label "Unsorted Bookmarks"> <!ENTITY bookmarksToolbarChevron.tooltip "Show more bookmarks"> @@ -412,6 +415,10 @@ These should match what Safari and other Apple applications use on OS X Lion. -- <!ENTITY emailPageCmd.accesskey "E"> <!ENTITY savePageCmd.label "Save Page As…"> <!ENTITY savePageCmd.accesskey "A"> +<!ENTITY sendLinkCmd.label "Send Link…"> +<!ENTITY sendLinkCmd.accesskey "d"> +<!ENTITY sendPageCmd.label "Send Page Link…"> +<!ENTITY sendPageCmd.accesskey "e"> <!-- alternate for content area context menu --> <!ENTITY savePageCmd.accesskey2 "P"> <!ENTITY savePageCmd.commandkey "s"> diff --git a/browser/locales/en-US/chrome/browser/palemoon.dtd b/browser/locales/en-US/chrome/browser/palemoon.dtd deleted file mode 100644 index ec0455a50..000000000 --- a/browser/locales/en-US/chrome/browser/palemoon.dtd +++ /dev/null @@ -1,50 +0,0 @@ -<!-- 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/. --> - -<!-- Menu items --> -<!ENTITY palemoon.sendLinkCmd.label "Send Link…"> -<!ENTITY palemoon.sendLinkCmd.accesskey "d"> -<!ENTITY palemoon.sendPageCmd.label "Send Page Link…"> -<!ENTITY palemoon.sendPageCmd.accesskey "e"> - -<!ENTITY palemoon.menu.statusBar.label "Status Bar"> -<!ENTITY palemoon.menu.statusBar.accesskey "S"> -<!ENTITY palemoon.menu.allBookmarks.label "Organize Bookmarks"> - -<!-- Preferences --> -<!ENTITY toolkit.classic.download.window.label "Use the classic downloads window"> - -<!ENTITY palemoon.showTabBar.label "Always show the tab bar"> -<!ENTITY palemoon.showTabBar.accesskey "b"> -<!ENTITY palemoon.insertRelatedAfterCurrent.label "Insert related tabs next to the current tab"> -<!ENTITY palemoon.contextLoadInBackground.label "When performing a context search, switch to the new tab immediately"> -<!ENTITY palemoon.closeWindowWithLastTab.label "Close the window when the last tab is closed"> -<!ENTITY palemoon.newtabPage.label "When opening a new tab, show:"> -<!ENTITY palemoon.newtabPage.blank.label "A blank page"> -<!ENTITY palemoon.newtabPage.home.label "The Pale Moon start page"> -<!ENTITY palemoon.newtabPage.quickdial.label "The Quickdial page"> - -<!ENTITY palemoon.loadImages.label "Load images:"> -<!ENTITY palemoon.loadImages.always "Automatically"> -<!ENTITY palemoon.loadImages.never "Never"> -<!ENTITY palemoon.loadImages.no3rdparty "Originating server only"> - -<!ENTITY palemoon.UACompatGroup.label "Compatibility"> -<!ENTITY palemoon.UACompat.label "User Agent Mode:"> -<!ENTITY palemoon.UACompat.Native "Native"> -<!ENTITY palemoon.UACompat.Gecko "Gecko Compatibility"> -<!ENTITY palemoon.UACompat.Firefox "Firefox Compatibility"> - -<!ENTITY palemoon.scrollparamTab.label "Scrolling"> -<!ENTITY palemoon.smoothscroll.explain.label "The parameters below only have an effect if smooth scrolling is enabled overall with the checkbox above."> -<!ENTITY palemoon.smoothscroll.to "to"> -<!ENTITY palemoon.smoothscroll.params.label "Smooth scrolling parameters"> -<!ENTITY palemoon.smoothscroll.mousewheel.label "Smooth scroll with mouse wheel"> -<!ENTITY palemoon.smoothscroll.mousewheel.duration "Mouse wheel scroll duration:"> -<!ENTITY palemoon.smoothscroll.arrowkeys.label "Smooth scroll with arrow keys"> -<!ENTITY palemoon.smoothscroll.arrowkeys.duration "Arrow keys scroll duration:"> -<!ENTITY palemoon.smoothscroll.pagekeys.label "Smooth scroll page up/down"> -<!ENTITY palemoon.smoothscroll.pagekeys.duration "Page up/down scroll duration:"> -<!ENTITY palemoon.smoothscroll.scrollbar.label "Smooth scroll with scrollbars"> -<!ENTITY palemoon.smoothscroll.scrollbar.duration "Scrollbar smooth scroll duration:"> diff --git a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd index b03f94456..b6fe2467b 100644 --- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd @@ -119,3 +119,22 @@ <!ENTITY verify2.accesskey "V"> <!ENTITY viewSecurityDevices.label "Security Devices"> <!ENTITY viewSecurityDevices.accesskey "y"> + +<!ENTITY UACompatGroup.label "Compatibility"> +<!ENTITY UACompat.label "User Agent Mode:"> +<!ENTITY UACompat.Native "Native"> +<!ENTITY UACompat.Gecko "Gecko Compatibility"> +<!ENTITY UACompat.Firefox "Firefox Compatibility"> + +<!ENTITY scrollparamTab.label "Scrolling"> +<!ENTITY smoothscroll.explain.label "The parameters below only have an effect if smooth scrolling is enabled overall with the checkbox above."> +<!ENTITY smoothscroll.to "to"> +<!ENTITY smoothscroll.params.label "Smooth scrolling parameters"> +<!ENTITY smoothscroll.mousewheel.label "Smooth scroll with mouse wheel"> +<!ENTITY smoothscroll.mousewheel.duration "Mouse wheel scroll duration:"> +<!ENTITY smoothscroll.arrowkeys.label "Smooth scroll with arrow keys"> +<!ENTITY smoothscroll.arrowkeys.duration "Arrow keys scroll duration:"> +<!ENTITY smoothscroll.pagekeys.label "Smooth scroll page up/down"> +<!ENTITY smoothscroll.pagekeys.duration "Page up/down scroll duration:"> +<!ENTITY smoothscroll.scrollbar.label "Smooth scroll with scrollbars"> +<!ENTITY smoothscroll.scrollbar.duration "Scrollbar smooth scroll duration:"> diff --git a/browser/locales/en-US/chrome/browser/preferences/content.dtd b/browser/locales/en-US/chrome/browser/preferences/content.dtd index a504f4926..3261c0087 100644 --- a/browser/locales/en-US/chrome/browser/preferences/content.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd @@ -7,6 +7,11 @@ <!ENTITY popupExceptions.label "Exceptions…"> <!ENTITY popupExceptions.accesskey "E"> +<!ENTITY loadImages.label "Load images:"> +<!ENTITY loadImages.always "Automatically"> +<!ENTITY loadImages.never "Never"> +<!ENTITY loadImages.no3rdparty "Originating server only"> + <!ENTITY fontsAndColors.label "Fonts & Colors"> <!ENTITY defaultFont.label "Default font:"> @@ -20,8 +25,7 @@ <!ENTITY colors.label "Colors…"> <!ENTITY colors.accesskey "C"> - -<!ENTITY languages.label "Languages"> -<!ENTITY chooseLanguage.label "Choose your preferred language for displaying pages"> -<!ENTITY chooseButton.label "Choose…"> -<!ENTITY chooseButton.accesskey "o"> +<!ENTITY languages.label "Languages"> +<!ENTITY chooseLanguage.label "Choose your preferred language for displaying pages"> +<!ENTITY chooseButton.label "Choose…"> +<!ENTITY chooseButton.accesskey "o"> diff --git a/browser/locales/en-US/chrome/browser/preferences/main.dtd b/browser/locales/en-US/chrome/browser/preferences/main.dtd index 7b354654a..886f535bf 100644 --- a/browser/locales/en-US/chrome/browser/preferences/main.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd @@ -34,3 +34,5 @@ <!ENTITY chooseFolderMac.accesskey "e"> <!ENTITY alwaysAsk.label "Always ask me where to save files"> <!ENTITY alwaysAsk.accesskey "A"> + +<!ENTITY toolkit.classic.download.window.label "Use the classic downloads window"> diff --git a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd index 5185b75b2..7ed7b4f72 100644 --- a/browser/locales/en-US/chrome/browser/preferences/tabs.dtd +++ b/browser/locales/en-US/chrome/browser/preferences/tabs.dtd @@ -19,3 +19,15 @@ <!ENTITY showTabsInTaskbar.label "Show tab previews in the Windows taskbar"> <!ENTITY showTabsInTaskbar.accesskey "k"> + +<!ENTITY showTabBar.label "Always show the tab bar"> +<!ENTITY showTabBar.accesskey "b"> + +<!ENTITY insertRelatedAfterCurrent.label "Insert related tabs next to the current tab"> +<!ENTITY contextLoadInBackground.label "When performing a context search, switch to the new tab immediately"> +<!ENTITY closeWindowWithLastTab.label "Close the window when the last tab is closed"> + +<!ENTITY newtabPage.label "When opening a new tab, show:"> +<!ENTITY newtabPage.blank.label "A blank page"> +<!ENTITY newtabPage.home.label "The Pale Moon start page"> +<!ENTITY newtabPage.quickdial.label "The Quickdial page"> diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 04e440376..9619653b8 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -17,7 +17,6 @@ locale/browser/aboutSyncTabs.dtd (%chrome/browser/aboutSyncTabs.dtd) #endif locale/browser/browser.dtd (%chrome/browser/browser.dtd) - locale/browser/palemoon.dtd (%chrome/browser/palemoon.dtd) locale/browser/baseMenuOverlay.dtd (%chrome/browser/baseMenuOverlay.dtd) locale/browser/charsetOverlay.dtd (%chrome/browser/charsetOverlay.dtd) locale/browser/browser.properties (%chrome/browser/browser.properties) |