зеркало из https://github.com/mozilla/gecko-dev.git
also, changes made accidentally on the weekend
This commit is contained in:
ben%netscape.com
Родитель
bb188fe65f
Коммит
41a82e22b2
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0"?>
|
||||
<?xml version="1.0"?><!-- -*- Mode: SGML; tab-width: 4; indent-tabs-mode: nil; -*- -->
|
||||
|
||||
<?xml-stylesheet href="chrome://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
|
||||
|
||||
|
|
@ -6,30 +6,54 @@
|
|||
|
||||
<!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/askSendFormat.dtd">
|
||||
|
||||
<window title="&windowTitle.label;"
|
||||
<window id="askSendFormat"
|
||||
title="&windowTitle.label;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
onload="Startup()"
|
||||
align="vertical"
|
||||
orient="vertical"
|
||||
class="dialog"
|
||||
style="user-input: ignore"
|
||||
>
|
||||
|
||||
<script language="JavaScript" src="chrome://messenger/content/messengercompose/askSendFormat.js"/>
|
||||
|
||||
<keyset id="keyset"/>
|
||||
<keyset id="keyset"/>
|
||||
|
||||
<spring style="height:0.5em"/>
|
||||
<box align="horizontal">
|
||||
<spring style="width:10px"/>
|
||||
<box align="vertical">
|
||||
<text value="&question.label;" />
|
||||
|
||||
<box orient="vertical" valign="middle">
|
||||
<image id="convertDefault" />
|
||||
</box>
|
||||
<spring style="width:10px"/>
|
||||
<box orient="vertical" flex="1">
|
||||
<html>&recipient.label;</html>
|
||||
<deck id="mailSendFormatExplanation">
|
||||
<box orient="vertical"><html>&convertibleDefault.label;</html></box> <!-- Hack: <box> is a workaround for bug 44513. -->
|
||||
<box orient="vertical"><html>&convertibleYes.label;</html></box>
|
||||
<box orient="vertical"><html>&convertibleAltering.label;</html></box>
|
||||
<box orient="vertical"><html>&convertibleNo.label;</html></box>
|
||||
</deck>
|
||||
<html>&question.label;</html>
|
||||
<spring style="height:1em"/>
|
||||
|
||||
<radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never">
|
||||
<box orient="horizontal">
|
||||
<radio group="mailDefaultHTMLAction" id="SendPlainTextAndHtml" data="0" value="&plainTextAndHtml.label;"/>
|
||||
<html id="plainTextAndHtmlRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
|
||||
<!-- Hack: box and html are workarounds for bug 49623 -->
|
||||
</box>
|
||||
<box orient="horizontal">
|
||||
<radio group="mailDefaultHTMLAction" id="SendPlainTextOnly" data="1" value="&plainTextOnly.label;"/>
|
||||
<html id="plainTextOnlyRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
|
||||
</box>
|
||||
<box orient="horizontal">
|
||||
<radio group="mailDefaultHTMLAction" id="SendHtmlOnly" data="2" value="&htmlOnly.label;"/>
|
||||
<html id="htmlOnlyRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
|
||||
</box>
|
||||
</radiogroup>
|
||||
|
||||
</box>
|
||||
<spring style="width:10px"/>
|
||||
</box>
|
||||
|
|
@ -37,9 +61,15 @@
|
|||
<spring style="height:1em"/>
|
||||
<box id="okCancelButtons"
|
||||
button1Label="&send.label;"
|
||||
button2Label="&dontSend.label;"
|
||||
button2Label="&cancel.label;"
|
||||
button3Label="&recipients.label;"
|
||||
button4Label="&help.label;"
|
||||
/>
|
||||
<spring style="height:0.5em" />
|
||||
<box id="hiddenLabels"
|
||||
plainTextAndHtmlRecommendedLabel="&plainTextAndHtmlRecommended.label;"
|
||||
plainTextOnlyRecommendedLabel="&plainTextOnlyRecommended.label;"
|
||||
htmlOnlyRecommendedLabel="&htmlOnlyRecommended.label;"
|
||||
/>
|
||||
<spring style="height:1em" />
|
||||
|
||||
</window>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,25 @@
|
|||
<!--LOCALIZATION NOTE askSendFormat.dtd UI for dialog that ask the user which format to use for sending a message -->
|
||||
<!--LOCALIZATION NOTE askSendFormat.dtd UI for dialog that asks the user, which format to use for sending a message -->
|
||||
<!ENTITY windowTitle.label "HTML Mail Question">
|
||||
|
||||
<!ENTITY question.label "Some of the recipients are not listed as being able to receive HTML mail. Would you like to convert the message to plain text or send it in HTML anyway?">
|
||||
<!ENTITY recipient.label "Some of the recipients are not listed as being able to receive HTML mail.">
|
||||
|
||||
<!ENTITY plainTextAndHtml.label "Send in Plain Text and HTML">
|
||||
<!ENTITY plainTextOnly.label "Send in Plain Text Only">
|
||||
<!ENTITY convertibleDefault.label "">
|
||||
<!ENTITY convertibleYes.label "Your message can be converted to plaintext without losing information.">
|
||||
<!ENTITY convertibleAltering.label "Your message can be converted to plaintext without losing important information. However, the plaintext version might look different from what you saw in the composer.">
|
||||
<!ENTITY convertibleNo.label "However, you used formatting (e.g. colors) that cannot be converted to plaintext.">
|
||||
|
||||
<!ENTITY question.label "Would you like to convert the message to plaintext or send it in HTML anyway?">
|
||||
|
||||
<!ENTITY plainTextAndHtml.label "Send in Plaintext and HTML">
|
||||
<!ENTITY plainTextOnly.label "Send in Plaintext Only">
|
||||
<!ENTITY htmlOnly.label "Send in HTML Only">
|
||||
|
||||
<!ENTITY plainTextAndHtmlRecommended.label "Send in Plaintext and HTML (recommended)">
|
||||
<!ENTITY plainTextOnlyRecommended.label "Send in Plaintext Only (recommended)">
|
||||
<!ENTITY htmlOnlyRecommended.label "Send in HTML Only (recommended)">
|
||||
<!ENTITY recommended.label "(recommended)">
|
||||
|
||||
<!ENTITY send.label "Send">
|
||||
<!ENTITY dontSend.label "Don't Send">
|
||||
<!ENTITY cancel.label "Cancel">
|
||||
<!ENTITY recipients.label "Recipients...">
|
||||
<!ENTITY help.label "Help">
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче