--- aumix-2.9.1.old/configure.ac
+++ aumix-2.9.1/configure.ac
@@ -44,8 +44,8 @@
 	sys/soundcard.h \
 	soundcard.h \
 	machine/soundcard.h \
-	ncurses.h \
-	curses.h])
+	ncursesw/ncurses.h \
+	ncursesw/curses.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -69,9 +69,9 @@
    [  --without-ncurses       compile with no ncurses or mouse support],
   AC_MSG_RESULT([Compiling without ncurses support]),[
   dnl Checks for ncurses library.
-  AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
+  AC_CHECK_LIB(ncursesw, initscr, initscr=on, initscr=off)
   if test $initscr = on; then
-    CURSLIB="ncurses"
+    CURSLIB="ncursesw"
     AC_DEFINE(HAVE_LIBNCURSES, 1,
       [Define this if you have the ncurses library and want to use it.])
   else
@@ -96,9 +96,9 @@
     AC_CACHE_CHECK([for private member _use_keypad in WINDOW],
       aumix_cv_struct_window_usekeypad,
       [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
+#include <ncursesw/ncurses.h>
 #else
-#include <curses.h>
+#include <ncursesw/curses.h>
 #endif]], [[WINDOW w; w._use_keypad;]])],[aumix_cv_struct_window_usekeypad=yes],[aumix_cv_struct_window_usekeypad=no])])
     if test $aumix_cv_struct_window_usekeypad = yes; then
       AC_DEFINE(HAVE_USEKEYPAD, 1,
@@ -155,8 +155,8 @@
   gtk_must=off, gtk_must=on)
 if test $gtk_must = on; then
   dnl from gftp 
-  AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes, no)
-  if test "$PKG_CONFIG" = "no"; then
+  PKG_PROG_PKG_CONFIG
+  if test -z "$PKG_CONFIG"; then
     echo "pkg-config not found--compiling without GTK+ 2.0." ; 
   else
     echo "pkg-config found--compiling with GTK+ 2.0." ; 
@@ -181,7 +181,7 @@
 else
   AC_MSG_RESULT([Compiling without GTK+ 2.0.])
 fi
-AM_CONDITIONAL(GTK, test "$gtk_must" = on && test "$PKG_CONFIG" != "no")
+AM_CONDITIONAL(GTK, test "$gtk_must" = on && test -n "$PKG_CONFIG")
 
 AC_MSG_CHECKING([whether dummy mixer is requested])
 AC_ARG_ENABLE(dummy-mixer,
--- aumix-2.9.1.old/doc/aumix.1
+++ aumix-2.9.1/doc/aumix.1
@@ -103,6 +103,16 @@
 specify the name of a file containing a color scheme.
 This implies
 .Fl I .
+The color scheme file may reside in the current working directory or in the
+.Nm
+data directory, typically
+.Pa /usr/share/aumix
+or
+.Pa /usr/share/aumix-gtk
+if you are using the GTK-enabled
+.Nm
+package. 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 )
@@ -118,6 +128,9 @@
 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 ,
@@ -186,6 +199,9 @@
 to
 .Li 9
 set it to 10% through 90%.
+The digit
+.Li 0
+sets it to 100% (not 0%).
 The same keys work analogously on the balance controls.
 .It Space
 toggles between record and play for controls which are capable of 
@@ -321,7 +337,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
@@ -331,9 +349,11 @@
 .Sh HOME PAGE
 .Bd -literal
 http://jpj.net/~trevor/aumix.html
+.Ed
 .Sh MAILING LISTS
 .Bd -literal
 https://gna.org/mail/?group=aumix
+.Ed
 .Sh SEE ALSO
 .Xr gpm 1 ,
 .Xr moused 8 ,
--- aumix-2.9.1.old/po/LINGUAS
+++ aumix-2.9.1/po/LINGUAS
@@ -15,3 +15,4 @@
 sv
 uk
 zh_CN
+zh_TW
--- aumix-2.9.1.old/po/ca.po
+++ aumix-2.9.1/po/ca.po
@@ -4,11 +4,12 @@
 # This file is distributed under the same license as the aumix package.
 # Ernest Adrogu� <eadrogue@gmx.net>, 2003.
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 2003-05-04 12:15+0200\n"
 "Last-Translator: Ernest Adrogu� <eadrogue@gmx.net>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -16,203 +17,275 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "Volum"
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "Greus"
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "Aguts"
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "Sintetitzador"
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM"
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "Altaveu"
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "L�nia"
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "Micr�fon"
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD"
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "Mescles"
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2"
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Grava"
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Entrada"
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Sortida"
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "L�nia 1"
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "L�nia 2"
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "L�nia 3"
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "Digital1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "Digital2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "Digital3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "Entrada Tel"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "Sortida Tel"
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "Video"
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "R�dio"
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "Monitor"
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "e"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  error en obrir el mesclador"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  no s'ha trobat cap dispositiu"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  mesclador no obert"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  no s'ha pogut obrir el fitxer de configuraci�"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  error no identificat %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr "r"
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "espera de %i ms\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "no establert"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "establert en"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -221,23 +294,30 @@
 "aumix %s Forma d'�s: aumix [-<opci� de canal>[[+|-][<quantitat>]]|<nivell>|\n"
 "R[ecord]|P[lay]|q[uery]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr " [-dhILqS]"
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr " [-dhLqS]"
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <fitxer esquema colors>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <fitxer rc>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -265,11 +345,11 @@
 "\n"
 "altres opcions:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  esquema de colors\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -281,12 +361,12 @@
 "      (per omissi� ~/.aumixrc o b�, /etc/aumixrc)\n"
 "  h:  mostra aquest missatge d'ajuda\n"
 
-#: src/common.c:716
+#: src/common.c:724
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  passa a mode interactiu despr�s d'efectuar funcions no interactives\n"
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -296,71 +376,97 @@
 "  q:  mostra el nivell de cada canal\n"
 "  s:  desa les prefer�ncies\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Eixir"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Carregar"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Guardar"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Tecles"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Silenci"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "�nic"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "Desfer"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "Nivell"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "E"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Balan�"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "D"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD"
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD"
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "cursor amunt/avall\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab entrar < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] cursor esq/dreta\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "espai\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -368,143 +474,160 @@
 "\n"
 "Premeu una tecla, o un bot� del ratol�, per continuar."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Tecla                     Funci�\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "canvia de canal\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "canvia entre nivell/balan�\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "ajusta l'indicador\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "alterna gravaci�/reproducci�\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "centra el balan�\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "g"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "       "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "silenci"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "�nic "
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Guardar"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "menu"
 msgstr "Men�"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Grava"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD"
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "t"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "c"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "s"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "u"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "g"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "d"
 
@@ -524,65 +647,69 @@
 msgid "t"
 msgstr "a"
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr "Men�"
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Grava"
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr "N�meros"
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr "v"
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr "b"
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr "n"
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Silenci Tots"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "Fitxer"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "Visualitzaci�"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Grv"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/de.po
+++ aumix-2.9.1/po/de.po
@@ -3,12 +3,13 @@
 # Copyright (C) 1998 Johnny Tevessen.
 # Johnny Tevessen <j.tevessen@line.org>, 1998.
 #
+#: src/common.c:743 src/curses.c:54
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "Last-Translator: Dominik Stadler <Dominik.Stadler@gmx.at>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,203 +17,275 @@
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "Lautst�rke"
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "B�sse"
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "H�hen"
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr ""
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "Lautsprecher"
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr ""
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "Mikro"
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Aufnahme"
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Eingang"
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Ausgang"
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr ""
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr ""
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr ""
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "b"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  Fehler beim �ffnen des Mixers"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  Audioger�t nicht gefunden"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  Mixer nicht ge�ffnet"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  Einstellungen konnten nicht ge�ffnet werden"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  Unbekannter Fehler %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "%i ms Pause\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "nicht gesetzt"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "gesetzt auf"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -221,23 +294,30 @@
 "aumix %s Benutzung: aumix [[ -<Kanaloptionen>[[+|-][<Betrag>]]<Stufe>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <Farbschemadatei>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <rc Datei>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -265,11 +345,11 @@
 "\n"
 "Weitere Optionen:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  Farbschema angeben\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -281,13 +361,13 @@
 "      (Standard sind ~/.aumixrc oder /etc/aumixrc)\n"
 "  h:  Diese n�tzlichen Informationen\n"
 
-#: src/common.c:716
+#: src/common.c:724
 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:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -297,71 +377,97 @@
 "  q:  Alle Kan�le abfragen und Einstellungen ausgeben\n"
 "  S:  Einstellungen speichern\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Beenden  "
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Laden    "
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Speichern"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Tasten   "
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Nichts   "
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "Alleine  "
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "R�ckg�ngig"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "Lautst�rke"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Balance"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "R"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "       "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "       "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "Bild auf/ab\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "Tab Enter < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] Pfeile Zahlen\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "Leertaste\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -369,142 +475,159 @@
 "\n"
 "Taste oder Maustaste dr�cken."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Taste                     Funktion\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------ --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "Kanal wechseln\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "Umschalten Lautst�rke/Balance\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "Schieber einstellen\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "Umschalten Aufnahme/Wiedergabe\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "Balance zentrieren\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "       "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "aus"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "alleine"
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Speichern"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Aufnahme"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "       "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "t"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "l"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "n"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "a"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "s"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "u"
 
@@ -524,65 +647,69 @@
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Aufnahme"
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Alles aus"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "Datei"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "Ansicht"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr ""
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/el.po
+++ aumix-2.9.1/po/el.po
@@ -2,12 +2,13 @@
 # Greek translation of aumix
 # Copyright (C) Trevor Johnson <trevor@jpj.net>, 2002.
 #
+#: src/common.c:743 src/curses.c:54
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "Last-Translator: Trevor Johnson <trevor@jpj.net>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
@@ -15,203 +16,275 @@
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Revision-Date: 2002-05-06 07:22+0000\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "�����"
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "������"
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "�����"
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "��������"
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "��������"
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "������"
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "���������"
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "�����"
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "������"
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "����������"
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "��������"
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "������ 1"
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "������ 2"
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "������ 3"
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "�������� 1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "�������� 2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "�������� 3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "��������"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "������"
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "���������"
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "������ �������"
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  ��������� ���������� ������ "
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  ������� ��� ��������� ����� "
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  ��������� �� �������� "
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  �������� �� ������� �� ������ ������������ "
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  ������� ����� %i "
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, c-format
+msgid "\n"
+msgstr ""
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "%i �� wait\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "��� �����"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "�����"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -220,23 +293,30 @@
 "aumix %s �����: aumix [-<������ option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr "[-C <������ �������� ������� �>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr "[-f <������ � rc>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -252,11 +332,11 @@
 "other options:\n"
 msgstr ""
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr ""
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -264,221 +344,262 @@
 "  h:  this helpful message\n"
 msgstr ""
 
-#: src/common.c:716
+#: src/common.c:724
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
 "  S:  save settings\n"
 msgstr ""
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr ""
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr ""
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr ""
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr ""
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr ""
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr ""
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr ""
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr ""
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr ""
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr ""
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr ""
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+msgid "                 "
+msgstr ""
+
+#: src/curses.c:159
+msgid "               "
+msgstr ""
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr ""
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr ""
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr ""
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr ""
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr ""
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
 msgstr ""
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr ""
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr ""
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr ""
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr ""
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr ""
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr ""
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr ""
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/curses.c:207
 msgid "     "
 msgstr ""
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr ""
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "active"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "������"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 msgid "          "
 msgstr ""
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr ""
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr ""
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr ""
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr ""
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr ""
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr ""
 
@@ -498,65 +619,69 @@
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "������"
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "������ ����"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "������"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "�����"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "������"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/es.po
+++ aumix-2.9.1/po/es.po
@@ -3,11 +3,12 @@
 # Copyright (C) 1999, Pablo Ruiz Garcia <dr_pci@spunfa.dhis.org>.
 # Copyright (C) 1999-2000, Jes�s Bravo �lvarez <jba@pobox.com>.
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 2000-10-08 12:16+0000\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -15,203 +16,275 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "Volumen "
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "Graves  "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "Agudos  "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "Sintet. "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "Altavoz "
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "L�nea   "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "Mic     "
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "Mezcl.  "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Grabar  "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Entrada "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Salida  "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "L�nea 1 "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "L�nea 2 "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "L�nea 3 "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "Digital1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "Digital2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "Digital3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "Phone In"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "PhoneOut"
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "V�deo   "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "Radio   "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "Monitor "
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "q"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  error mientras se abr�a el mezclador"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  no se encontr� ningun dispositivo"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  no se encontr� ningun Mixer"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  No se pudo abrir el fichero de configuracion"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  error desconocido %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "%i ms de espera\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "no establecido"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "establecido a"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -220,23 +293,30 @@
 "aumix %s uso: aumix [-<opci�n de canal>[[+|-][<cantidad>]]|<nivel>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr " [-dhILqS]"
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr " [-dhLqS]"
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <esquema de color>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <rc file>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -264,11 +344,11 @@
 "\n"
 "Otras opciones:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  indicar el esquema de color\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -280,13 +360,13 @@
 "      defecto es ~/.aumixrc o /etc/aumixrc\n"
 "  h:  este mensaje de ayuda\n"
 
-#: src/common.c:716
+#: src/common.c:724
 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:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -296,72 +376,98 @@
 "  q:  checkear todos los canales e imprimir su estado\n"
 "  S:  salvar la configuracion actual\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Quitar"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Leer"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Salvar"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Teclas"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Mute"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "�nico"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "Atr�s"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "Nivel"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "I"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Balance"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "D"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD      "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD      "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "RePag/AvPag, cursor arriba/abajo\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "Tab Intro < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] flechas d�gitos\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "espacio\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
 # incomplete translation
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -369,142 +475,159 @@
 "\n"
 "Pulse una tecla o un bot�n del rat�n para continuar."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Tecla               Funcion\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------ --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "cambiar canal\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "cambiar entre Nivel/Balanceo\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "ajustar el cursor\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "Cambiar entre Grabaci�n/Reproducci�n\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "centrar el balanceo\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "     "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "mudo"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "�nico "
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Salvar"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Grabar  "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD      "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "t"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "l"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "m"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "u"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "s"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "a"
 
@@ -524,65 +647,69 @@
 msgid "t"
 msgstr "a"
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Grabar  "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Silenciar Todos"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "Archivo"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "Ver"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Grab"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/fr.po
+++ aumix-2.9.1/po/fr.po
@@ -3,12 +3,13 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Guillaume Cottenceau <gc@mandrakesoft.com>, 2000.
 #
+#: src/common.c:743 src/curses.c:54
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "Last-Translator: Guillaume Cottenceau <gc@mandrakesoft.com>, 2000\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,203 +17,275 @@
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "Volume  "
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "Basses  "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "Aigus   "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "Synth   "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "HtParleur"
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "Ligne   "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "Mic     "
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "Mix     "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Enreg.  "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Entr�e  "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Sortie  "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "Ligne 1 "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "Ligne 2 "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "Ligne 3 "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "Digital1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "Digital2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "Digital3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "T�l�phIn"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "T�l�phOu"
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "Vid�o   "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "Radio   "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "Moniteur"
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "q"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  erreur � l'ouverture du mixeur"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  aucun p�riph�rique trouv�"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  mixeur non ouvert"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  impossible d'ouvrir le fichier de param�tres"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  erreur inconnue %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "%i ms d'attente\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "non mis"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "mis �"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -221,23 +294,30 @@
 "aumix %s usage: aumix [-<option de canal>[[+|-][<quantit�>]]<niveau>|\n"
 "R[ecord]|P[lay]q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <mod�le de couleurs>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <fichier de configuration>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -265,11 +345,11 @@
 "\n"
 "autres options:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  sp�cifier le mod�le de couleurs\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -281,12 +361,12 @@
 "      (par d�faut il s'agit de ~/.aumixrc ou /etc/aumixrc)\n"
 "  h:  ce message d'aide\n"
 
-#: src/common.c:716
+#: src/common.c:724
 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"
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -296,71 +376,97 @@
 "  q:  imprimer les param�tres de tous les canaux\n"
 "  S:  enregistrer les param�tres\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Quitte"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Charge"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Sauve"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Touches"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Muet"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "Seulement"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "Niveau"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Balance"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "R"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD      "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD      "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "page up/down\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab entr�e < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] fl�ches nombres\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "espace\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -368,142 +474,159 @@
 "\n"
 "Appuyez sur une touche ou un bouton de la souris pour continuer."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Touche                    Fonction\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "changer de canal\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "basculer niveau/balance\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "ajuster le slider\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "basculer enregistrer/jouer\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "centrer la balance\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "     "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "muet"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "seulement "
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Sauve"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Enreg.  "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD      "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "t"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "c"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "m"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr ""
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "s"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "a"
 
@@ -523,65 +646,69 @@
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Enreg.  "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Tous muets"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "Fichier"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Enreg."
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/gl.po
+++ aumix-2.9.1/po/gl.po
@@ -10,11 +10,12 @@
 # Based on es.po by Pablo Ruiz <dr_pci@spunfa.dhis.org>
 # and pt_BR.po by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 2000-10-08 12:11+0200\n"
 "Last-Translator: Jesus Bravo Alvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -22,203 +23,275 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "Volume  "
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "Graves  "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "Agudos  "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "Sintet. "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "Altofal."
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "Li�a    "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "Mic     "
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "Mestur. "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Gravar  "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Entrada "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Sa�da   "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "Li�a 1  "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "Li�a 2  "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "Li�a 3  "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "Dixital1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "Dixital2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "Dixital3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "Phone In"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "PhoneOut"
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "V�deo   "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "Radio   "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "Monitor "
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "s"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  erro � abri-lo mesturador"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  non se atopou ning�n dispositivo"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  mesturador non aberto"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  non se pode abri-lo ficheiro de opci�ns"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  erro %i desco�ecido"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "%i ms de espera\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "non establecido"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "establecer a"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -227,23 +300,30 @@
 "aumix %s uso: aumix [-<opci�n de canle>[[+|-][<cantidade>]]|<nivel>|\n"
 "R[gravar]|P[reproducir]|q[consultar]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr " [-dhILqS]"
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr " [-dhLqS]"
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <ficheiro de esquema de cores>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <ficheiro rc>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -271,11 +351,11 @@
 "\n"
 "outras opci�ns:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  especifica-lo esquema de cores\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -287,11 +367,11 @@
 "      ~/.aumixrc ou /etc/aumixrc)\n"
 "  h:  amosar esta mensaxe de axuda\n"
 
-#: src/common.c:716
+#: src/common.c:724
 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:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -301,71 +381,97 @@
 "  q:  escribi-la informaci�n de t�dalas canles\n"
 "  S:  garda-las opci�ns actuais\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Sa�r"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Cargar"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Gardar"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Teclas"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Mudo"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "�nico"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "Atr�s"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "Nivel"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "E"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Balance"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "D"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD      "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD      "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "AvP�x/ReP�x, cursor arriba/abaixo\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] frechas d�xitos\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "espacio\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -373,142 +479,159 @@
 "\n"
 "Prema unha tecla ou un bot�n do rato para continuar."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Tecla                     Funci�n\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "cambiar canle\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "trocar nivel/balance\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "axusta-lo cursor\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "trocar gravar/reproducir\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "centra-lo balance\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "g"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "     "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "mudo"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "�nico"
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Gardar"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Gravar  "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD      "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "t"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "c"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "m"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "u"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "g"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "a"
 
@@ -528,65 +651,69 @@
 msgid "t"
 msgstr "a"
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Gravar  "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Silenciar Todos"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "Ficheiro"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "Ver"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Grav"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/it.po
+++ aumix-2.9.1/po/it.po
@@ -3,11 +3,12 @@
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Cristian Rigamonti <bigamons@freemail.it>, 2003.
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 2003-03-10 11:37+0100\n"
 "Last-Translator: Cristian Rigamonti <bigamons@freemail.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,205 +17,277 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "Volume  "
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "Bassi   "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "Acuti   "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "Synth   "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "Casse   "
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "Linea   "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "Mic     "
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "Mix     "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Registra"
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Ingresso"
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Uscita  "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "Linea 1 "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "Linea 2 "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "Linea 3 "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "Digital1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "Digital2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "Digital3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "Telef In"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "TelefOut"
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "Video   "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "Radio   "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "Monitor "
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
 #  Questo messaggio DEVE restare tradotto cos�, per una corretta assegnazione
 #  del tasto al comando
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "e"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  errore nell'apertura del mixer"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  nessun dispositivo trovato"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  mixer non aperto"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  impossibile aprire il file delle impostazioni"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  errore sconosciuto %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr "r"
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "attesa: %i ms\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "non impostato"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "impostato a"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -223,23 +296,30 @@
 "aumix %s uso: aumix [-<opzione di canale>[[+|-][<valore>]]|<livello>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr " [-dhILqS]"
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr " [-dhLqS]"
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <file schema di colori>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <file rc>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -267,11 +347,11 @@
 "\n"
 "altre opzioni:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  specifica lo schema di colori\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -283,13 +363,13 @@
 "      (valore predefinito: ~/.aumixrc o /etc/aumixrc)\n"
 "  h:  questo messaggio di aiuto\n"
 
-#: src/common.c:716
+#: src/common.c:724
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  avvia in modalit� interattiva dopo aver eseguito funzioni non "
 "interattive\n"
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -299,71 +379,97 @@
 "  q:  interroga tutti i canali e stampa le loro impostazioni\n"
 "  S:  salva le impostazioni\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Esci"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Carica"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Salva"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Tasti"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Muto"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "Unico"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "Livello"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "S"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Bilanciamento"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "D"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD      "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD      "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "su gi� pag-su pag-gi�\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab invio < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] <- -> numeri\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "spazio\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -371,149 +477,166 @@
 "\n"
 "Premere un tasto o un pulsante del mouse per ritornare al mixer."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Tasto                     Funzione\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "cambia canale\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "alterna livello/bilanciamento\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "muovi il cursore\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "attiva/disattiva registrazione\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "centra il bilanciamento\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "     "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "spento"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "unico"
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Salva"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "menu"
 msgstr "Men�"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Registra"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD      "
 
 #  Questo messaggio DEVE restare tradotto cos�, per una corretta assegnazione
 #  del tasto al comando
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "t"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "c"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "m"
 
 #  Questo messaggio DEVE restare tradotto cos�, per una corretta assegnazione
 #  del tasto al comando
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "u"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "s"
 
 #  Questo messaggio DEVE restare tradotto cos�, per una corretta assegnazione
 #  del tasto al comando
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "a"
 
