winejack.drv: Remove unused WinMM driver.
diff --git a/configure b/configure
index 515d10d..d6a4958 100755
--- a/configure
+++ b/configure
@@ -789,7 +789,6 @@
with_gsm
with_gstreamer
with_hal
-with_jack
with_jpeg
with_ldap
with_mpg123
@@ -1479,7 +1478,6 @@
--without-gsm do not use libgsm (GSM 06.10 codec support)
--without-gstreamer do not use GStreamer (codecs support)
--without-hal do not use HAL (dynamic device support)
- --without-jack do not use the Jack sound support
--without-jpeg do not use JPEG
--without-ldap do not use LDAP
--without-mpg123 do not use the mpg123 library
@@ -2603,12 +2601,6 @@
fi
-# Check whether --with-jack was given.
-if test "${with_jack+set}" = set; then :
- withval=$with_jack; if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi
-fi
-
-
# Check whether --with-jpeg was given.
if test "${with_jpeg+set}" = set; then :
withval=$with_jpeg; if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi
@@ -5709,7 +5701,6 @@
ieeefp.h \
inet/mib2.h \
io.h \
- jack/jack.h \
jpeglib.h \
kstat.h \
lber.h \
@@ -10871,60 +10862,6 @@
esac
fi
-if test "$ac_cv_header_jack_jack_h" = "yes"
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ljack" >&5
-$as_echo_n "checking for -ljack... " >&6; }
-if ${ac_cv_lib_soname_jack+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_soname_save_LIBS=$LIBS
-LIBS="-ljack $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char jack_client_new ();
-int
-main ()
-{
-return jack_client_new ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- case "$LIBEXT" in
- dll) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest.exe | grep "jack" | sed -e "s/dll.*/dll/"';2,$d'` ;;
- dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack-*[0-9.]*\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjack-*[0-9.]*\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
- *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack-*[0-9.]*\\.$LIBEXT" | sed -e "s/^.*\(libjack-*[0-9.]*\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
- esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_soname_save_LIBS
-fi
-if test "x$ac_cv_lib_soname_jack" = "x"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_jack" >&5
-$as_echo "$ac_cv_lib_soname_jack" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define SONAME_LIBJACK "$ac_cv_lib_soname_jack"
-_ACEOF
-
-
-fi
-fi
-
if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lfontconfig" >&5
@@ -11805,13 +11742,12 @@
test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
-test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no}
test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
-if test "x$ALSALIBS$COREAUDIOLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$COREAUDIOLIBS" = "x" -a \
"x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
- "x$with_alsa$with_coreaudio$with_jack$with_oss" != xnononono
+ "x$with_alsa$with_coreaudio$with_oss" != xnonono
then
as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
fi
@@ -15216,7 +15152,6 @@
wine_fn_config_lib winecrt0
wine_fn_config_dll wined3d enable_wined3d implib
wine_fn_config_dll winegstreamer enable_winegstreamer
-wine_fn_config_dll winejack.drv enable_winejack_drv
wine_fn_config_dll winejoystick.drv enable_winejoystick_drv
wine_fn_config_dll winemapi enable_winemapi
wine_fn_config_dll winemp3.acm enable_winemp3_acm
diff --git a/configure.ac b/configure.ac
index 0637859..cd5fc18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,8 +55,6 @@
[if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi])
AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)]))
AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)]))
-AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]),
- [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi])
AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]),
[if test "x$withval" = "xno"; then ac_cv_header_jpeglib_h=no; fi])
AC_ARG_WITH(ldap, AS_HELP_STRING([--without-ldap],[do not use LDAP]),
@@ -404,7 +402,6 @@
ieeefp.h \
inet/mib2.h \
io.h \
- jack/jack.h \
jpeglib.h \
kstat.h \
lber.h \
@@ -1525,12 +1522,6 @@
WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"],
[libcups ${notice_platform}development files not found, CUPS won't be supported.])
-dnl **** Check for jack ****
-if test "$ac_cv_header_jack_jack_h" = "yes"
-then
- WINE_CHECK_SONAME(jack,jack_client_new,,,,[[libjack-*[[0-9.]]*]])
-fi
-
dnl **** Check for fontconfig ****
if test "$ac_cv_header_fontconfig_fontconfig_h" = "yes"
then
@@ -1645,14 +1636,13 @@
dnl **** Disable unsupported winmm drivers ****
test -n "$ALSALIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no}
test -n "$COREAUDIO" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no}
-test -n "$ac_cv_lib_soname_jack" || enable_winejack_drv=${enable_winejack_drv:-no}
test "x$ac_cv_member_oss_sysinfo_numaudioengines" = xyes || enable_wineoss_drv=${enable_wineoss_drv:-no}
test "$ac_cv_header_linux_joystick_h" = "yes" || enable_winejoystick_drv=${enable_winejoystick_drv:-no}
dnl **** Check for any sound system ****
-if test "x$ALSALIBS$COREAUDIOLIBS$ac_cv_lib_soname_jack" = "x" -a \
+if test "x$ALSALIBS$COREAUDIOLIBS" = "x" -a \
"x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \
- "x$with_alsa$with_coreaudio$with_jack$with_oss" != xnononono
+ "x$with_alsa$with_coreaudio$with_oss" != xnonono
then
WINE_WARNING([No sound system was found. Windows applications will be silent.])
fi
@@ -2835,7 +2825,6 @@
WINE_CONFIG_LIB(winecrt0)
WINE_CONFIG_DLL(wined3d,,[implib])
WINE_CONFIG_DLL(winegstreamer)
-WINE_CONFIG_DLL(winejack.drv)
WINE_CONFIG_DLL(winejoystick.drv)
WINE_CONFIG_DLL(winemapi)
WINE_CONFIG_DLL(winemp3.acm)
diff --git a/dlls/winejack.drv/Makefile.in b/dlls/winejack.drv/Makefile.in
deleted file mode 100644
index e7263d3..0000000
--- a/dlls/winejack.drv/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-MODULE = winejack.drv
-IMPORTS = dxguid uuid winmm user32
-
-C_SRCS = \
- audio.c
-
-@MAKE_DLL_RULES@
diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c
deleted file mode 100644
index 5d339ee..0000000
--- a/dlls/winejack.drv/audio.c
+++ /dev/null
@@ -1,2449 +0,0 @@
-/*
- * Wine Driver for jack Sound Server
- * http://jackit.sourceforge.net
- *
- * Copyright 1994 Martin Ayotte
- * Copyright 1999 Eric Pouech (async playing in waveOut/waveIn)
- * Copyright 2000 Eric Pouech (loops in waveOut)
- * Copyright 2002 Chris Morgan (jack version of this file)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/*
- * TODO:
- * implement audio stream resampling for any arbitrary frequenty
- * right now we use the winmm layer to do resampling although it would
- * be nice to have a full set of algorithms to choose from based on cpu
- * time
- *
- * FIXME:
- * pause in waveOut during loop is not handled correctly
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <fcntl.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winerror.h"
-#include "mmddk.h"
-#include "dsound.h"
-#include "dsdriver.h"
-#include "wine/unicode.h"
-#include "wine/library.h"
-#include "wine/debug.h"
-
-#ifdef HAVE_JACK_JACK_H
-#include <jack/jack.h>
-#endif
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(wave);
-
-#define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL;
-
-/* Function pointers for dynamic loading of libjack */
-/* these are prefixed with "fp_", ie. "fp_jack_client_open" */
-MAKE_FUNCPTR(jack_activate);
-MAKE_FUNCPTR(jack_connect);
-MAKE_FUNCPTR(jack_client_open);
-MAKE_FUNCPTR(jack_client_close);
-MAKE_FUNCPTR(jack_deactivate);
-MAKE_FUNCPTR(jack_set_process_callback);
-MAKE_FUNCPTR(jack_set_buffer_size_callback);
-MAKE_FUNCPTR(jack_set_sample_rate_callback);
-MAKE_FUNCPTR(jack_on_shutdown);
-MAKE_FUNCPTR(jack_get_sample_rate);
-MAKE_FUNCPTR(jack_port_register);
-MAKE_FUNCPTR(jack_port_get_buffer);
-MAKE_FUNCPTR(jack_get_ports);
-MAKE_FUNCPTR(jack_port_name);
-MAKE_FUNCPTR(jack_get_buffer_size);
-#undef MAKE_FUNCPTR
-
-static void *jackhandle;
-
-/* define the below to work around a bug in jack where closing a port */
-/* takes a very long time, so to get around this we actually don't */
-/* close the port when the device is closed but instead mark the */
-/* corresponding device as unused */
-#define JACK_CLOSE_HACK 1
-
-typedef jack_default_audio_sample_t sample_t;
-typedef jack_nframes_t nframes_t;
-
-/* only allow 10 output devices through this driver, this ought to be adequate */
-#define MAX_WAVEOUTDRV (10)
-#define MAX_WAVEINDRV (10)
-
-/* state diagram for waveOut writing:
- *
- * +---------+-------------+---------------+---------------------------------+
- * | state | function | event | new state |
- * +---------+-------------+---------------+---------------------------------+
- * | | open() | | STOPPED |
- * | PAUSED | write() | | PAUSED |
- * | STOPPED | write() | <thrd create> | PLAYING |
- * | PLAYING | write() | HEADER | PLAYING |
- * | (other) | write() | <error> | |
- * | (any) | pause() | PAUSING | PAUSED |
- * | PAUSED | restart() | RESTARTING | PLAYING (if no thrd => STOPPED) |
- * | (any) | reset() | RESETTING | STOPPED |
- * | (any) | close() | CLOSING | CLOSED |
- * +---------+-------------+---------------+---------------------------------+
- */
-
-/* states of the playing device */
-#define WINE_WS_PLAYING 0
-#define WINE_WS_PAUSED 1
-#define WINE_WS_STOPPED 2
-#define WINE_WS_CLOSED 3
-
-typedef struct {
- volatile int state; /* one of the WINE_WS_ manifest constants */
- WAVEOPENDESC waveDesc;
- WORD wFlags;
- PCMWAVEFORMAT format;
- WAVEOUTCAPSW caps;
- WORD wDevID;
- char interface_name[32];
-
- jack_port_t* out_port_l; /* ports for left and right channels */
- jack_port_t* out_port_r;
- jack_client_t* client;
- long sample_rate; /* jack server sample rate */
-
-#if JACK_CLOSE_HACK
- BOOL in_use; /* TRUE if this device is in use */
-#endif
-
- char* sound_buffer;
- unsigned long buffer_size;
-
- DWORD volume_left;
- DWORD volume_right;
-
- LPWAVEHDR lpQueuePtr; /* start of queued WAVEHDRs (waiting to be notified) */
- LPWAVEHDR lpPlayPtr; /* start of not yet fully played buffers */
- DWORD dwPartialOffset; /* Offset of not yet written bytes in lpPlayPtr */
-
- LPWAVEHDR lpLoopPtr; /* pointer of first buffer in loop, if any */
- DWORD dwLoops; /* private copy of loop counter */
-
- DWORD dwPlayedTotal; /* number of bytes actually played since opening */
- DWORD dwWrittenTotal; /* number of bytes written to jack since opening */
-
- DWORD bytesInJack; /* bytes that we wrote during the previous JACK_Callback() */
- DWORD tickCountMS; /* time in MS of last JACK_Callback() */
-
- /* synchronization stuff */
- CRITICAL_SECTION access_crst;
-} WINE_WAVEOUT;
-
-typedef struct {
- volatile int state;
- WAVEOPENDESC waveDesc;
- WORD wFlags;
- PCMWAVEFORMAT format;
- LPWAVEHDR lpQueuePtr;
- DWORD dwTotalRecorded;
- WAVEINCAPSW caps;
- BOOL bTriggerSupport;
- WORD wDevID;
- char interface_name[32];
-
- jack_port_t* in_port_l; /* ports for left and right channels */
- jack_port_t* in_port_r;
- jack_client_t* client;
- long sample_rate; /* jack server sample rate */
-
-#if JACK_CLOSE_HACK
- BOOL in_use; /* TRUE if this device is in use */
-#endif
-
- char* sound_buffer;
- unsigned long buffer_size;
-
- /* synchronization stuff */
- CRITICAL_SECTION access_crst;
-} WINE_WAVEIN;
-
-static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV];
-static WINE_WAVEIN WInDev [MAX_WAVEINDRV ];
-
-static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv);
-static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc);
-
-static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo);
-static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force);
-
-static int JACK_OpenWaveOutDevice(WINE_WAVEOUT* wwo);
-static int JACK_OpenWaveInDevice(WINE_WAVEIN* wwi, WORD nChannels);
-
-#if JACK_CLOSE_HACK
-static void JACK_CloseWaveOutDevice(WINE_WAVEOUT* wwo, BOOL close_client);
-#else
-static void JACK_CloseWaveOutDevice(WINE_WAVEOUT* wwo);
-#endif
-
-#if JACK_CLOSE_HACK
-static void JACK_CloseWaveInDevice(WINE_WAVEIN* wwi, BOOL close_client);
-#else
-static void JACK_CloseWaveInDevice(WINE_WAVEIN* wwi);
-#endif
-
-static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position,
- PCMWAVEFORMAT* format)
-{
- TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%u nChannels=%u nAvgBytesPerSec=%u\n",
- lpTime->wType, format->wBitsPerSample, format->wf.nSamplesPerSec,
- format->wf.nChannels, format->wf.nAvgBytesPerSec);
- TRACE("Position in bytes=%u\n", position);
-
- switch (lpTime->wType) {
- case TIME_SAMPLES:
- lpTime->u.sample = position / (format->wBitsPerSample / 8 * format->wf.nChannels);
- TRACE("TIME_SAMPLES=%u\n", lpTime->u.sample);
- break;
- case TIME_MS:
- lpTime->u.ms = 1000.0 * position / (format->wBitsPerSample / 8 * format->wf.nChannels * format->wf.nSamplesPerSec);
- TRACE("TIME_MS=%u\n", lpTime->u.ms);
- break;
- case TIME_SMPTE:
- lpTime->u.smpte.fps = 30;
- position = position / (format->wBitsPerSample / 8 * format->wf.nChannels);
- position += (format->wf.nSamplesPerSec / lpTime->u.smpte.fps) - 1; /* round up */
- lpTime->u.smpte.sec = position / format->wf.nSamplesPerSec;
- position -= lpTime->u.smpte.sec * format->wf.nSamplesPerSec;
- lpTime->u.smpte.min = lpTime->u.smpte.sec / 60;
- lpTime->u.smpte.sec -= 60 * lpTime->u.smpte.min;
- lpTime->u.smpte.hour = lpTime->u.smpte.min / 60;
- lpTime->u.smpte.min -= 60 * lpTime->u.smpte.hour;
- lpTime->u.smpte.fps = 30;
- lpTime->u.smpte.frame = position * lpTime->u.smpte.fps / format->wf.nSamplesPerSec;
- TRACE("TIME_SMPTE=%02u:%02u:%02u:%02u\n",
- lpTime->u.smpte.hour, lpTime->u.smpte.min,
- lpTime->u.smpte.sec, lpTime->u.smpte.frame);
- break;
- default:
- WARN("Format %d not supported, using TIME_BYTES !\n", lpTime->wType);
- lpTime->wType = TIME_BYTES;
- /* fall through */
- case TIME_BYTES:
- lpTime->u.cb = position;
- TRACE("TIME_BYTES=%u\n", lpTime->u.cb);
- break;
- }
- return MMSYSERR_NOERROR;
-}
-
-
-/*======================================================================*
- * Low level WAVE implementation *
- *======================================================================*/
-
-#define SAMPLE_MAX_16BIT 32767.0f
-
-/* Alsaplayer function that applies volume changes to a buffer */
-/* (C) Andy Lo A Foe */
-/* Length is in terms of 32 bit samples */
-static void volume_effect32(void *buffer, int length, int left, int right)
-{
- short *data = buffer;
- int i, v;
-
- if (right == -1) right = left;
-
- for(i = 0; i < length; i++) {
- v = (int) ((*(data) * left) / 100);
- *(data++) = (v>32767) ? 32767 : ((v<-32768) ? -32768 : v);
- v = (int) ((*(data) * right) / 100);
- *(data++) = (v>32767) ? 32767 : ((v<-32768) ? -32768 : v);
- }
-}
-
-/* move 16 bit mono/stereo to 16 bit stereo */
-static void sample_move_d16_d16(short *dst, short *src,
- unsigned long nsamples, int nChannels)
-{
- while(nsamples--)
- {
- *dst = *src;
- dst++;
-
- if(nChannels == 2) src++;
-
- *dst = *src;
- dst++;
-
- src++;
- }
-}
-
-/* convert from 16 bit to floating point */
-/* allow for copying of stereo data with alternating left/right */
-/* channels to a buffer that will hold a single channel stream */
-/* nsamples is in terms of 16bit samples */
-/* src_skip is in terms of 16bit samples */
-static void sample_move_d16_s16 (sample_t *dst, short *src,
- unsigned long nsamples, unsigned long src_skip)
-{
- /* ALERT: signed sign-extension portability !!! */
- while (nsamples--)
- {
- *dst = (*src) / SAMPLE_MAX_16BIT;
- dst++;
- src += src_skip;
- }
-}
-
-/* convert from floating point to 16 bit */
-/* allow for copying of a buffer that will hold a single channel stream */
-/* to stereo data with alternating left/right channels */
-/* nsamples is in terms of float samples */
-/* dst_skip is in terms of 16bit samples */
-static void sample_move_s16_d16 (short *dst, sample_t *src,
- unsigned long nsamples, unsigned long dst_skip)
-{
- /* ALERT: signed sign-extension portability !!! */
- while (nsamples--)
- {
- *dst = (*src) * SAMPLE_MAX_16BIT;
-/* TRACE("src=(%.8f,%p) dst=(%d,%p)\n",*src,src,*dst,dst); */
- dst += dst_skip;
- src++;
- }
-}
-
-
-/* fill dst buffer with nsamples worth of silence */
-static void sample_silence_dS (sample_t *dst, unsigned long nsamples)
-{
- /* ALERT: signed sign-extension portability !!! */
- while (nsamples--)
- {
- *dst = 0;
- dst++;
- }
-}
-
-/******************************************************************
- * JACK_callback_wwo
- */
-/* everytime the jack server wants something from us it calls this
-function, so we either deliver it some sound to play or deliver it nothing
-to play */
-static int JACK_callback_wwo (nframes_t nframes, void *arg)
-{
- sample_t* out_l;
- sample_t* out_r;
- WINE_WAVEOUT* wwo = arg;
-
- TRACE("wDevID: %u, nframes %u state=%u\n", wwo->wDevID, nframes,wwo->state);
-
- if(!wwo->client)
- ERR("client is closed, this is weird...\n");
-
- out_l = fp_jack_port_get_buffer(wwo->out_port_l, nframes);
- out_r = fp_jack_port_get_buffer(wwo->out_port_r, nframes);
-
- if(wwo->state == WINE_WS_PLAYING)
- {
- DWORD jackFramesAvailable = nframes;
- DWORD outputFramesAvailable;
- DWORD numFramesToWrite;
-
- long written = 0;
- char* buffer;
-
-#if JACK_CLOSE_HACK
- if(wwo->in_use == FALSE)
- {
- /* output silence if nothing is being outputted */
- sample_silence_dS(out_l, nframes);
- sample_silence_dS(out_r, nframes);
-
- return 0;
- }
-#endif
-
- TRACE("wwo.state == WINE_WS_PLAYING\n");
-
- /* see if our sound_buffer is large enough to hold the number of frames jack requested */
- /* Note: sound_buffer is always filled with 16-bit stereo data, even for mono mode */
- if(wwo->buffer_size < (nframes * sizeof(short) * 2))
- {
- ERR("for some reason JACK_BufSize() didn't allocate enough memory\n");
- ERR("allocated %ld bytes, need %d bytes\n", wwo->buffer_size, (nframes * (unsigned)sizeof(short) * 2));
- return 0;
- }
-
- /* while we have jackFramesAvailable and a wave header to be played */
- while(jackFramesAvailable && wwo->lpPlayPtr)
- {
- /* find the amount of audio to be played at this time */
- outputFramesAvailable = (wwo->lpPlayPtr->dwBufferLength - wwo->dwPartialOffset) / wwo->format.wf.nBlockAlign;
-
- numFramesToWrite = min(jackFramesAvailable, outputFramesAvailable);
- TRACE("dwBufferLength=(%d) dwPartialOffset=(%d)\n",wwo->lpPlayPtr->dwBufferLength,wwo->dwPartialOffset);
- TRACE("outputFramesAvailable == %d, jackFramesAvailable == %d\n", outputFramesAvailable, jackFramesAvailable);
-
- buffer = wwo->lpPlayPtr->lpData + wwo->dwPartialOffset;
-
- /* convert from mono to stereo if necessary */
- /* otherwise just memcpy to the output buffer */
-
- if(wwo->format.wf.nChannels == 1)
- {
- sample_move_d16_d16((short*)wwo->sound_buffer + ((nframes - jackFramesAvailable) * sizeof(short)),
- (short*)buffer, numFramesToWrite, wwo->format.wf.nChannels);
- } else /* just copy the memory over */
- {
- memcpy(wwo->sound_buffer + ((nframes - jackFramesAvailable) * wwo->format.wf.nBlockAlign),
- buffer, numFramesToWrite * wwo->format.wf.nBlockAlign);
- }
-
- /* advance to the next wave header if possible, or advance pointer */
- /* inside of the current header if we haven't completed it */
- if(numFramesToWrite == outputFramesAvailable)
- {
- wodHelper_PlayPtrNext(wwo); /* we wrote the whole waveheader, skip to the next one*/
- }
- else
- {
- wwo->dwPartialOffset+=(numFramesToWrite * wwo->format.wf.nBlockAlign); /* else advance by the bytes we took in to write */
- }
-
- written+=(numFramesToWrite * wwo->format.wf.nBlockAlign); /* add on what we wrote */
- jackFramesAvailable-=numFramesToWrite; /* take away what was written in terms of output bytes */
- }
-
- wwo->tickCountMS = GetTickCount(); /* record the current time */
- wwo->dwWrittenTotal+=written; /* update states on wave device */
- wwo->dwPlayedTotal+=wwo->bytesInJack; /* we must have finished with the last bytes or we wouldn't be back inside of this callback again... */
- wwo->bytesInJack = written; /* record the bytes inside of jack */
-
- /* Now that we have finished filling the buffer either until it is full or until */
- /* we have run out of application sound data to process, apply volume and output */
- /* the audio to the jack server */
-
- /* apply volume to the buffer */
- volume_effect32(wwo->sound_buffer, (nframes - jackFramesAvailable), wwo->volume_left, wwo->volume_right);
-
- /* convert from stereo 16 bit to single channel 32 bit float */
- /* for each jack server channel */
- /* NOTE: we skip over two sample since we want to only get either the left or right channel */
- sample_move_d16_s16(out_l, (short*)wwo->sound_buffer, (nframes - jackFramesAvailable), 2);
- sample_move_d16_s16(out_r, (short*)wwo->sound_buffer + 1, (nframes - jackFramesAvailable), 2);
-
- /* see if we still have jackBytesLeft here, if we do that means that we
- ran out of wave data to play and had a buffer underrun, fill in
- the rest of the space with zero bytes */
- if(jackFramesAvailable)
- {
- ERR("buffer underrun of %d frames\n", jackFramesAvailable);
- sample_silence_dS(out_l + (nframes - jackFramesAvailable), jackFramesAvailable);
- sample_silence_dS(out_r + (nframes - jackFramesAvailable), jackFramesAvailable);
- }
- }
- else if(wwo->state == WINE_WS_PAUSED ||
- wwo->state == WINE_WS_STOPPED ||
- wwo->state == WINE_WS_CLOSED)
- {
- /* output silence if nothing is being outputted */
- sample_silence_dS(out_l, nframes);
- sample_silence_dS(out_r, nframes);
- }
-
- /* notify the client of completed wave headers */
- EnterCriticalSection(&wwo->access_crst);
- wodHelper_NotifyCompletions(wwo, FALSE);
- LeaveCriticalSection(&wwo->access_crst);
-
- return 0;
-}
-
-/******************************************************************
- * JACK_bufsize_wwo
- *
- * Called whenever the jack server changes the max number
- * of frames passed to JACK_callback
- */
-static int JACK_bufsize_wwo (nframes_t nframes, void *arg)
-{
- WINE_WAVEOUT* wwo = arg;
- DWORD buffer_required;
- TRACE("wDevID=%d\n",wwo->wDevID);
- TRACE("the maximum buffer size is now %u frames\n", nframes);
-
- /* make sure the callback routine has adequate memory */
- /* see if our buffer is large enough for the data we are writing */
- /* ie. Buffer_size < (bytes we already wrote + bytes we are going to write in this loop) */
- EnterCriticalSection(&wwo->access_crst);
-
- /* wwo->sound_buffer is always filled with 16-bit stereo data, even for mono streams */
- buffer_required = nframes * sizeof(short) * 2;
- TRACE("wwo->buffer_size (%ld) buffer_required (%d).\n", wwo->buffer_size,buffer_required);
- if(wwo->buffer_size < buffer_required)
- {
- TRACE("expanding buffer from wwo->buffer_size == %ld, to %d\n",
- wwo->buffer_size, buffer_required);
- TRACE("GetProcessHeap() == %p\n", GetProcessHeap());
- wwo->buffer_size = buffer_required;
-
- if (wwo->sound_buffer)
- wwo->sound_buffer = HeapReAlloc(GetProcessHeap(), 0, wwo->sound_buffer, wwo->buffer_size);
- else
- wwo->sound_buffer = HeapAlloc(GetProcessHeap(), 0, wwo->buffer_size);
-
- /* if we don't have a buffer then error out */
- if(!wwo->sound_buffer)
- {
- ERR("error allocating sound_buffer memory\n");
- LeaveCriticalSection(&wwo->access_crst);
- return 0;
- }
- }
-
- LeaveCriticalSection(&wwo->access_crst);
-
- TRACE("ending\n");
-
- return 0;
-}
-/******************************************************************
- * JACK_bufsize_wwi
- *
- * Called whenever the jack server changes the max number
- * of frames passed to JACK_callback
- */
-static int JACK_bufsize_wwi (nframes_t nframes, void *arg)
-{
- TRACE("the maximum buffer size is now %u frames\n", nframes);
- return 0;
-}
-
-/******************************************************************
- * JACK_srate
- */
-static int JACK_srate (nframes_t nframes, void *arg)
-{
- TRACE("the sample rate is now %u/sec\n", nframes);
- return 0;
-}
-
-
-/******************************************************************
- * JACK_shutdown_wwo
- */
-/* if this is called then jack shut down... handle this appropriately */
-static void JACK_shutdown_wwo(void* arg)
-{
- WINE_WAVEOUT* wwo = arg;
-
- wwo->client = 0; /* reset client */
-
- TRACE("trying to reconnect after sleeping for a short while...\n");
-
- /* lets see if we can't reestablish the connection */
- Sleep(750); /* pause for a short period of time */
- if(!JACK_OpenWaveOutDevice(wwo))
- {
- ERR("unable to reconnect with jack...\n");
- }
-}
-
-/******************************************************************
- * JACK_shutdown_wwi
- */
-/* if this is called then jack shut down... handle this appropriately */
-static void JACK_shutdown_wwi(void* arg)
-{
- WINE_WAVEIN* wwi = arg;
-
- wwi->client = 0; /* reset client */
-
- TRACE("trying to reconnect after sleeping for a short while...\n");
-
- /* lets see if we can't reestablish the connection */
- Sleep(750); /* pause for a short period of time */
- if(!JACK_OpenWaveInDevice(wwi,wwi->format.wf.nChannels))
- {
- ERR("unable to reconnect with jack...\n");
- }
-}
-
-
-/******************************************************************
- * JACK_OpenWaveOutDevice
- */
-static int JACK_OpenWaveOutDevice(WINE_WAVEOUT* wwo)
-{
- const char** ports;
- int i;
- char client_name[64];
- jack_port_t* out_port_l;
- jack_port_t* out_port_r;
- jack_client_t* client;
- int failed = 0;
-
- TRACE("creating jack client and setting up callbacks\n");
-
-#if JACK_CLOSE_HACK
- /* see if this device is already open */
- if(wwo->client)
- {
- /* if this device is already in use then it is bad for us to be in here */
- if(wwo->in_use)
- return 0;
-
- TRACE("using existing client\n");
- wwo->in_use = TRUE;
- return 1;
- }
-#endif
-
- /* zero out the buffer pointer and the size of the buffer */
- wwo->sound_buffer = 0;
- wwo->buffer_size = 0;
-
- /* try to become a client of the JACK server */
- snprintf(client_name, sizeof(client_name), "wine_jack_out_%d", wwo->wDevID);
- TRACE("client name '%s'\n", client_name);
- if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0)
- {
- /* jack has problems with shutting down clients, so lets */
- /* wait a short while and try once more before we give up */
- Sleep(250);
- if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0)
- {
- ERR("jack server not running?\n");
- return 0;
- }
- }
-
- /* tell the JACK server to call `JACK_callback_wwo()' whenever
- there is work to be done. */
- fp_jack_set_process_callback (client, JACK_callback_wwo, wwo);
-
- /* tell the JACK server to call `JACK_bufsize_wwo()' whenever
- the maximum number of frames that will be passed
- to `JACK_Callback()' changes */
- fp_jack_set_buffer_size_callback (client, JACK_bufsize_wwo, wwo);
-
- /* tell the JACK server to call `srate()' whenever
- the sample rate of the system changes. */
- fp_jack_set_sample_rate_callback (client, JACK_srate, wwo);
-
- /* tell the JACK server to call `jack_shutdown()' if
- it ever shuts down, either entirely, or if it
- just decides to stop calling us. */
- fp_jack_on_shutdown (client, JACK_shutdown_wwo, wwo);
-
- /* display the current sample rate. once the client is activated
- (see below), you should rely on your own sample rate
- callback (see above) for this value. */
- wwo->sample_rate = fp_jack_get_sample_rate(client);
- TRACE("engine sample rate: %lu\n", wwo->sample_rate);
-
- /* create the left and right channel output ports */
- /* jack's ports are all mono so for stereo you need two */
- out_port_l = fp_jack_port_register (client, "out_l",
- JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-
- out_port_r = fp_jack_port_register (client, "out_r",
- JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-
- TRACE("Created ports. (%p) (%p)\n",out_port_l, out_port_r);
-
- /* save away important values to the WINE_WAVEOUT struct */
- wwo->client = client;
- wwo->out_port_l = out_port_l;
- wwo->out_port_r = out_port_r;
-
-#if JACK_CLOSE_HACK
- wwo->in_use = TRUE; /* mark this device as in use since it now is ;-) */
-#endif
-
- /* set initial buffer size */
- JACK_bufsize_wwo (fp_jack_get_buffer_size(client),wwo);
-
- /* tell the JACK server that we are ready to roll */
- if (fp_jack_activate (client))
- {
- ERR( "cannot activate client\n");
- return 0;
- }
-
- TRACE("jack activate.\n");
- /* figure out what the ports that we want to output on are */
- /* NOTE: we do this instead of using stuff like "alsa_pcm:playback_X" because */
- /* this way works if names are changed */
- ports = fp_jack_get_ports(client, NULL, NULL, JackPortIsPhysical|JackPortIsInput);
-
- /* display a trace of the output ports we found */
- for(i = 0; ports[i]; i++)
- {
- TRACE("ports[%d] = '%s'\n", i, ports[i]);
- }
-
- if(!ports)
- {
- ERR("jack_get_ports() failed to find 'JackPortIsPhysical|JackPortIsInput'\n");
- }
-
- /* connect the ports. Note: you can't do this before
- the client is activated (this may change in the future).
- */
- /* we want to connect to two ports so we have stereo output ;-) */
-
- if(fp_jack_connect(client, fp_jack_port_name(out_port_l), ports[0]))
- {
- ERR ("cannot connect to output port %d('%s')\n", 0, ports[0]);
- failed = 1;
- }
-
- if(fp_jack_connect(client, fp_jack_port_name(out_port_r), ports[1]))
- {
- ERR ("cannot connect to output port %d('%s')\n", 1, ports[1]);
- failed = 1;
- }
-
- free(ports); /* free the returned array of ports */
-
- /* if something failed we need to shut the client down and return 0 */
- if(failed)
- {
-#if JACK_CLOSE_HACK
- JACK_CloseWaveOutDevice(wwo, TRUE);
-#else
- JACK_CloseWaveOutDevice(wwo);
-#endif
- return 0;
- }
-
- return 1; /* return success */
-}
-
-/******************************************************************
- * JACK_CloseWaveOutDevice
- *
- * Close the connection to the server cleanly.
- * If close_client is TRUE we close the client for this device instead of
- * just marking the device as in_use(JACK_CLOSE_HACK only)
- */
-#if JACK_CLOSE_HACK
-static void JACK_CloseWaveOutDevice(WINE_WAVEOUT* wwo, BOOL close_client)
-#else
-static void JACK_CloseWaveOutDevice(WINE_WAVEOUT* wwo)
-#endif
-{
-#if JACK_CLOSE_HACK
- TRACE("wDevID: %d, close_client (wwo): %d\n", wwo->wDevID, close_client);
-#else
- TRACE("wDevID: %d\n", wwo->wDevID);
-#endif
-
-#if JACK_CLOSE_HACK
- if(close_client)
- {
-#endif
- fp_jack_deactivate(wwo->client); /* supposed to help the jack_client_close() to succeed */
- fp_jack_client_close (wwo->client);
-
- EnterCriticalSection(&wwo->access_crst);
- wwo->client = 0; /* reset client */
- HeapFree(GetProcessHeap(), 0, wwo->sound_buffer); /* free buffer memory */
- wwo->sound_buffer = 0;
- wwo->buffer_size = 0; /* zero out size of the buffer */
- LeaveCriticalSection(&wwo->access_crst);
-#if JACK_CLOSE_HACK
- } else
- {
- EnterCriticalSection(&wwo->access_crst);
- TRACE("setting in_use to FALSE\n");
- wwo->in_use = FALSE;
- LeaveCriticalSection(&wwo->access_crst);
- }
-#endif
-}
-
-/******************************************************************
- * JACK_CloseWaveInDevice
- *
- * Close the connection to the server cleanly.
- * If close_client is TRUE we close the client for this device instead of
- * just marking the device as in_use(JACK_CLOSE_HACK only)
- */
-#if JACK_CLOSE_HACK
-static void JACK_CloseWaveInDevice(WINE_WAVEIN* wwi, BOOL close_client)
-#else
-static void JACK_CloseWaveInDevice(WINE_WAVEIN* wwi)
-#endif
-{
-#if JACK_CLOSE_HACK
- TRACE("wDevID: %d, close_client (wwi): %d\n", wwi->wDevID, close_client);
-#else
- TRACE("wDevID: %d\n", wwi->wDevID);
-#endif
-
-#if JACK_CLOSE_HACK
- if(close_client)
- {
-#endif
- fp_jack_deactivate(wwi->client); /* supposed to help the jack_client_close() to succeed */
- fp_jack_client_close (wwi->client);
-
- EnterCriticalSection(&wwi->access_crst);
- wwi->client = 0; /* reset client */
- HeapFree(GetProcessHeap(), 0, wwi->sound_buffer); /* free buffer memory */
- wwi->sound_buffer = 0;
- wwi->buffer_size = 0; /* zero out size of the buffer */
- LeaveCriticalSection(&wwi->access_crst);
-#if JACK_CLOSE_HACK
- } else
- {
- EnterCriticalSection(&wwi->access_crst);
- TRACE("setting in_use to FALSE\n");
- wwi->in_use = FALSE;
- LeaveCriticalSection(&wwi->access_crst);
- }
-#endif
-}
-
-static int WAVE_loadcount;
-
-/******************************************************************
- * JACK_WaveRelease
- *
- *
- */
-static LONG JACK_WaveRelease(void)
-{
- int iDevice;
-
- if (--WAVE_loadcount)
- return 1;
- TRACE("closing all open waveout devices\n");
-
- /* close all open output devices */
- for(iDevice = 0; iDevice < MAX_WAVEOUTDRV; iDevice++)
- {
- TRACE("iDevice == %d\n", iDevice);
- if(WOutDev[iDevice].client)
- {
-#if JACK_CLOSE_HACK
- JACK_CloseWaveOutDevice(&WOutDev[iDevice], TRUE); /* close the device, FORCE the client to close */
-#else
- JACK_CloseWaveOutDevice(&WOutDev[iDevice]); /* close the device, FORCE the client to close */
-#endif
- DeleteCriticalSection(&(WOutDev[iDevice].access_crst)); /* delete the critical section */
- }
- }
-
- TRACE("closing all open wavein devices\n");
-
- /* close all open input devices */
- for(iDevice = 0; iDevice < MAX_WAVEINDRV; iDevice++)
- {
- TRACE("iDevice == %d\n", iDevice);
- if(WInDev[iDevice].client)
- {
-#if JACK_CLOSE_HACK
- JACK_CloseWaveInDevice(&WInDev[iDevice], TRUE); /* close the device, FORCE the client to close */
-#else
- JACK_CloseWaveInDevice(&WInDev[iDevice]); /* close the device, FORCE the client to close */
-#endif
- DeleteCriticalSection(&(WInDev[iDevice].access_crst)); /* delete the critical section */
- }
- }
-
- TRACE("returning 1\n");
-
- return 1;
-}
-
-/******************************************************************
- * JACK_WaveInit
- *
- * Initialize internal structures from JACK server info
- */
-static LONG JACK_WaveInit(void)
-{
- int i;
- CHAR szPname[MAXPNAMELEN];
-
- TRACE("called\n");
- if (WAVE_loadcount++)
- return 1;
-
- /* setup function pointers */
-#define LOAD_FUNCPTR(f) if((fp_##f = wine_dlsym(jackhandle, #f, NULL, 0)) == NULL) goto sym_not_found;
- LOAD_FUNCPTR(jack_activate);
- LOAD_FUNCPTR(jack_connect);
- LOAD_FUNCPTR(jack_client_open);
- LOAD_FUNCPTR(jack_client_close);
- LOAD_FUNCPTR(jack_deactivate);
- LOAD_FUNCPTR(jack_set_process_callback);
- LOAD_FUNCPTR(jack_set_buffer_size_callback);
- LOAD_FUNCPTR(jack_set_sample_rate_callback);
- LOAD_FUNCPTR(jack_on_shutdown);
- LOAD_FUNCPTR(jack_get_sample_rate);
- LOAD_FUNCPTR(jack_port_register);
- LOAD_FUNCPTR(jack_port_get_buffer);
- LOAD_FUNCPTR(jack_get_ports);
- LOAD_FUNCPTR(jack_port_name);
- LOAD_FUNCPTR(jack_get_buffer_size);
-#undef LOAD_FUNCPTR
-
- /* start with output device */
-
- for (i = 0; i < MAX_WAVEOUTDRV; ++i)
- {
- WOutDev[i].client = 0; /* initialize the client to 0 */
-
-#if JACK_CLOSE_HACK
- WOutDev[i].in_use = FALSE;
- WInDev[i].in_use = FALSE;
-#endif
-
- memset(&WOutDev[i].caps, 0, sizeof(WOutDev[i].caps));
-
- WOutDev[i].caps.wMid = 0x00FF; /* Manufac ID */
- WOutDev[i].caps.wPid = 0x0001; /* Product ID */
- snprintf(szPname, sizeof(szPname), "JACK WaveOut %d", i);
- MultiByteToWideChar(CP_ACP, 0, szPname, -1, WOutDev[i].caps.szPname, sizeof(WOutDev[i].caps.szPname)/sizeof(WCHAR));
- snprintf(WOutDev[i].interface_name, sizeof(WOutDev[i].interface_name), "winejack: %d", i);
-
- WOutDev[i].caps.vDriverVersion = 0x0100;
- WOutDev[i].caps.dwFormats = 0x00000000;
- WOutDev[i].caps.dwSupport = WAVECAPS_VOLUME;
-
- WOutDev[i].caps.wChannels = 2;
- WOutDev[i].caps.dwSupport |= WAVECAPS_LRVOLUME;
-
-/* NOTE: we don't support any 8 bit modes so note that */
-/* WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4M08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4S08; */
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4S16;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_4M16;
-/* WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2M08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2S08; */
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2M16;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_2S16;
-/* WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M08;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S08;*/
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1M16;
- WOutDev[i].caps.dwFormats |= WAVE_FORMAT_1S16;
- }
-
- /* then do input device */
- for (i = 0; i < MAX_WAVEINDRV; ++i)
- {
- /* TODO: we should initialize read stuff here */
- memset(&WInDev[i].caps, 0, sizeof(WInDev[i].caps));
-
- WInDev[i].caps.wMid = 0x00FF;
- WInDev[i].caps.wPid = 0x0001;
- snprintf(szPname, sizeof(szPname), "JACK WaveIn %d", i);
- MultiByteToWideChar(CP_ACP, 0, szPname, -1, WInDev[i].caps.szPname, sizeof(WInDev[i].caps.szPname)/sizeof(WCHAR));
- snprintf(WInDev[i].interface_name, sizeof(WInDev[i].interface_name), "winejack: %d", i);
-
- WInDev[i].caps.vDriverVersion = 0x0100;
-
- WInDev[i].caps.wChannels = 0x2;
- /* NOTE: we don't support any 8 bit modes so note that */
-/* WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S08; */
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_4S16;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_4M16;
-/* WInDev[i].caps.dwFormats |= WAVE_FORMAT_2M08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_2S08; */
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_2M16;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_2S16;
-/* WInDev[i].caps.dwFormats |= WAVE_FORMAT_1M08;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_1S08;*/
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_1M16;
- WInDev[i].caps.dwFormats |= WAVE_FORMAT_1S16;
- WInDev[i].caps.wReserved1 = 0;
- }
-
- return 1; /* return success */
-
-/* error path for function pointer loading errors */
-sym_not_found:
- WINE_MESSAGE(
- "Wine cannot find certain functions that it needs inside the jack"
- "library. To enable Wine to use the jack audio server please "
- "install libjack\n");
- wine_dlclose(jackhandle, NULL, 0);
- jackhandle = NULL;
- return FALSE;
-}
-
-/*======================================================================*
- * Low level WAVE OUT implementation *
- *======================================================================*/
-
-/**************************************************************************
- * wodNotifyClient [internal]
- */
-static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1,
- DWORD_PTR dwParam2)
-{
- TRACE("wMsg = %04X dwParm1 = %08lX dwParam2 = %08lX\n", wMsg, dwParam1, dwParam2);
-
- switch (wMsg) {
- case WOM_OPEN:
- case WOM_CLOSE:
- case WOM_DONE:
- if (wwo->wFlags != DCB_NULL &&
- !DriverCallback(wwo->waveDesc.dwCallback, wwo->wFlags,
- (HDRVR)wwo->waveDesc.hWave, wMsg, wwo->waveDesc.dwInstance,
- dwParam1, dwParam2))
- {
- WARN("can't notify client !\n");
- return MMSYSERR_ERROR;
- }
- break;
- default:
- FIXME("Unknown callback message %u\n", wMsg);
- return MMSYSERR_INVALPARAM;
- }
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodHelper_BeginWaveHdr [internal]
- *
- * Makes the specified lpWaveHdr the currently playing wave header.
- * If the specified wave header is a begin loop and we're not already in
- * a loop, setup the loop.
- */
-static void wodHelper_BeginWaveHdr(WINE_WAVEOUT* wwo, LPWAVEHDR lpWaveHdr)
-{
- EnterCriticalSection(&wwo->access_crst);
-
- wwo->lpPlayPtr = lpWaveHdr;
-
- if (!lpWaveHdr)
- {
- LeaveCriticalSection(&wwo->access_crst);
- return;
- }
-
- if (lpWaveHdr->dwFlags & WHDR_BEGINLOOP)
- {
- if (wwo->lpLoopPtr)
- {
- WARN("Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr);
- TRACE("Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr);
- } else
- {
- TRACE("Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr);
- wwo->lpLoopPtr = lpWaveHdr;
- /* Windows does not touch WAVEHDR.dwLoops,
- * so we need to make an internal copy */
- wwo->dwLoops = lpWaveHdr->dwLoops;
- }
- }
- wwo->dwPartialOffset = 0;
-
- LeaveCriticalSection(&wwo->access_crst);
-}
-
-
-/**************************************************************************
- * wodHelper_PlayPtrNext [internal]
- *
- * Advance the play pointer to the next waveheader, looping if required.
- */
-static LPWAVEHDR wodHelper_PlayPtrNext(WINE_WAVEOUT* wwo)
-{
- LPWAVEHDR lpWaveHdr;
-
- EnterCriticalSection(&wwo->access_crst);
-
- lpWaveHdr = wwo->lpPlayPtr;
-
- wwo->dwPartialOffset = 0;
- if ((lpWaveHdr->dwFlags & WHDR_ENDLOOP) && wwo->lpLoopPtr)
- {
- /* We're at the end of a loop, loop if required */
- if (--wwo->dwLoops > 0)
- {
- wwo->lpPlayPtr = wwo->lpLoopPtr;
- } else
- {
- /* Handle overlapping loops correctly */
- if (wwo->lpLoopPtr != lpWaveHdr && (lpWaveHdr->dwFlags & WHDR_BEGINLOOP)) {
- FIXME("Correctly handled case ? (ending loop buffer also starts a new loop)\n");
- /* shall we consider the END flag for the closing loop or for
- * the opening one or for both ???
- * code assumes for closing loop only
- */
- } else
- {
- lpWaveHdr = lpWaveHdr->lpNext;
- }
- wwo->lpLoopPtr = NULL;
- wodHelper_BeginWaveHdr(wwo, lpWaveHdr);
- }
- } else
- {
- /* We're not in a loop. Advance to the next wave header */
- TRACE("not inside of a loop, advancing to next wave header\n");
- wodHelper_BeginWaveHdr(wwo, lpWaveHdr = lpWaveHdr->lpNext);
- }
-
- LeaveCriticalSection(&wwo->access_crst);
-
- return lpWaveHdr;
-}
-
-/* if force is TRUE then notify the client that all the headers were completed */
-static DWORD wodHelper_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force)
-{
- LPWAVEHDR lpWaveHdr;
- DWORD retval;
-
- TRACE("called\n");
-
- EnterCriticalSection(&wwo->access_crst);
-
- /* Start from lpQueuePtr and keep notifying until:
- * - we hit an unwritten wavehdr
- * - we hit the beginning of a running loop
- * - we hit a wavehdr which hasn't finished playing
- */
- while ((lpWaveHdr = wwo->lpQueuePtr) &&
- (force ||
- (lpWaveHdr != wwo->lpPlayPtr &&
- lpWaveHdr != wwo->lpLoopPtr)))
- {
- wwo->lpQueuePtr = lpWaveHdr->lpNext;
-
- lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
- lpWaveHdr->dwFlags |= WHDR_DONE;
- TRACE("notifying client: lpWaveHdr=(%p) lpPlayPtr=(%p) dwFlags=(%d)\n",
- lpWaveHdr, wwo->lpPlayPtr, lpWaveHdr->dwFlags);
-
- wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0);
- }
- TRACE("Not notifying client: lpWaveHdr=(%p) lpPlayPtr=(%p) lpLoopPtr=(%p)\n",
- lpWaveHdr, wwo->lpPlayPtr, wwo->lpLoopPtr);
- retval = (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr !=
- wwo->lpLoopPtr) ? 0 : INFINITE;
-
- LeaveCriticalSection(&wwo->access_crst);
-
- return retval;
-}
-
-/**************************************************************************
- * wodHelper_Reset [internal]
- *
- * Resets current output stream.
- */
-static void wodHelper_Reset(WINE_WAVEOUT* wwo, BOOL reset)
-{
- EnterCriticalSection(&wwo->access_crst);
-
- /* updates current notify list */
- wodHelper_NotifyCompletions(wwo, FALSE);
-
- if (reset)
- {
- /* remove all wave headers and notify client that all headers were completed */
- wodHelper_NotifyCompletions(wwo, TRUE);
-
- wwo->lpPlayPtr = wwo->lpQueuePtr = wwo->lpLoopPtr = NULL;
- wwo->state = WINE_WS_STOPPED;
- wwo->dwPlayedTotal = wwo->dwWrittenTotal = wwo->bytesInJack = 0;
-
- wwo->dwPartialOffset = 0; /* Clear partial wavehdr */
- } else
- {
- if (wwo->lpLoopPtr)
- {
- /* complicated case, not handled yet (could imply modifying the loop counter) */
- FIXME("Pausing while in loop isn't correctly handled yet, expect strange results\n");
- wwo->lpPlayPtr = wwo->lpLoopPtr;
- wwo->dwPartialOffset = 0;
- wwo->dwWrittenTotal = wwo->dwPlayedTotal; /* this is wrong !!! */
- } else
- {
- LPWAVEHDR ptr;
- DWORD sz = wwo->dwPartialOffset;
-
- /* reset all the data as if we had written only up to lpPlayedTotal bytes */
- /* compute the max size playable from lpQueuePtr */
- for (ptr = wwo->lpQueuePtr; ptr != wwo->lpPlayPtr; ptr = ptr->lpNext)
- {
- sz += ptr->dwBufferLength;
- }
-
- /* because the reset lpPlayPtr will be lpQueuePtr */
- if (wwo->dwWrittenTotal > wwo->dwPlayedTotal + sz) ERR("doh\n");
- wwo->dwPartialOffset = sz - (wwo->dwWrittenTotal - wwo->dwPlayedTotal);
- wwo->dwWrittenTotal = wwo->dwPlayedTotal;
- wwo->lpPlayPtr = wwo->lpQueuePtr;
- }
-
- wwo->state = WINE_WS_PAUSED;
- }
-
- LeaveCriticalSection(&wwo->access_crst);
-}
-
-/**************************************************************************
- * wodGetDevCaps [internal]
- */
-static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize)
-{
- TRACE("(%u, %p, %u);\n", wDevID, lpCaps, dwSize);
-
- if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
-
- if (wDevID >= MAX_WAVEOUTDRV)
- {
- TRACE("MAX_WAVOUTDRV reached !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- TRACE("dwSupport=(0x%x), dwFormats=(0x%x)\n", WOutDev[wDevID].caps.dwSupport, WOutDev[wDevID].caps.dwFormats);
- memcpy(lpCaps, &WOutDev[wDevID].caps, min(dwSize, sizeof(*lpCaps)));
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodOpen [internal]
- *
- * NOTE: doesn't it seem like there is a race condition if you try to open
- * the same device twice?
- */
-static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
-{
- WINE_WAVEOUT* wwo;
- DWORD retval;
-
- TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags);
- if (lpDesc == NULL)
- {
- WARN("Invalid Parameter !\n");
- return MMSYSERR_INVALPARAM;
- }
- if (wDevID >= MAX_WAVEOUTDRV) {
- TRACE("MAX_WAVOUTDRV reached !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
-#if JACK_CLOSE_HACK
- if(WOutDev[wDevID].client && WOutDev[wDevID].in_use)
-#else
- if(WOutDev[wDevID].client)
-#endif
- {
- TRACE("device %d already allocated\n", wDevID);
- return MMSYSERR_ALLOCATED;
- }
-
- /* Only the PCM format is supported so far...
- * Also we only support 16 bit mode.
- */
- if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM ||
- lpDesc->lpFormat->nChannels == 0 ||
- lpDesc->lpFormat->nSamplesPerSec == 0 ||
- lpDesc->lpFormat->wBitsPerSample != 16)
- {
- WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n",
- lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
- lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample);
- return WAVERR_BADFORMAT;
- }
-
- if (dwFlags & WAVE_FORMAT_QUERY)
- {
- TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n",
- lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
- lpDesc->lpFormat->nSamplesPerSec);
- return MMSYSERR_NOERROR;
- }
-
- wwo = &WOutDev[wDevID];
- wwo->wDevID = wDevID;
-
- /* Set things up before we call JACK_OpenWaveOutDevice because */
- /* we will start getting callbacks before JACK_OpenWaveOutDevice */
- /* even returns and we want to be initialized before then */
- wwo->state = WINE_WS_STOPPED; /* start in a stopped state */
- wwo->dwPlayedTotal = 0; /* zero out these totals */
- wwo->dwWrittenTotal = 0;
- wwo->bytesInJack = 0;
- wwo->tickCountMS = 0;
-
- /* Initialize volume to full level */
- wwo->volume_left = 100;
- wwo->volume_right = 100;
-
- InitializeCriticalSection(&wwo->access_crst); /* initialize the critical section */
- EnterCriticalSection(&wwo->access_crst);
-
- dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */
-
- wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
-
- wwo->waveDesc = *lpDesc;
- memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
-
- /* open up jack ports for this device */
- if (!JACK_OpenWaveOutDevice(&WOutDev[wDevID]))
- {
- ERR("JACK_OpenWaveOutDevice(%d) failed\n", wDevID);
- LeaveCriticalSection(&wwo->access_crst);
- DeleteCriticalSection(&wwo->access_crst); /* delete the critical section so we can initialize it again from wodOpen() */
- return MMSYSERR_ERROR; /* return unspecified error */
- }
-
- LeaveCriticalSection(&wwo->access_crst);
-
- /* display the current wave format */
- TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n",
- wwo->format.wBitsPerSample, wwo->format.wf.nAvgBytesPerSec,
- wwo->format.wf.nSamplesPerSec, wwo->format.wf.nChannels,
- wwo->format.wf.nBlockAlign);
-
- /* make sure that we have the same sample rate in our audio stream */
- /* as we do in the jack server */
- if(wwo->format.wf.nSamplesPerSec != wwo->sample_rate)
- {
- TRACE("error: jack server sample rate is '%ld', wave sample rate is '%d'\n",
- wwo->sample_rate, wwo->format.wf.nSamplesPerSec);
-
-#if JACK_CLOSE_HACK
- JACK_CloseWaveOutDevice(wwo, FALSE); /* close this device, don't force the client to close */
-#else
- JACK_CloseWaveOutDevice(wwo); /* close this device */
-#endif
- DeleteCriticalSection(&wwo->access_crst); /* delete the critical section so we can initialize it again from wodOpen() */
- return WAVERR_BADFORMAT;
- }
-
- /* check for an invalid number of bits per sample */
- if (wwo->format.wBitsPerSample == 0)
- {
- WARN("Resetting zeroed wBitsPerSample\n");
- wwo->format.wBitsPerSample = 8 *
- (wwo->format.wf.nAvgBytesPerSec /
- wwo->format.wf.nSamplesPerSec) /
- wwo->format.wf.nChannels;
- }
-
- EnterCriticalSection(&wwo->access_crst);
- retval = wodNotifyClient(wwo, WOM_OPEN, 0, 0);
- LeaveCriticalSection(&wwo->access_crst);
-
- return retval;
-}
-
-/**************************************************************************
- * wodClose [internal]
- */
-static DWORD wodClose(WORD wDevID)
-{
- DWORD ret = MMSYSERR_NOERROR;
- WINE_WAVEOUT* wwo;
-
- TRACE("(%u);\n", wDevID);
-
- if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
- {
- WARN("bad device ID !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- wwo = &WOutDev[wDevID];
- if (wwo->lpQueuePtr)
- {
- WARN("buffers still playing !\n");
- ret = WAVERR_STILLPLAYING;
- } else
- {
- /* sanity check: this should not happen since the device must have been reset before */
- if (wwo->lpQueuePtr || wwo->lpPlayPtr) ERR("out of sync\n");
-
- wwo->state = WINE_WS_CLOSED; /* mark the device as closed */
-
-#if JACK_CLOSE_HACK
- JACK_CloseWaveOutDevice(wwo, FALSE); /* close the jack device, DO NOT force the client to close */
-#else
- JACK_CloseWaveOutDevice(wwo); /* close the jack device */
-#endif
- DeleteCriticalSection(&wwo->access_crst); /* delete the critical section so we can initialize it again from wodOpen() */
-
- ret = wodNotifyClient(wwo, WOM_CLOSE, 0, 0);
- }
-
- return ret;
-}
-
-
-/**************************************************************************
- * wodWrite [internal]
- *
- */
-static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
-{
- LPWAVEHDR*wh;
- WINE_WAVEOUT *wwo;
-
- TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize);
-
- /* first, do the sanity checks... */
- if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
- {
- WARN("bad dev ID !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- wwo = &WOutDev[wDevID];
-
- if (lpWaveHdr->lpData == NULL || !(lpWaveHdr->dwFlags & WHDR_PREPARED))
- {
- TRACE("unprepared\n");
- return WAVERR_UNPREPARED;
- }
-
- if (lpWaveHdr->dwFlags & WHDR_INQUEUE)
- {
- TRACE("still playing\n");
- return WAVERR_STILLPLAYING;
- }
-
- lpWaveHdr->dwFlags &= ~WHDR_DONE;
- lpWaveHdr->dwFlags |= WHDR_INQUEUE;
- lpWaveHdr->lpNext = 0;
-
- EnterCriticalSection(&wwo->access_crst);
-
- /* insert buffer at the end of queue */
- for (wh = &(wwo->lpQueuePtr); *wh; wh = &((*wh)->lpNext));
- *wh = lpWaveHdr;
-
- if (!wwo->lpPlayPtr)
- wodHelper_BeginWaveHdr(wwo,lpWaveHdr);
- if (wwo->state == WINE_WS_STOPPED)
- wwo->state = WINE_WS_PLAYING;
- LeaveCriticalSection(&wwo->access_crst);
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodPause [internal]
- */
-static DWORD wodPause(WORD wDevID)
-{
- TRACE("(%u);!\n", wDevID);
-
- if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
- {
- WARN("bad device ID !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- TRACE("[3-PAUSING]\n");
-
- EnterCriticalSection(&(WOutDev[wDevID].access_crst));
- wodHelper_Reset(&WOutDev[wDevID], FALSE);
- LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodRestart [internal]
- */
-static DWORD wodRestart(WORD wDevID)
-{
- TRACE("(%u);\n", wDevID);
-
- if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
- {
- WARN("bad device ID !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- if (WOutDev[wDevID].state == WINE_WS_PAUSED)
- {
- EnterCriticalSection(&(WOutDev[wDevID].access_crst));
- WOutDev[wDevID].state = WINE_WS_PLAYING;
- LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
- }
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodReset [internal]
- */
-static DWORD wodReset(WORD wDevID)
-{
- TRACE("(%u);\n", wDevID);
-
- if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
- {
- WARN("bad device ID !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- EnterCriticalSection(&(WOutDev[wDevID].access_crst));
- wodHelper_Reset(&WOutDev[wDevID], TRUE);
- LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodGetPosition [internal]
- */
-static DWORD wodGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
-{
- DWORD val;
- WINE_WAVEOUT* wwo;
- DWORD elapsedMS;
-
- TRACE("(%u, %p, %u);\n", wDevID, lpTime, uSize);
-
- if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
- {
- WARN("bad device ID !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- /* if null pointer to time structure return error */
- if (lpTime == NULL) return MMSYSERR_INVALPARAM;
-
- wwo = &WOutDev[wDevID];
-
- EnterCriticalSection(&(WOutDev[wDevID].access_crst));
- val = wwo->dwPlayedTotal;
- elapsedMS = GetTickCount() - wwo->tickCountMS;
- LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
-
- /* account for the bytes played since the last JACK_Callback() */
- val+=((elapsedMS * wwo->format.wf.nAvgBytesPerSec) / 1000);
-
- return bytes_to_mmtime(lpTime, val, &wwo->format);
-}
-
-/**************************************************************************
- * wodBreakLoop [internal]
- */
-static DWORD wodBreakLoop(WORD wDevID)
-{
- TRACE("(%u);\n", wDevID);
-
- if (wDevID >= MAX_WAVEOUTDRV || !WOutDev[wDevID].client)
- {
- WARN("bad device ID !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- EnterCriticalSection(&(WOutDev[wDevID].access_crst));
-
- if (WOutDev[wDevID].state == WINE_WS_PLAYING && WOutDev[wDevID].lpLoopPtr != NULL)
- {
- /* ensure exit at end of current loop */
- WOutDev[wDevID].dwLoops = 1;
- }
-
- LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodGetVolume [internal]
- */
-static DWORD wodGetVolume(WORD wDevID, LPDWORD lpdwVol)
-{
- DWORD left, right;
-
- left = WOutDev[wDevID].volume_left;
- right = WOutDev[wDevID].volume_right;
-
- TRACE("(%u, %p);\n", wDevID, lpdwVol);
-
- *lpdwVol = ((left * 0xFFFFl) / 100) + (((right * 0xFFFFl) / 100) <<
- 16);
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodSetVolume [internal]
- */
-static DWORD wodSetVolume(WORD wDevID, DWORD dwParam)
-{
- DWORD left, right;
-
- left = (LOWORD(dwParam) * 100) / 0xFFFFl;
- right = (HIWORD(dwParam) * 100) / 0xFFFFl;
-
- TRACE("(%u, %08X);\n", wDevID, dwParam);
-
- EnterCriticalSection(&(WOutDev[wDevID].access_crst));
-
- WOutDev[wDevID].volume_left = left;
- WOutDev[wDevID].volume_right = right;
-
- LeaveCriticalSection(&(WOutDev[wDevID].access_crst));
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodGetNumDevs [internal]
- */
-static DWORD wodGetNumDevs(void)
-{
- return MAX_WAVEOUTDRV;
-}
-
-/**************************************************************************
- * wodDevInterfaceSize [internal]
- */
-static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1)
-{
- TRACE("(%u, %p)\n", wDevID, dwParam1);
-
- *dwParam1 = MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].interface_name, -1,
- NULL, 0 ) * sizeof(WCHAR);
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * wodDevInterface [internal]
- */
-static DWORD wodDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2)
-{
- if (dwParam2 >= MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].interface_name, -1,
- NULL, 0 ) * sizeof(WCHAR))
- {
- MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].interface_name, -1,
- dwParam1, dwParam2 / sizeof(WCHAR));
- return MMSYSERR_NOERROR;
- }
- return MMSYSERR_INVALPARAM;
-}
-
-/**************************************************************************
- * wodMessage (WINEJACK.7)
- */
-DWORD WINAPI JACK_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
- DWORD_PTR dwParam1, DWORD_PTR dwParam2)
-{
- TRACE("(%u, %04X, %08X, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
-
- switch (wMsg) {
- case DRVM_INIT:
- return JACK_WaveInit();
- case DRVM_EXIT:
- return JACK_WaveRelease();
- case DRVM_ENABLE:
- case DRVM_DISABLE:
- /* FIXME: Pretend this is supported */
- return 0;
- case WODM_OPEN: return wodOpen(wDevID, (LPWAVEOPENDESC)dwParam1, dwParam2);
- case WODM_CLOSE: return wodClose(wDevID);
- case WODM_WRITE: return wodWrite(wDevID, (LPWAVEHDR)dwParam1, dwParam2);
- case WODM_PAUSE: return wodPause(wDevID);
- case WODM_GETPOS: return wodGetPosition(wDevID, (LPMMTIME)dwParam1, dwParam2);
- case WODM_BREAKLOOP: return wodBreakLoop(wDevID);
- case WODM_PREPARE: return MMSYSERR_NOTSUPPORTED;
- case WODM_UNPREPARE: return MMSYSERR_NOTSUPPORTED;
- case WODM_GETDEVCAPS: return wodGetDevCaps(wDevID, (LPWAVEOUTCAPSW)dwParam1, dwParam2);
- case WODM_GETNUMDEVS: return wodGetNumDevs();
- case WODM_GETPITCH: return MMSYSERR_NOTSUPPORTED;
- case WODM_SETPITCH: return MMSYSERR_NOTSUPPORTED;
- case WODM_GETPLAYBACKRATE: return MMSYSERR_NOTSUPPORTED;
- case WODM_SETPLAYBACKRATE: return MMSYSERR_NOTSUPPORTED;
- case WODM_GETVOLUME: return wodGetVolume(wDevID, (LPDWORD)dwParam1);
- case WODM_SETVOLUME: return wodSetVolume(wDevID, dwParam1);
- case WODM_RESTART: return wodRestart(wDevID);
- case WODM_RESET: return wodReset(wDevID);
-
- case DRV_QUERYDEVICEINTERFACESIZE: return wodDevInterfaceSize (wDevID, (LPDWORD)dwParam1);
- case DRV_QUERYDEVICEINTERFACE: return wodDevInterface (wDevID, (PWCHAR)dwParam1, dwParam2);
- case DRV_QUERYDSOUNDIFACE: return wodDsCreate(wDevID, (PIDSDRIVER*)dwParam1);
- case DRV_QUERYDSOUNDDESC: return wodDsDesc(wDevID, (PDSDRIVERDESC)dwParam1);
- default:
- FIXME("unknown message %d!\n", wMsg);
- }
- return MMSYSERR_NOTSUPPORTED;
-}
-
-/*======================================================================*
- * Low level DSOUND implementation *
- *======================================================================*/
-
-typedef struct IDsDriverImpl IDsDriverImpl;
-typedef struct IDsDriverBufferImpl IDsDriverBufferImpl;
-
-struct IDsDriverImpl
-{
- /* IUnknown fields */
- const IDsDriverVtbl *lpVtbl;
- DWORD ref;
- /* IDsDriverImpl fields */
- UINT wDevID;
- IDsDriverBufferImpl*primary;
-};
-
-struct IDsDriverBufferImpl
-{
- /* IUnknown fields */
- const IDsDriverBufferVtbl *lpVtbl;
- DWORD ref;
- /* IDsDriverBufferImpl fields */
- IDsDriverImpl* drv;
- DWORD buflen;
-};
-
-static DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv)
-{
- /* we can't perform memory mapping as we don't have a file stream
- interface with jack like we do with oss */
- MESSAGE("This sound card's driver does not support direct access\n");
- MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n");
- return MMSYSERR_NOTSUPPORTED;
-}
-
-static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc)
-{
- memset(desc, 0, sizeof(*desc));
- strcpy(desc->szDesc, "Wine jack DirectSound Driver");
- strcpy(desc->szDrvname, "winejack.drv");
- return MMSYSERR_NOERROR;
-}
-
-/*======================================================================*
- * Low level WAVE IN implementation *
- *======================================================================*/
-
-/**************************************************************************
- * widNotifyClient [internal]
- */
-static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1,
- DWORD_PTR dwParam2)
-{
- TRACE("wMsg = %04X dwParm1 = %08lX dwParam2 = %08lX\n", wMsg, dwParam1, dwParam2);
-
- switch (wMsg) {
- case WIM_OPEN:
- case WIM_CLOSE:
- case WIM_DATA:
- if (wwi->wFlags != DCB_NULL &&
- !DriverCallback(wwi->waveDesc.dwCallback, wwi->wFlags,
- (HDRVR)wwi->waveDesc.hWave, wMsg, wwi->waveDesc.dwInstance,
- dwParam1, dwParam2))
- {
- WARN("can't notify client !\n");
- return MMSYSERR_ERROR;
- }
- break;
- default:
- FIXME("Unknown callback message %u\n", wMsg);
- return MMSYSERR_INVALPARAM;
- }
- return MMSYSERR_NOERROR;
-}
-
-/******************************************************************
- * JACK_callback_wwi
- */
-/* everytime the jack server wants something from us it calls this
- function */
-static int JACK_callback_wwi (nframes_t nframes, void *arg)
-{
- sample_t* in_l;
- sample_t* in_r = 0;
- WINE_WAVEIN* wwi = arg;
-
- TRACE("wDevID: %u, nframes %u\n", wwi->wDevID, nframes);
-
- if(!wwi->client)
- ERR("client is closed, this is weird...\n");
-
- in_l = fp_jack_port_get_buffer(wwi->in_port_l, nframes);
-
- if (wwi->in_port_r)
- in_r = fp_jack_port_get_buffer(wwi->in_port_r, nframes);
-
- EnterCriticalSection(&wwi->access_crst);
-
- if((wwi->lpQueuePtr != NULL) && (wwi->state == WINE_WS_PLAYING))
- {
- LPWAVEHDR lpWaveHdr = wwi->lpQueuePtr;
- nframes_t jackFramesLeft = nframes;
-
-#if JACK_CLOSE_HACK
- if(wwi->in_use == FALSE)
- {
- /* do nothing if nothing is being recorded */
- LeaveCriticalSection(&wwi->access_crst);
- return 0;
- }
-#endif
-
- TRACE("wwi.state == WINE_WS_PLAYING\n");
-
- while (lpWaveHdr && jackFramesLeft)
- {
- DWORD waveHdrFramesLeft = (lpWaveHdr->dwBufferLength - lpWaveHdr->dwBytesRecorded) / (sizeof(short) * wwi->format.wf.nChannels);
- DWORD numFrames = min (jackFramesLeft, waveHdrFramesLeft);
-
- TRACE ("dwBufferLength=(%u) dwBytesRecorded=(%d)\n", lpWaveHdr->dwBufferLength, lpWaveHdr->dwBytesRecorded);
- TRACE ("jackFramesLeft=(%u) waveHdrFramesLeft=(%u)\n", jackFramesLeft, waveHdrFramesLeft);
-
- if (!in_r) {
- /* mono */
- sample_move_s16_d16((short *)((char *)lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded), in_l+(nframes-jackFramesLeft), numFrames, 1);
- } else {
- /* stereo */
- sample_move_s16_d16((short *)((char *)lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded),
- in_l+(nframes-jackFramesLeft), numFrames, 2);
- sample_move_s16_d16((short *)((char *)lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded + sizeof(short)),
- in_r+(nframes-jackFramesLeft), numFrames, 2);
- }
-
- lpWaveHdr->dwBytesRecorded += (numFrames * sizeof(short) * wwi->format.wf.nChannels );
- jackFramesLeft -= numFrames;
-
- if (lpWaveHdr->dwBytesRecorded >= lpWaveHdr->dwBufferLength)
- {
- /* must copy the value of next waveHdr, because we have no idea of what
- * will be done with the content of lpWaveHdr in callback
- */
- LPWAVEHDR lpNext = lpWaveHdr->lpNext;
-
- lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
- lpWaveHdr->dwFlags |= WHDR_DONE;
-
- TRACE("WaveHdr full. dwBytesRecorded=(%u) dwFlags=(0x%x)\n",lpWaveHdr->dwBytesRecorded,lpWaveHdr->dwFlags);
-
- widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
-
- lpWaveHdr = wwi->lpQueuePtr = lpNext;
- }
- }
- TRACE ("jackFramesLeft=(%u) lpWaveHdr=(%p)\n", jackFramesLeft, lpWaveHdr);
- if (jackFramesLeft > 0) { WARN("Record buffer ran out of WaveHdrs\n"); }
- }
-
- LeaveCriticalSection(&wwi->access_crst);
-
- return 0;
-}
-
-/******************************************************************
- * JACK_OpenWaveInDevice
- */
-static int JACK_OpenWaveInDevice(WINE_WAVEIN* wwi, WORD nChannels)
-{
- const char** ports;
- int i;
- char client_name[64];
- jack_port_t* in_port_l;
- jack_port_t* in_port_r = 0;
- jack_client_t* client;
- int failed = 0;
-
- TRACE("creating jack client and setting up callbacks\n");
-
- if ((nChannels == 0) || (nChannels > 2)) {
- ERR ("nChannels = (%d), but we only support mono or stereo.\n", nChannels);
- return 0;
- }
-
-#if JACK_CLOSE_HACK
- /* see if this device is already open */
- if(wwi->client)
- {
- /* if this device is already in use then it is bad for us to be in here */
- if(wwi->in_use)
- return 0;
-
- TRACE("using existing client\n");
- wwi->in_use = TRUE;
- return 1;
- }
-#endif
-
- /* zero out the buffer pointer and the size of the buffer */
- wwi->sound_buffer = 0;
- wwi->buffer_size = 0;
-
- /* try to become a client of the JACK server */
- snprintf(client_name, sizeof(client_name), "wine_jack_in_%d", wwi->wDevID);
- TRACE("client name '%s'\n", client_name);
- if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0)
- {
- /* jack has problems with shutting down clients, so lets */
- /* wait a short while and try once more before we give up */
- Sleep(250);
- if ((client = fp_jack_client_open (client_name, JackUseExactName, NULL)) == 0)
- {
- ERR("jack server not running?\n");
- return 0;
- }
- }
- wwi->client = client;
-
- /* tell the JACK server to call `JACK_wwi_callback()' whenever
- there is work to be done. */
- fp_jack_set_process_callback (client, JACK_callback_wwi, wwi);
-
- /* tell the JACK server to call `JACK_bufsize_wwi()' whenever
- the maximum number of frames that will be passed
- to `JACK_Callback()' changes */
- fp_jack_set_buffer_size_callback (client, JACK_bufsize_wwi, wwi);
-
- /* tell the JACK server to call `srate()' whenever
- the sample rate of the system changes. */
- fp_jack_set_sample_rate_callback (client, JACK_srate, wwi);
-
- /* tell the JACK server to call `jack_shutdown()' if
- it ever shuts down, either entirely, or if it
- just decides to stop calling us. */
- fp_jack_on_shutdown (client, JACK_shutdown_wwi, wwi);
-
- /* display the current sample rate. once the client is activated
- (see below), you should rely on your own sample rate
- callback (see above) for this value. */
- wwi->sample_rate = fp_jack_get_sample_rate(client);
- TRACE("engine sample rate: %lu\n", wwi->sample_rate);
-
- /* create the left and right channel output ports */
- /* jack's ports are all mono so for stereo you need two */
- in_port_l = fp_jack_port_register (client, "in_l",
- JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
- wwi->in_port_l = in_port_l;
- TRACE("Created port. (%p)\n", in_port_l);
-
- if (nChannels == 2)
- {
- in_port_r = fp_jack_port_register (client, "in_r",
- JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
- TRACE("Created port. (%p)\n", in_port_r);
- }
- wwi->in_port_r = in_port_r;
-
-#if JACK_CLOSE_HACK
- wwi->in_use = TRUE; /* mark this device as in use since it now is ;-) */
-#endif
-
- TRACE("activating client.\n");
- /* tell the JACK server that we are ready to roll */
- if (fp_jack_activate (client))
- {
- ERR( "cannot activate client\n");
- return 0;
- }
- TRACE("activated client.\n");
- /* figure out what the ports that we want to output on are */
- /* NOTE: we do this instead of using stuff like "alsa_pcm:playback_X" because */
- /* this way works if names are changed */
- ports = fp_jack_get_ports(client, NULL, NULL, JackPortIsPhysical|JackPortIsOutput);
-
- /* display a trace of the output ports we found */
- for(i = 0; ports[i]; i++)
- {
- TRACE("ports[%d] = '%s'\n", i, ports[i]);
- }
-
- if(!ports)
- {
- ERR("jack_get_ports() failed to find 'JackPortIsPhysical|JackPortIsOutput'\n");
- }
-
- /* connect the ports. Note: you can't do this before
- the client is activated (this may change in the future).
- */
- /* we want to connect to two ports so we have stereo input ;-) */
-
- if(fp_jack_connect(client, ports[0], fp_jack_port_name(in_port_l)))
- {
- ERR ("cannot connect to input port %d('%s')\n", 0, ports[0]);
- failed = 1;
- }
- TRACE("Connected (%s)<->(%s)\n",ports[0],fp_jack_port_name(in_port_l));
-
- if ((nChannels == 2) && in_port_r) {
- if(fp_jack_connect(client, ports[1], fp_jack_port_name(in_port_r)))
- {
- ERR ("cannot connect to input port %d('%s')\n", 1, ports[1]);
- failed = 1;
- }
- TRACE("Connected (%s)<->(%s)\n",ports[1],fp_jack_port_name(in_port_r));
- }
- free(ports); /* free the returned array of ports */
-
- /* if something failed we need to shut the client down and return 0 */
- if(failed)
- {
-#if JACK_CLOSE_HACK
- JACK_CloseWaveInDevice(wwi, TRUE);
-#else
- JACK_CloseWaveInDevice(wwi);
-#endif
- return 0;
- }
-
- TRACE("return success.\n");
- return 1; /* return success */
-}
-
-/**************************************************************************
- * widGetDevCaps [internal]
- */
-static DWORD widGetDevCaps(WORD wDevID, LPWAVEINCAPSW lpCaps, DWORD dwSize)
-{
- TRACE("(%u, %p, %u);\n", wDevID, lpCaps, dwSize);
-
- if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
-
- if (wDevID >= MAX_WAVEINDRV) {
- TRACE("MAX_WAVEINDRV reached !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- memcpy(lpCaps, &WInDev[wDevID].caps, min(dwSize, sizeof(*lpCaps)));
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * widOpen [internal]
- */
-static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
-{
- WINE_WAVEIN* wwi;
- DWORD retval;
-
- TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags);
- if (lpDesc == NULL)
- {
- WARN("Invalid Parameter !\n");
- return MMSYSERR_INVALPARAM;
- }
- if (wDevID >= MAX_WAVEINDRV) {
- TRACE ("MAX_WAVEINDRV reached !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
-#if JACK_CLOSE_HACK
- if(WInDev[wDevID].client && WOutDev[wDevID].in_use)
-#else
- if(WInDev[wDevID].client)
-#endif
- {
- TRACE("device %d already allocated\n", wDevID);
- return MMSYSERR_ALLOCATED;
- }
-
- /* Only the PCM format is supported so far...
- * Also we only support 16 bit mode.
- */
- if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM ||
- lpDesc->lpFormat->nChannels == 0 ||
- lpDesc->lpFormat->nSamplesPerSec == 0 ||
- lpDesc->lpFormat->wBitsPerSample!=16)
- {
- WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n",
- lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
- lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample);
- return WAVERR_BADFORMAT;
- }
-
- if (dwFlags & WAVE_FORMAT_QUERY)
- {
- TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n",
- lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
- lpDesc->lpFormat->nSamplesPerSec);
- return MMSYSERR_NOERROR;
- }
-
- wwi = &WInDev[wDevID];
- wwi->wDevID = wDevID;
-
- /* Set things up before we call JACK_OpenWaveOutDevice because */
- /* we will start getting callbacks before JACK_OpenWaveOutDevice */
- /* even returns and we want to be initialized before then */
- wwi->state = WINE_WS_STOPPED; /* start in a stopped state */
-
- InitializeCriticalSection(&wwi->access_crst); /* initialize the critical section */
- EnterCriticalSection(&wwi->access_crst);
-
- /* open up jack ports for this device */
- if (!JACK_OpenWaveInDevice(&WInDev[wDevID], lpDesc->lpFormat->nChannels))
- {
- ERR("JACK_OpenWaveInDevice(%d) failed\n", wDevID);
- LeaveCriticalSection(&wwi->access_crst);
- DeleteCriticalSection(&wwi->access_crst);
- return MMSYSERR_ERROR; /* return unspecified error */
- }
-
- dwFlags &= ~WAVE_DIRECTSOUND; /* direct sound not supported, ignore the flag */
-
- wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
-
- wwi->waveDesc = *lpDesc;
- memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
-
- LeaveCriticalSection(&wwi->access_crst);
-
- /* display the current wave format */
- TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n",
- wwi->format.wBitsPerSample, wwi->format.wf.nAvgBytesPerSec,
- wwi->format.wf.nSamplesPerSec, wwi->format.wf.nChannels,
- wwi->format.wf.nBlockAlign);
-
- /* make sure that we have the same sample rate in our audio stream */
- /* as we do in the jack server */
- if(wwi->format.wf.nSamplesPerSec != wwi->sample_rate)
- {
- TRACE("error: jack server sample rate is '%ld', wave sample rate is '%d'\n",
- wwi->sample_rate, wwi->format.wf.nSamplesPerSec);
-
-#if JACK_CLOSE_HACK
- JACK_CloseWaveInDevice(wwi, FALSE); /* close this device, don't force the client to close */
-#else
- JACK_CloseWaveInDevice(wwi); /* close this device */
-#endif
- DeleteCriticalSection(&wwi->access_crst);
- return WAVERR_BADFORMAT;
- }
-
- /* check for an invalid number of bits per sample */
- if (wwi->format.wBitsPerSample == 0)
- {
- WARN("Resetting zeroed wBitsPerSample\n");
- wwi->format.wBitsPerSample = 8 *
- (wwi->format.wf.nAvgBytesPerSec /
- wwi->format.wf.nSamplesPerSec) /
- wwi->format.wf.nChannels;
- }
-
- TRACE("notify client.\n");
- EnterCriticalSection(&wwi->access_crst);
- retval = widNotifyClient(wwi, WIM_OPEN, 0, 0);
- LeaveCriticalSection(&wwi->access_crst);
-
- return retval;
-}
-/**************************************************************************
- * widClose [internal]
- */
-static DWORD widClose(WORD wDevID)
-{
- DWORD ret = MMSYSERR_NOERROR;
- WINE_WAVEIN* wwi;
-
- TRACE("(%u);\n", wDevID);
-
- if (wDevID >= MAX_WAVEINDRV || !WInDev[wDevID].client)
- {
- WARN("bad device ID !\n");
- return MMSYSERR_BADDEVICEID;
- }
-
- wwi = &WInDev[wDevID];
- if (wwi->lpQueuePtr)
- {
- WARN("buffers still playing !\n");
- ret = WAVERR_STILLPLAYING;
- } else
- {
- /* sanity check: this should not happen since the device must have been reset before */
- if (wwi->lpQueuePtr) ERR("out of sync\n");
-
- wwi->state = WINE_WS_CLOSED; /* mark the device as closed */
-
-#if JACK_CLOSE_HACK
- JACK_CloseWaveInDevice(wwi, FALSE); /* close the jack device, DO NOT force the client to close */
-#else
- JACK_CloseWaveInDevice(wwi); /* close the jack device */
-#endif
- DeleteCriticalSection(&wwi->access_crst); /* delete the critical section so we can initialize it again from wodOpen() */
-
- ret = widNotifyClient(wwi, WIM_CLOSE, 0, 0);
- }
-
- return ret;
-}
-
-/**************************************************************************
- * widAddBuffer [internal]
- */
-static DWORD widAddBuffer(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
-{
- WINE_WAVEIN* wwi = &WInDev[wDevID];
-
- TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize);
-
- if (wDevID >= MAX_WAVEINDRV || WInDev[wDevID].state == WINE_WS_CLOSED) {
- WARN("can't do it !\n");
- return MMSYSERR_INVALHANDLE;
- }
- if (!(lpWaveHdr->dwFlags & WHDR_PREPARED)) {
- TRACE("never been prepared !\n");
- return WAVERR_UNPREPARED;
- }
- if (lpWaveHdr->dwFlags & WHDR_INQUEUE) {
- TRACE("header already in use !\n");
- return WAVERR_STILLPLAYING;
- }
-
- lpWaveHdr->dwFlags |= WHDR_INQUEUE;
- lpWaveHdr->dwFlags &= ~WHDR_DONE;
- lpWaveHdr->dwBytesRecorded = 0;
- lpWaveHdr->lpNext = NULL;
-
- EnterCriticalSection(&wwi->access_crst);
- /* insert buffer at end of queue */
- {
- LPWAVEHDR* wh;
- for (wh = &(wwi->lpQueuePtr); *wh; wh = &((*wh)->lpNext));
- *wh=lpWaveHdr;
- }
- LeaveCriticalSection(&wwi->access_crst);
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * widStart [internal]
- */
-static DWORD widStart(WORD wDevID)
-{
- TRACE("(%u);\n", wDevID);
- if (wDevID >= MAX_WAVEINDRV || WInDev[wDevID].state == WINE_WS_CLOSED) {
- WARN("can't start recording !\n");
- return MMSYSERR_INVALHANDLE;
- }
-
- WInDev[wDevID].state = WINE_WS_PLAYING;
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * widStop [internal]
- */
-static DWORD widStop(WORD wDevID)
-{
- WINE_WAVEIN* wwi = &WInDev[wDevID];
-
- TRACE("(%u);\n", wDevID);
- if (wDevID >= MAX_WAVEINDRV || WInDev[wDevID].state == WINE_WS_CLOSED) {
- WARN("can't stop !\n");
- return MMSYSERR_INVALHANDLE;
- }
-
- if (wwi->state != WINE_WS_STOPPED)
- {
- WAVEHDR* lpWaveHdr;
- /* do something here to stop recording ??? */
-
- /* return current buffer to app */
- lpWaveHdr = wwi->lpQueuePtr;
- if (lpWaveHdr)
- {
- LPWAVEHDR lpNext = lpWaveHdr->lpNext;
- TRACE("stop %p %p\n", lpWaveHdr, lpWaveHdr->lpNext);
- lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
- lpWaveHdr->dwFlags |= WHDR_DONE;
- widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
- wwi->lpQueuePtr = lpNext;
- }
- }
- wwi->state = WINE_WS_STOPPED;
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * widReset [internal]
- */
-static DWORD widReset(WORD wDevID)
-{
- WINE_WAVEIN* wwi = &WInDev[wDevID];
- WAVEHDR* lpWaveHdr;
-
- TRACE("(%u);\n", wDevID);
- if (wDevID >= MAX_WAVEINDRV || WInDev[wDevID].state == WINE_WS_CLOSED) {
- WARN("can't reset !\n");
- return MMSYSERR_INVALHANDLE;
- }
-
- wwi->state = WINE_WS_STOPPED;
-
- /* return all buffers to the app */
- for (lpWaveHdr = wwi->lpQueuePtr; lpWaveHdr; lpWaveHdr = lpWaveHdr->lpNext) {
- TRACE("reset %p %p\n", lpWaveHdr, lpWaveHdr->lpNext);
- lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
- lpWaveHdr->dwFlags |= WHDR_DONE;
-
- widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
- }
- wwi->lpQueuePtr = NULL;
-
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * widGetNumDevs [internal]
- */
-static DWORD widGetNumDevs(void)
-{
- return MAX_WAVEINDRV;
-}
-
-/**************************************************************************
- * widDevInterfaceSize [internal]
- */
-static DWORD widDevInterfaceSize(UINT wDevID, LPDWORD dwParam1)
-{
- TRACE("(%u, %p)\n", wDevID, dwParam1);
-
-
- *dwParam1 = MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1,
- NULL, 0 ) * sizeof(WCHAR);
- return MMSYSERR_NOERROR;
-}
-
-/**************************************************************************
- * widDevInterface [internal]
- */
-static DWORD widDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2)
-{
- if (dwParam2 >= MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1,
- NULL, 0 ) * sizeof(WCHAR))
- {
- MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1,
- dwParam1, dwParam2 / sizeof(WCHAR));
- return MMSYSERR_NOERROR;
- }
- return MMSYSERR_INVALPARAM;
-}
-
-/**************************************************************************
- * widMessage (WINEJACK.6)
- */
-DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
- DWORD_PTR dwParam1, DWORD_PTR dwParam2)
-{
- TRACE("(%u, %04X, %08X, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
-
- switch (wMsg) {
- case DRVM_INIT:
- return JACK_WaveInit();
- case DRVM_EXIT:
- return JACK_WaveRelease();
- case DRVM_ENABLE:
- case DRVM_DISABLE:
- /* FIXME: Pretend this is supported */
- return 0;
- case WIDM_OPEN: return widOpen (wDevID, (LPWAVEOPENDESC)dwParam1, dwParam2);
- case WIDM_CLOSE: return widClose (wDevID);
- case WIDM_ADDBUFFER: return widAddBuffer (wDevID, (LPWAVEHDR)dwParam1, dwParam2);
- case WIDM_PREPARE: return MMSYSERR_NOTSUPPORTED;
- case WIDM_UNPREPARE: return MMSYSERR_NOTSUPPORTED;
- case WIDM_GETDEVCAPS: return widGetDevCaps (wDevID, (LPWAVEINCAPSW)dwParam1, dwParam2);
- case WIDM_GETNUMDEVS: return widGetNumDevs();
- case WIDM_RESET: return widReset (wDevID);
- case WIDM_START: return widStart (wDevID);
- case WIDM_STOP: return widStop (wDevID);
- case DRV_QUERYDEVICEINTERFACESIZE: return widDevInterfaceSize (wDevID, (LPDWORD)dwParam1);
- case DRV_QUERYDEVICEINTERFACE: return widDevInterface (wDevID, (PWCHAR)dwParam1, dwParam2);
- default:
- FIXME("unknown message %d!\n", wMsg);
- }
-
- return MMSYSERR_NOTSUPPORTED;
-}
-
-/**************************************************************************
- * DriverProc (WINEJACK.1)
- */
-LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
- LPARAM dwParam1, LPARAM dwParam2)
-{
- TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n",
- dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" :
- wMsg == DRV_FREE ? "DRV_FREE" :
- wMsg == DRV_OPEN ? "DRV_OPEN" :
- wMsg == DRV_CLOSE ? "DRV_CLOSE" :
- wMsg == DRV_ENABLE ? "DRV_ENABLE" :
- wMsg == DRV_DISABLE ? "DRV_DISABLE" :
- wMsg == DRV_QUERYCONFIGURE ? "DRV_QUERYCONFIGURE" :
- wMsg == DRV_CONFIGURE ? "DRV_CONFIGURE" :
- wMsg == DRV_INSTALL ? "DRV_INSTALL" :
- wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN",
- wMsg, dwParam1, dwParam2);
-
- switch(wMsg) {
- case DRV_LOAD:
- jackhandle = wine_dlopen(SONAME_LIBJACK, RTLD_NOW, NULL, 0);
- if (!jackhandle)
- {
- FIXME("error loading the jack library %s, please install this library to use jack\n",
- SONAME_LIBJACK);
- return 0;
- }
- return 1;
- case DRV_FREE:
- if (jackhandle)
- {
- TRACE("calling wine_dlclose() on jackhandle\n");
- wine_dlclose(jackhandle, NULL, 0);
- jackhandle = NULL;
- }
- return 1;
- case DRV_OPEN:
- case DRV_CLOSE:
- case DRV_INSTALL:
- case DRV_REMOVE:
- case DRV_ENABLE:
- case DRV_DISABLE:
- case DRV_QUERYCONFIGURE:
- return 1;
- case DRV_CONFIGURE: MessageBoxA(0, "jack audio driver!", "jack driver", MB_OK); return 1;
- default:
- return 0;
- }
-}
diff --git a/dlls/winejack.drv/winejack.drv.spec b/dlls/winejack.drv/winejack.drv.spec
deleted file mode 100644
index aa8bc4f..0000000
--- a/dlls/winejack.drv/winejack.drv.spec
+++ /dev/null
@@ -1,3 +0,0 @@
-@ stdcall -private DriverProc(long long long long long) JACK_DriverProc
-@ stdcall -private widMessage(long long long long long) JACK_widMessage
-@ stdcall -private wodMessage(long long long long long) JACK_wodMessage
diff --git a/include/config.h.in b/include/config.h.in
index 788482a..26528b7 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -299,9 +299,6 @@
/* Define to 1 if you have the `isnan' function. */
#undef HAVE_ISNAN
-/* Define to 1 if you have the <jack/jack.h> header file. */
-#undef HAVE_JACK_JACK_H
-
/* Define to 1 if you have the <jpeglib.h> header file. */
#undef HAVE_JPEGLIB_H
@@ -1235,9 +1232,6 @@
/* Define to the soname of the libhal library. */
#undef SONAME_LIBHAL
-/* Define to the soname of the libjack library. */
-#undef SONAME_LIBJACK
-
/* Define to the soname of the libjpeg library. */
#undef SONAME_LIBJPEG
diff --git a/po/ar.po b/po/ar.po
index 7fa726f..5aa26a2 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -161,7 +161,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -10121,184 +10121,180 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "احفظ &ك..."
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "الم&حتويات"
-#: winecfg.rc:121
+#: winecfg.rc:120
#, fuzzy
msgid "Menu Background"
msgstr "احفظ &ك..."
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "احفظ &ك..."
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "اختر ال&كل\tCtrl+A"
-#: winecfg.rc:126
+#: winecfg.rc:125
#, fuzzy
msgid "ToolTip Background"
msgstr "احفظ &ك..."
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
#, fuzzy
msgid "Window Background"
msgstr "احفظ &ك..."
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr ""
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index f951290..122b2bf 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -168,7 +168,7 @@
msgid "System Path"
msgstr "Системен път"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10354,46 +10354,42 @@
msgstr "OSS Driver"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK Driver"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio Driver"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Couldn't open %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Sound Drivers"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out Devices"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave In Devices"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out Devices"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI In Devices"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux Devices"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer Devices"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10403,142 +10399,142 @@
"\n"
"Remove \"%s\" from registry?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Warning"
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "&Копирай фона"
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "Control"
-#: winecfg.rc:121
+#: winecfg.rc:120
#, fuzzy
msgid "Menu Background"
msgstr "&Копирай фона"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
#, fuzzy
msgid "Scrollbar"
msgstr "Превърти тук"
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "Постави като &фон на работния плот"
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "Маркирай &всичко"
-#: winecfg.rc:126
+#: winecfg.rc:125
#, fuzzy
msgid "ToolTip Background"
msgstr "&Копирай фона"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
#, fuzzy
msgid "Window Background"
msgstr "&Копирай фона"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr ""
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "Приложения"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "Control Panel"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
#, fuzzy
msgid "Controls Light"
msgstr "Control"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index cf92b88..45eb660 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -161,7 +161,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -10011,179 +10011,175 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr ""
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "Seleccionar &tot el text"
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "Seleccionar &tot el text"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr ""
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index d4c931d..02c79f3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -181,7 +181,7 @@
msgid "System Path"
msgstr "Systémový adresář"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10803,46 +10803,42 @@
msgstr "Ovladač OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Ovladač JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Ovladač CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Nemohu otevřít %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Ovladače zvuku"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Zařízení Wave Výstup"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Zařízení Wave Vstup"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Zařízení MIDI Výstup"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Zařízení MIDI Vstup"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Zařízení Aux"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Zařízení Míchání"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10852,142 +10848,142 @@
"\n"
"Odstranit “%s” z registru?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Varování"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Pozadí ovládacích prvků"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Písmo ovládacích prvků"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Pozadí menu"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Písmo menu"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Rolovací pruh"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Pozadí výběru"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Písmo výběru"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Pozadí tipu"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Písmo tipu"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Pozadí okna"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Písmo okna"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Pozadí titulku aktivního okna"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Písmo titulku aktivního okna"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Pozadí titulku neaktivného okna"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Písmo titulku neaktivního okna"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "Programy"
-#: winecfg.rc:136
+#: winecfg.rc:135
#, fuzzy
msgid "Window Frame"
msgstr "Písmo okna"
-#: winecfg.rc:137
+#: winecfg.rc:136
#, fuzzy
msgid "Active Border"
msgstr "Pozadí titulku aktivního okna"
-#: winecfg.rc:138
+#: winecfg.rc:137
#, fuzzy
msgid "Inactive Border"
msgstr "Pozadí titulku neaktivného okna"
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "Pozadí ovládacích prvků"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
#, fuzzy
msgid "Controls Highlight"
msgstr "Písmo ovládacích prvků"
-#: winecfg.rc:142
+#: winecfg.rc:141
#, fuzzy
msgid "Controls Dark Shadow"
msgstr "Pozadí ovládacích prvků"
-#: winecfg.rc:143
+#: winecfg.rc:142
#, fuzzy
msgid "Controls Light"
msgstr "Písmo ovládacích prvků"
-#: winecfg.rc:144
+#: winecfg.rc:143
#, fuzzy
msgid "Controls Alternate Background"
msgstr "Pozadí ovládacích prvků"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
#, fuzzy
msgid "Active Title Bar Gradient"
msgstr "Pozadí titulku aktivního okna"
-#: winecfg.rc:147
+#: winecfg.rc:146
#, fuzzy
msgid "Inactive Title Bar Gradient"
msgstr "Pozadí titulku neaktivného okna"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
#, fuzzy
msgid "Menu Bar"
msgstr "Pozadí menu"
diff --git a/po/da.po b/po/da.po
index d7fe2ff..a5069d7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -183,7 +183,7 @@
msgid "System Path"
msgstr "System sti"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10863,46 +10863,42 @@
msgstr "OSS-driver"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK-driver"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio-driver"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Kunne ikke åbne %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "lyddrivere"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Lyd ud enheder"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Lyd ind enheder"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI ud enheder"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI ind enheder"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux enheder"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixerenheder"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10912,131 +10908,131 @@
"\n"
"Fjern %s fra registrering databasen?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Advarsel"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Controls baggrund"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Controls tekst"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Menubaggrund"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Menutekst"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Scrollbar"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Markeret baggrund"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Markeret tekst"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Baggrund i værktøjstip"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Tekst i værktøjstip"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "vinduesbaggrund"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "vinduestekst"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Aktiv titellinie"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Aktiv titeltekst"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Inaktiv titellinie"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Inaktiv titeltekst"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Meldingsvinduestekst"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Arbejdsområde i program"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Vinduesramme"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Aktiv kant"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Inaktiv kant"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Controls skygge"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Grå tekst"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Markeret controls"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Controls mørk skygge"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Controls lys"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Baggrund for skiftende controls"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Markeret element"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Gradient for aktiv titellinie"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Gradient for Inaktiv titellinie"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Markeret menu"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menulinie"
diff --git a/po/de.po b/po/de.po
index 14930ab..5cbcd5f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -177,7 +177,7 @@
msgid "System Path"
msgstr "System Ordner"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10821,46 +10821,42 @@
msgstr "OSS-Treiber"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK-Treiber"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio-Treiber"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Konnte %s nicht öffnen!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Sound_Treiber"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave-Ausgabe-Geräte"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave-Eingabe-Geräte"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI-Ausgabe-Geräte"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI-Eingabe-Geräte"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux-Geräte"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer-Geräte"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10870,131 +10866,131 @@
"\n"
"Soll „%s“ aus der Registry entfernt werden?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Warnung"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Steuerelementhintergrund"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Steuerelementtext"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Menühintergrund"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Menütext"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Bildlaufleiste"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Auswahlhintergrund"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Auswahltext"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "ToolTip-Hintergrund"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "ToolTip-Text"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Fensterhintergrund"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Fenstertext"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Aktive Titelleiste"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Aktiver Titelleistentext"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Inaktive Titelleiste"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Inaktiver Titelleistentext"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Message Box Text"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Anwendungsarbeitsplatz"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Fensterrahmen"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Aktiver Rand"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Inaktiver Rand"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Steuerelementschatten"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Grauer Text"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Steuerelementhervorhebung"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Dunkler Steuerelementschatten"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Steuerelementerhellung"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Alternativer Steuerelementhintergrund"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Heiß verfolgtes Element"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Gradient der aktiven Titelleiste"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Gradient der inaktiven Titelleiste"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menühervorhebung"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menütitelleiste"
diff --git a/po/el.po b/po/el.po
index 98d1e7a..aa073c8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -163,7 +163,7 @@
msgid "System Path"
msgstr "System Path"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10149,179 +10149,175 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "&Περιεχόμενα"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr ""
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr ""
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "Επιλογές"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/en.po b/po/en.po
index c234c63..ac6881d 100644
--- a/po/en.po
+++ b/po/en.po
@@ -163,7 +163,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr "Desktop"
@@ -10362,177 +10362,173 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Couldn't open %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out Devices"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out Devices"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Controls Background"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Controls Text"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Menu Background"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Menu Text"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Scrollbar"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Selection Background"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Selection Text"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "ToolTip Background"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "ToolTip Text"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Window Background"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Window Text"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Active Title Bar"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Active Title Text"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Inactive Title Bar"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Inactive Title Text"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Message Box Text"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Application Workspace"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Window Frame"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Active Border"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Inactive Border"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Controls Shadow"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Grey Text"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Controls Highlight"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Controls Dark Shadow"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Controls Light"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Controls Alternate Background"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Hot Tracked Item"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Active Title Bar Gradient"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Inactive Title Bar Gradient"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menu Highlight"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menu Bar"
diff --git a/po/en_US.po b/po/en_US.po
index bca5fcc..883b0e0 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -167,7 +167,7 @@
msgid "System Path"
msgstr "System Path"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr "Desktop"
@@ -10510,46 +10510,42 @@
msgstr "OSS Driver"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK Driver"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio Driver"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Couldn't open %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Sound Drivers"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out Devices"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave In Devices"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out Devices"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI In Devices"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux Devices"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer Devices"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10559,131 +10555,131 @@
"\n"
"Remove '%s' from registry?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Warning"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Controls Background"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Controls Text"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Menu Background"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Menu Text"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Scrollbar"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Selection Background"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Selection Text"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "ToolTip Background"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "ToolTip Text"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Window Background"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Window Text"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Active Title Bar"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Active Title Text"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Inactive Title Bar"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Inactive Title Text"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Message Box Text"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Application Workspace"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Window Frame"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Active Border"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Inactive Border"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Controls Shadow"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Gray Text"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Controls Highlight"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Controls Dark Shadow"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Controls Light"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Controls Alternate Background"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Hot Tracked Item"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Active Title Bar Gradient"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Inactive Title Bar Gradient"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menu Highlight"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menu Bar"
diff --git a/po/eo.po b/po/eo.po
index 4796a31..a06947e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -168,7 +168,7 @@
msgid "System Path"
msgstr "Sistemvojo"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10322,186 +10322,182 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "Control Panel"
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "Control Panel"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
#, fuzzy
msgid "Scrollbar"
msgstr "&Ruliøu"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "Elektu"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
#, fuzzy
msgid "Window Text"
msgstr "&Aløustigu la fenestron"
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "Se&n titolstango"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "Wine Programa Malinstalilo"
-#: winecfg.rc:136
+#: winecfg.rc:135
#, fuzzy
msgid "Window Frame"
msgstr "&Aløustigu la fenestron"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "Control Panel"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 7db0644..af88513 100644
--- a/po/es.po
+++ b/po/es.po
@@ -177,7 +177,7 @@
msgid "System Path"
msgstr "Ruta del sistema"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -11047,46 +11047,42 @@
msgstr "Controlador OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Controlador JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Controlador CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "¡No se ha podido abrir %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Controladores de sonido"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Dispositivos de salida de onda"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Dispositivos de entrada de onda"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Dispositivos de salida MIDI"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Dispositivos de entrada MIDI"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Dispositivos auxiliares"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Dispositivos mezcladores"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -11096,131 +11092,131 @@
"\n"
"¿Eliminar \"%s\" del registro?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Advertencia"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Fondo del control"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Texto del control"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Fondo del menú"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Texto del menú"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Barra de desplazamiento"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Fondo de la selección"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Texto de la selección"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Fondo del consejo"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Texto del consejo"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Fondo de la ventana"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Texto de la ventana"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Barra de título activa"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Texto de barra de título activa"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Barra de título inactiva"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Texto de barra de título inactiva"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Texto de cuadro de diálogo"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Entorno de trabajo de la aplicación"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Recuadro de la ventana"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Borde activo"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Borde inactivo"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Sombra del control"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Texto en gris"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Resaltado del control"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Sombra oscura del control"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Parte iluminada del control"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Fondo alternativo del control"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Elemento resaltado"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Gradiente barra título activa"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Gradiente barra título inactiva"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Resaltado del menú"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Barra de menú"
diff --git a/po/fa.po b/po/fa.po
index 818562c..034559e 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -161,7 +161,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -10124,184 +10124,180 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "ذخیره &به نام..."
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "&محتویات"
-#: winecfg.rc:121
+#: winecfg.rc:120
#, fuzzy
msgid "Menu Background"
msgstr "ذخیره &به نام..."
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "ذخیره &به نام..."
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "انتخاب &همه\tCtrl+A"
-#: winecfg.rc:126
+#: winecfg.rc:125
#, fuzzy
msgid "ToolTip Background"
msgstr "ذخیره &به نام..."
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
#, fuzzy
msgid "Window Background"
msgstr "ذخیره &به نام..."
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr ""
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 0323574..4fb6c9a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -167,7 +167,7 @@
msgid "System Path"
msgstr "Järjestelmäkansio"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10437,46 +10437,42 @@
msgstr "OSS Driver"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK Driver"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio Driver"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Couldn't open %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Sound Drivers"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out Devices"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave In Devices"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out Devices"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI In Devices"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux Devices"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer Devices"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10486,143 +10482,143 @@
"\n"
"Remove \"%s\" from registry?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Warning"
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "&Kopioi Tausta"
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "Hallinta"
-#: winecfg.rc:121
+#: winecfg.rc:120
#, fuzzy
msgid "Menu Background"
msgstr "&Kopioi Tausta"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
#, fuzzy
msgid "Scrollbar"
msgstr "Vieritä Tänne"
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "&Aseta Taustaksi"
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "&Valitse Kaikki"
-#: winecfg.rc:126
+#: winecfg.rc:125
#, fuzzy
msgid "ToolTip Background"
msgstr "&Kopioi Tausta"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
#, fuzzy
msgid "Window Background"
msgstr "&Kopioi Tausta"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "&Ilman otsikkopalkkia"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "Valinnat"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "Ohjauspaneeli"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
#, fuzzy
msgid "Controls Light"
msgstr "Hallinta"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 833e2c5..da48a0e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -167,7 +167,7 @@
msgid "System Path"
msgstr "Chemin système (path)"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10627,48 +10627,44 @@
msgstr "Pilote OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Pilote JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Pilote CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Impossible d'ouvrir %s !"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Pilotes audio"
-#: winecfg.rc:106
+#: winecfg.rc:105
#, fuzzy
msgid "Wave Out Devices"
msgstr "Périphériques de sortie Wave"
-#: winecfg.rc:107
+#: winecfg.rc:106
#, fuzzy
msgid "Wave In Devices"
msgstr "Périphériques d'entrée Wave"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Périphériques de sortie MIDI"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Périphériques d'entrée MIDI"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Périphériques Aux"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Périphériques de mixage"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10678,131 +10674,131 @@
"\n"
"Souhaitez-vous supprimer « %s » de la base de registre ?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Attention"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Contrôle l'arrière-plan"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Contrôle le texte"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Arrière-plan du menu"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Texte du menu"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Barre de défilement"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Arrière-plan de la sélection"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Texte de la sélection"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Arrière-plan de l'infobulle"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Texte de l'infobulle"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Arrière-plan de la fenêtre"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Texte de la fenêtre"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Barre de titre active"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Texte de la barre de titre active"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Barre de titre inactive"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Texte de la barre de titre inactive"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Texte des boîtes à messages"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Espace de travail de l'application"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Cadre de la fenêtre"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Bordure active"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Bordure inactive"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Ombre des contrôles"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Texte gris"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Surbrillance des contrôles"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Ombre sombre des contrôles"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Lumière des contrôles"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Arrière-plan alternatif des contrôles"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Élément actif"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Dégradé de la barre de titre active"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Dégradé de la barre de titre inactive"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Surbrillance du menu"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Barre de menu"
diff --git a/po/he.po b/po/he.po
index e7d94b0..469b214 100644
--- a/po/he.po
+++ b/po/he.po
@@ -167,7 +167,7 @@
msgid "System Path"
msgstr "נתיב המערכת"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10674,55 +10674,50 @@
#: winecfg.rc:102
#, fuzzy
-msgid "JACK Driver"
-msgstr "מנהל התקן JACK"
-
-#: winecfg.rc:103
-#, fuzzy
msgid "CoreAudio Driver"
msgstr "מנהל התקן CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
#, fuzzy
msgid "Couldn't open %s!"
msgstr "לא ניתן לפתוח את %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
#, fuzzy
msgid "Sound Drivers"
msgstr "מנהלי התקני שמע"
-#: winecfg.rc:106
+#: winecfg.rc:105
#, fuzzy
msgid "Wave Out Devices"
msgstr "התקני פלט Wave"
-#: winecfg.rc:107
+#: winecfg.rc:106
#, fuzzy
msgid "Wave In Devices"
msgstr "התקני קלט Wave"
-#: winecfg.rc:108
+#: winecfg.rc:107
#, fuzzy
msgid "MIDI Out Devices"
msgstr "התקני פלט MIDI"
-#: winecfg.rc:109
+#: winecfg.rc:108
#, fuzzy
msgid "MIDI In Devices"
msgstr "התקני קלט MIDI"
-#: winecfg.rc:110
+#: winecfg.rc:109
#, fuzzy
msgid "Aux Devices"
msgstr "התקנים חיצוניים"
-#: winecfg.rc:111
+#: winecfg.rc:110
#, fuzzy
msgid "Mixer Devices"
msgstr "התקני ערבול"
-#: winecfg.rc:112
+#: winecfg.rc:111
#, fuzzy
msgid ""
"Found driver in registry that is not available!\n"
@@ -10733,162 +10728,162 @@
"\n"
"האם למחוק את '%s' מרישום המערכת?"
-#: winecfg.rc:113
+#: winecfg.rc:112
#, fuzzy
msgid "Warning"
msgstr "אזהרה"
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "רקע הפקדים"
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "טקסט הפקדים"
-#: winecfg.rc:121
+#: winecfg.rc:120
#, fuzzy
msgid "Menu Background"
msgstr "רקע התפריט"
-#: winecfg.rc:122
+#: winecfg.rc:121
#, fuzzy
msgid "Menu Text"
msgstr "טקסט בתפריט"
-#: winecfg.rc:123
+#: winecfg.rc:122
#, fuzzy
msgid "Scrollbar"
msgstr "סרגל גלילה"
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "רקע הבחירה"
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "טקסט הבחירה"
-#: winecfg.rc:126
+#: winecfg.rc:125
#, fuzzy
msgid "ToolTip Background"
msgstr "רקע חלונית העצה"
-#: winecfg.rc:127
+#: winecfg.rc:126
#, fuzzy
msgid "ToolTip Text"
msgstr "טקסט חלונית עצה"
-#: winecfg.rc:128
+#: winecfg.rc:127
#, fuzzy
msgid "Window Background"
msgstr "רקע החלון"
-#: winecfg.rc:129
+#: winecfg.rc:128
#, fuzzy
msgid "Window Text"
msgstr "טקסט בחלון"
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "כותרת החלון הפעיל"
-#: winecfg.rc:131
+#: winecfg.rc:130
#, fuzzy
msgid "Active Title Text"
msgstr "טקסט בכותרת של פעיל"
-#: winecfg.rc:132
+#: winecfg.rc:131
#, fuzzy
msgid "Inactive Title Bar"
msgstr "סרגל כותרת של בלתי פעיל"
-#: winecfg.rc:133
+#: winecfg.rc:132
#, fuzzy
msgid "Inactive Title Text"
msgstr "טקסט כותרת של בלתי פעיל"
-#: winecfg.rc:134
+#: winecfg.rc:133
#, fuzzy
msgid "Message Box Text"
msgstr "טקסט בתיבת הודעות"
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "מרחב היישומים"
-#: winecfg.rc:136
+#: winecfg.rc:135
#, fuzzy
msgid "Window Frame"
msgstr "מסגרת החלון"
-#: winecfg.rc:137
+#: winecfg.rc:136
#, fuzzy
msgid "Active Border"
msgstr "מסגרת של פעיל"
-#: winecfg.rc:138
+#: winecfg.rc:137
#, fuzzy
msgid "Inactive Border"
msgstr "מסגרת של בלתי פעיל"
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "הצללת הפקדים"
-#: winecfg.rc:140
+#: winecfg.rc:139
#, fuzzy
msgid "Gray Text"
msgstr "טקסט אפור"
-#: winecfg.rc:141
+#: winecfg.rc:140
#, fuzzy
msgid "Controls Highlight"
msgstr "הדגשת פקדים"
-#: winecfg.rc:142
+#: winecfg.rc:141
#, fuzzy
msgid "Controls Dark Shadow"
msgstr "הפקדים בהצללה כהה"
-#: winecfg.rc:143
+#: winecfg.rc:142
#, fuzzy
msgid "Controls Light"
msgstr "פקדים בהירים"
-#: winecfg.rc:144
+#: winecfg.rc:143
#, fuzzy
msgid "Controls Alternate Background"
msgstr "צבע רקע הפקדים משתנה"
-#: winecfg.rc:145
+#: winecfg.rc:144
#, fuzzy
msgid "Hot Tracked Item"
msgstr "פריט במעקב חם"
-#: winecfg.rc:146
+#: winecfg.rc:145
#, fuzzy
msgid "Active Title Bar Gradient"
msgstr "מדרג שורת כותרת של חלון פעיל"
-#: winecfg.rc:147
+#: winecfg.rc:146
#, fuzzy
msgid "Inactive Title Bar Gradient"
msgstr "מדרג שורת כותרת של חלון בלתי פעיל"
-#: winecfg.rc:148
+#: winecfg.rc:147
#, fuzzy
msgid "Menu Highlight"
msgstr "הדגשה בתפריט"
-#: winecfg.rc:149
+#: winecfg.rc:148
#, fuzzy
msgid "Menu Bar"
msgstr "סרגל תפריטים"
diff --git a/po/hi.po b/po/hi.po
index 4490dbd..9e8c2e0 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -161,7 +161,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -9994,178 +9994,174 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr ""
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr ""
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "बिना शीर्षकपट्टी के (&W)"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 444fa79..753ce3f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -183,7 +183,7 @@
msgid "System Path"
msgstr "Rendszer elérési útvonal"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10698,46 +10698,42 @@
msgstr "OSS Driver"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK Driver"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio Driver"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Couldn't open %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Sound Drivers"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out Devices"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave In Devices"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out Devices"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI In Devices"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux Devices"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer Devices"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10747,146 +10743,146 @@
"\n"
"Remove \"%s\" from registry?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Warning"
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "Háttér &másolása"
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "Control"
-#: winecfg.rc:121
+#: winecfg.rc:120
#, fuzzy
msgid "Menu Background"
msgstr "&Háttér"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
#, fuzzy
msgid "Scrollbar"
msgstr "görgetősáv"
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "Beállítás há&ttérként"
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "Kijelölés &információ"
-#: winecfg.rc:126
+#: winecfg.rc:125
#, fuzzy
msgid "ToolTip Background"
msgstr "Háttér &másolása"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
#, fuzzy
msgid "Window Background"
msgstr "Háttér &másolása"
-#: winecfg.rc:129
+#: winecfg.rc:128
#, fuzzy
msgid "Window Text"
msgstr "&Ablakok"
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "címsor"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
#, fuzzy
msgid "Message Box Text"
msgstr "Üzenet összesítő"
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "Alkalmazás szabályok"
-#: winecfg.rc:136
+#: winecfg.rc:135
#, fuzzy
msgid "Window Frame"
msgstr "&Ablakok"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "Vezérlőpult"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
#, fuzzy
msgid "Controls Light"
msgstr "Control"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
#, fuzzy
msgid "Menu Bar"
msgstr "menüsor"
diff --git a/po/it.po b/po/it.po
index d12a2fd..91608de 100644
--- a/po/it.po
+++ b/po/it.po
@@ -175,7 +175,7 @@
msgid "System Path"
msgstr "Percorso di sistema"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10957,46 +10957,42 @@
msgstr "Driver OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Driver JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Driver CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Impossibile aprire %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Driver Audio"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Dispositivo Wave Out"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Dispositivo Wave In"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Dispositivo MIDI Out"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Dispositivo MIDI In"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Dispositivo Aux"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Dispositivo Mixer"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -11006,131 +11002,131 @@
"\n"
"Rimuovere '%s' dal registro?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Attenzione"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Controlli - Sfondo"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Controlli - Testo"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Menu - Sfondo"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Menu - Testo"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Barra di scorrimento"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Selezione - Sfondo"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Selezione - Testo"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "ToolTip - Sfondo"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "ToolTip - Testo"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Finestra - Sfondo"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Finestra - Testo"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Titolo attivo - Barra"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Titolo attivo - Testo"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Titolo inattivo - Barra"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Titolo inattivo - Testo"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Testo della casella di Messaggio"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Spazio di lavoro dell'applicazione"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Frame della finestra"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Bordo attivo"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Bordo inattivo"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Controlli - Ombre"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Testo disabilitato"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Controlli - Selezione"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Controlli - Ombre scure"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Controlli - Luce"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Controlli - Sfondo alternativo"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Oggetto Hot Tracked"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Titolo attivo - Gradiente della barra"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Titolo inattivo - Gradiente della barra"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menu - Selezione"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menu - Barra"
diff --git a/po/ja.po b/po/ja.po
index 18a7052..d98d7d3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -167,7 +167,7 @@
msgid "System Path"
msgstr "システム パス"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr "デスクトップ"
@@ -10517,46 +10517,42 @@
msgstr "OSS ドライバ"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK ドライバ"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio ドライバ"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "%sをオープンできません!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "サウンドドライバ"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave 出力デバイス"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave 入力デバイス"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI 出力デバイス"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI 入力デバイス"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "補助デバイス"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "ミキサーデバイス"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10566,131 +10562,131 @@
"\n"
"レジストリから \"%s\" を削除しますか?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "警告"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "コントロールの背景"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "コントロールのテキスト"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "メニューの背景"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "メニューのテキスト"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "スクロールバー"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "選択項目の背景"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "選択項目のテキスト"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "ヒントの背景"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "ヒントのテキスト"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "ウィンドウの背景"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "ウィンドウのテキスト"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "アクティブ タイトル バー"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "アクティブ タイトルのテキスト"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "非アクティブ タイトル バー"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "非アクティブ タイトルのテキスト"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "メッセージ ボックスのテキスト"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "アプリケーション作業域"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "ウィンドウの境界"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "アクティブ境界"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "非アクティブ境界"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Controls Shadow"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Gray Text"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Controls Highlight"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Controls Dark Shadow"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Controls Light"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Controls Alternate Background"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Hot Tracked Item"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Active Title Bar Gradient"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Inactive Title Bar Gradient"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menu Highlight"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "メニュー バー"
diff --git a/po/ko.po b/po/ko.po
index f66814f..72fa63e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -167,7 +167,7 @@
msgid "System Path"
msgstr "시스템 경로"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10473,46 +10473,42 @@
msgstr "OSS 드라이버"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK 드라이버"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio 드라이버"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "%s를 열 수 없습니다!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "사운드 드라이버"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave 출력 장치"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave 입력 장치"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI 출력 장치"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI 입력 장치"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux 장치"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer 장치"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10522,131 +10518,131 @@
"\n"
" '%s'를 레지스트리에서 지우겠습니까?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "경고"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "컨트롤 배경"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "컨트롤 문자"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "메뉴 배경"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "메뉴 문자"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "목록바"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "선택된 배경"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "선택된 문자"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "도구팁 배경"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "도구팁 문자"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "창 배경"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "창 문자"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "활성된 제목 막대"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "활성된 제목 문자"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "비활성된 제목 막대"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "비활성된 제목 문자"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "메세지 상자 텍스트"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "어플리케이션 작업공간"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "창 프레임"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "활성화된 창틀"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "비 활성화된 창틀"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "컨트롤 그함지"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "회색 문자"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "컨트롤 하이라이트"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "컨트롤 어두운 그림자"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "컨트롤 밝음"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "컨트롤 바뀔때 배경"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "핫 트랙된 아이템"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "활성화된 제목 바 색깔 변화"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "비활성화된 제목바 색깔 변화"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "메뉴 하이라이트"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "메뉴바"
diff --git a/po/lt.po b/po/lt.po
index dc66d2e..05a4e94 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -170,7 +170,7 @@
msgid "System Path"
msgstr "Sistemos kelias"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10541,46 +10541,42 @@
msgstr "OSS tvarkyklė"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK tvarkyklė"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio tvarkyklė"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Nepavyko atverti %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Garso tvarkyklės"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out įrenginiai"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave In įrenginiai"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out įrenginiai"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI In įrenginiai"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux įrenginiai"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer įrenginiai"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10590,131 +10586,131 @@
"\n"
"Pašalinti „%s“ iš registro?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Įspėjimas"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Valdiklių fonas"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Valdiklių tekstas"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Meniu fonas"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Meniu tekstas"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Slankjuostė"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Žymėjimo fonas"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Žymėjimo tekstas"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Patarimo fonas"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Patarimo tekstas"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Lango fonas"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Lango tekstas"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Aktyvi lango antraštės juosta"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Aktyvios lango antraštės tekstas"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Neaktyvi lango antraštės juosta"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Neaktyvios lango antraštės tekstas"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Pranešimo lango tekstas"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Programos erdvė"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Lango rėmelis"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Aktyvi kraštinė"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Neaktyvi kraštinė"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Valdiklių šešėlis"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Pilkas tekstas"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Valdiklių paryškinimas"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Valdiklių tamsus šešėlis"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Valdiklių šviesumas"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Valdiklių alternatyvus fonas"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Pažymėtas elementas"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Aktyvios lango antraštės gradientas"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Neaktyvios lango antraštės gradientas"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Meniu paryškinimas"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Meniu juosta"
diff --git a/po/ml.po b/po/ml.po
index 3883c80..320977a 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -161,7 +161,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -9994,178 +9994,174 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr ""
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr ""
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "റ്റൈറ്റില്ബാര് _ഇല്ലാതെ"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 620351a..0be3d9a 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -166,7 +166,7 @@
msgid "System Path"
msgstr "Systemsti"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10830,46 +10830,42 @@
msgstr "OSS-driver"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK-driver"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio-driver"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Klarte ikke åpne %s."
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Lyddrivere"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Lyd ut-enheter"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Lyd inn-enheter"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI ut-enheter"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI inn-enheter"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux-enheter"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mikserenheter"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10879,131 +10875,131 @@
"\n"
"Fjerne «%s» fra registeret?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Advarsel"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Kontrollerbakgrunn"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Kontrollertekst"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Menybakgrunn"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Menytekst"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Rullefelt"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Bakgrunn for merking"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Merket tekst"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Bakgrunn for verktøytips"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Tekst i verktøytips"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Vindubakgrunn"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Vinduteksts"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Aktiv tittellinje"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Aktiv titteltekst"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Inaktiv tittellinje"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Inaktiv titteltekst"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Meldingsvindutekst"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Arbeidsområde i program"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Visrusramme"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Aktiv kant"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Inaktiv kant"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Kontrollerskygge"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Grå tekst"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Merket kontroller"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Mørk skygge i kontroller"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Kontrollerlys"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Bakgrunn for skiftende kontroller"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Merket element"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Gradient for aktiv tittellinje"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Gradient for inaktiv tittellinje"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menymerking"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menylinje"
diff --git a/po/nl.po b/po/nl.po
index 6bbafea..7e77c21 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -170,7 +170,7 @@
msgid "System Path"
msgstr "Systeem Pad"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10710,46 +10710,42 @@
msgstr "OSS Stuurprogramma"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK Stuurprogramma"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio Stuurprogramma"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "%s kon niet worden geopend!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Stuurprogramma's voor geluid"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out Apparaten"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave In Apparaten"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out Apparaten"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI In Apparaten"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux Apparaten"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer Apparaten"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10759,131 +10755,131 @@
"\n"
"Verwijder \"%s\" uit het register?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Waarschuwing"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Instellingen Achtergrond"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Instellingen Tekst"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Menu Achtergrond"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Menu Tekst"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Scrollbalk"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Selectie Achtergrond"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Selectie Tekst"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "ToolTip Achtergrond"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "ToolTip Tekst"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Venster Achtergrond"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Venster Tekst"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Actieve Titelbalk"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Actieve Titeltekst"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Inactieve Titelbalk"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Inactieve Titeltekst"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Meldingsvenster Tekst"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Applicatie Werkruimte"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Vensterraamwerk"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Actieve Rand"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Inactieve Rand"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Knopschaduw"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Grijze Tekst"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Knoppen Gemarkeerd"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Knoppen Donkere Schaduw"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Knoppen Licht"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Knoppen Alternatieve Achtergrond"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Hot-Tracked Onderdeel"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Actieve Titelbalk Verloop"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Inactieve Titelbalk Verloop"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menu Gemarkeerd"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menubalk"
diff --git a/po/or.po b/po/or.po
index 2132e00..487963d 100644
--- a/po/or.po
+++ b/po/or.po
@@ -161,7 +161,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -9994,178 +9994,174 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr ""
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr ""
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "ଶୀର୍ଷକ ପଟି ବିନା (&W)"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index ed83ad4..9fd5bd6 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -161,7 +161,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -9994,178 +9994,174 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr ""
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr ""
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "ਟਾਈਟਲਬਾਰ ਤੋਂ ਬਿਨਾਂ(&W)"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index fd4dbe0..7f88f9e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -167,7 +167,7 @@
msgid "System Path"
msgstr "Ścieżka systemowa"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10549,46 +10549,42 @@
msgstr "Sterownik OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Sterownik JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Sterownik CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Nie mogę otworzyć %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Sterowniki dźwiękowe"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Urządzenia Wave Out"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Urządzenia Wave In"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Wyjścia MIDI"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Wejścia MIDI"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Urządzenia Aux"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Miksery"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10598,131 +10594,131 @@
"\n"
"Usunąć wpis “%s” z rejestru?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Ostrzeżenie"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Kontrolki - tło"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Kontrolki - tekst"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Tło menu"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Tekst menu"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Pasek przewijania"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Tło zaznaczonego obszaru"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Zaznaczony tekst"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Tło podpowiedzi"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Tekst podpowiedzi"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Tło okna"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Tekst okna"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Tło nagłówka aktywnego okna"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Tytuł aktywnego okna"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Tło nagłówka nieaktywnego okna"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Tytuł nieaktywnego okna"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Tekst okien komunikatów"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Wnętrze okna aplikacji"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Ramka okna"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Obramowanie aktywnego okna"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Obramowanie nieaktywnego okna"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Kontrolki - cień"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Szary tekst"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Kontrolki - podświetlenie"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Kontrolki - głębszy cień"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Kontrolki - jaśniejszy cień"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Kontrolki - alternatywne tło"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Śledzony element"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Gradient nagłówka aktywnego okna"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Gradient nagłówka nieaktywnego okna"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Podświetlone menu"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Pasek menu"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 19636f2..9ac1503 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -172,7 +172,7 @@
msgid "System Path"
msgstr "Caminho do Sistema"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10911,46 +10911,42 @@
msgstr "Driver OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Driver JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Driver CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Não foi possível abrir %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Drivers de Som"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Dispositivos de Saída Wave"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Dispositivos de Entrada Wave"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Dispositivos de Saída MIDI"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Dispositivos de Entrada MIDI"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Dispositivos Auxiliares"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Dispositivos Misturadores"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10960,131 +10956,131 @@
"\n"
"Remover '%s' do registo?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Aviso"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Fundo do Botão"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Texto do Botão"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Fundo do Menu"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Texto do Menu"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Barra de Rolagem"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Fundo de Seleção"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Texto de Seleção"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Fundo da Dica"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Texto da Dica"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Fundo da Janela"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Texto da Janela"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Barra de Título Ativa"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Texto de Título Ativo"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Barra de Título Inativa"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Texto de Título Inativo"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Texto da Caixa de Mensagens"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Área do Aplicativo"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Corpo da Janela"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Borda Ativa"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Borda Inativa"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Sombra dos Botões"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Texto Inativo"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Realce do Botão"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Sombra Escura do Botão"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Luz do Botão"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Fundo Alternativo do Botão"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Hot Tracked Item"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Gradiente da Barra Ativa"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Gradiente da Barra Inativa"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Realce de Menu"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Barra de Menu"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b1e3bac..6a091c3 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -177,7 +177,7 @@
msgid "System Path"
msgstr "Localização do Sistema"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10971,46 +10971,42 @@
msgstr "Controlador OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Controlador JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Controlador CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Não é possível abrir %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Controladores de Som"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Dispositivos de Saída Wave"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Dispositivos de Entrada Wave"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Dispositivos de Saída MIDI"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Dispositivos de Entrada MIDI"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Dispositivos Auxiliares"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Dispositivos Misturadores"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -11020,131 +11016,131 @@
"\n"
"Remover ?%s? do registo?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Aviso"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Fundo dos Controlos"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Texto dos Controlos"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Fundo do Menu"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Texto do Menu"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Barra de Rolagem"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Fundo de Selecção"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Texto de Selecção"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Fundo das Dicas"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Texto das Dicas"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Fundo das Janelas"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Texto das Janelas"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Barra de Título Activa"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Texto de Título Activo"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Barra de Título Inactiva"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Texto de Título Inactivo"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Texto da Caixa de Mensagem"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Application Workspace"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Window Frame"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Active Border"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Inactive Border"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Controls Shadow"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Gray Text"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Controls Highlight"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Controls Dark Shadow"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Controls Light"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Controls Alternate Background"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Hot Tracked Item"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Active Title Bar Gradient"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Inactive Title Bar Gradient"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menu Highlight"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menu Bar"
diff --git a/po/rm.po b/po/rm.po
index ab5a3dd..d7cf435 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -163,7 +163,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -10071,178 +10071,174 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr ""
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr ""
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr ""
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "&Options"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index a1ceac1..71314d4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -171,7 +171,7 @@
msgid "System Path"
msgstr "Calea de sistem"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -11200,46 +11200,42 @@
msgstr "Driver OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Driver JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Driver CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Nu pot deschide %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Drivere de sunet"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Dispozitive Wave Out"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Dispozitive Wave In"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Dispozitive MIDI Out"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Dispozitive MIDI In"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Dispozitive Aux"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Dispozitive Mixer"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -11249,131 +11245,131 @@
"\n"
"Doriți să ștergeți driver-ul „%s” din registru?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Avertizare"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Fundal controale"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Text controale"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Fundal meniu"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Text meniu"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Bare de defilare"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Fundal selecție"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Text selecție"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Fundal baloane de ajutor"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Text baloane de ajutor"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Fundal fereastră"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Text fereastră"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Bară de titlu activă"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Text bară de titlu activă"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Bară de titlu inactivă"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Text bară de titlu inactivă"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Text casetă de mesaje"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Spațiul de lucru al aplicației"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Cadru de fereastră"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Margini active"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Margini inactive"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Umbră pentru controale"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Text gri"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Evidențiere controale"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Umbră întunecată pentru controale"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Lumină pentru controale"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Fundal alternativ pentru controale"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Element cu urmărire fierbinte"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Gradient bară de titlu activă"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Gradient bară de titlu inactivă"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Evidențiere meniu"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Bară de meniu"
diff --git a/po/ru.po b/po/ru.po
index 24a8a5a..fe1dbc5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -167,7 +167,7 @@
msgid "System Path"
msgstr "Системный путь"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10534,46 +10534,42 @@
msgstr "OSS драйвер"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK драйвер"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio драйвер"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Невозможно открыть %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Аудио драйвера"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Устройство вывода звука"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Устройство ввода звука"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Устройство вывода MIDI"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Устройство ввода MIDI"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Дополнительное устройство"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Устройство микширования"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10583,131 +10579,131 @@
"\n"
"Удалить \"%s\" из реестра?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Внимание"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Элементы управления - фон"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Элементы управления - текст"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Меню - фон"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Меню - текст"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Полоса прокрутки"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Выделение - фон"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Выделение - текст"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Подсказка - фон"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Подсказка - текст"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Содержимое окна - фон"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Содержимое окна - текст"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Активное окно"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Активное окно - текст"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Пассивное окно"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Пассивное окно - текст"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Окно сообщения - текст"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Содержимое окна MDI - фон"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Окно - рамка"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Активное окно - рамка"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Пассивное окно - рамка"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Элементы управления - тень"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Недоступный элемент"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Элементы управления - светлая рамка"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Элементы управления - темная тень"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Элементы управления - свет"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Элементы управления - фон 2"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Ссылка, Подсветка"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Градиент активного окна"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Градиент пассивного окна"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Плоское меню - подсветка"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Плоское меню - фон"
diff --git a/po/sk.po b/po/sk.po
index c66f630..2763987 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -165,7 +165,7 @@
msgid "System Path"
msgstr "Systémová cesta"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10318,183 +10318,179 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
#, fuzzy
msgid "Couldn't open %s!"
msgstr "Nemôžem vytvoriť alebo použiť okno."
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "&About Control Panel..."
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "&About Control Panel..."
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "&Select"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "&Bez titulkového pruhu"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "&About Control Panel..."
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 3009d69..72cd4f7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -170,7 +170,7 @@
msgid "System Path"
msgstr "Sistemska pot"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10586,46 +10586,42 @@
msgstr "Gonilnik OSS"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "Gonilnik JACK"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "Gonilnik CoreAudio"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Gonilnika %s ni mogoče odpreti!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Zvočni gonilniki"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Izh naprave"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave Vh naprave"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Izh naprave"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI Vh naprave"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Pomožne naprave"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mešalne naprave"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10635,131 +10631,131 @@
"\n"
"Ali želite '%s' odstraniti iz registra?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Opozorilo"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Ozadje nadzornikov"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Besedilo nadzornikov"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Ozadje menija"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Besedilo menija"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Drsnik"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Ozadje izbire"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Besedilo izbire"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Ozadje orodnega namiga"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Besedilo orodnega namiga"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Ozadje okna"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Besedilo okna"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Dejavna nazivna vrstica"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Besedilo dejavnega naziva"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Nedejavna nazivna vrstica"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Besedilno nedejavnega naziva"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Sporočilo polja z besedilom"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Delovni prostor programa"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Okvir okna"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Dejaven rob"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Nedejaven rob"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Senca nadzornikov"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Sivo besedilo"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Poudarjanje nadzornikov"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Temna senca nadzornikov"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Svetlost nadzornikov"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Nadomestno ozadje nadzornikov"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Predmet s hitrim sledenjem"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Preliv naslova dejavna nazivne vrstice"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Preliv nedejavne nazivne vrstice"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Poudarjanje menija"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menijska vrstica"
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 6b7d98c..ed3f376 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -171,7 +171,7 @@
msgid "System Path"
msgstr "Системска путања"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10501,193 +10501,189 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
#, fuzzy
msgid "Wave Out Devices"
msgstr "Подразумевани WaveOut уређај"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
#, fuzzy
msgid "MIDI Out Devices"
msgstr "Подразумевани WaveOut уређај"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "&Умножи позадину"
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "Контрола"
-#: winecfg.rc:121
+#: winecfg.rc:120
#, fuzzy
msgid "Menu Background"
msgstr "&Умножи позадину"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
#, fuzzy
msgid "Scrollbar"
msgstr "трака за померање"
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "Постави као позадину"
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "Изабери &све"
-#: winecfg.rc:126
+#: winecfg.rc:125
#, fuzzy
msgid "ToolTip Background"
msgstr "&Умножи позадину"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
#, fuzzy
msgid "Window Background"
msgstr "&Умножи позадину"
-#: winecfg.rc:129
+#: winecfg.rc:128
#, fuzzy
msgid "Window Text"
msgstr "&Прозор"
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "насловна линија"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "Програми"
-#: winecfg.rc:136
+#: winecfg.rc:135
#, fuzzy
msgid "Window Frame"
msgstr "&Прозор"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "Управљачки панел"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
#, fuzzy
msgid "Controls Light"
msgstr "Контрола"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
#, fuzzy
msgid "Menu Bar"
msgstr "линија менија"
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index f73afc4..a60152f 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -185,7 +185,7 @@
msgid "System Path"
msgstr "Sistemska putanja"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10597,46 +10597,42 @@
msgstr "OSS Driver"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK Driver"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio Driver"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Ne mogu da otvorim %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Drajveri za zvuk"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out Uređaj"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave In Uređaj"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out Uređaj"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI In Uređaj"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux Uređaj"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer Uređaj"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10646,131 +10642,131 @@
"\n"
"Ukloni '%s' iz registra?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Upozorenje"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Kontrole pozadine"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Kontrole teksta"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Pozadina menija"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Tekst menija"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Scrollbar"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Odabir pozadine"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Odabir teksta"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "ToolTip pozadina"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "ToolTip Text"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Pozadina prozora"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Text Prozora"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Aktivni nazivni Bar"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Aktivni nazivni Text"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Neaktivni nazivni Bar"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Neaktivni nazivni Text"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Poruka Box Text"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Radni prostor aplikacije"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Ram prozora"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Aktivna ivica"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Neaktivna ivica"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Kontrola senke"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Sivi Text"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Kontrola odabranog"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Kontrola mracne senke"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Kontrola svetla"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Kontrola alternativne pozadine"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Hot Tracked Item"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Aktivni nazivni bar Gradient"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Neaktivni nazivni bar Gradient"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Meni osvetljenog"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Meni Bar"
diff --git a/po/sv.po b/po/sv.po
index 359bbe6..92207f1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -169,7 +169,7 @@
msgid "System Path"
msgstr "Systemsökväg"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10551,46 +10551,42 @@
msgstr "OSS-drivrutin"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK-drivrutin"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio Driver"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Kunde inte öppna %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Ljuddrivrutiner"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave Out-enheter"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave In-enheter"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Out-enheter"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI In-enheter"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux-enheter"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixerenheter"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10600,131 +10596,131 @@
"\n"
"Ta bort “%s” från registret?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Varning"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Bakgrund i kontroller"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Text i kontroller"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Menybakgrund"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Menytext"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Rullningslist"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Bakgrund för markering"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Text för markering"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Bakgrund för verktygstips"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Text för verktygstips"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Fönsterbakgrund"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Fönstertext"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Aktiv titellist"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Aktiv titeltext"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Inaktiv titellist"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Inaktiv titeltext"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Text i meddelandefönster"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Arbetsyta i program"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Fönsterram"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Aktiv kant"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Inaktiv kant"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Skugga i kontroller"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Grå text"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Markering i kontroller"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Mörk skugga i kontroller"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Ljus i kontroller"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Alternativ bakgrund i kontroller"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Hovrat föremål"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Gradient för aktiv titellist"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Gradient för inaktiv titellist"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Menymarkering"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Menyrad"
diff --git a/po/te.po b/po/te.po
index 046cca1..fc025fe 100644
--- a/po/te.po
+++ b/po/te.po
@@ -161,7 +161,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -9994,178 +9994,174 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr ""
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr ""
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "శీర్షికపట్టీ లేకుండా (&W)"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/th.po b/po/th.po
index ddb0fc0..5f056e4 100644
--- a/po/th.po
+++ b/po/th.po
@@ -162,7 +162,7 @@
msgid "System Path"
msgstr "System Path"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10172,180 +10172,176 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "เนื้อหา"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "เลือกทั้งหมด\tCtrl+A"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "แสดงแทบเมนู"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 8b4d587..5f842a0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -174,7 +174,7 @@
msgid "System Path"
msgstr "Sistem Yolu"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10974,46 +10974,42 @@
msgstr "OSS Sürücüsü"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK Sürücüsü"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio Sürücüsü"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "%s açılamadı!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Ses Sürücüleri"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Dalga Çıkış Aygıtları"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Dalga Giriş Aygıtları"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI Çıkış Aygıtları"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI Giriş Aygıtları"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux Aygıtları"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Mixer Aygıtları"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -11023,147 +11019,147 @@
"\n"
"\"%s\" girişi sistem kaydından silinsin mi?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Uyarı"
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "Arkaplanı Ko&pyala"
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "Control"
-#: winecfg.rc:121
+#: winecfg.rc:120
#, fuzzy
msgid "Menu Background"
msgstr "&Arkaplan"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
#, fuzzy
msgid "Scrollbar"
msgstr "Buraya Kaydır"
-#: winecfg.rc:124
+#: winecfg.rc:123
#, fuzzy
msgid "Selection Background"
msgstr "Arka&plan Yap"
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "Seçim &bilgisi"
-#: winecfg.rc:126
+#: winecfg.rc:125
#, fuzzy
msgid "ToolTip Background"
msgstr "Arkaplanı Ko&pyala"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
#, fuzzy
msgid "Window Background"
msgstr "Arkaplanı Ko&pyala"
-#: winecfg.rc:129
+#: winecfg.rc:128
#, fuzzy
msgid "Window Text"
msgstr "&Pencere"
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "&Başlık Çubuğunu Kaldır"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr "Seçenekler"
-#: winecfg.rc:136
+#: winecfg.rc:135
#, fuzzy
msgid "Window Frame"
msgstr "&Pencere"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "Control Panel"
-#: winecfg.rc:140
+#: winecfg.rc:139
#, fuzzy
msgid "Gray Text"
msgstr "Gri"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
#, fuzzy
msgid "Controls Dark Shadow"
msgstr "Controls Debug Channels"
-#: winecfg.rc:143
+#: winecfg.rc:142
#, fuzzy
msgid "Controls Light"
msgstr "Control"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 2633386..203a972 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -165,7 +165,7 @@
msgid "System Path"
msgstr "Системний шлях"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10520,46 +10520,42 @@
msgstr "OSS драйвер"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK драйвер"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio драйвер"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "Неможна відкрити %s!"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "Звукові драйвери"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Пристрої виводу звуку"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Пристрої вводу звуку"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "Пристрої виводу MIDI"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "Пристрої вводу MIDI"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "Aux пристрої"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "Пристрої мікшування"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10569,131 +10565,131 @@
"\n"
"Видалити '%s' з реєстру?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "Увага"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "Елементи керування - фон"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "Елементи керування - текст"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "Меню - фон"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "Меню - текст"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "Смуга прокручування"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "Виділення - фон"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "Виділення - текст"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "Підказка - фон"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "Підказка - текст"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "Вікно - фон"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "Вікно - текст"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "Заголовок акт. вікна"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "Заголовок акт. - текст"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "Заголовок неак. вікна"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "Заголовок неак. вікна - текст"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "Вікно повідомлення - текст"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "Робоче поле програми"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "Вікно - рамка"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "Активна рамка"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "Неактивна рамка"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "Елементи керування - тінь"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "Недоступний елемент - текст"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "Ел-ти керув. - світла рамка"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "Ел-ти керув. - темна тінь"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "Елементи керування - світло"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "Ел-ти керув. - інший фон"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "Посилання, Підсвічування"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "Градієнт заголовка акт. вікна"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "Град. заголовка неакт. вікна"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "Меню - підсвічування"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "Рядок меню"
diff --git a/po/wa.po b/po/wa.po
index 25135b6..353fc55 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -162,7 +162,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -10147,182 +10147,178 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
#, fuzzy
msgid "Controls Background"
msgstr "&About Control Panel..."
-#: winecfg.rc:119
+#: winecfg.rc:118
#, fuzzy
msgid "Controls Text"
msgstr "&About Control Panel..."
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
#, fuzzy
msgid "Selection Text"
msgstr "&Select"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
#, fuzzy
msgid "Active Title Bar"
msgstr "Sin bår di &Tite"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "&About Control Panel..."
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index 82b7c22..881047b 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -158,7 +158,7 @@
msgid "System Path"
msgstr ""
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
msgctxt "display name"
msgid "Desktop"
msgstr ""
@@ -9967,177 +9967,173 @@
msgstr ""
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr ""
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr ""
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr ""
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr ""
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr ""
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr ""
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr ""
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr ""
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr ""
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr ""
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
"Remove '%s' from registry?"
msgstr ""
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr ""
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr ""
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr ""
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr ""
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr ""
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr ""
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr ""
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr ""
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr ""
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr ""
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr ""
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr ""
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr ""
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr ""
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr ""
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr ""
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr ""
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr ""
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr ""
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr ""
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr ""
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr ""
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr ""
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr ""
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr ""
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr ""
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr ""
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr ""
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9833d48..846dd2b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -173,7 +173,7 @@
msgid "System Path"
msgstr "系统路径"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10488,46 +10488,42 @@
msgstr "OSS 驱动"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK 驱动"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio 驱动"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "无法打开 %s！"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "音频驱动程序"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave 输出设备"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave 输入设备"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI 输出设备"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI 输入设备"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "辅助设备"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "混音设备"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10537,131 +10533,131 @@
"\n"
"将 %s 从注册表中删除?"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "警告"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "控件背景"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "控件文字"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "菜单背景"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "菜单文字"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "滚动条"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "选中的文字背景"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "选中的文字"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "工具提示背景"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "工具提示文字"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "窗口背景"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "窗口文字"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "活动窗口标题栏"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "活动窗口标题栏文字"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "非活动窗口标题栏"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "非活动窗口标题栏"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr "消息框文字"
-#: winecfg.rc:135
+#: winecfg.rc:134
msgid "Application Workspace"
msgstr "应用程序工作区"
-#: winecfg.rc:136
+#: winecfg.rc:135
msgid "Window Frame"
msgstr "焦点控件框架"
-#: winecfg.rc:137
+#: winecfg.rc:136
msgid "Active Border"
msgstr "活动窗口边界"
-#: winecfg.rc:138
+#: winecfg.rc:137
msgid "Inactive Border"
msgstr "非活动窗口边界"
-#: winecfg.rc:139
+#: winecfg.rc:138
msgid "Controls Shadow"
msgstr "控件阴影"
-#: winecfg.rc:140
+#: winecfg.rc:139
msgid "Gray Text"
msgstr "灰色文字"
-#: winecfg.rc:141
+#: winecfg.rc:140
msgid "Controls Highlight"
msgstr "控件高亮"
-#: winecfg.rc:142
+#: winecfg.rc:141
msgid "Controls Dark Shadow"
msgstr "控件灰暗"
-#: winecfg.rc:143
+#: winecfg.rc:142
msgid "Controls Light"
msgstr "控件光亮"
-#: winecfg.rc:144
+#: winecfg.rc:143
msgid "Controls Alternate Background"
msgstr "控件切换背景"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr "鼠标拖选框"
-#: winecfg.rc:146
+#: winecfg.rc:145
msgid "Active Title Bar Gradient"
msgstr "活动窗口标题栏渐进目标色"
-#: winecfg.rc:147
+#: winecfg.rc:146
msgid "Inactive Title Bar Gradient"
msgstr "非活动窗口标题栏渐进目标色"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr "菜单高亮"
-#: winecfg.rc:149
+#: winecfg.rc:148
msgid "Menu Bar"
msgstr "菜单栏"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ffd55d6..b6756fa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -173,7 +173,7 @@
msgid "System Path"
msgstr "系統路徑"
-#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:120 winefile.rc:103
+#: comdlg32.rc:34 shell32.rc:153 winecfg.rc:119 winefile.rc:103
#, fuzzy
msgctxt "display name"
msgid "Desktop"
@@ -10550,46 +10550,42 @@
msgstr "OSS 驅動"
#: winecfg.rc:102
-msgid "JACK Driver"
-msgstr "JACK 驅動"
-
-#: winecfg.rc:103
msgid "CoreAudio Driver"
msgstr "CoreAudio 驅動"
-#: winecfg.rc:104
+#: winecfg.rc:103
msgid "Couldn't open %s!"
msgstr "無法開啟 %s ！"
-#: winecfg.rc:105
+#: winecfg.rc:104
msgid "Sound Drivers"
msgstr "音效驅動程式"
-#: winecfg.rc:106
+#: winecfg.rc:105
msgid "Wave Out Devices"
msgstr "Wave 輸出裝置"
-#: winecfg.rc:107
+#: winecfg.rc:106
msgid "Wave In Devices"
msgstr "Wave 輸入裝置"
-#: winecfg.rc:108
+#: winecfg.rc:107
msgid "MIDI Out Devices"
msgstr "MIDI 輸出裝置"
-#: winecfg.rc:109
+#: winecfg.rc:108
msgid "MIDI In Devices"
msgstr "MIDI 輸入裝置"
-#: winecfg.rc:110
+#: winecfg.rc:109
msgid "Aux Devices"
msgstr "輔助裝置"
-#: winecfg.rc:111
+#: winecfg.rc:110
msgid "Mixer Devices"
msgstr "混音器裝置"
-#: winecfg.rc:112
+#: winecfg.rc:111
msgid ""
"Found driver in registry that is not available!\n"
"\n"
@@ -10599,75 +10595,75 @@
"\n"
"是否將 %s 從登錄資訊裡移除？"
-#: winecfg.rc:113
+#: winecfg.rc:112
msgid "Warning"
msgstr "警告"
-#: winecfg.rc:118
+#: winecfg.rc:117
msgid "Controls Background"
msgstr "按鈕背景"
-#: winecfg.rc:119
+#: winecfg.rc:118
msgid "Controls Text"
msgstr "按鈕文字"
-#: winecfg.rc:121
+#: winecfg.rc:120
msgid "Menu Background"
msgstr "功能表背景"
-#: winecfg.rc:122
+#: winecfg.rc:121
msgid "Menu Text"
msgstr "功能表文字"
-#: winecfg.rc:123
+#: winecfg.rc:122
msgid "Scrollbar"
msgstr "捲軸"
-#: winecfg.rc:124
+#: winecfg.rc:123
msgid "Selection Background"
msgstr "選择區背景"
-#: winecfg.rc:125
+#: winecfg.rc:124
msgid "Selection Text"
msgstr "選择區文字"
-#: winecfg.rc:126
+#: winecfg.rc:125
msgid "ToolTip Background"
msgstr "提示區背景"
-#: winecfg.rc:127
+#: winecfg.rc:126
msgid "ToolTip Text"
msgstr "提示區文字"
-#: winecfg.rc:128
+#: winecfg.rc:127
msgid "Window Background"
msgstr "視窗背景"
-#: winecfg.rc:129
+#: winecfg.rc:128
msgid "Window Text"
msgstr "視窗文字"
-#: winecfg.rc:130
+#: winecfg.rc:129
msgid "Active Title Bar"
msgstr "當前標題欄"
-#: winecfg.rc:131
+#: winecfg.rc:130
msgid "Active Title Text"
msgstr "當前標題欄文字"
-#: winecfg.rc:132
+#: winecfg.rc:131
msgid "Inactive Title Bar"
msgstr "非當前標題欄"
-#: winecfg.rc:133
+#: winecfg.rc:132
msgid "Inactive Title Text"
msgstr "非當前標題欄文字"
-#: winecfg.rc:134
+#: winecfg.rc:133
msgid "Message Box Text"
msgstr ""
-#: winecfg.rc:135
+#: winecfg.rc:134
#, fuzzy
msgid "Application Workspace"
msgstr ""
@@ -10676,70 +10672,70 @@
"#-#-#-#-# zh_TW.po (Wine) #-#-#-#-#\n"
"應用程式"
-#: winecfg.rc:136
+#: winecfg.rc:135
#, fuzzy
msgid "Window Frame"
msgstr "視窗文字"
-#: winecfg.rc:137
+#: winecfg.rc:136
#, fuzzy
msgid "Active Border"
msgstr "當前標題欄"
-#: winecfg.rc:138
+#: winecfg.rc:137
#, fuzzy
msgid "Inactive Border"
msgstr "非當前標題欄"
-#: winecfg.rc:139
+#: winecfg.rc:138
#, fuzzy
msgid "Controls Shadow"
msgstr "按鈕背景"
-#: winecfg.rc:140
+#: winecfg.rc:139
#, fuzzy
msgid "Gray Text"
msgstr "文本文字"
-#: winecfg.rc:141
+#: winecfg.rc:140
#, fuzzy
msgid "Controls Highlight"
msgstr "按鈕文字"
-#: winecfg.rc:142
+#: winecfg.rc:141
#, fuzzy
msgid "Controls Dark Shadow"
msgstr "按鈕背景"
-#: winecfg.rc:143
+#: winecfg.rc:142
#, fuzzy
msgid "Controls Light"
msgstr "按鈕文字"
-#: winecfg.rc:144
+#: winecfg.rc:143
#, fuzzy
msgid "Controls Alternate Background"
msgstr "按鈕背景"
-#: winecfg.rc:145
+#: winecfg.rc:144
msgid "Hot Tracked Item"
msgstr ""
-#: winecfg.rc:146
+#: winecfg.rc:145
#, fuzzy
msgid "Active Title Bar Gradient"
msgstr "當前標題欄"
-#: winecfg.rc:147
+#: winecfg.rc:146
#, fuzzy
msgid "Inactive Title Bar Gradient"
msgstr "非當前標題欄"
-#: winecfg.rc:148
+#: winecfg.rc:147
msgid "Menu Highlight"
msgstr ""
-#: winecfg.rc:149
+#: winecfg.rc:148
#, fuzzy
msgid "Menu Bar"
msgstr "功能表背景"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index afd072b..eacfa6f 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -93,7 +93,6 @@
{IDS_DRIVER_ALSA, "alsa"},
{IDS_DRIVER_OSS, "oss"},
{IDS_DRIVER_COREAUDIO, "coreaudio"},
- {IDS_DRIVER_JACK, "jack"},
{0, ""}
};
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index a4cc39e..67b912c 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -188,7 +188,6 @@
#define IDS_DRIVER_ALSA 8304
#define IDS_DRIVER_OSS 8307
-#define IDS_DRIVER_JACK 8308
#define IDS_DRIVER_COREAUDIO 8311
#define IDS_OPEN_DRIVER_ERROR 8312
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index f6073f1..9e0ca9f 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -99,7 +99,6 @@
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_OSS "OSS Driver"
- IDS_DRIVER_JACK "JACK Driver"
IDS_DRIVER_COREAUDIO "CoreAudio Driver"
IDS_OPEN_DRIVER_ERROR "Couldn't open %s!"
IDS_SOUNDDRIVERS "Sound Drivers"
