Merge svn changes up to r30419

20 files changed, 44 insertions, 14 deletions

diff --git a/DOCS/man/cs/mplayer.1 b/DOCS/man/cs/mplayer.1
index 412b64f984..174e4f063d 100644
--- a/DOCS/man/cs/mplayer.1
+++ b/DOCS/man/cs/mplayer.1
@@ -1,5 +1,5 @@
 .\" Synced with r24573
-.\" MPlayer (C) 2000-2009 MPlayer Team
+.\" MPlayer (C) 2000-2010 MPlayer Team
 .\" Tuto man stránku napsali/píší Gabucino, Diego Biurrun, Jonas Jermann
 .\" Překlad (translation): Jiří Heryán
 .\" Kódování (encoding): UTF-8
diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1
index c8056c59b7..e0e0412b53 100644
--- a/DOCS/man/de/mplayer.1
+++ b/DOCS/man/de/mplayer.1
@@ -1,4 +1,4 @@
-.\" MPlayer (C) 2000-2009 MPlayer Team
+.\" MPlayer (C) 2000-2010 MPlayer Team
 .\" Diese Man-Page wurde/wird von Moritz Bunkus, Sebastian Kr�mer,
 .\" Tobias Diedrich gepflegt.
 .\" Encoding: iso-8859-1
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 1747a598f2..ca5bee4d09 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -1,5 +1,5 @@
 .\" $Revision$
-.\" MPlayer (C) 2000-2009 MPlayer Team
+.\" MPlayer (C) 2000-2010 MPlayer Team
 .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
 .
 .\" --------------------------------------------------------------------------
diff --git a/DOCS/man/es/mplayer.1 b/DOCS/man/es/mplayer.1
index c45da693eb..b09f62f938 100644
--- a/DOCS/man/es/mplayer.1
+++ b/DOCS/man/es/mplayer.1
@@ -1,6 +1,6 @@
 .\" synced with 1.685
 .\" Encoding: iso-8859-1
-.\" MPlayer (C) 2000-2009 El equipo de MPlayer
+.\" MPlayer (C) 2000-2010 El equipo de MPlayer
 .\" Esta p�gina de manual ha sido escrita por Gabucino, Diego Biurrun,
 .\" Jonas Jermann y traducida al espa�ol por Juan Mart�n L�pez.
 .\"
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index f1de6a4065..6209931071 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -1,6 +1,6 @@
 .\" synced with r30135
 .\" Encoding: iso-8859-1
-.\" MPlayer (C) 2000-2009 MPlayer Team
+.\" MPlayer (C) 2000-2010 MPlayer Team
 .\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
 .\" Traduction: Guillaume POIRIER < poirierg AT gmail POINT com >,
 .
diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1
index 95ead131e3..86ddc2d752 100644
--- a/DOCS/man/hu/mplayer.1
+++ b/DOCS/man/hu/mplayer.1
@@ -1,5 +1,5 @@
-.\" Synced with r30311
-.\" MPlayer (C) 2000-2009 MPlayer Team
+.\" Synced with r30414
+.\" MPlayer (C) 2000-2010 MPlayer Team
 .\" Ezt a man oldalt Gabucino, Diego Biurrun �s Jonas Jermann k�sz�ti/k�sz�tette
 .\" Karbantart�: Gabrov
 .\" Encoding/k�dol�s: iso-8859-2
@@ -33,7 +33,7 @@
 .\" N�v
 .\" --------------------------------------------------------------------------
 .
-.TH MPlayer 1 "2010. 01. 16." "MPlayer Project" "A film lej�tsz�"
+.TH MPlayer 1 "2010. 01. 24." "MPlayer Project" "A film lej�tsz�"
 .
 .SH N�V
 mplayer  \- film lej�tsz�
@@ -3925,6 +3925,16 @@ Az ITU-R BT.709 sz�nteret haszn�lja.
 .IPs 3
 Az SMPTE-240M sz�nteret haszn�lja.
 .RE
