Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings. r=flod
authorNihanth Subramanya <nhnt11@gmail.com>
Tue, 20 Dec 2016 18:34:53 +0530
changeset 374118 31cb40156b9d96323907c5406f224c7ba1ecac2f
parent 374117 3c8f210688e2c0bb092f10683c7314efa2a1de7a
child 374119 b35d6cb8df5dfa3cc762bfc81aac0736acca121d
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1322201
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1322201 - Ensure correct usage of "login" vs "log in" in captive portal strings. r=flod MozReview-Commit-ID: 1kfSFGSanWe
browser/locales/en-US/chrome/browser/browser.properties
browser/locales/en-US/chrome/overrides/netError.dtd
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -727,22 +727,20 @@ decoder.noCodecs.message = To play video, you may need to install Microsoft’s Media Feature Pack.
 decoder.noCodecsVista.message = To play video, you may need to install Microsoft’s Platform Update Supplement for Windows Vista.
 decoder.noCodecsXP.message = To play video, you may need to enable Adobe’s Primetime Content Decryption Module.
 decoder.noCodecsLinux.message = To play video, you may need to install the required video codecs.
 decoder.noHWAcceleration.message = To improve video quality, you may need to install Microsoft’s Media Feature Pack.
 decoder.noHWAccelerationVista.message = To improve video quality, you may need to install Microsoft’s Platform Update Supplement for Windows Vista.
 decoder.noPulseAudio.message = To play audio, you may need to install the required PulseAudio software.
 decoder.unsupportedLibavcodec.message = libavcodec may be vulnerable or is not supported, and should be updated to play video.
 
-# LOCALIZATION NOTE (captivePortal.infoMessage,
-#                    captivePortal.infoMessage2):
+# LOCALIZATION NOTE (captivePortal.infoMessage2):
 # Shown in a notification bar when we detect a captive portal is blocking network access
-# and requires the user to log in before browsing. %1$S is replaced with brandShortName.
-captivePortal.infoMessage = This network may require you to login to use the internet. %1$S has opened the login page for you.
-captivePortal.infoMessage2 = This network may require you to login to use the internet.
+# and requires the user to log in before browsing.
+captivePortal.infoMessage2 = This network may require you to log in to use the internet.
 # LOCALIZATION NOTE (captivePortal.showLoginPage):
 # The label for a button shown in the info bar in all tabs except the login page tab.
 # The button shows the portal login page tab when clicked.
 captivePortal.showLoginPage = Show Login Page
 
 permissions.remove.tooltip = Clear this permission and ask again
 
 # LOCALIZATION NOTE (aboutDialog.architecture.*):
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -46,19 +46,19 @@
 </ul>
 ">
 
 <!ENTITY generic.title "Oops.">
 <!ENTITY generic.longDesc "
 <p>&brandShortName; can’t load this page for some reason.</p>
 ">
 
-<!ENTITY captivePortal.title "Login to network">
+<!ENTITY captivePortal.title "Log in to network">
 <!ENTITY captivePortal.longDesc "
-<p>This network may require you to login to access the internet.</p>
+<p>This network may require you to log in to access the internet.</p>
 ">
 
 <!ENTITY openPortalLoginPage.label "Open Login Page">
 
 <!ENTITY malformedURI.title "The address isn’t valid">
 <!ENTITY malformedURI.longDesc "
 <ul>
   <li>Web addresses are usually written like