зеркало из https://github.com/mozilla/gecko-dev.git
fix bug 85300
r=morse sr=alecf backout morse' change in 6/15 which remove the real fix. 6/15 build is fine, but 6/18 build is broken by morse's change.
This commit is contained in:
Родитель
74bd8d16c5
Коммит
99219b09f6
|
@ -53,37 +53,37 @@
|
|||
|
||||
<treeitem container="true" open="true" id="primary">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/locale/wallet/WalletPrimary.xul" label="&primary.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator-region/locale/wallet/WalletPrimary.xul" label="&primary.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem id="pnameID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletName.xul" label="&pname.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletName.xul" label="&pname.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="paddressID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="home." url="chrome://communicator/locale/wallet/WalletAddress.xul" label="&paddress.label;"/>
|
||||
<treecell class="treecell-indent" tag="home." url="chrome://communicator-region/locale/wallet/WalletAddress.xul" label="&paddress.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="pphoneID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="home." url="chrome://communicator/locale/wallet/WalletPhone.xul" label="&pphone.label;"/>
|
||||
<treecell class="treecell-indent" tag="home." url="chrome://communicator-region/locale/wallet/WalletPhone.xul" label="&pphone.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="pcreditID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletCredit.xul" label="&pcredit.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletCredit.xul" label="&pcredit.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="pemployID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletEmploy.xul" label="&pemploy.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletEmploy.xul" label="&pemploy.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="pmiscID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletMisc.xul" label="&pmisc.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletMisc.xul" label="&pmisc.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
@ -91,22 +91,22 @@
|
|||
|
||||
<treeitem container="true" open="true" id="shipping">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/locale/wallet/WalletShipping.xul" label="&shipping.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator-region/locale/wallet/WalletShipping.xul" label="&shipping.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem id="snameID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator/locale/wallet/WalletName.xul" label="&sname.label;"/>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator-region/locale/wallet/WalletName.xul" label="&sname.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="saddressID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator/locale/wallet/WalletAddress.xul" label="&saddress.label;"/>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator-region/locale/wallet/WalletAddress.xul" label="&saddress.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="sphoneID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator/locale/wallet/WalletPhone.xul" label="&sphone.label;"/>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator-region/locale/wallet/WalletPhone.xul" label="&sphone.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
@ -114,22 +114,22 @@
|
|||
|
||||
<treeitem container="true" open="true" id="billing">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/locale/wallet/WalletBilling.xul" label="&billing.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator-region/locale/wallet/WalletBilling.xul" label="&billing.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem id="bnameID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator/locale/wallet/WalletName.xul" label="&bname.label;"/>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator-region/locale/wallet/WalletName.xul" label="&bname.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="baddressID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator/locale/wallet/WalletAddress.xul" label="&baddress.label;"/>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator-region/locale/wallet/WalletAddress.xul" label="&baddress.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="bphoneID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator/locale/wallet/WalletPhone.xul" label="&bphone.label;"/>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator-region/locale/wallet/WalletPhone.xul" label="&bphone.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
@ -137,17 +137,17 @@
|
|||
|
||||
<treeitem container="true" open="true" id="other">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/locale/wallet/WalletOther.xul" label="&other.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator-region/locale/wallet/WalletOther.xul" label="&other.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem id="concatenatedID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletConcatenated.xul" label="&concatenated.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletConcatenated.xul" label="&concatenated.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="urlspecificID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletUrlspecific.xul" label="&urlspecific.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletUrlspecific.xul" label="&urlspecific.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
<iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
document.getElementById("panelFrame").setAttribute("src", "chrome://communicator/locale/wallet/WalletName.xul");
|
||||
document.getElementById("panelFrame").setAttribute("src", "chrome://communicator-region/locale/wallet/WalletName.xul");
|
||||
document.getElementById("panelFrame").setAttribute("tag", "" );
|
||||
]]>
|
||||
</script>
|
||||
|
|
|
@ -53,37 +53,37 @@
|
|||
|
||||
<treeitem container="true" open="true" id="primary">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/locale/wallet/WalletPrimary.xul" label="&primary.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator-region/locale/wallet/WalletPrimary.xul" label="&primary.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem id="pnameID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletName.xul" label="&pname.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletName.xul" label="&pname.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="paddressID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="home." url="chrome://communicator/locale/wallet/WalletAddress.xul" label="&paddress.label;"/>
|
||||
<treecell class="treecell-indent" tag="home." url="chrome://communicator-region/locale/wallet/WalletAddress.xul" label="&paddress.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="pphoneID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="home." url="chrome://communicator/locale/wallet/WalletPhone.xul" label="&pphone.label;"/>
|
||||
<treecell class="treecell-indent" tag="home." url="chrome://communicator-region/locale/wallet/WalletPhone.xul" label="&pphone.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="pcreditID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletCredit.xul" label="&pcredit.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletCredit.xul" label="&pcredit.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="pemployID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletEmploy.xul" label="&pemploy.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletEmploy.xul" label="&pemploy.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="pmiscID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletMisc.xul" label="&pmisc.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletMisc.xul" label="&pmisc.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
@ -91,22 +91,22 @@
|
|||
|
||||
<treeitem container="true" open="true" id="shipping">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/locale/wallet/WalletShipping.xul" label="&shipping.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator-region/locale/wallet/WalletShipping.xul" label="&shipping.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem id="snameID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator/locale/wallet/WalletName.xul" label="&sname.label;"/>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator-region/locale/wallet/WalletName.xul" label="&sname.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="saddressID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator/locale/wallet/WalletAddress.xul" label="&saddress.label;"/>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator-region/locale/wallet/WalletAddress.xul" label="&saddress.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="sphoneID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator/locale/wallet/WalletPhone.xul" label="&sphone.label;"/>
|
||||
<treecell class="treecell-indent" tag="shipto." url="chrome://communicator-region/locale/wallet/WalletPhone.xul" label="&sphone.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
@ -114,22 +114,22 @@
|
|||
|
||||
<treeitem container="true" open="true" id="billing">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/locale/wallet/WalletBilling.xul" label="&billing.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator-region/locale/wallet/WalletBilling.xul" label="&billing.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem id="bnameID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator/locale/wallet/WalletName.xul" label="&bname.label;"/>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator-region/locale/wallet/WalletName.xul" label="&bname.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="baddressID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator/locale/wallet/WalletAddress.xul" label="&baddress.label;"/>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator-region/locale/wallet/WalletAddress.xul" label="&baddress.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="bphoneID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator/locale/wallet/WalletPhone.xul" label="&bphone.label;"/>
|
||||
<treecell class="treecell-indent" tag="billto." url="chrome://communicator-region/locale/wallet/WalletPhone.xul" label="&bphone.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
@ -137,17 +137,17 @@
|
|||
|
||||
<treeitem container="true" open="true" id="other">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/locale/wallet/WalletOther.xul" label="&other.label;"/>
|
||||
<treecell class="treecell-indent" url="chrome://communicator-region/locale/wallet/WalletOther.xul" label="&other.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem id="concatenatedID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletConcatenated.xul" label="&concatenated.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletConcatenated.xul" label="&concatenated.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="urlspecificID">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator/locale/wallet/WalletUrlspecific.xul" label="&urlspecific.label;"/>
|
||||
<treecell class="treecell-indent" tag="" url="chrome://communicator-region/locale/wallet/WalletUrlspecific.xul" label="&urlspecific.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
<iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
document.getElementById("panelFrame").setAttribute("src", "chrome://communicator/locale/wallet/WalletName.xul");
|
||||
document.getElementById("panelFrame").setAttribute("src", "chrome://communicator-region/locale/wallet/WalletName.xul");
|
||||
document.getElementById("panelFrame").setAttribute("tag", "" );
|
||||
]]>
|
||||
</script>
|
||||
|
|
|
@ -52,15 +52,15 @@ en-US.jar:
|
|||
locale/en-US/communicator/wallet/WalletViewer.dtd (editor/WalletViewer.dtd)
|
||||
|
||||
US.jar:
|
||||
locale/US/communicator/wallet/WalletAddress.xul (editor/WalletAddress.xul)
|
||||
locale/US/communicator/wallet/WalletBilling.xul (editor/WalletBilling.xul)
|
||||
locale/US/communicator/wallet/WalletConcatenated.xul (editor/WalletConcatenated.xul)
|
||||
locale/US/communicator/wallet/WalletCredit.xul (editor/WalletCredit.xul)
|
||||
locale/US/communicator/wallet/WalletEmploy.xul (editor/WalletEmploy.xul)
|
||||
locale/US/communicator/wallet/WalletMisc.xul (editor/WalletMisc.xul)
|
||||
locale/US/communicator/wallet/WalletName.xul (editor/WalletName.xul)
|
||||
locale/US/communicator/wallet/WalletOther.xul (editor/WalletOther.xul)
|
||||
locale/US/communicator/wallet/WalletPhone.xul (editor/WalletPhone.xul)
|
||||
locale/US/communicator/wallet/WalletPrimary.xul (editor/WalletPrimary.xul)
|
||||
locale/US/communicator/wallet/WalletShipping.xul (editor/WalletShipping.xul)
|
||||
locale/US/communicator/wallet/WalletUrlspecific.xul (editor/WalletUrlspecific.xul)
|
||||
locale/US/communicator-region/wallet/WalletAddress.xul (editor/WalletAddress.xul)
|
||||
locale/US/communicator-region/wallet/WalletBilling.xul (editor/WalletBilling.xul)
|
||||
locale/US/communicator-region/wallet/WalletConcatenated.xul (editor/WalletConcatenated.xul)
|
||||
locale/US/communicator-region/wallet/WalletCredit.xul (editor/WalletCredit.xul)
|
||||
locale/US/communicator-region/wallet/WalletEmploy.xul (editor/WalletEmploy.xul)
|
||||
locale/US/communicator-region/wallet/WalletMisc.xul (editor/WalletMisc.xul)
|
||||
locale/US/communicator-region/wallet/WalletName.xul (editor/WalletName.xul)
|
||||
locale/US/communicator-region/wallet/WalletOther.xul (editor/WalletOther.xul)
|
||||
locale/US/communicator-region/wallet/WalletPhone.xul (editor/WalletPhone.xul)
|
||||
locale/US/communicator-region/wallet/WalletPrimary.xul (editor/WalletPrimary.xul)
|
||||
locale/US/communicator-region/wallet/WalletShipping.xul (editor/WalletShipping.xul)
|
||||
locale/US/communicator-region/wallet/WalletUrlspecific.xul (editor/WalletUrlspecific.xul)
|
||||
|
|
|
@ -30,4 +30,4 @@ include <$(DEPTH)\config\rules.mak>
|
|||
chrome::
|
||||
$(REGCHROME) content wallet comm.jar
|
||||
$(REGCHROME) locale en-US/wallet en-US.jar
|
||||
$(REGCHROME) locale US/communicator-region US.jar
|
||||
$(REGCHROME) locale US/communicator-region US.jar
|
||||
|
|
Загрузка…
Ссылка в новой задаче