+.IPs levelconv=<n>
+Kiv�lasztja a f�nyess�g konvert�l�si szintj�t a YUV-RGB konvert�l�s sor�n
+.RSss
+.IPs 0
+TV-r�l PC szintre (alap�rtelmezett).
+.IPs 1
+PC-r�l TV szintre.
+.IPs 2
+Nincs semmilyen konvert�l�s.
+.RE
 .IPs lscale=<n>
 Kiv�lasztja a haszn�land� m�retez� f�ggv�nyt a f�nyer�ss�ghez.
 Csak a 2-es, 3-as, 4-es �s 6-os yuv m�dokn�l helyes.
diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1
index 1cf1d734fb..c9811f6a25 100644
--- a/DOCS/man/it/mplayer.1
+++ b/DOCS/man/it/mplayer.1
@@ -1,6 +1,6 @@
 .\" synced with r30336
 .\" Encoding: iso-8859-1
-.\" MPlayer (C) 2000-2009 MPlayer Team
+.\" MPlayer (C) 2000-2010 MPlayer Team
 .\" Questa pagina di manuale � stata fatta da Gabucino, Diego Biurrun,
 .\" Jonas Jermann
 .\" Traduzione in italiano di Daniele Forghieri, aggiornamenti PaulTT
diff --git a/DOCS/man/pl/mplayer.1 b/DOCS/man/pl/mplayer.1
index da2915c355..9b484edbba 100644
--- a/DOCS/man/pl/mplayer.1
+++ b/DOCS/man/pl/mplayer.1
@@ -1,6 +1,6 @@
 .\" synced with 1.1114
 .\" Encoding: iso-8859-2
-.\" MPlayer (C) 2000-2009 MPlayer Team
+.\" MPlayer (C) 2000-2010 MPlayer Team
 .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
 .\" T�umaczenie: Wac�aw "Torinthiel" Schiller (torinthiel@wp.pl)
 .\"            i Maciej "Paszczi" Paszta (paszczi@go2.pl)
diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1
index 071db93168..5a958c27d4 100644
--- a/DOCS/man/ru/mplayer.1
+++ b/DOCS/man/ru/mplayer.1
@@ -1,4 +1,4 @@
-.\" MPlayer (C) 2000-2009 MPlayer Team
+.\" MPlayer (C) 2000-2010 MPlayer Team
 .\" This man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
 .\" Translated by Vladimir Voroshilov <voroshil@gmail.com>
 .\" Encoding: koi8-r
diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1
index 0c7a2d7a31..f19c81b37b 100644
--- a/DOCS/man/zh_CN/mplayer.1
+++ b/DOCS/man/zh_CN/mplayer.1
@@ -1,4 +1,4 @@
-.\" sync with en/mplayer.1 r30197
+.\" sync with en/mplayer.1 r30336
 .\" Encoding: UTF-8
 .\" Reminder of hard terms which need better/final solution later:
 .\"   /capture; playtree in parent list; colorkey; retrace; desync; downmix;
@@ -6,7 +6,7 @@
 .\"   encoding audio rate; alphamap; upsampling; sweep;
 .\"   aligned buffers; instancenumber;
 .\"
-.\" MPlayer (C) 2000-2009 MPlayer 团队
+.\" MPlayer (C) 2000-2010 MPlayer 团队
 .\" 本(英文)手册页由 Gabucino, Diego Biurrun, Jonas Jermann 编写
 .\" 视频滤镜、通用编解码器选项、特定编解码器专用选项三个章节由
 .\" JRaSH <jrash06 AT 163.com>重新翻译
@@ -3627,7 +3627,7 @@ GL_ARB_fragment_shader！）。至少需要三个纹理单位。提供饱和度�
 选择 YUV 至 RGB 转换所用的色彩空间
 .RSss
 .IPs 0
-使用 MPlayer 通常使用的程式（默认值）
+使用 MPlayer 通常使用的公式（默认值）。
 .IPs 1
 使用 ITU-R BT.601 色彩空间。
 .IPs 2
@@ -3635,6 +3635,16 @@ GL_ARB_fragment_shader！）。至少需要三个纹理单位。提供饱和度�
 .IPs 3
 使用 SMPTE-240M 色彩空间。
 .RE