@@ -535,65 +658,69 @@
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr "Men�"
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Registra"
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr "Numeri"
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr "v"
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr "b"
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr "n"
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Spegni Tutti"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "File"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "Visualizza"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Rec"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/ja.po
+++ aumix-2.9.1/po/ja.po
@@ -3,11 +3,12 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Takeshi Aihana <aihana@muc.biglobe.ne.jp>, 2000.
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 2000-06-28 23:03+0900\n"
 "Last-Translator: Takeshi Aihana <aihana@muc.biglobe.ne.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -15,203 +16,275 @@
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "�ܥ�塼��"
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "�㲻      "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "�ⲻ      "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "����      "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM       "
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "���ԡ�����"
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "�饤��    "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "�ޥ���    "
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD        "
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "Mix       "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2     "
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Ͽ��      "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "����      "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "����      "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "�饤�� 1  "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "�饤�� 2  "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "�饤�� 3  "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "�ǥ�������1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "�ǥ�������2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "�ǥ�������3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "��������   "
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "���ý���   "
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "�ӥǥ�     "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "�饸��     "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "��˥�     "
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix: �ߥ������������ޤ���"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix: �ǥХ��������Ĥ���ޤ���"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix: �ߥ������������ޤ���"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix: ����ե����뤬�����ޤ���"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix: �����ʥ��顼 %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, c-format
+msgid "\n"
+msgstr ""
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "%i [ms] �Ԥ�\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "���ꤵ��Ƥ��ޤ���"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "���ꤵ��ޤ���"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -220,23 +293,30 @@
 "aumix %s ��ˡ: aumix [-<�����ͥ륪�ץ����>[[+|-][<��>]]|<��٥�>|\n"
 "R(Ͽ��)|P(����)|q(�䤤��碌)]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <���顼����ե�����>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <����ե�����>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -264,11 +344,11 @@
 "\n"
 "����¾�Υ��ץ����:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C: ���顼����λ��ꤹ��\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -280,11 +360,11 @@
 "    (�ǥե���Ȥϡ�$HOME/.aumixrc �ޤ��� /etc/aumixrc)\n"
 "  h: ���Υإ�פ�ɽ������\n"
 
