changeset 10925:3c168670c782

Massive docs update. (sync, etc.) New translated files coming soon.
author lumag
date Mon, 22 Sep 2003 08:20:53 +0000 (2003-09-22)
parents f531971e44cf
children f9e8401ec049
files DOCS/xml/ru/bugs.xml DOCS/xml/ru/cd-dvd.xml DOCS/xml/ru/codecs.xml DOCS/xml/ru/documentation.xml DOCS/xml/ru/edl.xml DOCS/xml/ru/features.xml DOCS/xml/ru/formats.xml DOCS/xml/ru/history.xml DOCS/xml/ru/html-single.xsl DOCS/xml/ru/html.xsl DOCS/xml/ru/install.xml DOCS/xml/ru/mail-lists.xml DOCS/xml/ru/patches.xml DOCS/xml/ru/tvinput.xml DOCS/xml/ru/users-vs-dev.xml
diffstat 15 files changed, 245 insertions(+), 292 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/xml/ru/bugs.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/bugs.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.4 -->
 <appendix id="bugs">
 <title>蠣彭嘖隣� 侑和姪踊</title>
 <sect1 id="bugs-special">
@@ -19,7 +20,7 @@
 </listitem>
 <listitem>
 <para>&quot;Internal buffer inconsistency&quot; 從 徠斗� 忸佻摸杜頻 MEncoder'�:</para>
-<para>靤和姪輿: 冨彭嘖料� 侑和姪輿, 墨把� &lt; 3.90 墨熔斌敏�遡嗔, 瓶佻蒙旁� gcc 2.96 斌� 3.x.</para>
+<para>靤和姪輿: 冨彭嘖料� 侑和姪輿, 墨把� lame &lt; 3.90 墨熔斌敏�遡嗔, 瓶佻蒙旁� gcc 2.96 斌� 3.x.</para>
 <para>鯏枦良�: 瓶佻蒙旁編� lame &ge;3.90.</para>
 <para>鐶範�: 嗚詫佗棉簒編� lame,瓶佻蒙旁� gcc 2.95.x, � 嫩遡不� 徨� 孛� 孑堊力很杜隣�
 仭謀壅 lame, 藁� 溶婆� 泰墮 嗚詫佗棉厦彖隣, 瓶佻蒙旁� gcc 2.96.</para>
@@ -128,7 +129,7 @@
 </sect2>
 
 <sect2 id="bugs-nopicture">
-<title>�和歸 療� 冨和卅崚良� (塹蒙墨 侑腕塹� 單厦�/敕味力� 亘力)</title>
+<title>�和歸 療� 冨和卅崚良� (塹蒙墨 侑腕塹� 單厦�/敕味力� 亘力)</title>
 <itemizedlist>
 <listitem>
 <para>�� 徳別 瓶佻蒙旁都 療 佻陳賭嵒彖斗拱 徂津� 墨津�</para>
--- a/DOCS/xml/ru/cd-dvd.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/cd-dvd.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.7 -->
 <chapter id="cd-dvd">
 <title>蚌佻蒙斛彖良� CD/DVD</title>
 
@@ -10,48 +11,48 @@
 
 <para>
 麩徠斗杜隣� 侑夫歪� CD-ROM 溶杯� 卅堆堊墮 料 �杜�  忸嗜防� 嗚碗腕墹�, 療墨塹燮�
-冨 良� 嗤腕和隣 凖杯棉厦彖墮 嗚碗腕墮 湟杜頻. 酖嗚鰐慄� 倉杯妖淋� � 佻蒙旁 瓶佻蒙斛彖良� 榑亙 從斃�力嘖�:
+冨 良� 嗤腕和隣 凖杯棉厦彖墮 嗚碗腕墮 湟杜頻. 酖嗚鰐慄� 倉杯妖淋� &quot;攸&quot;
+瓶佻蒙斛彖良� 榑亙 從斃�力嘖�:
 </para>
 
 <itemizedlist>
 <listitem><para>
-靤� 忸嗜防� 和碗�組 從斷喪堊都 彭厦冱力嘖� �病防 侑� 湟杜鰭, 腕和杜力 �
-療侑宋斌慘� 攸佗啻領挌 追嗚�. �杜憖杜錨 嗚碗腕塢 溶崚� 侑田�徠壮不� 佻堙卆
+鄙 忸嗜防� 和碗�組 從斷喪堊都 彭厦冱力嘖� �病防 侑� 湟杜鰭, 腕和杜力 �
+侈枠� 啼碗溶彖領挌 追嗚�. �杜憖杜錨 嗚碗腕塢 溶崚� 侑田�徠壮不� 佻堙卆
 珍領挌 � 療墨塹燮� 嗅孺叢�.
 </para></listitem>
 
 <listitem><para>
-��杜� 柎輿, 從斷喪堊摂品 � 和碗�鼠�, 溶崚� 亘惣壮慯� 彭嗹輿 嗾歸嘖彭領挈
+輓惑錨 CD-ROM 侑夫歪� 孛喪力 柎用�, � 嗄埠杜錨 嗚碗腕塢 溶崚� 侑夫途塢
+� 嬪杜憖杜廟 柎輿.
 </para></listitem>
 </itemizedlist>
 
 <para>
 � 溶崚堙 嬪杜憖不� 嗚碗腕墮 徠掃杜頻 IDE CD-ROM 侑夫歪� 侑惑卅様鼠�
 <command>hdparm</command> 斌� <command>setcd</command>. 霻� 卅堆堊都 堊�:
-<screen>hdparm -E <replaceable>[嗚碗腕墮]</replaceable> <replaceable>[侑夫歪]</replaceable></screen>
-<screen>setcd -x <replaceable>[嗚碗腕墮]</replaceable> <replaceable>[侑夫歪]</replaceable></screen>
+<screen>hdparm -E <replaceable>[嗚碗腕墮]</replaceable> <replaceable>[cdrom 孑墟亙嘖從]</replaceable></screen>
+<screen>setcd -x <replaceable>[嗚碗腕墮]</replaceable> <replaceable>[cdrom 孑墟亙嘖從]</replaceable></screen>
 </para>
 
 <para>
-� 堊勃� 溶崚堙 佻侑和�壮�
-<screen>echo current_speed:4 &gt; /proc/ide/<replaceable>[cdrom device]</replaceable>/settings</screen>
-力 通� 榑惑� 墟殿媽墫� 侑夫斌吐鰭 祖揺良嘖卅塹卅. 麑田媽歔� 墨輿猟�
-塹崚 溶崚� 泰墮 佻姪變�:
+縒棉 � �� 途墮 侑夫斌吐鰭 祖揺良嘖卅塹卅, 嗅田媽歔� 墨輿猟�
+塹崚 溶崚� 亘惣壮慯� 佻姪變亙:
 <screen>echo file_readahead:2000000 &gt; /proc/ide/<replaceable>[cdrom device]</replaceable>/settings</screen>
 </para>
 
 <para>
 �防� 和卅斛� 侑田彖夘堙蒙力 嘲不掀租墫� 2 妖覗汰編� (佻姪變� 侑�
-追嗚組 � 蛋卅佗料揺). 縒棉 佻嘖宋不� 嗅布墨� 忸嗜墨� 變挿杜錨, 塹 佻嘖湾領拱
-攸侖嗚 � 腕堊力徊� 徠掃杜頻 追嗚� 漬鼠壮扶途防 嗄冨冱 榮禿穆夫力嘖�.
+追嗚組 � 蛋卅佗料揺). 縒棉 佻嘖宋不� 嗅布墨� 堆蒙柤� 變挿杜錨, 塹 佻嘖湾領拱
+攸侖嗚 � 腕堊力徊� 徠掃杜頻 追嗚� 孛喪力 嗄冨冱 榮禿穆夫力嘖�.
 鯏墨妖猟嫖墫� 堊勃� 佻柘墟鷲墮 侑夫歪, 瓶佻蒙旁� <command>hdparm</command>:
-<screen>hdparm -d1 -a8 -u1 <replaceable>侑夫歪</replaceable></screen>
+<screen>hdparm -d1 -a8 -u1 <replaceable>cdrom 孑墟亙嘖從</replaceable></screen>
 </para>
 
 <para>
 �防� 和卅斛� 徊明涸都嗔 侑冤亙 掴嘖孃 � 仭用塢[DMA], 侑田彖夘堙蒙力�
-湟杜錨 � 卅斃喪防厦徊� IRQ (侑�塢 man-嘖卅良稚 <command>hdparm</command>,
-通� 堆姪� 佻漬和力馬 椀瓶僧頻).
+湟杜錨 � 卅斃喪防厦徊� IRQ (侑�塢堙 man-嘖卅良稚 <command>hdparm</command>,
+� 堆姪� 佻漬和隣� 椀瓶僧錨�).
 </para>
 
 <para>
@@ -73,7 +74,7 @@
 <sect1 id="dvd">
 <title>�嗤厦冨彭津良� DVD</title>
 <para>
-靉摸拱 嗤瓶亘 從斃�隣� 椀檀� 溶嵶� 侑�不壮� � man.
+靉摸拱 嗤瓶亘 從斃�隣� 椀檀� 溶嵶� 侑�不壮� � man 嘖卅良壇.
 麌淋阻喇� 通� 嘖僧珍參隣� 禀寅�挌 輓惑話徒砺挌 簓嗚�[Digital Versatile Disc]
 (DVD) 堊墨�:
 <screen>mplayer dvd://<replaceable>&lt;厦棉�&gt;</replaceable> [-dvd-device <replaceable>侑夫歪</replaceable>]</screen>
@@ -114,15 +115,6 @@
 </para>
 
 <formalpara>
-<title>靉陳賭嵋� DVD 料徂覗檀� (dvdnav)</title>
-<para>
-靉陳賭嵋� DVD 料徂覗檀�, 瓶佻蒙旁� <systemitem>dvdnav</systemitem> 泰盟 料涸堊,
-力 良墨把� 療 泰盟 掴彭津料 掴 嬪�, � 料 珍領詫 榑双� 攸岱�杜�. 誑� 變租�,
-藁� 溶崚� 珍崚 嗚詫佗棉厦彖墮嗔.
-</para>
-</formalpara>
-
-<formalpara>
 <title>黌倉叢 佻陳賭嵋� DVD - 鈬 閧髫癆繻��</title>
 <para>
 霻� 溶崚� 亘惣壮慯� 佻姪變挈, 料侑浜賭, 侑� 侑腕溶墟� 攸柯寅�僧隣� VOB-徳別�
@@ -157,7 +149,7 @@
 
 <para>
 蠣-攸 榑惑� 嘖倉叢 佻陳賭嵋� DVD c <systemitem>libcss</systemitem> 燐崢租墫� �
-攸溶淋敏�僧力� 徳別�亙 喇嘖斗� � 佻單穆碗力葉 掴嘖孃� � 孑墟亙嘖徼. �
+攸溶淋敏�僧力� 徳別�亙 喇嘖斗� � 佻單穆碗力� 掴嘖孃� � 孑墟亙嘖徼. �
 嗜崛姪良�, 通� 榑惑� 燐嵶� 侑夫斌吐鰭 祖揺良嘖卅塹卅 (佻� Linux). 靤和姪輿
 凖杼都嗔 墟斗� 嗤腕和鼠�:
 
@@ -177,7 +169,8 @@
 酖 瓶佻蒙斛彖墮 漬訴彭� 徳別�亙 喇嘖斗� 冨 冂卅 � 徨� 津盟墮 � 侑腕墟僧嘖彭
 佻蒙斛彖堙妄. <systemitem>libdvdread</systemitem> 0.9.x � <systemitem>
 libmpdvdkit</systemitem> 堊� � 津盟脊 (力彖� 佻陳賭嵋� DVD). 簟訴彭� UDF
-徳別�亙 喇嘖斗� 療 燐崚�, 佻嗚鰐慄� � 良� 徨墟賄領拇 漬訴彭卅 徳別�亙 喇嘖斗�
+徳別�亙 喇嘖斗� 療 燐崚�, 佻嗚鰐慄� � 榑蛭 舵駄貧堙冒� 途墮 徨墟賄領拇
+漬訴彭卅 徳別�亙 喇嘖斗�
 UDF. �勃� DVD 療 和凉僧 泰墮 攸溶淋敏�僧隣�, 佻嗚鰐慄� 瓶佻蒙旁都嗔
 塹蒙墨 侑冤亙 佻單穆碗隣� 掴嘖孃.
 </para></listitem>
@@ -185,8 +178,8 @@
 </para>
 
 <para>
-蚓惑珍 佻蒙斛彖堙棉 療 溶杯� 淺堊墮 <filename>/dev/dvd</filename>
-, 佻榑詫� 宋塹燮 <systemitem>libdvdread</systemitem> 料佗啻棉 寨嫐冀貧領拱
+蚓惑珍 佻蒙斛彖堙棉 療 溶杯� 淺堊墮 <filename>/dev/dvd</filename>,
+佻榑詫� 宋塹燮 <systemitem>libdvdread</systemitem> 料佗啻棉 寨嫐冀貧領拱
 孀�杜�, 墨塹燮� 侑砺卅歔都 單穆碗隣� 祖凖啻 � 料旌僧頻 徳別� � 嗟倒杜錨,
 通� 寨嫐冀鰭 侑冤惑� 掴嘖孃� 料 攸溶淋敏�僧力� 徳別�亙 喇嘖斗� 斌� 料 孱嘖墨�
 追嗚�.
@@ -201,7 +194,7 @@
 
 <para>
 �墟亙嘖從 DVD 佻 嬪鰐涸良� &mdash; <filename>/dev/dvd</filename>. 縒棉 �柯
-孑堊力徊� �棉涸脊嗔, 嗜敖訴堙 喇要鰐扶途釦� 嗷挂釦 斌� 嬲爽不� 侑宋斌慘賄
+料嘖厦碧� �棉涸脊嗔, 嗜敖訴堙 喇要鰐扶途釦� 嗷挂釦 斌� 嬲爽不� 侑宋斌慘賄
 料旌僧錨 � 墨輿猟力� 嘖厦謀 佻嗅� 椀檀� <filename>-dvd-device</filename>.
 </para>
 
@@ -301,8 +294,8 @@
 
 <note><para>
 靉 牧訴療� 妖凖 Plextor'� � 療墨塹燮� Toshiba SCSI CD-ROM 侑夫歪� 佻冒旛彖脊
-孛喪燐� 侑鷲旌歪不徒慘腕墮 侑� 湟杜鰭 VCD'�. 霻� 和瀾嗄囘墫� 療佻摸挈
-腕斈途墸姪良斗 <systemitem>ioctl</systemitem> CDROMREADRAW 料 榑蛭 侑夫歪組.
+孛喪燐� 侑鷲旌歪不徒慘腕墮 侑� 湟杜鰭 VCD'�. 霻� 和瀾嗄囘墫� 堙�, 湟�
+CDROMREADRAW <systemitem>ioctl</systemitem> 料 榑蛭 侑夫歪組 腕斈途墸味� 療 壇棉墨�.
 縒棉 � 浜電堙 療墨塹燮� 佻變僧頻 � 啼賭� 侑惑卅様敏�僧頻 SCSI, 佻崛盲篇堊
 <ulink url="../../tech/patches.txt">佻溶派堙 料�</ulink> � 料佗啻良� 佻陳賭嵋�
 SCSI generic 通� VCD.
@@ -326,15 +319,16 @@
 <listitem><para>
 霤叟叢 掴厦嵋� 嗜津雙不 療嗚鰐慄� 妖覗汰編 單穆碗鼠� 佻 2048 汰編�,
 � 徳別�亙 喇嘖斗亙 iso9660, 和掵力 嗜津雙掃妬 侑鷲拝掀壮徒� VCD 通�
-Windows 斌� 侑�媽 瀕届厖礎廟, 徠歪� 冒參瀕亘 斌� 堙睦堊.
+Windows �, 從斃�力, 侑�媽 瀕届厖礎廟, 徠歪� 冒參瀕亘 斌� 堙睦堊.
 </para></listitem>
 
 <listitem><para>
 �碗叢 � 腕堊蒙隣� 掴厦嵋� 嗜津雙壮 MPEG-佻塹� 單穆碗鼠� 佻 2324 汰編�, 佻
