backout 3c5239c5771d for test failures

This commit is contained in:
Margaret Leibovic 2013-03-06 16:47:34 +00:00
parent 3da20ffdbb
commit f33ad66987
3 changed files with 7 additions and 5 deletions

View File

@ -6406,8 +6406,8 @@ var PermissionsHelper = {
},
"geolocation": {
label: "geolocation.shareLocation",
allowed: "geolocation.allow",
denied: "geolocation.dontAllow"
allowed: "geolocation.alwaysAllow",
denied: "geolocation.neverAllow"
},
"popup": {
label: "blockPopups.label",

View File

@ -86,7 +86,7 @@ ContentPermissionPrompt.prototype = {
}
}];
let message = browserBundle.formatStringFromName(entityName + ".ask",
let message = browserBundle.formatStringFromName(entityName + ".wantsTo",
[request.principal.URI.host], 1);
let options = { checkbox: browserBundle.GetStringFromName(entityName + ".dontAskAgain") };

View File

@ -90,7 +90,9 @@ identity.ownerUnknown2=(unknown)
# Geolocation UI
geolocation.allow=Share
geolocation.dontAllow=Don't share
geolocation.ask=Share your location with %S?
geolocation.alwaysAllow=Always Share
geolocation.neverAllow=Never Share
geolocation.wantsTo=%S wants your location.
# LOCALIZATION NOTE (geolocation.shareLocation): Label that will be used in
# site settings dialog.
geolocation.shareLocation=Share Location
@ -101,7 +103,7 @@ geolocation.dontAskAgain=Don't ask again for this site
# Desktop notification UI
desktopNotification.allow=Allow
desktopNotification.dontAllow=Don't allow
desktopNotification.ask=Allow %S to use notifications?
desktopNotification.wantsTo=%S wants to use notifications.
# LOCALIZATION NOTE (desktopNotification.useNotifications): Label that will be
# used in site settings dialog.
desktopNotification.useNotifications=Use Notifications