-#: src/common.c:716
+#: src/common.c:724
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr "  I: �����å⡼�ɤ��ѹ�����������å⡼�ɤdz��Ϥ���\n"
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -294,71 +374,97 @@
 "  q: ���ƤΥ����ͥ���䤤��碌�������ɽ������\n"
 "  S: �������¸����\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "��λ"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "�ɤ߹���"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "��¸"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "����"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "�ߥ塼��"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "�������"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "����ɥ�"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "��٥�"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "��"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "���"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "��"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD        "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD        "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "�ڡ�����ʤ��\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "TAB ���� <> , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] �������륭�� ��������\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "���ڡ����С�\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr ""
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -366,142 +472,159 @@
 "\n"
 "���������򲡤����ޥ����ܥ���򲡤������ޤ���"
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "����                       ��ǽ\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr ""
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "�����ͥ���ѹ�\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "��٥�ȥХ�󥹤��ڤ��ؤ�\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "���饤������Ĵ��\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "Ͽ���ȱ��դ��ڤ��ؤ�\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "�Х�󥹤������\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/curses.c:207
 msgid "     "
 msgstr ""
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "�ߥ塼�Ȥ��줿"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "�������"
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "��¸"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Ͽ��      "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD        "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr ""
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr ""
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr ""
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr ""
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr ""
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr ""
 
@@ -521,65 +644,69 @@
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Ͽ��      "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "���ƥߥ塼��"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "�ե�����"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "ɽ��"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Ͽ��"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/nl.po
+++ aumix-2.9.1/po/nl.po
@@ -3,11 +3,12 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Jelmer Vernooij <jelmer@nl.linux.org>, 2001.
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 2001-12-08 21:54+CET\n"
 "Last-Translator: Jelmer Vernooij <jelmer@nl.linux.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -15,203 +16,275 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: src/common.c:76
-msgid "Volume  "
+#: src/common.c:36
+msgid "/dev/mixer"
 msgstr ""
 
 #: src/common.c:77
-msgid "Bass    "
+msgid "Volume  "
 msgstr ""
 
 #: src/common.c:78
-msgid "Treble  "
+msgid "Bass    "
 msgstr ""
 
 #: src/common.c:79
+msgid "Treble  "
+msgstr ""
+
+#: src/common.c:80
 msgid "Synth   "
 msgstr "Synt    "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr ""
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "Lijn    "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr ""
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr ""
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Opnemen "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Invoer  "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Uitvoer "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "Lijn 1  "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "Lijn 2  "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "Lijn 3  "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "Tel In  "
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "Tel Uit "
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr ""
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr ""
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "s"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix: fout tijdens openen mixer"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  geen apparaat gevonden"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  mixer niet open"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  kan instellingen bestand niet openen"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  onbekende fout %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "%i ms wachten\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "niet ingesteld"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "stel in op"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -220,23 +293,30 @@
 "aumix %s gebruik: aumix [-<kanaal optie>[[+|-][<hoeveelheid]]|<niveau>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr " [-dhiLqS]"
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr " [-dhLqS]"
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <kleuren schema bestand>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <rc bestand>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -264,11 +344,11 @@
 "\n"
 "andere opties:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  geef kleurenschema op\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -280,13 +360,13 @@
 "      (standaard: ~/.aumixrc of /etc/aumixrc)\n"
 "  h:  dit helpvolle bericht\n"
 
-#: src/common.c:716
+#: src/common.c:724
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  start in interactieve modus na het uitvoeren van niet-interactieve "
 "functies\n"
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -296,71 +376,97 @@
 "  q:  toon gegevens van alle kanalen\n"
 "  S:  sla instellingen op\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Sluiten"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Laden"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Opslaan"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Toetsen"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Uit"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "Alleen"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "E Terug"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "Niveau"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Balans"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "R"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "        "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "        "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "page toetsen\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] pijltjes getallen\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "spatie\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -368,142 +474,159 @@
 "\n"
 "Druk een toets in of een muisknop om terug te keren."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Toets                     Functie\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "verander kanaal\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "schakel niveau/balans\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "stel slider bij\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "schakel opnemen/spelen\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "balans in midden\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "o"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "        "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "uitgezet"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "alleen "
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Opslaan"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Opnemen "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "        "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "t"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "l"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "u"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "a"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "o"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "e"
 
@@ -523,65 +646,69 @@
 msgid "t"
 msgstr "i"
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Opnemen "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Alles Uit"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "Bestand"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "Bekijken"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Opnemen"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/pl.po
+++ aumix-2.9.1/po/pl.po
@@ -4,11 +4,12 @@
 # Arkadiusz Mi�kiewicz <misiek@debian.eu.org>, 1998.
 # Piotr Czerwi�ski <pius@pld.org.pl>, 1999, 2000.
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix-2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "Last-Translator: Piotr Czerwi�ski <pius@pld.org.pl>\n"
 "Language-Team: PL <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,203 +17,275 @@
 "Content-Transfer-Encoding: 8bit\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "Poziom  "
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "Niskie  "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "Wysokie "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "Syntetyz"
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "G�o�n PC"
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "Linia   "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "Mikrofon"
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "Mikser  "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Nagryw. "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Wej�cie "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Wyj�cie "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "Linia 1 "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "Linia 2 "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "Linia 3 "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "Cyfrowe1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "Cyfrowe2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "Cyfrowe3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "Tel Wej "
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "Tel Wyj "
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "Video   "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "Radio   "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "Monitor "
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "k"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  b��d podczas otwierania miksera"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  nie znaleziono urz�dzenia"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  mikser nie otwarty"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  nie mo�na otworzy� pliku z ustawieniami"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  nieznany b��d %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr ""
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "nie ustawione"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "ustawione na"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, fuzzy, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -221,23 +294,30 @@
 "aumix %s u�ycie: aumix [-<opcje kana�u>[[+|-][<warto��>]]|<poziom>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <schemat kolor�w>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <plik rc>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 #, fuzzy
 msgid ""
 "channel options:\n"
@@ -266,11 +346,11 @@
 "\n"
 "inne opcje:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  okre�la plik zawieraj�cy schemat u�ycia kolor�w\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -282,13 +362,13 @@
 "      ~/.aumixrc lub /etc/aumixrc)\n"
 "  h:  ta pomocna informacja\n"
 