-歪力葉 仭謀壞 MPEG PS 料 單穆碗 徑途塹 徳別�亙 喇嘖斗�. 霻� 掴厦嵋� <emphasis
-role="bold">療 溶淋敏媽墫�</emphasis> (� 墨把�-良怠椿 溶淋敏�遡� 奏追� 追嗚
+歪力葉 仭謀壞 MPEG PS 料 單穆碗 徑途塹 徳別�亙 喇嘖斗�. 訌� � 掴厦嵋�
+奏追�CD, 榑� 掴厦嵋� <emphasis role="bold">療 溶淋敏媽墫�</emphasis>
+(� 墨把�-良怠椿 溶淋敏�遡� 奏追� 追嗚
 通� 塹馬, 湟和� 吐� 從嗤厦冨彭嘖�?) �� 冒� 堆蒙柯林墸� 読蒙溶� 浜杜力 料 榑亙
-掴厦嵋�, 佻侑和嬖 嗄挿遡� <option>vcd://2</option>.
+掴厦嵋�, 佻侑和嬖堙 嗄挿遡� <option>vcd://2</option>.
 </para></listitem>
 
 <listitem><para>
@@ -350,9 +344,9 @@
 料旛彖斗拱 ISO-佚凖範�, 嗜敖僧隣�, 湟和� 佻旌鰐不� Windows 和卅汰壅彖墮 榑�
 掴厦嵋� (Windows 從和歸 攸侑倒租� 侑斌�杜頻� 瓶佻蒙斛彖墮 侑冤亙 掴嘖孃
 � 孑墟亙嘖彖�). 靉� Linux � 療 溶崚堙 墨佗厦彖墮 榑� 徳別� (藁� 忸婆冂冱, 冒�
-葉嗜�). 靉� Windows 榑� 從斃�力, 佻嗚鰐慄� 冨 iso9660 寨嫐敏嫖� 侑冤亙 掴嘖孃
+葉嗜�). 靉� Windows 榑� 從斃�力, 佻嗚鰐慄� 堊� iso9660 寨嫐敏嫖� 侑冤亙 掴嘖孃
 � 掴厦嵋鼠 淌凖� 榑� 徳別. �和� 侑鷲拝掀壮� .DAT 徳別 �� 燐崚� 漬訴彭�,
-墨塹燮� 溶崚� 泰墮 料閉杜 � Linux 彭厶鰭 PowerDVD. 霻� 溶追読檀厦彖領拱 漬訴彭�
+冨 Linux 彭厶鰭 PowerDVD. 霻� 溶追読檀厦彖領拱 漬訴彭�
 iso9660 徳別�亙 喇嘖斗� (<filename>vcdfs/isofs-2.4.X.o</filename>), 墨塹燮�
 嗤腕和杜 寨嫐敏�壮� 侑冤亙 掴嘖孃 � 掴厦嵋鼠 淌凖� 榑� 徳別. 縒棉 �
 攸溶淋敏嫖堙 追嗚, 瓶佻蒙旁� 蛭 漬訴彭�, � 溶崚堙 墨佗厦彖墮 � 珍崚 侑鷲拝掀壮�
@@ -362,7 +356,7 @@
 漬訴彭� <ulink url="http://www.elis.rug.ac.be/~ronsse/cdfs/">cdfs</ulink> (療
 徃歪不 � 脇秒描蒙力� 冂厦) 墨塹燮� 佻冒旛彖都 掴厦嵋�[單嗷鰭] 料 追嗚� 冒� 徳別�
 和卅斛� � <ulink url="http://cdrdao.sf.net/">cdrdao</ulink>, 侑斌�杜錨 通�
-佻舵堽惑� 湟杜頻/墨佗厦彖良� CD.
+佻舵塹從馬 湟杜頻/墨佗厦彖良� CD.
 </para>
 </formalpara>
 </sect1>
--- a/DOCS/xml/ru/codecs.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/codecs.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.18 -->
 <sect1 id="codecs">
 <title>靉陳賭嵒彖斗拇 墨津防</title>
 
@@ -13,7 +14,7 @@
 </para>
 
 <para>
-鄙病鰐電 彖嵶拇 冨 良�:
+鄙病鰐電 彖嵶拇 墨津防:
 </para>
 
 <itemizedlist>
@@ -78,11 +79,11 @@
 <title>DivX4/DivX5</title>
 
 <para>
-霻� 單肪頻 嗜津雙不 瀕届厖礎廟 � DivX4 b DivX5 墨津冒� 冨
+霻� 單肪頻 嗜津雙不 瀕届厖礎廟 � DivX4 b DivX5 墨津冒� �
 <ulink url="http://www.projectmayo.com">Project Mayo</ulink>.
 虍 佚叟挈� 掴嘖孃隣揺 遡愼� 彭厶頻揺 泰棉 OpenDivX alpha 47 � 48.
-靉陳賭嵋� 通� 良� 泰盟 徊明淌料 � <application>MPlayer</application> � 侑�模�
-� 嗜舵卅盟嗹 佻 嬪鰐涸良�.  輾 堊勃� 瓶佻蒙斛彖棉 蛭 墨� 佻嘖和卅堆塰�
+� 侑�模� 佻陳賭嵋� 通� 良� 泰盟 徊明淌料 � <application>MPlayer</application>
+� 嗜舵卅盟嗹 佻 嬪鰐涸良�. �勃� 踊 瓶佻蒙斛彖棉 蛭 墨� 佻嘖和卅堆塰�
 通� 徳釦蒙堊塢徇惑� 嫐孺枦良� 冒淌嘖彖 冨和卅崚良� � MPEG1/2 読蒙輿�.
 鹽舗喪 踊 瓶佻蒙旁斗 料� 嗜帯墸杜隣� 読蒙墟 通� 徳別� 徨堵 塢佻�.
 </para>
@@ -93,8 +94,8 @@
 泰嘖凖�, 淌� Win32 DivX DLL'�, 力 妖通杜療�, 淌� <systemitem
 class="library">libavcodec</systemitem>. 靉榑詫�, 瓶佻蒙斛彖墮 吐� � 冒淌嘖彭
 津墨津卅 <emphasis role="bold">鈬 鱚謠辣鈔���</emphasis>. 莽墹, 藁 佻姪敕�
-通� 墨追厦彖良�. 緜瀕嘖彭領挈 療掴嘖壮墨� 榑惑� 墨津冒 况妄都嗔 塹, � 療馬
-療 棉壇鱗頻 鑚牧捏挈 瓶範栂挈 墨珍[Open Source license]
+通� 墨追厦彖良�. 緜瀕嘖彭領挈 療掴嘖壮墨� 榑惑� 墨津冒 况妄都嗔 塹, 湟� 藁
+療 掴嘖孃杜 佻 棉壇鱗鰭 � 鑚牧捏挈 瓶範栂挈 墨掴�[Open Source license]
 </para>
 
 <para>
@@ -163,7 +164,7 @@
 </para></step>
 <step><para>
 � 嗜崛姪良�, 通� 舵駄貧堙防 encore Linux'�惑� Makefile 療�, � MMX 椀塢揺敝厦彖領拱
-墨� 卅堆堊都 塹蒙墨 佻� Windows. � 徨� 崚 溶崚堙 嗚詫佗棉厦彖墮 釘, 瓶佻蒙旁� 榑�
+墨� 卅堆堊都 塹蒙墨 佻� Windows. � 徨� 崚 溶崚堙 嗚詫佗棉厦彖墮 釘, 瓶佻蒙旁� 榑�
 <ulink url="ftp://ftp.mplayerhq.hu/MPlayer/contrib/divx-mf/Makefile">Makefile</ulink>.
 <screen>
 cd ../../../encore/build
@@ -179,7 +180,7 @@
 </procedure>
 
 <para>
-<application>MPlayer</application> 宋塹輿塢淌嗚� 料範追� DivX4/DivX5 途棉 藁 泰�
+<application>MPlayer</application> 宋塹輿塢淌嗚� 料範追� DivX4/DivX5 途棉 藁� 泰棉
 侑宋斌慘� 孑堊力很杜, 侑腕塹 墨熔斌敏嬖堙 冒� 和掵力. 縒棉 藁 療 料範追� 榑�
 墨津�, 塹 � 療侑宋斌慘� 孑堊力徂棉 斌� 嗚藁読杯夘厦彖棉 DivX4/DivX5.
 </para>
@@ -308,7 +309,7 @@
   </para></step>
 <step><para>
   霤凖浜杜嬖堙/嗜敖訴堙 喇要鰐扶途防� 嗷挂防, 嫗卅� 涸嘖�, �力嗔殄途� �
-  倉班堙穆孀�, 湟和� 藁� 料旛彖棉嗹 堊�: <filename>vid_cvid.xa</filename>,
+  倉班堙穆孀� 堊�, 湟和� 徳別� 料旛彖棉嗹 堊�: <filename>vid_cvid.xa</filename>,
   <filename>vid_h263.xa</filename>, <filename>vid_iv50.xa</filename>
   </para></step>
 </procedure>
@@ -400,15 +401,15 @@
 <application>RealONE</application>, 佻嗚鰐慄� <application>MPlayer</application>
 溶崚� 瓶佻蒙斛彖墮 蛭 舵駄貧堙防 通� 津墨追厦彖良� 徳別� � RealVideo 2.0 - 4.0
 徂津�. <application>MPlayer</application>'�嗚品 嗚夘來 <filename>configure</filename>
-掴網杜 椀凖津棉墮 <application>RealPlayer</application>'�嗚錨 舵駄貧堙防 �
-嘖僧珍參力� 妖嘖椀鰐�杜鰭 佻摸亙 孑堊力徊�. 縒棉 榑惑� 療 侑鷲喩歪不, 嗜和殄堙
+掴網杜 料編� <application>RealPlayer</application>'�嗚錨 舵駄貧堙防, �
+嘖僧珍參力� 妖嘖椀鰐�杜鰭 侑� 佻摸亙 孑堊力徊�. 縒棉 榑惑� 療 侑鷲喩歪不, 嗜和殄堙
 <filename>configure</filename>, 把� 蛭 瓶冒墮 椀檀妬 <option>--with-reallibdir</option>.
 </para>
 
 <para>
 �勃�, � 溶崚堙 嗚挿壮� 墨津防 料
 <ulink url="http://www.mplayerhq.hu/MPlayer/releases/codecs/">http://www.mplayerhq.hu/MPlayer/releases/codecs/</ulink>.
-靉嗅� 嗚疏淺彖良� 仭謀堊 Real'�嗚蛭 墨津墨�, 卅嗤阻嬖堙 蛭 � 冒堊模�
+靉嗅� 嗚挿夫僧頻 仭謀堊 Real'�嗚蛭 墨津墨�, 卅嗤阻嬖堙 蛭 � 冒堊模�
 <filename class="directory">/usr/local/lib/codecs</filename>, 斌� 嬲爽不�
 侖墮 椀檀妬 <option>--with-reallibdir</option>.
 </para>
@@ -426,10 +427,10 @@
 <title>XviD</title>
 
 <para>
-<ulink url="http://www.xvid.org">XviD</ulink> - 榑� �佻淤�宋杼决� 卅斷疎�冒
+<ulink url="http://www.xvid.org">XviD</ulink> - 榑� 卅斷疎�冒, �佻淤�宋杼决� �
 OpenDivX 墨津冒. 霻� 侑鷲斛枳�, 墨把� ProjectMayo 喞徒遡 瓶範栂拱 墨� OpenDivX
-攸牧捏挈 (DivX4, ntgthm DivX5), � 卅斷疎�淺防 OpenDivX 療 冨 ProjectMayo
-卅斛斂斌瓶�, � 料涸棉 XviD. 靉榑詫� � 和鷲� 侑賄穆� 和殄� 墨厠�.
+攸牧捏挈 (DivX4, 堙佚曼 DivX5), � 卅斷疎�淺防 OpenDivX 療 冨 ProjectMayo
+卅斛斂斌瓶�, � 忱冖瓶� 攸 XviD. 靉榑詫� � 和鷲� 侑賄穆� 和殄� 墨厠�.
 
 <itemizedlist>
 <title>頏繪逡�齡�</title>
@@ -443,7 +444,7 @@
   佻陳賭嵋� 墨追厦彖良� � 2 侑枠歪�
   </simpara></listitem>
 <listitem><simpara>
-  忸嗜墨� 冒淌嘖從 墨追厦彖良�, 堆姪� 忸嗜冒� 嗚碗腕墮, 佻 嘔宋療良� � DivX4
+  範厦枦� 冒淌嘖從 墨追厦彖良�, 堆姪� 忸嗜冒� 嗚碗腕墮, 佻 嘔宋療良� � DivX4
   (忸 溶崚堙 吐� 椀塢揺敝厦彖墮 佻� �柎 輿柯燐 從 徠斗� 墨熔斌冀鰭)
   </simpara></listitem>
 </itemizedlist>
@@ -452,8 +453,8 @@
 <title>鈬粹齡癆謇</title>
 <listitem><simpara>
   � 料嘖湾殄� 溶妖淋 療 徨� DivX/DivX4 徳別� <emphasis role="bold">津墨追簒脊嗔
-  </emphasis> (療 侑和姪輿, 佻嗚鰐慄� <link linkend="ffmpeg">libavcodec</link>
-  溶崚� 蛭 侑鷲拝掀壮�)
+  </emphasis> (療 侑和姪輿, 佻嗚鰐慄� 蛭 溶崚� 從嗤厦冨彭嘖�
+  <link linkend="ffmpeg">libavcodec</link>)
   </simpara></listitem>
 <listitem><simpara>
   卅斷疎�冒 侑歪鰐崛都嗔 � � 料嘖湾殄� 溶妖淋
@@ -513,11 +514,8 @@
 <itemizedlist>
 <listitem><simpara>
   Sorenson 1 (fourcc <emphasis>SVQ1</emphasis>) - 津墨追厦彖良� 佻陳賭嵒彖都嗔
-  <emphasis role="bold">厦栂挈� 墨津冒揺</emphasis>. � 津篇墸不徒慘腕塢 途墮 鍔�
-  (佻湟� 歪瀕阻�挌) 津墨津卅 通� SVQ1: 歪瀕 � <application>MPlayer</application>'�,
-  漬嫻亙 � libavcodec. � 溶崚堙 攸侖嘖不� 蛭 嗜�彭墫墸杜力 椀檀冤�
-  <option>-vc svq1</option> � <option>-vc ffsvq1</option>. 酖墨塹燮� 徳別� 怠蔦�
-  卅堆堊墮 � 歪良� � 療 怠蔦� 卅堆堊墮 � 漬嫻浜, 佻榑詫� 佻侑和嬖堙 和� 津墨津卅.
+  <emphasis role="bold">厦栂挈 墨津墨�</emphasis>
+  (<link linkend="ffmpeg">libavcodec</link>)
   </simpara></listitem>
 <listitem><simpara>
   Sorenson 3 (fourcc <emphasis>SVQ3</emphasis>) - 津墨追厦彖良� 佻陳賭嵒彖都嗔,
@@ -527,7 +525,7 @@
 
 <procedure>
 <title>謠逅蛹驛蜻 MPLAYER'� � 竟粐纈�闃 砠碎蜿�� QUICKTIME</title>
-<note><para>� 料嘖湾殄� 溶妖淋 佻陳賭嵒彖脊嗔 塹蒙墨 32舵堽拇 Intel'砺嗚錨
+<note><para>� 料嘖湾殄� 溶妖淋 佻陳賭嵒彖脊嗔 塹蒙墨 32舵塹忸� Intel'砺嗚錨
 侈壮届厖�.</para></note>
 <step><para>嗚挿訴堙 MPlayer'�嗚品 CVS</para></step>
 <step><para>嗚挿訴堙 仭謀� QuickTime DLL �
@@ -605,9 +603,8 @@
 <para>
 篥墨津� AC3 溶崚� 嗜敖宋壮� 奏追� 忸從� 揺奔敏�僧隣� 通� 2, 4 斌� 6 墨模力�.
 瞠蔦淺 嗚藁読杯夘厦彖領挈 通� 6 墨模力�, 榑� 津墨津� 侑田腕堊很囘� 卅敖徒慘拱
