--- aumix-2.7.orig/doc/aumix.1
+++ aumix-2.7/doc/aumix.1
@@ -98,9 +98,12 @@
 specify the name of a file containing a color scheme.
 This implies
 .Fl I .
+This option can be used to force the ncurses interface with a GTK version.
+No need to specify a filename in that case.
 .It Fl d Ar device_file
 specify the name of the mixer device (default is
-.Pa /dev/mixer )
+.Pa /dev/mixer
+). IMPORTANT: if you use this option, specify it before any other options; it won't take effect on preceding options/commands. 
 .It Fl f Ar rc_file
 specify file for saving and loading settings
 .It Fl h
@@ -108,11 +111,15 @@
 .It Fl I
 run
 .Nm
-interactively, using the full-screen ncurses-based interface.
+interactively, using the default user interface (GTK or ncurses,
+depending on the version).
 This is the default if no options are given, but must be specified
 in order to have
 .Nm
 go into interactive mode after doing things non-interactively.
+.br
+To force use of the ncurses interface with the GTK version,
+specify -C (no need to give a filename).
 .It Fl L
 load settings from
 .Pa $HOME/.aumixrc ,
@@ -314,7 +321,9 @@
 If either foreground or background is given as
 .Ql \- ,
 then the default color for that is used.
-The defaults are a white foreground and black background.
+If aumix is linked against ncurses, then the terminal's
+default fore or background will be used; else the default foreground is
+white and the default background is black.
 .Pp
 An xpm icon is provided.
 .Sh VERSION
--- aumix-2.7.orig/src/common.c
+++ aumix-2.7/src/common.c
@@ -27,10 +27,14 @@
 #endif				/* HAVE_GTK */
 #include "interactive.h"
 
+#define MIXERDEV	"/dev/mixer"
+#ifdef __linux__
+# define MIXERDEV_DEVFS	"/dev/sound/mixer"
+#endif
 FILE           *OpenDefaultFile(char *mode);
 FILE           *setfile;
 char           *save_filename = NULL;	/* name of file for saved settings */
-char           *device_filename = "/dev/mixer";	/* name of mixer device file */
+char           *device_filename = NULL;	/* name of mixer device file */
 unsigned short  setfile_opened = FALSE, setfile_write_perm = FALSE, setfile_read_perm = FALSE;
 int             current_dev = 0, mixer_fd = -1, mutelevel[SOUND_MIXER_NRDEVICES], devmask = 0, recmask = 0, recsrc = 0, stereodevs = 0, mutestate = 0, interactive = FALSE;
 #ifdef USE_OWN_LABELS