-#: src/common.c:716
+#: src/common.c:724
 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:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -298,71 +378,97 @@
 "  q:  sprawdza i wy�wietla aktualne ustawienia wszystkich kana��w\n"
 "  S:  zapisuje ustawienia\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Koniec"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Laduj "
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Pomoc "
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Wycisz"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "Jeden "
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "Poziom"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Balans"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "P"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD      "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD      "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "page up/down strza�ki\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] strza�ki cyfry\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "spacja\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -370,142 +476,159 @@
 "\n"
 "Wci�nij dowolny klawisz lub klawisz myszy by powr�ci�."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Klawisz                   Funkcja\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "zmienia kana�\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "prze��cza poziom/balans\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "reguluje poziom\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "prze��cza nagrywanie/odtwarzanie\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "wy�rodkowuje balans\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "z"
+
+#: src/curses.c:207
 msgid "     "
 msgstr ""
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "cisza"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "jeden"
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Zapisz"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Nagryw. "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD      "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "p"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "l"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "w"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "j"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "z"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "c"
 
@@ -525,65 +648,69 @@
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Nagryw. "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Wycisz wszystkie"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "Plik"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Nagrywanie"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/pt_BR.po
+++ aumix-2.9.1/po/pt_BR.po
@@ -6,11 +6,12 @@
 # Cyro Mendes de Moraes Neto <neto@conectiva.com.br>, 2000.
 # Osvaldo Santana Neto <osvaldo@conectiva.com.br>, 2001.
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 1999-11-27 05:37-0800\n"
 "Last-Translator: Osvaldo Santana Neto <osvaldo@conectiva.com>\n"
 "Language-Team: pt <pt@li.org>\n"
@@ -18,203 +19,275 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "Volume  "
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "Graves  "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "Agudos  "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "Sint    "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "Auto Falante"
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "Linha   "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "Microfone"
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "Mixer   "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "Gravar  "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "Entrada "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "Sa�da   "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "Linha 1"
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "Linha 2 "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "Linha 3 "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "Digital1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "Digital2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "Digital3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "Entrada do fone"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "Sa�da do fone"
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "V�deo   "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "R�dio   "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "Monitor "
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "s"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  erro na abertura de mixer"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  nenhum dispositivo encontrado"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix: mixer n�o aberto"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  n�o foi poss�vel abrir o arquivo de configura��o"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  erro desconhecido %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "Espera %i ms\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "n�o configurado"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "configurar para"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -223,23 +296,30 @@
 "aumix %s uso: aumix [-<op��o de canal>[[+|-][<quantidade>]]|<n�vel>|\n"
 "R[gravar]|P[tocar]|q[pesquisar]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr " [-dhILqS]"
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr " [-dhLqS]"
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <arquivo com esquema de cor>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <arquivo de informa��es>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -267,11 +347,11 @@
 "\n"
 "outras op��es:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C: especificar esquema de cores\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -283,12 +363,12 @@
 "�       ~/.aumixrc or /etc/aumixrc)\n"
 "  h:  essa mensagem de ajuda\n"
 
-#: src/common.c:716
+#: src/common.c:724
 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:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -298,71 +378,97 @@
 "  q:  pesquise todos os canais e mostre suas configura��es\n"
 "  S:  salvar configura��es\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Sair"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Carga"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Grava"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Teclas"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Mudo"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "Apenas"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "N�vel"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "E"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "Balan�o"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "D"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD      "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD      "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "setas de p�ginas\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] setas d�gitos\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "espa�o\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -370,142 +476,159 @@
 "\n"
 "Pressione uma tecla ou um bot�o do mouse para continuar."
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "Tecla                     Fun��o\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "mudar canal\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "alternar n�vel/balan�o\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "ajustar controle deslizante\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "alternar gravar/tocar\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "centralize balan�o\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "g"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "     "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "mudo"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "apenas "
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Grava"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "Gravar  "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD      "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "t"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "c"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "m"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "a"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "g"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "d"
 
@@ -525,65 +648,69 @@
 msgid "t"
 msgstr "p"
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "Gravar  "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr "N�meros"
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "Tudo mudo"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "Arquivo"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "Visualizar"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "Gravar"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/ru.po
+++ aumix-2.9.1/po/ru.po
@@ -2,12 +2,13 @@
 # Russian po file for aumix.
 # copyright (C) 1999 Michael Vasilenko <acid@stu.cn.ua>
 #
+#: src/common.c:743 src/curses.c:54
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "Last-Translator: Michael Vasilenko <acid@stu.cn.ua>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,203 +16,275 @@
 "Content-Transfer-Encoding: none\n"
 "POT-Revision-Date: 2000-07-13 11:13+0000\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "���������"
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "������  "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "������� "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "����������"
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "������� PC"
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "�������� ����"
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "��������"
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "�������-����"
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "������  "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "������  "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "����    "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "�����   "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "���. ���� 1"
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "���. ���� 2"
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "���. ���� 3"
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "�������� 1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "�������� 2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "�������� 3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "���� ��������"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "����� �������"
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "�����   "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "�����   "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "������� "
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  ������ �������� MIXER"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  ���������� �� ������o"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  ������ �� ������"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  ���������� ������� ���� ���������"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  ����������� ������ %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr ""
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "�� �����������"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "����������� ������"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, fuzzy, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -220,23 +293,30 @@
 "������������� aumix %s: aumix [-<channel option>[[+|-][<amount>]]<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr ""
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr ""
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr ""
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr ""
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 #, fuzzy
 msgid ""
 "channel options:\n"
@@ -266,11 +346,11 @@
 "\n"
 "������ �����:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  ����� �������� �����\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -282,13 +362,13 @@
 "      ~/.aumixrc ��� /etc/aumixrc)\n"
 "  h:  ��� ������\n"
 
-#: src/common.c:716
+#: src/common.c:724
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  ����� ��������� ���������� � ��������� ������ ������� � ������������� "
 "�����\n"
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -298,71 +378,97 @@
 "  q:  ������� ��������� ���� �������\n"
 "  S:  �������� ���������\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "Quit"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "Load"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "Save"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "Keys"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "Mute"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "Only"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "Undo"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "�������"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "������"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "R"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "�������-����"
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "�������-����"
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "�����/����\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "Tab Enter < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] ������� 0-9\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "������\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -370,144 +476,161 @@
 "\n"
 "������� ������� ��� ������ ���� ��� �����������"
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "�������                  �������\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "�������� �����\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "�������� �������/������\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "����������� ��������\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "�������� ������/������������\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "�������������� ������\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: src/curses.c:207
 msgid "     "
 msgstr "     "
 
 # incomplete translation
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr ""
 
 # incomplete translation
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "Save"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "������  "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "�������-����"
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "k"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr ""
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr ""
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr ""
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr ""
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr ""
 
@@ -527,65 +650,69 @@
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "������  "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr ""
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr ""
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr ""
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr ""
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/sv.po
+++ aumix-2.9.1/po/sv.po
@@ -329,7 +329,7 @@
 
 #: src/curses.c:43
 msgid "Undo"
-msgstr "�ngra"
+msgstr "Angra"
 
 #: src/curses.c:114 src/gtk.c:360
 msgid "Level"
--- aumix-2.9.1.old/po/uk.po
+++ aumix-2.9.1/po/uk.po
@@ -4,11 +4,12 @@
 # copyright (C) 2000 Trevor Johnson <trevor@jpj.net>
 # copyright (C) 2001 Olexander Kunytsa <kunia@istc.kiev.ua>
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 2001-06-25 01:13+0200\n"
 "Last-Translator: Olexander Kunytsa <kunia@istc.kiev.ua>\n"
 "Language-Team: Ukrainian <linux@linux0.org.ua>\n"
@@ -16,203 +17,275 @@
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "������"
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "����˦ �"
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "����˦ �"
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "������. "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr ""
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "����ͦ� "
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "�����"
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "��������"
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "��Ħ�-CD"
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr ""
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr ""
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "�����   "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr ""
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr ""
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "��. 1  "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "��. 2  "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "��. 3  "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr ""
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr ""
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr ""
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr ""
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr ""
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "�����   "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "��Ħ�   "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr ""
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "q"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix:  ������� צ������� ͦ�����"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix:  �����Ҧ� �� �������o"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix:  ͦ���� �� צ������"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix:  �� ���� צ������ ���� ���Ʀ����æ�"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix:  ��צ���� ������� %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "�������� %i ��\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "�� �����������"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "����������� ��"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -221,23 +294,30 @@
 "������������ aumix %s : aumix [-<������[[+|-][<�ͦ��>]]|<Ҧ����>|\n"
 "R(�����)|P(�����������)|q(���������)]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr " [-dhILqS]"
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr " [-dhLqS]"
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <���� ����� �����Ҧ�>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <���� ���Ʀ����æ�>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -265,11 +345,11 @@
 "\n"
 "��ۦ ���������:\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C:  ������� ����� �����Ҧ�\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -281,13 +361,13 @@
 "      ~/.aumixrc �� /etc/aumixrc)\n"
 "  h:  �� ��������\n"
 
-#: src/common.c:716
+#: src/common.c:724
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr ""
 "  I:  Ц��� ������� �������Ҧ� � ���������� ����� ������� � ������������� "
 "�����\n"
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -298,71 +378,97 @@
 "  S:  �������� Ҧ�Φ � ����\n"
 
 # incomplete translation
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr ""
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr ""
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr ""
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr ""
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr ""
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr ""
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr ""
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "�����"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "�"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "������"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "�"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "��Ħ�-CD"
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "��Ħ�-CD"
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "�����/����\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] ��Ҧ��� 0-9\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "���¦�\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -370,141 +476,158 @@
 "\n"
 "�����Φ�� ����-��� ���צ��... OR MOUSE BUTTON"
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "���צ��                  ����æ�\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "�ͦ���� �����\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "��������� Ҧ����/������\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "����ͦ����� ��������\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "��������� �����/�����������\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "צ����������� ������\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "      "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "���� "
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "������"
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "active"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "�����   "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "��Ħ�-CD"
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "k"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "l"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "m"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "o"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "s"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "u"
 
@@ -524,65 +647,69 @@
 msgid "t"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "�����   "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "���������� �Ӧ�"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "����"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "���Ʀ����æ�"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "���"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/zh_CN.po
+++ aumix-2.9.1/po/zh_CN.po
@@ -3,11 +3,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Wang Jian <lark@linux.net.cn>, 2001
 #
+#: src/common.c:743 src/curses.c:54
 msgid ""
 msgstr ""
 "Project-Id-Version: aumix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-05 02:37+0000\n"
+"POT-Creation-Date: 2010-05-06 03:41+0000\n"
 "PO-Revision-Date: 2001-11-28 22:04+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -15,203 +16,275 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/common.c:76