-忸從� 徨堵 AC3 冒料模� 旌嬲�詫� 漬訴彭簒 , 佻旌鰐冪 佻盲淺墮 "旌嬲 從牧嫻"
+忸從� 徨堵 AC3 冒料模� 旌嬲�詫� 漬訴彭簒, 佻旌鰐冪 佻盲淺墮 "旌嬲 從牧嫻"
 妥� 徇奴療馬 AC3 津墨津卅, 療和範追溶馬 通� 瓶佻蒙斛彖良� hwac3 墨津冒.
-hwac3 codec.
 </para>
 
 <para>
@@ -642,7 +639,7 @@
 �� 燐嵶� AC3-嗜徑途塢輿� 冒參� � 檀寅�挈 (SP/DIF) 忸從掴�. 簟訴彭� 冒參�
 掴網杜 掴網隣� 和卅斛� 佻陳賭嵒彖墮 AFMT_AC3 届厖壮 (料侑浜賭 C-Media).
 靉柘賄追良堙 AC3 津墨津� � SP/DIF 忸從蔦 � 瓶佻蒙旁編� 椀檀� <option>-ac
-hwac3</option>. 霻� 榾嗤賭浜杜堊蒙力, 力 冨彭嘖力, 湟� 榑� 卅堆堊都 �
+hwac3</option>. 霻� 榾嗤賭浜杜堊蒙料� 從斃�力嘖�, 力 冨彭嘖力, 湟� 榑� 卅堆堊都 �
 C-Media 冒參鼠� � Soundblaster Live! + ALSA (力 療 OSS) 漬訴彭卅揺 �
 冒參鼠� MPEG 津墨追厦彖良� DXR3/Hollywood+.
 </para>
@@ -655,7 +652,7 @@
 <para>
 <ulink url="http://mad.sourceforge.net">libmad</ulink> - 榑� 洋惑椀盟堝碗妖領叢
 舵駄貧堙冒 津墨追厦彖良� MPEG 奏追�. 鑪� 療 �杜� 範厦柤 和卅汰壅彖都 舵壅�
-徳別� � 瀕惑珍 瓶俎壅彖都 侑和姪踊 � 佚凖妖歸良斗 佻 徳別�.
+徳別� � 瀕惑珍 � 療� 泰彖脊 侑和姪踊 � 佚凖妖歸良斗 佻 徳別�.
 </para>
 
 <para>
@@ -706,7 +703,7 @@
 <para>
 疸追� 佻塹防 QDesign (fourcc:<emphasis>QDMC, QDM2</emphasis>) 和料簒嵒彖脊嗔
 � MOV/QT 徳別組. 鐶� 彭厶鰭 榑惑� 墨津冒 溶杯� 津墨追厦彖墮嗔 舵駄貧堙冒揺
-QuickTime. 簗� 瀕嘖簒肪品 佻 孑堊力徊� 嗟. 單肪廟 
+QuickTime. 蚓嘖簒肪鰭 佻 孑堊力徊� 嗟. � 單肪鰭
 <link linkend="sorenson">Sorenson video codec</link>.
 </para>
 </sect3>
@@ -716,7 +713,7 @@
 <para>
 疸追� 佻塹防 Qualcomm (fourcc:<emphasis>Qclp</emphasis>) 和料簒嵒彖脊嗔
 � MOV/QT 徳別組. 鑪� 溶杯� 津墨追厦彖墮嗔 舵駄貧堙冒揺 QuickTime.
-簗� 瀕嘖簒肪品 佻 孑堊力徊� 嗟. 單肪廟
+蚓嘖簒肪品 佻 孑堊力徊� 嗟. � 單肪鰭
 <link linkend="sorenson">Sorenson video codec</link>.
 </para>
 </sect3>
@@ -725,24 +722,9 @@
 <title>AAC 墨津�</title>
 <para>
 AAC (Advanced Audio Coding) - 榑� 墨津�, 瀕惑珍 和料簒嵒彖斗拱 � MOV � MP4
-徳別組. 篥墨津� � �牧捏挈 瓶範栂挈 墨掴� 料旛彖都嗔 FAAD � 掴嘖孃杜 �
-<ulink url="http://www.audiocoding.com"/>. � 溶崚堙 嗚挿壮� 墨津� 徭碗惑�
-佻墨姪良� - FAAD2 料 蛭 <ulink url="http://www.audiocoding.com/download.php">
-嘖卅良壇 嗚挿夫僧頻</ulink>. � 嗜崛姪良�, FAAD2 1.1 療 墨熔斌敏嫖墫� 佻� Linux,
-佻榑詫� �� 侑浜都嗔 瓶佻蒙斛彖墮 CVS 彭厶廟. � 從� 冒�:
-<screen>
-cvs -d:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac login
-cvs -z3 -d:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac co faad2
-cd faad2/
-chmod +x bootstrap
-./bootstrap
-./configure
-make
-make install
-</screen>
-睇料夘� 療 掴嘖孃隣 料 audiocoding.com, 力 � 佻盲淺墮(apt-get) Debian'�嗚錨
-仭謀壅 � <ulink url="http://marillat.free.fr">掴輿枸妬 嘖卅良遅 Christian
-Marillat</ulink> � Mandrake'�嗚錨 RPM'� � <ulink url="http://plf.zarb.org">P.L.F</ulink>.
+徳別組. 篥墨津� � �牧捏挈 瓶範栂挈 墨掴�, 料旛彖斗拱 FAAD, 掴嘖孃杜 �
+<ulink url="http://www.audiocoding.com"/>.
+MPlayer 徊明涸都 � 單耐 libfaad 2.0RC1, 佻榑詫� �� 良淌馬 療 燐嵶� 掴佻摸不徒慘� 嗚挿夫壮�.
 </para>
 </sect3>
 
@@ -880,7 +862,7 @@
   </para></step>
 <step><para>
   縒棉 GUID 料閉杜, � 掴網隣 徂津墮 佻妄 <guilabel>FriendlyName</guilabel>
-  � <guilabel>CLSID</guilabel>. �佗柯堙 16-塢 汰編隣� CLSID, 榑� GUID, 墨塹燮�
+  � <guilabel>CLSID</guilabel>. �佗柯堙 16-塢 汰編�拱 CLSID, 榑� GUID, 墨塹燮�
   料� 燐崚�.
   </para></step>
 </procedure>
--- a/DOCS/xml/ru/documentation.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/documentation.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="KOI8-R" standalone="no"?>
+<!-- synced with 1.6 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 	"/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"
 [
@@ -24,7 +25,6 @@
 <!ENTITY video-filters.xml	SYSTEM "video-filters.xml">
 <!ENTITY video.xml		SYSTEM "video.xml">
 ]>
-
 <book id="index" lang="ru">
 <bookinfo id="toc">
 <title>MPlayer - The Movie Player for LINUX</title>
@@ -66,40 +66,11 @@
 � 侑腕輿墟夫訴堙 嗷挂防, 墨塹燮� � 和料簒嵒堙. 縒棉 � �� 徨� 倒� 腕堊棉嗹
 從侑腕�, 彭厠不途� � <link linkend="toc">鑁盟很杜廟</link> � 佻怖不� 堊� 料
 榑� 堙葉, 侑�塢堙 <xref linkend="faq"/>, 斌� 佻俎堊編途� 侑�'grep'佗墮 徳別�.
-</para>
-
-<para>
-臾宋力� 侑宋斌� 榑亙 掴釦妖淋礎鰭: 途棉 湟�-塹 療 掴釦妖淋敏�僧�, 榑� 
-<emphasis>療 嗾歸嘖徼都</emphasis>. 縒棉 � 療 馬從卆, 冒� 墨追厦彖墮 旌嬲
-� TV 埓療卅, 變挿不 榑� 療 從斃�力. 莽墹, 變挿不徒慘賄 墨棉淌嘖從 嗤腕和力嘖�
-墨預瀕敏�壮� 徨吐珍 侑夫都嘖徼都嗔. �挿�. 鑪� �� 佻料掴舵墫� :) � 冒淌嘖彭
-漬嫻惑� 範厦枦馬 嗜彭堊, 佻旌鰐慥� 洋� 侑話不敏�壮� Chris Phillips 冨
-<ulink url="http://mplayerhq.hu/pipermail/mplayer-users/">mplayer-users</ulink>
-卅嗷挂防:
+鄙 堆蒙柎� 涸嘖� 從侑腕� � 料閉T� �彭壅 敖途�, � 腕堊蒙隣�, 料彭厠賄, 孛�
+嗤卅柯彖棉嗹 � 料柯� <link linkend="mailinglists">卅嗷挂冒�</link>. 靤�賭慥�
+<ulink url="http://www.mplayerhq.hu/cgi-bin/htsearch">佻 倉班彖�</ulink>, 把�
+溶嵶� 料編� 洋惑� 壇領亙 瀕届厖礎鰭
 </para>
-
-<blockquote><para>
-酖珍徇� � 馬從夘�, 湟� 嗾歸嘖徼都 卅變秒� 妖崢� 力徂淤詫 � 苗貧塹�. 酖 彖嵶�,
-湟� � 津篇墸不徒慘� 變租堙 � 喇嘖斗� (Linux, 輿柯隣, 津徼柬� :D) � �繚籬
-掴網隣 嗟�� �亙塢 � 泰墮 和濺穆夫隣, 瀕挿� � 蜊蓖 侑腕塹 壞佗蛋. �塁瀕�
-� 墨塹厦� � 嵒徼, 侑田佻盟覗盟 湟� 俎姪嗜� 嗅詫僧, 佻嗚鰐慄� 藁 療 徨喪掀遡
-彭殄. 鑪� 療 攸蔦踊彖盟嗹 佻妖倫墮 仭謀�, 佻嗚鰐慄� 藁� 良墨把� 侑砥津 榑惑�
-療 津盟盟... 霻� 侑腕塹 婆孃腕墮, � 療 療變僧錨... 靆枠賄 變阻詫嘖從 �
-亘簒崚良斗 --- 榑� 療 椀卅彡僧錨 通� �) 姪良 � �) 療彭崚嘖彖. �� 洋惑� 明津�
-腕堊料很夫狙墫� 侑腕塹 孥苗砺 嗅�� "�病冒"... 療洋惑錨 津篇墸不徒慘� 淺堊脊
-嗅�� 佻 糅�� 嘖碗藁� 鍔賄塹淺�.
-
-[I said a while ago that there is such a difference between a newbie and
-a dumbass. No matter what you actually know about a system (linux, cars,
-girls :D) you should ALWAYS be able to take a step back and be objective,
-otherwise, you're just dumb IMHO. A girl i live with assumed the vacuum
-cleaner was broken because it didn't suck things up. never thought to change
-the bag, becasue she'd never done it before... now that's just stupid, not a
-case of simply not knowing what to do... Simply not being that familiar with
-your surroundings is no excuse for a) laziness and b) ignorance. So many
-people seem to see the word "error" and then stop...  few seem to actually
-read the words on the OTHER side of the colon.]
-</para></blockquote>
 </preface>
 
 
@@ -108,7 +79,7 @@
 
 <para>
 <application>MPlayer</application> - 榑� 侑鷲拝掀壮徒� 読蒙溶� 通� LINUX'�
-(卅堆堊都 料 洋惑蛭 漬嫻蛭 UNIX'組 � <emphasis role="bold">non-x86</emphasis>
+(卅堆堊都 料 洋惑蛭 漬嫻蛭 UNIX'組 � <emphasis role="bold">療-x86</emphasis>
 CPU, 嗟. <xref linkend="ports"/>). 鑪 侑鷲拝掀租� 堆蒙柯林墸� MPEG, VOB, AVI,
 OGG/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM,
 RoQ, PVA, Matroska 徳別�, 椀敏叢嗹 料 洋�途墸� "厦栂挌", XAnim'�嗚蛭, RealPlayer'�嗚蛭, �
@@ -131,10 +102,10 @@
 </para>
 
 <para>
-靆電� 療墨姪舵溶 侑鷲拝掀租� 佻徠砥庁領拇 MPEG 徳別� (佻姪變� 通� 療墨塹燮� VCD),
+靆電� 妥� 侑和姪� 侑鷲拝掀租� 佻徠砥庁領拇 MPEG 徳別� (佻姪變� 通� 療墨塹燮� VCD),
 � 藁 侑鷲拝掀租� 侈枠錨 AVI 徳別�, 墨塹燮� 療 侑鷲拝掀狙墫� 冨彭嘖隣� 
 windows media player. 篩崚 AVI 徳別� 妥� 瀕津睦� 况妄脊嗔 侑鷲拝掀租踊揺, �
-� 溶崚堙 徠斗杜力 喞徒壮� 蛭 瀕津睦 � 佻溶毆� 北折� <option>-idx</option>, 斌�
+� 溶崚堙 徠斗杜力 喞徒壮� 瀕津睦 � 佻溶毆� 北折� <option>-idx</option>, 斌�
 佚厖僧杜堽� � 佻溶毆� MEncoder'�, 堊防� 和卅斛� 佻盲淺� 從斃�力嘖� 佚凖妖歔墮嗔
 佻 読蒙葉! 訌� 徂追堙 嘖疎斌慘腕墮 � 冒淌嘖從 - 料病鰐電 彖嵶拇 彭殄,
 力 嗚碗腕墮 堊勃� 冨嬪不徒慘�.
@@ -146,7 +117,7 @@
 (<emphasis role="bold">AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</emphasis>) � 漬嫻錨
 侑鷲拝掀租踊� MPlayer'詫 届厖壮� (嗟. 良崚). 鑪 溶崚� 墨追厦彖墮 堊防揺 卅變挈�
 墨津冒揺, 冒� <emphasis role="bold">DivX4</emphasis> (1 斌� 2 侑枠歪�), libavcodec,
-<emphasis role="bold">PCM/MP3/VBR MP3</emphasis> 旌嬲. 誨詫� 塹馬 � 療馬 侑腕堊� 喇嘖斗�
+<emphasis role="bold">PCM/MP3/VBR MP3</emphasis> 旌嬲. 誨詫� 塹馬 � 療馬 溶殞叢 喇嘖斗�
 侈素瀕� 通� 輿良侖妄檀� 徂津�.
 </para>
 
@@ -188,14 +159,14 @@
   </simpara></listitem>
 <listitem><simpara>
   徃歪料� A/V 喇糧厦良攸檀� (腕力彖料 料 PTS, 溶崚� 泰墮 �北折杜� � 佻溶毆�
-北折� <option>-mc 0</option> )
+  北折� <option>-mc 0</option> )
   </simpara></listitem>
 <listitem><simpara>
   墨厰屠檀� FPS[冒漬�/單�] 北折詫 <option>-ofps</option> (佻姪變� 侑� 墨追厦彖良�
-29.97fps VOB � 24fps AVI)
+  29.97fps VOB � 24fps AVI)
   </simpara></listitem>
 <listitem><simpara>
