+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 @@