diff -rc2P sndconfig/po/sndconfig.pot sndconfig.new/po/sndconfig.pot
*** sndconfig/po/sndconfig.pot	Mon Sep 27 11:28:55 1999
--- sndconfig.new/po/sndconfig.pot	Wed Jan 26 22:19:18 2000
***************
*** 7,11 ****
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 1999-09-27 11:28-0400\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 7,11 ----
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
! "POT-Creation-Date: 2000-01-26 22:19-0500\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
***************
*** 15,207 ****
  "Content-Transfer-Encoding: ENCODING\n"
  
! #: ../sndconfig.c:50
  msgid "ACER Notebook sound"
  msgstr ""
  
! #: ../sndconfig.c:54
  msgid "AD1816 (Acer FX-3D, HP Kayak)"
  msgstr ""
  
! #: ../sndconfig.c:57
  msgid "AdLib"
  msgstr ""
  
! #: ../sndconfig.c:61
  msgid "Advance Logic ALS-007"
  msgstr ""
  
! #: ../sndconfig.c:65
  msgid "Advance Logic ALS-100/110"
  msgstr ""
  
! #: ../sndconfig.c:69
  msgid "Aztech Sound Galaxy Waverider Pro 32-3D, Washington 16"
  msgstr ""
  
! #: ../sndconfig.c:73
  msgid "CMI8330 sound chip (many motherboards)"
  msgstr ""
  
! #: ../sndconfig.c:76
  msgid "C-Media PCI Audio (8338, 8738)"
  msgstr ""
  
! #: ../sndconfig.c:80
  msgid "Compaq Deskpro XL Sound"
  msgstr ""
  
! #: ../sndconfig.c:84
  msgid "Crystal CS423x sound chip"
  msgstr ""
  
! #: ../sndconfig.c:87
  msgid "Ensoniq AudioPCI 1370 (SoundBlaster 64/128 PCI)"
  msgstr ""
  
! #: ../sndconfig.c:90
  msgid "Creative/Ensoniq AudioPCI 1371"
  msgstr ""
  
! #: ../sndconfig.c:94
  msgid "Ensoniq SoundScape"
  msgstr ""
  
! #: ../sndconfig.c:98
  msgid "Ensoniq SoundScape VIVO"
  msgstr ""
  
! #: ../sndconfig.c:102
  msgid "ESS688 AudioDrive"
  msgstr ""
  
! #: ../sndconfig.c:106
  msgid "ESS1688 AudioDrive"
  msgstr ""
  
! #: ../sndconfig.c:110
  msgid "ESS1868 AudioDrive"
  msgstr ""
  
! #: ../sndconfig.c:113
  msgid "ESS Maestro 1/2/2E"
  msgstr ""
  
! #: ../sndconfig.c:116
  msgid "ESS Solo 1"
  msgstr ""
  
! #: ../sndconfig.c:120
  msgid "Gravis UltraSound"
  msgstr ""
  
! #: ../sndconfig.c:124
  msgid "Gravis UltraSound MAX"
  msgstr ""
  
! #: ../sndconfig.c:128
  msgid "Gravis UltraSound PnP"
  msgstr ""
  
! #: ../sndconfig.c:132
  msgid "Logitech SoundMan Games (not SM16 or SM Wave!)"
  msgstr ""
  
! #: ../sndconfig.c:136
  msgid "MediaTrix AudioTrix Pro"
  msgstr ""
  
! #: ../sndconfig.c:140
  msgid "MediaVision Jazz16 (ProSonic, SoundMan Wave)"
  msgstr ""
  
! #: ../sndconfig.c:144
  msgid "Mozart/MAD16 (OPTi 82C928)"
  msgstr ""
  
! #: ../sndconfig.c:148
  msgid "MAD16 Pro (OPTi 82C929/82C930)"
  msgstr ""
  
! #: ../sndconfig.c:152
  msgid "miroSOUND PCM12"
  msgstr ""
  
! #: ../sndconfig.c:155
  msgid "NeoMagic MagicMedia 256AV"
  msgstr ""
  
! #: ../sndconfig.c:159
  msgid "OPL3-SA1 sound chip"
  msgstr ""
  
! #: ../sndconfig.c:163
  msgid "OPL3-SA2/3/x sound chip"
  msgstr ""
  
! #: ../sndconfig.c:167
  msgid "Pro Audio Spectrum/Studio 16, Logitech SoundMan 16"
  msgstr ""
  
! #: ../sndconfig.c:171
  msgid "PSS (Orchid SW32, Cardinal DSP16)"
  msgstr ""
  
! #: ../sndconfig.c:174
  msgid "S3 SonicVibes"
  msgstr ""
  
! #: ../sndconfig.c:178
  msgid "Sound Blaster"
  msgstr ""
  
! #: ../sndconfig.c:182
  msgid "Sound Blaster Pro"
  msgstr ""
  
! #: ../sndconfig.c:186
  msgid "Sound Blaster 16"
  msgstr ""
  
! #: ../sndconfig.c:190
  msgid "Sound Blaster AWE32/64"
  msgstr ""
  
! #: ../sndconfig.c:194
  msgid "Turtle Beach MultiSound Classic/Monterey/Tahiti"
  msgstr ""
  
! #: ../sndconfig.c:198
  msgid "Turtle Beach MultiSound Pinnacle/Fiji"
  msgstr ""
  
