From 41e07182f7b673f0edcfb1829a55e6ca865eee3a Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 16 Jan 2019 01:55:31 +0100
Subject: [PALEMOON] Move Advanced prefs l10n strings to their proper place

---
 .../locales/en-US/chrome/browser/preferences/advanced.dtd    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'application/palemoon/locales')

diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
index 6ef29c680..f8203c6f6 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -33,6 +33,12 @@
 <!ENTITY setDefault.accesskey            "d">
 <!ENTITY isDefault.label                 "&brandShortName; is currently your default browser">
 
+<!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 dataChoicesTab.label            "Data Choices">
 
 <!ENTITY crashReporterSection.label      "Crash Reporter">
@@ -126,12 +132,6 @@
 <!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">
-- 
cgit v1.2.3


From db15a3fdb7fa9bb9e35ca0f2b7bc808a3783e4c5 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 16 Jan 2019 01:57:41 +0100
Subject: [PALEMOON] Add captive portal preference to the UI.

Tag #860
---
 .../palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd     | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'application/palemoon/locales')

diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
index f8203c6f6..dcb7b0e90 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -39,6 +39,9 @@
 <!ENTITY UACompat.Gecko                  "Gecko Compatibility">
 <!ENTITY UACompat.Firefox                "Firefox Compatibility">
 
+<!ENTITY captivePortalGroup.label        "Captive portals">
+<!ENTITY captivePortalDetect.label       "Detect restricted network access">
+
 <!ENTITY dataChoicesTab.label            "Data Choices">
 
 <!ENTITY crashReporterSection.label      "Crash Reporter">
-- 
cgit v1.2.3


From d9a05498806ede2978623019ce222150c5cfcef5 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 6 Feb 2019 15:59:19 +0100
Subject: Add "check for updates" to main menu and AppMenu

Tag #963.
---
 application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'application/palemoon/locales')

diff --git a/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd b/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
index a926b0ed2..23e681625 100644
--- a/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
@@ -25,6 +25,9 @@
 <!ENTITY helpTroubleshootingInfo.label      "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey  "T">
 
+<!ENTITY checkForUpdates.label       "Check for Updates…">
+<!ENTITY checkForUpdates.accesskey   "C">
+
 <!ENTITY helpFeedbackPage.label      "Submit Feedback…">
 <!ENTITY helpFeedbackPage.accesskey  "S">
 
-- 
cgit v1.2.3


From 8db772d2ca44ff44f32d434e7f62acba289b4155 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 6 Feb 2019 16:15:27 +0100
Subject: Revert "Add "check for updates" to main menu and AppMenu"

This reverts commit d9a05498806ede2978623019ce222150c5cfcef5.
---
 application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'application/palemoon/locales')

diff --git a/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd b/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
index 23e681625..a926b0ed2 100644
--- a/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/baseMenuOverlay.dtd
@@ -25,9 +25,6 @@
 <!ENTITY helpTroubleshootingInfo.label      "Troubleshooting Information">
 <!ENTITY helpTroubleshootingInfo.accesskey  "T">
 
-<!ENTITY checkForUpdates.label       "Check for Updates…">
-<!ENTITY checkForUpdates.accesskey   "C">
-
 <!ENTITY helpFeedbackPage.label      "Submit Feedback…">
 <!ENTITY helpFeedbackPage.accesskey  "S">
 
-- 
cgit v1.2.3