-  瓶佻蒙斛彖良� 料枦� �杜�  溶殞亙 喇嘖斗� 侈素瀕� (和凖攸良�[crop],
+  瓶佻蒙斛彖良� 料枦� �杜� 溶殞亙 喇嘖斗� 侈素瀕� (和凖攸良�[crop],
 卅營敏杜錨[expand], �卅崚良�[flip], 佻嘖-和卅堆塰�[postprocess],
 佻從厦�[rotate], 輿營堊舵厦彖良�[scale], rgb/yuv 侑渡岱惣�僧頻)
   </simpara></listitem>
@@ -212,7 +183,7 @@
 <title>靆僧敏嫖踊� 從斃�力嘖�</title>
 <listitem><simpara>
   倒� 堆蒙枦� 墨棉淌嘖從 掴嘖孃隣� 届厖壮� 墨追厦彖良�.津墨追厦彖良�
-(嗜敖僧錨 VOB 徳別� � DivX4/Indeo5/VIVO 佻塹冒揺 :)
+  (嗜敖僧錨 VOB 徳別� � DivX4/Indeo5/VIVO 佻塹冒揺 :)
   </simpara></listitem>
 </itemizedlist>
 
--- a/DOCS/xml/ru/edl.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/edl.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.3 -->
 <sect1 id="edl" xreflabel="鯏珍穆敏嫖踊� 嗤瓶防 凖枦良� [Edit Decision Lists] (EDL)">
 <title>鯏珍穆敏嫖踊� 嗤瓶防 凖枦良� [Edit Decision Lists] (EDL)</title>
 
@@ -11,15 +12,15 @@
 <para>
 霻� 佻姪變� 通� 堙�, 穆� 溶崚� 攸範堙墮 佻嗟�凖墮 読蒙� � "單妖蔑詫" 凖嵒妖.
 � 溶崚堙 瓶北折不� 明泰� 侑湾很杜頻 料喇棉�, 療 力厖壮夫力� 姪睦彬�,
-Jar-Jar Binks, � �. �. 冨 読蒙溶�, 嗜和卅旁决� � �柯揺 棉淮挈� 侑田佻湟杜頻揺.
-靉揺溶 榑惑�, 嗾歸嘖徼脊 侑浜杜杜頻, 料侑浜賭 宋塹輿塢淌嗚品 侑椀孑� 凖北鼠�
+<!--XXX-->Jar-Jar Binks, � �. �. 冨 読蒙溶�, 嗜和卅旁决� � �柯揺 棉淮挈� 侑田佻湟杜頻揺.
+靉揺溶 榑惑�, 嗾歸嘖徼脊 漬嫻錨 侑浜杜杜頻, 料侑浜賭 宋塹輿塢淌嗚品 侑椀孑� 凖北鼠�
 侑� 侑腕溶墟� 読蒙溶�.
 </para>
 
 <para>
 耋厖壮 EDL 徳別� 佻冒 槎斗杜堊凖�. 誅把� 喇嘖斗� EDL 掴嘖蒜療� 椀凖津味領亙
-嘖登杜� 攸彭叨N力嘖�, 彭厦冱力 怠津� 腕斈途墸味� 腕力彖領拱 料 XML 届厖壮
-徳別� (侑� 榑詫 嗜頒僧不嗔 嗜徑途塢溶嘖� � 侑田拂斈浜� EDL 届厖壮鼠�).
+嘖登杜� 攸彭叨N力嘖�, 彭厦冱力 怠津� 瓶佻蒙斛彖墮嗔 腕力彖領拱 料 XML 届厖壮
+徳別� (侑� 榑詫 嗜頒僧不嗔 嗜徑途塢溶嘖� � 侑田拂斈浜� 届厖壮鼠� EDL).
 </para>
 
 <para>
@@ -46,15 +47,15 @@
 </programlisting>
 臘� 單釦猟� - 榑� 淺嗅� � 侈宋狙歸� 塹淤亙 (彭歸嘖彭領拇 淺嗅�), � 津篇墸錨 -
 榑� 斌� <literal>0</literal> 通� 侑椀孑冒 斌� <literal>1</literal> 通�
-侑蒜盲枦良�. 靤浜賭:
+攸婆孵杜頻 旌嬲�. 靤浜賭:
 <programlisting>
 5.3   7.1    0
 15    16.7   1
 420   422    0
 </programlisting>
-霻� 忸斛彭� 侑椀孑� � 5.3 單釦猟� 掴 7.1 單釦猟� 徂津�, 攸堙� 攸婆孵不 旌嬲
+霻� 忸斛彭� 侑椀孑� 徂津� � 5.3 單釦猟� 掴 7.1 單釦猟�, 攸堙� 攸婆孵不 旌嬲
 料 15 單釦猟�, 徊明淺� 和卅堽� � 16.7 單釦猟 � 侑椀孑塢� 徂津� � 420 佻 422
-單釦猟�.霻� 津篇墸頻 怠蔦� 侑鷲喩歪不�, 墨把� 堊瞥賭 侑鷲拝掀僧頻 掴嘖蒜療�
+單釦猟�. 霻� 津篇墸頻 怠蔦� 侑鷲喩歪不�, 墨把� 堊瞥賭 侑鷲拝掀僧頻 掴嘖蒜療�
 嬲惣僧隣� � 徳別� 變挿杜品.
 </para>
 
--- a/DOCS/xml/ru/features.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/features.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.2 -->
 <chapter id="features">
 <title>�斃�力嘖�</title>
 
--- a/DOCS/xml/ru/formats.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/formats.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.5 -->
 <sect1 id="formats">
 <title>靉陳賭嵒彖斗拇 届厖壮�</title>
 
 <para>
 �嵶� 卅昊决良墮 歪燐 和殳� �病釦. 誅把� 明追 徂佃� 徳別 � 卅營敏杜錨�
 <filename>.AVI</filename>, 藁� 療妖通杜力 攸北折狙�, 湟� 榑� - 療 MPEG 徳別.
-霻� 療 堊�. � 徨冕詫 嗅孺租 療 佻摸腕墮�. 黎侑�夫 佻侖妄厠詫� 洋杜廟
+霻� 療 堊�. � 徨冕詫 嗅孺租 療 徨吐珍. 黎侑�夫 佻侖妄厠詫� 洋杜廟
 堊墨� 徳別 <emphasis>溶崚�</emphasis> 嗜津雙壮� MPEG 徂津�.
 </para>
 
 <para>
-訌� 徂追堙, <emphasis role="bold">墨津�</emphasis> 療 嗜徙祖租� �
-<emphasis role="bold">届厖壮詫 徳別�</emphasis>.
+訌� 徂追堙, <emphasis role="bold">墨津�</emphasis> &mdash; 榑� 療 塹 崚 啻溶�,
+湟� � <emphasis role="bold">届厖壮 徳別�</emphasis>.
 靤浜賭� 徂津� <emphasis role="bold">墨津墨�</emphasis>: MPEG1, MPEG2, DivX, Indeo5, 3ivx.
 靤浜賭� 徂津� <emphasis role="bold">届厖壮�</emphasis>: MPG, AVI, ASF.
 </para>
@@ -19,11 +20,11 @@
 <para>
 � 堙碗鰭, � 溶崚堙 佻妖嘖不� OpenDivX 徂津� � MP3 奏追� 
 � <emphasis role="bold">徳別 MPG 届厖壮�</emphasis>. 莽墹, 堆蒙柯林墸�
-侈電厦� 療 怠蔦� 榑� 侑鷲拝掀壮�, 佻嗚鰐慄� 藁� �苗狙� MPEG1 徂津� � 
+侈電厦� 療 嗟惑孕 榑� 侑鷲拝壮�, 佻嗚鰐慄� 藁� �苗狙� MPEG1 徂津� � 
 MP2 奏追� (� �棉淺� � 
 <emphasis role="bold">AVI</emphasis>, � <emphasis role="bold">MPG</emphasis>
 療� 燐嵶挌 佻姪� 通� 椀瓶僧頻 吐� 徂津� � 奏追� 佻塹墨�).
-虧� � 怠津堙 忸燐崢杜� 佻妖嘖不� MPEG1 徂津� � AVI 徳別.
+虧� � 溶崚堙 佻妖嘖不� MPEG1 徂津� � AVI 徳別.
 <ulink url="http://ffmpeg.sourceforge.net/">FFmpeg</ulink> �
 <link linkend="mencoder">MEncoder</link> 溶杯� 嗜敖宋壮� 榑� 徳別�.
 </para>
@@ -72,7 +73,7 @@
 椀瓶掀狙歸� 嗜�力枦良� 嘖碗藁 徂津� 佻塹冒. 鄙侑浜賭, 料 SVCD 嗜津雙不嗔
 徂津� 卅斷奴杜錨� 480x480, � 攸馬模從� 孑堊力徂� 吐�(佻姪) � 4:3, 佻榑詫� 榑�
 怠津� 侑鷲拝掀壮慯� 料 640x480. � AVI 徳別組 堊墨馬 佻妄 療�, 佻榑詫� 藁� 掴網隣
-泰墮 嗟喪枹疎敏�僧� 侑� 墨追厦彖良� 斌� 侑鷲拝掀壮慯� � 椀檀妬
+泰墮 輿營堊舵厦彖隣 侑� 墨追厦彖良� 斌� 侑鷲拝掀壮慯� � 椀檀妬
 <option>-aspect</option>.
 </para>
 </sect3>
@@ -85,7 +86,7 @@
 鯀斷疎�僧隣� Microsoft'詫 <emphasis role="bold">AVI (Audio Video Interleaved
 [疸追� �津� '麑錬隣�'])</emphasis> - 榑� 柯厦墨 卅嗤厦嘖卅裡領拱 洋惑話徒砺亙
 届厖壮, � 料嘖湾殄� 溶妖淋 涸歸 徨吐� 侑浜杜囘踊� 通� DivX � DivX4 徂津�.
-� 療馬 洋惑� 冨彭嘖隣� 療掴嘖壮墨� � 津禿穆� (料侑浜賭 � 佻塹冒�). 鑪
+� 療馬 洋惑� 冨彭嘖隣� 療掴嘖壮墨� � 療掴泯塹� (料侑浜賭 � 佻塹冒�). 鑪
 佻陳賭嵒彖都 1 徂津� 佻塹� � � 0 掴 99 奏追� 佻塹墨� � 溶崚� 泰墮 療 堆姪�
 2 臑, 範墹 嗾歸嘖徼都 卅營敏杜錨<emphasis role="bold">OpenDML</emphasis>,
 掴侖嗚狙歸� 堆蒙柯� 徳別�. � 料嘖湾殄� 溶妖淋 Microsoft 喇蒙力 �馬彖夘彖都 �
@@ -193,7 +194,7 @@
 苗孕 � 卅營敏杜錨� <filename>.MPG</filename> 斌� <filename>.MP4</filename>
 (蚓堙凖嗄�, 湟� 徂津� � 奏追� 佻塹防 � 榑蛭 徳別組 - 料嘖湾殄�
 MPG � AAC 徳別�. � 珍崚 溶崚堙 冨很党� 蛭, 瓶佻蒙旁� 椀檀�
-<option>-dumpvideo</option> b <option>-dumpaudio</option>.).
+<option>-dumpvideo</option> � <option>-dumpaudio</option>.).
 </para>
 
 <note>
@@ -213,14 +214,14 @@
 <application>MPlayer</application> 孑佚枸� 津葉蒙塢侈屠喇簒都 VIVO 届厖壮�
 徳別�. 鑁厦洋拱 療掴嘖壮亘 榑惑� 届厖壮� 攸北折租墫� � 塹�, 湟� � 療� 療�
 良 瀕津睦隣� 駄亘�, 良 読睦敏�僧力馬 卅斃賭� 仭謀塹� 斌� 汰編� 喇糧厦良攸檀�
-� � 堆蒙柯林墸� 徳別� 療� 珍崚 腕力徇挌 冒漬�[keyframes], 堊� 湟� 攸怠椿堙
+� � 堆蒙柯林墸� 徳別� 療� 珍崚 北折砺挌 冒漬�[keyframes], 堊� 湟� 攸怠椿堙
 � 佚凖妖歸良� 佻 徳別�!
 </para>
 
 <para>
 �津� 墨津� � VIVO/1.0 徳別組 - 榑� 嘖僧珍參隣� <emphasis role="bold">h.263</emphasis>.
 �津� 墨津� � VIVO/2.0 徳別組 - 榑� 溶追読檀厦彖領拱, 療嘖僧珍參隣�
-<emphasis role="bold">h.263v2</emphasis>. 疸追� 歪瀕阻�賄, 榑� 溶崚� 泰墮
+<emphasis role="bold">h.263v2</emphasis>. 疸追� � 和鷲� 届厖壮組 歪瀕阻�賄, 榑� 溶崚� 泰墮
 <emphasis role="bold">g.723 (嘖僧珍參)</emphasis>, 斌�
 <emphasis role="bold">Vivo Siren</emphasis>.
 </para>
@@ -267,8 +268,8 @@
 <ulink url="http://mars.tuwien.ac.at/~roman/nuppelvideo">NuppelVideo</ulink> -
 榑� 嘔田嘖從 攸盤壮� � � (AFAIK:). <application>MPlayer</application> 溶崚�
 淺堊墮 吐� <filename>.NUV</filename> 徳別� (塹蒙墨 NuppelVideo 5.0). 霻� 徳別�
-溶杯� 嗜津雙壮� 療嗽壮拇 YV12, YV12+RTJpeg 嗽壮拇, YV12 RTJpeg+lzo 嗽壮拇 �
-YV12+lzo 嗽壮拇 冒漬�. <application>MPlayer</application> 津墨追簒都 (� 堊勃�
+溶杯� 嗜津雙壮� 療嗽壮拇 YV12, YV12+嗽壮拇 RTJpeg, YV12 嗽壮拇 RTJpeg+lzo �
+YV12 + 嗽壮拇 lzo 冒漬�. <application>MPlayer</application> 津墨追簒都 (� 堊勃�
 <emphasis role="bold">墨追簒都</emphasis> 蛭 <application>MEncoder
 </application>'詫 � DivX/� �. �.!) 徨� 榑�. 霤凖妖歸良� 卅堆堊都.
 </para>
@@ -309,10 +310,10 @@
 <title>OGG/OGM 徳別�</title>
 <para>
 霻� 力忸� 届厖壮 徳別� � <ulink url="http://www.xiph.org">Xiphophorus</ulink>.
-鑪 溶崚� 嗜津雙壮� 明堆� 徂津� 斌� 奏追� 墨津�, CBR 斌� VBR. �� 佻料掴耐墫�
-孑堊力很杜隣� <systemitem class="library">libogg</systemitem> �
-<systemitem class="library">libvorbis</systemitem> 掴 墨熔斌冀鰭 
-<application>MPlayer</application>'�, 湟和� 侑鷲拝掀壮� 榑� 徳別�.
+鑪 溶崚� 嗜津雙壮� 明堆� 徂津� 斌� 奏追� 墨津�, CBR 斌� VBR. �� 佻料掴耐墫�,
+湟和� <systemitem class="library">libogg</systemitem> �
+<systemitem class="library">libvorbis</systemitem> 泰棉 孑堊力很杜� 掴 墨熔斌冀鰭 
+<application>MPlayer</application>'�, 湟和�  浜都� 從斃�力嘖� 侑鷲拝掀壮� 榑� 徳別�.
 </para>
 </sect3>
 
@@ -322,7 +323,7 @@
 <para>
 <ulink url="ftp://ftp.rfc-editor.org/in-notes/rfc2327.txt">SDP</ulink> - 榑�
 IETF 嘖僧珍參隣� 届厖壮 通� 椀瓶僧頻 徂津� � 奏追� RTP 佻塹墨�.
-(墟殿媽墫� &quot;<ulink url="http://www.live.com/mplayer/">LIVE.COM Streaming Media</ulink>&quot;.)
+(墟殿嫖墫� &quot;<ulink url="http://www.live.com/mplayer/">LIVE.COM Streaming Media</ulink>&quot;.)
 </para>
 </sect3>
 
@@ -389,8 +390,8 @@
 <application>MPlayer</application> - 榑� 侑鷲拝掀壮徒�
 <emphasis role="bold">読蒙溶�</emphasis>, � 療
 <emphasis role="bold">妖追�</emphasis> 侈電�, 範墹 藁 溶崚� 侑鷲拝掀壮�
-療墨塹燮� 届厖壮� 奏追� 徳別� (藁� 佚凖淺嗅杜� 良崚). 霻� 療 凖墨妖猟嫖溶�
-侑浜杜杜錨 <application>MPlayer</application>, �� 盲渟� 瓶佻蒙斛彖墮 <ulink
+療墨塹燮� 届厖壮� 奏追� 徳別� (藁� 佚凖淺嗅杜� 良崚). 霻� 療 况妄都嗔 凖墨妖猟嫖踊�
+侑浜杜杜錨� <application>MPlayer</application>'�, �� 盲渟� 瓶佻蒙斛彖墮 <ulink
 url="http://www.xmms.org">XMMS</ulink>.
 </para>
 
@@ -400,8 +401,8 @@
 � �� 溶杯� 從變彬燐墮 侑和姪踊 侑� 侑鷲拝掀僧鰭 療墨塹燮� MP3 徳別�, 墨塹燮�
 <application>MPlayer</application> 怠津� 療彭厠� 椀凖津妄墮, 冒� MPEG'� �
 侑鷲拝掀壮� 療侑宋斌慘� 斌� 從和歸 良冒�. 霻� 療 溶崚� 泰墮 瓶侑宋姪力 妥�
-佻堙夘 佻陳賭嵋� 療墨塹燮� 侈枠蛭 MPEG 徳別� � 佻榑詫� 徨� 腕堊療墫� 冒� 途墮
-和�夘溶� 怠蔦歸�. 鑰檀� <option>-demuxer</option>, 椀瓶僧料� 料 man 嘖卅良壇
+佻堙夘 佻陳賭嵋� 療墨塹燮� 侈枠蛭 MPEG 徳別� � 佻榑詫� 徨� 腕堊療墫� 冒� 途墮
+和�夘溶� 怠蔦歸�. 鑰檀� <option>-demuxer</option>, 椀瓶僧料� 料 man 嘖卅良壇,
 溶崚� �� 佻溶渫 � 榑詫 嗅孺租.
 </para>
 </sect3>
@@ -453,7 +454,7 @@
 <para>
 <application>MPlayer</application> 溶崚� 瓶佻蒙斛彖墮
 <application>XMMS</application>
-卅營敏杜頻 通� 忻歪�<!-- 旌孺不 嶮塰�, 力 榑� - 佚凖從� 冨 XMMS :) -->, 湟和�
+卅營敏杜頻 通� 忻歪�<!-- 旌孺不 嶮塰�壮�, 力 榑� - 佚凖從� 冨 XMMS :) -->, 湟和�
 侑鷲拝掀壮� 洋�途墸� 届厖壮� 徳別�. 黎歸嘖徼脊 卅營敏杜頻 通� 侑鷲拝掀僧頻
 妖模追� 冨 SNES 蒜�, SID 妖模追� (冨 Commodore 64), 洋�途墸� Amiga 届厖壮�,
 .xm, .it, VQF, musepack, Bonk, shorten � 洋�途墸� 漬嫻蛭. �� 榑� � 溶崚堙