! #: ../sndconfig.c:204
  msgid "Turtle Beach Maui/Tropez/Tropez+"
  msgstr ""
  
! #: ../sndconfig.c:208
  msgid "VIA 82CXXX PCI Audio"
  msgstr ""
  
! #: ../sndconfig.c:212
  msgid "Windows Sound System (AD1848/CS4248/CS4231)"
  msgstr ""
  
! #: ../sndconfig.c:216
  msgid "AMD7930 (sun4c)"
  msgstr ""
  
! #: ../sndconfig.c:220
  msgid "CS4231 (some sun4m, sun4u)"
  msgstr ""
  
! #: ../sndconfig.c:224
  msgid "DBRI (SPARCstation 10, 20, LX, Voyager)"
  msgstr ""
  
! #: ../sndconfig.c:297
  msgid "  <Tab>/<Alt-Tab> between elements  |  Use <Enter> to edit a selection"
  msgstr ""
  
! #: ../sndconfig.c:301
  #, c-format
  msgid ""
--- 15,207 ----
  "Content-Transfer-Encoding: ENCODING\n"
  
! #: ../sndconfig.c:55
  msgid "ACER Notebook sound"
  msgstr ""
  
! #: ../sndconfig.c:59
  msgid "AD1816 (Acer FX-3D, HP Kayak)"
  msgstr ""
  
! #: ../sndconfig.c:62
  msgid "AdLib"
  msgstr ""
  
! #: ../sndconfig.c:66
  msgid "Advance Logic ALS-007"
  msgstr ""
  
! #: ../sndconfig.c:70
  msgid "Advance Logic ALS-100/110"
  msgstr ""
  
! #: ../sndconfig.c:74
  msgid "Aztech Sound Galaxy Waverider Pro 32-3D, Washington 16"
  msgstr ""
  
! #: ../sndconfig.c:78
  msgid "CMI8330 sound chip (many motherboards)"
  msgstr ""
  
! #: ../sndconfig.c:81
  msgid "C-Media PCI Audio (8338, 8738)"
  msgstr ""
  
! #: ../sndconfig.c:85
  msgid "Compaq Deskpro XL Sound"
  msgstr ""
  
! #: ../sndconfig.c:89
  msgid "Crystal CS423x sound chip"
  msgstr ""
  
! #: ../sndconfig.c:92
  msgid "Ensoniq AudioPCI 1370 (SoundBlaster 64/128 PCI)"
  msgstr ""
  
! #: ../sndconfig.c:95
  msgid "Creative/Ensoniq AudioPCI 1371"
  msgstr ""
  
! #: ../sndconfig.c:99
  msgid "Ensoniq SoundScape"
  msgstr ""
  
! #: ../sndconfig.c:103
  msgid "Ensoniq SoundScape VIVO"
  msgstr ""
  
! #: ../sndconfig.c:107
  msgid "ESS688 AudioDrive"
  msgstr ""
  
! #: ../sndconfig.c:111
  msgid "ESS1688 AudioDrive"
  msgstr ""
  
! #: ../sndconfig.c:115
  msgid "ESS1868 AudioDrive"
  msgstr ""
  
! #: ../sndconfig.c:118
  msgid "ESS Maestro 1/2/2E"
  msgstr ""
  
! #: ../sndconfig.c:121
  msgid "ESS Solo 1"
  msgstr ""
  
! #: ../sndconfig.c:125
  msgid "Gravis UltraSound"
  msgstr ""
  
! #: ../sndconfig.c:129
  msgid "Gravis UltraSound MAX"
  msgstr ""
  
! #: ../sndconfig.c:133
  msgid "Gravis UltraSound PnP"
  msgstr ""
  
! #: ../sndconfig.c:137
  msgid "Logitech SoundMan Games (not SM16 or SM Wave!)"
  msgstr ""
  
! #: ../sndconfig.c:141
  msgid "MediaTrix AudioTrix Pro"
  msgstr ""
  
! #: ../sndconfig.c:145
  msgid "MediaVision Jazz16 (ProSonic, SoundMan Wave)"
  msgstr ""
  
! #: ../sndconfig.c:149
  msgid "Mozart/MAD16 (OPTi 82C928)"
  msgstr ""
  
! #: ../sndconfig.c:153
  msgid "MAD16 Pro (OPTi 82C929/82C930)"
  msgstr ""
  
! #: ../sndconfig.c:157
  msgid "miroSOUND PCM12"
  msgstr ""
  
! #: ../sndconfig.c:160
  msgid "NeoMagic MagicMedia 256AV"
  msgstr ""
  
! #: ../sndconfig.c:164
  msgid "OPL3-SA1 sound chip"
  msgstr ""
  
! #: ../sndconfig.c:168
  msgid "OPL3-SA2/3/x sound chip"
  msgstr ""
  
! #: ../sndconfig.c:172
  msgid "Pro Audio Spectrum/Studio 16, Logitech SoundMan 16"
  msgstr ""
  
! #: ../sndconfig.c:176
  msgid "PSS (Orchid SW32, Cardinal DSP16)"
  msgstr ""
  
! #: ../sndconfig.c:179
  msgid "S3 SonicVibes"
  msgstr ""
  
! #: ../sndconfig.c:183
  msgid "Sound Blaster"
  msgstr ""
  
