# HG changeset patch
# User diego
# Date 1143459567 0
# Node ID 9a5a62f480e662503b1d31ffab5f1397fae88f06
# Parent  75442247ee568cbdc68be62c2a9a51f719425d07
Rename the default GUI skins directory from 'Skin' to 'skins', keeping
backwards compatibility.

diff -r 75442247ee56 -r 9a5a62f480e6 ChangeLog
--- a/ChangeLog	Mon Mar 27 10:32:52 2006 +0000
+++ b/ChangeLog	Mon Mar 27 11:39:27 2006 +0000
@@ -122,6 +122,7 @@
     * bitexact decoding
 
     GUI:
+    * skins now reside in a directory named 'skins', not 'Skin'
     * ported to GTK2
     * long standing up side down vpotmeter bug fixed
     * don't hang on unreadable skin files
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/de/documentation.html
--- a/DOCS/de/documentation.html	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/de/documentation.html	Mon Mar 27 11:39:27 2006 +0000
@@ -919,12 +919,12 @@
 herunterladen, wenn du das GUI verwenden willst. Schau dazu auf die <A
 HREF="http://www.mplayerhq.hu/dload.html">Download-Seite</A>. Diese
 sollten in das normale, systemweite Verzeichnis
-(<CODE>$PREFIX/share/mplayer/Skin</CODE>) oder nach
-<CODE>$HOME/.mplayer/Skin</CODE> extrahiert werden. MPlayer sucht
+(<CODE>$PREFIX/share/mplayer/skins/</CODE>) oder nach
+<CODE>$HOME/.mplayer/skins/</CODE> extrahiert werden. MPlayer sucht
 standardm&auml;&szlig;ig nach einem Verzeichnis namens <CODE>default</CODE>,
 aber du kannst mit der Option <CODE>-skin (neuer Skin)</CODE> oder dem Eintrag
 <CODE>skin=(neuer Skin)</CODE> in der Konfigurationsdatei den Skin
-<CODE>*/Skin/(neuer Skin)</CODE> ausw&auml;hlen.</P>
+<CODE>*/skins/(neuer Skin)</CODE> ausw&auml;hlen.</P>
   
 <H2><A NAME="subtitles_osd">1.4 Untertitel und das OSD</H2>
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/it/documentation.html
--- a/DOCS/it/documentation.html	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/it/documentation.html	Mon Mar 27 11:39:27 2006 +0000
@@ -790,11 +790,11 @@
 
 <P>Dato che MPlayer non ha una skin inclusa, devi scaricarle
 se vuoi usare la GUI. Vedi la <A HREF="http://www.mplayerhq.hu/dload.html">pagina dei download</A>.
-Dovranno essere estratti nella solita directory valida per tutto il sistema (<CODE>$PREFIX/share/mplayer/Skin</CODE>),
-o in <CODE>$HOME/.mplayer/Skin</CODE> . MPlayer cerca in
+Dovranno essere estratti nella solita directory valida per tutto il sistema (<CODE>$PREFIX/share/mplayer/skins/</CODE>),
+o in <CODE>$HOME/.mplayer/skins/</CODE> . MPlayer cerca in
 queste una directory di nome  <I>default</I>, ma puoi usare l'opzione
 <I>-skin nuovaskin</I>, o la direttiva <I>skin=nuovaskin</I> del file di configurazione
-per usare la skin nella directory <CODE>*/Skin/nuovaskin</CODE>.</P>
+per usare la skin nella directory <CODE>*/skins/nuovaskin</CODE>.</P>
 
 <H2><A NAME="subtitles_osd">1.4. Sottotitoli e OSD</A></H2>
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/it/skin.html
--- a/DOCS/it/skin.html	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/it/skin.html	Mon Mar 27 11:39:27 2006 +0000
@@ -47,9 +47,9 @@
 
 <p>Le directory in cui si cerca per le skin sono (in ordine):
 <pre>
-    $(DATADIR)/Skin/
-    $(PREFIX)/share/mplayer/Skin/
-    ~/.mplayer/Skin/
+    $(DATADIR)/skins/
+    $(PREFIX)/share/mplayer/skins/
+    ~/.mplayer/skins/
 </pre>
 
 <p>Nota che il primo path può variare a seconda di come è stato configurato
@@ -59,7 +59,7 @@
 <p>Ogni skin è installata in una sua propria directory sotto una delle directory
 elencate sopra, per esempio:
 <pre>
-    $(PREFIX)/share/mplayer/Skin/default/
+    $(PREFIX)/share/mplayer/skins/default/
 </pre>
 
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/cs/mplayer.1
--- a/DOCS/man/cs/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/cs/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -892,14 +892,14 @@
 .TP
 .B \-skin <jméno> (pouze GUI)
 Nahraje skin z adresáøe <jméno>. Zde jsou výchozí
-adresáøe se skiny:\& /usr/\:local/\:share/\:mplayer/\:Skin/\: a ~/.mplayer/\:Skin/.
+adresáøe se skiny:\& /usr/\:local/\:share/\:mplayer/\:skins/\: a ~/.mplayer/\:skins/.
 .sp 1
 .I PØÍKLAD:
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-Zkou¹í /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene
-a poté ~/.mplayer/\:Skin/\:fittyfene.
+Zkou¹í /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene
+a poté ~/.mplayer/\:skins/\:fittyfene.
 .RE
 .PD 1
 .
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/de/mplayer.1
--- a/DOCS/man/de/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/de/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -943,14 +943,14 @@
 .B \-skin <Name> (nur mit GUI)
 Lädt eine Oberfläche (skin) aus dem angegebenen Verzeichnis, das sich in einem
 der beiden Standardoberflächenverzeichnisse