+#: src/common.c:36
+msgid "/dev/mixer"
+msgstr ""
+
+#: src/common.c:77
 msgid "Volume  "
 msgstr "����    "
 
-#: src/common.c:77
+#: src/common.c:78
 msgid "Bass    "
 msgstr "����    "
 
-#: src/common.c:78
+#: src/common.c:79
 msgid "Treble  "
 msgstr "����    "
 
-#: src/common.c:79
+#: src/common.c:80
 msgid "Synth   "
 msgstr "�ϳ�    "
 
-#: src/common.c:80
+#: src/common.c:81
 msgid "PCM     "
 msgstr "PCM     "
 
-#: src/common.c:81
+#: src/common.c:82
 msgid "Speaker "
 msgstr "������  "
 
-#: src/common.c:82
+#: src/common.c:83
 msgid "Line    "
 msgstr "��·    "
 
-#: src/common.c:83
+#: src/common.c:84
 msgid "Mic     "
 msgstr "��Ͳ    "
 
-#: src/common.c:84
+#: src/common.c:85
 msgid "CD      "
 msgstr "CD      "
 
-#: src/common.c:85
+#: src/common.c:86
 msgid "Mix     "
 msgstr "���    "
 
-#: src/common.c:86
+#: src/common.c:87
 msgid "PCM 2   "
 msgstr "PCM 2   "
 
-#: src/common.c:87
+#: src/common.c:88
 msgid "Record  "
 msgstr "¼��    "
 
-#: src/common.c:88
+#: src/common.c:89
 msgid "Input   "
 msgstr "����    "
 
-#: src/common.c:89
+#: src/common.c:90
 msgid "Output  "
 msgstr "���    "
 
-#: src/common.c:90
+#: src/common.c:91
 msgid "Line 1  "
 msgstr "��· 1  "
 
-#: src/common.c:91
+#: src/common.c:92
 msgid "Line 2  "
 msgstr "��· 2  "
 
-#: src/common.c:92
+#: src/common.c:93
 msgid "Line 3  "
 msgstr "��· 3  "
 
-#: src/common.c:93
+#: src/common.c:94
 msgid "Digital1"
 msgstr "���� 1"
 
-#: src/common.c:94
+#: src/common.c:95
 msgid "Digital2"
 msgstr "���� 2"
 
-#: src/common.c:95
+#: src/common.c:96
 msgid "Digital3"
 msgstr "���� 3"
 
-#: src/common.c:96
+#: src/common.c:97
 msgid "Phone In"
 msgstr "��Ͳ����"
 
-#: src/common.c:97
+#: src/common.c:98
 msgid "PhoneOut"
 msgstr "��Ͳ���"
 
-#: src/common.c:98
+#: src/common.c:99
 msgid "Video   "
 msgstr "��Ƶ    "
 
-#: src/common.c:99
+#: src/common.c:100
 msgid "Radio   "
 msgstr "������  "
 
-#: src/common.c:100
+#: src/common.c:101
 msgid "Monitor "
 msgstr "������  "
 
-#: src/common.c:110
+#: src/common.c:111
 msgid "vbtswplmcxWrio123"
 msgstr ""
 
-#: src/common.c:138
+#: src/common.c:132
+msgid "/dev/sound/mixer"
+msgstr ""
+
+#: src/common.c:139
 msgid "hILqSd:f:C:v:b:t:s:w:P:p:l:m:c:x:W:R:r:i:o:1:2:3:"
 msgstr ""
 
-#: src/common.c:153 src/interactive.c:403 src/gtk.c:213
+#: src/common.c:154 src/interactive.c:401 src/gtk.c:213
 msgid "q"
 msgstr "q"
 
-#: src/common.c:272
+#: src/common.c:211 src/curses.c:255
+msgid "DISPLAY"
+msgstr ""
+
+#: src/common.c:229
+msgid "UTF-8"
+msgstr ""
+
+#: src/common.c:275
 msgid "aumix:  error opening mixer"
 msgstr "aumix���򿪻�����ʱ��������"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  no device found"
 msgstr "aumix��û�з����豸"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_DEVMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid " aumix:  SOUND_MIXER_READ_RECMASK"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_READ_STEREODEVS"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  SOUND_MIXER_WRITE_RECSRC"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_READ"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  MIXER_WRITE"
 msgstr ""
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  mixer not open"
 msgstr "aumix��û�д򿪻�����"
 
-#: src/common.c:272
+#: src/common.c:275
 msgid "aumix:  unable to open settings file"
 msgstr "aumix���޷��������ļ�"
 
-#: src/common.c:280
+#: src/common.c:286
 #, c-format
 msgid "aumix:  unknown error %i"
 msgstr "aumix��δ֪���� %i"
 
-#: src/common.c:301 src/curses.c:274 src/curses.c:277 src/gtk.c:215
-#: src/gtk.c:267
+#: src/common.c:291 src/common.c:338 src/common.c:673 src/common.c:687
+#: src/curses.c:594
+#, fuzzy, c-format
+msgid "\n"
+msgstr "|\n"
+
+#: src/common.c:307 src/curses.c:286 src/curses.c:289 src/gtk.c:215
+#: src/gtk.c:263
 msgid "r"
 msgstr ""
 
-#: src/common.c:305
+#: src/common.c:311
 msgid "%[^:;, ]%*[:;, ]%10u%*[:;, ]%3u%*[:;, ]%1c\n"
 msgstr ""
 
-#: src/common.c:306
+#: src/common.c:312
 msgid "wait"
 msgstr ""
 
-#: src/common.c:308
+#: src/common.c:314
 #, c-format
 msgid "%i ms wait\n"
 msgstr "%i ms �ȴ�\n"
 
-#: src/common.c:320
+#: src/common.c:326
+#, c-format
+msgid "%s %s\n"
+msgstr ""
+
+#: src/common.c:326
 msgid "not set"
 msgstr "û������"
 
-#: src/common.c:323
+#: src/common.c:329
+#, c-format
+msgid "%s %s %i, %i"
+msgstr ""
+
+#: src/common.c:329
 msgid "set to"
 msgstr "����Ϊ"
 
-#: src/common.c:349
+#: src/common.c:335 src/common.c:671
+#, c-format
+msgid ", %c"
+msgstr ""
+
+#: src/common.c:355
 msgid "w"
 msgstr ""
 
-#: src/common.c:356
+#: src/common.c:362
 #, c-format
 msgid "%s:%i:%i:%c\n"
 msgstr ""
 
-#: src/common.c:683
+#: src/common.c:608
+msgid "HOME"
+msgstr ""
+
+#: src/common.c:610
+#, c-format
+msgid "%s/.%s"
+msgstr ""
+
+#: src/common.c:615 src/curses.c:288
+#, c-format
+msgid "%s/%s"
+msgstr ""
+
+#: src/common.c:634
+msgid "+"
+msgstr ""
+
+#: src/common.c:634
+msgid "-"
+msgstr ""
+
+#: src/common.c:668
+#, c-format
+msgid "%s %i, %i"
+msgstr ""
+
+#: src/common.c:687
+msgid "@(#) aumix "
+msgstr ""
+
+#: src/common.c:689
+msgid "@(#) copyright (c) 1993, 1996-2010 the authors--see AUTHORS file\n"
+msgstr ""
+
+#: src/common.c:691
 #, c-format
 msgid ""
 "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
@@ -220,23 +293,30 @@
 "aumix %s �÷��� aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
 "R[ecord]|P[lay]|q[uery]]"
 
-#: src/common.c:685
+#: src/common.c:693
 msgid " [-dhILqS]"
 msgstr " [-dhILqS]"
 
-#: src/common.c:687
+#: src/common.c:695
 msgid " [-dhLqS]"
 msgstr " [-dhLqS]"
 
-#: src/common.c:690
+#: src/common.c:698
 msgid " [-C <color scheme file>]"
 msgstr " [-C <color scheme file>]"
 
-#: src/common.c:692
+#: src/common.c:700
 msgid " [-f <rc file>]"
 msgstr " [-f <rc file>]"
 
-#: src/common.c:694
+#: src/common.c:701
+#, c-format
+msgid ""
+"\n"
+"\n"
+msgstr ""
+
+#: src/common.c:702
 msgid ""
 "channel options:\n"
 "  v:  main volume           x:  mix monitor\n"
@@ -264,11 +344,11 @@
 "\n"
 "����ѡ�\n"
 
-#: src/common.c:707
+#: src/common.c:715
 msgid "  C:  specify color scheme\n"
 msgstr "  C��ָ����ɫ����\n"
 
-#: src/common.c:710
+#: src/common.c:718
 msgid ""
 "  d:  adjust a device besides /dev/mixer\n"
 "  f:  specify file for saving and loading settings (defaults to\n"
@@ -279,11 +359,11 @@
 "  f��ָ�����ڱ�����������õ��ļ�(Ĭ��Ϊ ~/.aumixrc �� /etc/aumixrc)\n"
 "  h����ӡ�ð�����Ϣ\n"
 
-#: src/common.c:716
+#: src/common.c:724
 msgid "  I:  start in interactive mode after doing non-interactive functions\n"
 msgstr "  I������ɷǽ������ܺ�����������ģʽ\n"
 
-#: src/common.c:719
+#: src/common.c:727
 msgid ""
 "  L:  load settings\n"
 "  q:  query all channels and print their settings\n"
@@ -293,71 +373,97 @@
 "  q����ѯ����ͨ�����ò���ӡ\n"
 "  S����������\n"
 
-#: src/curses.c:37 src/gtk.c:212
+#: src/curses.c:38 src/gtk.c:212
 msgid "Quit"
 msgstr "�˳�"
 
-#: src/curses.c:38 src/gtk.c:212
+#: src/curses.c:39 src/gtk.c:212
 msgid "Load"
 msgstr "����"
 
-#: src/curses.c:39 src/gtk.c:212
+#: src/curses.c:40 src/gtk.c:212
 msgid "Save"
 msgstr "����"
 
-#: src/curses.c:40
+#: src/curses.c:41
 msgid "Keys"
 msgstr "����"
 
-#: src/curses.c:41 src/gtk.c:287
+#: src/curses.c:42 src/gtk.c:283
 msgid "Mute"
 msgstr "����"
 
-#: src/curses.c:42
+#: src/curses.c:43
 msgid "Only"
 msgstr "��"
 
-#: src/curses.c:43
+#: src/curses.c:44
 msgid "Undo"
 msgstr "����"
 