! #: ../sndconfig.c:187
  msgid "Sound Blaster Pro"
  msgstr ""
  
! #: ../sndconfig.c:191
  msgid "Sound Blaster 16"
  msgstr ""
  
! #: ../sndconfig.c:195
  msgid "Sound Blaster AWE32/64"
  msgstr ""
  
! #: ../sndconfig.c:199
  msgid "Turtle Beach MultiSound Classic/Monterey/Tahiti"
  msgstr ""
  
! #: ../sndconfig.c:203
  msgid "Turtle Beach MultiSound Pinnacle/Fiji"
  msgstr ""
  
! #: ../sndconfig.c:209
  msgid "Turtle Beach Maui/Tropez/Tropez+"
  msgstr ""
  
! #: ../sndconfig.c:213
  msgid "VIA 82CXXX PCI Audio"
  msgstr ""
  
! #: ../sndconfig.c:217
  msgid "Windows Sound System (AD1848/CS4248/CS4231)"
  msgstr ""
  
! #: ../sndconfig.c:221
  msgid "AMD7930 (sun4c)"
  msgstr ""
  
! #: ../sndconfig.c:225
  msgid "CS4231 (some sun4m, sun4u)"
  msgstr ""
  
! #: ../sndconfig.c:229
  msgid "DBRI (SPARCstation 10, 20, LX, Voyager)"
  msgstr ""
  
! #: ../sndconfig.c:302
  msgid "  <Tab>/<Alt-Tab> between elements  |  Use <Enter> to edit a selection"
  msgstr ""
  
! #: ../sndconfig.c:306
  #, c-format
  msgid ""
***************
*** 211,312 ****
  #. file format is pretty static, if you change then
  #. this program wont read it right.
! #: ../sndconfig.c:572
  msgid "# THIS FILE IS WRITTEN BY SNDCONFIG\n"
  msgstr ""
  
! #: ../sndconfig.c:573
  msgid "# PLEASE USE SNDCONFIG TO MODIFY\n"
  msgstr ""
  
! #: ../sndconfig.c:574
  msgid "# TO CHANGE THIS FILE!\n"
  msgstr ""
  
! #: ../sndconfig.c:575
  msgid "# There should be no spaces at the start of a line\n"
  msgstr ""
  
! #: ../sndconfig.c:576
  msgid "# or around the '=' sign\n"
  msgstr ""
  
! #: ../sndconfig.c:587
  msgid "Card Type"
  msgstr ""
  
! #: ../sndconfig.c:591
  msgid "Please select your card:"
  msgstr ""
  
! #: ../pnpconf.c:825 ../sndconfig.c:624 ../sndconfig.c:865 ../sndconfig.c:1000
! #: ../sndconfig.c:1155 ../sndconfig.c:1169 ../sndconfig.c:1183
! #: ../sndconfig.c:1198 ../sndconfig.c:1208 ../sndconfig.c:1214
! #: ../sndconfig.c:1243 ../sndconfig.c:1262 ../sndconfig.c:1283
! #: ../sndconfig.c:1380 ../sndconfig.c:1401 ../sndconfig.c:1438
! #: ../sndconfig.c:1486 ../sndconfig.c:1501 ../sndconfig.c:1507
! #: ../sndconfig.c:1512 ../sndconfig.c:1517 ../sndconfig.c:1544
! #: ../sndconfig.c:1558 ../sndconfig.c:1562 ../sndconfig.c:1581
! #: ../sndconfig.c:1606 ../sndconfig.c:1636
  msgid "Ok"
  msgstr ""
  
! #: ../sndconfig.c:625 ../sndconfig.c:865 ../sndconfig.c:1380
! #: ../sndconfig.c:1637
  msgid "Cancel"
  msgstr ""
  
! #: ../sndconfig.c:718
  msgid "I/O PORT"
  msgstr ""
  
! #: ../sndconfig.c:732
  msgid "IRQ"
  msgstr ""
  
! #: ../sndconfig.c:748
  msgid "8-bit DMA"
  msgstr ""
  
! #: ../sndconfig.c:750
  msgid "DMA 1"
  msgstr ""
  
! #: ../sndconfig.c:752
  msgid "DMA"
  msgstr ""
  
! #: ../sndconfig.c:771
  msgid "CONFIG I/O"
  msgstr ""
  
! #: ../sndconfig.c:773
  msgid "16-bit DMA"
  msgstr ""
  
! #: ../sndconfig.c:775
  msgid "DMA 2"
  msgstr ""
  
! #: ../sndconfig.c:800
  msgid "MPU I/O"
  msgstr ""
  
! #: ../sndconfig.c:818
  msgid "MPU IRQ"
  msgstr ""
  
! #: ../sndconfig.c:838
  msgid "CONTROL I/O"
  msgstr ""
  
! #: ../sndconfig.c:840
  msgid "SB I/O"
  msgstr ""
  
! #: ../sndconfig.c:842
  msgid "BASE MEMORY"
  msgstr ""
  
! #: ../sndconfig.c:868
  msgid ""
  "Your sound card is a PnP device, so its settings can be configured w/o "
--- 211,312 ----
  #. file format is pretty static, if you change then
  #. this program wont read it right.
! #: ../sndconfig.c:577
  msgid "# THIS FILE IS WRITTEN BY SNDCONFIG\n"
  msgstr ""
  