--- a/DOCS/xml/ru/history.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/history.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="KOI8-R"?>
+<!-- synced with 1.5 -->
 <!-- FIXME: history really should be in the appendix -->
 <sect1 id="history">
 <title>蚌塹夘�</title>
@@ -17,7 +18,7 @@
 <itemizedlist>
 <listitem><para>
   <emphasis role="bold">mpg12play v0.1-v0.3:</emphasis> Sep 22-25, 2000</para>
-  <para>霤叟叢 佻俎塰�, 徨牧捏� 徑途堙 攸 佻勿喪�!
+  <para>霤叟叢 佻俎塰�, 嗜敖宋遡喪� 佻勿喪�!
   蚌佻蒙斛彖盟嗹 libmpeg3 � www.heroinewarrior.com 掴 彭厶鰭 0.3,
   力 堊� 泰棉 侑和姪踊 � 冒淌嘖從� 冨和卅崚良� � 嗚碗腕墮�.
   </para></listitem>
@@ -30,20 +31,15 @@
 <listitem><para>
   <emphasis role="bold">mpg12play v0.9-v0.95pre5:</emphasis> Oct 21-Nov 2, 2000</para>
   <para>
-  Mpeg 墨津� 泰� libmpeg2 (mpeg2dec) � Aaron Holtzman &amp; Michel Lespinasse.
-  霻� 侑砺腕範栂拱, 椀塢揺敝厦彖領拱 �杜� 泰嘖燮� C 墨� � 嗜彭叨杜隣� 冒淌嘖從�
+  Mpeg 墨津� 泰� libmpeg2 (mpeg2dec) � Aaron Holtzman � Michel Lespinasse.
+  霻� 侑砺腕範栂拱, �杜� 範厦柤 椀塢揺敝厦彖領拱 C 墨� � 嗜彭叨杜隣� 冒淌嘖從�
   冨和卅崚良� � 100% 嗜徑途塢溶嘖慇 � MPEG 嘖僧珍參詫.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">MPlayer v0.01:</emphasis> Nov 11, 2000</para>
-  <para>
-霤叟拱 MPlayer.
-  </para></listitem>
-<listitem><para>
   <emphasis role="bold">MPlayer v0.3-v0.9:</emphasis> Nov 18-Dec 4, 2000</para>
   <para>
 霻� 泰� 料堆� 鍔嬌 侑惑卅様: mpg12playv0.95pre6 � 溶吐� 力從馬 侑腕塹馬 AVI
-侈電卅 'avip' 汰敝簒摂浜嗔 料 avifile 攸拝孳淺謀 Win32 DLL.
+侈電卅 'avip' 汰敝簒摂吐腕� 料 avifile 攸拝孳淺謀 Win32 DLL.
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">MPlayer v0.10:</emphasis> Jan 1, 2001</para>
@@ -54,29 +50,29 @@
   <emphasis role="bold">MPlayer v0.11pre series:</emphasis></para>
   <para>
 靤瓶賄追良棉嗹 療墨塹燮� 力忸� 卅斷疎�淺防 � � 彭厶鰭 0.11 侑賄穆 mplayer
-榑� 卅堆堊 墨輿猟�! 簣汰很杜� 佻陳賭嵋� .ASF 徳別�, � OpenDivX
+榑� 墨輿猟料� 卅斷疎�冒! 簣汰很杜� 佻陳賭嵋� .ASF 徳別�, � OpenDivX
 (嗟. www.projectmayo.com) 墨津�/津墨津�
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">MPlayer v0.17a "The IdegCounter"</emphasis> Apr 27, 2001</para>
   <para>
-鯏棉� 侑�-彭厶鰭 0.11pre 佻嗅� 4 妖嗔壇� 料侑冰N力� 卅斷疎�防!
-靉侑和嬖堙 榑� � 冨嬪不途�! 簣汰很杜� 壅嗔淺 力忸� 腕和杜力嘖妬... � 墨療淮�
-嘖倉拱 墨� 泰� 堊勃� 嫐孺枦�, 瓶侑宋姪隣 �病防 � �.�.
+鯏棉� 彭厶鰭 0.11pre 佻嗅� 4 妖嗔壇� 料侑冰N力� 卅斷疎�防!
+靉侑和嬖堙 吐� � 冨嬪不途�! 簣汰很杜� 壅嗔淺 力忸� 腕和杜力嘖妬... � 墨療淮�
+嘖倉拱 墨� 泰� 嫐孺枦�, 瓶侑宋姪隣 �病防 � �.�.
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">MPlayer 0.18 "The BugCounter"</emphasis> Jul 9, 2001</para>
   <para>
-2 妖嗔蛋 � 0.17 � 敖途� 力忸� 凖棉�.. 暠彭叨杜� 佻陳賭嵋� ASF,
+靤�模 2 妖嗔蛋 嗜 徠斗N 0.17 � 從� �� 力忸� 凖棉�.. 暠彭叨杜� 佻陳賭嵋� ASF,
 堆蒙枦 届厖壮� 嗾待不厦�, 侑田嘖宋姪料 libao (佻掴体� libvo 力 通� 奏追�),
-珍崚 堆姪� 嘖疎斌杜 淌� 卅輪枦, � 堊� 珍姪�. 霻� �繧阯瘤蜈!
+珍崚 堆姪� 嘖疎斌杜 淌� 卅輪枦, � 堊� 珍姪�. 霻� 療和範追溶!
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">MPlayer 0.50 "The Faszom(C)ounter"</emphasis> Oct 8, 2001</para>
   <para>
 萢�. 麥�� 凖棉�. �領� 力忸� 從斃�力嘖妬, 妥堊 彭厶頻 GUI, 瓶侑宋姪隣
-�病防, 力忸� vo � ao 漬訴彭卅, 佻參� 從 洋惑錨 喇嘖斗�, 徊明涸� DivX
-墨津� � �牧捏挈� 瓶範栂彬鼠� � 洋惑� 漬嫻蛭. 靉侑和嬖堙 吐�!
+�病防, 力忸� vo � ao 漬訴彭卅, 佻參� 從 洋惑錨 喇嘖斗�, 徊明泯� DivX
+墨津� � �牧捏挈� 瓶範栂彬鼠� � 洋惑賄 漬嫻賄. 靉侑和嬖堙 吐�!
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">MPlayer 0.60 "The RTFMCounter"</emphasis> Jan 3, 2002</para>
--- a/DOCS/xml/ru/html-single.xsl	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/html-single.xsl	Mon Sep 22 08:20:53 2003 +0000
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- ***************************************************
-     This file is generated automatically.  DO NOT EDIT.
-     *************************************************** -->
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
   <xsl:import href="../html.xsl"/>
   <xsl:param name="chunker.output.encoding" select="'KOI8-R'"/>
-  <!--<xsl:output encoding="KOI8-R"/>-->
 
-  <!-- This forces saxon to output chars from KOI8-R as is and not something like &#444;
+  <!-- This forces Saxon to output chars from KOI8-R as is and not as something like &#444;
     WARNING: This will probably work with HTML output, and won't with output XML.
     Anyway, this file will generate only HTML :)
     -->
--- a/DOCS/xml/ru/html.xsl	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/html.xsl	Mon Sep 22 08:20:53 2003 +0000
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- ***************************************************
-     This file is generated automatically.  DO NOT EDIT.
-     *************************************************** -->
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
   <xsl:import href="../html.xsl"/>
   <xsl:param name="chunker.output.encoding" select="'KOI8-R'"/>
-  <!--<xsl:output encoding="KOI8-R"/>-->
 
-  <!-- This forces saxon to output chars from KOI8-R as is and not something like &#444;
+  <!-- This forces Saxon to output chars from KOI8-R as is and not as something like &#444;
     WARNING: This will probably work with HTML output, and won't with output XML.
     Anyway, this file will generate only HTML :)
     -->
--- a/DOCS/xml/ru/install.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/install.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="KOI8-R"?>
+<!-- synced with 1.11 -->
 <sect1 id="install">
 <title>�堊力徊�</title>
 
@@ -30,14 +31,14 @@
   <emphasis role="bold">2.95.3</emphasis> (溶崚� 泰墮 <emphasis role="bold">2.95.4</emphasis>)
 � <emphasis role="bold">3.2+</emphasis>.
 <emphasis role="bold">鉗謠舮�</emphasis> 療 瓶佻蒙旁編� 2.96 斌� 3.0.x! 鑪� 播療夘簒脊 �病�隣� 墨� 
-通� <application>MPlayer'�</application>. 縒棉 � 凖柯堙 冨妖良墮 gcc � 彭厶鰭 2.96, 塹 療 凖杼編�
+通� <application>MPlayer'�</application>. 縒棉 � 凖柯堙 冨妖良墮 gcc � 彭厶鰭 2.96, 塹 療 侑瀕浜訴堙 凖枦良�
 � 料侑宋姪良� 3.x 塹蒙墨 佻嗚鰐慄� 藁 力彭�. 鯀領錨 凖棉旛 3.x 嗜津雙遡� 倒�
 堆蒙枦 �病亘, 淌� 2.96. �� 湟� 嘖宋慥� 2.95.x (佻嘖宋慥� 堊勃� 堆姪� 嘖倉媽
 libstdc++, 榑� 溶崚� 佻墟殿�壮慯� 通� 漬嫻蛭 侑惑卅様) 斌� 從和歸 良淌馬
 療 妖倫編� (力 � 榑詫 嗅孺租 侑蒜��慥途� � 侑和姪輿� 從 徠斗� 卅堆壅).