-/usr/\:local/\:share/\:mplayer/\:Skin/\: und ~/.mplayer/\:Skin/ befindet.
+/usr/\:local/\:share/\:mplayer/\:skins/\: und ~/.mplayer/\:skins/ befindet.
 .sp 1
 .I BEISPIEL:
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-Probiert zuerst /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene und
-anschließend ~/.mplayer/\:Skin/\:fittyfene.
+Probiert zuerst /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene und
+anschließend ~/.mplayer/\:skins/\:fittyfene.
 .RE
 .PD 1
 .
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -901,14 +901,14 @@
 .TP
 .B \-skin <name> (GUI only)
 Loads a skin from the directory given as parameter below the default skin
-directories, /usr/\:local/\:share/\:mplayer/\:Skin/\: and ~/.mplayer/\:Skin/.
+directories, /usr/\:local/\:share/\:mplayer/\:skins/\: and ~/.mplayer/\:skins/.
 .sp 1
 .I EXAMPLE:
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-Tries /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene
-and afterwards ~/.mplayer/\:Skin/\:fittyfene.
+Tries /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene
+and afterwards ~/.mplayer/\:skins/\:fittyfene.
 .RE
 .PD 1
 .
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/es/mplayer.1
--- a/DOCS/man/es/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/es/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -662,14 +662,14 @@
 .B \-skin <nombre> (sólo GUI)
 Carga un skin del directorio dado como parámetro bajo el directorio
 por defecto para los skins, /usr/\:local/\:share/\:mplayer/ y
-~/.mplayer/\:Skin/.
+~/.mplayer/\:skins/.
 .sp 1 
 .I EJEMPLO:
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-Intenta usar /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene y
-después ~/.mplayer/\:Skin/\:fittyfene.
+Intenta usar /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene y
+después ~/.mplayer/\:skins/\:fittyfene.
 .RE
 .PD 1
 .
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/fr/mplayer.1
--- a/DOCS/man/fr/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/fr/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -934,14 +934,14 @@
 .TP
 .B \-skin <nom_skin> (GUI uniquement)
 Charge le skin <nom_skin> (revêtement décoratif) depuis les répertoires
-par défaut /usr/\:local/\:share/\:mplayer/\:Skin/\: et ~/.mplayer/\:Skin/.
+par défaut /usr/\:local/\:share/\:mplayer/\:skins/\: et ~/.mplayer/\:skins/.
 .sp 1
 .I EXEMPLE:
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-Essaie /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene en premier, puis
-~/.mplayer/\:Skin/\:fittyfene en cas d'échec.
+Essaie /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene en premier, puis
+~/.mplayer/\:skins/\:fittyfene en cas d'échec.
 .RE
 .PD 1
 .
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/hu/mplayer.1
--- a/DOCS/man/hu/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/hu/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -533,7 +533,7 @@
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-megpróbálja a Skin/fittyfenét.
+megpróbálja a skins/fittyfenét.
 Elõször az 
 /usr/local/share/mplayer/
 könyvtárban, majd a ~/.mplayer/ könyvtárban.
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/it/mplayer.1
--- a/DOCS/man/it/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/it/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -925,15 +925,15 @@
 .TP
 .B \-skin <nome> (solo GUI)
 Carica la skin dalla directory specificata come parametro sotto le directory
-di default delle skin, /usr/\:local/\:share/\:mplayer/\:Skin/ e
-~/.mplayer/\:Skin/.
+di default delle skin, /usr/\:local/\:share/\:mplayer/\:skins/ e
+~/.mplayer/\:skins/.
 .sp 1
 .I ESEMPIO:
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-Prova prima in /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene
-e poi in ~/.mplayer/\:Skin/\:fittyfene.
+Prova prima in /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene
+e poi in ~/.mplayer/\:skins/\:fittyfene.
 .RE
 .PD 1
 .
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/pl/mplayer.1
--- a/DOCS/man/pl/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/pl/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -734,15 +734,15 @@
 .TP
 .B \-skin <nazwa> (tylko z GUI)
 Za³aduje skórkê z podanego jako parametr katalogu znajduj±cego siê pod
-domy¶lnymi katalogami skórek, /usr/\:local/\:share/\:mplayer/\:Skin/
-i ~/.mplayer/Skin.
+domy¶lnymi katalogami skórek, /usr/\:local/\:share/\:mplayer/\:skins/
+i ~/.mplayer/skins/.
 .sp 1
 .I PRZYK£AD:
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-Próbuje za³adowaæ /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene,
-pó¼niej ~/.mplayer/\:Skin/\:fittyfene.
+Próbuje za³adowaæ /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene,
+pó¼niej ~/.mplayer/\:skins/\:fittyfene.
 .RE
 .PD 1
 .
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/sv/mplayer.1
--- a/DOCS/man/sv/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/sv/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -647,13 +647,13 @@
 .TP
 .B \-skin <namn> (Endast GUI)
 Ladda angivet skin från en katalog vilke som standard är:
-/usr/\:local/\:share/\:mplayer/\:Skin/\: samt ~/.mplayer/\:Skin/.
+/usr/\:local/\:share/\:mplayer/\:skins/\: samt ~/.mplayer/\:skins/.
 .sp 1
 .I EXEMPEL:
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-Försöker /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene och efteråt ~/.mplayer/\:Skin/\:fittyfene.
+Försöker /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene och efteråt ~/.mplayer/\:skins/\:fittyfene.
 .RE
 .PD 1
 .
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/man/zh/mplayer.1
--- a/DOCS/man/zh/mplayer.1	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/man/zh/mplayer.1	Mon Mar 27 11:39:27 2006 +0000
@@ -290,7 +290,7 @@
 .PD 0
 .RSs
 .IPs "\-skin fittyfene"