! #: ../sndconfig.c:578
  msgid "# PLEASE USE SNDCONFIG TO MODIFY\n"
  msgstr ""
  
! #: ../sndconfig.c:579
  msgid "# TO CHANGE THIS FILE!\n"
  msgstr ""
  
! #: ../sndconfig.c:580
  msgid "# There should be no spaces at the start of a line\n"
  msgstr ""
  
! #: ../sndconfig.c:581
  msgid "# or around the '=' sign\n"
  msgstr ""
  
! #: ../sndconfig.c:592
  msgid "Card Type"
  msgstr ""
  
! #: ../sndconfig.c:596
  msgid "Please select your card:"
  msgstr ""
  
! #: ../pnpconf.c:825 ../sndconfig.c:629 ../sndconfig.c:870 ../sndconfig.c:1004
! #: ../sndconfig.c:1159 ../sndconfig.c:1173 ../sndconfig.c:1187
! #: ../sndconfig.c:1202 ../sndconfig.c:1212 ../sndconfig.c:1218
! #: ../sndconfig.c:1247 ../sndconfig.c:1266 ../sndconfig.c:1287
! #: ../sndconfig.c:1388 ../sndconfig.c:1409 ../sndconfig.c:1446
! #: ../sndconfig.c:1494 ../sndconfig.c:1509 ../sndconfig.c:1515
! #: ../sndconfig.c:1520 ../sndconfig.c:1525 ../sndconfig.c:1552
! #: ../sndconfig.c:1566 ../sndconfig.c:1570 ../sndconfig.c:1589
! #: ../sndconfig.c:1614 ../sndconfig.c:1644
  msgid "Ok"
  msgstr ""
  
! #: ../sndconfig.c:630 ../sndconfig.c:870 ../sndconfig.c:1388
! #: ../sndconfig.c:1645
  msgid "Cancel"
  msgstr ""
  
! #: ../sndconfig.c:723
  msgid "I/O PORT"
  msgstr ""
  
! #: ../sndconfig.c:737
  msgid "IRQ"
  msgstr ""
  
! #: ../sndconfig.c:753
  msgid "8-bit DMA"
  msgstr ""
  
! #: ../sndconfig.c:755
  msgid "DMA 1"
  msgstr ""
  
! #: ../sndconfig.c:757
  msgid "DMA"
  msgstr ""
  
! #: ../sndconfig.c:776
  msgid "CONFIG I/O"
  msgstr ""
  
! #: ../sndconfig.c:778
  msgid "16-bit DMA"
  msgstr ""
  
! #: ../sndconfig.c:780
  msgid "DMA 2"
  msgstr ""
  
! #: ../sndconfig.c:805
  msgid "MPU I/O"
  msgstr ""
  
! #: ../sndconfig.c:823
  msgid "MPU IRQ"
  msgstr ""
  
! #: ../sndconfig.c:843
  msgid "CONTROL I/O"
  msgstr ""
  
! #: ../sndconfig.c:845
  msgid "SB I/O"
  msgstr ""
  
! #: ../sndconfig.c:847
  msgid "BASE MEMORY"
  msgstr ""
  
! #: ../sndconfig.c:873
  msgid ""
  "Your sound card is a PnP device, so its settings can be configured w/o "
***************
*** 315,319 ****
  msgstr ""
  
! #: ../sndconfig.c:875
  msgid ""
  "Please adjust the settings below to match the dip switch settings on your "
--- 315,319 ----
  msgstr ""
  
! #: ../sndconfig.c:880
  msgid ""
  "Please adjust the settings below to match the dip switch settings on your "
***************
*** 321,333 ****
  msgstr ""
  
! #: ../sndconfig.c:920
  msgid "Card Settings"
  msgstr ""
  
! #: ../pnpconf.c:825 ../sndconfig.c:1000
  msgid "File Exists"
  msgstr ""
  
! #: ../sndconfig.c:1001
  msgid ""
  "There is already a file called /etc/conf.modules. The existing file will be "
--- 321,333 ----
  msgstr ""
  
! #: ../sndconfig.c:925
  msgid "Card Settings"
  msgstr ""
  
! #: ../pnpconf.c:825 ../sndconfig.c:1004
  msgid "File Exists"
  msgstr ""
  
! #: ../sndconfig.c:1005
  msgid ""
  "There is already a file called /etc/conf.modules. The existing file will be "
***************
*** 337,345 ****
  #. (set->type == GUS) || (set->type == GUSMAX) ||
  #. (set->type == GUSPNP) ||
! #: ../sndconfig.c:1155 ../sndconfig.c:1243
  msgid "Sound Card Test"
  msgstr ""
  
! #: ../sndconfig.c:1155
  msgid ""
  "A sound sample will now be played to determine if your sound card has been "
--- 337,345 ----
  #. (set->type == GUS) || (set->type == GUSMAX) ||
  #. (set->type == GUSPNP) ||
! #: ../sndconfig.c:1159 ../sndconfig.c:1247
  msgid "Sound Card Test"
  msgstr ""
  
! #: ../sndconfig.c:1159
  msgid ""
  "A sound sample will now be played to determine if your sound card has been "
***************
*** 347,351 ****
  msgstr ""
  
! #: ../sndconfig.c:1165
  msgid ""
  "The following error occurred running the isapnp program:\n"
--- 347,351 ----
  msgstr ""
  