-#: src/curses.c:114 src/gtk.c:360
+#: src/curses.c:57 src/curses.c:64
+msgid "LANG"
+msgstr ""
+
+#: src/curses.c:110 src/gtk.c:217
+msgid "aumix"
+msgstr ""
+
+#: src/curses.c:114 src/gtk.c:384
+msgid "0"
+msgstr ""
+
+#: src/curses.c:115 src/gtk.c:356
 msgid "Level"
 msgstr "����"
 
-#: src/curses.c:116 src/gtk.c:382
+#: src/curses.c:116 src/gtk.c:387
+msgid "100"
+msgstr ""
+
+#: src/curses.c:117 src/gtk.c:378
 msgid "L"
 msgstr "L"
 
-#: src/curses.c:117 src/gtk.c:214 src/gtk.c:259 src/gtk.c:363
+#: src/curses.c:118 src/gtk.c:214 src/gtk.c:255 src/gtk.c:359
 msgid "Balance"
 msgstr "ƽ��"
 
-#: src/curses.c:118 src/gtk.c:385
+#: src/curses.c:119 src/gtk.c:381
 msgid "R"
 msgstr "R"
 
-#: src/curses.c:164
+#: src/curses.c:126 src/curses.c:402
+#, fuzzy
+msgid "                 "
+msgstr "CD      "
+
+#: src/curses.c:159
+#, fuzzy
+msgid "               "
+msgstr "CD      "
+
+#: src/curses.c:175
 msgid "page arrows\n"
 msgstr "��ҳ��\n"
 
-#: src/curses.c:165
+#: src/curses.c:176
 msgid "tab enter < > , .\n"
 msgstr "tab enter < > , .\n"
 
-#: src/curses.c:166
+#: src/curses.c:177
 msgid "+ - [ ] arrows digits\n"
 msgstr "+ - [ ] ��ͷ ����\n"
 
-#: src/curses.c:167
+#: src/curses.c:178
 msgid "space\n"
 msgstr "�ո�\n"
 
-#: src/curses.c:168
+#: src/curses.c:179
 msgid "|\n"
 msgstr "|\n"
 
-#: src/curses.c:169
+#: src/curses.c:180
 msgid ""
 "\n"
 "Press a key or mouse button to resume."
@@ -365,142 +471,159 @@
 "\n"
 "�����������갴ť������"
 
-#: src/curses.c:171
+#: src/curses.c:182
 msgid "Key                       Function\n"
 msgstr "��                        ����\n"
 
-#: src/curses.c:172
+#: src/curses.c:183
 msgid "------------------------- --------------------"
 msgstr "------------------------- --------------------"
 
-#: src/curses.c:173
+#: src/curses.c:184
 msgid "change channel\n"
 msgstr "�ı�ͨ��\n"
 
-#: src/curses.c:174
+#: src/curses.c:185
 msgid "toggle level/balance\n"
 msgstr "�л�����/ƽ��\n"
 
-#: src/curses.c:175
+#: src/curses.c:186
 msgid "adjust slider\n"
 msgstr "����������\n"
 
-#: src/curses.c:176
+#: src/curses.c:187
 msgid "toggle record/play\n"
 msgstr "�л�¼��/����\n"
 
-#: src/curses.c:177
+#: src/curses.c:188
 msgid "center balance\n"
 msgstr "��ȫƽ��\n"
 
-#: src/curses.c:196
+#: src/curses.c:207 src/curses.c:210 src/curses.c:213 src/curses.c:285
+#, fuzzy, c-format
+msgid "%s"
+msgstr "s"
+
+#: src/curses.c:207
 msgid "     "
 msgstr "     "
 
-#: src/curses.c:199
+#: src/curses.c:210
 msgid "muted"
 msgstr "�Ѿ���"
 
-#: src/curses.c:202
+#: src/curses.c:213
 msgid "only "
 msgstr "�� "
 
-#: src/curses.c:268
+#: src/curses.c:254
+msgid "TERM"
+msgstr ""
+
+#: src/curses.c:254
+msgid "xterm"
+msgstr ""
+
+#: src/curses.c:256
+msgid "DISPLAY="
+msgstr ""
+
+#: src/curses.c:279
 msgid "black"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "red"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "green"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "yellow"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "blue"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "magenta"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "cyan"
 msgstr ""
 
-#: src/curses.c:268
+#: src/curses.c:279
 msgid "white"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "active"
 msgstr "����"
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "axis"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "handle"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "hotkey"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "menu"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "play"
 msgstr ""
 
-#: src/curses.c:270
+#: src/curses.c:281
 #, fuzzy
 msgid "record"
 msgstr "¼��    "
 
-#: src/curses.c:270
+#: src/curses.c:281
 msgid "track"
 msgstr ""
 
-#: src/curses.c:298 src/curses.c:299 src/curses.c:302
+#: src/curses.c:310 src/curses.c:311 src/curses.c:314
 msgid " \t\n"
 msgstr ""
 
-#: src/curses.c:358 src/curses.c:389
+#: src/curses.c:370
 #, fuzzy
 msgid "          "
 msgstr "CD      "
 
-#: src/interactive.c:399
+#: src/interactive.c:397
 msgid "k"
 msgstr "k"
 
-#: src/interactive.c:400 src/gtk.c:213
+#: src/interactive.c:398 src/gtk.c:213
 msgid "l"
 msgstr "l"
 
-#: src/interactive.c:401
+#: src/interactive.c:399
 msgid "m"
 msgstr "m"
 
-#: src/interactive.c:402
+#: src/interactive.c:400
 msgid "o"
 msgstr "o"
 
-#: src/interactive.c:404 src/gtk.c:213
+#: src/interactive.c:402 src/gtk.c:213
 msgid "s"
 msgstr "s"
 
-#: src/interactive.c:405
+#: src/interactive.c:403
 msgid "u"
 msgstr "u"
 
@@ -520,65 +643,69 @@
 msgid "t"
 msgstr "t"
 
-#: src/gtk.c:214 src/gtk.c:258
+#: src/gtk.c:214 src/gtk.c:254
 msgid "Menu"
 msgstr ""
 
-#: src/gtk.c:214 src/gtk.c:260
+#: src/gtk.c:214 src/gtk.c:256
 #, fuzzy
 msgid "Record/Play"
 msgstr "¼��    "
 
-#: src/gtk.c:214 src/gtk.c:261
+#: src/gtk.c:214 src/gtk.c:257
 msgid "Numbers"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:265
+#: src/gtk.c:215 src/gtk.c:261
 msgid "v"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:266
+#: src/gtk.c:215 src/gtk.c:262
 msgid "b"
 msgstr ""
 
-#: src/gtk.c:215 src/gtk.c:268
+#: src/gtk.c:215 src/gtk.c:264
 msgid "n"
 msgstr ""
 
-#: src/gtk.c:218 src/gtk.c:468 src/gtk.c:483
+#: src/gtk.c:218 src/gtk.c:464 src/gtk.c:479
 msgid "destroy"
 msgstr ""
 
-#: src/gtk.c:239 src/gtk.c:240 src/gtk.c:265 src/gtk.c:266 src/gtk.c:267
-#: src/gtk.c:268 src/gtk.c:276 src/gtk.c:291 src/gtk.c:327 src/gtk.c:351
-#: src/gtk.c:352 src/gtk.c:353 src/gtk.c:354
+#: src/gtk.c:235 src/gtk.c:236 src/gtk.c:261 src/gtk.c:262 src/gtk.c:263
+#: src/gtk.c:264 src/gtk.c:272 src/gtk.c:287 src/gtk.c:323 src/gtk.c:347
+#: src/gtk.c:348 src/gtk.c:349 src/gtk.c:350
 msgid "activate"
 msgstr ""
 
-#: src/gtk.c:273
+#: src/gtk.c:269
 msgid "Mute All"
 msgstr "ȫ������"
 
-#: src/gtk.c:279
+#: src/gtk.c:275
 msgid "File"
 msgstr "�ļ�"
 
-#: src/gtk.c:283
+#: src/gtk.c:279
 msgid "View"
 msgstr "�鿴"
 
-#: src/gtk.c:315 src/gtk.c:325
+#: src/gtk.c:311 src/gtk.c:321
 msgid "value_changed"
 msgstr ""
 
-#: src/gtk.c:348 src/gtk.c:470 src/gtk.c:472 src/gtk.c:485 src/gtk.c:487
+#: src/gtk.c:344 src/gtk.c:466 src/gtk.c:468 src/gtk.c:481 src/gtk.c:483
 msgid "clicked"
 msgstr ""
 
-#: src/gtk.c:357
+#: src/gtk.c:353
 msgid "Rec"
 msgstr "¼��"
 
-#: src/gtk.c:467 src/gtk.c:482
+#: src/gtk.c:463 src/gtk.c:478
 msgid "File selection"
 msgstr ""