-³¢ÊÔSkin/fittyfene.
+³¢ÊÔskins/fittyfene.
 ½«»áÊ×ÏȲ쿴/usr/local/share/mplayer/,
 È»ºóÊÇ~/.mplayer/.
 .RE
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/tech/TODO
--- a/DOCS/tech/TODO	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/tech/TODO	Mon Mar 27 11:39:27 2006 +0000
@@ -42,6 +42,10 @@
 FOR THE v1.00 RELEASE:
 ~~~~~~~~~~~~~~~~~~~~~~
 
+cruft removal:
+- remove support for skins directories using the obsolete name 'Skin'
+
+DVB:
 - display OSD and subtitles using DVB card's OSD
 
 mpg demuxer:
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/tech/binary-packaging.txt
--- a/DOCS/tech/binary-packaging.txt	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/tech/binary-packaging.txt	Mon Mar 27 11:39:27 2006 +0000
@@ -101,7 +101,7 @@
 /usr/share/man/man1/            man page
 /usr/share/man/XX/man1/         translated man page
 /usr/share/mplayer/font/        fonts
-/usr/share/mplayer/Skin/        GUI skins
+/usr/share/mplayer/skins/       GUI skins
 
 You MUSTN'T include the codecs.conf file in your package. It is useful
 only for development purposes and often causes obscure problems for users.
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/cs/install.xml
--- a/DOCS/xml/cs/install.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/cs/install.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -586,13 +586,13 @@
   muset nìjaký stáhnout abyste mohli pou¾ívat GUI. Viz na¹i <ulink
   url="http://www.mplayerhq.hu/dload.html">download stránku</ulink>.
   Skiny by mìly být rozbaleny do obvyklého systémového adresáøe
-  (<filename class="directory">$PREFIX/share/mplayer/Skin</filename>),
-  nebo do <filename class="directory">$HOME/.mplayer/Skin</filename>.
+  (<filename class="directory">$PREFIX/share/mplayer/skins</filename>),
+  nebo do <filename class="directory">$HOME/.mplayer/skins</filename>.
   <application>MPlayer</application> ve výchozím stavu hledá v tìchto adresáøích
   podadresáø jménem <filename class="directory">default</filename>, ale
   mù¾ete pou¾ít volbu <option>-skin <replaceable>nový_skin</replaceable></option>
   nebo direktivu <literal>skin=nový_skin</literal> konfiguraèního souboru pro
-  pou¾ití skinu v adresáøi <filename class="directory">*/Skin/nový_skin</filename>.
+  pou¾ití skinu v adresáøi <filename class="directory">*/skins/nový_skin</filename>.
 </para>
 </sect1>
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/cs/skin.xml
--- a/DOCS/xml/cs/skin.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/cs/skin.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -34,13 +34,13 @@
 Adresáøe prohledávané na skiny jsou (v tomto poøadí):
 <orderedlist>
 <listitem><para>
-<filename class="directory">$(DATADIR)/Skin/</filename>
+<filename class="directory">$(DATADIR)/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
+<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">~/.mplayer/Skin/</filename>
+<filename class="directory">~/.mplayer/skins/</filename>
 </para></listitem>
 </orderedlist>
 </para>
@@ -54,7 +54,7 @@
 <para>
 Ka¾dý skin je instalován do vlastního adresáøe v nìkterém z vý¹e uvedených.
 Napøíklad:
-<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
+<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
 </para>
 </sect2>
 
@@ -267,7 +267,7 @@
 
 <para>
 Jméno souboru s obrázkem musí být zadáno bez úvodních adresáøù - obrázky jsou
-vyhledávány v adresáøi <filename class="directory">Skin</filename>.
+vyhledávány v adresáøi <filename class="directory">skins</filename>.
 Mìli byste (ale nemusíte) zadat pøíponu souboru. Pokud soubor neexistuje,
 zkou¹í <application>MPlayer</application> naèíst soubor
 <filename>&lt;jméno&gt;.&lt;pøíp&gt;</filename>, kdy jsou za
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/en/install.xml
--- a/DOCS/xml/en/install.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/en/install.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -547,13 +547,13 @@
 have to download them if you want to use the GUI. See the <ulink
 url="http://www.mplayerhq.hu/dload.html">download page</ulink>.
 They should be extracted to the usual system-wide directory (<filename
-class="directory">$PREFIX/share/mplayer/Skin</filename>), or to <filename
-class="directory">$HOME/.mplayer/Skin</filename>.
+class="directory">$PREFIX/share/mplayer/skins</filename>), or to <filename
+class="directory">$HOME/.mplayer/skins</filename>.
 <application>MPlayer</application> by default looks in these directories
 for a directory named <filename class="directory">default</filename>, but
 you can use the <option>-skin <replaceable>newskin</replaceable></option>
 option, or the <literal>skin=newskin</literal> config file directive to use
-the skin in <filename class="directory">*/Skin/newskin</filename>
+the skin in <filename class="directory">*/skins/newskin</filename>
 directory.
 </para>
 </sect1>
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/en/skin.xml
--- a/DOCS/xml/en/skin.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/en/skin.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -18,13 +18,13 @@
 The directories searched for skins are (in order):
 <orderedlist>
 <listitem><para>