@@ -128,7 +132,13 @@
    but we do it anyway because it makes sense for line1, line2 and line3.
  */
 	while (TRUE) {
+#if defined(HAVE_CURSES) && defined(HAVE_GTK) && defined(optional_argument)
+		/* optional_argument is a GLIBC extension */
+		/* -C takes _optional_ argument. No arg forces curses mode. */
+		optn = getopt(argc, argv, "hILqSd:f:C::v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:");
+#else
 		optn = getopt(argc, argv, "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:");
+#endif
 		if (optn == -1)
 			break;
 /* Funny, strchr() returns a pointer to char, according to the man page,
@@ -162,9 +172,17 @@
 				break;
 #ifdef HAVE_CURSES		/* no color schemes for GTK+ */
 			case 'C':	/* User specified the color scheme. */
-				scheme_name = malloc(strlen(optarg) + 1);
-				strcpy(scheme_name, optarg);
-				setcolors = TRUE;
+				if (!optarg) {
+					/* handle space between -C and scheme */
+					if (argv[optind] && *argv[optind] && *argv[optind] != '-') {
+						optarg = argv[optind++];
+					}
+				}
+				if (optarg) {
+					scheme_name = malloc(strlen(optarg)+1);
+					strcpy(scheme_name, optarg);
+					setcolors = TRUE;
+				}
 				interactive = IN_CURSES;
 				break;
 #endif				/* HAVE_CURSES */
@@ -201,7 +219,9 @@
 */
 	if (interactive == IN_ANY) {
 #ifdef HAVE_GTK
-		if (getenv("DISPLAY") != NULL)
+		char *p;
+		/* DISPLAY is set and not the empty string */
+		if ((p = getenv("DISPLAY")) != NULL && *p != 0)
 			interactive = IN_GTK;
 #endif				/* HAVE_GTK */
 #ifdef HAVE_CURSES
@@ -218,7 +238,12 @@
 /* GTK+ stuff */
 	if (interactive == IN_GTK) {
 #ifndef DUMMY_MIXER
-		if ((mixer_fd = open(device_filename, O_RDWR)) < 0)
+		if ((mixer_fd = open(device_filename?device_filename:MIXERDEV, O_RDWR)) < 0)
+# ifdef __linux__
+		    /* if no mixer device option given, also try devfs node */
+		    if (device_filename == NULL &&
+			    ((mixer_fd = open(MIXERDEV_DEVFS, O_RDWR)) < 0))
+# endif
 			return EOPENMIX;
 #endif				/* DUMMY_MIXER */
 		ErrorExitWarn(MixerStatus(), 'e');
@@ -372,11 +397,18 @@
    EREADRECSRC           SOUND_MIXER_READ_RECSRC
    EREADSTEREO           SOUND_MIXER_READ_STEREODEVS
  */
+
 #ifdef HAVE_ALSA
 	AlsaUnmute();
 #endif				/* HAVE_ALSA */
 #ifndef DUMMY_MIXER
-	if ((mixer_fd = open(device_filename, O_RDWR)) < 0)
+	/* If no explicit mixer device given, use default */
+	if ((mixer_fd = open(device_filename?device_filename:MIXERDEV, O_RDWR)) < 0)
+# ifdef __linux__
+	    /* if no explicit mixer device option given, also try devfs node */
+	    if (device_filename != NULL ||
+			    ((mixer_fd = open(MIXERDEV_DEVFS, O_RDWR)) < 0))
+# endif
 		return EOPENMIX;
 #endif				/* DUMMY_MIXER */
 	ErrorExitWarn(MixerStatus(), 'e');
@@ -568,12 +600,12 @@
    Success:   pointer to the default settings file structure
    Failure:   NULL
  */
-	FILE           *setfile;
+	FILE           *setfile = NULL;
 	char           *home;
 	char            filename[FILENAME_MAX];
 	if (save_filename == NULL) {
 		home = getenv("HOME");
-		if ((strlen(home) + strlen(AUMIXRC)) < PATH_MAX) {
+		if (home && (strlen(home) + strlen(AUMIXRC)) < PATH_MAX) {
 			sprintf(filename, "%s/.%s", home, AUMIXRC);
 			setfile = fopen(filename, mode);
 		}
--- aumix-2.7.orig/src/curses.c
+++ aumix-2.7/src/curses.c
@@ -33,14 +33,14 @@
 	char            hotkey[2] = "";
 	menu_width = MENUSIZES[1];	/* "en" default */
 	for (i = 0; i < sizeof(LANGUAGES) / sizeof(*LANGUAGES); i++) {
-		if ((lang = (char *) getenv("LANG")) && !strncmp(lang, LANGUAGES[i], 5)) {
+		if ((lang = (char *) getenv("LANG")) && !strncmp(lang, LANGUAGES[i], 2)) {
 			menu_width = MENUSIZES[i];
 			break;
 		}
 	}
 	label_width = LABELSIZES[1];	/* "en" default */
 	for (i = 0; i < sizeof(LANGUAGES) / sizeof(*LANGUAGES); i++) {
-		if ((lang = (char *) getenv("LANG")) && !strncmp(lang, LANGUAGES[i], 5)) {
+		if ((lang = (char *) getenv("LANG")) && !strncmp(lang, LANGUAGES[i], 2)) {
 			label_width = LABELSIZES[i];
 			break;
 		}
@@ -258,6 +258,9 @@
 		if (schemefile == NULL)
 			return EFILE;
 	}
+#ifdef NCURSES_VERSION
+	use_default_colors();
+#endif
 	while (fgets(buf, BUFSIZ, schemefile)) {
 		p = buf;
 		while (*p && isspace(*p))	/* skip whitespace */
@@ -282,8 +285,13 @@
 		back = strtok(NULL, " \t\n");
 		if (!back)	/* only two items */
 			continue;
+#ifdef NCURSES_VERSION
+		bg = -1;	/* use_default_colors extension */
+		fg = -1;
+#else
 		bg = COLOR_BLACK;
 		fg = COLOR_WHITE;
+#endif
 		/* Check whether fore or back match names of colors. */
 		for (i = COLOR_BLACK; i < sizeof(colors) / sizeof(*colors); i++) {
 			if (strcasecmp(fore, colors[i]) == 0)
--- aumix-2.7.orig/src/gtk.c
+++ aumix-2.7/src/gtk.c
@@ -108,8 +108,10 @@
 	GtkWidget      *control_box;
 	int             balset, max, y, tmp, left, right;
 	long int        i;
-	GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &LoadDialog, &SaveDialog, &CloseScreenGTK};
-	char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Load From"), LOCAL_TEXT_NOOP("Save To"), LOCAL_TEXT_NOOP("Quit")};
+	GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &LoadDialog, &SaveDialog, &CloseScreenGTK}; 
+/* GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK}; */
+	char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Load From"), LOCAL_TEXT_NOOP("Save To"), LOCAL_TEXT_NOOP("Quit")};/*
+	char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};*/
 	char           *fileacceltext[5] = {LOCAL_TEXT_NOOP("l"), LOCAL_TEXT_NOOP("s"), LOCAL_TEXT_NOOP("f"), LOCAL_TEXT_NOOP("t"), LOCAL_TEXT_NOOP("q")};
 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(window), "aumix");
--- aumix-2.7.orig/po/de.po
+++ aumix-2.7/po/de.po
@@ -6,147 +6,150 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.6\n"
-"POT-Creation-Date: 2000-06-23 17:57+0200\n"
-"Last-Translator: Dominik Stadler <Dominik.Stadler@gmx.at>\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
+"Last-Translator: Eduard Bloch <blade@debian.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr "Lautstärke"
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr "Bässe"
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr "Höhen"
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr ""
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr "Lautsprecher"
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr "Mikro"
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr "Aufnahme"
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr "Eingang"
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr "Ausgang"
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr ""
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr ""
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr ""
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  Fehler beim Öffnen des Mixers"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr "aumix:  Audiogerät nicht gefunden"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr "aumix:  Mixer nicht geöffnet"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  Einstellungen konnten nicht geöffnet werden"
 
-#: src/common.c:272
+#: src/common.c:297
+#, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  Unbekannter Fehler %i"
 
-#: src/common.c:300
+#: src/common.c:325
+#, c-format
 msgid "%i ms wait\n"
 msgstr "%i ms Pause\n"
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr "nicht gesetzt"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr "gesetzt auf"
 
-#: src/common.c:656
+#: src/common.c:688
+#, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
@@ -154,23 +157,23 @@
 "aumix %s Benutzung: aumix [[ -<Kanaloptionen>[[+|-][<Betrag>]]<Stufe>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr " [-C <Farbschemadatei>]"
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr " [-f <rc Datei>]"
 
-#: src/common.c:667
+#: src/common.c:699
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -198,11 +201,11 @@
 "\n"
 "Weitere Optionen:\n"
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  Farbschema angeben\n"
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -214,13 +217,13 @@
 "      (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
 "  h:  Diese nützlichen Informationen\n"
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  Start im interaktiven Modus nach Ausführen nicht-interaktiver "
 "Funktionen\n"
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -230,55 +233,56 @@
 "  q:  Alle Kanäle abfragen und Einstellungen ausgeben\n"
 "  S:  Einstellungen speichern\n"
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
-msgstr "Beenden  "
+msgstr "Beenden   "
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
-msgstr "Laden    "
+msgstr "Laden     "
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
-msgstr "Speichern"
+msgstr "Speichern "
 
 #: src/curses.c:20
 msgid "Keys"
-msgstr "Tasten   "
+msgstr "Tasten    "
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
-msgstr "Stille   "
+msgstr "Alles aus "
 
 #: src/curses.c:22
 msgid "Only"
-msgstr "Alleine  "
+msgstr "Nur dieses"
 
 #: src/curses.c:23
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr "0"
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr "Lautstärke"
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr "100"
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr "Balance"
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "R"
 
@@ -348,64 +352,66 @@
 
 #: src/curses.c:182
 msgid "only "
-msgstr "alleine"
+msgstr "Nur dieses"
 
 #: src/interactive.c:382 src/interactive.c:389
 msgid "k"
 msgstr "t"
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr "l"
 
 #: src/interactive.c:384 src/interactive.c:391
 msgid "m"
-msgstr "r"
+msgstr "a"
 
 #: src/interactive.c:385 src/interactive.c:392
 msgid "o"
-msgstr "a"
+msgstr "n"
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr "b"
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr "s"
 
 #: src/interactive.c:388 src/interactive.c:395
 msgid "u"
-msgstr "u"
+msgstr "r"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr "Laden von"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr "Speichern nach"
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr "Alles aus"
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr "Datei"
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr "Ansicht"
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr ""
--- aumix-2.7.orig/po/es.po
+++ aumix-2.7/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.6\n"
-"POT-Creation-Date: 2000-06-23 17:57+0200\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,140 +13,142 @@
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr ""
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr ""
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr ""
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr ""
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr ""
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr ""
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr ""
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr ""
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr ""
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr ""
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  error mientras se abría el mezclador"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr "aumix:  no se encontró ningun dispositivo"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr "aumix:  no se encontró ningun Mixer"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  No se pudo abrir el fichero de configuracion"
 
-#: src/common.c:272
+#: src/common.c:297
+#, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  error desconocido %i"
 
-#: src/common.c:300
+#: src/common.c:325
 #, c-format
 msgid "%i ms wait\n"
 msgstr ""
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr "no establecido"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr "establecido a"
 
-#: src/common.c:656
+#: src/common.c:688
+#, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
@@ -154,23 +156,23 @@
 "aumix %s Uso: aumix [-<Canal>[[+|-][<cantidad>]]|<Nivel>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr " [-C <esquema de color>]"
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr " [-f <rc file>]"
 
-#: src/common.c:667
+#: src/common.c:699
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -198,11 +200,11 @@
 "\n"
 "Otras opciones:\n"
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  indicar el esquema de color\n"
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -214,13 +216,13 @@
 "      defecto es ~/.aumixrc o /etc/aumixrc\n"
 "  h:  este mensaje de ayuda\n"
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I: comenzar en modo interactico antes de ejecutar funciones no "
 "interactivas\n"
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -230,15 +232,16 @@
 "  q:  checkear todos los canales e imprimir su estado\n"
 "  S:  salvar la configuracion actual\n"
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr "Quitar"
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr "Leer"
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr "Salvar"
 
@@ -246,7 +249,7 @@
 msgid "Keys"
 msgstr "Teclas"
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr "Mute"
 
@@ -258,27 +261,27 @@
 msgid "Undo"
 msgstr "Atrás"
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr "0"
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr "Nivel"
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr "100"
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "I"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr "Balance"
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "D"
 
@@ -355,7 +358,9 @@
 msgid "k"
 msgstr "t"
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr "l"
 
@@ -367,11 +372,11 @@
 msgid "o"
 msgstr "u"
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr "q"
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr "s"
 
@@ -379,34 +384,34 @@
 msgid "u"
 msgstr "a"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr ""
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
- 
-#: src/gtk.c:113
+
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr ""
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr ""
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr ""
--- aumix-2.7.orig/po/gl.po
+++ aumix-2.7/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.4\n"
-"POT-Creation-Date: 2000-06-23 17:57+0200\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
 "Last-Translator: Jesus Bravo Alvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
@@ -20,165 +20,167 @@
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr ""
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr ""
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr ""
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr ""
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr ""
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr ""
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr ""
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr ""
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr ""
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr ""
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  erro ó abri-lo mesturador"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr "aumix:  non se atopou ningún dispositivo"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr "aumix:  mesturador non aberto"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  non se pode abri-lo ficheiro de parámetros"
 
-#: src/common.c:272
+#: src/common.c:297
+#, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  erro %i descoñecido"
 
-#: src/common.c:300
+#: src/common.c:325
 #, c-format
 msgid "%i ms wait\n"
 msgstr ""
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr "non establecido"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr "establecer a"
 
-#: src/common.c:656
+#: src/common.c:688
+#, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 msgstr ""
-"aumix %s modo de emprego: aumix [-<opción de "
-"canle>[[+|-][<cantidade>]]|<nivel>|\n"
+"aumix %s modo de emprego: aumix [-<opción de canle>[[+|-][<cantidade>]]|"
+"<nivel>|\n"
 "R[tocar]|P[tocar]|q[consultar]]"
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr " [-C <esquema>]"
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr ""
 
-#: src/common.c:667
+#: src/common.c:699
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -206,11 +208,11 @@
 "\n"
 "outras opcións:\n"
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  especifica-lo esquema de cor\n"
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -222,11 +224,11 @@
 "      ~/.aumixrc ou /etc/aumixrc)\n"
 "  h:  amosar esta mensaxe de axuda\n"
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr "  I:  comezar en modo interactivo tralas funcións non interactivas\n"
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -236,15 +238,16 @@
 "  q:  escribi-la información de tódalas canles\n"
 "  S:  garda-los parámetros actuais\n"
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr "Saír  "
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr "Cargar"
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr "Gardar"
 
@@ -252,7 +255,7 @@
 msgid "Keys"
 msgstr "Teclas"
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr "Mudo  "
 
@@ -264,27 +267,27 @@
 msgid "Undo"
 msgstr "Atrás "
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr "0"
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr "Nivel"
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr "100"
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "E"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr "Balance"
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "D"
 
@@ -360,7 +363,9 @@
 msgid "k"
 msgstr "t"
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr "c"
 
@@ -372,11 +377,11 @@
 msgid "o"
 msgstr "u"
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr "s"
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr "g"
 
@@ -384,34 +389,34 @@
 msgid "u"
 msgstr "a"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr ""
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
- 
-#: src/gtk.c:113
+
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr ""
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr ""
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr ""
--- aumix-2.7.orig/po/pl.po
+++ aumix-2.7/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix-2.4\n"
-"POT-Creation-Date: 2000-06-23 17:57+0200\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
 "Last-Translator: Piotr Czerwiñski <pius@pld.org.pl>\n"
 "Language-Team: PL <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -14,141 +14,141 @@
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr "Poziom  "
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr "Niskie  "
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr "Wysokie "
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr "Syntetyz"
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr "G³o¶n PC"
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr "Linia   "
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr "Mikrofon"
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr "Mikser  "
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr "Nagryw. "
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr "Wej¶cie "
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr "Wyj¶cie "
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr "Linia 1 "
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr "Linia 2 "
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr "Linia 3 "
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr "Cyfrowe1"
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr "Cyfrowe2"
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr "Cyfrowe3"
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr "Tel Wej "
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr "Tel Wyj "
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr "Video   "
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr "Radio   "
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr "Monitor "
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  b³±d podczas otwierania miksera"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr "aumix:  nie znaleziono urz±dzenia"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr "aumix:  mikser nie otwarty"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  nie mo¿na otworzyæ pliku z ustawieniami"
 
-#: src/common.c:272
+#: src/common.c:297
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  nieznany b³±d %i"
 
-#: src/common.c:300
+#: src/common.c:325
 #, c-format
 msgid "%i ms wait\n"
 msgstr ""
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr "nie ustawione"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr "ustawione na"
 
-#: src/common.c:656
+#: src/common.c:688
 #, fuzzy, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -157,23 +157,23 @@
 "aumix %s u¿ycie: aumix [-<opcje kana³u>[[+|-][<warto¶æ>]]|<poziom>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr " [-C <schemat kolorów>]"
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr " [-f <plik rc>]"
 
-#: src/common.c:667
+#: src/common.c:699
 #, fuzzy
 msgid ""
 "channel options:\n"
@@ -202,11 +202,11 @@
 "\n"
 "inne opcje:\n"
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  okre¶la plik zawieraj±cy schemat u¿ycia kolorów\n"
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -218,13 +218,13 @@
 "      ~/.aumixrc lub /etc/aumixrc)\n"
 "  h:  ta pomocna informacja\n"
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  startuje w trybie interaktywnym po wykonaniu funkcji "
 "nieinteraktywnych\n"
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -234,15 +234,16 @@
 "  q:  sprawdza i wy¶wietla aktualne ustawienia wszystkich kana³ów\n"
 "  S:  zapisuje ustawienia\n"
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr "Koniec"
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr "Laduj "
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr "Zapisz"
 
@@ -250,7 +251,7 @@
 msgid "Keys"
 msgstr "Pomoc "
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr "Wycisz"
 
@@ -262,27 +263,27 @@
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr ""
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr "Poziom"
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr ""
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr "Balans"
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "P"
 
@@ -358,7 +359,9 @@
 msgid "k"
 msgstr "p"
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr "l"
 
@@ -370,11 +373,11 @@
 msgid "o"
 msgstr "j"
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr "k"
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr "z"
 
@@ -382,34 +385,34 @@
 msgid "u"
 msgstr "c"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr "£aduj z"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr "Zapisz do"
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
- 
-#: src/gtk.c:113
+
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr "Wycisz wszystkie"
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr "Plik"
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr "Nagrywanie"
--- aumix-2.7.orig/po/pt_BR.po
+++ aumix-2.7/po/pt_BR.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.4\n"
-"POT-Creation-Date: 2000-06-23 17:57+0200\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
 "Last-Translator: Trevor Johnson <trevor@jpj.net>\n"
 "Language-Team: pt <pt@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -14,142 +14,142 @@
 "Content-Transfer-Encoding: 8-bit\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr ""
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr ""
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr ""
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr ""
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr ""
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr ""
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr ""
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr ""
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr ""
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr ""
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  erro na abertura de mixer"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr "aumix:  nenhum dispositivo encontrado"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr "aumix: mixer não aberto"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  não foi possível abrir o arquivo de configuração"
 
-#: src/common.c:272
+#: src/common.c:297
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  erro desconhecido %i"
 
-#: src/common.c:300
+#: src/common.c:325
 #, c-format
 msgid "%i ms wait\n"
 msgstr ""
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr "não configurado"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr "configurar para"
 
 # incomplete translation
-#: src/common.c:656
+#: src/common.c:688
 #, fuzzy, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -158,24 +158,24 @@
 "aumix %s uso: aumix [-<opção de canal>[[+|-][<AMOUNT>]][ ]<nível>|\n"
 "R[gravar]|P[tocar]|q[pesquisar]]"
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr ""
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr ""
 
 # incomplete translation
-#: src/common.c:667
+#: src/common.c:699
 #, fuzzy
 msgid ""
 "channel options:\n"
@@ -204,11 +204,11 @@
 "\n"
 "outras opções:\n"
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  SPECIFY COLOR SCHEME\n"
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -220,12 +220,12 @@
 "      ~/.aumixrc or /etc/aumixrc)\n"
 "  h:  esta mensagem de ajuda\n"
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  inicia em modo interativo após executar funções não-interativas\n"
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -235,15 +235,16 @@
 "  q:  pesquise todos os canais e mostre suas configurações\n"
 "  S:  salvar configurações\n"
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr "Sair "
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr "Carga"
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr "Grava"
 
@@ -251,7 +252,7 @@
 msgid "Keys"
 msgstr "Tecla"
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr "Mudo "
 
@@ -265,27 +266,27 @@
 msgid "Undo"
 msgstr "UNDO "
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr "0"
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr "Nível"
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr ""
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr "Balanço"
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "R"
 
@@ -363,7 +364,9 @@
 msgid "k"
 msgstr "t"
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr "c"
 
@@ -376,11 +379,11 @@
 msgid "o"
 msgstr "O"
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr "s"
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr "s"
 
@@ -389,34 +392,34 @@
 msgid "u"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr ""
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
- 
-#: src/gtk.c:113
+
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr ""
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr ""
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr ""
--- aumix-2.7.orig/po/ru.po
+++ aumix-2.7/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.4\n"
-"POT-Creation-Date: 2000-06-23 17:57+0200\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
 "Last-Translator: Michael Vasilenko <acid@stu.cn.ua>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,141 +13,141 @@
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr "çÒÏÍËÏÓÔØ"
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr "îÉÚËÉÅ  "
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr "÷ÙÓÏËÉÅ "
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr "óÉÎÔÅÚÁÔÏÒ"
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr "äÉÎÁÍÉË PC"
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr "ìÉÎÅÊÎÙÊ ×ÈÏÄ"
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr "íÉËÒÏÆÏÎ"
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr "ëÏÍÐÁËÔ-ÄÉÓË"
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr "íÉËÛÅÒ  "
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr "úÁÐÉÓØ  "
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr "÷ÈÏÄ    "
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr "÷ÙÈÏÄ   "
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr "ìÉÎ. ×ÈÏÄ 1"
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr "ìÉÎ. ×ÈÏÄ 2"
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr "ìÉÎ. ×ÈÏÄ 3"
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr "ãÉÆÒÏ×ÏÊ 1"
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr "ãÉÆÒÏ×ÏÊ 2"
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr "ãÉÆÒÏ×ÏÊ 3"
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr "÷ÈÏÄ ÔÅÌÅÆÏÎÁ"
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr "÷ÙÈÏÄ ÔÅÌÅÆÏÎ"
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr "÷ÉÄÅÏ   "
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr "òÁÄÉÏ   "
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr "íÏÎÉÔÏÒ "
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ MIXER"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr "aumix:  ÕÓÔÒÏÊÓÔ×Ï ÎÅ ÎÁÊÄÅÎo"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr "aumix:  ÍÉËÛÅÒ ÎÅ ÏÔËÒÙÔ"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÕÓÔÁÎÏ×ÏË"
 
-#: src/common.c:272
+#: src/common.c:297
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %i"
 
-#: src/common.c:300
+#: src/common.c:325
 #, c-format
 msgid "%i ms wait\n"
 msgstr ""
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÏ"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr "ÕÓÔÁÎÏ×ÌÅÎÏ ÒÁ×ÎÙÍ"
 
-#: src/common.c:656
+#: src/common.c:688
 #, fuzzy, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -156,23 +156,23 @@
 "ÉÓÐÏÌØÚÏ×ÁÎÉÅ aumix %s: aumix [-<channel option>[[+|-][<amount>]]<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr ""
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr ""
 
-#: src/common.c:667
+#: src/common.c:699
 #, fuzzy
 msgid ""
 "channel options:\n"
@@ -202,11 +202,11 @@
 "\n"
 "äÒÕÇÉÅ ÏÐÃÉÉ:\n"
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  ×ÙÂÏÒ Ã×ÅÔÏ×ÏÊ ÓÈÅÍÙ\n"
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -218,13 +218,13 @@
 "      ~/.aumixrc ÉÌÉ /etc/aumixrc)\n"
 "  h:  ÜÔÁ ÐÏÍÏÝØ\n"
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  ÐÏÓÌÅ ÏÂÒÁÂÏÔËÉ ÐÁÒÁÍÅÔÒÏ× × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ ÐÅÒÅÊÔÉ × ÉÎÔÅÒÁËÔÉ×ÎÙÊ "
 "ÒÅÖÉÍ\n"
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -234,15 +234,16 @@
 "  q:  ×Ù×ÅÓÔÉ ÕÓÔÁÎÏ×ËÉ ×ÓÅÈ ËÁÎÁÌÏ×\n"
 "  S:  ÚÁÐÉÓÁÔØ ÕÓÔÁÎÏ×ËÉ\n"
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr "Quit"
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr "Load"
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr "Save"
 
@@ -250,7 +251,7 @@
 msgid "Keys"
 msgstr "Keys"
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr "Mute"
 
@@ -262,27 +263,27 @@
 msgid "Undo"
 msgstr "Undo"
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr "0"
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr "õÒÏ×ÅÎØ"
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr "100"
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr "âÁÌÁÎÓ"
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "R"
 
@@ -360,7 +361,9 @@
 msgid "k"
 msgstr "k"
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr ""
 
@@ -372,11 +375,11 @@
 msgid "o"
 msgstr ""
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr ""
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr ""
 
@@ -384,34 +387,34 @@
 msgid "u"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr ""
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
- 
-#: src/gtk.c:113
+
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr ""
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr ""
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr ""
--- aumix-2.7.orig/po/uk.po
+++ aumix-2.7/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.4\n"
-"POT-Creation-Date: 2000-06-23 17:57+0200\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
 "Last-Translator: Trevor Johnson <trevor@jpj.net>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,142 +13,142 @@
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr ""
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr ""
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr ""
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr ""
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr ""
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr ""
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr ""
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr ""
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr ""
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr ""
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  ÐÏÍÉÌËÁ ׊ÄËÒÉÔÔÑ ÍŠËÛÅÒ"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr "aumix:  ÐÒÉÓÔÒŠÊ ÎÅ ÚÎÁÊÄÅÎo"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr "aumix:  ÍŠËÛÅÒ ÎŠ׊ÄËÒÉÔÏ"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  ÎÅ ÍÏÖÕ ×ŠÄËÒÉÔÉ ÆÁÊÌ ÕÓÔÁÎÏ×ÏË"
 
-#: src/common.c:272
+#: src/common.c:297
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  ÎÅ׊ÄÏÍÁ ÐÏÍÉÌËÁ %i"
 
-#: src/common.c:300
+#: src/common.c:325
 #, c-format
 msgid "%i ms wait\n"
 msgstr ""
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr "ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr "×ÓÔÁÎÏ×ÌÅÎÏ ÎÁ"
 
 # incomplete translation
-#: src/common.c:656
+#: src/common.c:688
 #, fuzzy, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -157,24 +157,24 @@
 "×ÉËÏÒÉÓÔÁÎÎÑ aumix %s : aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr ""
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr ""
 
 # incomplete translation
-#: src/common.c:667
+#: src/common.c:699
 #, fuzzy
 msgid ""
 "channel options:\n"
@@ -204,11 +204,11 @@
 "\n"
 "¶ÎÛŠ ÏÐʧ:\n"
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  SPECIFY COLOR SCHEME\n"
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -220,13 +220,13 @@
 "      ~/.aumixrc ÞÉ /etc/aumixrc)\n"
 "  h:  ÃÑ ÄÏÐÏÍÏÇÁ\n"
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  ЊÓÌÑ ÏÂÒÏÂËÉ ÐÁÒÁÍÅÔÒŠ× × ËÏÍÁÎÄÎÏÍÕ ÒÑÄËÕ ÐÅÒÅÊÔÉ × ŠÎÔÅÒÁËÔÉ×ÎÉÊ "
 "ÒÅÖÉÍ\n"
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -237,15 +237,16 @@
 "  S:  ÚÁÐÉÓÁÔÉ ÒŠ×Ί × ÆÁÊÌ\n"
 
 # incomplete translation
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr ""
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr ""
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr ""
 
@@ -253,7 +254,7 @@
 msgid "Keys"
 msgstr ""
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr ""
 
@@ -265,27 +266,27 @@
 msgid "Undo"
 msgstr ""
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr "0"
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr "òŠ×ÅÎØ"
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr "100"
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr "âÁÌÁÎÓ"
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "R"
 
@@ -362,7 +363,9 @@
 msgid "k"
 msgstr "k"
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr "l"
 
@@ -374,11 +377,11 @@
 msgid "o"
 msgstr "o"
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr "q"
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr "s"
 
@@ -386,34 +389,34 @@
 msgid "u"
 msgstr "u"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr ""
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
- 
-#: src/gtk.c:113
+
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr ""
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr ""
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr ""
--- aumix-2.7.orig/po/ChangeLog
+++ aumix-2.7/po/ChangeLog
@@ -8,3 +8,10 @@
 
 1999-01-30
 - added ru and ua translations (G.V.)
+
+2001-08-04 (EB)
+- merged with another french translation (E.B.)
+- new nl translation
+
+2001-08-04 (EB)
+- fixed german translation
--- aumix-2.7.orig/po/fr.po
+++ aumix-2.7/po/fr.po
@@ -1,176 +1,180 @@
-# French translations for aumix potfile.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Guillaume Cottenceau <gc@mandrakesoft.com>, 2000.
+# Fichier po français pour aumix.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Fabrice Bauzac <noon@cote-dazur.com>, 2001.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: aumix 2.4\n"
-"POT-Creation-Date: 2000-06-23 17:57+0200\n"
-"Last-Translator: Guillaume Cottenceau <gc@mandrakesoft.com>, 2000\n"
-"Language-Team: French <fr@li.org>\n"
+"Project-Id-Version: aumix 2\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
+"PO-Revision-Date: 2001-01-28 09:59+CET\n"
+"Last-Translator: Bauzac Fabrice <noon@cote-dazur.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: none\n"
-"POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr "Volume  "
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr "Basses  "
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
-msgstr "Aigus   "
+msgstr "Aigues  "
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
-msgstr "Synth   "
+msgstr "Synthét."
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
-msgstr "HtParleur"
+msgstr "Haut-p. "
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr "Ligne   "
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
-msgstr "Mic     "
+msgstr "Micro   "
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr "Mix     "
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
-msgstr "Enreg.  "
+msgstr "Record  "
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr "Entrée  "
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr "Sortie  "
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr "Ligne 1 "
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr "Ligne 2 "
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr "Ligne 3 "
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr "Digital1"
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr "Digital2"
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr "Digital3"
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
-msgstr "TéléphIn"
+msgstr "Phone In"
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
-msgstr "TéléphOu"
+msgstr "PhoneOut"
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr "Vidéo   "
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr "Radio   "
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr "Moniteur"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
-msgstr "aumix:  erreur à l'ouverture du mixeur"
+msgstr "aumix:  erreur lors de l'ouverture du mixeur"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
-msgstr "aumix:  aucun périphérique trouvé"
+msgstr "aumix:  Aucun device trouvé"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
-msgstr "aumix:  mixeur non ouvert"
+msgstr "aumix:  le mixeur n'est pas ouvert"
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
-msgstr "aumix:  impossible d'ouvrir le fichier de paramètres"
+msgstr "aumix:  impossible d'ouvrir le fichier de configuration"
 
-#: src/common.c:272
+#: src/common.c:297
+#, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  erreur inconnue %i"
 
-#: src/common.c:300
+#: src/common.c:325
+#, c-format
 msgid "%i ms wait\n"
 msgstr "%i ms d'attente\n"
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
-msgstr "non mis"
+msgstr "non initialisé"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
-msgstr "mis à"
+msgstr "initialisé à"
 
-#: src/common.c:656
+#: src/common.c:688
+#, fuzzy, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 msgstr ""
-"aumix %s usage: aumix [-<option de canal>[[+|-][<quantité>]]<niveau>|\n"
-"R[ecord]|P[lay]q[uery]]"
+"aumix %s usage: aumix [[ -<option de canal>[ ][[+|-][<quantité>]]<niveau>|\n"
+"P[lay]|R[ecord]|q[uery] [-d] [-h] [-L] [-q] [-S]\n"
+"\n"
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr " [-C <modèle de couleurs>]"
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr " [-f <fichier de configuration>]"
 
-#: src/common.c:667
+#: src/common.c:699
+#, fuzzy
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -185,24 +189,29 @@
 "\n"
 "other options:\n"
 msgstr ""
-"options des canaux:\n"
-"  v:  volume global         x:  mixage\n"
+"options de canal:\n"
+"  v:  volume principal      x:  moniteur de mixage\n"
 "  b:  basses                W:  PCM 2\n"
-"  t:  aigus                 r:  enregistrement\n"
+"  t:  aigues                r:  enregistrement\n"
 "  s:  synthétiseur          i:  gain en entrée\n"
 "  w:  PCM                   o:  gain en sortie\n"
-"  p:  Haut-Parleur          1:  ligne 1\n"
+"  p:  haut-parleur          1:  ligne 1\n"
 "  l:  ligne                 2:  ligne 2\n"
 "  m:  microphone            3:  ligne 3\n"
 "  c:  CD\n"
 "\n"
 "autres options:\n"
+"  d:  choisir un devide différent de /dev/mixer\n"
+"  f:  spécifier un fichier pour la sauvegarde et le chargement des\n"
+"      paramètres (~/.aumixrc ou /etc/aumixrc par défaut)\n"
+"  C:  spécifie un schéma de couleurs\n"
+"  h:  ce message d'aide\n"
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  spécifier le modèle de couleurs\n"
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -214,76 +223,77 @@
 "      (par défaut il s'agit de ~/.aumixrc ou /etc/aumixrc)\n"
 "  h:  ce message d'aide\n"
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
-"  I:  démarrer en mode interactif après les fonctions non-interactives\n"
+"  I:  démarre en mode interactif après avoir fait le travail non interactif\n"
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
-"  L:  charger les paramètres\n"
-"  q:  imprimer les paramètres de tous les canaux\n"
-"  S:  enregistrer les paramètres\n"
+"  L:  lire la configuration\n"
+"  q:  afficher le niveau de tous les canaux\n"
+"  S:  sauver la configuration\n"
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr "Quitte"
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr "Charge"
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr "Sauve"
 
 #: src/curses.c:20
 msgid "Keys"
-msgstr "Touches"
+msgstr "Touche"
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr "Muet"
 
 #: src/curses.c:22
 msgid "Only"
-msgstr "Seulement"
+msgstr "Unique"
 
 #: src/curses.c:23
 msgid "Undo"
-msgstr "Annuler"
+msgstr "Défait"
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
-msgstr "0"
+msgstr ""
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr "Niveau"
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
-msgstr "100"
+msgstr ""
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
-msgstr "L"
+msgstr "G"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
-msgstr "Balance"
+msgstr ""
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
-msgstr "R"
+msgstr "D"
 
 #: src/curses.c:144
 msgid "page arrows\n"
-msgstr "page up/down\n"
+msgstr "page suivante, précédente\n"
 
 #: src/curses.c:145
 msgid "tab enter < > , .\n"
@@ -291,7 +301,7 @@
 
 #: src/curses.c:146
 msgid "+ - [ ] arrows digits\n"
-msgstr "+ - [ ] flèches nombres\n"
+msgstr "+ - [ ] flèches chiffres\n"
 
 #: src/curses.c:147
 msgid "space\n"
@@ -307,7 +317,7 @@
 "Press a key or mouse button to resume."
 msgstr ""
 "\n"
-"Appuyez sur une touche ou un bouton de la souris pour continuer."
+"Pressez une touche ou un bouton de la souris pour revenir."
 
 #: src/curses.c:151
 msgid "Key                       Function\n"
@@ -315,27 +325,27 @@
 
 #: src/curses.c:152
 msgid "------------------------- --------------------"
-msgstr "------------------------- --------------------"
+msgstr ""
 
 #: src/curses.c:153
 msgid "change channel\n"
-msgstr "changer de canal\n"
+msgstr "change le canal\n"
 
 #: src/curses.c:154
 msgid "toggle level/balance\n"
-msgstr "basculer niveau/balance\n"
+msgstr "change entre niveau/balance\n"
 
 #: src/curses.c:155
 msgid "adjust slider\n"
-msgstr "ajuster le slider\n"
+msgstr "ajuste le curseur\n"
 
 #: src/curses.c:156
 msgid "toggle record/play\n"
-msgstr "basculer enregistrer/jouer\n"
+msgstr "change entre enregistrer/jouer\n"
 
 #: src/curses.c:157
 msgid "center balance\n"
-msgstr "centrer la balance\n"
+msgstr "centre la balance\n"
 
 #: src/curses.c:176
 msgid "     "
@@ -343,17 +353,19 @@
 
 #: src/curses.c:179
 msgid "muted"
-msgstr "muet"
+msgstr "muet  "
 
 #: src/curses.c:182
 msgid "only "
-msgstr "seulement "
+msgstr "seul "
 
 #: src/interactive.c:382 src/interactive.c:389
 msgid "k"
 msgstr "t"
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr "c"
 
@@ -363,48 +375,61 @@
 
 #: src/interactive.c:385 src/interactive.c:392
 msgid "o"
-msgstr ""
+msgstr "u"
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr "q"
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr "s"
 
 #: src/interactive.c:388 src/interactive.c:395
 msgid "u"
-msgstr "a"
+msgstr "d"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
+#, fuzzy
 msgid "Load From"
-msgstr "Charger à Partir de"
+msgstr "Charge"
 
-#: src/gtk.c:112
+#: src/gtk.c:113
+#, fuzzy
 msgid "Save To"
-msgstr "Sauvegarder Vers"
+msgstr "Sauve"
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
- 
-#: src/gtk.c:113
+
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
+#, fuzzy
 msgid "Mute All"
-msgstr "Tous muets"
+msgstr "Muet"
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr "Fichier"
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr "Enreg."
+
+#~ msgid ""
+#~ "aumix %s usage: aumix [[ -<channel option>[[+|-][<amount>]][ ]<level>|\n"
+#~ "P[lay]|R[ecord]|q[uery] [-C scheme] [-d] [-h] [-I] [-L] [-q] [-S]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "aumix %s usage: aumix [[ -<option de canal>[[+|-][<quantité>]][ ]"
+#~ "<niveau>|\n"
+#~ "P[lay]|R[ecord]|q[uery] [-C schéma] [-d] [-h] [-I] [-L] [-q] [-S]\n"
+#~ "\n"
--- aumix-2.7.orig/po/ja.po
+++ aumix-2.7/po/ja.po
@@ -13,172 +13,172 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.7\n"
-"POT-Creation-Date: 2000-05-01 02:27+0000\n"
-"POT-Revision-Date: 2000-07-13 11:13+0000\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
 "Last-Translator: Trevor Johnson <trevor@jpj.net>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr "²»ÎÌ"
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr ""
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr ""
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr ""
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr ""
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr ""
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr "ÆþÎÏ"
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr ""
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr ""
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr ""
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr ""
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:297
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr ""
 
-#: src/common.c:300
+#: src/common.c:325
 #, c-format
 msgid "%i ms wait\n"
 msgstr "°ì»þÄä»ß %i ms\n"
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr ""
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr ""
 
-#: src/common.c:656
+#: src/common.c:688
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 msgstr ""
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr ""
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr ""
 
-#: src/common.c:667
+#: src/common.c:699
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -194,11 +194,11 @@
 "other options:\n"
 msgstr ""
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -206,26 +206,27 @@
 "  h:  this helpful message\n"
 msgstr ""
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr "œªÎ»"
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr "³«€¯"
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr "ÊÝž"
 
@@ -233,7 +234,7 @@
 msgid "Keys"
 msgstr "¥­¡Œ"
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr "¥ß¥å¡Œ¥È"
 
@@ -245,27 +246,27 @@
 msgid "Undo"
 msgstr ""
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr ""
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr ""
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr ""
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "ºž"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr ""
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "±Š"
 
@@ -339,7 +340,9 @@
 msgid "k"
 msgstr ""
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr ""
 
@@ -351,11 +354,11 @@
 msgid "o"
 msgstr ""
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr ""
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr ""
 
@@ -363,34 +366,34 @@
 msgid "u"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr "³«€¯..."
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr "ÌŸÁ°€òÉÕ€±€ÆÊÝž"
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr ""
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr ""
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr "¥Õ¥¡¥€¥ë"
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr "¥Ó¥å¡Œ¥¹¥¿¥€¥ë"
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr "Ï¿²»ž»"
--- aumix-2.7.orig/po/sv.po
+++ aumix-2.7/po/sv.po
@@ -13,172 +13,172 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.7\n"
-"POT-Creation-Date: 2000-05-23 15:34+0000\n"
-"POT-Revision-Date: 2000-07-13 11:13+0000\n"
+"POT-Creation-Date: 2001-09-02 23:59+0200\n"
 "Last-Translator: <trevor@jpj.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:74
+#: src/common.c:78
 msgid "Volume  "
 msgstr "Volym"
 
-#: src/common.c:75
+#: src/common.c:79
 msgid "Bass    "
 msgstr ""
 
-#: src/common.c:76
+#: src/common.c:80
 msgid "Treble  "
 msgstr ""
 
-#: src/common.c:77
+#: src/common.c:81
 msgid "Synth   "
 msgstr ""
 
-#: src/common.c:78
+#: src/common.c:82
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:79
+#: src/common.c:83
 msgid "Speaker "
 msgstr ""
 
-#: src/common.c:80
+#: src/common.c:84
 msgid "Line    "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:85
 msgid "Mic     "
 msgstr ""
 
-#: src/common.c:82
+#: src/common.c:86
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:83
+#: src/common.c:87
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:84
+#: src/common.c:88
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:89
 msgid "Record  "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:90
 msgid "Input   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:91
 msgid "Output  "
 msgstr ""
 
-#: src/common.c:88
+#: src/common.c:92
 msgid "Line 1  "
 msgstr ""
 
-#: src/common.c:89
+#: src/common.c:93
 msgid "Line 2  "
 msgstr ""
 
-#: src/common.c:90
+#: src/common.c:94
 msgid "Line 3  "
 msgstr ""
 
-#: src/common.c:91
+#: src/common.c:95
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:92
+#: src/common.c:96
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:93
+#: src/common.c:97
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:98
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:99
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:100
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:101
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:102
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  error opening mixer"
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  no device found"
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  mixer not open"
 msgstr ""
 
-#: src/common.c:264
+#: src/common.c:289
 msgid "aumix:  unable to open settings file"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:297
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr ""
 
-#: src/common.c:300
+#: src/common.c:325
 #, c-format
 msgid "%i ms wait\n"
 msgstr "vänta %i ms\n"
 
-#: src/common.c:312
+#: src/common.c:337
 msgid "not set"
 msgstr "inte satt"
 
-#: src/common.c:315
+#: src/common.c:340
 msgid "set to"
 msgstr ""
 
-#: src/common.c:656
+#: src/common.c:688
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 msgstr ""
 
-#: src/common.c:658
+#: src/common.c:690
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:660
+#: src/common.c:692
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:663
+#: src/common.c:695
 msgid " [-C <color scheme file>]"
 msgstr ""
 
-#: src/common.c:665
+#: src/common.c:697
 msgid " [-f <rc file>]"
 msgstr ""
 
-#: src/common.c:667
+#: src/common.c:699
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -194,11 +194,11 @@
 "other options:\n"
 msgstr ""
 
-#: src/common.c:680
+#: src/common.c:712
 msgid "  C:  specify color scheme\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:715
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -206,26 +206,27 @@
 "  h:  this helpful message\n"
 msgstr ""
 
-#: src/common.c:689
+#: src/common.c:721
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 
-#: src/common.c:692
+#: src/common.c:724
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
 
-#: src/curses.c:17 src/gtk.c:112
+#: src/curses.c:17 src/gtk.c:113
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/curses.c:18 src/gtk.c:112
+#. GtkSignalFunc   filefuncs[] = {&LoadSettingsGTK, &SaveSettingsGTK, &CloseScreenGTK};
+#: src/curses.c:18 src/gtk.c:113
 msgid "Load"
 msgstr "Ladda"
 
-#: src/curses.c:19 src/gtk.c:112
+#: src/curses.c:19 src/gtk.c:113
 msgid "Save"
 msgstr "Spara"
 
@@ -233,7 +234,7 @@
 msgid "Keys"
 msgstr ""
 
-#: src/curses.c:21 src/gtk.c:159
+#: src/curses.c:21 src/gtk.c:161
 msgid "Mute"
 msgstr ""
 
@@ -245,27 +246,27 @@
 msgid "Undo"
 msgstr "Ångra"
 
-#: src/curses.c:93 src/gtk.c:248
+#: src/curses.c:93 src/gtk.c:250
 msgid "0"
 msgstr ""
 
-#: src/curses.c:94 src/gtk.c:222
+#: src/curses.c:94 src/gtk.c:224
 msgid "Level"
 msgstr ""
 
-#: src/curses.c:95 src/gtk.c:251
+#: src/curses.c:95 src/gtk.c:253
 msgid "100"
 msgstr ""
 
-#: src/curses.c:96 src/gtk.c:242
+#: src/curses.c:96 src/gtk.c:244
 msgid "L"
 msgstr "Vänster"
 
-#: src/curses.c:97 src/gtk.c:225
+#: src/curses.c:97 src/gtk.c:227
 msgid "Balance"
 msgstr ""
 
-#: src/curses.c:98 src/gtk.c:245
+#: src/curses.c:98 src/gtk.c:247
 msgid "R"
 msgstr "Högre"
 
@@ -339,7 +340,9 @@
 msgid "k"
 msgstr ""
 
-#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+#.
+#. char           *filemenutext[] = {LOCAL_TEXT_NOOP("Load"), LOCAL_TEXT_NOOP("Save"), LOCAL_TEXT_NOOP("Quit")};
+#: src/gtk.c:115 src/interactive.c:383 src/interactive.c:390
 msgid "l"
 msgstr ""
 
@@ -351,11 +354,11 @@
 msgid "o"
 msgstr ""
 
-#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+#: src/gtk.c:115 src/interactive.c:386 src/interactive.c:393
 msgid "q"
 msgstr "a"
 
-#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+#: src/gtk.c:115 src/interactive.c:387 src/interactive.c:394
 msgid "s"
 msgstr ""
 
@@ -363,34 +366,34 @@
 msgid "u"
 msgstr ""
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Load From"
 msgstr "Öppna..."
 
-#: src/gtk.c:112
+#: src/gtk.c:113
 msgid "Save To"
 msgstr "Spara som..."
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "f"
 msgstr "o"
 
-#: src/gtk.c:113
+#: src/gtk.c:115
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:145
+#: src/gtk.c:147
 msgid "Mute All"
 msgstr ""
 
-#: src/gtk.c:151
+#: src/gtk.c:153
 msgid "File"
 msgstr "Fil"
 
-#: src/gtk.c:155
+#: src/gtk.c:157
 msgid "View"
 msgstr "Visa"
 
-#: src/gtk.c:219
+#: src/gtk.c:221
 msgid "Rec"
 msgstr "Mottagar källa"
--- aumix-2.7.orig/po/nl.po
+++ aumix-2.7/po/nl.po
@@ -0,0 +1,411 @@
+# Dutch translation for aumix.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Guus Sliepen <guus@debian.org>, 2001
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.7\n"
+"POT-Creation-Date: 2000-07-13 11:17+0000\n"
+"PO-Revision-Date: 2001-08-05 13:23:46+0200\n"
+"Last-Translator: Guus Sliepen <guus@debian.org>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: src/common.c:74
+msgid "Volume  "
+msgstr "Volume  "
+
+#: src/common.c:75
+msgid "Bass    "
+msgstr "Lage T. "
+
+#: src/common.c:76
+msgid "Treble  "
+msgstr "Hoge T. "
+
+#: src/common.c:77
+msgid "Synth   "
+msgstr "Synth   "
+
+#: src/common.c:78
+msgid "PCM     "
+msgstr "PCM     "
+
+#: src/common.c:79
+msgid "Speaker "
+msgstr "Speaker "
+
+#: src/common.c:80
+msgid "Line    "
+msgstr "Lijn    "
+
+#: src/common.c:81
+msgid "Mic     "
+msgstr "Mic     "
+
+#: src/common.c:82
+msgid "CD      "
+msgstr "CD      "
+
+#: src/common.c:83
+msgid "Mix     "
+msgstr "Mix     "
+
+#: src/common.c:84
+msgid "PCM 2   "
+msgstr "PCM 2   "
+
+#: src/common.c:85
+msgid "Record  "
+msgstr "Opname  "
+
+#: src/common.c:86
+msgid "Input   "
+msgstr "Ingang  "
+
+#: src/common.c:87
+msgid "Output  "
+msgstr "Uitgang "
+
+#: src/common.c:88
+msgid "Line 1  "
+msgstr "Lijn 1  "
+
+#: src/common.c:89
+msgid "Line 2  "
+msgstr "Lijn 2  "
+
+#: src/common.c:90
+msgid "Line 3  "
+msgstr "Lijn 3  "
+
+#: src/common.c:91
+msgid "Digital1"
+msgstr "Digit. 1"
+
+#: src/common.c:92
+msgid "Digital2"
+msgstr "Digit. 2"
+
+#: src/common.c:93
+msgid "Digital3"
+msgstr "Digit. 3"
+
+#: src/common.c:94
+msgid "Phone In"
+msgstr "Phone In"
+
+#: src/common.c:95
+msgid "PhoneOut"
+msgstr "PhoneUit"
+
+#: src/common.c:96
+msgid "Video   "
+msgstr "Video   "
+
+#: src/common.c:97
+msgid "Radio   "
+msgstr "Radio   "
+
+#: src/common.c:98
+msgid "Monitor "
+msgstr "Monitor "
+
+#: src/common.c:264
+msgid "aumix:  error opening mixer"
+msgstr "aumix:  fout tijdens openen mixer"
+
+#: src/common.c:264
+msgid "aumix:  no device found"
+msgstr "aumix:  apparaat niet gevonden"
+
+#: src/common.c:264
+msgid "aumix:  mixer not open"
+msgstr "aumix:  mixer niet open"
+
+#: src/common.c:264
+msgid "aumix:  unable to open settings file"
+msgstr "aumix:  kon instellingen niet laden"
+
+#: src/common.c:272
+#, c-format
+msgid "aumix:  unknown error %i"
+msgstr "aumix:  onbekende fout %i"
+
+#: src/common.c:300
+#, c-format
+msgid "%i ms wait\n"
+msgstr "%i ms wachten\n"
+
+#: src/common.c:312
+msgid "not set"
+msgstr "niet ingesteld"
+
+#: src/common.c:315
+msgid "set to"
+msgstr "ingesteld op"
+
+#: src/common.c:656
+#, c-format
+msgid ""
+"aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
+"R[ecord]|P[lay]|q[uery]]"
+msgstr ""
+"aumix %s usage: aumix [-<kanaal optie>[[+|-][<waarde>]]|<niveau>|\n"
+"R[ecord]|P[lay]|q[uery]]"
+
+#: src/common.c:658
+msgid " [-dhILqS]"
+msgstr " [-dhILqS]"
+
+#: src/common.c:660
+msgid " [-dhLqS]"
+msgstr " [-dhLqS]"
+
+#: src/common.c:663
+msgid " [-C <color scheme file>]"
+msgstr " [-C <kleurenschema bestand>]"
+
+#: src/common.c:665
+msgid " [-f <rc file>]"
+msgstr " [-f <configuratie bestand>]"
+
+#: src/common.c:667
+msgid ""
+"channel options:\n"
+"  v:  main volume           x:  mix monitor\n"
+"  b:  bass                  W:  PCM 2\n"
+"  t:  treble                r:  record\n"
+"  s:  synthesizer           i:  input gain\n"
+"  w:  PCM                   o:  output gain\n"
+"  p:  PC speaker            1:  line 1\n"
+"  l:  line                  2:  line 2\n"
+"  m:  microphone            3:  line 3\n"
+"  c:  CD\n"
+"\n"
+"other options:\n"
+msgstr ""
+"kanaal opties:\n"
+"  v:  hoofdvolume           x:  mix monitor\n"
+"  b:  lage tonen            W:  PCM 2\n"
+"  t:  hoge tonen            r:  opname\n"
+"  s:  synthesizer           i:  ingangsversterking\n"
+"  w:  PCM                   o:  uitgangsverterking\n"
+"  p:  PC luidspreker        1:  lijn 1\n"
+"  l:  lijningang            2:  lijn 2\n"
+"  m:  microfoon             3:  lijn 3\n"
+"  c:  CD\n"
+"\n"
+"andere opties:\n"
+
+#: src/common.c:680
+msgid "  C:  specify color scheme\n"
+msgstr "  C:  specifieer kleurenschema\n"
+
+#: src/common.c:683
+msgid ""
+"  d:  adjust a device besides /dev/mixer\n"
+"  f:  specify file for saving and loading settings (defaults to\n"
+"      ~/.aumixrc or /etc/aumixrc)\n"
+"  h:  this helpful message\n"
+msgstr ""
+"  d:  pas een ander apparaat aan dan /dev/mixer\n"
+"  f:  specifieer bestand voor instelling\n"
+"      (standaard ~/.aumixrc of /etc/aumixrc)\n"
+"  h:  deze behulpzame tekst\n"
+
+#: src/common.c:689
+msgid "  I:  start in interactive mode after doing non-interactive functions\n"
+msgstr "  I:  start in interactieve modus na uitvoeren niet-interactieve functies\n"
+
+#: src/common.c:692
+msgid ""
+"  L:  load settings\n"
+"  q:  query all channels and print their settings\n"
+"  S:  save settings\n"
+msgstr ""
+"  L:  instellingen laden\n"
+"  q:  alle kanalen afgaan en instellingen tonen\n"
+"  S:  instellingen bewaren\n"
+
+#: src/curses.c:17 src/gtk.c:112
+msgid "Quit"
+msgstr "Einde"
+
+#: src/curses.c:18 src/gtk.c:112
+msgid "Load"
+msgstr "Laad"
+
+#: src/curses.c:19 src/gtk.c:112
+msgid "Save"
+msgstr "Bewaar"
+
+#: src/curses.c:20
+msgid "Keys"
+msgstr "Toetsen"
+
+#: src/curses.c:21 src/gtk.c:159
+msgid "Mute"
+msgstr "Stil"
+
+#: src/curses.c:22
+msgid "Only"
+msgstr "Alleen"
+
+#: src/curses.c:23
+msgid "Undo"
+msgstr "Ondoen"
+
+#: src/curses.c:93 src/gtk.c:248
+msgid "0"
+msgstr "0"
+
+#: src/curses.c:94 src/gtk.c:222
+msgid "Level"
+msgstr "Niveau"
+
+#: src/curses.c:95 src/gtk.c:251
+msgid "100"
+msgstr "100"
+
+#: src/curses.c:96 src/gtk.c:242
+msgid "L"
+msgstr "L"
+
+#: src/curses.c:97 src/gtk.c:225
+msgid "Balance"
+msgstr "Balans"
+
+#: src/curses.c:98 src/gtk.c:245
+msgid "R"
+msgstr "R"
+
+#: src/curses.c:144
+msgid "page arrows\n"
+msgstr "pagina pijlen\n"
+
+#: src/curses.c:145
+msgid "tab enter < > , .\n"
+msgstr "tab enter < > , .\n"
+
+#: src/curses.c:146
+msgid "+ - [ ] arrows digits\n"
+msgstr "+ - [ ] pijlen cijfers\n"
+
+#: src/curses.c:147
+msgid "space\n"
+msgstr "spatie\n"
+
+#: src/curses.c:148
+msgid "|\n"
+msgstr "|\n"
+
+#: src/curses.c:149
+msgid ""
+"\n"
+"Press a key or mouse button to resume."
+msgstr ""
+"\n"
+"Druk op een toets of muisknop om door te gaan."
+
+#: src/curses.c:151
+msgid "Key                       Function\n"
+msgstr "Toets                     Functie\n"
+
+#: src/curses.c:152
+msgid "------------------------- --------------------"
+msgstr "------------------------- --------------------"
+
+#: src/curses.c:153
+msgid "change channel\n"
+msgstr "verander kanaal\n"
+
+#: src/curses.c:154
+msgid "toggle level/balance\n"
+msgstr "schakel tussen niveau/balans\n"
+
+#: src/curses.c:155
+msgid "adjust slider\n"
+msgstr "schuif bewegen\n"
+
+#: src/curses.c:156
+msgid "toggle record/play\n"
+msgstr "schakel tussen opnemen/afspelen\n"
+
+#: src/curses.c:157
+msgid "center balance\n"
+msgstr "balans centreren\n"
+
+#: src/curses.c:176
+msgid "     "
+msgstr "      "
+
+#: src/curses.c:179
+msgid "muted"
+msgstr "stil  "
+
+#: src/curses.c:182
+msgid "only "
+msgstr "alleen"
+
+#: src/interactive.c:382 src/interactive.c:389
+msgid "k"
+msgstr "t"
+
+#: src/gtk.c:113 src/interactive.c:383 src/interactive.c:390
+msgid "l"
+msgstr "l"
+
+#: src/interactive.c:384 src/interactive.c:391
+msgid "m"
+msgstr "s"
+
+#: src/interactive.c:385 src/interactive.c:392
+msgid "o"
+msgstr "a"
+
+#: src/gtk.c:113 src/interactive.c:386 src/interactive.c:393
+msgid "q"
+msgstr "e"
+
+#: src/gtk.c:113 src/interactive.c:387 src/interactive.c:394
+msgid "s"
+msgstr "b"
+
+#: src/interactive.c:388 src/interactive.c:395
+msgid "u"
+msgstr "o"
+
+#: src/gtk.c:112
+msgid "Load From"
+msgstr "Laad van"
+
+#: src/gtk.c:112
+msgid "Save To"
+msgstr "Bewaar als"
+
+#: src/gtk.c:113
+msgid "f"
+msgstr "f"
+
+#: src/gtk.c:113
+msgid "t"
+msgstr "t"
+
+#: src/gtk.c:145
+msgid "Mute All"
+msgstr "Alles stil"
+
+#: src/gtk.c:151
+msgid "File"
+msgstr "Bestand"
+
+#: src/gtk.c:155
+msgid "View"
+msgstr "Toon"
+
+#: src/gtk.c:219
+msgid "Rec"
+msgstr "Opname"
--- aumix-2.7.orig/configure.in
+++ aumix-2.7/configure.in
@@ -11,7 +11,7 @@
 dnl
 dnl #### This kind of sucks.  Shouldn't the configure process
 dnl determine this automagically by scanning `.po' files in `po/'?
-ALL_LINGUAS="de es fr gl ja pl pt_BR ru sv uk"
+ALL_LINGUAS="de es fr gl ja nl pl pt_BR ru sv uk"
 
 dnl Checks for programs.
 AC_PROG_AWK
--- aumix-2.7.orig/debian/init
+++ aumix-2.7/debian/init
@@ -0,0 +1,96 @@
+#! /bin/sh
+# 
+# aumix    Save/restore mixer settings on bootup
+# Thanks to Leon Breedt <ljb@debian.org> for this.
+#
+
+NAME=aumix
+CONF=/etc/aumixrc
+AUMIX=/usr/bin/aumix
+
+[ -x $AUMIX -a -f /usr/share/doc/aumix/copyright ] || exit 0
+
+export PATH=/usr/sbin:$PATH
+export I=""
+
+if [ -x /etc/init.d/alsa ]; then
+    if alsactl >/dev/null 2>&1; then
+        echo "ALSA detected, so aumix will not touch the mixer settings."
+        exit 0
+    fi
+    echo "ALSA detected, but alsactl not usable, carrying on with aumix."
+fi
+
+store ()
+{
+   I=""
+   echo -n "Saving mixer settings: "
+   while $AUMIX -d /dev/mixer$I -f $CONF$I -S 2>/dev/null >/dev/null; do
+      test "x$I" = "x" && I=0
+      echo -n "device $I, "
+      I=`expr $I + 1`
+   done
+   if [ "$I" = 0 ]; then
+      echo "failed."
+   fi
+}
+
+load ()
+{
+   I=""
+   echo -n "Restoring mixer settings: "
+   while $AUMIX -d /dev/mixer$I -f $CONF$I -L 2>/dev/null >/dev/null; do
+      test "x$I" = "x" && I=0
+      echo -n "device $I, "
+      I=`expr $I + 1`
+   done
+   if [ "$I" = 0 ]; then
+      echo "failed."
+   else
+      echo "done."
+   fi
+}
+
+mute ()
+{
+   I=""
+   echo "muting."
+   while $AUMIX -d /dev/mixer$I -v 0 2>/dev/null >/dev/null; do
+      test "x$I" = "x" && I=0
+      I=`expr $I + 1`
+   done
+}
+
+case "$1" in
+    start|restart|reload|force-reload)
+        if [ -f $CONF ]; then
+            rm -f /var/lock/aumix/saved
+            load
+        fi
+        ;;
+    stop)
+        if [ -f /var/lock/aumix/saved ] ; then
+          echo "Configuration allready stored, not saving again..."
+        else
+          store
+          touch /var/lock/aumix/saved
+          [ "$I" = 0 ] && exit 1
+          mute
+        fi
+        ;;
+    save)
+        if [ -f /var/lock/aumix/saved ] ; then
+          echo "Configuration allready stored, not saving again..."
+        else
+           store
+           [ "$I" = 0 ] && exit 1
+           echo "done."
+        fi
+        ;;
+    *)
+        echo "Usage: /etc/init.d/$NAME {start|stop|save}" 
+        exit 1
+        ;;
+esac
+
+exit 0
--- aumix-2.7.orig/debian/changelog
+++ aumix-2.7/debian/changelog
@@ -0,0 +1,281 @@
+aumix (2.7-11) unstable; urgency=low
+
+  * fixed the init scripts to begin not with mixer0. Closes: #118775.
+    Why, oh why could the OSS guys not just follow the simple scheme with
+    "deviceNUMBER" and "device" == symlink to preffered device.
+  * now purging init symlinks of the concurenting aumix package. Preventing
+    old script from screwing up the new configuration.
+
+ -- Eduard Bloch <blade@debian.org>  Thu,  8 Nov 2001 20:43:59 +0100
+
+aumix (2.7-10) unstable; urgency=low
+
+  * added a hint about possible nasty behaviour to the manpage.
+  * now tries to store the settings of multiple mixer devices,
+    Thanks to Paul van Tilburg <paulvt@debian.org>.
+
+ -- Eduard Bloch <blade@debian.org>  Tue,  6 Nov 2001 22:28:06 +0100
+
+aumix (2.7-9) unstable; urgency=high
+
+  * possible local symlink attacks, Closes: #117282
+
+ -- Eduard Bloch <blade@debian.org>  Sat, 27 Oct 2001 16:12:10 +0200
+
+aumix (2.7-8) unstable; urgency=low
+
+  * improved description after discussing with a translator
+  * fixed a probable typo in menu width decision (curses.c), localised
+    strings should have enough space now. Closes: #101376
+  * it does not make much sense to distribute /etc/aumixrc conffile in the
+    package. Closes: #111473
+  * fixed german translation
+  * Closed in previous NMU: Closes: #75742, Closes: #97701, Closes: #98465
+
+ -- Eduard Bloch <blade@debian.org>  Sat, 15 Sep 2001 17:17:08 +0200
+
+aumix (2.7-7) unstable; urgency=low
+
+  * added b-dep on autoconf, closes: #111761
+  * pre-saving the mixer settings on installation, closes: #111754
+
+ -- Eduard Bloch <blade@debian.org>  Sun,  9 Sep 2001 16:56:17 +0200
+
+aumix (2.7-6) unstable; urgency=low
+
+  * changed Provides, closes: #111657
+
+ -- Eduard Bloch <blade@debian.org>  Sat,  8 Sep 2001 09:56:14 +0200
+
+aumix (2.7-5) unstable; urgency=low
+
+  * changed priority of aumix-gtk to optional (to be prefered), aumix to extra
+
+ -- Eduard Bloch <blade@debian.org>  Thu,  6 Sep 2001 11:31:23 +0200
+
+aumix (2.7-4) unstable; urgency=low
+
+  * New maintainer
+  * made sure that start/save routines are not executed twice, closes: #100797
+  * removed the explicite check of alsactl path, not working in current ALSA
+  * Some bugs closed in previous release(s): closes: #95333, closes: #76844,
+    closes: #65399, closes: #65400
+  * updated translations: fr.po, nl.po, closes: #111300
+
+ -- Eduard Bloch <blade@debian.org>  Fri, 31 Aug 2001 19:31:24 +0200
+
+aumix (2.7-3) unstable; urgency=low
+
+  * NMU, permitted by maintainer
+  * changed priority of the init script to save the settings before ALSA
+    shutdown, Closes: #98465 (and probably #100797)
+  * modified the xaumix wrapper to run in weird conditions (stored in debian/),
+    Closes: #75742, Closes: #97701
+  * Fixed init script to check if alsactl is really useable
+
+ -- Eduard Bloch <blade@debian.org>  Tue,  3 Jul 2001 00:19:42 +0200
+
+aumix (2.7-2) unstable; urgency=low
+
+  * Detect if /etc/init.d/alsa is there, and if so, don't do anything in
+    the init.d script. Apparently when alsa mutes the card (in hardware),
+    the levels also go to zero (which I wouldn't have expected).
+    closes:#71300,#71699
+  * Mute at shutdown, after saving the settings. closes:#71926
+  * Add "save" option to init.d script for convenience.
+  * In the manpage, clarify use of -C to use ncurses interface in gtk version.
+    closes:#70844
+  * Clarify the -I explanation in the manpage. closes:#70843
+
+ -- Paul Slootman <paul@debian.org>  Mon, 18 Sep 2000 20:12:40 +0200
+
+aumix (2.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Now enabled GTK interface. I've created a separate aumix-gtk package
+    because otherwise those who use aumix on a non-X system would be forced to
+    install libgtk and libglib as well; and those aren't exactly tiny.
+  * AFAIK "aumix -C xterm -L" now works. closes:#50744
+  * Now the xaumix script looks at x-terminal-emulator when choosing which
+    terminal emulator to use. closes:#64495
+  * Updated standards-version to 3.2.1, and this of course closes:#70303
+  * This new build linked against the latest ncurses library. closes:#64700
+  * Now featuring an init.d script to save and restore the mixer settings.
+    closes:#60969
+
+ -- Paul Slootman <paul@debian.org>  Wed, 30 Aug 2000 07:59:08 +0200
+
+aumix (2-1) unstable; urgency=low
+
+  * New upstream release. Includes GTK interface.
+  * GTK interface disabled for the time being, it's still not that usable.
+
+ -- Paul Slootman <paul@debian.org>  Tue, 28 Dec 1999 12:49:47 +0100
+
+aumix (1.30-1) unstable; urgency=low
+
+  * YA new upstream release. Skipped 1.28, 1.29.
+    Seems like adopting aumix has put new life into its development...
+  * Added some patches from Christian Weisgerber <naddy@mips.rhein-neckar.de>
+    from the aumix mailing list (level/balance selection after resizing,
+    minor record/play bug).
+
+ -- Paul Slootman <paul@debian.org>  Thu,  9 Dec 1999 10:27:54 +0100
+
+aumix (1.27.1-1) unstable; urgency=low
+
+  * YA new upstream release. Skipped 1.26, 1.27.
+
+ -- Paul Slootman <paul@debian.org>  Wed, 17 Nov 1999 10:12:32 +0100
+
+aumix (1.25.1-2) unstable; urgency=low
+
+  * Made sure references to aumix-X-wrapper were changed to xaumix.
+    closes:#49460
+  * Changed pointless "`which aumix`" into plain "aumix" which does exactly
+    the same (also referenced in bug 49460).
+
+ -- Paul Slootman <paul@debian.org>  Mon,  8 Nov 1999 14:25:24 +0100
+
+aumix (1.25.1-1) unstable; urgency=low
+
+  * New upstream release... before I could upload 1.25-1.
+  * Upstream removed aumix-alsa support, as the new ALSA libraries are
+    not compatible with the old ones, and there's no documentation on the
+    new libs.
+
+ -- Paul Slootman <paul@debian.org>  Wed,  3 Nov 1999 13:46:49 +0100
+
+aumix (1.25-1) unstable; urgency=low
+
+  * New upstream release with most of the debian patches included (yay!)
+  * Upstream removed aumix-alsa support, as the new ALSA libraries are
+    not compatible with the old ones, and there's no documentation on the
+    new libs.
+
+ -- Paul Slootman <paul@debian.org>  Mon,  1 Nov 1999 14:40:38 +0100
+
+aumix (1.23.1-2) unstable; urgency=low
+
+  * Made lintian-clean: manpage for aumix-X-wrapper, call update-menus in
+    postrm.
+  * fixed X11 menu entries
+  * fixed various problems with the aumix-alsa package (menu entry, missing
+    (icon). closes:#47066
+
+ -- Paul Slootman <paul@debian.org>  Tue, 19 Oct 1999 16:21:59 +0200
+
+aumix (1.23.1-1) unstable; urgency=low
+
+  * New upstream release before I'd finished the previous one (1.23-1 remains
+    unreleased).
+  * Fixed reading of the scheme file to be less prone to problems. It now also
+    supports '-' as color to mean the default.
+    Should be included in the next upstream release.
+
+ -- Paul Slootman <paul@debian.org>  Thu,  7 Oct 1999 15:54:49 +0200
+
+aumix (1.23-1) unstable; urgency=low
+
+  * New upstream release.
+  * News standards version.
+  * This time I won't forget to change the maintainer in the control file. Sigh.
+  * postrm checks whether a /etc/aumixrc exists, and suggests removing it if so.
+  * menu entries for vc and x11 (using a wrapper for the x11 entry).
+  * upstream now includes an icon. I've hacked it to fit menu's requirements.
+
+ -- Paul Slootman <paul@debian.org>  Wed,  6 Oct 1999 10:49:22 +0200
+
+aumix (1.22.1-1) unstable; urgency=low
+
+  * New maintainer.
+  * New upstream release.
+    This release closes:#40219, #36280, #39338
+    (100% CPU time, and new version 1.21.1 available)
+    The following bugs were already closed:#34468
+    (new version 1.18.2 available)
+
+ -- Paul Slootman <paul@debian.org>  Fri, 30 Jul 1999 13:23:03 +0200
+
+aumix (1.18.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Sun, 14 Mar 1999 12:45:35 +0000
+
+aumix (1.14-1) unstable; urgency=low
+
+  * New upstream release.
+  * Split into 2 packages: aumix and aumix-alsa.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Sun, 29 Nov 1998 00:00:30 +0000
+
+aumix (1.13-1) unstable; urgency=low
+
+  * New upstream release.
+  * Major change: ALSA support added.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Sat, 19 Sep 1998 23:48:38 +0100
+
+aumix (1.10-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Wed,  5 Aug 1998 23:06:34 +0100
+
+aumix (1.8-2) unstable; urgency=low
+
+  * Uses debhelper and doc-base.
+  * New standards-version.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Sun, 15 Mar 1998 18:35:06 +0000
+
+aumix (1.8-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Thu, 23 Oct 1997 22:15:36 +0100
+
+aumix (1.7-2) unstable; urgency=low
+
+  * Fixes to the description field.
+  * Menu file no longer allows running under X.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Sat,  4 Oct 1997 11:37:24 +0100
+
+aumix (1.7-1) unstable; urgency=low
+
+  * New upstream version.
+  * Built against libc6.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Fri,  15 Aug 1997 09:29:34 +0100
+
+aumix (1.6.1-4) unstable; urgency=low
+
+  * Updated for menu-1
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Sat, 26 Apr 1997 09:50:00 +0100
+
+aumix (1.6.1-3) unstable frozen; urgency=low
+
+  * Moved documentation from dwww-index to menu
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Thu, 10 Apr 1997 09:35:16 +0100
+
+aumix (1.6.1-2) unstable; urgency=low
+
+  * Structural changes in source package
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Fri, 14 Feb 1997 23:18:27 +0000
+
+aumix (1.6.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Sun, 2 Feb 1997 09:47:11 +0000
+
+aumix (1.5-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Tom Lees <tom@lpsg.demon.co.uk>  Sat, 7 Dec 1996 13:50:20 +0000
--- aumix-2.7.orig/debian/xaumix
+++ aumix-2.7/debian/xaumix
@@ -0,0 +1,135 @@
+#!/bin/sh
+# xaumix:  run aumix in ncurses mode in a terminal emulator under X
+# copyright (C) 1999,2000 Paul Slootman <paul@debian.org>
+# released under GNU General Public License
+#
+# - Initial idea and version by Paul Slootman
+#
+# - Searching for different terminal emulator and the accompanying options
+#   by Trevor Johnson <trevor@jpj.net> (and others?)
+#
+# - Reworked to first select a suitable terminal emulator and then select
+#   the appropriate options by Paul Slootman to enable usage of debian's
+#   alternatives mechanism, where the local admin can select what the
+#   default terminal emulator is. (I don't know if other distributions have
+#   similar mechanisms?)
+#
+# - Modified by Eduard Bloch <blade@debian.org> to try x-terminal-emulator and
+#   rely on the new behaviour of the menu system.
+
+set -e  # exit upon any error
+
+# Are we under X11?
+if test -z "$DISPLAY"; then
+	exec aumix
+	exit 1
+fi
+
+XTERM=  # nothing found yet
+
+if [ -x /usr/sbin/update-alternatives ]; then   # debian
+	# Example line:
+	#	link currently points to /usr/X11R6/bin/rxvt-xterm
+	XTERM=`/usr/sbin/update-alternatives --display x-terminal-emulator |
+		grep 'link currently' | sed 's,.* points to .*/\(.*\)$,\1,'`
+else
+	XTERM=''
+fi
+# from gzexe:  add colon to internal field separator because PATH
+# is colon-delimited
+IFS=${IFS= 	}
+saveifs=$IFS
+IFS=${IFS}:
+# Test for GNOME before KDE:  I flipped a coin. --Trevor
+if [ -z "$XTERM" ] && xprop -root | grep -q '^GNOME_SM_PROXY'; then
+	for dir in $PATH; do
+		# Although gnome-terminal works, it gives error messages:
+ 		#	Gdk-WARNING **: locale not supported by C library
+ 		#	GnomeUI-WARNING **: Could not open help topics file NULL
+	    if test -x $dir/gnome-terminal.wrapper; then XTERM=gnome-terminal.wrapper; break; fi
+	done
+fi
+if [ -z "$XTERM" ] && xprop -root | grep -q 'Unnamed Desktop'; then
+	for dir in $PATH; do
+		if test -x $dir/kvt; then XTERM=kvt; break; fi
+		#    This one doesn't do color.  Also it gives an error message:
+		# 	TEScreen.C(172) : setRegion(0,64) : bad range.
+		# if test -f $HOME/.kde/share/config/konsolerc; then
+		#	if test -x $dir/konsole; then XTERM=konsole; break; fi
+	done
+fi
+
+if [ -z "$XTERM" ]; then	# find an available xterm-alike
+	for dir in $PATH; do
+		if test -x $dir/xterm; then PREFERRED=xterm; break; fi
+		if test -x $dir/rxvt;  then PREFERRED=rxvt;  break; fi
+		if test -x $dir/aterm; then PREFERRED=aterm; break; fi
+		if test -x $dir/kterm; then PREFERRED=kterm; break; fi
+		if test -x $dir/wterm; then PREFERRED=wterm; break; fi
+		if test -x $dir/Eterm; then PREFERRED=Eterm; break; fi
+		if test -x $dir/eterm; then PREFERRED=eterm; break; fi
+	done
+fi
+IFS=$saveifs
+
+# set defaults
+XTERMOPTIONS='-T aumix -n aumix'
+GEOMETRY='-geometry 79x${LINES}'
+SCHEME='-C ansi'
+
+case "$XTERM" in
+	gnome-terminal.wrapper)
+		XTERMOPTIONS='-t aumix --name aumix'
+		GEOMETRY='--geometry 79x${LINES}'
+		;;
+	kvt)	XTERMOPTIONS='-no_scrollbar -sl 0 -caption aumix -n aumix'
+		GEOMETRY='-vt_geometry 79x${LINES}'
+		SCHEME='-C xterm'
+		;;
+	konsole)
+		XTERMOPTIONS=' -sl 0 -nowelcome -caption aumix -n aumix'
+		GEOMETRY='' #'-vt_sz 79x{LINES}' doesn't work
+		SCHEME='-C xterm'
+		;;
+	xterm*|rxvt*|aterm)
+		XTERMOPTIONS='-rv +sb -T aumix -n aumix'
+		;;
+	kterm)	XTERMOPTIONS=' -T aumix -n aumix'
+		;;
+	wterm)	XTERMOPTIONS='-T aumix -name aumix -rv +sb'
+		;;
+	Eterm)	XTERMOPTIONS='--scrollbar=0 --term-name xterm -T aumix -n aumix'
+		GEOMETRY='-g 79x${LINES}'
+		;;
+	# need to check geometry option for eterm
+	# Is this the same as Eterm ("Enlightened Terminal Emulator
+	# for X Windows[sic]")?
+	eterm)	XTERMOPTIONS='-T aumix -n aumix'
+		GEOMETRY=''
+		SCHEME='-C xterm'
+		;;
+	*) if [ ! -z $XTERM ] ; then
+   # we have x-terminal-emulator symlink that should allways support -e and -T.
+   # If it doesn't, file bugs against the corresponding program
+         echo "Unknown X terminal emulator. xaumix will invoke $XTERM now
+   (pointed by your x-terminal-emulator alternatives entry)"
+         # safer options
+         XTERMOPTIONS=""
+         GEOMETRY=""
+         SCHEME=""
+         #XTERM="x-terminal-emulator"
+      fi
+esac
+
+if test -z "$XTERM"; then
+	echo "xaumix:  no terminal emulator found" >&2
+        exit 1
+fi
+
+if [ ! -z "$GEOMETRY" ]; then
+	LINES=`aumix -q | wc -l`
+	LINES=`expr $LINES + 1`
+	eval GEOMETRY=\"$GEOMETRY\"
+fi
+exec $XTERM $GEOMETRY $XTERMOPTIONS -e aumix $SCHEME
+exit 1