+
+#: src/gtk.c:470 src/gtk.c:485
+msgid ".aumixrc"
+msgstr ""
--- aumix-2.9.1.old/po/zh_TW.po
+++ aumix-2.9.1/po/zh_TW.po
@@ -0,0 +1,421 @@
+# Traditional Chinese Messages for aumix
+# Copyright (C) 2001, 05 Free Software Foundation, Inc.
+# This file is distributed under the same license as the aumix package.
+# Wang Jian <lark@linux.net.cn>, 2001
+# Wei-Lun Chao <bluebat@member.fsf.org>, 2005
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: aumix 2.8\n"
+"POT-Creation-Date: 2002-11-25 01:36+0000\n"
+"PO-Revision-Date: 2005-11-01 13:40+0800\n"
+"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
+"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/common.c:76
+msgid "Volume  "
+msgstr "音量    "
+
+#: src/common.c:77
+msgid "Bass    "
+msgstr "低音    "
+
+#: src/common.c:78
+msgid "Treble  "
+msgstr "高音    "
+
+#: src/common.c:79
+msgid "Synth   "
+msgstr "合成    "
+
+#: src/common.c:80
+msgid "PCM     "
+msgstr "PCM     "
+
+#: src/common.c:81
+msgid "Speaker "
+msgstr "揚聲器  "
+
+#: src/common.c:82
+msgid "Line    "
+msgstr "線路    "
+
+#: src/common.c:83
+msgid "Mic     "
+msgstr "麥克風  "
+
+#: src/common.c:84
+msgid "CD      "
+msgstr "CD      "
+
+#: src/common.c:85
+msgid "Mix     "
+msgstr "混合    "
+
+#: src/common.c:86
+msgid "PCM 2   "
+msgstr "PCM 2   "
+
+#: src/common.c:87
+msgid "Record  "
+msgstr "錄音    "
+
+#: src/common.c:88
+msgid "Input   "
+msgstr "輸入    "
+
+#: src/common.c:89
+msgid "Output  "
+msgstr "輸出    "
+
+#: src/common.c:90
+msgid "Line 1  "
+msgstr "線路 1  "
+
+#: src/common.c:91
+msgid "Line 2  "
+msgstr "線路 2  "
+
+#: src/common.c:92
+msgid "Line 3  "
+msgstr "線路 3  "
+
+#: src/common.c:93
+msgid "Digital1"
+msgstr "數位 1"
+
+#: src/common.c:94
+msgid "Digital2"
+msgstr "數位 2"
+
+#: src/common.c:95
+msgid "Digital3"
+msgstr "數位 3"
+
+#: src/common.c:96
+msgid "Phone In"
+msgstr "話筒輸入"
+
+#: src/common.c:97
+msgid "PhoneOut"
+msgstr "話筒輸出"
+
+#: src/common.c:98
+msgid "Video   "
+msgstr "視訊    "
+
+#: src/common.c:99
+msgid "Radio   "
+msgstr "收音機  "
+
+#: src/common.c:100
+msgid "Monitor "
+msgstr "監視器  "
+
+#: src/common.c:263
+msgid "aumix:  error opening mixer"
+msgstr "aumix：開啟混音器時發生錯誤"
+
+#: src/common.c:263
+msgid "aumix:  no device found"
+msgstr "aumix：沒有發現裝置"
+
+#: src/common.c:263
+msgid "aumix:  mixer not open"
+msgstr "aumix：沒有開啟混音器"
+
+#: src/common.c:263
+msgid "aumix:  unable to open settings file"
+msgstr "aumix：無法開啟設定檔案"
+
+#: src/common.c:271
+#, c-format
+msgid "aumix:  unknown error %i"
+msgstr "aumix：不明錯誤 %i"
+
+#: src/common.c:299
+#, c-format
+msgid "%i ms wait\n"
+msgstr "等待 %i 毫秒\n"
+
+#: src/common.c:311
+msgid "not set"
+msgstr "沒有設定"
+
+#: src/common.c:314
+msgid "set to"
+msgstr "設定為"
+
+#: src/common.c:674
+#, c-format
+msgid "aumix %s usage: aumix [-<channel option>[[+|-][<amount>]]|<level>|\n"
+"R[ecord]|P[lay]|q[uery]]"
+msgstr "aumix %s 用法： aumix [-<通道選項>[[+|-][<數量>]]|<層級>|\n"
+"R[ecord]|P[lay]|q[uery]]"
+
+#: src/common.c:676
+msgid " [-dhILqS]"
+msgstr " [-dhILqS]"
+
+#: src/common.c:678
+msgid " [-dhLqS]"
+msgstr " [-dhLqS]"
+
+#: src/common.c:681
+msgid " [-C <color scheme file>]"
+msgstr " [-C <顏色方案檔案>]"
+
+#: src/common.c:683
+msgid " [-f <rc file>]"
+msgstr " [-f <rc 檔案>]"
+
+#: src/common.c:685
+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 "通道選項：\n"
+"  v：主音量           x：混音監視器\n"
+"  b：低音             W：PCM 2\n"
+"  t：高音             r：錄音\n"
+"  s：合成器           i：輸入增益\n"
+"  w：PCM              o：輸出增益\n"
+"  p：PC 揚聲器        1：線路 1\n"
+"  l：線路             2：線路 2\n"
+"  m：麥克風           3：線路 3\n"
+"  c：CD\n\n"
+"其它選項：\n"
+
+#: src/common.c:698
+msgid "  C:  specify color scheme\n"
+msgstr "  C：指定顏色方案\n"
+
+#: src/common.c:701
+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：調整除了 /dev/mixer 以外的裝置\n"
+"  f：指定用於儲存和載入設定的檔案(預設為 ~/.aumixrc 或 /etc/aumixrc)\n"
+"  h：印出本輔助訊息\n"
+
+#: src/common.c:707
+msgid "  I:  start in interactive mode after doing non-interactive functions\n"
+msgstr "  I：在完成非交互功能後啟動到交互模式\n"
+
+#: src/common.c:710
+msgid "  L:  load settings\n"
+"  q:  query all channels and print their settings\n"
+"  S:  save settings\n"
+msgstr "  L：載入設定\n"
+"  q：查詢所有通道並印出設定\n"
+"  S：儲存設定\n"
+
+#: src/curses.c:37 src/gtk.c:191
+msgid "Quit"
+msgstr "離開"
+
+#: src/curses.c:38 src/gtk.c:191
+msgid "Load"
+msgstr "載入"
+
+#: src/curses.c:39 src/gtk.c:191
+msgid "Save"
+msgstr "儲存"
+
+#: src/curses.c:40
+msgid "Keys"
+msgstr "按鍵"
+
+#: src/curses.c:41 src/gtk.c:265
+msgid "Mute"
+msgstr "靜音"
+
+#: src/curses.c:42
+msgid "Only"
+msgstr "僅有"
+
+#: src/curses.c:43
+msgid "Undo"
+msgstr "撤消"
+
+#: src/curses.c:113 src/gtk.c:365
+msgid "0"
+msgstr "0"
+
+#: src/curses.c:114 src/gtk.c:337
+msgid "Level"
+msgstr "層級"
+
+#: src/curses.c:115 src/gtk.c:368
+msgid "100"
+msgstr "100"
+
+#: src/curses.c:116 src/gtk.c:359
+msgid "L"
+msgstr "左"
+
+#: src/curses.c:117 src/gtk.c:193 src/gtk.c:237 src/gtk.c:340
+msgid "Balance"
+msgstr "平衡"
+
+#: src/curses.c:118 src/gtk.c:362
+msgid "R"
+msgstr "右"
+
+#: src/curses.c:164
+msgid "page arrows\n"
+msgstr "換頁鍵\n"
+
+#: src/curses.c:165
+msgid "tab enter < > , .\n"
+msgstr "跳格 輸入 < > , .\n"
+
+#: src/curses.c:166
+msgid "+ - [ ] arrows digits\n"
+msgstr "+ - [ ] 箭頭 數字\n"
+
+#: src/curses.c:167
+msgid "space\n"
+msgstr "空格\n"
+
+#: src/curses.c:168
+msgid "|\n"
+msgstr "|\n"
+
+#: src/curses.c:169
+msgid "\n"
+"Press a key or mouse button to resume."
+msgstr "\n"
+"按任意鍵或滑鼠按鈕繼續。"
+
+#: src/curses.c:171
+msgid "Key                       Function\n"
+msgstr "鍵                        功能\n"
+
+#: src/curses.c:172
+msgid "------------------------- --------------------"
+msgstr "------------------------- --------------------"
+
+#: src/curses.c:173
+msgid "change channel\n"
+msgstr "變更通道\n"
+
+#: src/curses.c:174
+msgid "toggle level/balance\n"
+msgstr "切換層級/平衡\n"
+
+#: src/curses.c:175
+msgid "adjust slider\n"
+msgstr "調整滑動條\n"
+
+#: src/curses.c:176
+msgid "toggle record/play\n"
+msgstr "切換錄音/播放\n"
+
+#: src/curses.c:177
+msgid "center balance\n"
+msgstr "中央平衡\n"
+
+#: src/curses.c:196
+msgid "     "
+msgstr "     "
+
+#: src/curses.c:199
+msgid "muted"
+msgstr "已靜音"
+
+#: src/curses.c:202
+msgid "only "
+msgstr "僅有 "
+
+#: src/interactive.c:399
+msgid "k"
+msgstr "k"
+
+#: src/gtk.c:192 src/interactive.c:400
+msgid "l"
+msgstr "l"
+
+#: src/interactive.c:401
+msgid "m"
+msgstr "m"
+
+#: src/interactive.c:402
+msgid "o"
+msgstr "o"
+
+#: src/gtk.c:192 src/interactive.c:403
+msgid "q"
+msgstr "q"
+
+#: src/gtk.c:192 src/interactive.c:404
+msgid "s"
+msgstr "s"
+
+#: src/interactive.c:405
+msgid "u"
+msgstr "u"
+
+#: src/gtk.c:191
+msgid "Load From"
+msgstr "載入自"
+
+#: src/gtk.c:191
+msgid "Save To"
+msgstr "儲存到"
+
+#: src/gtk.c:192
+msgid "f"
+msgstr "f"
+
+#: src/gtk.c:192
+msgid "t"
+msgstr "t"
+
+#: src/gtk.c:193 src/gtk.c:236
+msgid "Menu"
+msgstr "選單"
+
+#: src/gtk.c:193 src/gtk.c:238
+msgid "Numbers"
+msgstr "數字"
+
+#: src/gtk.c:194 src/gtk.c:242
+msgid "v"
+msgstr "v"
+
+#: src/gtk.c:194 src/gtk.c:243
+msgid "b"
+msgstr "b"
+
+#: src/gtk.c:194 src/gtk.c:244
+msgid "n"
+msgstr "n"
+
+#: src/gtk.c:251
+msgid "Mute All"
+msgstr "全部靜音"
+
+#: src/gtk.c:257
+msgid "File"
+msgstr "檔案"
+
+#: src/gtk.c:261
+msgid "View"
+msgstr "檢視"
+
+#: src/gtk.c:334
+msgid "Rec"
+msgstr "錄音"
--- aumix-2.9.1.old/src/common.c
+++ aumix-2.9.1/src/common.c
@@ -20,6 +20,7 @@
  * Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#define EXTERN
 #include "common.h"
 #ifdef HAVE_CURSES
 #include "curses.h"
@@ -125,7 +126,9 @@
 	I18nInitialize();
 #endif				/* ENABLE_NLS */
 
-	interactive = FALSE;
+	/* interactive will be set to FALSE if
+	 * non-interactive command line options are specified */
+	interactive = IN_UNSPECIFIED;
 
 #ifdef __linux__
 	if (access(device_filename, F_OK) != 0)