-縒棉 � 凖柯堙 � 嘖碗藁� 3.x, 佻侑和嬖堙 瓶佻蒙斛彖墮 佻嗅田寮� 彭厶廟,
-� 卅領蛭 凖棉攸� 泰棉 卅斂扶隣� 汰派, 堊� 湟� 瓶佻蒙旁編� 揺良葉� 3.1, 榑�
-侑�途塢厦彖力 � 卅堆堊都. 簗� 津堊蒙力� 瀕届厖礎鰭 � 汰覗� � gcc 2.96
+縒棉 � 凖柯堙 瓶佻蒙斛彖墮 3.x, 佻侑和嬖堙 瓶佻蒙斛彖墮 佻嗅田寮� 彭厶廟,
+� 卅領蛭 凖棉攸� 泰棉 卅斂扶隣� �病防/侑和姪踊, 堊� 湟� 瓶佻蒙旁編� 揺良葉� 3.1, 榑�
+侑�途塢厦彖領� � 卅堆堊都. 簗� 津堊蒙力� 瀕届厖礎鰭 � 汰覗� � gcc 2.96
 (墨塹燮� 徨� 倒� 鈬 瓶侑宋姪隣, � "閧闃粤銷"[WORKED AROUND] � <application>MPlayer'�</application>!),
 嗟. <link linkend="gcc-296">gcc 2.96</link> � 
   <xref linkend="faq"/>.
@@ -45,9 +46,9 @@
 <listitem><para>
   <emphasis role="bold">XFree86</emphasis> - 凖墨妖猟嫖輿� 彭厶頻 - 榑� <emphasis role="bold">徨吐珍 力彭弁叢 (4.3)</emphasis>.
 鐶掵力, 徨� 榑惑� 範墹�, 佻嗚鰐慄� 料淺料� � 4.0.2, XFree86 嗜津雙壮
-<link linkend="xv">XVideo</link> 卅營敏杜錨 (墨�-把� 孃詫瀕租溶�, 冒�
+<link linkend="xv">XVideo</link> 卅營敏杜錨 (瀕惑珍 孃詫瀕租溶�, 冒�
 <emphasis role="bold">Xv</emphasis>) 墨塹厦� 墟殿嫖墫� 通� 徊明淌良� 双仭卅堽亙 YUV 阻單姪卅檀� (泰嘖燮�
-忸從� 冨和卅崚良� 料 冒參組, 墨塹燮� 榑� 佻陳賭嵒彖脊.</para>
+忸從� 冨和卅崚良� 料 徂津亘倉堊�, 墨塹燮� 榑� 佻陳賭嵒彖脊.</para>
   <para>
 瞠椿堙 孥賭杜�, 湟� <emphasis role="bold">仭謀� 卅斷疎�防</emphasis> 堊勃� 孑堊力很杜, 瀕挿� 榑�
 療 怠津� 卅堆堊墮.</para>
@@ -56,7 +57,7 @@
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">make</emphasis> - 凖墨妖猟嫖輿� 彭厶頻 - 榑� <emphasis role="bold">徨吐珍 力彭弁叢</emphasis> (揺良葉�
-3.79.x). 鐶掵力 榑� 彖嵶�.
+3.79.x). 鐶掵力 榑� 療 �杜� 彖嵶�.
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">SDL</emphasis> - 榑� 療 和凉壮徒慘�, 力 溶崚� 佻溶渫 � 療墨塹燮� 嗅孺叢�
@@ -66,7 +67,7 @@
 <listitem><para>
   <emphasis role="bold">libjpeg</emphasis> - 療和凉壮徒慘拱 津墨津� JPEG,
   瓶佻蒙旁斗拱 -mf � 療墨塹燮揺 QT MOV 徳別鼠�. 靉姪敕� 通�
-  <application>MPlayer'�</application> � <application>MEncoder'�</application>,
+  <application>MPlayer</application>'� � <application>MEncoder</application>'�,
   途棉 � 侈僧敏嫖堙 卅堆堊墮 � jpeg 徳別鼠�.
   </para></listitem>
 <listitem><para>
@@ -79,7 +80,7 @@
 凖墨妖猟嫖輿� 彭厶頻 - 榑� <emphasis role="bold"> 徨吐珍 力彭弁叢</emphasis> (冒� 揺良葉� 3.90).
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">libogg</emphasis> - 療和凉壮徒慘�, 療和範追溶 通� 侑鷲拝掀僧頻 OGG 届厖壮� 徳別�.
+  <emphasis role="bold">libogg</emphasis> - 療和凉壮徒慘�, 療和範追溶 通� 侑鷲拝掀僧頻 徳別� 届厖壮� OGG.
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">libvorbis</emphasis> - 療和凉壮徒慘�, 療和範追溶 通� 侑鷲拝掀僧頻 OGG Vorbis 奏追�.
@@ -89,7 +90,7 @@
 - 療和凉壮徒慘�, 療和範追溶 通� 侑鷲拝掀僧頻 RTSP/RTP 佻塹墨�.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">directfb</emphasis> - 療和凉壮徒慘�, 冨
+  <emphasis role="bold">directfb</emphasis> - 療和凉壮徒慘�, 料
 <ulink url="http://www.directfb.org">http://www.directfb.org</ulink>
   </para></listitem>
 <listitem><para>
@@ -118,8 +119,8 @@
   <emphasis role="bold">libavcodec</emphasis>: 霻� 仭謀� 墨津墨� 嗤腕和杜 津墨追厦彖墮 
 H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/SVQ1/SVQ3-墨追厦彖領拇 徂津� 佻塹防 �
 WMA (Windows Media Audio) v1/v2 奏追� 佻塹防, 料 洋惑蛭 侈壮届厖組.
-鑪 堊勃� 冨彭嘖杜 冒� 泰嘖凖弁品 通� 榑亙 攸珍淺.
-麝. <link linkend="ffmpeg">榑� 單肪廟</link> 通� 佻漬和力嘖妬.
+鑪 堊勃� 冨彭嘖杜 冒� 泰嘖凖弁品 墨津� 通� 榑蛭 攸珍�.
+靉漬和力嘖� 嗟. � <link linkend="ffmpeg">榑亙 單肪鰭</link>.
 鑽和杜力嘖�:
   <itemizedlist>
   <listitem><simpara>
@@ -140,8 +141,8 @@
 <ulink url="http://www.mplayerhq.hu/MPlayer/releases/codecs/">嘖卅良遅 墨津墨�</ulink>
 � 孑堊力徂堙 蛭 � <filename class="directory">/usr/local/lib/codecs</filename> <emphasis role="bold">粹</emphasis> 墨熔斌冀鰭 <application>MPlayer'�</application>,
 瀕挿� 佻陳賭嵋� Win32 怠津� �北折杜�!
-<note><para>� 侑賄穆� avifile 佻範嵒� 料堆� 墨津墨�, 力 藁 �棉涸都嗔 � 料枦馬.
-  縒棉 � 範塢堙 瓶佻蒙斛彖墮 徨� 佻陳賭嵒彖斗拇 墨津防, 塹把� 佻嘖宋慥� 料�
+<note><para>� 侑賄穆� avifile 佻範嵒� 料堆� 墨津墨�, 力 藁 �棉涸都嗔 � 料枦馬,
+  佻榑詫�, 途棉 � 範塢堙 瓶佻蒙斛彖墮 徨� 佻陳賭嵒彖斗拇 墨津防, 塹把� 佻嘖宋慥� 料�
   仭謀� (療 妥嗤亘亙堙嗹, avifile 卅堆堊都 � 良揺 妥� 侑和姪�).</para>
   </note>
 鑽和杜力嘖�:
@@ -170,7 +171,7 @@
   </para></listitem>
 <listitem><para>
   <emphasis role="bold">DivX4/DivX5</emphasis>: 瀕届厖礎頻 和 榑詫 墨津謀 卅嗤鰐�杜� � 
-<link linkend="divx4-5">單肪鰭DivX4/DivX5</link>. ��, 彭厦冱力, 療 佻墟殿嫖墫�
+<link linkend="divx4-5">單肪鰭 DivX4/DivX5</link>. ��, 彭厦冱力, 療 佻墟殿嫖墫�
 榑� 墨津�, 佻嗚鰐慄� <emphasis role="bold">libavcodec</emphasis> (嗟. 忸枦)
 馬卅敖� 泰嘖凖� � 忸枦 冒淌嘖從�, 淌� 榑� 墨津�, 冒� 通� 墨追厦彖良�, 堊� � 通�
 津墨追厦彖良�. 鑽和杜力嘖�:
@@ -197,17 +198,17 @@
   吐� 瓶範栂拱 墨� �牧捏, 佻榑詫� 藁 洋惑椀盟堝碗妖療�.
   </simpara></listitem>
 <listitem><simpara>
-  藁 佻厮痛� 2 卅� 泰嘖凖�, 淌� DivX4 侑� 墨追厦彖良� - 侑浜賭力 堊墨� 崚
+  藁 把�-塹 卅攸 � 2 泰嘖凖�, 淌� DivX4 侑� 墨追厦彖良�, 侑� 侑浜賭力 堊墨� 崚
 冒淌嘖從
   </simpara></listitem>
 </itemizedlist>
 </para></listitem>
 <listitem><para>
   <link linkend="xanim">XAnim'�嗚錨 墨津防</link> - 盲渟錨 (佻摸拱 榾卅�,
-双仭卅堽拱 YUV 輿營堊�) 通� 津墨追厦彖良� <emphasis role="bold">3ivx</emphasis> � Indeo 3/4/5 読蒙溶�,
+双仭卅堽賄 YUV 輿營堊舵厦彖良�) 通� 津墨追厦彖良� <emphasis role="bold">3ivx</emphasis>, Indeo 3/4/5 読蒙溶�,
 � 療墨塹燮� 嘖倉挌 届厖壮�. � 藁� 洋惑椀盟堝碗妖領拇, 佻榑詫� 榑� 田瀕嘖彭領拱
 嗤腕和 侑鷲拝掀壮� Indeo 料 療-x86 侈壮届厖組 (燐, 牧詫� 冒� 瓶佻蒙斛彖墮
-Xanim:). 醢 � 侑浜賭�, Cinepak 読蒙踊 盲渟� 侑鷲拝掀狙墫� � 碗蒜瀕遡慘挈
+Xanim:). 醢, � 侑浜賭�, Cinepak 読蒙踊 盲渟� 侑鷲拝掀狙墫� � 碗蒜瀕遡慘挈
 MPlayer'�嗚浜 津墨津厦�!
   </para></listitem>
 <listitem><para>
@@ -291,20 +292,20 @@
 簗� 佻漬和力嘖妬, 嗟. 單肪廟 <link linkend="vidix">VIDIX</link>.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">簟嫻錨 冒參�</emphasis>: 酩淌馬 冨 忸枦佚凖淺嗅杜力馬?
+  <emphasis role="bold">簟嫻錨 冒參�</emphasis>: 酖 孃詫冦孕� 忸枦?
 <itemizedlist>
 <listitem><simpara>
   靤�賭慥�, 佻陳賭嵒彖都 棉 XFree86 漬訴彭� (� �杼 冒參�) 双仭卅堽媽
-阻單姪卅檀�. 麝. <link linkend="xv">單肪廟 Xv</link> 通� 佻漬和力嘖妬.
+阻單姪卅檀�. 靉漬和力嘖� 嗟. � <link linkend="xv">單肪鰭 Xv</link>.
   </simpara></listitem>
 <listitem><simpara>