-<filename class="directory">$(DATADIR)/Skin/</filename>
+<filename class="directory">$(DATADIR)/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
+<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">~/.mplayer/Skin/</filename>
+<filename class="directory">~/.mplayer/skins/</filename>
 </para></listitem>
 </orderedlist>
 </para>
@@ -38,7 +38,7 @@
 <para>
 Every skin is installed into its own directory under one of the directories
 listed above, for example:
-<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
+<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
 </para>
 </sect2>
 
@@ -253,7 +253,7 @@
 
 <para>
 The name of an image file must be given without leading directories - images
-are searched for in the <filename class="directory">Skin</filename> directory.
+are searched for in the <filename class="directory">skins</filename> directory.
 You may (but you need not) specify the extension of the file. If the file does
 not exist, <application>MPlayer</application> tries to load the file
 <filename>&lt;filename&gt;.&lt;ext&gt;</filename>, where <literal>png</literal>
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/es/install.xml
--- a/DOCS/xml/es/install.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/es/install.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -542,13 +542,13 @@
 bajarlas si desea usar la GUI. Vea la <ulink
 url="http://www.mplayerhq.hu/dload.html">página de descargas</ulink>.
 Deberían ser extraídas al directorio global de pieles normal (<filename
-class="directory">$PREFIX/share/mplayer/Skin</filename>), o al directorio
-personal  <filename class="directory">$HOME/.mplayer/Skin</filename>.
+class="directory">$PREFIX/share/mplayer/skins/</filename>), o al directorio
+personal  <filename class="directory">$HOME/.mplayer/skins/</filename>.
 <application>MPlayer</application> por omisión busca en esos directorios 
 por un directorio llamado <filename class="directory">default</filename>, pero
 puede usar la opción <option>-skin <replaceable>pielnueva</replaceable></option>,
 o usar la directiva <literal>skin=pielnueva</literal> en el archivo de configuración
-para usar el directorio <filename class="directory">*/Skin/pielnueva</filename>.
+para usar el directorio <filename class="directory">*/skins//pielnueva</filename>.
 </para>
 </sect1>
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/es/skin.xml
--- a/DOCS/xml/es/skin.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/es/skin.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -33,13 +33,13 @@
 Los directorios donde se buscan los skins son (en orden):
 <orderedlist>
 <listitem><para>
-<filename class="directory">$(DATADIR)/Skin/</filename>
+<filename class="directory">$(DATADIR)/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
+<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">~/.mplayer/Skin/</filename>
+<filename class="directory">~/.mplayer/skins/</filename>
 </para></listitem>
 </orderedlist>
 </para>
@@ -54,7 +54,7 @@
 <para>
 Todo skin es instalado en su propio directorio bajo uno de los directorios
 listados más arriba, por ejemplo:
-<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
+<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
 </para>
 </sect2>
 
@@ -275,7 +275,7 @@
 
 <para>
 El nombre de un archivo de imagen se debe dar sin los directorios - las imágenes
-se buscan en el directorio <filename class="directory">Skin</filename>.
+se buscan en el directorio <filename class="directory">skins</filename>.
 También puede (pero necesita ser root) especificar la extensión del archivo. Si
 el archivo no existe, <application>MPlayer</application> intentará cargar el
 archivo
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/fr/install.xml
--- a/DOCS/xml/fr/install.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/fr/install.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -540,11 +540,11 @@
 devrez la télécharger si vous voulez utiliser la GUI. Voir la <ulink
 url="http://www.mplayerhq.hu/dload.html">page des téléchargements</ulink>.
 Elles pourront se placer dans le répertoire commun (<filename class="directory">
-$PREFIX/share/mplayer/Skin</filename>), ou dans <filename class="directory">$HOME/.mplayer/Skin</filename>.
+$PREFIX/share/mplayer/skins</filename>), ou dans <filename class="directory">$HOME/.mplayer/skins</filename>.
 Par défaut, <application>MPlayer</application> consulte ces répertoires à la recherche
 d'un répertoire nommé <filename class="directory">default</filename>, mais vous pouvez utiliser l'option
 <option>-skin <replaceable>nouvelleskin</replaceable></option>, ou placer <literal>skin=nouvelleskin</literal>
-dans votre fichier de configuration pour utiliser la skin dans le répertoire <filename class="directory">*/Skin/newskin</filename>.
+dans votre fichier de configuration pour utiliser la skin dans le répertoire <filename class="directory">*/skins/newskin</filename>.
 </para>
 </sect1>
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/fr/skin.xml
--- a/DOCS/xml/fr/skin.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/fr/skin.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -18,13 +18,13 @@
 <application>MPlayer</application> cherche des skins dans ces répertoires (dans cet ordre):
 <orderedlist>
 <listitem><para>
-<filename class="directory">$(DATADIR)/Skin/</filename>
+<filename class="directory">$(DATADIR)/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
+<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">~/.mplayer/Skin/</filename>
+<filename class="directory">~/.mplayer/skins/</filename>
 </para></listitem>
 </orderedlist>
 </para>
@@ -38,7 +38,7 @@
 <para>
 Chaque skin est installée dans son propre répertoire sous l'un des répertoires
 listés ci-dessus, par exemple:
-<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
+<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
 </para>
 </sect2>
 
@@ -254,7 +254,7 @@
 
 <para>
 Le nom d'un fichier image doit être donné sans distinction de répertoire - les
