aboutsummaryrefslogtreecommitdiffhomepage
path: root/DOCS
diff options
context:
space:
mode:
authorGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-14 23:33:37 +0000
committerGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-14 23:33:37 +0000
commit47a665f8c9e45cf70c988c3e59f89e5c06e3c625 (patch)
tree653f46594eee5b192448213935379cd7dbd88fb2 /DOCS
parent0ba7f250d72b3809fd73114a14b97124762e2340 (diff)
The system-wide and the user-specific MEncoder configuration file should both
be called 'mencoder.conf', not two different names over which code and documentation disagree. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17870 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/cs/mplayer.14
-rw-r--r--DOCS/man/de/mplayer.12
-rw-r--r--DOCS/man/en/mplayer.14
-rw-r--r--DOCS/man/fr/mplayer.12
-rw-r--r--DOCS/man/it/mplayer.14
-rw-r--r--DOCS/man/pl/mplayer.12
6 files changed, 9 insertions, 9 deletions
diff --git a/DOCS/man/cs/mplayer.1 b/DOCS/man/cs/mplayer.1
index f00b1e9596..e1371b8a99 100644
--- a/DOCS/man/cs/mplayer.1
+++ b/DOCS/man/cs/mplayer.1
@@ -483,7 +483,7 @@ Systémový konfigurační soubor 'mplayer.conf' je v konfiguračním adresáři
konfigurační soubor je pak '~/\:.mplayer/\:config'.
Konfigurační soubor MEncoderu je 'mencoder.conf' v konfiguračním adresáři
(např\& /etc/\:mplayer nebo /usr/\:local/\:etc/\:mplayer), uživatelský
-je pak '~/\:.mplayer/\:mencoder'.
+je pak '~/\:.mplayer/\:mencoder.conf'.
Uživatelské volby přebijí systémové volby a příkazový řádek přebije vše.
Syntax konfiguračního souboru je 'volba=<hodnota>', všecko za '#' je považováno
za komentář.
@@ -9473,7 +9473,7 @@ Systémové nastavení MEncoderu.
Uživatelské nastavení MPlayeru.
.
.TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
Uživatelské nastavení MEncoderu.
.
.TP
diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1
index 19eab83b6f..2cb6b55374 100644
--- a/DOCS/man/de/mplayer.1
+++ b/DOCS/man/de/mplayer.1
@@ -9984,7 +9984,7 @@ Systemweite Einstellungen für MEncoder
Benutzerspezifische Einstellungen für MPlayer
.
.TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
Benutzerspezifische Einstellungen für MEncoder
.
.TP
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index aa4351e631..bae291bb2a 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -476,7 +476,7 @@ directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the user
specific one is '~/\:.mplayer/\:config'.
The configuration file for MEncoder is 'mencoder.conf' in your configuration
directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the
-user specific one is '~/\:.mplayer/\:mencoder.
+user specific one is '~/\:.mplayer/\:mencoder.conf.
User specific options override system-wide options and options given on the
command line override either.
The syntax of the configuration files is 'option=<value>', everything after
@@ -9560,7 +9560,7 @@ MEncoder system-wide settings
MPlayer user settings
.
.TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
MEncoder user settings
.
.TP
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 669cd74598..df8f37afcf 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -499,7 +499,7 @@ l'utilisateur se trouve dans '~/\:.mplayer/\:config'.
Le fichier de configuration pour MEncoder est 'mencoder.conf' qui se trouve
dans le répertoire habituel des fichiers de configuration (par ex.\&
/etc/\:mplayer ou /usr/\:local/\:etc/\:mplayer), et le fichier de
-configuration spécifique ŕ l'utilisateur est '~/\:.mplayer/\:mencoder.
+configuration spécifique ŕ l'utilisateur est '~/\:.mplayer/\:mencoder.conf.
Les options du fichier utilisateur ont priorité sur les options du fichier
global, et les options données sur la ligne de commande ont priorité sur tous
les fichiers.
diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1
index 64cd3a7452..66d204c91c 100644
--- a/DOCS/man/it/mplayer.1
+++ b/DOCS/man/it/mplayer.1
@@ -495,7 +495,7 @@ configurazione (p.es.\& /etc/\:mplayer o /usr/\:local/\:etc/\:mplayer), quello
specifico dell'utente č '~/\:.mplayer/\:config'.
Il file di configurazione per MEncoder č 'mencoder.conf' nella tua directory di
configurazione (p.es.\& /etc/\:mplayer o /usr/\:local/\:etc/\:mplayer), quello
-specifico dell'utente č '~/\:.mplayer/\:mencoder'.
+specifico dell'utente č '~/\:.mplayer/\:mencoder.conf'.
Le opzioni del file utente hanno precedenza sulle opzioni globali e le opzioni
della linea di comando hanno precedenza su quelle specificate in entrambi i file.
La sintassi del file di configurazione č 'option=<valore>', tutto quello che
@@ -9888,7 +9888,7 @@ configurazioni di sistema globali di MEncoder
configurazioni utente di MPlayer
.
.TP
-~/.mplayer/\:mencoder
+~/.mplayer/\:mencoder.conf
configurazioni utente di MEncoder
.
.TP
diff --git a/DOCS/man/pl/mplayer.1 b/DOCS/man/pl/mplayer.1
index 57101086fa..ce71882fa6 100644
--- a/DOCS/man/pl/mplayer.1
+++ b/DOCS/man/pl/mplayer.1
@@ -413,7 +413,7 @@ Główny zbiór konfiguracyjny "mplayer.conf" jest w katalogu konfiguracyjnym
użytkownika to "~/\:.mplayer/\:config".
Zbiorem konfiguracyjnym MEncodera jest "mencoder.conf" w katalogu
konfiguracyjnym (np.\& /etc/\:mplayer lub /usr/\:local/\:etc/\:mplayer),
-a specyficzny dla użytkownika to "~/\:.mplayer/\:mencoder".
+a specyficzny dla użytkownika to "~/\:.mplayer/\:mencoder.conf".
Opcje określone przez użytkownika unieważniają opcje z głównego zbioru, a opcje
podawane z wiersza poleceń unieważniają obie.
Składnia zbioru konfiguracyjnego to "opcja=<wartość>", wszystko po "#" uważane