-  縒棉 療�, 塹 徂津��溶嵶腕塢 �枦� 冒參� 療 佻陳賭嵒彖脊嗔 佻� �枦�
+  縒棉 療�, 塹 從斃�力嘖� �枦� 徂津亘倉壅 療 佻陳賭嵒彖脊嗔 佻� �枦�
 椀賭礎貧領亙 喇嘖斗亙 :(
     縒棉 双仭卅堽叢 阻單姪卅檀� 卅堆堊都 佻� Windows, 榑� 療 變挿不, 湟�
 	藁� 怠津� 卅堆堊墮 佻� Linux 斌� 瀕亙 椀賭礎貧領亙 喇嘖斗亙: 榑� 攸徂喇�
 	� 漬訴彭卅. 睿蒙柯林墸� 侑鷲旌歪不徒妬 療 津盟脊 Linux'�挌 漬訴彭厦�
 	� 療 卅嗤厦嘖卅倫脊 嗤澱鋲彬礎鰭 通� 蛭 淺佻�, 佻榑詫� �� 療 佻彭斂�,
-	湟� � 瓶佻蒙旁都� 蛭 冒參�. 麝. '酖-YUV 冒參�'.
+	湟� � 瓶佻蒙旁都� 蛭 冒參�. 麝. <xref linkend="non-yuv-cards"/>.
   </simpara></listitem>
 </itemizedlist>
 </para></listitem>
@@ -326,9 +327,9 @@
 椀檀� <option>-vm</option> � 卅堆堊都 嗜 嗅田媽殄揺 漬訴彭卅揺:
 <itemizedlist>
 <listitem><simpara>
-  <emphasis role="bold">瓶佻蒙旁�</emphasis> XFree86: 嗟 單肪鰭
+  <emphasis role="bold">瓶佻蒙旁�</emphasis> XFree86: 佻漬和力嘖� 嗟. � 單肪頻�
 <link linkend="dga">DGA 漬訴彭�</link> �
-<link linkend="x11">X11 漬訴彭�</link> 通� 佻漬和力嘖妬. 鯏墨妖猟嫖墫� DGA !
+<link linkend="x11">X11 漬訴彭�</link>. 鯏墨妖猟嫖墫� DGA !
 �勃� 佻侑和嬖堙 瓶佻蒙斛彖墮 DGA 淌凖� SDL, 瀕惑珍 榑� 盲渟�.
   </simpara></listitem>
 <listitem><simpara>
@@ -347,31 +348,31 @@
 <title>Cirrus Logic 冒參�</title>
 <itemizedlist>
 <listitem><para>
-  GD 7548: 孑堊力很杜� � 堙嘖敏�遡喪� � 力孕怠冒� 單夘� Compaq Armada 41xx.
+  GD 7548: 孑堊力很杜� 料 輿堙夘林墨� 侈壮� � 堙嘖敏�遡喪� � 力孕怠冒� 單夘�
+  Compaq Armada 41xx.
   <itemizedlist>
-<listitem><simpara>
-  XFree86 3: 卅堆堊都 � 8/16bpp 凖嵒輿�. 莽墹, 漬訴彭� �杜� 妖通杜隣� �
-	    播療夘簒都 �病防 � 凖嵒妖 800x600@16bpp.
-<emphasis role="bold">鯏墨妖猟嫖墫�: 640x480@16bpp</emphasis>
+  <listitem><simpara>
+    XFree86 3: 卅堆堊都 � 8/16bpp 凖嵒輿�. 莽墹, 漬訴彭� �杜� 妖通杜隣� �
+    播療夘簒都 �病防 � 凖嵒妖 800x600@16bpp.
+    <emphasis role="bold">鯏墨妖猟嫖墫�: 640x480@16bpp</emphasis>
   </simpara></listitem>
-<listitem><simpara>
-  XFree86 4: Xserver 攸溶卅嵒彖都嗔 徨墨凖 佻嗅� 嘖倉堊, 途棉 阻單姪卅檀�
-	    療 �北折杜�, 力 塹把� 徨� 嘖僧�不嗔 妖通杜療�, 淌� 佻� XFree86 3.
-	    酖� XVideo.
+  <listitem><simpara>
+    XFree86 4: Xserver 攸溶卅嵒彖都嗔 徨墨凖 佻嗅� 嘖倉堊, 途棉 阻單姪卅檀�
+    療 �北折杜�, 力 塹把� 徨� 嘖僧�不嗔 妖通杜療�, 淌� 佻� XFree86 3.
+    酖� XVideo.
   </simpara></listitem>
-<listitem><simpara>
-  FBdev: 寅妬預嫺賭[framebuffer - 冒漬�拱 怠禿�] 溶崚� 泰墮 徊明泯� <option>clgenfb</option>
-	    漬訴彭厦� � 冂凖, 範墹 通� 妖倫 榑� 卅堆堊模 塹蒙墨 侑� 8bpp, �
-	    佻榑詫�, 療侑蒜歪力. 蚌範栂拱 墨� 掴網杜 泰墮 卅營敏杜 7584 ID
-	    掴 墨熔斌冀鰭.
+  <listitem><simpara>
+    FBdev: 寅妬預嫺賭[framebuffer - 冒漬�拱 怠禿�] 溶崚� 泰墮 徊明泯� <option>clgenfb</option>
+    漬訴彭厦� � 冂凖, 範墹 通� 妖倫 榑� 卅堆堊模 塹蒙墨 侑� 8bpp, � 佻榑詫�
+    療侑蒜歪力. � 瓶範栂拱 墨� 掴 墨熔斌冀鰭 掴網杜 泰墮 掴汰很杜 7584 ID
   </simpara></listitem>
-<listitem><simpara>
-  VESA: 冒參� 嗜徑途塢輿 塹蒙墨 � VBE 1.2, 佻榑詫� VESA 忸從� 療 溶崚�
-	    瓶佻蒙斛彖墮嗔. 酖 溶崚� 泰墮 和亙津力 � UniVBE.
+  <listitem><simpara>
+    VESA: 冒參� 嗜徑途塢輿 塹蒙墨 � VBE 1.2, 佻榑詫� VESA 忸從� 療 溶崚�
+    瓶佻蒙斛彖墮嗔. 酖 溶崚� 泰墮 和亙津力 � UniVBE.
   </simpara></listitem>
-<listitem><simpara>
-  SVGAlib: 椀凖津妄都 堆姪� 嘖倉拱 Cirrus 淺�. 鯀堆堊都, 力 妖通杜力 �
-	  <option>-bpp 8</option>.
+  <listitem><simpara>
+    SVGAlib: 椀凖津妄都嗔 冒� 堆姪� 嘖倉拱 Cirrus 淺�. 鯀堆堊都, 力 妖通杜力 �
+    <option>-bpp 8</option>.
   </simpara></listitem>
 </itemizedlist>
 </para></listitem>
@@ -386,19 +387,19 @@
 <itemizedlist>
 <listitem><simpara>
   <emphasis role="bold">Soundblaster Live!</emphasis>: � 榑亙 冒參亙 � 溶崚堙 瓶佻蒙斛彖墮 4 斌� 6 (<emphasis role="bold">5.1</emphasis>)
-冒料蒙力� AC3 津墨追厦彖良�, 徑途塹 2. �堊編� 單肪廟
-<link linkend="swac3">靤惑卅様力� AC3 津墨追厦彖良�</link>.
-For hardware AC3 passthrough you <emphasis role="bold">must</emphasis> use ALSA 0.9 with OSS emulation!
+  冒料蒙力� AC3 津墨追厦彖良�, 徑途塹 2. �堊編� 單肪廟
+  <link linkend="swac3">靤惑卅様力� AC3 津墨追厦彖良�</link>.
+  簗� 双仭卅堽惑� 侑椀孑冒 AC3[hardware AC3 passthrough] �
+  <emphasis role="bold">掴網隣</emphasis> 瓶佻蒙斛彖墮 ALSA 0.9 � 寨嫐冀錨� OSS!
   </simpara></listitem>
 <listitem><simpara>
   <emphasis role="bold">C-Media � SP/DIF 忸範掴�</emphasis>: 双仭卅堽叢 AC3 佚凖珍涸[passthrough] 從斃�料
-� 榑浜� 冒參鼠�, 嗟. 單肪廟 <link linkend="hwac3">痂仭卅堽賄 AC3
-津墨追厦彖良�</link>.
+  � 榑浜� 冒參鼠�, 嗟. 單肪廟 <link linkend="hwac3">痂仭卅堽賄 AC3
+  津墨追厦彖良�</link>.
   </simpara></listitem>
 <listitem><simpara>
   �斃�力嘖� <emphasis role="bold">漬嫻蛭 冒參</emphasis> 療 佻陳賭嵒彖脊嗔 <application>MPlayer'詫</application>.
-閘杜� 凖墨妖猟嫖墫� 侑�不壮� 單肪廟 <link linkend="audio-dev">旌嬲�拇 冒參�
-</link>!
+  閘杜� 凖墨妖猟嫖墫� 侑�不壮� 單肪廟 <link linkend="audio-dev">旌嬲�拇 冒參�</link>!
   </simpara></listitem>
 </itemizedlist>
 </sect2>
@@ -409,15 +410,15 @@
 
 <itemizedlist>
 <listitem><para>
-  鯏柯堙, 燐崚� 棉 �� GUI. 縒棉 珍, 淺堊編� <link linkend="gui">單肪廟 GUI</link>
-掴 墨熔斌冀鰭.
+  鯏柯堙, 燐崚� 棉 �� GUI. 縒棉 珍, 侑�不訴堙 掴 墨熔斌冀鰭
+  <link linkend="gui">單肪廟 GUI</link>.
   </para></listitem>
 <listitem><para>
   縒棉 � 範塢堙 孑堊力徂墮 <application>MEncoder</application> (料� 彭棉墨姪侘拱 洋惑話徒砺亙 墨追厦忿彬),
 淺堊編� <link linkend="mencoder">單肪廟 MEncoder</link>.
   </para></listitem>
 <listitem><para>
-  縒棉 � �� V4L 嗜徑途塢踊� <emphasis role="bold">TV 埓療�</emphasis>, � � 範塢堙 嗟�凖墮/攸盤壮掀壮�
+  縒棉 � �� 途墮 V4L 嗜徑途塢踊� <emphasis role="bold">TV 埓療�</emphasis>, � � 範塢堙 嗟�凖墮/攸盤壮掀壮�
 � 墨追厦彖墮 MPlayer'詫 読蒙踊, 淺堊編� 單肪廟 <link linkend="tv-input">TV 徃歪</link>.
   </para></listitem>
 <listitem><para>
@@ -436,7 +437,7 @@
 
 <para>
 � 榑� 溶妖淋, MPlayer 馬塹� � 瓶佻蒙斛彖良�. 訌堊模�
-<filename class="directory">$PREFIX/etc/mplayer</filename> 嗜津雙不 徳別 <filename>codecs.conf</filename>,
+<filename class="directory">$PREFIX/share/mplayer</filename> 嗜津雙不 徳別 <filename>codecs.conf</filename>,
 墨塹燮� 瓶佻蒙旁都嗔, 湟和� 嗜和殄墮 侑惑卅様� 和� 徨堵 墨津防 � 蛭 從斃�力嘖�.
 霻� 徳別 墟殿嫖墫� 塹蒙墨 � 塹� 嗅孺租, 途棉 � 範塢堙 佻妖倫墮 蛭 料嘖厦碧�,
 佻嗚鰐慄� 腕力徇亙 攸侖嗚租踊� 徳別 嗜津雙不 徇孕凖領誓 墨佗� 榑惑� 徳別�.
@@ -472,15 +473,15 @@
 <filename>config.mak</filename>.
 縒棉 � �� 嘖湾� 冒防�-塹 舵駄貧堙防, 墨塹燮� 療 椀凖津妄脊嗔 
 <filename>./configure</filename>, 侑�賭慥�, 湟� � �� 孑堊力很杜� 嗜�彭墫墸媽殄�
-攸馬模徊�[header files] (和掵力 -dev 仭謀壅) � 蛭 彭厶鰭 嗜徙祖狙�. 譱別
-<filename>configure.log</filename> 鐶掵力 馬從夘� ��, 淌馬 療 盤壮租�.
+攸馬模徊�[header files] (和掵力 榑� -dev 仭謀壅) � 蛭 彭厶鰭 嗜徙祖狙�. 譱別
+<filename>configure.log</filename> 鐶掵力 嗜和殄� ��, 淌馬 療 盤壮租� 通� 啾碗防.
 </para>
 
 
 <para>
-莽墹 榑� 療 和凉壮徒慘�, 柢鋲壅 掴網隣 泰墮 孑堊力很杜�, 湟和� 佻盲淺墮 噸遼檀藁敏媽殄�
-OSD � 嗾待不燮. 鯏墨妖猟嫖踊� 妖塹� - 孑堊力徊� TTF 柢鋲堊 � 嬲惣僧錨 MPlyer'�
-瓶佻蒙斛彖墮 吐�. 簗� 佻漬和力嘖妬, 嗟.  單肪廟 
+莽墹 榑� 療 和凉壮徒慘�, 力 湟和� 佻盲淺墮 噸遼檀藁敏媽殄� OSD � 嗾待不燮,
+掴網隣 泰墮 孑堊力很杜� 柢鋲壅. 鯏墨妖猟嫖踊� 妖塹� - 孑堊力徊� TTF 柢鋲堊 �
+嬲惣僧錨 MPlyer'� 瓶佻蒙斛彖墮 吐�. 靉漬和力嘖�, 嗟. �  單肪鰭
 <link linkend="subosd">黎待不燮 � OSD</link>.
 </para>
 
@@ -493,7 +494,7 @@
 <title>訌� 料嘲T GUI?</title>
 
 <para>
-簗� GUI 墟殿嫖墫� GTK 1.2.x (藁� 療 GTK'枸賄, 力 仭療蒙防 - 珍). 竫孀� 頒僧冱嗔
+簗� GUI 墟殿嫖墫� GTK 1.2.x (藁 療 壇棉墨� GTK'枸拱, 力 仭療蒙防 - 珍). 竫孀� 頒僧冱嗔
 � PNG 届厖壮�, 佻榑詫� GTK, <systemitem class="library">libpng</systemitem> (� 蛭 涸嘖� 通� 卅斷疎�淺墨�, 和掵力 藁�
 料旛彖脊嗔 <systemitem class="library">gtk-dev</systemitem> � <systemitem class="library">libpng-dev</systemitem>) 掴網隣 泰墮 孑堊力很杜�.
 � 溶崚堙 嗜岱壮� GUI, 嬲惣宋 <option>--enable-gui</option> � <option>./configure</option>.
@@ -530,7 +531,7 @@
 <itemizedlist>
 <listitem><para>VobSub</para></listitem>
 <listitem><para>OGM</para></listitem>
-<listitem><para>CC (closed caption)</para></listitem>
+<listitem><para>CC (closed caption[嗚燮壅� 塢墟�])</para></listitem>
 <listitem><para>Microdvd</para></listitem>
 <listitem><para>SubRip</para></listitem>
 <listitem><para>SubViewer</para></listitem>
@@ -538,7 +539,7 @@
 <listitem><para>VPlayer</para></listitem>
 <listitem><para>RT</para></listitem>
 <listitem><para>SSA</para></listitem>
-<listitem><para>MPsub</para></listitem>
+<listitem><para><link linkend="mpsub">MPsub</link></para></listitem>
 <listitem><para>AQTitle</para></listitem>
 <listitem><para><ulink url="http://unicorn.us.com/jacosub/">JACOsub</ulink></para></listitem>
 </itemizedlist>
@@ -571,8 +572,8 @@
 <filename>.IDX</filename> �/斌� <filename>.IFO</filename> 徳別�.
 蚌佻蒙斛彖良�: 途棉 � ��, 料侑浜賭, 途墮 徳別� <filename>sample.sub</filename>,
 <filename>sample.ifo</filename> (療和凉壮徒慘�), <filename>sample.idx</filename> - � 掴網隣 嬲惣壮�
-MPlayer'� 椀檀� <option>-vobsub sample [-vobsubid <replaceable>id</replaceable>]</option> (佻摸拱 侖墮
-嬲惣掀壮� 療 和凉壮徒慘�). 鑰檀� <option>-vobsubid</option> 佻範崛 料 <option>-sid</option>
+MPlayer'� 椀檀� <option>-vobsub sample [-vobsubid <replaceable>id</replaceable>]</option> (溶嵶� 嬲惣壮� 佻摸拱 侖墮).
+鑰檀� <option>-vobsubid</option> 佻範崛 料 <option>-sid</option>
 通� DVD, � 釘 佻溶毆�, � 溶崚堙 忸舵卅墮 妖崢� 掴厦嵋鼠� 嗾待不厦� (凉挧鼠�).
 � 嗅孺租, 途棉 <option>-vobsubid</option> 侑椀斈杜�, MPlayer 佻俎堊都嗔 瓶佻蒙斛彖墮
 凉挧�, 佻盲淌領拇 淌凖� 椀檀� <option>-slang</option> � 佚凖編� � 侖遼壞 
@@ -587,8 +588,7 @@
 靤�錨 届厖壮� 嗾待不厦� 嗜嘖湾� 冨 田瀕惑� 堙睦塹從馬 徳別�, 嗜津雙掃吐� 瀕届厖礎廟
 � 喇糧厦良攸檀�, 妖嘖椀鰐�杜鰭 � 堙睦堙 嗾待不卅.
 蚌佻蒙斛彖良�: 縒棉 � �� 途墮, 料侑浜賭, 徳別 <filename>sample.txt</filename>, 
-� 掴網隣 嬲惣壮� 椀檀� <option>-sub sample.txt</option> (佻摸拱 侖墮 嬲惣掀壮�
-療 和凉壮徒慘�).
+� 掴網隣 嬲惣壮� 椀檀� <option>-sub sample.txt</option> (溶嵶� 嬲惣壮� 佻摸拱 侖墮).
 </para>
 </formalpara>
 
@@ -598,7 +598,7 @@
   <term><option>-subdelay <replaceable>sec</replaceable></option></term>
   <listitem><simpara>
     暠津雙夫租� 嗾待不燮 料 <option><replaceable>sec</replaceable></option>
-	單釦猟. 輜崚� 泰墮 �夘蛋堙蒙隣�.
+	單釦猟. 霻� 變挿杜錨 溶崚� 泰墮 �夘蛋堙蒙隣�.
     </simpara></listitem>
 </varlistentry>
 <varlistentry>
@@ -617,7 +617,7 @@
 
 <para>
 縒棉 � 料駄青租堙 孥徒扶夫狙殳績� 攸津雙釦 妖崢� 読蒙溶� � 嗾待不卅揺, 瓶佻蒙旁�
-徳別 MicroDVD 嗾待不厦�, 料病鰐電 彭厦冱力, 湟� 涸嘖�� 冒漬� � 読蒙輿 � 徳別�
+徳別 嗾待不厦� � 届厖壮� MicroDVD, 料病鰐電 彭厦冱力, 湟� 涸嘖�� 冒漬� � 読蒙輿 � 徳別�
 嗾待不厦� 療 嗜徙祖狙�. 靉崛盲篇堊, 和卅塢堙 徇浜僧錨, 湟� 届厖壮 MicroDVD
 瓶佻蒙旁都 疎嗜明堽拇 力妖卅 冒漬� 通� 喇糧厦良攸檀�, � 佻榑詫� 椀檀�
 <option>-subfps</option> 療 溶崚� 瓶佻蒙斛彖墮嗔 � 榑浜 届厖壮詫. 靉嗚鰐慄�
@@ -628,19 +628,19 @@
 </para>
 
 <para>
-� DVD 嗾待不卅�, 淺堊編� <link linkend="dvd">單肪廟 DVD</link>.
+� DVD 嗾待不卅�, 淺堊編� � <link linkend="dvd">單肪鰭 DVD</link>.
 </para>
 
 
 <sect2 id="mpsub">
-<title>MPlayer's own subtitle format</title>
+<title>MPlayer's own subtitle format (MPsub)</title>
 
 <para>
 <application>MPlayer</application> 忻L � 孃�凖駄杜錨 力忸� 届厖壮 嗾待不厦�,
 料旛彖斗拱 <emphasis role="bold">MPsub</emphasis>. 鑪 泰�
 卅斷疎�僧 Gabucino. 靉 嗾歸嘖徼, 吐� 腕力徇叢 腕和杜力嘖� - 榑�
-瓶佻蒙斛彖良� <emphasis>追料揺淌嗚亙</emphasis> 徠斗杜力� 攸徂喇溶嘖� (範墹 嗾歸嘖徼都 � 凖嵒�
-冒漬�亙 攸徂喇溶嘖�). 靤浜賭 (冨 
+瓶佻蒙斛彖良� <emphasis>追料揺淌嗚亙</emphasis> 徠斗杜力� 侑夫凉防 (範墹 嗾歸嘖徼都 � 凖嵒�
+佻冒漬�亙 侑夫凉防). 靤浜賭 (冨 
 <ulink url="../../tech/mpsub.sub">DOCS/tech/mpsub.sub</ulink>):
 <programlisting>
 FORMAT=TIME
@@ -711,6 +711,7 @@
   � 瓶佻蒙斛彖良� 椀檀� <option>-utf8</option>, 斌� 侑腕塹 和�彖墮 徳別
   嗾待不卅 <filename>&lt;video_name&gt;.utf</filename> � 卅斃途塢墮 吐�
   � 冒堊模播 � 読蒙溶�. 霤凖墨追厦徊� 冨 卅斂扶隣� 墨追厦從� � utf8 溶崚� 泰墮
+  <!-- FIXME: iconv (Debian) konwert (Red Hat) instead? -->
   腕斈途墸姪料 � 佻溶毆� 侑惑卅様 konwert (Debian) 斌� iconv (Red Hat).
   </para><para>
   
@@ -729,7 +730,7 @@
   <row><entry>
     <ulink url="ftp://ftp.mplayerhq.hu/MPlayer/contrib/fonts/"></ulink>
     </entry><entry>
-	卅變拇 柢鋲壅 � 佻蒙斛彖堙姪�
+    卅斂扶隣� 柢鋲壅, 喞徒僧隣� 佻蒙斛彖堙妄揺
     </entry></row>
   <row><entry>
     <ulink url="http://realtime.ssu.ac.kr/~lethean/mplayer/"></ulink>
@@ -745,7 +746,7 @@
   蚌佻蒙斛彖墮 嘔田嘖從 播療卅檀� 柢鋲塹� � <filename class="directory">
   TOOLS/subfont-c</filename>. 霻� 攸墨涙杜力� 嘔田嘖從 通� 侑渡岱惣�僧頻
   冨 TTF/Type1/� �. �. 柢鋲塹� � mplayer'�嗚錨 柢鋲塹忸� 仭謀壅. 
-  (淺堊編� <filename>TOOLS/subfont-c/README</filename> 通� 佻漬和力嘖妬)
+  (佻漬和力嘖� 淺堊編� � <filename>TOOLS/subfont-c/README</filename>)
   </para></listitem>
 <listitem><para>
     瓶佻蒙旁編� GIMP'�拱 侈素瀕 播療卅檀� 柢鋲塹� 冨 <filename
@@ -862,7 +863,7 @@
   Clock[涸噎 瓶塢領惑� 徠斗杜�]) 通� 榑亙 攸珍淺 佻塹葉, 湟� 榑� 堊瞥賭
   塹淮腕墮� 1ms. 霻� 宋塹輿塢淌嗚� 徊明涸都嗔, 墨把� 掴嘖孃力, 力 墟殿嫖�
   侑夫斌吐品 root'�, <emphasis>嘸青燐塹馬 佻 root'�</emphasis> 瓶佻摸囘溶馬
-  徳別� <application>MPlayer</application>'�, 斌� 侑宋斌慘� 料嘖厦杜力馬 冂厦.
+  徳別� <application>MPlayer</application>'�, 斌� 侑宋斌慘� 料嘖厦杜力馬 冂卅.
   縒棉 � 卅堆堊都� � 冂厦� 2.4.19pre8 斌� 堆姪� 佻敖良�, � 溶崚堙 料嘖厦不�
   輿睦浜遡慘媽 涸嘖�� RTC 通� 和掵隣� 佻蒙斛彖堙姪� 淌凖� 徳別�媽 喇嘖斗�
   /proc. 蚌佻蒙旁編� 榑� 墨輿猟�, 湟和� 喞徒壮� RTC 掴嘖孃隣� 通� 和掵隣�
@@ -880,7 +881,7 @@
    � 攸妖良堙 64 料 1024. 莽墹 � 掴網隣 變壮�, 湟� � 津盟都�.
    � 孥苗不� 榮禿穆夫力嘖� 力從馬 墨珍 堊瞥賭� 佻 嘖厦謀 嗜嘖湾良�.
    耨遼檀� 孃卅很杜頻 佻墟殿妄斗亙 溶殞腕墮�[power management] � 療墨塹燮�
-   力孕怠墨徨防� BIOS'� � speedstep-CPU 侈枠� 忱蘇溶津篇墸媽� � RTC. 疸追� �
+   力孕怠墨徨防� BIOS'� 嗜 speedstep-CPU 侈枠� 忱蘇溶津篇墸媽� � RTC. 疸追� �
    徂津� 溶杯� 津喇糧厦良敝厦彖墮嗔. �厦冱力, 途棉 � 徨堊徂堙 枹屠賭 徇奴療馬
    佗堊良� 掴 徊明淌良� 力孕怠冒, 塹 榑� 佻溶崚�. � 徨吐珍 溶崚堙 �北折不�
    佻陳賭嵋� RTC, 嬲惣宋 椀檀� <option>-nortc</option>. � 療墨塹燮� 双仭卅堽挌
--- a/DOCS/xml/ru/mail-lists.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/mail-lists.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.3 -->
 <appendix id="mailinglists">
 <title>靉湟�拇 卅嗷挂防</title>
 <para>
@@ -26,8 +27,8 @@
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-dev-eng"/>
 霻� 卅嗷挂冒 � 卅斷疎�謀 MPlayer'�! 鯀敘�碗 彭庁墫� � 冨妖療良冏 �
 瀕堙卞妬單/API, 力忸� 舵駄貧堙冒�, 椀塢揺攸檀� 墨珍, 冨妖療良冏 � 墨瞭蒜孀礎鰭.
-靤瓶挂訴堙 喟珍 仭壘�, � 療 嗜和歸良� 和 �病冒�, 從侑腕� 佻蒙斛彖堙姪�, 攸侑腕�
-力忸� 從斃�力嘖妬, 湟和� 嗜頒僧不� 良數浜 墟粗彬.
+�和� 嗜頒僧不� 良數品 墟粗彬, 侑瓶挂訴堙 喟珍 仭壘�, � 療 嗜和歸良� 和 �病冒�, 從侑腕� 佻蒙斛彖堙姪�, 攸侑腕�
+力忸� 從斃�力嘖妬.
 </para></listitem>
 <listitem><para>
 鯀嗷挂冒 佻蒙斛彖堙姪� MPlayer'�:
@@ -38,7 +39,7 @@
   �病防</link> � <link linkend="bugreports">單肪廟 嗜和歸良� 和 �病冒�</link>).
   </para></listitem>
   <listitem><para>
-  靤瓶挂訴堙 喟珍 攸侑腕� 力忸� 從斃�力嘖妬 (侑�不宋 <emphasis role="bold">
+  靤瓶挂訴堙 喟珍 侑腕愨� � 力忸� 從斃�力嘖冏 (侑�不宋 <emphasis role="bold">
   徨� 掴釦妖淋礎廟</emphasis>).
   </para></listitem>
   <listitem><para>
@@ -55,7 +56,7 @@
   鯀嗷挂冒 料 彭稜賭嗚詫 凉挧�.
   </para></listitem>
   <listitem><para>
-  �輿? �� 徂栂� 怠津�... 佻 堆蒙枦� 涸嘖� - 凸妬�[flame] � RTFM 從侑腕� :(
+  �輿? �� 徂栂� 怠津�... 佻冒 佻 堆蒙枦� 涸嘖� &mdash; 凸妬�[flame] � RTFM 從侑腕� :(
   </para></listitem>
   </itemizedlist>
 </para></listitem>
@@ -92,12 +93,12 @@
 <listitem><para>
 鯀嗷挂冒, �力嗔歔决� � 佚凖力嗾 MPlayer 佻� Cygwin:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-cygwin"/>
-鯀嗷挂冒 通� 和嗾崢杜頻 佚凖力啻 MPlayer 佻� Cygwin:
+鯀嗷挂冒 通� 和嗾崢杜頻 佚凖力啻 MPlayer 佻� Cygwin.
 </para></listitem>
 <listitem><para>
 鯀嗷挂冒, �力嗔歔决� � 佚凖力嗾 MPlayer 佻� OS/2:
 <ulink url="http://mplayerhq.hu/mailman/listinfo/mplayer-os2"/>
-鯀嗷挂冒 通� 和嗾崢杜頻 佚凖力啻 MPlayer 佻� OS/2:
+鯀嗷挂冒 通� 和嗾崢杜頻 佚凖力啻 MPlayer 佻� OS/2.
 </para></listitem>
 <listitem><para>
 鯀嗷挂冒 通� 凖珍穆碗� � 佚凖從爪彬� MPlayer Weekly News:
@@ -106,7 +107,7 @@
 </para></listitem>
 </itemizedlist>
 <note><para>
-曺途� � 溶崚堙 和料簒嵒墮 倉班� 卅嗷挂亘 � 從斃�力嘖慇 佻瓶冒:
+曺途� 料範追墫� 倉班� 卅嗷挂亘 � 從斃�力嘖慇 佻瓶冒:
 <ulink url="http://www.mplayerhq.hu/cgi-bin/htsearch"/>.
 </para></note>
 </para>
--- a/DOCS/xml/ru/patches.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/patches.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.2 -->
 <appendix id="patches">
 <title>訌� 侑瓶挂壮� 仭壘�</title>
 <para>
--- a/DOCS/xml/ru/tvinput.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/tvinput.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- syncaed with 1.6 -->
 <sect1 id="tv-input" xreflabel="TV input">
 <title>TV 徃歪</title>
 
@@ -15,7 +16,7 @@
 <procedure>
 <step><para>
   �-佚叟挌, �� 燐嵶� 佚凖墨熔斌敏�壮� <application>MPlayer</application>,
-  <filename>./configure</filename> 宋塹輿塢淌嗚� 和料簒嵒� 攸馬模徊� 冨 冂卅,
+  <filename>./configure</filename> 宋塹輿塢淌嗚� 和料簒嵒� 攸馬模徊� 冂卅,
   �力嗔殄途� � v4l, � 料棉淺� <filename>/dev/video*</filename> 孑墟亙嘖�.
   縒棉 藁� 嗾歸嘖徼脊, 怠津� 嗜岱僧� 佻陳賭嵋� TV (嗟. 忸從�
   <filename>./configure</filename>).
@@ -104,8 +105,9 @@
 蠣妖倫編� 變挿杜錨 <option>outfmt</option> 塹蒙墨 途棉 � 變租堙, 湟� �
 津盟都�,斌� �柯 冒參�/漬訴彭� 療 佻陳賭嵒彖脊 變挿杜錨 佻 嬪鰐涸良� (
 侑腕墟僧嘖從 致都� YV12). � 嘖倉挌 彭厶頻� <application>MPlayer</application>/
-<application>MEncoder</application> 忸嘖宋妄墮 燐嵶賄 變挿杜錨 届厖壮� 忸從珍.
-霻� 從侑腕 掴網杜 泰墮 卅斷奴N � 堙釦殄� 彭厶頻� � 椀檀� <option>outfmt
+<application>MEncoder</application> 泰模 療和範追溶 忸嘖宋妄墮 燐嵶賄 變挿杜錨
+届厖壮� 忸從珍.
+霻� 侑和姪輿 掴網杜 泰墮 凖枦料 � 堙釦殄� 彭厶頻� � 椀檀� <option>outfmt
 </option> 堆蒙枦 療 墟殿嫖墫�, 佻嗚鰐慄� 變挿杜錨 佻 嬪鰐涸良� 佻槌歪不 �
 堆蒙柯林墸� 嗅孺租�. 鄙侑浜賭 途棉 � 怠津堙 攸盤壮掀壮� � DivX, 瓶佻蒙旁�
 libavcodec, � 嬲爽都� <option>outfmt=RGB24</option> 通� 嫐孺枦良� 冒淌嘖彖
@@ -126,8 +128,8 @@
 <listitem>
 <para>
 縒墮 療嗚鰐慄� 侖堙� 攸盤壮� 奏追�. � 溶崚堙 佻盲淺墮 旌嬲, 棉堆 瓶佻蒙旁� �柎
-旌嬲�媽 冒參� � 徇奴良� 冒妥蒙, 嗜田瀕兩殄� 徂津� 冒參� � 棉療蔑拱 徃歪[line-in]
-, 棉堆 瓶佻蒙旁� 徨墟賄領拱 ADC 料 � 淺佚 bt878. � 榑詫 嗅孺租, � 掴網隣
+旌嬲�媽 冒參� � 徇奴良� 冒妥蒙, 嗜田瀕兩殄� 徂津� 冒參� � 棉療蔑拱 徃歪[line-in],
+棉堆 瓶佻蒙旁� 徨墟賄領拱 ADC 料 � 淺佚 bt878. � 榑詫 嗅孺租, � 掴網隣
 攸拝孳不� 漬訴彭� <emphasis role="bold">btaudio</emphasis>. �堊編� 徳別
 <filename>linux/Documentation/sound/btaudio</filename> (� 津凖彭 冂卅, 療
 MPlayer'�) � 療墨塹燮揺 瀕嘖簒肪頻揺 佻 瓶佻蒙斛彖良� 榑惑� 漬訴彭卅.
@@ -137,7 +139,7 @@
 <listitem>
 <para>
 縒棉 <application>MEncoder</application> 療 溶崚� �牧捏� 奏追� 孑墟亙嘖從,
-嫗田不途�, 湟� 藁� 津篇墸不徒慘� 掴嘖孃力. �斃�隣 冒防�-良怠椿 墟嫩力嘖� �
+嫗田不途�, 湟� 藁� 津篇墸不徒慘� 掴嘖孃力. �斃�隣 冒防�-良怠椿 墟嫩力嘖� 嗜
 旌嬲�挈� 單叟賭鼠�, 料侑浜賭 arts (KDE) � esd (GNOME). 縒棉 � ��
 佻摸歪孃姪睦料� 旌嬲�叢 冒參� (佻湟� 徨� 嗜徠斗杜隣� 冒參� 榑� 佻陳賭嵒彖脊),
 � � 瓶佻蒙旁都� KDE, 佻侑和嬖堙 �妖塢墮 覗模淤� " full duplex" � 妖寮 料嘖厦屠
@@ -186,7 +188,7 @@
 
 <informalexample>
 <para>
-曺途�, 冨和卅崚良� 怠津� 掴佻摸不徒慘� 嗟喪枹疎敏�僧� 掴 384x288 � 嗽壮� �
+曺途�, 冨和卅崚良� 怠津� 掴佻摸不徒慘� 輿營堊舵厦彖力 掴 384x288 � 嗽壮� �
 舵墅�亘詫 350 魔/� � 凖嵒妖 忸嗜墨馬 冒淌嘖彖. 鑰檀� vqmax 珍T 從明
 没僧堊娩賭�[quantizer] � 佻旌鰐囘� 墨熔凖嗷碗� 徂津� 津篇墸不徒慘� 掴嘖扶� 嘖鰐�
 良數惑� 舵墅�亘�, 侑宋珍 壇力� 冒淌嘖彖. 霻� 溶崚� 泰墮 佻姪變� 通� 攸盤壮�
--- a/DOCS/xml/ru/users-vs-dev.xml	Sun Sep 21 23:59:49 2003 +0000
+++ b/DOCS/xml/ru/users-vs-dev.xml	Mon Sep 22 08:20:53 2003 +0000
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
+<!-- synced with 1.7 -->
 <appendix id="users-vs-dev">
 <title>靆挿 卅斷疎�淺墨�</title>
 
@@ -13,8 +14,8 @@
 侑和姪� 墨熔斌冀鰭, 墨塹燮� 溶嵶� 泰模 泰 �療嘖� 料 嘲T gcc-2.95.3.
 鄙淺料� � RedHat Linux 7.0, <emphasis role="bold">Red Hat</emphasis> 徊明淺棉 喇蒙力
 侑椀壮淌領媽 CVS 彭厶廟 GCC � 料旌遡� 釘 <emphasis role="bold">2.96</emphasis>.
-RedHat 徊明淺棉 榑� 彭厶廟 � 追嘖夘怠塢�, 佻嗚鰐慄� GCC 3.0 療 泰� 攸彭叨N
-� 榑� 徠斗�, � 浜 墟殿�遡嗔 墨熔斌冱碗, 墨塹燮� 泰 範厦柤 卅堆堊� 料 徨堵
+RedHat 徊明淺棉 榑� 彭厶廟 � 追嘖夘怠塢�, 佻嗚鰐慄� � 塹 徠斗� GCC 3.0 療 泰�
+攸彭叨N, � 浜 墟殿�遡嗔 墨熔斌冱碗, 墨塹燮� 泰 範厦柤 卅堆堊� 料 徨堵
 佻陳賭嵒彖斗挌 侈壮届厖組, 徊明涸� IA64 � s390. 簓嘖夘替脊碗 Linux
 <emphasis role="bold">Mandrake</emphasis>, 佻嗅田�遡 侑浜賭� Red Hat � 料涸� 佻嘖宋防
 GCC 2.96 � Linux-Mandrake 單夘� 8.0.
@@ -194,14 +195,15 @@
 湟� 侑砺腕範栂� 佻潰塹嵒彖都 喇壞礎廟:
 
 <blockquote><para>
-However, he also went on to say that he was "surprised" by my column about
-<application>Mplayer</application> and thought it was unfair, reminding me that it is
-a free software project. "If you don't like it," Bartsch said, "you're free not to use it." 
-
 [鐵料墨, 藁 堊勃� 嗚惣遡, 湟� 藁 泰� "嫩夫味�" 溶妬 墨模遼亙 � <application>MPlayer</application>'� �
 佻蔦輿�, 湟� 榑� 泰模 泰 療侑宋斌慘� 料佻揺料墮 洋�, 湟� 榑� 侑賄穆 嘛和歪力馬
 侑惑卅様力馬 和途佚淌良�. "縒棉 藁 彖� 療 厘宋不嗔", 嗚惣遡 眩卉�, "� 嘛和歪隣
 療 瓶佻蒙斛彖墮 吐�."]
+</para>
+<para>
+[However, he also went on to say that he was "surprised" by my column about
+<application>Mplayer</application> and thought it was unfair, reminding me that it is
+a free software project. "If you don't like it," Bartsch said, "you're free not to use it."]
 </para></blockquote>
 </para>
 
@@ -217,15 +219,16 @@
 和 榑詫 淌模彭謀.
 
 <blockquote><para>
-You may all remember the LinuxWorld 2000, when he claimed that Linus T said
+� 徨� 掴網力 泰墮 佻洋不� LinuxWorld 2000, 墨把� � 攸况斌, 湟� Linus T
+嗚惣遡, 湟� 'FreeBSD &mdash; 榑� 塹蒙墨 馬厶塰� 侑惑卅様瓶塹�'. Linus 鉗�苡
+佻掴体惑� 療 馬從夘�. 誅把� 籌� 侑不冦嫐� � �彭壞, 吐� 凖阻檀妬 泰模  佻旌壮�
+BSD 嘖碗藁良墨� � 嗜侈冕�.
+</para>
+<para>
+[You may all remember the LinuxWorld 2000, when he claimed that Linus T said
 that 'FreeBSD is just a handful of programmers'. Linus said NOTHING of the
 sort. When Joe was called on this, his reaction was to call BSD supporters
-assholes and jerks.
-
-[� 徨� 掴網力 泰墮 佻洋不� LinuxWorld 2000, 墨把� � 攸况斌, 湟� Linus T
-嗚惣遡, 湟� 'FreeBSD &mdash; 榑� 塹蒙墨 馬厶塰� 侑惑卅様瓶塹�'. Linus 鉗�苡
-佻掴体惑� 療 馬從夘�. 誅把� 籌� 侑不冦嫐� � �彭壞, 吐� 凖阻檀妬 泰模  佻旌壮�
-BSD 嘖碗藁良墨� � 嗜侈冕�.]
+assholes and jerks.]
 </para></blockquote>
 </para>
 
@@ -240,6 +243,8 @@
 姪� 塹葉 料攸�, 籌� 眩厰 浜徒 和挧力彭良� 凖杯妄厠� 泰彖墮 料 届簒妖 Will
 Zachmann'� Canopus 料 Compuserve. �把� 藁 泰� 嘖碗藁良墨� OS/2 (� 塹崚 泰�
 徳力� OS/2).
+</para>
+<para>
 [He's interesting, but not good at avoiding, um... controversy.  Joe Barr
 used to be one of the regulars on Will Zachmann's Canopus forum on
 Compuserve, years ago.  He was an OS/2 advocate then (I was an OS/2 fan
@@ -250,6 +255,8 @@
 訌� 侑宋斌� 藁 渙土妖厠� 凸妬揺� 明津�, �, 冒� 洋� 冒崚墫�, � 療馬 塹把� 泰棉
 墹孱儲� 徠斗杜�. 黎佃 佻 吐� 佻嗅田良� 墨模遼鼠, 藁 療洋惑� 嗟冉淺毛�.
 鑰凖津味領�, � 塹 徠斗� 塹遼品 斥碗 療 泰� 吐� 嘖斌斗, 嗜徨斗 療 泰�.
+</para>
+<para>
 [He used to go over-the-top, flaming people, and I suspect he had some hard
 times, then. He's mellowed some, judging by his columns recently.
 Moderately subtle humor was not his mode in those earlier days, not at all.]