Sync Pale Moon code

3 files changed, 11 insertions, 11 deletions

diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.dtd b/application/palemoon/locales/en-US/chrome/browser/browser.dtd
index d6965cd74..fe5f64854 100644
--- a/application/palemoon/locales/en-US/chrome/browser/browser.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/browser.dtd
@@ -67,6 +67,9 @@ can reach it easily. -->
 <!ENTITY goOfflineCmd.label "Work Offline">
 <!ENTITY goOfflineCmd.accesskey "k">
 
+<!ENTITY restartCmd.label "Restart…">
+<!ENTITY restartCmd.accesskey "R">
+
 <!ENTITY menubarCmd.label "Menu Bar">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Navigation Toolbar">
@@ -307,7 +310,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY viewToolbarsMenu.accesskey     "T"> 
 <!ENTITY viewSidebarMenu.label "Sidebar">
 <!ENTITY viewSidebarMenu.accesskey "e">
-<!ENTITY viewCustomizeToolbar.label       "Customize…"> 
+<!ENTITY viewCustomizeToolbar.label       "Customize"> 
 <!ENTITY viewCustomizeToolbar.accesskey     "C">
 <!ENTITY viewTabsOnTop.label            "Tabs on Top">
 <!ENTITY viewTabsOnTop.accesskey        "T">
@@ -325,7 +328,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 
 <!ENTITY appMenuEdit.label "Edit">
 <!ENTITY appMenuCustomize.label "Customize">
-<!ENTITY appMenuToolbarLayout.label "Toolbar Layout…">
+<!ENTITY appMenuToolbarLayout.label "Toolbar Layout">
 <!ENTITY appMenuSidebars.label "Sidebars">
 <!ENTITY appMenuFind.label "Find…">
 <!ENTITY appMenuUnsorted.label "Unsorted Bookmarks">
@@ -546,7 +549,7 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY zoomInButton.tooltip           "Zoom in">
 <!ENTITY zoomControls.label             "Zoom Controls">
 
-<!ENTITY appMenuRestart.label           "Restart">
+<!ENTITY appMenuRestart.label           "Restart…">
 <!ENTITY appMenuRestart.accesskey       "R">
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
@@ -573,11 +576,8 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY pageReportIcon.tooltip            "Change pop-up blocking settings for this website">
 
 <!ENTITY allowPopups.accesskey "p">
-<!-- On Windows we use the term "Options" to describe settings, but
-     on Linux and Mac OS X we use "Preferences" - carry that distinction
-     over into this string, which is used in the "popup blocked" info bar . -->
-<!ENTITY editPopupSettingsUnix.label "Edit Pop-up Blocker Preferences…">
-<!ENTITY editPopupSettings.label "Edit Pop-up Blocker Options…">
+<!ENTITY editPopupSettingsUnix.label "Edit Pop-up Blocker Preferences">
+<!ENTITY editPopupSettings.label "Edit Pop-up Blocker Preferences">
 <!ENTITY editPopupSettings.accesskey "E">
 <!ENTITY dontShowMessage.accesskey "D">
 
diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties b/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties
index fd8a13547..24cb5c092 100644
--- a/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties
+++ b/application/palemoon/locales/en-US/chrome/browser/statusbar/meta.properties
@@ -1,5 +1,5 @@
 # Translator names. If there is more than one, separate with commas. Only include your name, not the locale you're translating.
-translator=Sparky Bluefang
+translator=Moonchild
 
 # Extension title. This usually should not be translated.
 name=Status-4-Evar
diff --git a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
index 0ea5ffc26..bb0ab95f8 100644
--- a/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/statusbar/statusbar-overlay.dtd
@@ -4,7 +4,7 @@
 <!ENTITY status4evar.progress.widget.title "Progress Meter">
 <!ENTITY status4evar.throbber.widget.title "Activity Indicator">
 <!ENTITY status4evar.download.widget.title "Download Status">
-<!ENTITY status4evar.options.widget.title "Pale Moon status bar options">
+<!ENTITY status4evar.options.widget.title "Status Bar Preferences">
 <!ENTITY status4evar.options.widget.label "Pale Moon status bar">
-<!ENTITY status4evar.menu.options.label "Status bar options...">
+<!ENTITY status4evar.menu.options.label "Status Bar Preferences">