@@ -136,7 +139,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,
@@ -144,6 +153,7 @@
    a cast". */
 		if ((mopt = (char *) strchr(moptindx, optn))) {
 			usage_ok = 0;
+			if (interactive == IN_UNSPECIFIED) interactive = FALSE;
 			if (mixer_fd == -1)
 				ErrorExitWarn(InitializeMixer(device_filename), 'e');
 			ErrorExitWarn(SetShowNoninter(mopt - moptindx), 'e');
@@ -152,6 +162,8 @@
 			switch (optn) {
 			case 'q':	/* query */
 				optarg = "q";
+				if (interactive == IN_UNSPECIFIED)
+					interactive = FALSE;
 				if (mixer_fd == -1)
 					ErrorExitWarn(InitializeMixer(device_filename), 'e');
 				for (ii = 0; ii < SOUND_MIXER_NRDEVICES; ii++) {
@@ -168,24 +180,37 @@
 				break;
 #ifdef HAVE_CURSES		/* no color schemes for GTK+ */
 			case 'C':	/* User specified the color scheme. */
-				scheme_name = strdup(optarg);
-				setcolors = TRUE;
+				if (optarg) { /* scheme specified? */
+					scheme_name = strdup(optarg);
+					setcolors = TRUE;
+				} else {
+					/* handle space between -C and scheme */
+					if (argv[optind] && 
+					    *argv[optind] && 
+					    *argv[optind] != '-') {
+						optarg = argv[optind++];
+					}
+				}
 				interactive = IN_CURSES;
 				break;
 #endif				/* HAVE_CURSES */
 			case 'S':	/* Save to file. */
+				if (interactive == IN_UNSPECIFIED)
+					interactive = FALSE;
 				if (mixer_fd == -1)
 					ErrorExitWarn(InitializeMixer(device_filename), 'e');
 				ErrorExitWarn(SaveSettings(), 'e');
 				break;
 			case 'L':	/* Load from file. */
+				if (interactive == IN_UNSPECIFIED)
+					interactive = FALSE;
 				if (mixer_fd == -1)
 					ErrorExitWarn(InitializeMixer(device_filename), 'e');
 				ErrorExitWarn(LoadSettings(), 'e');
 				break;
 #if defined (HAVE_CURSES) || defined (HAVE_GTK)
 			case 'I':	/* User asked for interactive mode. */
-				if (!interactive)
+				if ((interactive == FALSE) || (interactive == IN_UNSPECIFIED))
 					interactive = IN_ANY;
 				break;
 #endif				/* HAVE_CURSES || HAVE_GTK */
@@ -198,8 +223,8 @@
 		}
 	}
 #if defined (HAVE_CURSES) || defined (HAVE_GTK)
-/* Be interactive if no options were given. */
-	if (!interactive && argc <= 1)
+/* Be interactive if no options specifying otherwise were given. */
+	if (interactive == IN_UNSPECIFIED)
 		interactive = IN_ANY;
 /* By now we've decided whether to go interactive.
    The -C (color scheme) option implies curses, even if GTK is available.
@@ -234,7 +259,7 @@
 #endif				/* DUMMY_MIXER */
 		ErrorExitWarn(MixerStatus(), 'e');
 		if (!devmask)
-			return EFINDDEVICE;
+			ErrorExitWarn(EFINDDEVICE, 'e');
 		gtk_init(&argc, &argv);
 		InitScreenGTK();
 		gtk_main();
@@ -713,7 +738,7 @@
 other options:\n"));
 #ifdef HAVE_CURSES
 	fprintf(fp, LOCAL_TEXT("\
-  C:  specify color scheme\n"));
+  C:  start in curses mode (and optionally specify color scheme)\n"));
 #endif				/* HAVE_CURSES */
 	fprintf(fp, LOCAL_TEXT("\
   d:  adjust a device besides /dev/mixer\n\
--- aumix-2.9.1.old/src/common.h
+++ aumix-2.9.1/src/common.h
@@ -17,6 +17,10 @@
  * Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifndef EXTERN
+#define EXTERN extern
+#endif
+
 #ifndef AUMIX_H
 #define AUMIX_H
 #include "../config.h"
@@ -26,6 +30,7 @@
 #define IN_CURSES 1
 #define IN_GTK 2
 #define IN_ANY 3
+#define IN_UNSPECIFIED 4
 #endif				/* HAVE_CURSES || HAVE_GTK */
 #ifndef TRUE			/* defined in ncurses.h */
 #define TRUE 1
@@ -41,6 +46,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#ifdef __GNU_LIBRARY__
+#include <getopt.h>		/* getopt() with optional args */
+#endif
 
 #ifdef HAVE_SYS_SOUNDCARD_H
 #include <sys/soundcard.h>
@@ -129,8 +137,8 @@
 extern int      ReadRecSrc(void);
 extern int      WriteRecSrc(void);
 int             ReadWriteMixer(int device, char *rw, int *left, int *right, char *rp);
-int             ourlevel[SOUND_MIXER_NRDEVICES];
-int             our_recplay[SOUND_MIXER_NRDEVICES];	/* Store record/play settings for updates. */
+EXTERN int             ourlevel[SOUND_MIXER_NRDEVICES];
+EXTERN int             our_recplay[SOUND_MIXER_NRDEVICES];	/* Store record/play settings for updates. */
 int             LoadSettings(void);
 int             SaveSettings(void);
 int             dummy_ioctl(int fd, unsigned long req, int *arg);
--- aumix-2.9.1.old/src/curses.c
+++ aumix-2.9.1/src/curses.c
@@ -27,7 +27,7 @@
 #include "mouse.h"
 
 unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo, *lang;
-int             current_dev, level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
+int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode, cols_saved, lines_saved;
 int             in_keysbox = FALSE;
 static int	cursor_x, cursor_y;	/* keep track of cursor position */
 
@@ -290,6 +290,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 */
@@ -314,8 +317,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 (ii = COLOR_BLACK; ii < sizeof(colors) / sizeof(*colors); ii++) {
 			if (strcasecmp(fore, colors[ii]) == 0)
--- aumix-2.9.1.old/src/curses.h
+++ aumix-2.9.1/src/curses.h
@@ -17,6 +17,10 @@
  * Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifndef EXTERN
+#define EXTERN extern
+#endif
+
 #ifndef AUMIX_CURSES_H
 #define AUMIX_CURSES_H
 #if HAVE_CURSES
@@ -24,9 +28,9 @@
 #define XOFFSET 0		/* blank columns to leave at the left */
 #define YOFFSET 0		/* blank lines to leave at the top */
 #if HAVE_NCURSES_H
-#include <ncurses.h>
+#include <ncursesw/ncurses.h>
 #else
-#include <curses.h>
+#include <ncursesw/curses.h>
 #endif				/* HAVE_NCURSES_H */
 #ifndef CTRL
 #define CTRL(x) ((x) & 0x1F)
@@ -88,8 +92,8 @@
 };
 #define ARROW_WIDTH 1		/* width of selection arrow */
 #define R_P_WIDTH 1		/* width of record/play indicator */
-int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
-int             (*Wgetch) (WINDOW * win);
+extern int             level_increment, balance_increment, menu_width, level_width, label_width, balance_width, levelbalmode;
+EXTERN int             (*Wgetch) (WINDOW * win);
 #define Getch() (*Wgetch)(stdscr)
 void            WakeUpCurses(void);
 void            InitScreenCurses(void);
--- aumix-2.9.1.old/src/gtk.h
+++ aumix-2.9.1/src/gtk.h
@@ -1,5 +1,9 @@
 /* $Aumix: aumix/src/gtk.h,v 1.3 2002/12/12 04:38:09 trevor Exp $ */
 
+#ifndef EXTERN
+#define EXTERN extern
+#endif
+
 #ifndef AUMIX_GTK_H
 #define AUMIX_GTK_H
 #define BORDER 2
@@ -7,23 +11,23 @@
 #include <sys/mman.h>
 #include <gtk/gtk.h>
 
-GdkBitmap      *rmask;
-GdkBitmap      *pmask;
-GtkWidget      *pixmapwid[SOUND_MIXER_NRDEVICES];
-GdkPixmap      *record_pixmap;
-GdkPixmap      *play_pixmap;
-GtkAdjustment  *adjustment[SOUND_MIXER_NRDEVICES];
-GtkAdjustment  *balance[SOUND_MIXER_NRDEVICES];
-GtkWidget      *baltracks[SOUND_MIXER_NRDEVICES];
-GtkWidget      *channellabel[SOUND_MIXER_NRDEVICES];
-GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
-GtkWidget      *levels[SOUND_MIXER_NRDEVICES];
-GtkWidget      *maintable;
-gint            balcallback[SOUND_MIXER_NRDEVICES];
-gint            lvlcallback[SOUND_MIXER_NRDEVICES];
-gint            rpcallback[SOUND_MIXER_NRDEVICES];
-gboolean        menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
-GtkWidget      *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
+EXTERN GdkBitmap      *rmask;
+EXTERN GdkBitmap      *pmask;
+EXTERN GtkWidget      *pixmapwid[SOUND_MIXER_NRDEVICES];
+EXTERN GdkPixmap      *record_pixmap;
+EXTERN GdkPixmap      *play_pixmap;
+EXTERN GtkAdjustment  *adjustment[SOUND_MIXER_NRDEVICES];
+EXTERN GtkAdjustment  *balance[SOUND_MIXER_NRDEVICES];
+EXTERN GtkWidget      *baltracks[SOUND_MIXER_NRDEVICES];
+EXTERN GtkWidget      *channellabel[SOUND_MIXER_NRDEVICES];
+EXTERN GtkToggleButton *rpbuttons[SOUND_MIXER_NRDEVICES];
+EXTERN GtkWidget      *levels[SOUND_MIXER_NRDEVICES];
+EXTERN GtkWidget      *maintable;
+EXTERN gint            balcallback[SOUND_MIXER_NRDEVICES];
+EXTERN gint            lvlcallback[SOUND_MIXER_NRDEVICES];
+EXTERN gint            rpcallback[SOUND_MIXER_NRDEVICES];
+EXTERN gboolean        menuvisible, balancevisible, recplayvisible, valuesvisible, visible[SOUND_MIXER_NRDEVICES];
+EXTERN GtkWidget      *labelrec, *labelzero, *labelcent, *labelleft, *labelright, *labelbalance;
 void            WakeUpGTK(void);
 void            HideShowBalancesGTK(void);
 void            HideShowNumbersGTK(void);
--- aumix-2.9.1.old/src/interactive.h
+++ aumix-2.9.1/src/interactive.h
@@ -7,7 +7,7 @@
 #define MUTE_ONLY 2
 #define        REFRESH_PERIOD 1	/* number of seconds between updates */
 
-unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
+extern unsigned char  *key_keys, *key_load, *key_mute, *key_only, *key_quit, *key_save, *key_undo;
 void            AumixSignalHandler(int signal_number);
 void            InitScreen(void);
 void            KeysBox(void);