---- aumix-2.1/doc/aumix.1 Mon Jan 31 23:30:12 2000
-+++ aumix-2.1.pius/doc/aumix.1 Fri Feb 4 00:50:48 2000
-@@ -115,7 +115,8 @@
+diff -Nru aumix-2.6/doc/aumix.1 aumix-2.6.new/doc/aumix.1
+--- aumix-2.6/doc/aumix.1 Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/doc/aumix.1 Fri Apr 14 06:46:17 2000
+@@ -115,15 +115,19 @@
go into interactive mode after doing things non-interactively.
.It Fl L
load settings from
+(depreciated), or
.Pa /etc/aumixrc
if the former is inaccessible
-@@ -123,7 +125,10 @@
+ .It Fl q
query all devices and print their settings
.It Fl S
save settings to
--.Pa $HOME/.aumixrc
+.Pa $CONFIG_DIR/aumixrc
+or
-+.Pa $HOME/.aumixrc
+ .Pa $HOME/.aumixrc
+(depreciated)
.El
- .Sh EXAMPLE
+ .Sh EXAMPLES
The command
-@@ -179,7 +184,10 @@
+@@ -189,7 +193,10 @@
show a description of the functions of keys
.It L or l
load settings from
falling back to
.Pa /etc/aumixrc
.It M or m
-@@ -247,8 +255,11 @@
+@@ -257,8 +264,11 @@
Saved settings for the mixer are kept in the
.Pa /etc/aumixrc
and
Color schemes are normally kept in the directory given
by
.Ev DATADIRNAME
---- aumix-2.1/src/Makefile.am Sat Dec 25 17:53:54 1999
-+++ aumix-2.1.pius/src/Makefile.am Thu Feb 3 16:26:12 2000
-@@ -1,8 +1,8 @@
+diff -Nru aumix-2.6/po/aumix.pot aumix-2.6.new/po/aumix.pot
+--- aumix-2.6/po/aumix.pot Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/aumix.pot Fri Apr 14 06:46:17 2000
+@@ -180,7 +180,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+diff -Nru aumix-2.6/po/de.po aumix-2.6.new/po/de.po
+--- aumix-2.6/po/de.po Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/de.po Fri Apr 14 06:48:27 2000
+@@ -188,7 +188,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc) or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+@@ -206,7 +206,7 @@
+ "Weitere Optionen:\n"
+ " d: Anderes Gerät als /dev/mixer benutzen\n"
+ " f: Spezifizieren Sie die Datei zum Speichern und Laden von Einstellungen\n"
+-" (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
++" (Standard sind ~/.aumixrc oder /etc/aumixrc) or /etc/aumixrc)\n"
+ " h: Diese nützlichen Informationen\n"
+
+ #: src/common.c:675
+diff -Nru aumix-2.6/po/es.po aumix-2.6.new/po/es.po
+--- aumix-2.6/po/es.po Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/es.po Fri Apr 14 06:46:17 2000
+@@ -187,7 +187,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+@@ -205,7 +205,7 @@
+ "Otras opciones:\n"
+ " d: ajustar dispositivos además de /dev/mixer\n"
+ " f: indicar el fichero para guardar y cargar las preferencias (por\n"
+-" defecto es ~/.aumixrc o /etc/aumixrc\n"
++" defecto es $CONFIG_DIR/aumixrc, ~/.aumixrc o /etc/aumixrc\n"
+ " C: indicar el esquema de color\n"
+ " h: este mensaje de ayuda\n"
+
+diff -Nru aumix-2.6/po/fr.po aumix-2.6.new/po/fr.po
+--- aumix-2.6/po/fr.po Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/fr.po Fri Apr 14 06:46:17 2000
+@@ -190,7 +190,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+@@ -208,7 +208,7 @@
+ "autres options:\n"
+ " d: ajuster un périphérique autre que /dev/mixer\n"
+ " f: spécifier le fichier de sauvegarde/chargement des paramètres\n"
+-" (par défaut il s'agit de ~/.aumixrc ou /etc/aumixrc)\n"
++" (par défaut il s'agit de $CONFIG_DIR/aumixrc, ~/.aumixrc ou /etc/aumixrc)\n"
+ " C: spécifier le modèle de couleurs\n"
+ " h: ce message d'aide\n"
+
+diff -Nru aumix-2.6/po/gl.po aumix-2.6.new/po/gl.po
+--- aumix-2.6/po/gl.po Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/gl.po Fri Apr 14 06:46:17 2000
+@@ -193,7 +193,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+@@ -211,7 +211,7 @@
+ "outras opcións:\n"
+ " d: axustar outro dispositivo que non sexa /dev/mixer\n"
+ " f: especificar ficheiro para gardar e cargar parámetros (por omisión é\n"
+-" ~/.aumixrc ou /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc ou /etc/aumixrc)\n"
+ " C: especifica-lo esquema de cor\n"
+ " h: amosar esta mensaxe de axuda\n"
+
+diff -Nru aumix-2.6/po/pl.po aumix-2.6.new/po/pl.po
+--- aumix-2.6/po/pl.po Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/pl.po Fri Apr 14 06:46:17 2000
+@@ -187,7 +187,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+@@ -205,7 +205,7 @@
+ "inne opcje:\n"
+ " d: dostosowuje urz±dzenie inne ni¿ /dev/mixer\n"
+ " f: okre¶la plik do zapisywania i ³adowania ustawieñ (domy¶lnie jest to\n"
+-" ~/.aumixrc lub /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc lub /etc/aumixrc)\n"
+ " C: okre¶la plik zawieraj±cy schemat u¿ycia kolorów\n"
+ " h: ta pomocna informacja\n"
+
+diff -Nru aumix-2.6/po/pt_BR.po aumix-2.6.new/po/pt_BR.po
+--- aumix-2.6/po/pt_BR.po Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/pt_BR.po Fri Apr 14 06:46:17 2000
+@@ -190,7 +190,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+@@ -208,7 +208,7 @@
+ "outras opções:\n"
+ " d: usar outro dispositivo que não o /dev/mixer\n"
+ " f: SPECIFY FILE FOR SAVING AND LOADING SETTINGS (DEFAULTS TO\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: SPECIFY COLOR SCHEME\n"
+ " h: esta mensagem de ajuda\n"
+
+diff -Nru aumix-2.6/po/ru.po aumix-2.6.new/po/ru.po
+--- aumix-2.6/po/ru.po Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/ru.po Fri Apr 14 06:46:17 2000
+@@ -194,7 +194,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+@@ -213,7 +213,7 @@
+ "äÒÕÇÉÅ ÏÐÃÉÉ:\n"
+ " d: ÒÅÇÕÌÉÒÏ×ÁÔØ ÕÓÔÒÏÊÓÔ×Á ËÒÏÍÅ /dev/mixer\n"
+ " f: ÕËÁÚÁÎÉÅ ÉÍÅÎÉ ÆÁÊÌÁ ÄÌÑ ÈÒÁÎÅÎÉÑ ÕÓÔÁÎÏ×ÏË (ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
+-" ~/.aumixrc ÉÌÉ /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc ÉÌÉ /etc/aumixrc)\n"
+ " C: ×ÙÂÏÒ Ã×ÅÔÏ×ÏÊ ÓÈÅÍÙ\n"
+ " h: ÜÔÁ ÐÏÍÏÝØ\n"
+
+diff -Nru aumix-2.6/po/uk.po aumix-2.6.new/po/uk.po
+--- aumix-2.6/po/uk.po Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/po/uk.po Fri Apr 14 06:46:17 2000
+@@ -189,7 +189,7 @@
+ "other options:\n"
+ " d: adjust a device besides /dev/mixer\n"
+ " f: specify file for saving and loading settings (defaults to\n"
+-" ~/.aumixrc or /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
+ " C: specify color scheme\n"
+ " h: this helpful message\n"
+ msgstr ""
+@@ -208,7 +208,7 @@
+ "¶ÎÛ¦ ÏÐæ§:\n"
+ " d: ÒÅÇÕÌÀ×ÁÔÉ ÐÒÉÓÔÒϧ ÏËÒ¦Í /dev/mixer\n"
+ " f: ×ËÁÚÁÎÎÑ ¦ÍÅΦ ÆÁÊÌÕ ÄÌÑ ÚÂÅÒ¦ÇÁÎÎÑ Ò¦×Î¦× (ÚÁ ÚÁÍÏ×ÞÁÎÎÑÍ\n"
+-" ~/.aumixrc ÞÉ /etc/aumixrc)\n"
++" $CONFIG_DIR/aumixrc, ~/.aumixrc ÞÉ /etc/aumixrc)\n"
+ " C: SPECIFY COLOR SCHEME\n"
+ " h: ÃÑ ÄÏÐÏÍÏÇÁ\n"
+
+diff -Nru aumix-2.6/src/Makefile.am aumix-2.6.new/src/Makefile.am
+--- aumix-2.6/src/Makefile.am Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/src/Makefile.am Fri Apr 14 06:46:17 2000
+@@ -1,7 +1,7 @@
bin_PROGRAMS = aumix
bin_SCRIPTS = xaumix
-aumix_SOURCES = common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c \
- mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h \
-- mouse.h
-+aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c \
-+ interactive.c mouse.c userdir.h common.h curses.h gpm-xterm.h \
-+ gtk.h interactive.h mouse.h
++aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c \
++ mouse.c userdir.h common.h curses.h gpm-xterm.h gtk.h interactive.h \
+ mouse.h play.xpm record.xpm
localedir = $(datadir)/locale
INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
- CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@
---- aumix-2.1/src/Makefile.in Mon Jan 31 23:19:53 2000
-+++ aumix-2.1.pius/src/Makefile.in Thu Feb 3 16:25:03 2000
+diff -Nru aumix-2.6/src/Makefile.in aumix-2.6.new/src/Makefile.in
+--- aumix-2.6/src/Makefile.in Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/src/Makefile.in Fri Apr 14 06:46:17 2000
@@ -84,7 +84,7 @@
bin_PROGRAMS = aumix
bin_SCRIPTS = xaumix
--aumix_SOURCES = common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h mouse.h
-+aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c mouse.c userdir.h common.h curses.h gpm-xterm.h gtk.h interactive.h mouse.h
+-aumix_SOURCES = common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h mouse.h play.xpm record.xpm
++aumix_SOURCES = userdir.c common.c curses.c dummy.c gpm-xterm.c gtk.c interactive.c mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h mouse.h play.xpm record.xpm
localedir = $(datadir)/locale
INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
interactive.o mouse.o
aumix_LDADD = $(LDADD)
aumix_DEPENDENCIES =
---- aumix-2.1/src/common.c Mon Jan 31 23:30:12 2000
-+++ aumix-2.1.pius/src/common.c Thu Feb 3 23:51:47 2000
-@@ -24,6 +24,7 @@
+diff -Nru aumix-2.6/src/common.c aumix-2.6.new/src/common.c
+--- aumix-2.6/src/common.c Fri Apr 14 06:47:08 2000
++++ aumix-2.6.new/src/common.c Fri Apr 14 06:46:17 2000
+@@ -26,6 +26,7 @@
#include "gtk.h"
- #endif
+ #endif /* HAVE_GTK */
#include "interactive.h"
+#include "userdir.h"
- void ExitIfError(int error);
- int InitializeMixer(char *device_file);
-@@ -536,7 +537,8 @@
+ FILE *OpenDefaultFile(char *mode);
+ FILE *setfile;
+@@ -556,7 +557,8 @@
{
/* Open the settings file for reading or writing.
- Try first ${HOME}/.AUMIXRC, then AUMIXRC_PATH/AUMIXRC;
-+ Try first ${CONFIG_DIR}/AUMIXRC, then ${HOME}/.AUMIXRC
-+ and eventually AUMIXRC_PATH/AUMIXRC;
++ Try first ${HOME}/.AUMIXRC, then then ${HOME}/.AUMIXRC
++ and eventualy AUMIXRC_PATH/AUMIXRC;
become an error generator if neither can be opened.
Input:
-@@ -548,22 +550,34 @@
- Success: pointer to the default settings file structure
- Failure: NULL
- */
-- FILE *setfile;
-+ FILE *setfile = NULL;
+@@ -571,19 +573,24 @@
+ FILE *setfile;
char *home;
char filename[FILENAME_MAX];
+ struct cfv etcfile;
- return NULL;
- }
+ etcfile.variable = "CONFIG_DIR";
-+ etcfile.home_dir = NULL;
-+ etcfile.home_scd = NULL;
-+ etcfile.subname = AUMIXRC;
-+ etcfile.prefix = ".";
-+ etcfile.suffix = "";
-+ etcfile.mode = M_REGULAR_FILE;
-+
-+ if ((usercfv (&etcfile)) == -1)
-+ setfile = notnullfopencfv(&etcfile, mode);
-+ else
-+ setfile = fopen(etcfile.result, mode);
-+
-+ if (setfile == NULL) {
-+ sprintf(filename, "%s/%s", AUMIXRC_PATH, AUMIXRC);
-+ setfile = fopen(filename, mode);
-+ }
-+ if (setfile == NULL)
-+ return NULL;
-+
++ etcfile.home_dir = NULL;
++ etcfile.home_scd = NULL;
++ etcfile.subname = AUMIXRC;
++ etcfile.prefix = ".";
++ etcfile.suffix = "";
++ etcfile.mode = M_REGULAR_FILE;
++
++ setfile = fopencfv(&etcfile, mode);
++ if (setfile == NULL) {
++ sprintf(filename, "%s/%s", AUMIXRC_PATH, AUMIXRC);
++ setfile = fopen(filename, mode);
++ }
} else
- setfile = fopen(save_filename, mode);
+ setfile = fopen(save_filename, mode);
return setfile;
}
-@@ -649,7 +663,7 @@
+@@ -668,7 +675,7 @@
other options:\n\
d: adjust a device besides /dev/mixer\n\
f: specify file for saving and loading settings (defaults to\n\
-- ~ /.aumixrc or /etc/aumixrc)\n\
+- ~/.aumixrc or /etc/aumixrc)\n\
+ $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n\
C: specify color scheme\n\
h: this helpful message\n"));
#ifdef HAVE_CURSES
---- aumix-2.1/src/userdir.c Thu Jan 1 01:00:00 1970
-+++ aumix-2.1.pius/src/userdir.c Thu Feb 3 01:24:28 2000
-@@ -0,0 +1,146 @@
+diff -Nru aumix-2.6/src/userdir.c aumix-2.6.new/src/userdir.c
+--- aumix-2.6/src/userdir.c Thu Jan 1 01:00:00 1970
++++ aumix-2.6.new/src/userdir.c Fri Apr 14 06:46:17 2000
+@@ -0,0 +1,167 @@
+// $Id$
+#include "userdir.h"
+
+ return 0;
+}
+
++/******************************************************************************/
++
+int preparemain(struct cfv *CFV) {
+ char *p;
+ struct stat st;
+ return 0;
+}
+
++/******************************************************************************/
++
+int preparehome(struct cfv *CFV) {
+ struct stat st;
+ if (CFV->home_dir == NULL || *(CFV->home_dir) == '\0') return (-1);
+ return (-1);
+}
+
++/******************************************************************************/
++
+int usercfv (struct cfv *CFV) {
+ int gr;
+ gr = detectcfv(CFV);
+
+/******************************************************************************/
+
-+/* If directory or file doesn't exist returns the best one wich may be created*/
++/* If directory or file doesn't exist returns the best one wich may be created */
+int notnullusercfv (struct cfv *CFV) {
+ int gr;
+ if ((usercfv(CFV)) == -1) {
+ gr = detectcfv(CFV);
-+ if (gr) return gr;
-+ /* get environment variable */
++ if (gr) return gr; /* remember, it works for errors! */
++ /* get the environment variable */
+ gr = getusercfv (CFV->variable,
+ CFV->home_dir,
+ CFV->result,
+
+/******************************************************************************/
+
-+FILE *fopencfv (struct cfv *CFV, const char *mode)
++FILE *maynullfopencfv (struct cfv *CFV, const char *mode)
+ {
+ FILE *cfvfile = NULL;
+
+ cfvfile = fopen (CFV->result, mode);
+ return (cfvfile);
+ }
++
++/******************************************************************************/
+
---- aumix-2.1/src/userdir.h Thu Jan 1 01:00:00 1970
-+++ aumix-2.1.pius/src/userdir.h Thu Feb 3 01:58:57 2000
-@@ -0,0 +1,55 @@
++FILE *fopencfv (struct cfv *CFV, const char *mode)
++ {
++ FILE *cfvfile = NULL;
++
++ if (cfvfile == NULL && (strpbrk(mode, "wa")) != NULL) /* create in best location */
++ cfvfile = notnullfopencfv (CFV, mode);
++ else
++ cfvfile = maynullfopencfv (CFV, mode);
++
++ return (cfvfile);
++ }
++
++/******************************************************************************/
+\ No newline at end of file
+diff -Nru aumix-2.6/src/userdir.h aumix-2.6.new/src/userdir.h
+--- aumix-2.6/src/userdir.h Thu Jan 1 01:00:00 1970
++++ aumix-2.6.new/src/userdir.h Fri Apr 14 06:46:17 2000
+@@ -0,0 +1,56 @@
+// $Id$
+#ifndef USERDIR__H
+#define USERDIR__H
+int notnullusercfv (struct cfv *CFV);
+
+FILE *fopencfv (struct cfv *CFV, const char *mode);
++FILE *maynullfopencfv (struct cfv *CFV, const char *mode);
+FILE *notnullfopencfv (struct cfv *CFV, const char *mode);
+
+#endif
---- aumix-2.1/po/aumix.pot Mon Jan 31 23:30:12 2000
-+++ aumix-2.1.pius/po/aumix.pot Fri Feb 4 01:11:42 2000
-@@ -175,7 +175,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~ /.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
---- aumix-2.1/po/de.po Sun Nov 28 07:35:18 1999
-+++ aumix-2.1.pius/po/de.po Fri Feb 4 01:10:08 2000
-@@ -81,7 +81,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~ /.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
-@@ -99,7 +99,7 @@
- "Weitere Optionen:\n"
- " d: Anderes Gerät als /dev/mixer benutzen\n"
- " f: spezifizieren Sie Datei für Einsparung- und Ladeneinstellungen\n"
--" (Rückstellungen zum ~ /.aumixrc or /etc/aumixrc)\n"
-+" (Rückstellungen zum $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " h: Diese nützlichen Informationen\n"
-
- #: src/common.c:567
---- aumix-2.1/po/es.po Mon Dec 6 16:41:47 1999
-+++ aumix-2.1.pius/po/es.po Fri Feb 4 01:10:21 2000
-@@ -81,7 +81,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~ /.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
-@@ -99,7 +99,7 @@
- "Otras opciones:\n"
- " d: ajustar dispositivos además de /dev/mixer\n"
- " f: indicar el fichero para guardar y cargar las preferencias (por\n"
--" defecto es ~/.aumixrc o /etc/aumixrc\n"
-+" defecto es $CONFIG_DIR/aumixrc, ~/.aumixrc o /etc/aumixrc\n"
- " C: indicar el esquema de color\n"
- " h: este mensaje de ayuda\n"
-
---- aumix-2.1/po/gl.po Mon Dec 6 16:41:47 1999
-+++ aumix-2.1.pius/po/gl.po Fri Feb 4 01:10:34 2000
-@@ -89,7 +89,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~ /.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
-@@ -107,7 +107,7 @@
- "outras opcións:\n"
- " d: axustar outro dispositivo que non sexa /dev/mixer\n"
- " f: especificar ficheiro para gardar e cargar parámetros (por omisión é\n"
--" ~/.aumixrc ou /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc ou /etc/aumixrc)\n"
- " C: especifica-lo esquema de cor\n"
- " h: amosar esta mensaxe de axuda\n"
-
---- aumix-2.1/po/pl.po Mon Dec 20 02:13:11 1999
-+++ aumix-2.1.pius/po/pl.po Fri Feb 4 01:10:50 2000
-@@ -181,7 +181,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~/.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
-@@ -199,7 +199,7 @@
- "inne opcje:\n"
- " d: dostosowuje urz±dzenie inne ni¿ /dev/mixer\n"
- " f: okre¶la plik do zapisywania i ³adowania ustawieñ (domy¶lnie jest to\n"
--" ~/.aumixrc lub /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~/.aumixrc lub /etc/aumixrc)\n"
- " C: okre¶la plik zawieraj±cy schemat u¿ycia kolorów\n"
- " h: ta pomocna informacja\n"
-
---- aumix-2.1/po/pt_BR.po Sun Nov 28 07:35:18 1999
-+++ aumix-2.1.pius/po/pt_BR.po Fri Feb 4 01:11:01 2000
-@@ -84,7 +84,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~ /.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
-@@ -102,7 +102,7 @@
- "outras opções:\n"
- " d: usar outro dispositivo que não o /dev/mixer\n"
- " f: SPECIFY FILE FOR SAVING AND LOADING SETTINGS (DEFAULTS TO\n"
--" ~ /.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " C: SPECIFY COLOR SCHEME\n"
- " h: esta mensagem de ajuda\n"
-
---- aumix-2.1/po/ru.po Mon Dec 20 02:13:11 1999
-+++ aumix-2.1.pius/po/ru.po Fri Feb 4 01:11:14 2000
-@@ -188,7 +188,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~ /.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
-@@ -207,7 +207,7 @@
- "äÒÕÇÉÅ ÏÐÃÉÉ:\n"
- " d: ÒÅÇÕÌÉÒÏ×ÁÔØ ÕÓÔÒÏÊÓÔ×Á ËÒÏÍÅ /dev/mixer\n"
- " f: ÕËÁÚÁÎÉÅ ÉÍÅÎÉ ÆÁÊÌÁ ÄÌÑ ÈÒÁÎÅÎÉÑ ÕÓÔÁÎÏ×ÏË (ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
--" ~ /.aumixrc ÉÌÉ /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc ÉÌÉ /etc/aumixrc)\n"
- " C: ×ÙÂÏÒ Ã×ÅÔÏ×ÏÊ ÓÈÅÍÙ\n"
- " h: ÜÔÁ ÐÏÍÏÝØ\n"
-
---- aumix-2.1/po/uk.po Sun Nov 28 07:35:18 1999
-+++ aumix-2.1.pius/po/uk.po Fri Feb 4 01:11:26 2000
-@@ -82,7 +82,7 @@
- "other options:\n"
- " d: adjust a device besides /dev/mixer\n"
- " f: specify file for saving and loading settings (defaults to\n"
--" ~ /.aumixrc or /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc or /etc/aumixrc)\n"
- " C: specify color scheme\n"
- " h: this helpful message\n"
- msgstr ""
-@@ -101,7 +101,7 @@
- "¶ÎÛ¦ ÏÐæ§:\n"
- " d: ÒÅÇÕÌÀ×ÁÔÉ ÐÒÉÓÔÒϧ ÏËÒ¦Í /dev/mixer\n"
- " f: ×ËÁÚÁÎÎÑ ¦ÍÅΦ ÆÁÊÌÕ ÄÌÑ ÚÂÅÒ¦ÇÁÎÎÑ Ò¦×Î¦× (ÚÁ ÚÁÍÏ×ÞÁÎÎÑÍ\n"
--" ~ /.aumixrc ÞÉ /etc/aumixrc)\n"
-+" $CONFIG_DIR/aumixrc, ~ /.aumixrc ÞÉ /etc/aumixrc)\n"
- " C: SPECIFY COLOR SCHEME\n"
- " h: ÃÑ ÄÏÐÏÍÏÇÁ\n"
-
projects / packages / aumix-gtk.git / blobdiff