-images seront cherchées dans le répertoire <filename class="directory">Skin</filename>.
+images seront cherchées dans le répertoire <filename class="directory">skins</filename>.
 Vous pouvez (mais ce n'est pas obligatoire) spécifier l'extension du fichier. Si
 le fichier n'existe pas, <application>MPlayer</application> essaie de charger le fichier
 <filename>&lt;nomfichier&gt;.&lt;ext&gt;</filename>, où <literal>png</literal>
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/hu/install.xml
--- a/DOCS/xml/hu/install.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/hu/install.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -538,14 +538,14 @@
 le kell töltened õket, ha a GUI-t használni akarod. Lásd a <ulink
 url="http://www.mplayerhq.hu/dload.html">letöltési oldalt</ulink>.
 Ajánlott egy rendszerszinten elérhetõ könyvtárba tenni õket (<filename
-class="directory">$PREFIX/share/mplayer/Skin</filename>), vagy a <filename
-class="directory">$HOME/.mplayer/Skin</filename>-be.
+class="directory">$PREFIX/share/mplayer/skins</filename>), vagy a <filename
+class="directory">$HOME/.mplayer/skins</filename>-be.
 Az <application>MPlayer</application> ezekben a könyvtárakban
 keres egy <filename class="directory">default</filename> nevû alkönyvtárat, amelyben
 az alapértelmezett skin van. Megadhatsz más könyvtárat is a
 <option>-skin <replaceable>newskin</replaceable></option> kapcsolóval vagy a
 <literal>skin=newskin</literal> sorral a konfigurációs fájlban, és ekkor a
-<filename class="directory">*/Skin/newskin</filename> könyvtárban lévõ skin lesz
+<filename class="directory">*/skins/newskin</filename> könyvtárban lévõ skin lesz
 használatban.
 </para>
 </sect1>
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/hu/skin.xml
--- a/DOCS/xml/hu/skin.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/hu/skin.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -18,13 +18,13 @@
 Az alábbi könyvtárak kerülnek átvizsgálásra (sorrendben):
 <orderedlist>
 <listitem><para>
-<filename class="directory">$(DATADIR)/Skin/</filename>
+<filename class="directory">$(DATADIR)/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
+<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">~/.mplayer/Skin/</filename>
+<filename class="directory">~/.mplayer/skins/</filename>
 </para></listitem>
 </orderedlist>
 </para>
@@ -38,7 +38,7 @@
 <para>
 Minden skin a saját könyvtárába kerül telepítésre a fent felsorolt könyvtárakon
 belül, például:
-<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
+<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
 </para>
 </sect2>
 
@@ -253,7 +253,7 @@
 
 <para>
 Egy kép fájl nevét a hozzá vezetõ útvonal nélkül kell megadni - a képeknek
-a <filename class="directory">Skin</filename> könyvtárban kell lenniük.
+a <filename class="directory">skins</filename> könyvtárban kell lenniük.
 A fájl kiterjesztését megadhatod (de nem kötelezõ). Ha a fájl nem létezik,
 az <application>MPlayer</application> megpróbálja betölteni a
 <filename>&lt;filename&gt;.&lt;ext&gt;</filename> fájlt, ahol <literal>png</literal>
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/pl/install.xml
--- a/DOCS/xml/pl/install.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/pl/install.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -561,14 +561,14 @@
 je ¶ci±gn±æ, je¿eli chcesz u¿ywaæ GUI. Sprawd¼ <ulink
 url="http://www.mplayerhq.hu/dload.html">stronê z zasobami do pobrania</ulink>.
 Skórki powinny byæ rozpakowane do katalogu dostêpnego dla wszystkich (<filename
-class="directory">$PREFIX/share/mplayer/Skin</filename>) lub do <filename
-class="directory">$HOME/.mplayer/Skin</filename>.
+class="directory">$PREFIX/share/mplayer/skins</filename>) lub do <filename
+class="directory">$HOME/.mplayer/skins</filename>.
 <application>MPlayer</application> sprawdza je w poszukiwaniu
 folderu nazwanego <filename class="directory">default</filename>, ale
 mo¿esz u¿yæ opcji <option>-skin <replaceable>nowaskórka</replaceable></option>
 lub wpisaæ do pliku konfiguracyjnego <literal>skin=nowaskórka</literal>, aby
 program korzysta³ ze skórki w katalogu
-<filename class="directory">*/Skin/nowaskórka</filename>.
+<filename class="directory">*/skins/nowaskórka</filename>.
 </para>
 </sect1>
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/pl/skin.xml
--- a/DOCS/xml/pl/skin.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/pl/skin.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -35,13 +35,13 @@
 Skórki s± szukane w nastêpuj±cych katalogach (w kolejno¶ci):
 <orderedlist>
 <listitem><para>
-<filename class="directory">$(DATADIR)/Skin/</filename>
+<filename class="directory">$(DATADIR)/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
+<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
 </para></listitem>
 <listitem><para>
-<filename class="directory">~/.mplayer/Skin/</filename>
+<filename class="directory">~/.mplayer/skins/</filename>
 </para></listitem>
 </orderedlist>
 </para>
@@ -56,7 +56,7 @@
 <para>
 Ka¿da skórka jest instalowana w swoim w³asnym katalogu, w jednej z wy¿ej
 wymienionych lokacji, na przyk³ad:
-<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
+<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
 </para>
 </sect2>
 
@@ -280,7 +280,7 @@
 
 <para>
 Nazwa pliku graficznego musi zostaæ podana bez ¿adnych nazw katalogów - obrazki
