зеркало из https://github.com/mozilla/gecko-dev.git
Bug 293523 - Change a couple instances of "Options" to "Preferences" in the blocked popup bar UI in Mac/Linux builds. r=mconnor, a=asa
This commit is contained in:
Родитель
0bdb85b4b1
Коммит
0ec1cc1fb3
|
@ -187,7 +187,11 @@
|
|||
accesskey="&allowPopups.accesskey;"
|
||||
oncommand="gPopupBlockerObserver.toggleAllowPopupsForSite(event);"/>
|
||||
<broadcaster id="blockedPopupEditSettings"
|
||||
label="&editPopupSettings.label;"
|
||||
#ifdef XP_WIN
|
||||
label="&editPopupSettings.label;"
|
||||
#else
|
||||
label="&editPopupSettingsUnix.label;"
|
||||
#endif
|
||||
accesskey="&editPopupSettings.accesskey;"
|
||||
oncommand="gPopupBlockerObserver.editPopupSettings();"/>
|
||||
<broadcaster id="blockedPopupDontShowMessage"
|
||||
|
|
|
@ -218,7 +218,11 @@ const gPopupBlockerObserver = {
|
|||
var brandShortName = brandBundle.getString("brandShortName");
|
||||
var message;
|
||||
var popupCount = gBrowser.selectedBrowser.pageReport.length;
|
||||
#ifdef XP_WIN
|
||||
var popupButtonText = bundle_browser.getString("popupWarningButton");
|
||||
#else
|
||||
var popupButtonText = bundle_browser.getString("popupWarningButtonUnix");
|
||||
#endif
|
||||
if (popupCount > 1)
|
||||
message = bundle_browser.getFormattedString("popupWarningMultiple", [brandShortName, popupCount]);
|
||||
else
|
||||
|
|
|
@ -341,6 +341,10 @@
|
|||
<!ENTITY pageReportIcon.tooltip "Change popup blocking settings for this web site">
|
||||
|
||||
<!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 Popup Blocker Preferences...">
|
||||
<!ENTITY editPopupSettings.label "Edit Popup Blocker Options...">
|
||||
<!ENTITY editPopupSettings.accesskey "E">
|
||||
<!ENTITY dontShowMessage.accesskey "D">
|
||||
|
|
|
@ -73,6 +73,7 @@ themeWarningButton=Edit Options...
|
|||
popupWarning=%S prevented this site from opening a popup window.
|
||||
popupWarningMultiple=%S prevented this site from opening %S popup windows.
|
||||
popupWarningButton=Options
|
||||
popupWarningButtonUnix=Preferences
|
||||
popupAllow=Allow popups for %S
|
||||
popupBlock=Block popups for %S
|
||||
popupWarningDontShowFromMessage=Don't show this message when popups are blocked
|
||||
|
|
Загрузка…
Ссылка в новой задаче