+.IPs levelconv=<n>
+选择用于 YUV 至 RGB 转换的亮度等级转换方式。
+.RSss
+.IPs 0
+将 TV 等级转换为 PC 等级（默认值）。
+.IPs 1
+将 PC 等级转换为 TV 等级。
+.IPs 2
+不作任何转换。
+.RE
 .IPs lscale=<n>
 选择用于亮度调整的调节函数。
 仅对 yuv 模式 2、3、4 和 6 有效。
diff --git a/DOCS/xml/cs/documentation.xml b/DOCS/xml/cs/documentation.xml
index dd3fce2618..ad733f9919 100644
--- a/DOCS/xml/cs/documentation.xml
+++ b/DOCS/xml/cs/documentation.xml
@@ -16,6 +16,7 @@
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>MPlayer team</holder>
 </copyright>
 <legalnotice>
diff --git a/DOCS/xml/de/documentation.xml b/DOCS/xml/de/documentation.xml
index 80d382829b..bc56ee3fe6 100644
--- a/DOCS/xml/de/documentation.xml
+++ b/DOCS/xml/de/documentation.xml
@@ -18,6 +18,7 @@
     <year>2007</year>
     <year>2008</year>
     <year>2009</year>
+    <year>2010</year>
     <holder>MPlayer-Team</holder>
   </copyright>
       <legalnotice>
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index 2108533f96..00afd76f06 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -16,6 +16,7 @@
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>MPlayer team</holder>
 </copyright>
 <legalnotice>
diff --git a/DOCS/xml/es/documentation.xml b/DOCS/xml/es/documentation.xml
index 3ddc2e360c..00e5c708e7 100644
--- a/DOCS/xml/es/documentation.xml
+++ b/DOCS/xml/es/documentation.xml
@@ -17,6 +17,7 @@ para LINUX</title>
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>MPlayer team</holder>
 </copyright>
 <legalnotice>
diff --git a/DOCS/xml/fr/documentation.xml b/DOCS/xml/fr/documentation.xml
index 0458d4a030..a0a3f7b613 100644
--- a/DOCS/xml/fr/documentation.xml
+++ b/DOCS/xml/fr/documentation.xml
@@ -16,6 +16,7 @@
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>MPlayer team</holder>
 </copyright>
 <legalnotice>
diff --git a/DOCS/xml/hu/documentation.xml b/DOCS/xml/hu/documentation.xml
index 57c00999d9..e41c1f05b9 100644
--- a/DOCS/xml/hu/documentation.xml
+++ b/DOCS/xml/hu/documentation.xml
@@ -16,6 +16,7 @@
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>MPlayer team</holder>
 </copyright>
 <legalnotice>
diff --git a/DOCS/xml/it/documentation.xml b/DOCS/xml/it/documentation.xml
index 6e0020886e..9257e48141 100644
--- a/DOCS/xml/it/documentation.xml
+++ b/DOCS/xml/it/documentation.xml
@@ -16,6 +16,7 @@
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>MPlayer team</holder>
 </copyright>
 <legalnotice>
diff --git a/DOCS/xml/pl/documentation.xml b/DOCS/xml/pl/documentation.xml
index 71677605d8..e0781d14b6 100644
--- a/DOCS/xml/pl/documentation.xml
+++ b/DOCS/xml/pl/documentation.xml
@@ -17,6 +17,7 @@
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>Załoga MPlayera</holder>
 </copyright>
 <legalnotice>
diff --git a/DOCS/xml/ru/documentation.xml b/DOCS/xml/ru/documentation.xml
index 5d5db208d9..60c5ea58be 100644
--- a/DOCS/xml/ru/documentation.xml
+++ b/DOCS/xml/ru/documentation.xml
@@ -16,6 +16,7 @@
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>MPlayer team</holder>
 </copyright>
 <legalnotice>
diff --git a/DOCS/xml/zh_CN/documentation.xml b/DOCS/xml/zh_CN/documentation.xml
index 320664846f..2924f91dc3 100644
--- a/DOCS/xml/zh_CN/documentation.xml
+++ b/DOCS/xml/zh_CN/documentation.xml
@@ -16,6 +16,7 @@
   <year>2007</year>
   <year>2008</year>
   <year>2009</year>
+  <year>2010</year>
   <holder>MPlayer工作组</holder>
 </copyright>
 <!--