From 3cf6d2b2d73b3b09fb268a2b3927d920883745fb Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Wed, 4 Apr 2018 03:17:39 -0400
Subject: Sync Pale Moon code

---
 application/palemoon/locales/en-US/chrome/browser/browser.dtd        | 1 -
 application/palemoon/locales/en-US/chrome/browser/browser.properties | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'application/palemoon/locales/en-US')

diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.dtd b/application/palemoon/locales/en-US/chrome/browser/browser.dtd
index fe5f64854..0225f422b 100644
--- a/application/palemoon/locales/en-US/chrome/browser/browser.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/browser.dtd
@@ -337,7 +337,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY appMenuSafeMode.label "Restart in Safe Mode…">
 
 <!ENTITY openCmd.commandkey           "l">
-<!ENTITY urlbar.placeholder2          "Search or enter address">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Switch to tab:">
 
diff --git a/application/palemoon/locales/en-US/chrome/browser/browser.properties b/application/palemoon/locales/en-US/chrome/browser/browser.properties
index 5f75502ed..8b3fea4d5 100644
--- a/application/palemoon/locales/en-US/chrome/browser/browser.properties
+++ b/application/palemoon/locales/en-US/chrome/browser/browser.properties
@@ -220,6 +220,8 @@ tabHistory.goBack=Go back to this page
 tabHistory.goForward=Go forward to this page
 
 # URL Bar
+urlbar.placeholder=Search or enter address
+urlbar.placeholderURLOnly=Enter address
 pasteAndGo.label=Paste & Go
 
 # Block autorefresh
-- 
cgit v1.2.3