-s± szukane w katalogu <filename class="directory">Skin</filename>.
+s± szukane w katalogu <filename class="directory">skins</filename>.
 Mo¿esz (ale nie musisz) okre¶liæ rozszerzenia tego pliku. Je¶li plik taki nie
 istnieje, <application>MPlayer</application>
 spróbuje wczytaæ plik <filename>&lt;nazwa pliku&gt;.&lt;rozszerzenie&gt;</filename>,
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/xml/ru/install.xml
--- a/DOCS/xml/ru/install.xml	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/xml/ru/install.xml	Mon Mar 27 11:39:27 2006 +0000
@@ -540,11 +540,11 @@
 ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ GUI. óÍ. 
 <ulink url="http://www.mplayerhq.hu/dload.html">download page[ÓÔÒÁÎÉÃÕ
 ÚÁËÁÞÅË]</ulink>. ïÎÉ ÄÏÌÖÎÙ ÂÙÔØ ÉÚ×ÌÅÞÅÎÙ × ÓÉÓÔÅÍÎÙÊ ËÁÔÁÌÏÇ
-(<filename class="directory">$PREFIX/share/mplayer/Skin</filename>), ÉÌÉ × 
-<filename class="directory">$HOME/.mplayer/Skin</filename>. ðÏ ÕÍÏÌÞÁÎÉÀ, MPlayer ÉÝÅÔ ËÁÔÁÌÏÇ <filename class="directory">default</filename>
+(<filename class="directory">$PREFIX/share/mplayer/skins</filename>), ÉÌÉ × 
+<filename class="directory">$HOME/.mplayer/skins</filename>. ðÏ ÕÍÏÌÞÁÎÉÀ, MPlayer ÉÝÅÔ ËÁÔÁÌÏÇ <filename class="directory">default</filename>
 × ÜÔÉÈ ËÁÔÁÌÏÇÁÈ, ÎÏ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÃÉÀ <option>-skin <replaceable>newskin</replaceable></option>,
 ÉÌÉ ÄÉÒÅËÔÉ×Õ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ <option>skin=newskin</option>, ÞÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ
-ÛËÕÒÕ ÉÚ ËÁÔÁÌÏÇÁ <filename class="directory">*/Skin/newskin</filename>.
+ÛËÕÒÕ ÉÚ ËÁÔÁÌÏÇÁ <filename class="directory">*/skins/newskin</filename>.
 </para>
 </sect1>
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/zh/documentation.html
--- a/DOCS/zh/documentation.html	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/zh/documentation.html	Mon Mar 27 11:39:27 2006 +0000
@@ -657,9 +657,9 @@
 <P>Ä¿Ç°ÓÉÓÚ¼¼ÊõÔ­Òò£¬Ä¿Ç°Äã²»ÄÜÔÚÃüÁîÐÐÏÂʹÓÃ<CODE>-gui</CODE>Ñ¡Ïî¡£</P>
 
 <P>ÒòΪMPlayer²»×Ô´øskin£¬ËùÒÔÈç¹ûÄãÏëҪʹÓÃGUI£¬Äã±ØÐë×Ô¼ºÏÂÔØËüÃÇ¡£²Î¼û<A HREF="http://www.mplayerhq.hu/dload.html">ÏÂÔØÒ³</A>¡£
-ËûÃÇÓ¦¸Ã±»½âѹµ½ÏµÍ³Í¨ÓõÄĿ¼(<CODE>$PREFIX/share/mplayer/Skin</CODE>)£¬»òÕß½âѹµ½<CODE>$HOME/.mplayer/Skin</CODE>¡£
+ËûÃÇÓ¦¸Ã±»½âѹµ½ÏµÍ³Í¨ÓõÄĿ¼(<CODE>$PREFIX/share/mplayer/skins/</CODE>)£¬»òÕß½âѹµ½<CODE>$HOME/.mplayer/skins/</CODE>¡£
 MPlayerÔÚĬÈÏÇé¿öÏ»áÔÚÕâЩµÄĿ¼ÀïÑ°ÕÒÒ»¸ö½Ð<I>default</I>µÄĿ¼£¬
-µ«ÊÇÄãÄÜʹÓÃ<CODE>-skin newskin</CODE>Ñ¡Ïî»òÔÚconfigÎļþÖÐÌí¼Ó<CODE>skin=newskin</CODE>À´Ç¿ÖÆʹÓÃ<CODE>*/Skin/newskin</CODE>Ŀ¼ÏµÄskin¡£</P>
+µ«ÊÇÄãÄÜʹÓÃ<CODE>-skin newskin</CODE>Ñ¡Ïî»òÔÚconfigÎļþÖÐÌí¼Ó<CODE>skin=newskin</CODE>À´Ç¿ÖÆʹÓÃ<CODE>*/skins/newskin</CODE>Ŀ¼ÏµÄskin¡£</P>
 
 <H2><A NAME="subtitles_osd">1.4 ×ÖÄ»ºÍOSD</A></H2>
 
diff -r 75442247ee56 -r 9a5a62f480e6 DOCS/zh/skin.html
--- a/DOCS/zh/skin.html	Mon Mar 27 10:32:52 2006 +0000
+++ b/DOCS/zh/skin.html	Mon Mar 27 11:39:27 2006 +0000
@@ -40,9 +40,9 @@
 
 <p>skinµÄËÑË÷Ŀ¼(°´Ë³Ðò)ÊÇ£º</p>
 <pre>
