nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out changeset d28d0498bd7b (bug 1517493) for bc failures at browser_firstPartyIsolation_saveAs.js

Browse source
This commit is contained in:
Oana Pop Rus 2019-02-21 14:28:56 +02:00
parent 561078725c
commit d259530ce5
13 changed files with 316 additions and 761 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

160
browser/base/content/pageinfo/pageInfo.js
View file

@ -172,6 +172,18 @@ gImageView.getCellProperties = function(row, col) {
return props; return props;
}; };
gImageView.getCellText = function(row, column) {
var value = this.data[row][column.index];
if (column.index == COL_IMAGE_SIZE) {
if (value == -1) {
return gStrings.unknown;
}
var kbSize = Number(Math.round(value / 1024 * 100) / 100);
return gBundle.getFormattedString("mediaFileSize", [kbSize]);
}
return value || "";
};
gImageView.onPageMediaSort = function(columnname) { gImageView.onPageMediaSort = function(columnname) {
var tree = document.getElementById(this.treeid); var tree = document.getElementById(this.treeid);
var treecol = tree.columns.getNamedColumn(columnname); var treecol = tree.columns.getNamedColumn(columnname);
@ -285,20 +297,21 @@ var onUnloadRegistry = [ ];
* the calling window's document will be used * the calling window's document will be used
* - initialTab: (optional) id of the inital tab to display * - initialTab: (optional) id of the inital tab to display
*/ */
async function onLoadPageInfo() { function onLoadPageInfo() {
gStrings.unknown = await document.l10n.formatValue("image-size-unknown"); gBundle = document.getElementById("pageinfobundle");
gStrings.notSet = await document.l10n.formatValue("not-set-alternative-text"); gStrings.unknown = gBundle.getString("unknown");
gStrings.mediaImg = await document.l10n.formatValue("media-img"); gStrings.notSet = gBundle.getString("notset");
gStrings.mediaBGImg = await document.l10n.formatValue("media-bg-img"); gStrings.mediaImg = gBundle.getString("mediaImg");
gStrings.mediaBorderImg = await document.l10n.formatValue("media-border-img"); gStrings.mediaBGImg = gBundle.getString("mediaBGImg");
gStrings.mediaListImg = await document.l10n.formatValue("media-list-img"); gStrings.mediaBorderImg = gBundle.getString("mediaBorderImg");
gStrings.mediaCursor = await document.l10n.formatValue("media-cursor"); gStrings.mediaListImg = gBundle.getString("mediaListImg");
gStrings.mediaObject = await document.l10n.formatValue("media-object"); gStrings.mediaCursor = gBundle.getString("mediaCursor");
gStrings.mediaEmbed = await document.l10n.formatValue("media-embed"); gStrings.mediaObject = gBundle.getString("mediaObject");
gStrings.mediaLink = await document.l10n.formatValue("media-link"); gStrings.mediaEmbed = gBundle.getString("mediaEmbed");
gStrings.mediaInput = await document.l10n.formatValue("media-input"); gStrings.mediaLink = gBundle.getString("mediaLink");
gStrings.mediaVideo = await document.l10n.formatValue("media-video"); gStrings.mediaInput = gBundle.getString("mediaInput");
gStrings.mediaAudio = await document.l10n.formatValue("media-audio"); gStrings.mediaVideo = gBundle.getString("mediaVideo");
gStrings.mediaAudio = gBundle.getString("mediaAudio");
var args = "arguments" in window && var args = "arguments" in window &&
window.arguments.length >= 1 && window.arguments.length >= 1 &&
@ -325,7 +338,7 @@ function loadPageInfo(frameOuterWindowID, imageElement, browser) {
let pageInfoData; let pageInfoData;
// Get initial pageInfoData needed to display the general, permission and security tabs. // Get initial pageInfoData needed to display the general, permission and security tabs.
mm.addMessageListener("PageInfo:data", async function onmessage(message) { mm.addMessageListener("PageInfo:data", function onmessage(message) {
mm.removeMessageListener("PageInfo:data", onmessage); mm.removeMessageListener("PageInfo:data", onmessage);
pageInfoData = message.data; pageInfoData = message.data;
let docInfo = pageInfoData.docInfo; let docInfo = pageInfoData.docInfo;
@ -335,13 +348,14 @@ function loadPageInfo(frameOuterWindowID, imageElement, browser) {
gDocInfo = docInfo; gDocInfo = docInfo;
gImageElement = imageInfo; gImageElement = imageInfo;
var titleFormat = windowInfo.isTopWindow ? "page-info-page"
: "page-info-frame"; var titleFormat = windowInfo.isTopWindow ? "pageInfo.page.title"
document.l10n.setAttributes(document.documentElement, titleFormat, {"website": docInfo.location}); : "pageInfo.frame.title";
document.title = gBundle.getFormattedString(titleFormat, [docInfo.location]);
document.getElementById("main-window").setAttribute("relatedUrl", docInfo.location); document.getElementById("main-window").setAttribute("relatedUrl", docInfo.location);
await makeGeneralTab(pageInfoData.metaViewRows, docInfo); makeGeneralTab(pageInfoData.metaViewRows, docInfo);
onLoadPermission(uri, principal); onLoadPermission(uri, principal);
securityOnLoad(uri, windowInfo); securityOnLoad(uri, windowInfo);
}); });
@ -451,13 +465,9 @@ function openCacheEntry(key, cb) {
diskStorage.asyncOpenURI(Services.io.newURI(key), "", nsICacheStorage.OPEN_READONLY, checkCacheListener); diskStorage.asyncOpenURI(Services.io.newURI(key), "", nsICacheStorage.OPEN_READONLY, checkCacheListener);
} }
async function makeGeneralTab(metaViewRows, docInfo) { function makeGeneralTab(metaViewRows, docInfo) {
// Sets Title in the General Tab, set to "Untitled Page" if no title found var title = (docInfo.title) ? docInfo.title : gBundle.getString("noPageTitle");
if (docInfo.title) { document.getElementById("titletext").value = title;
document.getElementById("titletext").value = docInfo.title;
} else {
document.l10n.setAttributes(document.getElementById("titletext"), "no-page-title");
}
var url = docInfo.location; var url = docInfo.location;
setItemValue("urltext", url); setItemValue("urltext", url);
@ -465,8 +475,8 @@ async function makeGeneralTab(metaViewRows, docInfo) {
var referrer = ("referrer" in docInfo && docInfo.referrer); var referrer = ("referrer" in docInfo && docInfo.referrer);
setItemValue("refertext", referrer); setItemValue("refertext", referrer);
var mode = ("compatMode" in docInfo && docInfo.compatMode == "BackCompat") ? "general-quirks-mode" : "general-strict-mode"; var mode = ("compatMode" in docInfo && docInfo.compatMode == "BackCompat") ? "generalQuirksMode" : "generalStrictMode";
document.l10n.setAttributes(document.getElementById("modetext"), mode); document.getElementById("modetext").value = gBundle.getString(mode);
// find out the mime type // find out the mime type
var mimeType = docInfo.contentType; var mimeType = docInfo.contentType;
@ -482,9 +492,11 @@ async function makeGeneralTab(metaViewRows, docInfo) {
if (!length) if (!length)
metaGroup.style.visibility = "hidden"; metaGroup.style.visibility = "hidden";
else { else {
document.l10n.setAttributes(document.getElementById("metaTagsCaption"), var metaTagsCaption = document.getElementById("metaTagsCaption");
"general-meta-tags", {"tags": length}); if (length == 1)
metaTagsCaption.value = gBundle.getString("generalMetaTag");
else
metaTagsCaption.value = gBundle.getFormattedString("generalMetaTags", [length]);
var metaTree = document.getElementById("metatree"); var metaTree = document.getElementById("metatree");
metaTree.view = gMetaView; metaTree.view = gMetaView;
@ -494,7 +506,8 @@ async function makeGeneralTab(metaViewRows, docInfo) {
metaGroup.style.removeProperty("visibility"); metaGroup.style.removeProperty("visibility");
} }
var modifiedText = formatDate(docInfo.lastModified, await document.l10n.formatValue("not-set-date")); // get the date of last modification
var modifiedText = formatDate(docInfo.lastModified, gStrings.notSet);
document.getElementById("modifiedtext").value = modifiedText; document.getElementById("modifiedtext").value = modifiedText;
// get cache info // get cache info
@ -504,17 +517,15 @@ async function makeGeneralTab(metaViewRows, docInfo) {
if (cacheEntry) { if (cacheEntry) {
var pageSize = cacheEntry.dataSize; var pageSize = cacheEntry.dataSize;
var kbSize = formatNumber(Math.round(pageSize / 1024 * 100) / 100); var kbSize = formatNumber(Math.round(pageSize / 1024 * 100) / 100);
document.l10n.setAttributes(document.getElementById("sizetext"), sizeText = gBundle.getFormattedString("generalSize", [kbSize, formatNumber(pageSize)]);
"properties-general-size",
{"kb": kbSize, "bytes": formatNumber(pageSize)});
} else {
setItemValue("sizetext", sizeText);
} }
setItemValue("sizetext", sizeText);
}); });
} }
async function addImage(imageViewRow) { function addImage(imageViewRow) {
let [url, type, alt, elem, isBg] = imageViewRow; let [url, type, alt, elem, isBg] = imageViewRow;
if (!url) if (!url)
return; return;
@ -524,23 +535,16 @@ async function addImage(imageViewRow) {
gImageHash[url][type] = { }; gImageHash[url][type] = { };
if (!gImageHash[url][type].hasOwnProperty(alt)) { if (!gImageHash[url][type].hasOwnProperty(alt)) {
gImageHash[url][type][alt] = gImageView.data.length; gImageHash[url][type][alt] = gImageView.data.length;
var row = [url, type, gStrings.unknown, alt, 1, elem, isBg]; var row = [url, type, -1, alt, 1, elem, isBg];
gImageView.addRow(row); gImageView.addRow(row);
// Fill in cache data asynchronously // Fill in cache data asynchronously
openCacheEntry(url, function(cacheEntry) { openCacheEntry(url, function(cacheEntry) {
// The data at row[2] corresponds to the data size. // The data at row[2] corresponds to the data size.
if (cacheEntry) { if (cacheEntry) {
let value = cacheEntry.dataSize; row[2] = cacheEntry.dataSize;
// If value is not -1 then replace with actual value, else keep as "unknown"
if (value != -1) {
let kbSize = Number(Math.round(value / 1024 * 100) / 100);
document.l10n.formatValue("media-file-size", {"size": kbSize}).then(function(response) {
row[2] = response;
// Invalidate the row to trigger a repaint. // Invalidate the row to trigger a repaint.
gImageView.tree.invalidateRow(gImageView.data.indexOf(row)); gImageView.tree.invalidateRow(gImageView.data.indexOf(row));
});
}
} }
}); });
@ -617,10 +621,10 @@ function getSelectedRow(tree) {
return (rows.length == 1) ? rows[0] : -1; return (rows.length == 1) ? rows[0] : -1;
} }
async function selectSaveFolder(aCallback) { function selectSaveFolder(aCallback) {
const nsIFile = Ci.nsIFile; const nsIFile = Ci.nsIFile;
const nsIFilePicker = Ci.nsIFilePicker; const nsIFilePicker = Ci.nsIFilePicker;
let titleText = await document.l10n.formatValue("media-select-folder"); let titleText = gBundle.getString("mediaSelectFolder");
let fp = Cc["@mozilla.org/filepicker;1"]. let fp = Cc["@mozilla.org/filepicker;1"].
createInstance(nsIFilePicker); createInstance(nsIFilePicker);
let fpCallback = function fpCallback_done(aResult) { let fpCallback = function fpCallback_done(aResult) {
@ -755,16 +759,15 @@ function makePreview(row) {
var cacheKey = url.replace(/#.*$/, ""); var cacheKey = url.replace(/#.*$/, "");
openCacheEntry(cacheKey, function(cacheEntry) { openCacheEntry(cacheKey, function(cacheEntry) {
// find out the file size // find out the file size
var sizeText;
if (cacheEntry) { if (cacheEntry) {
let imageSize = cacheEntry.dataSize; let imageSize = cacheEntry.dataSize;
var kbSize = Math.round(imageSize / 1024 * 100) / 100; var kbSize = Math.round(imageSize / 1024 * 100) / 100;
document.l10n.setAttributes(document.getElementById("imagesizetext"), sizeText = gBundle.getFormattedString("generalSize",
"properties-general-size", [formatNumber(kbSize), formatNumber(imageSize)]);
{"kb": formatNumber(kbSize), "bytes": formatNumber(imageSize)}); } else
} else { sizeText = gBundle.getString("mediaUnknownNotCached");
document.l10n.setAttributes(document.getElementById("imagesizetext"), setItemValue("imagesizetext", sizeText);
"media-unknown-not-cached");
}
var mimeType = item.mimeType || this.getContentTypeFromHeaders(cacheEntry); var mimeType = item.mimeType || this.getContentTypeFromHeaders(cacheEntry);
var numFrames = item.numFrames; var numFrames = item.numFrames;
@ -776,21 +779,19 @@ function makePreview(row) {
if (imageMimeType) { if (imageMimeType) {
imageType = imageMimeType[1].toUpperCase(); imageType = imageMimeType[1].toUpperCase();
if (numFrames > 1) if (numFrames > 1)
document.l10n.setAttributes(document.getElementById("imagetypetext"), imageType = gBundle.getFormattedString("mediaAnimatedImageType",
"media-animated-image-type", [imageType, numFrames]);
{"type": imageType, "frames": numFrames});
else else
document.l10n.setAttributes(document.getElementById("imagetypetext"), imageType = gBundle.getFormattedString("mediaImageType", [imageType]);
"media-image-type",
{"type": imageType});
} else { } else {
// the MIME type doesn't begin with image/, display the raw type // the MIME type doesn't begin with image/, display the raw type
setItemValue("imagetypetext", mimeType); imageType = mimeType;
} }
} else { } else {
// We couldn't find the type, fall back to the value in the treeview // We couldn't find the type, fall back to the value in the treeview
setItemValue("imagetypetext", gImageView.data[row][COL_IMAGE_TYPE]); imageType = gImageView.data[row][COL_IMAGE_TYPE];
} }
setItemValue("imagetypetext", imageType);
var imageContainer = document.getElementById("theimagecontainer"); var imageContainer = document.getElementById("theimagecontainer");
var oldImage = document.getElementById("thepreviewimage"); var oldImage = document.getElementById("thepreviewimage");
@ -846,21 +847,21 @@ function makePreview(row) {
document.getElementById("theimagecontainer").collapsed = false; document.getElementById("theimagecontainer").collapsed = false;
document.getElementById("brokenimagecontainer").collapsed = true; document.getElementById("brokenimagecontainer").collapsed = true;
let imageSize = "";
if (url) { if (url) {
if (width != physWidth || height != physHeight) { if (width != physWidth || height != physHeight) {
document.l10n.setAttributes(document.getElementById("imagedimensiontext"), imageSize = gBundle.getFormattedString("mediaDimensionsScaled",
"media-dimensions-scaled", [formatNumber(physWidth),
{"dimx": formatNumber(physWidth), formatNumber(physHeight),
"dimy": formatNumber(physHeight), formatNumber(width),
"scaledx": formatNumber(width), formatNumber(height)]);
"scaledy": formatNumber(height)});
} else { } else {
document.l10n.setAttributes(document.getElementById("imagedimensiontext"), imageSize = gBundle.getFormattedString("mediaDimensions",
"media-dimensions", [formatNumber(width),
{"dimx": formatNumber(width), formatNumber(height)]);
"dimy": formatNumber(height)});
} }
} }
setItemValue("imagedimensiontext", imageSize);
}, {once: true}); }, {once: true});
newImage.setAttribute("triggeringprincipal", triggeringPrinStr); newImage.setAttribute("triggeringprincipal", triggeringPrinStr);
@ -895,12 +896,13 @@ function makePreview(row) {
document.getElementById("theimagecontainer").collapsed = true; document.getElementById("theimagecontainer").collapsed = true;
} }
let imageSize = "";
if (url && !isAudio) { if (url && !isAudio) {
document.l10n.setAttributes(document.getElementById("imagedimensiontext"), imageSize = gBundle.getFormattedString("mediaDimensions",
"media-dimensions", [formatNumber(width),
{"dimx": formatNumber(width), formatNumber(height)]);
"dimy": formatNumber(height)});
} }
setItemValue("imagedimensiontext", imageSize);
} }
makeBlockImage(url); makeBlockImage(url);
@ -924,7 +926,7 @@ function makeBlockImage(url) {
var uri = Services.io.newURI(url); var uri = Services.io.newURI(url);
if (uri.host) { if (uri.host) {
checkbox.hidden = false; checkbox.hidden = false;
document.l10n.setAttributes(checkbox, "media-block-image", {"website": uri.host}); checkbox.label = gBundle.getFormattedString("mediaBlockImage", [uri.host]);
var perm = permissionManager.testPermission(uri, "image"); var perm = permissionManager.testPermission(uri, "image");
checkbox.checked = perm == nsIPermissionManager.DENY_ACTION; checkbox.checked = perm == nsIPermissionManager.DENY_ACTION;
} else } else

132
browser/base/content/pageinfo/pageInfo.xul
View file

@ -7,6 +7,8 @@
<?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
<!DOCTYPE window [ <!DOCTYPE window [
<!ENTITY % pageInfoDTD SYSTEM "chrome://browser/locale/pageInfo.dtd">
%pageInfoDTD;
#ifdef XP_MACOSX #ifdef XP_MACOSX
#include ../browser-doctype.inc #include ../browser-doctype.inc
#endif #endif
@ -14,22 +16,18 @@
<window id="main-window" <window id="main-window"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
data-l10n-id="page-info-window"
data-l10n-attrs="style"
windowtype="Browser:page-info" windowtype="Browser:page-info"
onload="onLoadPageInfo()" onload="onLoadPageInfo()"
onunload="onUnloadPageInfo()" onunload="onUnloadPageInfo()"
align="stretch" align="stretch"
screenX="10" screenY="10" screenX="10" screenY="10"
width="&pageInfoWindow.width;" height="&pageInfoWindow.height;"
persist="screenX screenY width height sizemode"> persist="screenX screenY width height sizemode">
#ifdef XP_MACOSX #ifdef XP_MACOSX
#include ../macWindow.inc.xul #include ../macWindow.inc.xul
#endif #endif
<linkset>
<link rel="localization" href="browser/pageInfo.ftl"/>
</linkset>
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/> <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
<script type="application/javascript" src="chrome://global/content/treeUtils.js"/> <script type="application/javascript" src="chrome://global/content/treeUtils.js"/>
@ -39,6 +37,7 @@
<script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/> <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
<stringbundleset id="pageinfobundleset"> <stringbundleset id="pageinfobundleset">
<stringbundle id="pageinfobundle" src="chrome://browser/locale/pageInfo.properties"/>
<stringbundle id="pkiBundle" src="chrome://pippki/locale/pippki.properties"/> <stringbundle id="pkiBundle" src="chrome://pippki/locale/pippki.properties"/>
<stringbundle id="browserBundle" src="chrome://browser/locale/browser.properties"/> <stringbundle id="browserBundle" src="chrome://browser/locale/browser.properties"/>
</stringbundleset> </stringbundleset>
@ -51,32 +50,32 @@
</commandset> </commandset>
<keyset id="pageInfoKeySet"> <keyset id="pageInfoKeySet">
<key data-l10n-id="close-window" modifiers="accel" command="cmd_close"/> <key key="&closeWindow.key;" modifiers="accel" command="cmd_close"/>
<key keycode="VK_ESCAPE" command="cmd_close"/> <key keycode="VK_ESCAPE" command="cmd_close"/>
#ifdef XP_MACOSX #ifdef XP_MACOSX
<key key="." modifiers="meta" command="cmd_close"/> <key key="." modifiers="meta" command="cmd_close"/>
#else #else
<key keycode="VK_F1" command="cmd_help"/> <key keycode="VK_F1" command="cmd_help"/>
#endif #endif
<key data-l10n-id="copy" modifiers="accel" command="cmd_copy"/> <key key="&copy.key;" modifiers="accel" command="cmd_copy"/>
<key data-l10n-id="select-all" modifiers="accel" command="cmd_selectall"/> <key key="&selectall.key;" modifiers="accel" command="cmd_selectall"/>
<key data-l10n-id="select-all" modifiers="alt" command="cmd_selectall"/> <key key="&selectall.key;" modifiers="alt" command="cmd_selectall"/>
</keyset> </keyset>
<menupopup id="picontext"> <menupopup id="picontext">
<menuitem id="menu_selectall" data-l10n-id="menu-select-all" command="cmd_selectall"/> <menuitem id="menu_selectall" label="&selectall.label;" command="cmd_selectall" accesskey="&selectall.accesskey;"/>
<menuitem id="menu_copy" data-l10n-id="menu-copy" command="cmd_copy"/> <menuitem id="menu_copy" label="&copy.label;" command="cmd_copy" accesskey="&copy.accesskey;"/>
</menupopup> </menupopup>
<vbox id="topBar"> <vbox id="topBar">
<radiogroup id="viewGroup" class="chromeclass-toolbar" orient="horizontal"> <radiogroup id="viewGroup" class="chromeclass-toolbar" orient="horizontal">
<radio id="generalTab" data-l10n-id="general-tab" <radio id="generalTab" label="&generalTab;" accesskey="&generalTab.accesskey;"
oncommand="showTab('general');"/> oncommand="showTab('general');"/>
<radio id="mediaTab" data-l10n-id="media-tab" <radio id="mediaTab" label="&mediaTab;" accesskey="&mediaTab.accesskey;"
oncommand="showTab('media');" hidden="true"/> oncommand="showTab('media');" hidden="true"/>
<radio id="permTab" data-l10n-id="perm-tab" <radio id="permTab" label="&permTab;" accesskey="&permTab.accesskey;"
oncommand="showTab('perm');"/> oncommand="showTab('perm');"/>
<radio id="securityTab" data-l10n-id="security-tab" <radio id="securityTab" label="&securityTab;" accesskey="&securityTab.accesskey;"
oncommand="showTab('security');"/> oncommand="showTab('security');"/>
</radiogroup> </radiogroup>
</vbox> </vbox>
@ -92,12 +91,12 @@
</columns> </columns>
<rows id="generalRows"> <rows id="generalRows">
<row id="generalTitle"> <row id="generalTitle">
<label control="titletext" data-l10n-id="general-title"/> <label control="titletext" value="&generalTitle;"/>
<separator/> <separator/>
<textbox readonly="true" id="titletext"/> <textbox readonly="true" id="titletext"/>
</row> </row>
<row id="generalURLRow"> <row id="generalURLRow">
<label control="urltext" data-l10n-id="general-url"/> <label control="urltext" value="&generalURL;"/>
<separator/> <separator/>
<textbox readonly="true" id="urltext"/> <textbox readonly="true" id="urltext"/>
</row> </row>
@ -105,27 +104,27 @@
<separator class="thin"/> <separator class="thin"/>
</row> </row>
<row id="generalTypeRow"> <row id="generalTypeRow">
<label control="typetext" data-l10n-id="general-type"/> <label control="typetext" value="&generalType;"/>
<separator/> <separator/>
<textbox readonly="true" id="typetext"/> <textbox readonly="true" id="typetext"/>
</row> </row>
<row id="generalModeRow"> <row id="generalModeRow">
<label control="modetext" data-l10n-id="general-mode"/> <label control="modetext" value="&generalMode;"/>
<separator/> <separator/>
<textbox readonly="true" crop="end" id="modetext"/> <textbox readonly="true" crop="end" id="modetext"/>
</row> </row>
<row id="generalEncodingRow"> <row id="generalEncodingRow">
<label control="encodingtext" data-l10n-id="general-encoding"/> <label control="encodingtext" value="&generalEncoding2;"/>
<separator/> <separator/>
<textbox readonly="true" id="encodingtext"/> <textbox readonly="true" id="encodingtext"/>
</row> </row>
<row id="generalSizeRow"> <row id="generalSizeRow">
<label control="sizetext" data-l10n-id="general-size"/> <label control="sizetext" value="&generalSize;"/>
<separator/> <separator/>
<textbox readonly="true" id="sizetext"/> <textbox readonly="true" id="sizetext"/>
</row> </row>
<row id="generalReferrerRow"> <row id="generalReferrerRow">
<label control="refertext" data-l10n-id="general-referrer"/> <label control="refertext" value="&generalReferrer;"/>
<separator/> <separator/>
<textbox readonly="true" id="refertext"/> <textbox readonly="true" id="refertext"/>
</row> </row>
@ -133,7 +132,7 @@
<separator class="thin"/> <separator class="thin"/>
</row> </row>
<row id="generalModifiedRow"> <row id="generalModifiedRow">
<label control="modifiedtext" data-l10n-id="general-modified"/> <label control="modifiedtext" value="&generalModified;"/>
<separator/> <separator/>
<textbox readonly="true" id="modifiedtext"/> <textbox readonly="true" id="modifiedtext"/>
</row> </row>
@ -144,11 +143,11 @@
<label control="metatree" id="metaTagsCaption" class="header"/> <label control="metatree" id="metaTagsCaption" class="header"/>
<tree id="metatree" flex="1" hidecolumnpicker="true" contextmenu="picontext"> <tree id="metatree" flex="1" hidecolumnpicker="true" contextmenu="picontext">
<treecols> <treecols>
<treecol id="meta-name" data-l10n-id="general-meta-name" <treecol id="meta-name" label="&generalMetaName;"
persist="width" flex="1" persist="width" flex="1"
onclick="gMetaView.onPageMediaSort('meta-name');"/> onclick="gMetaView.onPageMediaSort('meta-name');"/>
<splitter class="tree-splitter"/> <splitter class="tree-splitter"/>
<treecol id="meta-content" data-l10n-id="general-meta-content" <treecol id="meta-content" label="&generalMetaContent;"
persist="width" flex="4" persist="width" flex="4"
onclick="gMetaView.onPageMediaSort('meta-content');"/> onclick="gMetaView.onPageMediaSort('meta-content');"/>
</treecols> </treecols>
@ -156,7 +155,7 @@
</tree> </tree>
</vbox> </vbox>
<hbox pack="end"> <hbox pack="end">
<button command="cmd_help" data-l10n-id="help-button" dlgtype="help"/> <button command="cmd_help" label="&helpButton.label;" dlgtype="help"/>
</hbox> </hbox>
</vbox> </vbox>
@ -166,23 +165,23 @@
ondragstart="onBeginLinkDrag(event,'image-address','image-alt')"> ondragstart="onBeginLinkDrag(event,'image-address','image-alt')">
<treecols> <treecols>
<treecol primary="true" persist="width" flex="10" <treecol primary="true" persist="width" flex="10"
width="10" id="image-address" data-l10n-id="media-address" width="10" id="image-address" label="&mediaAddress;"
onclick="gImageView.onPageMediaSort('image-address');"/> onclick="gImageView.onPageMediaSort('image-address');"/>
<splitter class="tree-splitter"/> <splitter class="tree-splitter"/>
<treecol persist="hidden width" flex="2" <treecol persist="hidden width" flex="2"
width="2" id="image-type" data-l10n-id="media-type" width="2" id="image-type" label="&mediaType;"
onclick="gImageView.onPageMediaSort('image-type');"/> onclick="gImageView.onPageMediaSort('image-type');"/>
<splitter class="tree-splitter"/> <splitter class="tree-splitter"/>
<treecol hidden="true" persist="hidden width" flex="2" <treecol hidden="true" persist="hidden width" flex="2"
width="2" id="image-size" data-l10n-id="media-size" value="size" width="2" id="image-size" label="&mediaSize;" value="size"
onclick="gImageView.onPageMediaSort('image-size');"/> onclick="gImageView.onPageMediaSort('image-size');"/>
<splitter class="tree-splitter"/> <splitter class="tree-splitter"/>
<treecol hidden="true" persist="hidden width" flex="4" <treecol hidden="true" persist="hidden width" flex="4"
width="4" id="image-alt" data-l10n-id="media-alt-header" width="4" id="image-alt" label="&mediaAltHeader;"
onclick="gImageView.onPageMediaSort('image-alt');"/> onclick="gImageView.onPageMediaSort('image-alt');"/>
<splitter class="tree-splitter"/> <splitter class="tree-splitter"/>
<treecol hidden="true" persist="hidden width" flex="1" <treecol hidden="true" persist="hidden width" flex="1"
width="1" id="image-count" data-l10n-id="media-count" width="1" id="image-count" label="&mediaCount;"
onclick="gImageView.onPageMediaSort('image-count');"/> onclick="gImageView.onPageMediaSort('image-count');"/>
</treecols> </treecols>
<treechildren id="imagetreechildren" flex="1"/> <treechildren id="imagetreechildren" flex="1"/>
@ -197,32 +196,32 @@
</columns> </columns>
<rows id="mediaRows"> <rows id="mediaRows">
<row id="mediaLocationRow"> <row id="mediaLocationRow">
<label control="imageurltext" data-l10n-id="media-location"/> <label control="imageurltext" value="&mediaLocation;"/>
<separator/> <separator/>
<textbox readonly="true" id="imageurltext"/> <textbox readonly="true" id="imageurltext"/>
</row> </row>
<row id="mediaTypeRow"> <row id="mediaTypeRow">
<label control="imagetypetext" data-l10n-id="general-type"/> <label control="imagetypetext" value="&generalType;"/>
<separator/> <separator/>
<textbox id="imagetypetext"/> <textbox readonly="true" id="imagetypetext"/>
</row> </row>
<row id="mediaSizeRow"> <row id="mediaSizeRow">
<label control="imagesizetext" data-l10n-id="general-size"/> <label control="imagesizetext" value="&generalSize;"/>
<separator/> <separator/>
<textbox readonly="true" id="imagesizetext"/> <textbox readonly="true" id="imagesizetext"/>
</row> </row>
<row id="mediaDimensionRow"> <row id="mediaDimensionRow">
<label control="imagedimensiontext" data-l10n-id="media-dimension"/> <label control="imagedimensiontext" value="&mediaDimension;"/>
<separator/> <separator/>
<textbox readonly="true" id="imagedimensiontext"/> <textbox readonly="true" id="imagedimensiontext"/>
</row> </row>
<row id="mediaTextRow"> <row id="mediaTextRow">
<label control="imagetext" data-l10n-id="media-text"/> <label control="imagetext" value="&mediaText;"/>
<separator/> <separator/>
<textbox readonly="true" id="imagetext"/> <textbox readonly="true" id="imagetext"/>
</row> </row>
<row id="mediaLongdescRow"> <row id="mediaLongdescRow">
<label control="imagelongdesctext" data-l10n-id="media-long-desc"/> <label control="imagelongdesctext" value="&mediaLongdesc;"/>
<separator/> <separator/>
<textbox readonly="true" id="imagelongdesctext"/> <textbox readonly="true" id="imagelongdesctext"/>
</row> </row>
@ -231,14 +230,14 @@
<hbox id="imageSaveBox" align="end"> <hbox id="imageSaveBox" align="end">
<vbox id="blockImageBox"> <vbox id="blockImageBox">
<checkbox id="blockImage" hidden="true" oncommand="onBlockImage()" <checkbox id="blockImage" hidden="true" oncommand="onBlockImage()"
data-l10n-id="media-block-image"/> accesskey="&mediaBlockImage.accesskey;"/>
<label control="thepreviewimage" data-l10n-id="media-preview" class="header"/> <label control="thepreviewimage" value="&mediaPreview;" class="header"/>
</vbox> </vbox>
<spacer id="imageSaveBoxSpacer" flex="1"/> <spacer id="imageSaveBoxSpacer" flex="1"/>
<button data-l10n-id="menu-select-all" <button label="&selectall.label;" accesskey="&selectall.accesskey;"
id="selectallbutton" id="selectallbutton"
oncommand="doSelectAllMedia();"/> oncommand="doSelectAllMedia();"/>
<button data-l10n-id="media-save-as" <button label="&mediaSaveAs;" accesskey="&mediaSaveAs.accesskey;"
icon="save" id="imagesaveasbutton" icon="save" id="imagesaveasbutton"
oncommand="saveMedia();"/> oncommand="saveMedia();"/>
</hbox> </hbox>
@ -253,26 +252,26 @@
</vbox> </vbox>
<hbox id="mediaSaveBox" collapsed="true"> <hbox id="mediaSaveBox" collapsed="true">
<spacer id="mediaSaveBoxSpacer" flex="1"/> <spacer id="mediaSaveBoxSpacer" flex="1"/>
<button data-l10n-id="media-save-image-as" <button label="&mediaSaveAs;" accesskey="&mediaSaveAs2.accesskey;"
icon="save" id="mediasaveasbutton" icon="save" id="mediasaveasbutton"
oncommand="saveMedia();"/> oncommand="saveMedia();"/>
</hbox> </hbox>
<hbox pack="end"> <hbox pack="end">
<button command="cmd_help" data-l10n-id="help-button" dlgtype="help"/> <button command="cmd_help" label="&helpButton.label;" dlgtype="help"/>
</hbox> </hbox>
</vbox> </vbox>
<!-- Permissions --> <!-- Permissions -->
<vbox id="permPanel"> <vbox id="permPanel">
<hbox id="permHostBox"> <hbox id="permHostBox">
<label data-l10n-id="permissions-for" control="hostText" /> <label value="&permissionsFor;" control="hostText" />
<textbox id="hostText" class="header" readonly="true" <textbox id="hostText" class="header" readonly="true"
crop="end" flex="1"/> crop="end" flex="1"/>
</hbox> </hbox>
<vbox id="permList" flex="1"/> <vbox id="permList" flex="1"/>
<hbox pack="end"> <hbox pack="end">
<button command="cmd_help" data-l10n-id="help-button" dlgtype="help"/> <button command="cmd_help" label="&helpButton.label;" dlgtype="help"/>
</hbox> </hbox>
</vbox> </vbox>
@ -280,7 +279,7 @@
<vbox id="securityPanel"> <vbox id="securityPanel">
<!-- Identity Section --> <!-- Identity Section -->
<groupbox> <groupbox>
<label class="header" data-l10n-id="security-view-identity"/> <label class="header" value="&securityView.identity.header;"/>
<grid> <grid>
<columns> <columns>
<column/> <column/>
@ -289,7 +288,7 @@
<rows> <rows>
<!-- Domain --> <!-- Domain -->
<row> <row>
<label data-l10n-id="security-view-identity-domain" <label value="&securityView.identity.domain;"
control="security-identity-domain-value"/> control="security-identity-domain-value"/>
<textbox id="security-identity-domain-value" readonly="true"/> <textbox id="security-identity-domain-value" readonly="true"/>
</row> </row>
@ -297,24 +296,25 @@
<row> <row>
<label id="security-identity-owner-label" <label id="security-identity-owner-label"
class="fieldLabel" class="fieldLabel"
data-l10n-id="security-view-identity-owner" value="&securityView.identity.owner;"
control="security-identity-owner-value"/> control="security-identity-owner-value"/>
<textbox id="security-identity-owner-value" readonly="true"/> <textbox id="security-identity-owner-value" readonly="true"/>
</row> </row>
<!-- Verifier --> <!-- Verifier -->
<row> <row>
<label data-l10n-id="security-view-identity-verifier" <label value="&securityView.identity.verifier;"
control="security-identity-verifier-value"/> control="security-identity-verifier-value"/>
<hbox align="center"> <hbox align="center">
<textbox id="security-identity-verifier-value" readonly="true" <textbox id="security-identity-verifier-value" readonly="true"
flex="1"/> flex="1"/>
<button id="security-view-cert" data-l10n-id="security-view" <button id="security-view-cert" label="&securityView.certView;"
accesskey="&securityView.accesskey;"
oncommand="security.viewCert();"/> oncommand="security.viewCert();"/>
</hbox> </hbox>
</row> </row>
<!-- Certificate Validity --> <!-- Certificate Validity -->
<row id="security-identity-validity-row"> <row id="security-identity-validity-row">
<label data-l10n-id="security-view-identity-validity" <label value="&securityView.identity.validity;"
control="security-identity-validity-value"/> control="security-identity-validity-value"/>
<textbox id="security-identity-validity-value" readonly="true"/> <textbox id="security-identity-validity-value" readonly="true"/>
</row> </row>
@ -324,7 +324,7 @@
<!-- Privacy & History section --> <!-- Privacy & History section -->
<groupbox> <groupbox>
<label class="header" data-l10n-id="security-view-privacy"/> <label class="header" value="&securityView.privacy.header;"/>
<grid> <grid>
<columns> <columns>
<column flex="1"/> <column flex="1"/>
@ -333,31 +333,33 @@
<rows> <rows>
<!-- History --> <!-- History -->
<row> <row>
<label control="security-privacy-history-value" data-l10n-id="security-view-privacy-history-value"/> <label control="security-privacy-history-value">&securityView.privacy.history;</label>
<label id="security-privacy-history-value" <label id="security-privacy-history-value"
data-l10n-id="security-view-unknown"/> value="&securityView.unknown;"/>
</row> </row>
<!-- Site Data & Cookies --> <!-- Site Data & Cookies -->
<row id="security-privacy-sitedata-row"> <row>
<label control="security-privacy-sitedata-value" data-l10n-id="security-view-privacy-sitedata-value"/> <label control="security-privacy-sitedata-value">&securityView.privacy.siteData;</label>
<hbox id="security-privacy-sitedata-box" align="center"> <hbox id="security-privacy-sitedata-box" align="center">
<label id="security-privacy-sitedata-value" data-l10n-id="security-view-unknown" <label id="security-privacy-sitedata-value"
flex="1"/> flex="1">&securityView.unknown;</label>
<button id="security-clear-sitedata" <button id="security-clear-sitedata"
disabled="true" disabled="true"
data-l10n-id="security-view-privacy-clearsitedata" label="&securityView.privacy.clearSiteData;"
accesskey="&securityView.privacy.clearSiteData.accessKey;"
oncommand="security.clearSiteData();"/> oncommand="security.clearSiteData();"/>
</hbox> </hbox>
</row> </row>
<!-- Passwords --> <!-- Passwords -->
<row> <row>
<label control="security-privacy-passwords-value" data-l10n-id="security-view-privacy-passwords-value"/> <label control="security-privacy-passwords-value">&securityView.privacy.passwords;</label>
<hbox id="security-privacy-passwords-box" align="center"> <hbox id="security-privacy-passwords-box" align="center">
<label id="security-privacy-passwords-value" <label id="security-privacy-passwords-value"
data-l10n-id="security-view-unknown" value="&securityView.unknown;"
flex="1"/> flex="1"/>
<button id="security-view-password" <button id="security-view-password"
data-l10n-id="security-view-privacy-viewpasswords" label="&securityView.privacy.viewPasswords;"
accesskey="&securityView.privacy.viewPasswords.accessKey;"
oncommand="security.viewPasswords();"/> oncommand="security.viewPasswords();"/>
</hbox> </hbox>
</row> </row>
@ -367,7 +369,7 @@
<!-- Technical Details section --> <!-- Technical Details section -->
<groupbox> <groupbox>
<label class="header" data-l10n-id="security-view-technical"/> <label class="header" value="&securityView.technical.header;"/>
<label id="security-technical-shortform"/> <label id="security-technical-shortform"/>
<description id="security-technical-longform1"/> <description id="security-technical-longform1"/>
<description id="security-technical-longform2"/> <description id="security-technical-longform2"/>
@ -375,7 +377,7 @@
</groupbox> </groupbox>
<hbox pack="end"> <hbox pack="end">
<button command="cmd_help" data-l10n-id="help-button" dlgtype="help"/> <button command="cmd_help" label="&helpButton.label;" dlgtype="help"/>
</hbox> </hbox>
</vbox> </vbox>
<!-- Others added by overlay --> <!-- Others added by overlay -->

2
browser/base/content/pageinfo/permissions.js
View file

@ -138,7 +138,7 @@ function createRow(aPartId) {
let checkbox = document.createXULElement("checkbox"); let checkbox = document.createXULElement("checkbox");
checkbox.setAttribute("id", aPartId + "Def"); checkbox.setAttribute("id", aPartId + "Def");
checkbox.setAttribute("oncommand", "onCheckboxClick('" + aPartId + "');"); checkbox.setAttribute("oncommand", "onCheckboxClick('" + aPartId + "');");
document.l10n.setAttributes(checkbox, "permissions-use-default"); checkbox.setAttribute("label", gBundle.getString("permissions.useDefault"));
controls.appendChild(checkbox); controls.appendChild(checkbox);
let spacer = document.createXULElement("spacer"); let spacer = document.createXULElement("spacer");

53
browser/base/content/pageinfo/security.js
View file

@ -138,30 +138,34 @@ var security = {
this.siteData = await SiteDataManager.getSites( this.siteData = await SiteDataManager.getSites(
SiteDataManager.getBaseDomainFromHost(this.uri.host)); SiteDataManager.getBaseDomainFromHost(this.uri.host));
let pageInfoBundle = document.getElementById("pageinfobundle");
let clearSiteDataButton = document.getElementById("security-clear-sitedata"); let clearSiteDataButton = document.getElementById("security-clear-sitedata");
let siteDataLabel = document.getElementById("security-privacy-sitedata-value"); let siteDataLabel = document.getElementById("security-privacy-sitedata-value");
if (!this.siteData.length) { if (!this.siteData.length) {
document.l10n.setAttributes(siteDataLabel, "security-site-data-no"); let noStr = pageInfoBundle.getString("securitySiteDataNo");
siteDataLabel.textContent = noStr;
clearSiteDataButton.setAttribute("disabled", "true"); clearSiteDataButton.setAttribute("disabled", "true");
return; return;
} }
let usageText;
let usage = this.siteData.reduce((acc, site) => acc + site.usage, 0); let usage = this.siteData.reduce((acc, site) => acc + site.usage, 0);
if (usage > 0) { if (usage > 0) {
let size = DownloadUtils.convertByteUnits(usage); let size = DownloadUtils.convertByteUnits(usage);
let hasCookies = this.siteData.some(site => site.cookies.length > 0); let hasCookies = this.siteData.some(site => site.cookies.length > 0);
if (hasCookies) { if (hasCookies) {
document.l10n.setAttributes(siteDataLabel, "security-site-data-cookies", {"value": size[0], "unit": size[1]}); usageText = pageInfoBundle.getFormattedString("securitySiteDataCookies", size);
} else { } else {
document.l10n.setAttributes(siteDataLabel, "security-site-data-only", {"value": size[0], "unit": size[1]}); usageText = pageInfoBundle.getFormattedString("securitySiteDataOnly", size);
} }
} else { } else {
// We're storing cookies, else the list would have been empty. // We're storing cookies, else the list would have been empty.
document.l10n.setAttributes(siteDataLabel, "security-site-data-cookies-only"); usageText = pageInfoBundle.getString("securitySiteDataCookiesOnly");
} }
clearSiteDataButton.removeAttribute("disabled"); clearSiteDataButton.removeAttribute("disabled");
siteDataLabel.textContent = usageText;
}, },
/** /**
@ -196,10 +200,12 @@ function securityOnLoad(uri, windowInfo) {
} }
document.getElementById("securityTab").hidden = false; document.getElementById("securityTab").hidden = false;
const pageInfoBundle = document.getElementById("pageinfobundle");
/* Set Identity section text */ /* Set Identity section text */
setText("security-identity-domain-value", info.hostName); setText("security-identity-domain-value", info.hostName);
var validity; var owner, verifier, validity;
if (info.cert && !info.isBroken) { if (info.cert && !info.isBroken) {
validity = info.cert.validity.notAfterLocalDay; validity = info.cert.validity.notAfterLocalDay;
@ -207,26 +213,25 @@ function securityOnLoad(uri, windowInfo) {
// so we'll employ fallbacks where appropriate. The EV spec states that Org // so we'll employ fallbacks where appropriate. The EV spec states that Org
// fields must be specified for subject and issuer so that case is simpler. // fields must be specified for subject and issuer so that case is simpler.
if (info.isEV) { if (info.isEV) {
setText("security-identity-owner-value", info.cert.organization); owner = info.cert.organization;
setText("security-identity-verifier-value", info.cAName); verifier = info.cAName;
} else { } else {
// Technically, a non-EV cert might specify an owner in the O field or not, // Technically, a non-EV cert might specify an owner in the O field or not,
// depending on the CA's issuing policies. However we don't have any programmatic // depending on the CA's issuing policies. However we don't have any programmatic
// way to tell those apart, and no policy way to establish which organization // way to tell those apart, and no policy way to establish which organization
// vetting standards are good enough (that's what EV is for) so we default to // vetting standards are good enough (that's what EV is for) so we default to
// treating these certs as domain-validated only. // treating these certs as domain-validated only.
document.l10n.setAttributes(document.getElementById("security-identity-owner-value"), owner = pageInfoBundle.getString("securityNoOwner");
"security-no-owner"); verifier = info.cAName || info.cert.issuerCommonName || info.cert.issuerName;
setText("security-identity-verifier-value", info.cAName || info.cert.issuerCommonName || info.cert.issuerName);
} }
} else { } else {
// We don't have valid identity credentials. // We don't have valid identity credentials.
document.l10n.setAttributes(document.getElementById("security-identity-owner-value"), owner = pageInfoBundle.getString("securityNoOwner");
"security-no-owner"); verifier = pageInfoBundle.getString("notset");
document.l10n.setAttributes(document.getElementById("security-identity-verifier-value"),
"not-set-verified-by");
} }
setText("security-identity-owner-value", owner);
setText("security-identity-verifier-value", verifier);
if (validity) { if (validity) {
setText("security-identity-validity-value", validity); setText("security-identity-validity-value", validity);
} else { } else {
@ -242,6 +247,8 @@ function securityOnLoad(uri, windowInfo) {
viewCert.collapsed = true; viewCert.collapsed = true;
/* Set Privacy & History section text */ /* Set Privacy & History section text */
var yesStr = pageInfoBundle.getString("yes");
var noStr = pageInfoBundle.getString("no");
// Only show quota usage data for websites, not internal sites. // Only show quota usage data for websites, not internal sites.
if (uri.scheme == "http" || uri.scheme == "https") { if (uri.scheme == "http" || uri.scheme == "https") {
@ -250,16 +257,16 @@ function securityOnLoad(uri, windowInfo) {
document.getElementById("security-privacy-sitedata-row").hidden = true; document.getElementById("security-privacy-sitedata-row").hidden = true;
} }
if (realmHasPasswords(uri)) { setText("security-privacy-passwords-value",
document.l10n.setAttributes(document.getElementById("security-privacy-passwords-value"), realmHasPasswords(uri) ? yesStr : noStr);
"saved-passwords-yes");
} else {
document.l10n.setAttributes(document.getElementById("security-privacy-passwords-value"),
"saved-passwords-no");
}
document.l10n.setAttributes(document.getElementById("security-privacy-history-value"), var visitCount = previousVisitCount(info.hostName);
"security-visits-number", {"visits": previousVisitCount(info.hostName)});
let visitCountStr = visitCount > 0
? PluralForm.get(visitCount, pageInfoBundle.getString("securityVisitsNumber"))
.replace("#1", visitCount.toLocaleString())
: pageInfoBundle.getString("securityNoVisits");
setText("security-privacy-history-value", visitCountStr);
/* Set the Technical Detail section messages */ /* Set the Technical Detail section messages */
const pkiBundle = document.getElementById("pkiBundle"); const pkiBundle = document.getElementById("pkiBundle");

2
browser/base/content/test/static/browser_all_files_referenced.js
View file

@ -131,8 +131,6 @@ var whitelist = [
{file: "resource://app/modules/translation/YandexTranslator.jsm"}, {file: "resource://app/modules/translation/YandexTranslator.jsm"},
// Starting from here, files in the whitelist are bugs that need fixing. // Starting from here, files in the whitelist are bugs that need fixing.
// Bug 1529127 (only string left referenced in widget/windows/nsDataObj.cpp)
{file: "chrome://browser/locale/pageInfo.properties"},
// Bug 1339424 (wontfix?) // Bug 1339424 (wontfix?)
{file: "chrome://browser/locale/taskbar.properties", {file: "chrome://browser/locale/taskbar.properties",
platforms: ["linux", "macosx"]}, platforms: ["linux", "macosx"]},

256
browser/locales/en-US/browser/pageInfo.ftl
View file

@ -1,256 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. --
page-info-window =
.style = width: 600px; min-height: 550px;
copy =
.key = C
menu-copy =
.label = Copy
.accesskey = C
select-all =
.key = A
menu-select-all =
.label = Select All
.accesskey = A
close-window =
.key = A
general-tab =
.label = General
.accesskey = G
general-title =
.value = Title:
general-url =
.value = Address:
general-type =
.value = Type:
general-mode =
.value = Render Mode:
general-size =
.value = Size:
general-referrer =
.value = Referring URL:
general-modified =
.value = Modified:
general-encoding =
.value = Text Encoding:
general-meta-name =
.label = Name
general-meta-content =
.label = Content
media-tab =
.label = Media
.accesskey = M
media-location =
.value = Location:
media-text =
.value = Associated Text:
media-alt-header =
.label = Alternate Text
media-address =
.label = Address
media-type =
.label = Type
media-size =
.label = Size
media-count =
.label = Count
media-dimension =
.value = Dimensions:
media-long-desc =
.value = Long Description:
media-save-as =
.label = Save As…
.accesskey = A
media-save-image-as =
.label = Save As…
.accesskey = e
media-preview =
.value = Media Preview:
perm-tab =
.label = Permissions
.accesskey = P
permissions-for =
.value = Permissions for:
security-tab =
.label = Security
.accesskey = S
security-view =
.label = View Certificate
.accesskey = V
security-view-unknown = Unknown
.value = Unknown
security-view-identity =
.value = Website Identity
security-view-identity-owner =
.value = Owner:
security-view-identity-domain =
.value = Website:
security-view-identity-verifier =
.value = Verified by:
security-view-identity-validity =
.value = Expires on:
security-view-privacy =
.value = Privacy & History
security-view-privacy-history-value = Have I visited this website prior to today?
security-view-privacy-sitedata-value = Is this website storing information on my computer?
security-view-privacy-clearsitedata =
.label = Clear Cookies and Site Data
.accesskey = C
security-view-privacy-passwords-value = Have I saved any passwords for this website?
security-view-privacy-viewpasswords =
.label = View Saved Passwords
.accesskey = w
security-view-technical =
.value = Technical Details
help-button =
.label = Help
security-site-data-cookies-only = Yes, cookies
security-site-data-no = No
## These strings are used to tell the user if the website is storing cookies
## and data on the users computer in the security tab of pageInfo
## Variables:
## $value (number) - Amount of data being stored
## $unit (string) - The unit of data being stored (Usually KB)
security-site-data-cookies = Yes, cookies and { $value } { $unit } of site data
security-site-data-only = Yes, { $value } { $unit } of site data
security-site-data-cookies-only = Yes, cookies
security-site-data-no = No
image-size-unknown = Unknown
not-set-verified-by = Not specified
not-set-alternative-text = Not specified
not-set-date = Not specified
media-img = Image
media-bg-img = Background
media-border-img = Border
media-list-img = Bullet
media-cursor = Cursor
media-object = Object
media-embed = Embed
media-link = Icon
media-input = Input
media-video = Video
media-audio = Audio
saved-passwords-yes = Yes
saved-passwords-no = No
no-page-title =
.value = Untitled Page:
general-quirks-mode =
.value = Quirks mode
general-strict-mode =
.value = Standards compliance mode
security-no-owner = This website does not supply ownership information.
media-select-folder = Select a Folder to Save the Images
media-unknown-not-cached =
.value = Unknown (not cached)
permissions-use-default =
.label = Use Default
security-no-visits = No
# This string is used to display the number of meta tags
# in the General Tab
# Variables:
# $tags (number) - The number of meta tags
general-meta-tags =
.value =
{ $tags ->
[one] Meta (1 tag)
*[other] Meta ({ $tags } tags)
}
# This string is used to display the number of times
# the user has visited the website prior
# Variables:
# $visits (number) - The number of previous visits
security-visits-number =
{ $visits ->
[0] No
[one] Yes, once
*[other] Yes, { $visits } times
}
# This string is used to display the size of a media file
# Variables:
# $kb (number) - The size of an image in Kilobytes
# $bytes (number) - The size of an image in Bytes
properties-general-size =
.value = { $bytes ->
[one] { $kb } KB ({ $bytes } byte)
*[other] { $kb } KB ({ $bytes } bytes)
}
# This string is used to display the type and number
# of frames of a animated image
# Variables:
# $type (string) - The type of a animated image
# $frames (number) - The number of frames in an animated image
media-animated-image-type =
.value = { $frames ->
[one] { $type } Image (animated, { $frames } frame)
*[other] { $type } Image (animated, { $frames } frames)
}
# This string is used to display the type of
# an image
# Variables:
# $type (string) - The type of an image
media-image-type =
.value = { $type } Image
# This string is used to display the size of a scaled image
# in both scaled and unscaled pixels
# Variables:
# $dimx (number) - The horizontal size of an image
# $dimy (number) - The vertical size of an image
# $scaledx (number) - The scaled horizontal size of an image
# $scaledy (number) - The scaled vertical size of an image
media-dimensions-scaled =
.value = { $dimx }px × { $dimy }px (scaled to { $scaledx }px × { $scaledy }px)
# This string is used to display the size of an image in pixels
# Variables:
# $dimx (number) - The horizontal size of an image
# $dimy (number) - The vertical size of an image
media-dimensions =
.value = { $dimx }px × { $dimy }px
# This string is used to display the size of a media
# file in kilobytes
# Variables:
# $size (number) - The size of the media file in kilobytes
media-file-size = { $size } KB
# This string is used to display the website name next to the
# "Block Images" checkbox in the media tab
# Variables:
# $website (string) - The website name
media-block-image =
.label = Block Images from { $website }
.accesskey = B
# This string is used to display the URL of the website on top of the
# pageInfo dialog box
# Variables:
# $website (string) - The url of the website pageInfo is getting info for
page-info-page =
.title = Page Info - { $website }
page-info-frame =
.title = Frame Info - { $website }

75
browser/locales/en-US/chrome/browser/pageInfo.dtd Normal file
View file

@ -0,0 +1,75 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!ENTITY pageInfoWindow.width "600">
<!ENTITY pageInfoWindow.height "550">
<!ENTITY copy.key "C">
<!ENTITY copy.label "Copy">
<!ENTITY copy.accesskey "C">
<!ENTITY selectall.key "A">
<!ENTITY selectall.label "Select All">
<!ENTITY selectall.accesskey "A">
<!ENTITY closeWindow.key "w">
<!ENTITY generalTab "General">
<!ENTITY generalTab.accesskey "G">
<!ENTITY generalTitle "Title:">
<!ENTITY generalURL "Address:">
<!ENTITY generalType "Type:">
<!ENTITY generalMode "Render Mode:">
<!ENTITY generalSize "Size:">
<!ENTITY generalReferrer "Referring URL:">
<!ENTITY generalSource "Cache Source:">
<!ENTITY generalModified "Modified:">
<!ENTITY generalEncoding2 "Text Encoding:">
<!ENTITY generalMetaName "Name">
<!ENTITY generalMetaContent "Content">
<!ENTITY mediaTab "Media">
<!ENTITY mediaTab.accesskey "M">
<!ENTITY mediaLocation "Location:">
<!ENTITY mediaText "Associated Text:">
<!ENTITY mediaAltHeader "Alternate Text">
<!ENTITY mediaAddress "Address">
<!ENTITY mediaType "Type">
<!ENTITY mediaSize "Size">
<!ENTITY mediaCount "Count">
<!ENTITY mediaDimension "Dimensions:">
<!ENTITY mediaLongdesc "Long Description:">
<!ENTITY mediaBlockImage.accesskey "B">
<!ENTITY mediaSaveAs "Save As…">
<!ENTITY mediaSaveAs.accesskey "A">
<!ENTITY mediaSaveAs2.accesskey "e">
<!ENTITY mediaPreview "Media Preview:">
<!ENTITY permTab "Permissions">
<!ENTITY permTab.accesskey "P">
<!ENTITY permissionsFor "Permissions for:">
<!ENTITY securityTab "Security">
<!ENTITY securityTab.accesskey "S">
<!ENTITY securityView.certView "View Certificate">
<!ENTITY securityView.accesskey "V">
<!ENTITY securityView.unknown "Unknown">
<!ENTITY securityView.identity.header "Website Identity">
<!ENTITY securityView.identity.owner "Owner:">
<!ENTITY securityView.identity.domain "Website:">
<!ENTITY securityView.identity.verifier "Verified by:">
<!ENTITY securityView.identity.validity "Expires on:">
<!ENTITY securityView.privacy.header "Privacy &amp; History">
<!ENTITY securityView.privacy.history "Have I visited this website prior to today?">
<!ENTITY securityView.privacy.siteData "Is this website storing information on my computer?">
<!ENTITY securityView.privacy.clearSiteData "Clear Cookies and Site Data">
<!ENTITY securityView.privacy.clearSiteData.accessKey "C">
<!ENTITY securityView.privacy.passwords "Have I saved any passwords for this website?">
<!ENTITY securityView.privacy.viewPasswords "View Saved Passwords">
<!ENTITY securityView.privacy.viewPasswords.accessKey "w">
<!ENTITY securityView.technical.header "Technical Details">
<!ENTITY helpButton.label "Help">

57
browser/locales/en-US/chrome/browser/pageInfo.properties
View file

@ -2,4 +2,61 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
pageInfo.page.title=Page Info - %S
pageInfo.frame.title=Frame Info - %S
noPageTitle=Untitled Page: noPageTitle=Untitled Page:
unknown=Unknown
notset=Not specified
yes=Yes
no=No
mediaImg=Image
mediaVideo=Video
mediaAudio=Audio
mediaBGImg=Background
mediaBorderImg=Border
mediaListImg=Bullet
mediaCursor=Cursor
mediaObject=Object
mediaEmbed=Embed
mediaLink=Icon
mediaInput=Input
mediaFileSize=%S KB
mediaSize=%Spx \u00D7 %Spx
mediaSelectFolder=Select a Folder to Save the Images
mediaBlockImage=Block Images from %S
mediaUnknownNotCached=Unknown (not cached)
mediaImageType=%S Image
mediaAnimatedImageType=%S Image (animated, %S frames)
mediaDimensions=%Spx \u00D7 %Spx
mediaDimensionsScaled=%Spx \u00D7 %Spx (scaled to %Spx \u00D7 %Spx)
generalQuirksMode=Quirks mode
generalStrictMode=Standards compliance mode
generalSize=%S KB (%S bytes)
generalMetaTag=Meta (1 tag)
generalMetaTags=Meta (%S tags)
securityNoOwner=This website does not supply ownership information.
# LOCALIZATION NOTE (securityVisitsNumber):
# Semi-colon list of plural forms.
# See: https://developer.mozilla.org/en/docs/Localization_and_Plurals
# #1 is the number of visits and can be used in all plural forms as needed, e.g.
# for '1': 'Yes, #1 time'
securityVisitsNumber=Yes, once;Yes, #1 times
securityNoVisits=No
# LOCALIZATION NOTE(securitySiteDataCookies,securitySiteDataOnly): This is for site data disk usage.
# It confirms that a website is indeed using this much space.
# e.g. Is this website storing site data? "Yes, 50.23 MB"
# %1$S = size (in bytes or megabytes, ...)
# %2$S = unit of measure (bytes, KB, MB, ...)
securitySiteDataCookies=Yes, cookies and %1$S %2$S of site data
securitySiteDataOnly=Yes, %1$S %2$S of site data
# LOCALIZATION NOTE(securitySiteDataCookiesOnly,securitySiteDataNo):
# This is for site data and cookies usage. It answers the question "Is this website storing cookies and/or site data?"
securitySiteDataCookiesOnly=Yes, cookies
securitySiteDataNo=No
permissions.useDefault=Use Default

1
browser/locales/jar.mn
View file

@ -22,6 +22,7 @@
locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties) locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties)
locale/browser/lightweightThemes.properties (%chrome/browser/lightweightThemes.properties) locale/browser/lightweightThemes.properties (%chrome/browser/lightweightThemes.properties)
locale/browser/uiDensity.properties (%chrome/browser/uiDensity.properties) locale/browser/uiDensity.properties (%chrome/browser/uiDensity.properties)
locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd)
locale/browser/pageInfo.properties (%chrome/browser/pageInfo.properties) locale/browser/pageInfo.properties (%chrome/browser/pageInfo.properties)
locale/browser/pocket.properties (%chrome/browser/pocket.properties) locale/browser/pocket.properties (%chrome/browser/pocket.properties)
locale/browser/search.properties (%chrome/browser/search.properties) locale/browser/search.properties (%chrome/browser/search.properties)

2
intl/l10n/DOMLocalization.jsm
View file

@ -65,7 +65,7 @@ const LOCALIZABLE_ATTRIBUTES = {
description: ["value"], description: ["value"],
key: ["key", "keycode"], key: ["key", "keycode"],
label: ["value"], label: ["value"],
textbox: ["placeholder", "value"], textbox: ["placeholder"],
}, },
}; };

327
python/l10n/fluent_migrations/bug_1517493_pageInfo.py
View file

@ -1,327 +0,0 @@
# coding=utf8
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
from __future__ import absolute_import
import fluent.syntax.ast as FTL
from fluent.migrate.helpers import transforms_from
from fluent.migrate.helpers import VARIABLE_REFERENCE, TERM_REFERENCE
from fluent.migrate import REPLACE, COPY, CONCAT, PLURALS, REPLACE_IN_TEXT
def migrate(ctx):
"""Bug 1517493 - Move strings from pageInfo.dtd and subsection of strings from pageInfo.properties to Fluent, part {index}"""
ctx.add_transforms(
"browser/browser/pageInfo.ftl",
"browser/browser/pageInfo.ftl",
[
FTL.Message(
id=FTL.Identifier("security-site-data-cookies"),
value=REPLACE(
"browser/chrome/browser/pageInfo.properties",
"securitySiteDataCookies",
{
"%1$S": VARIABLE_REFERENCE("value"),
"%2$S": VARIABLE_REFERENCE("unit")
},
normalize_printf=True
)
),
FTL.Message(
id=FTL.Identifier("security-site-data-only"),
value=REPLACE(
"browser/chrome/browser/pageInfo.properties",
"securitySiteDataOnly",
{
"%1$S": VARIABLE_REFERENCE("value"),
"%2$S": VARIABLE_REFERENCE("unit")
},
normalize_printf=True
)
),
FTL.Message(
id=FTL.Identifier("page-info-window"),
attributes=[
FTL.Attribute(
FTL.Identifier("style"),
CONCAT(
FTL.TextElement("width: "),
COPY(
"browser/chrome/browser/pageInfo.dtd",
"pageInfoWindow.width"
),
FTL.TextElement("px; min-height: "),
COPY(
"browser/chrome/browser/pageInfo.dtd",
"pageInfoWindow.height"
),
FTL.TextElement("px;")
)
)
]
),
FTL.Message(
id=FTL.Identifier("media-image-type"),
attributes=[
FTL.Attribute(
FTL.Identifier("value"),
REPLACE(
"browser/chrome/browser/pageInfo.properties",
"mediaImageType",
{
"%1$S": VARIABLE_REFERENCE("type"),
},
normalize_printf=True
)
)
]
),
FTL.Message(
id=FTL.Identifier("media-dimensions-scaled"),
attributes=[
FTL.Attribute(
FTL.Identifier("value"),
REPLACE(
"browser/chrome/browser/pageInfo.properties",
"mediaDimensionsScaled",
{
"%1$S": VARIABLE_REFERENCE("dimx"),
"%2$S": VARIABLE_REFERENCE("dimy"),
"%3$S": VARIABLE_REFERENCE("scaledx"),
"%4$S": VARIABLE_REFERENCE("scaledy"),
},
normalize_printf=True
)
)
]
),
FTL.Message(
id=FTL.Identifier("media-dimensions"),
attributes=[
FTL.Attribute(
FTL.Identifier("value"),
REPLACE(
"browser/chrome/browser/pageInfo.properties",
"mediaDimensions",
{
"%1$S": VARIABLE_REFERENCE("dimx"),
"%2$S": VARIABLE_REFERENCE("dimy"),
},
normalize_printf=True
)
)
]
),
FTL.Message(
id=FTL.Identifier("media-file-size"),
value=REPLACE(
"browser/chrome/browser/pageInfo.properties",
"mediaFileSize",
{
"%1$S": VARIABLE_REFERENCE("size"),
},
normalize_printf=True
)
),
FTL.Message(
id=FTL.Identifier("media-block-image"),
attributes=[
FTL.Attribute(
FTL.Identifier("label"),
REPLACE(
"browser/chrome/browser/pageInfo.properties",
"mediaBlockImage",
{
"%1$S": VARIABLE_REFERENCE("website")
},
normalize_printf=True
)
),
FTL.Attribute(
FTL.Identifier("accesskey"),
COPY(
"browser/chrome/browser/pageInfo.dtd",
"mediaBlockImage.accesskey"
)
)
]
),
FTL.Message(
id=FTL.Identifier("page-info-page"),
attributes=[
FTL.Attribute(
FTL.Identifier("title"),
REPLACE(
"browser/chrome/browser/pageInfo.properties",
"pageInfo.page.title",
{
"%1$S": VARIABLE_REFERENCE("website"),
},
normalize_printf=True
)
)
]
),
FTL.Message(
id=FTL.Identifier("page-info-frame"),
attributes=[
FTL.Attribute(
FTL.Identifier("title"),
REPLACE(
"browser/chrome/browser/pageInfo.properties",
"pageInfo.frame.title",
{
"%1$S": VARIABLE_REFERENCE("website"),
},
normalize_printf=True
)
)
]
)
]
)
ctx.add_transforms(
"browser/browser/pageInfo.ftl",
"browser/browser/pageInfo.ftl",
transforms_from(
"""
security-site-data-cookies-only = { COPY("browser/chrome/browser/pageInfo.properties","securitySiteDataCookiesOnly") }
security-site-data-no = { COPY("browser/chrome/browser/pageInfo.properties","securitySiteDataNo") }
image-size-unknown = { COPY("browser/chrome/browser/pageInfo.properties","unknown") }
copy =
.key = { COPY("browser/chrome/browser/pageInfo.dtd","copy.key") }
menu-copy =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","copy.label") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","copy.accesskey") }
select-all =
.key = { COPY("browser/chrome/browser/pageInfo.dtd","selectall.key") }
menu-select-all =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","selectall.label") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","selectall.accesskey") }
close-window =
.key = { COPY("browser/chrome/browser/pageInfo.dtd","selectall.key") }
general-tab =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","generalTab") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","generalTab.accesskey") }
general-title =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","generalTitle") }
general-url =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","generalURL") }
general-type =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","generalType") }
general-mode =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","generalMode") }
general-size =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","generalSize") }
general-referrer =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","generalReferrer") }
general-modified =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","generalModified") }
general-encoding =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","generalEncoding2") }
general-meta-name =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","generalMetaName") }
general-meta-content =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","generalMetaContent") }
media-tab =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","mediaTab") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","mediaTab.accesskey") }
media-location =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","mediaLocation") }
media-text =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","mediaText") }
media-alt-header =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","mediaAltHeader") }
media-address =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","mediaAddress") }
media-type =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","mediaType") }
media-size =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","mediaSize") }
media-count =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","mediaCount") }
media-dimension =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","mediaDimension") }
media-long-desc =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","mediaLongdesc") }
media-save-as =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","mediaSaveAs") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","mediaSaveAs.accesskey") }
media-save-image-as =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","mediaSaveAs") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","mediaSaveAs2.accesskey") }
media-preview =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","mediaPreview") }
perm-tab =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","permTab") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","permTab.accesskey") }
permissions-for =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","permissionsFor") }
security-tab =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","securityTab") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","securityTab.accesskey") }
security-view =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.certView") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.accesskey") }
security-view-unknown = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.unknown") }
.value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.unknown") }
security-view-identity =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.identity.header") }
security-view-identity-owner =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.identity.owner") }
security-view-identity-domain =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.identity.domain") }
security-view-identity-verifier =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.identity.verifier") }
security-view-identity-validity =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.identity.validity") }
security-view-privacy =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.privacy.header") }
security-view-privacy-history-value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.privacy.history") }
security-view-privacy-sitedata-value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.privacy.siteData") }
security-view-privacy-clearsitedata =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.privacy.clearSiteData") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.privacy.clearSiteData.accessKey") }
security-view-privacy-passwords-value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.privacy.passwords") }
security-view-privacy-viewpasswords =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.privacy.viewPasswords") }
.accesskey = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.privacy.viewPasswords.accessKey") }
security-view-technical =
.value = { COPY("browser/chrome/browser/pageInfo.dtd","securityView.technical.header") }
help-button =
.label = { COPY("browser/chrome/browser/pageInfo.dtd","helpButton.label") }
unknown = { COPY("browser/chrome/browser/pageInfo.properties","unknown") }
not-set-verified-by = { COPY("browser/chrome/browser/pageInfo.properties","notset") }
not-set-alternative-text = { COPY("browser/chrome/browser/pageInfo.properties","notset") }
not-set-date = { COPY("browser/chrome/browser/pageInfo.properties","notset") }
media-img = { COPY("browser/chrome/browser/pageInfo.properties","mediaImg") }
media-bg-img = { COPY("browser/chrome/browser/pageInfo.properties","mediaBGImg") }
media-border-img = { COPY("browser/chrome/browser/pageInfo.properties","mediaBorderImg") }
media-list-img = { COPY("browser/chrome/browser/pageInfo.properties","mediaListImg") }
media-cursor = { COPY("browser/chrome/browser/pageInfo.properties","mediaCursor") }
media-object = { COPY("browser/chrome/browser/pageInfo.properties","mediaObject") }
media-embed = { COPY("browser/chrome/browser/pageInfo.properties","mediaEmbed") }
media-link = { COPY("browser/chrome/browser/pageInfo.properties","mediaLink") }
media-input = { COPY("browser/chrome/browser/pageInfo.properties","mediaInput") }
media-video = { COPY("browser/chrome/browser/pageInfo.properties","mediaVideo") }
media-audio = { COPY("browser/chrome/browser/pageInfo.properties","mediaAudio") }
saved-passwords-yes = { COPY("browser/chrome/browser/pageInfo.properties","yes") }
saved-passwords-no = { COPY("browser/chrome/browser/pageInfo.properties","no") }
no-page-title =
.value = { COPY("browser/chrome/browser/pageInfo.properties","noPageTitle") }
general-quirks-mode =
.value = { COPY("browser/chrome/browser/pageInfo.properties","generalQuirksMode") }
general-strict-mode =
.value = { COPY("browser/chrome/browser/pageInfo.properties","generalStrictMode") }
security-no-owner = { COPY("browser/chrome/browser/pageInfo.properties","securityNoOwner") }
media-select-folder = { COPY("browser/chrome/browser/pageInfo.properties","mediaSelectFolder") }
media-unknown-not-cached =
.value = { COPY("browser/chrome/browser/pageInfo.properties","mediaUnknownNotCached") }
permissions-use-default =
.label = { COPY("browser/chrome/browser/pageInfo.properties","permissions.useDefault") }
security-no-visits = { COPY("browser/chrome/browser/pageInfo.properties","no") }
"""
)
)

3
testing/firefox-ui/tests/functional/security/manifest.ini
View file

@ -2,15 +2,12 @@
tags = remote tags = remote
[test_dv_certificate.py] [test_dv_certificate.py]
skip-if = true # bug 1523133
[test_enable_privilege.py] [test_enable_privilege.py]
tags = local tags = local
[test_ev_certificate.py] [test_ev_certificate.py]
skip-if = true # bug 1523133
[test_mixed_content_page.py] [test_mixed_content_page.py]
[test_mixed_script_content_blocking.py] [test_mixed_script_content_blocking.py]
[test_no_certificate.py] [test_no_certificate.py]
skip-if = true # bug 1523133
tags = local tags = local
[test_security_notification.py] [test_security_notification.py]
[test_ssl_disabled_error_page.py] [test_ssl_disabled_error_page.py]

1
testing/firefox-ui/tests/puppeteer/manifest.ini
View file

@ -16,7 +16,6 @@ tags = remote
[test_menubar.py] [test_menubar.py]
[test_notifications.py] [test_notifications.py]
[test_page_info_window.py] [test_page_info_window.py]
skip-if = true # bug 1523133
[test_tabbar.py] [test_tabbar.py]
[test_toolbars.py] [test_toolbars.py]
disabled = Bug 1369556 disabled = Bug 1369556