! #: ../sndconfig.c:1169
  msgid ""
  "The following error occurred running the isapnp program:\n"
***************
*** 353,361 ****
  msgstr ""
  
! #: ../sndconfig.c:1169
  msgid "isapnp error"
  msgstr ""
  
! #: ../sndconfig.c:1179 ../sndconfig.c:1258
  msgid ""
  "The following error occurred running the modprobe program:\n"
--- 353,361 ----
  msgstr ""
  
! #: ../sndconfig.c:1173
  msgid "isapnp error"
  msgstr ""
  
! #: ../sndconfig.c:1183 ../sndconfig.c:1262
  msgid ""
  "The following error occurred running the modprobe program:\n"
***************
*** 363,371 ****
  msgstr ""
  
! #: ../sndconfig.c:1183 ../sndconfig.c:1262
  msgid "modprobe error"
  msgstr ""
  
! #: ../sndconfig.c:1194 ../sndconfig.c:1279
  msgid ""
  "The following error occurred playing the sample:\n"
--- 363,371 ----
  msgstr ""
  
! #: ../sndconfig.c:1187 ../sndconfig.c:1266
  msgid "modprobe error"
  msgstr ""
  
! #: ../sndconfig.c:1198 ../sndconfig.c:1283
  msgid ""
  "The following error occurred playing the sample:\n"
***************
*** 373,411 ****
  msgstr ""
  
! #: ../sndconfig.c:1198 ../sndconfig.c:1214 ../sndconfig.c:1283
  msgid "Unable To Play Audio"
  msgstr ""
  
! #: ../sndconfig.c:1208
  msgid "Sample Not Found"
  msgstr ""
  
! #: ../sndconfig.c:1209
  msgid "The sound sample does not appear to be installed."
  msgstr ""
  
! #: ../sndconfig.c:1215
  msgid "An error occurred opening /dev/audio"
  msgstr ""
  
! #: ../sndconfig.c:1232 ../sndconfig.c:1290
  msgid "Test Result"
  msgstr ""
  
! #: ../sndconfig.c:1232 ../sndconfig.c:1290 ../sndconfig.c:1424
! #: ../sndconfig.c:1609
  msgid "Yes"
  msgstr ""
  
! #: ../sndconfig.c:1232 ../sndconfig.c:1290 ../sndconfig.c:1424
! #: ../sndconfig.c:1609
  msgid "No"
  msgstr ""
  
! #: ../sndconfig.c:1233 ../sndconfig.c:1291
  msgid "Were you able to hear the sample?"
  msgstr ""
  
! #: ../sndconfig.c:1244
  msgid ""
  "A MIDI sample will now be played to determine if your sound card's synth has "
--- 373,411 ----
  msgstr ""
  
! #: ../sndconfig.c:1202 ../sndconfig.c:1218 ../sndconfig.c:1287
  msgid "Unable To Play Audio"
  msgstr ""
  
! #: ../sndconfig.c:1212
  msgid "Sample Not Found"
  msgstr ""
  
! #: ../sndconfig.c:1213
  msgid "The sound sample does not appear to be installed."
  msgstr ""
  
! #: ../sndconfig.c:1219
  msgid "An error occurred opening /dev/audio"
  msgstr ""
  
! #: ../sndconfig.c:1236 ../sndconfig.c:1294
  msgid "Test Result"
  msgstr ""
  
! #: ../sndconfig.c:1236 ../sndconfig.c:1294 ../sndconfig.c:1432
! #: ../sndconfig.c:1617
  msgid "Yes"
  msgstr ""
  
! #: ../sndconfig.c:1236 ../sndconfig.c:1294 ../sndconfig.c:1432
! #: ../sndconfig.c:1617
  msgid "No"
  msgstr ""
  
! #: ../sndconfig.c:1237 ../sndconfig.c:1295
  msgid "Were you able to hear the sample?"
  msgstr ""
  
! #: ../sndconfig.c:1248
  msgid ""
  "A MIDI sample will now be played to determine if your sound card's synth has "
***************
*** 413,417 ****
  msgstr ""
  
! #: ../sndconfig.c:1317
  msgid ""
  "\n"
--- 413,417 ----
  msgstr ""
  
! #: ../sndconfig.c:1328
  msgid ""
  "\n"
***************
*** 419,425 ****
  msgstr ""
  
! #: ../sndconfig.c:1325
  msgid ""
! "Usage: sndconfig [--help] [--noprobe] [--noautoconfig]\n"
  "     --noprobe    do not probe for PnP sound cards.\n"
  "     --noautoconfig do not autoconfigure any probed PnP sound cards.\n"
--- 419,429 ----
  msgstr ""
  
! #: ../sndconfig.c:1344
! msgid "--confpath: missing argument\n"
! msgstr ""
! 
! #: ../sndconfig.c:1350
  msgid ""
! "Usage: sndconfig [--help] [--noprobe] [--noautoconfig] [ --confpath path]\n"
  "     --noprobe    do not probe for PnP sound cards.\n"
  "     --noautoconfig do not autoconfigure any probed PnP sound cards.\n"
***************
*** 427,448 ****
  msgstr ""
  
! #: ../sndconfig.c:1349
  msgid ""
! "Usage: sndconfig [--help] [--noprobe]\n"
  "     --noprobe    do not probe for PnP sound cards.\n"
  "\n"
  msgstr ""
  