-    $(DATADIR)/Skin/
-    $(PREFIX)/share/mplayer/Skin/
-    ~/.mplayer/Skin/
+    $(DATADIR)/skins/
+    $(PREFIX)/share/mplayer/skins/
+    ~/.mplayer/skins/
 </pre>
 
 <p>×¢Ò⣬µÚÒ»¸ö·¾¶ÒÐÀµÓÚMPlayerµÄ°²×°ÅäÖÃ(¼û<code>configure</code>½Å±¾
@@ -50,7 +50,7 @@
 
 <p>ËùÓеÄskin±»°²×°µ½ÉÏÃæÁгöµÄÒ»¸öĿ¼ÏµÄ×Ô¼ºµÄĿ¼ÖУ¬ÀýÈ磺</p>
 <pre>
-    $(PREFIX)/share/mplayer/Skin/default/
+    $(PREFIX)/share/mplayer/skins/default/
 </pre>
 
 
@@ -207,7 +207,7 @@
   </tr>
 </table>
 
-<p>ͼÏñÎļþµÄÃû³Æ±ØÐë²»´øĿ¼Ãû -- ͼÏñÔÚ<code>Skin</code>Ŀ¼Öб»ËÑË÷¡£ÄãÄÜ(µ«ÊDz¢²»ÐèÒª)¹æ¶¨À©Õ¹Ãû¡£
+<p>ͼÏñÎļþµÄÃû³Æ±ØÐë²»´øĿ¼Ãû -- ͼÏñÔÚ<code>skins</code>Ŀ¼Öб»ËÑË÷¡£ÄãÄÜ(µ«ÊDz¢²»ÐèÒª)¹æ¶¨À©Õ¹Ãû¡£
 Èç¹ûÎļþ²»´æÔÚ£¬MPlayer½«ÊÔͼװÔØ<code>&lt;filename&gt;.&lt;ext&gt;</code>Îļþ£¬
 <code>&lt;ext&gt;</code>¿ÉÒÔÊÇ<code>png</code>»òÕß<code>PNG</code>(°´Õâ¸ö˳Ðò³¢ÊÔ)¡£µÚÒ»¸öÆ¥ÅäÎļþ½«±»Ê¹Óá£</p>
 
diff -r 75442247ee56 -r 9a5a62f480e6 Gui/app.c
--- a/Gui/app.c	Mon Mar 27 10:32:52 2006 +0000
+++ b/Gui/app.c	Mon Mar 27 11:39:27 2006 +0000
@@ -74,8 +74,11 @@
 
 listItems   appMPlayer;
 
+/* FIXME: Eventually remove the obsolete directory names. */
 char      * skinDirInHome=NULL;
+char      * skinDirInHome_obsolete=NULL;
 char      * skinMPlayerDir=NULL;
+char      * skinMPlayerDir_obsolete=NULL;
 char      * skinName = NULL;
 
 void appClearItem( wItem * item )
diff -r 75442247ee56 -r 9a5a62f480e6 Gui/app.h
--- a/Gui/app.h	Mon Mar 27 10:32:52 2006 +0000
+++ b/Gui/app.h	Mon Mar 27 11:39:27 2006 +0000
@@ -171,7 +171,9 @@
 extern listItems   appMPlayer;
 
 extern char      * skinDirInHome;
+extern char      * skinDirInHome_obsolete;
 extern char      * skinMPlayerDir;
+extern char      * skinMPlayerDir_obsolete;
 extern char      * skinName;
 
 extern void appInitStruct( listItems * item );
diff -r 75442247ee56 -r 9a5a62f480e6 Gui/interface.c
--- a/Gui/interface.c	Mon Mar 27 10:32:52 2006 +0000
+++ b/Gui/interface.c	Mon Mar 27 11:39:27 2006 +0000
@@ -215,10 +215,14 @@
 // --- initialize X 
  wsXInit( (void *)mDisplay );
 // --- load skin
- skinDirInHome=get_path("Skin");
- skinMPlayerDir=MPLAYER_DATADIR "/Skin";
+ skinDirInHome=get_path("skins");
+ skinDirInHome_obsolete=get_path("Skin");
+ skinMPlayerDir=MPLAYER_DATADIR "/skins";
+ skinMPlayerDir_obsolete=MPLAYER_DATADIR "/Skin";
  mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1: '%s'\n",skinDirInHome);
+ mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1 (obsolete): '%s'\n",skinDirInHome_obsolete);
  mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2: '%s'\n",skinMPlayerDir);
+ mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2 (obsolete): '%s'\n",skinMPlayerDir_obsolete);
  if ( !skinName ) skinName=strdup( "default" );
  i = skinRead( skinName );
  if ((i == -1) && strcmp(skinName,"default"))
diff -r 75442247ee56 -r 9a5a62f480e6 Gui/mplayer/gtk/sb.c
--- a/Gui/mplayer/gtk/sb.c	Mon Mar 27 10:32:52 2006 +0000
+++ b/Gui/mplayer/gtk/sb.c	Mon Mar 27 11:39:27 2006 +0000
@@ -18,8 +18,11 @@
 
 GtkWidget * SkinList = NULL;
 char      * sbSelectedSkin=NULL;
+/* FIXME: Eventually remove the obsolete directory names. */
 char      * sbMPlayerDirInHome=NULL;
+char      * sbMPlayerDirInHome_obsolete=NULL;
 char      * sbMPlayerPrefixDir=NULL;
+char      * sbMPlayerPrefixDir_obsolete=NULL;
 
 char * gtkOldSkin;
 static char * prev;
@@ -173,8 +176,12 @@
  gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)1 );
  gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)0 );
 
+ if ( ( sbMPlayerDirInHome_obsolete=(char *)calloc( 1,strlen( skinDirInHome_obsolete ) + 4 ) ) != NULL )
+  { strcpy( sbMPlayerDirInHome_obsolete,skinDirInHome_obsolete ); strcat( sbMPlayerDirInHome_obsolete,"/*" ); }
  if ( ( sbMPlayerDirInHome=(char *)calloc( 1,strlen( skinDirInHome ) + 4 ) ) != NULL )
   { strcpy( sbMPlayerDirInHome,skinDirInHome ); strcat( sbMPlayerDirInHome,"/*" ); }
