You've committed translation to the EN tree.
Please revert.
On 12.02.2006 02:28, Dallas Thunder wrote:
dallas Sat Feb 11 23:28:58 2006 UTC
Modified files:
/phpdoc/en/reference/mail ini.xml reference.xml
Log:
Added.
http://cvs.php.net/viewcvs.cgi/phpdoc/en/reference/mail/ini.xml?r1=1.8&r2=1.9&diff_format=u
Index: phpdoc/en/reference/mail/ini.xml
diff -u phpdoc/en/reference/mail/ini.xml:1.8
phpdoc/en/reference/mail/ini.xml:1.9
--- phpdoc/en/reference/mail/ini.xml:1.8 Tue Feb 22 17:36:07 2005
+++ phpdoc/en/reference/mail/ini.xml Sat Feb 11 23:28:57 2006
@@ -1,18 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<?xml version="1.0" encoding="gb2312"?>
+<!-- $Revision: 1.9 $ -->
+<!-- $Author: dallas $ -->
+<!-- EN-Revision: 1.8 Maintainer: dallas Status: ready -->
<section id="mail.configuration">
&reftitle.runtime;
&extension.runtime;
<para>
<table>
- <title>Mail configuration options</title>
+ <title>Mail еДжця║оН</title>
<tgroup cols="4">
<thead>
<row>
- <entry>Name</entry>
- <entry>Default</entry>
- <entry>Changeable</entry>
- <entry>Changelog</entry>
+ <entry>цШЁф</entry>
+ <entry>д╛хож╣</entry>
+ <entry>©ипч╦д╥╤н╖</entry>
+ <entry>╦Эпб╪гб╪</entry>
</row>
</thead>
<tbody>
@@ -26,7 +28,7 @@
<entry>smtp_port</entry>
<entry>"25"</entry>
<entry>PHP_INI_ALL</entry>
- <entry>Available since PHP 4.3.0.</entry>
+ <entry>вт PHP 4.3.0 фП©исц</entry>
</row>
<row>
<entry>sendmail_from</entry>
@@ -57,8 +59,8 @@
</term>
<listitem>
<para>
- Used under Windows only: DNS name or IP address of the SMTP server PHP
- should use for mail sent with the <function>mail</function> function.
+ ╫Жсцсз Windowsё╨PHP тз <function>mail</function> ╨╞йЩжпсцю╢╥╒кмсй╪Ч╣д
+ SMTP ╥ЧнЯфВ╣д DNS цШЁф╩Руъ IP ╣ьж╥║ё
</para>
</listitem>
</varlistentry>
@@ -70,10 +72,8 @@
</term>
<listitem>
<para>
- Used under Windows only: Number of the port to connect to the server
- specified with the <literal>SMTP</literal> setting when sending mail
- with <function>mail</function>; defaults to 25. Only available since
- PHP 4.3.0.
+ ╫Жсцсз Windowsё╨<literal>SMTP</literal> ╥ЧнЯфВ╣д╤к©з╨её╛д╛хон╙ 25║ёвт
+ PHP 4.3.0 фП©исц║ё
</para>
</listitem>
</varlistentry>
@@ -85,8 +85,7 @@
</term>
<listitem>
<para>
- Which "From:" mail address should be used in mail sent from
- PHP under Windows.
+ тз Windows обсц PHP ╥╒кмсй╪Чй╠╣д "From:" сй╪Ч╣ьж╥╣дж╣║ё
</para>
</listitem>
</varlistentry>
@@ -98,29 +97,24 @@
</term>
<listitem>
<para>
- Where the <command>sendmail</command> program can be found,
- usually <filename>/usr/sbin/sendmail</filename> or
- <filename>/usr/lib/sendmail</filename>.
- <command>configure</command> does an honest attempt of
- locating this one for you and set a default, but if it fails,
- you can set it here.
+ <command>sendmail</command> ЁлпР╣дб╥╬╤ё╛м╗Ёён╙
+ <filename>/usr/sbin/sendmail</filename> ╩Р
+ <filename>/usr/lib/sendmail</filename>║ё<command>configure</command>
+ ╫е╠╬╩АЁ╒йтур╣╫╦цЁлпР╡╒иХ╤╗н╙д╛хож╣ё╛╣╚йгхГ╧Шй╖╟э╣д╩╟ё╛©ирттзуБюОиХ╤╗║ё
</para>
<para>
- Systems not using sendmail should set this directive to the
- sendmail wrapper/replacement their mail system offers, if any.
- For example, <ulink url="&url.qmail;">Qmail</ulink>
- users can normally set it to
- <filename>/var/qmail/bin/sendmail</filename> or <filename>
- /var/qmail/bin/qmail-inject</filename>.
+ ╡╩й╧сц sendmail ╣до╣мЁс╕╫╚╢кж╦аНиХ╤╗н╙фДсй╪Чо╣мЁлА╧╘╣д
+ sendmail лФ╢ЗЁлпРё╛хГ╧Шсп╣д╩╟║ёюЩхГё╛<ulink
url="&url.qmail;">Qmail</ulink>
+ сц╩╖м╗Ёё©иртиХн╙
+ <filename>/var/qmail/bin/sendmail</filename> ╩Р
+ <filename>/var/qmail/bin/qmail-inject</filename>║ё
</para>
<para>
- <command>qmail-inject</command> does not require any option to
- process mail correctly.
+ <command>qmail-inject</command> ╡╩пХр╙хн╨ня║оН╬мдэуЩх╥╢╕юМсй╪Ч║ё
</para>
<para>
- This directive works also under Windows. If set, <varname>smtp</varname>,
- <varname>smtp_port</varname> and <varname>sendmail_from</varname> are
- ignored and the specified command is executed.
+ ╢кж╦аНр╡©исцсз
Windows║ёхГ╧ШиХ╤╗ё╛<varname>smtp</varname>ё╛<varname>smtp_port</varname>
+ ╨м <varname>sendmail_from</varname> ╤╪╠╩╨Жбт╡╒ткппж╦╤╗╣дцЭаН║ё
</para>
</listitem>
</varlistentry>
http://cvs.php.net/viewcvs.cgi/phpdoc/en/reference/mail/reference.xml?r1=1.11&r2=1.12&diff_format=u
Index: phpdoc/en/reference/mail/reference.xml
diff -u phpdoc/en/reference/mail/reference.xml:1.11
phpdoc/en/reference/mail/reference.xml:1.12
--- phpdoc/en/reference/mail/reference.xml:1.11 Sun Sep 4 19:39:17 2005
+++ phpdoc/en/reference/mail/reference.xml Sat Feb 11 23:28:57 2006
@@ -1,58 +1,56 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<?xml version="1.0" encoding="gb2312"?>
+<!-- $Revision: 1.12 $ -->
+<!-- $Author: dallas $ -->
+<!-- EN-Revision: 1.11 Maintainer: dallas Status: ready -->
<!-- Purpose: remote.mail -->
<!-- Membership: core -->
- <reference id="ref.mail">
- <title>Mail Functions</title>
- <titleabbrev>Mail</titleabbrev>
- <partintro>
-
- <section id="mail.intro">
- &reftitle.intro;
- <para>
- The <function>mail</function> function allows you to send mail.
- </para>
- </section>
-
- <section id="mail.requirements">
- &reftitle.required;
- <para>
- For the Mail functions to be available, PHP must have access to the
- <literal>sendmail</literal> binary on your system during compile time.
- If you use another mail program, such as qmail or postfix, be sure to
- use the appropriate sendmail wrappers that come with them. PHP will
- first look for sendmail in your <literal>PATH</literal>, and then in
- the following:
- <literal>/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib</literal>.
- It's highly recommended to have sendmail available from your
- <literal>PATH</literal>. Also, the user that compiled PHP must have
- permission to access the sendmail binary.
- </para>
- </section>
-
- <section id="mail.installation">
- &reftitle.install;
- &no.install;
- </section>
-
- &reference.mail.ini;
-
- <section id="mail.resources">
- &reftitle.resources;
- &no.resource;
- </section>
-
- <section id="mail.constants">
- &reftitle.constants;
- &no.constants;
- </section>
+<reference id="ref.mail">
+ <title>Mail сй╪Ч╨╞йЩ</title>
+ <titleabbrev>Mail</titleabbrev>
+ <partintro>
+
+ <section id="mail.intro">
+ &reftitle.intro;
+ <para>
+ <function>mail</function> ╨╞йЩ©ирт╥╒км╣Гвссй╪Ч║ё
+ </para>
+ </section>
+
+ <section id="mail.requirements">
+ &reftitle.required;
+ <para>
+ р╙й╧сй╪Ч╨╞йЩ©исцё╛PHP ╠ьпКтз╠ЮрКй╠дэ╧╩╥цнй
+ <literal>sendmail</literal> ЁлпР║ёхГ╧Шй╧сцфДкЭ╣дсй╪ЧЁлпРюЩхГ qmail
+ ╩Р postfixё╛х╥╠ёй╧сцаксКфДоЮс╕╣д sendmail лФ╢ЗЁлпР║ёPHP йвох╩Атзо╣мЁ╣д
+ <literal>PATH</literal> жпкякВ
+
sendmailё╛╫све╟╢ртобкЁпРкякВё╨<literal>/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib</literal>║ёг©ар╫╗рИтз
+ <literal>PATH</literal> жпдэ╧╩ур╣╫ sendmail║ёаМмБё╛╠ЮрК PHP
╣дсц╩╖╠ьпКдэ╧╩╥цнй sendmail ЁлпР║ё
+ </para>
+ </section>
+
+ <section id="mail.installation">
+ &reftitle.install;
+ &no.install;
+ </section>
+
+ &reference.mail.ini;
+
+ <section id="mail.resources">
+ &reftitle.resources;
+ &no.resource;
+ </section>
+
+ <section id="mail.constants">
+ &reftitle.constants;
+ &no.constants;
+ </section>
- </partintro>
+ </partintro>
-&reference.mail.functions;
+ &reference.mail.functions;
- </reference>
+</reference>
<!-- Keep this comment at the end of the file
Local variables:
mode: sgml
--
Wbr,
Antony Dovgal