! #: ../sndconfig.c:1361
  msgid ""
! "Usage: sndconfig [--help]\n"
  "\n"
  msgstr ""
  
! #: ../sndconfig.c:1380
  msgid "Introduction"
  msgstr ""
  
! #: ../sndconfig.c:1381
  #, c-format
  msgid ""
--- 431,452 ----
  msgstr ""
  
! #: ../sndconfig.c:1363
  msgid ""
! "Usage: sndconfig [--help] [--noprobe] [ --confpath path]\n"
  "     --noprobe    do not probe for PnP sound cards.\n"
  "\n"
  msgstr ""
  
! #: ../sndconfig.c:1373
  msgid ""
! "Usage: sndconfig [--help] [ --confpath path]\n"
  "\n"
  msgstr ""
  
! #: ../sndconfig.c:1388
  msgid "Introduction"
  msgstr ""
  
! #: ../sndconfig.c:1389
  #, c-format
  msgid ""
***************
*** 454,474 ****
  msgstr ""
  
! #: ../sndconfig.c:1385
  msgid "The automatic probing for PnP cards has been DISABLED"
  msgstr ""
  
! #: ../sndconfig.c:1387
  msgid "A probe will now be performed for any PnP cards"
  msgstr ""
  
! #: ../sndconfig.c:1389
  msgid " that will be automatically configured."
  msgstr ""
  
! #: ../sndconfig.c:1401
  msgid "ERROR: No Sound Modules found"
  msgstr ""
  
! #: ../sndconfig.c:1402
  msgid ""
  "You don't seem to be running a kernel with modular sound enabled. "
--- 458,478 ----
  msgstr ""
  
! #: ../sndconfig.c:1393
  msgid "The automatic probing for PnP cards has been DISABLED"
  msgstr ""
  
! #: ../sndconfig.c:1395
  msgid "A probe will now be performed for any PnP cards"
  msgstr ""
  
! #: ../sndconfig.c:1397
  msgid " that will be automatically configured."
  msgstr ""
  
! #: ../sndconfig.c:1409
  msgid "ERROR: No Sound Modules found"
  msgstr ""
  
! #: ../sndconfig.c:1410
  msgid ""
  "You don't seem to be running a kernel with modular sound enabled. "
***************
*** 482,490 ****
  msgstr ""
  
! #: ../sndconfig.c:1424
  msgid "Warning: DISPLAY is set"
  msgstr ""
  
! #: ../sndconfig.c:1425
  msgid ""
  "Warning: DISPLAY is set. It is recommended that sndconfig *not* be run from "
--- 486,494 ----
  msgstr ""
  
! #: ../sndconfig.c:1432
  msgid "Warning: DISPLAY is set"
  msgstr ""
  
! #: ../sndconfig.c:1433
  msgid ""
  "Warning: DISPLAY is set. It is recommended that sndconfig *not* be run from "
***************
*** 492,500 ****
  msgstr ""
  
! #: ../sndconfig.c:1438
  msgid "PnP Probe Results"
  msgstr ""
  
! #: ../sndconfig.c:1438
  #, c-format
  msgid ""
--- 496,504 ----
  msgstr ""
  
! #: ../sndconfig.c:1446
  msgid "PnP Probe Results"
  msgstr ""
  
! #: ../sndconfig.c:1446
  #, c-format
  msgid ""
***************
*** 504,512 ****
  msgstr ""
  
! #: ../sndconfig.c:1486
  msgid "Probe Error"
  msgstr ""
  
! #: ../sndconfig.c:1487
  msgid ""
  "A PnP card has been detected, but the model identifier is unclear. You will "
--- 508,516 ----
  msgstr ""
  
! #: ../sndconfig.c:1494
  msgid "Probe Error"
  msgstr ""
  
! #: ../sndconfig.c:1495
  msgid ""
  "A PnP card has been detected, but the model identifier is unclear. You will "
***************
*** 514,523 ****
  msgstr ""
  
! #: ../sndconfig.c:1499
  #, c-format
  msgid "%s Probe Results"
  msgstr ""
  
! #: ../sndconfig.c:1501
  #, c-format
  msgid ""
--- 518,527 ----
  msgstr ""
  
! #: ../sndconfig.c:1507
  #, c-format
  msgid "%s Probe Results"
  msgstr ""
  
! #: ../sndconfig.c:1509
  #, c-format
  msgid ""
***************
*** 527,536 ****
  msgstr ""
  
! #: ../sndconfig.c:1508
  #, c-format
  msgid "The %s is not supported."
  msgstr ""
  
! #: ../sndconfig.c:1513
  #, c-format
  msgid ""
--- 531,540 ----
  msgstr ""
  
! #: ../sndconfig.c:1516
  #, c-format
  msgid "The %s is not supported."
  msgstr ""
  
! #: ../sndconfig.c:1521
  #, c-format
  msgid ""
***************
*** 538,542 ****
  msgstr ""
  
! #: ../sndconfig.c:1518
  #, c-format
  msgid ""
--- 542,546 ----
  msgstr ""
  
! #: ../sndconfig.c:1526
  #, c-format
  msgid ""
***************
*** 545,562 ****
  msgstr ""
  
! #: ../sndconfig.c:1545
  #, c-format
  msgid "The %s is not currently supported."
  msgstr ""
  