+ if ( ( sbMPlayerPrefixDir_obsolete=(char *)calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL )
+  { strcpy( sbMPlayerPrefixDir_obsolete,skinMPlayerDir ); strcat( sbMPlayerPrefixDir_obsolete,"/*" ); }
  if ( ( sbMPlayerPrefixDir=(char *)calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL )
   { strcpy( sbMPlayerPrefixDir,skinMPlayerDir ); strcat( sbMPlayerPrefixDir,"/*" ); }
 
diff -r 75442247ee56 -r 9a5a62f480e6 Gui/mplayer/gtk/sb.h
--- a/Gui/mplayer/gtk/sb.h	Mon Mar 27 10:32:52 2006 +0000
+++ b/Gui/mplayer/gtk/sb.h	Mon Mar 27 11:39:27 2006 +0000
@@ -6,7 +6,9 @@
 extern GtkWidget * SkinList;
 extern char      * sbSelectedSkin;
 extern char      * sbMPlayerDirInHome;
+extern char      * sbMPlayerDirInHome_obsolete;
 extern char      * sbMPlayerPrefixDir;
+extern char      * sbMPlayerPrefixDir_obsolete;
 extern GtkWidget * SkinBrowser;
 
 extern void ShowSkinBrowser( void );
diff -r 75442247ee56 -r 9a5a62f480e6 Gui/mplayer/widgets.c
--- a/Gui/mplayer/widgets.c	Mon Mar 27 10:32:52 2006 +0000
+++ b/Gui/mplayer/widgets.c	Mon Mar 27 11:39:27 2006 +0000
@@ -167,7 +167,10 @@
    case evSkinBrowser:
 	ShowSkinBrowser();
 //        gtkClearList( SkinList );
-        if ( gtkFillSkinList( sbMPlayerPrefixDir ) && gtkFillSkinList( sbMPlayerDirInHome ) )
+        if ( gtkFillSkinList( sbMPlayerPrefixDir ) &&
+             gtkFillSkinList( sbMPlayerPrefixDir_obsolete ) &&
+             gtkFillSkinList( sbMPlayerDirInHome ) &&
+             gtkFillSkinList( sbMPlayerDirInHome_obsolete )  )
          {
           gtkSetDefaultToCList( SkinList,param );
 	  gtk_clist_sort( GTK_CLIST( SkinList ) );
diff -r 75442247ee56 -r 9a5a62f480e6 Gui/skin/skin.c
--- a/Gui/skin/skin.c	Mon Mar 27 10:32:52 2006 +0000
+++ b/Gui/skin/skin.c	Mon Mar 27 11:39:27 2006 +0000
@@ -676,8 +676,16 @@
    setname( skinMPlayerDir,dname );
    if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
     {
-     mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn );
-     return -1;
+     setname( skinDirInHome_obsolete,dname );
+     if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
+      {
+       setname( skinMPlayerDir_obsolete,dname );
+       if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
+        {
+         mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn );
+         return -1;
+        }
+      }
     }
   }
 
diff -r 75442247ee56 -r 9a5a62f480e6 Makefile
--- a/Makefile	Mon Mar 27 10:32:52 2006 +0000
+++ b/Makefile	Mon Mar 27 11:39:27 2006 +0000
@@ -494,9 +494,9 @@
 	echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
 	fi
 ifeq ($(GUI),yes)
-	@$(INSTALL) -d $(DATADIR)/Skin
+	@$(INSTALL) -d $(DATADIR)/skins
 	@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
-	@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
+	@echo "*** for GUI, and extract to $(DATADIR)/skins/"
 	@$(INSTALL) -d $(prefix)/share/pixmaps
 	$(INSTALL) -m 644 Gui/mplayer/pixmaps/mplayer-desktop.xpm $(prefix)/share/pixmaps/mplayer-desktop.xpm
 	@$(INSTALL) -d $(prefix)/share/applications
diff -r 75442247ee56 -r 9a5a62f480e6 README
--- a/README	Mon Mar 27 10:32:52 2006 +0000
+++ b/README	Mon Mar 27 11:39:27 2006 +0000
@@ -210,11 +210,11 @@
 STEP6: Installing a GUI skin
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Unpack the archive and put the contents in /usr/local/share/mplayer/Skin/ or
-~/.mplayer/Skin/. MPlayer will use the skin in the subdirectory named default
-of /usr/local/share/mplayer/Skin/ or ~/.mplayer/Skin/ unless told otherwise via
-the '-skin' switch. You should therefore rename your skin subdirectory or make
-a suitable symbolic link.
+Unpack the archive and put the contents in /usr/local/share/mplayer/skins/ or
+~/.mplayer/skins/. MPlayer will use the skin in the subdirectory named default
+of /usr/local/share/mplayer/skins/ or ~/.mplayer/skins/ unless told otherwise
+via the '-skin' switch. You should therefore rename your skin subdirectory or
+make a suitable symbolic link.
 
 
 __________________
diff -r 75442247ee56 -r 9a5a62f480e6 etc/example.conf
--- a/etc/example.conf	Mon Mar 27 10:32:52 2006 +0000
+++ b/etc/example.conf	Mon Mar 27 11:39:27 2006 +0000
@@ -91,7 +91,7 @@
 #framedrop = yes
 
 # Specify your preferred skin here (skins are searched for in
-# /usr/local/share/mplayer/Skin/<name> and ~/.mplayer/Skin/<name>).
+# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
 #skin = Abyss
 
 # Resample the font alphamap.