summaryrefslogtreecommitdiffstats
path: root/application/palemoon/base
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-03-01 12:21:40 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-03-01 12:21:40 -0500
commit17e72c824ed54ced83a2943237340f8d1b7b1824 (patch)
tree5fb75140efde1678e4c97c3c0ac27ea49b0c19f0 /application/palemoon/base
parentb6c2d5f6ae5dfbbafe7c5488942fe775bc617aaa (diff)
downloadUXP-17e72c824ed54ced83a2943237340f8d1b7b1824.tar
UXP-17e72c824ed54ced83a2943237340f8d1b7b1824.tar.gz
UXP-17e72c824ed54ced83a2943237340f8d1b7b1824.tar.lz
UXP-17e72c824ed54ced83a2943237340f8d1b7b1824.tar.xz
UXP-17e72c824ed54ced83a2943237340f8d1b7b1824.zip
Sync Pale Moon code
Diffstat (limited to 'application/palemoon/base')
-rw-r--r--application/palemoon/base/content/aboutDialog.xul4
-rw-r--r--application/palemoon/base/content/browser-menubar.inc4
2 files changed, 6 insertions, 2 deletions
diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul
index 1ba8f06a1..743ff21df 100644
--- a/application/palemoon/base/content/aboutDialog.xul
+++ b/application/palemoon/base/content/aboutDialog.xul
@@ -88,6 +88,9 @@
</vbox>
<description class="text-pmcreds">
+#ifdef MC_PRIVATE_BUILD
+ This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
+#else
Pale Moon is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
</description>
<description class="text-pmcreds">
@@ -96,6 +99,7 @@
<description class="text-blurb">
If you wish to contribute, please consider helping out by providing support to other users on the <label class="text-link" href="https://forum.palemoon.org/">Pale Moon forum</label>
or getting involved in our development by tackling some of the issues found in our GitHub issue tracker.
+#endif
</description>
</vbox>
</vbox>
diff --git a/application/palemoon/base/content/browser-menubar.inc b/application/palemoon/base/content/browser-menubar.inc
index f818f5149..fa9d7f0f4 100644
--- a/application/palemoon/base/content/browser-menubar.inc
+++ b/application/palemoon/base/content/browser-menubar.inc
@@ -85,8 +85,8 @@
observes="workOfflineMenuitemState"
oncommand="BrowserOffline.toggleOfflineStatus();"/>
<menuitem id="menu_restart"
- label="&appMenuRestart.label;"
- accesskey="&appMenuRestart.accesskey;"
+ label="&restartCmd.label;"
+ accesskey="&restartCmd.accesskey;"
command="cmd_restartApplication"/>
<menuitem id="menu_FileQuitItem"
#ifdef XP_WIN