! #: ../sndconfig.c:1558 ../sndconfig.c:1562
  msgid "No driver available"
  msgstr ""
  
! #: ../sndconfig.c:1581
  msgid "Probe Results"
  msgstr ""
  
! #: ../sndconfig.c:1582
  msgid ""
  "No PnP or PCI sound cards were found in your system. Please select your card "
--- 549,566 ----
  msgstr ""
  
! #: ../sndconfig.c:1553
  #, c-format
  msgid "The %s is not currently supported."
  msgstr ""
  
! #: ../sndconfig.c:1566 ../sndconfig.c:1570
  msgid "No driver available"
  msgstr ""
  
! #: ../sndconfig.c:1589
  msgid "Probe Results"
  msgstr ""
  
! #: ../sndconfig.c:1590
  msgid ""
  "No PnP or PCI sound cards were found in your system. Please select your card "
***************
*** 564,576 ****
  msgstr ""
  
! #: ../sndconfig.c:1606
  msgid "Card Information"
  msgstr ""
  
! #: ../sndconfig.c:1609
  msgid "Warning"
  msgstr ""
  
! #: ../sndconfig.c:1610
  msgid ""
  "Warning: This driver is known to lock Dell Inspiron 3500 notebooks that use "
--- 568,580 ----
  msgstr ""
  
! #: ../sndconfig.c:1614
  msgid "Card Information"
  msgstr ""
  
! #: ../sndconfig.c:1617
  msgid "Warning"
  msgstr ""
  
! #: ../sndconfig.c:1618
  msgid ""
  "Warning: This driver is known to lock Dell Inspiron 3500 notebooks that use "
***************
*** 578,586 ****
  msgstr ""
  
! #: ../sndconfig.c:1636
  msgid "Autoconfiguration failed!"
  msgstr ""
  
! #: ../sndconfig.c:1637
  msgid ""
  "Autoconfiguration of your sound card failed. Now proceeding with manual "
--- 582,590 ----
  msgstr ""
  
! #: ../sndconfig.c:1644
  msgid "Autoconfiguration failed!"
  msgstr ""
  
! #: ../sndconfig.c:1645
  msgid ""
  "Autoconfiguration of your sound card failed. Now proceeding with manual "
diff -rc2P sndconfig/sndconfig.c sndconfig.new/sndconfig.c
*** sndconfig/sndconfig.c	Mon Sep 27 11:34:06 1999
--- sndconfig.new/sndconfig.c	Wed Jan 26 22:19:09 2000
***************
*** 13,16 ****
--- 13,17 ----
  #include <stdlib.h>
  #include <unistd.h>
+ #include <limits.h>
  #include <malloc.h>
  #include <string.h>
***************
*** 33,36 ****
--- 34,41 ----
  #include "messages.h"
  
+ static const char *conf_modules = "/etc/conf.modules";
+ static const char *conf_modules_bak = "/etc/conf.modules.bak";
+ static char *tmpconf="/etc/sndconfig-XXXXXX";
+ 
  /* This one should be defined in the Makefile ... */
  #ifndef VERSION
***************
*** 456,460 ****
  
      /* now read io settings from /etc/conf.modules */
!     if ((f=fopen("/etc/conf.modules","r"))==NULL)
  	return -1;
      
--- 461,465 ----
  
      /* now read io settings from /etc/conf.modules */
!     if ((f=fopen(conf_modules,"r"))==NULL)
  	return -1;
      
***************
*** 963,967 ****
  int WriteConfModules( struct settings *set ) {
      char tmpstr[200],modulename[200];
-     char tmpfile[]="/etc/sndconfig-XXXXXX";
      FILE *f, *t;
      struct stat memstat;
--- 968,971 ----
***************
*** 969,980 ****
      int tfilefd;
  
!     if ((tfilefd=mkstemp(tmpfile)) < 0)
  	return -1;
      close(tfilefd);
!     if ((t=fopen(tmpfile, "w"))==NULL) 
  	return -1;
  
      snprintf(modulename,200," %s ",set->modulename);
!     if ((f=fopen("/etc/conf.modules", "r"))!=NULL) {
  	    while(1) {
  		    if (!fgets(tmpstr, sizeof(tmpstr), f))
--- 973,984 ----
      int tfilefd;
  
!     if ((tfilefd=mkstemp(tmpconf)) < 0)
  	return -1;
      close(tfilefd);
!     if ((t=fopen(tmpconf, "w"))==NULL) 
  	return -1;
  
      snprintf(modulename,200," %s ",set->modulename);
!     if ((f=fopen(conf_modules, "r"))!=NULL) {
  	    while(1) {
  		    if (!fgets(tmpstr, sizeof(tmpstr), f))
***************
*** 997,1001 ****
      }
  
!     if (!madebackup && !access("/etc/conf.modules", F_OK)) {
  	newtWinMessage(_("File Exists"), _("Ok"),
  		       _("There is already a file called /etc/conf.modules."
--- 1001,1005 ----
      }
  
!     if (!madebackup && !access(conf_modules, F_OK)) {
  	newtWinMessage(_("File Exists"), _("Ok"),
  		       _("There is already a file called /etc/conf.modules."
***************
*** 1003,1007 ****
  		       "/etc/conf.modules.bak and a new file will be "
  		       "written."));
! 	rename("/etc/conf.modules", "/etc/conf.modules.bak");
  	madebackup=1;
      }
--- 1007,1011 ----
  		       "/etc/conf.modules.bak and a new file will be "
  		       "written."));
! 	rename(conf_modules, conf_modules_bak);
  	madebackup=1;
      }
***************
*** 1135,1140 ****
  
      fclose(t);
!     chmod(tmpfile,0644);
!     rename(tmpfile,"/etc/conf.modules");
      return 0;
  }
--- 1139,1144 ----
  
      fclose(t);
!     chmod(tmpconf,0644);
!     rename(tmpconf,conf_modules);
      return 0;
  }
***************
*** 1306,1309 ****
--- 1310,1314 ----
      int noprobe = 0,autoconfig=1;
      struct device **devs;
+     int i;
  
      setlocale(LC_ALL, "");
***************
*** 1312,1315 ****
--- 1317,1326 ----
      setenv("PATH","/sbin:/usr/sbin:/bin:/usr/bin",1);
  
+     #if !defined(USE_PNP) && !defined (__sparc__)
+ 	autoconfig = 0;
+ 	noprobe = 1;
+ 	pnpprobe = 0;
+     #endif
+ 
  #ifndef DEBUG
      /* make sure we should even be running */
***************
*** 1319,1371 ****
      }
  #endif
