diff --git a/mozilla/camino/CHBrowserWrapper.mm b/mozilla/camino/CHBrowserWrapper.mm index 4ccde827bcd..492a31fbc2d 100644 --- a/mozilla/camino/CHBrowserWrapper.mm +++ b/mozilla/camino/CHBrowserWrapper.mm @@ -474,10 +474,6 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [[self window] setFrame:frame display:YES]; } -#define NS_POPUP_BLOCK @"This Web site is attempting to open an unrequested popup window. Navigator can \ -automatically prevent Web sites from opening popup advertisements. Click OK to prevent all \ -unrequested popups (including this one) from opening." - - (CHBrowserView*)createBrowserWindow:(unsigned int)aMask { nsCOMPtr pref(do_GetService("@mozilla.org/preferences-service;1")); @@ -497,7 +493,7 @@ unrequested popups (including this one) from opening." // popup. nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); BOOL confirm = [controller confirm: [self window] title: @"Unrequested Popup Detected" - text: NS_POPUP_BLOCK]; + text: [NSString stringWithFormat: NSLocalizedString(@"PopupBlockMsg", @""), NSLocalizedString(@"Navigator", @"")]]; // This is a one-time dialog. pref->SetBoolPref("browser.popups.showPopupBlocker", PR_FALSE); diff --git a/mozilla/camino/English.lproj/Localizable.strings b/mozilla/camino/English.lproj/Localizable.strings index 148f89cece6..3b56396868d 100644 Binary files a/mozilla/camino/English.lproj/Localizable.strings and b/mozilla/camino/English.lproj/Localizable.strings differ diff --git a/mozilla/camino/resources/localized/English.lproj/Localizable.strings b/mozilla/camino/resources/localized/English.lproj/Localizable.strings index 148f89cece6..3b56396868d 100644 Binary files a/mozilla/camino/resources/localized/English.lproj/Localizable.strings and b/mozilla/camino/resources/localized/English.lproj/Localizable.strings differ diff --git a/mozilla/camino/src/browser/BrowserWrapper.mm b/mozilla/camino/src/browser/BrowserWrapper.mm index 4ccde827bcd..492a31fbc2d 100644 --- a/mozilla/camino/src/browser/BrowserWrapper.mm +++ b/mozilla/camino/src/browser/BrowserWrapper.mm @@ -474,10 +474,6 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [[self window] setFrame:frame display:YES]; } -#define NS_POPUP_BLOCK @"This Web site is attempting to open an unrequested popup window. Navigator can \ -automatically prevent Web sites from opening popup advertisements. Click OK to prevent all \ -unrequested popups (including this one) from opening." - - (CHBrowserView*)createBrowserWindow:(unsigned int)aMask { nsCOMPtr pref(do_GetService("@mozilla.org/preferences-service;1")); @@ -497,7 +493,7 @@ unrequested popups (including this one) from opening." // popup. nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); BOOL confirm = [controller confirm: [self window] title: @"Unrequested Popup Detected" - text: NS_POPUP_BLOCK]; + text: [NSString stringWithFormat: NSLocalizedString(@"PopupBlockMsg", @""), NSLocalizedString(@"Navigator", @"")]]; // This is a one-time dialog. pref->SetBoolPref("browser.popups.showPopupBlocker", PR_FALSE); diff --git a/mozilla/chimera/CHBrowserWrapper.mm b/mozilla/chimera/CHBrowserWrapper.mm index 4ccde827bcd..492a31fbc2d 100644 --- a/mozilla/chimera/CHBrowserWrapper.mm +++ b/mozilla/chimera/CHBrowserWrapper.mm @@ -474,10 +474,6 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [[self window] setFrame:frame display:YES]; } -#define NS_POPUP_BLOCK @"This Web site is attempting to open an unrequested popup window. Navigator can \ -automatically prevent Web sites from opening popup advertisements. Click OK to prevent all \ -unrequested popups (including this one) from opening." - - (CHBrowserView*)createBrowserWindow:(unsigned int)aMask { nsCOMPtr pref(do_GetService("@mozilla.org/preferences-service;1")); @@ -497,7 +493,7 @@ unrequested popups (including this one) from opening." // popup. nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); BOOL confirm = [controller confirm: [self window] title: @"Unrequested Popup Detected" - text: NS_POPUP_BLOCK]; + text: [NSString stringWithFormat: NSLocalizedString(@"PopupBlockMsg", @""), NSLocalizedString(@"Navigator", @"")]]; // This is a one-time dialog. pref->SetBoolPref("browser.popups.showPopupBlocker", PR_FALSE); diff --git a/mozilla/chimera/English.lproj/Localizable.strings b/mozilla/chimera/English.lproj/Localizable.strings index 148f89cece6..3b56396868d 100644 Binary files a/mozilla/chimera/English.lproj/Localizable.strings and b/mozilla/chimera/English.lproj/Localizable.strings differ diff --git a/mozilla/chimera/resources/localized/English.lproj/Localizable.strings b/mozilla/chimera/resources/localized/English.lproj/Localizable.strings index 148f89cece6..3b56396868d 100644 Binary files a/mozilla/chimera/resources/localized/English.lproj/Localizable.strings and b/mozilla/chimera/resources/localized/English.lproj/Localizable.strings differ diff --git a/mozilla/chimera/src/browser/BrowserWrapper.mm b/mozilla/chimera/src/browser/BrowserWrapper.mm index 4ccde827bcd..492a31fbc2d 100644 --- a/mozilla/chimera/src/browser/BrowserWrapper.mm +++ b/mozilla/chimera/src/browser/BrowserWrapper.mm @@ -474,10 +474,6 @@ static const char* ioServiceContractID = "@mozilla.org/network/io-service;1"; [[self window] setFrame:frame display:YES]; } -#define NS_POPUP_BLOCK @"This Web site is attempting to open an unrequested popup window. Navigator can \ -automatically prevent Web sites from opening popup advertisements. Click OK to prevent all \ -unrequested popups (including this one) from opening." - - (CHBrowserView*)createBrowserWindow:(unsigned int)aMask { nsCOMPtr pref(do_GetService("@mozilla.org/preferences-service;1")); @@ -497,7 +493,7 @@ unrequested popups (including this one) from opening." // popup. nsAlertController* controller = nsCocoaBrowserService::GetAlertController(); BOOL confirm = [controller confirm: [self window] title: @"Unrequested Popup Detected" - text: NS_POPUP_BLOCK]; + text: [NSString stringWithFormat: NSLocalizedString(@"PopupBlockMsg", @""), NSLocalizedString(@"Navigator", @"")]]; // This is a one-time dialog. pref->SetBoolPref("browser.popups.showPopupBlocker", PR_FALSE);