! 
  #ifdef USE_PNP
!     if (argc > 1) {
! 	if (!strcmp(argv[1], "--help")) {
! 	    fprintf(stderr,_("Usage: sndconfig [--help] [--noprobe] [--noautoconfig]\n"
  		  "     --noprobe    do not probe for PnP sound cards.\n"
      		  "     --noautoconfig do not autoconfigure any probed PnP sound cards.\n\n"));
  	    return 0;
  	}
!         else if (!strcmp(argv[1], "--noprobe")) {
  	  noprobe = 1;
  	  autoconfig = 0;
! 	} else if (!strcmp(argv[1], "--noautoconfig")) {
! 	    autoconfig = 0;
! 	}
!     }
!     if (argc > 2) {
! 	if (!strcmp(argv[2], "--noprobe")) {
! 	    noprobe = 1;
  	    autoconfig = 0;
  	}
- 	else if (!strcmp(argv[2], "--noautoconfig")) {
- 	    autoconfig = 0;
- 	}
-     }
  #elif defined(__sparc__)
!     if (argc > 1) {
! 	if (!strcmp(argv[1], "--help")) {
! 	    fprintf(stderr,_("Usage: sndconfig [--help] [--noprobe]\n"
  		  "     --noprobe    do not probe for PnP sound cards.\n\n"));
  	    return 0;
  	}
!         else if (!strcmp(argv[1], "--noprobe")) {
  	  noprobe = 1;
  	  autoconfig = 0;
  	}
-     }
  #else
!     if (argc > 1) {
! 	if (!strcmp(argv[1], "--help")) {
! 	    fprintf(stderr,_("Usage: sndconfig [--help]\n\n"));
  	    return 0;
  	}
-     }
-     autoconfig = 0;
-     noprobe = 1;
-     pnpprobe = 0;
  #endif 
!     
      NewtStartUp();
  
--- 1330,1379 ----
      }
  #endif
!     for (i=1; i<argc; i++){
! 	if (!strcmp(argv[i],"--confpath")){
! 	    if (i+1 < argc){
! 		char tmp[PATH_MAX];
! 		conf_modules = argv[i+1];
! 		snprintf (tmp,sizeof(tmp)-1,"%s.bak",conf_modules);
! 		conf_modules_bak = strdup(tmp);
! 		snprintf (tmp,sizeof(tmp)-1,"%s-XXXXXX",conf_modules);
! 		tmpconf = strdup(tmp);
! 		i++;
! 		continue;	
! 	    }else{
! 		fprintf (stderr,_("--confpath: missing argument\n"));
! 		exit (1);
! 	    }
! 	}
  #ifdef USE_PNP
! 	if (!strcmp(argv[i], "--help")) {
! 	    fprintf(stderr,_("Usage: sndconfig [--help] [--noprobe] [--noautoconfig] [ --confpath path]\n"
  		  "     --noprobe    do not probe for PnP sound cards.\n"
      		  "     --noautoconfig do not autoconfigure any probed PnP sound cards.\n\n"));
  	    return 0;
  	}
!         else if (!strcmp(argv[i], "--noprobe")) {
  	  noprobe = 1;
  	  autoconfig = 0;
! 	} else if (!strcmp(argv[i], "--noautoconfig")) {
  	    autoconfig = 0;
  	}
  #elif defined(__sparc__)
! 	if (!strcmp(argv[i], "--help")) {
! 	    fprintf(stderr,_("Usage: sndconfig [--help] [--noprobe] [ --confpath path]\n"
  		  "     --noprobe    do not probe for PnP sound cards.\n\n"));
  	    return 0;
  	}
!         else if (!strcmp(argv[i], "--noprobe")) {
  	  noprobe = 1;
  	  autoconfig = 0;
  	}
  #else
! 	if (!strcmp(argv[i], "--help")) {
! 	    fprintf(stderr,_("Usage: sndconfig [--help] [ --confpath path]\n\n"));
  	    return 0;
  	}
  #endif 
!     }
      NewtStartUp();
  
Only in sndconfig: sndconfig.spec