[MPlayer-translations] r34335 - in trunk: DOCS/man/cs/mplayer.1 DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/es/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/man/hu/mplayer.1 DOCS/man/it/mplayer.1 DOCS/man/pl/mplayer.1 DO...
diego
subversion at mplayerhq.hu
Wed Nov 9 02:22:03 CET 2011
Author: diego
Date: Wed Nov 9 02:22:02 2011
New Revision: 34335
Log:
Remove obsolete ALSA 0.5 audio output and ALSA 0.9 audio input.
ALSA 0.5 was last released in 2000, 0.9 in 2003; besides the ALSA
0.9 and 1.x audio inputs heavily duplicated code.
Modified:
trunk/DOCS/man/cs/mplayer.1
trunk/DOCS/man/de/mplayer.1
trunk/DOCS/man/es/mplayer.1
trunk/DOCS/man/fr/mplayer.1
trunk/DOCS/man/hu/mplayer.1
trunk/DOCS/man/it/mplayer.1
trunk/DOCS/man/pl/mplayer.1
trunk/DOCS/man/ru/mplayer.1
trunk/DOCS/man/zh_CN/mplayer.1
trunk/help/help_mp-bg.h
trunk/help/help_mp-cs.h
trunk/help/help_mp-de.h
trunk/help/help_mp-es.h
trunk/help/help_mp-fr.h
trunk/help/help_mp-hu.h
trunk/help/help_mp-it.h
trunk/help/help_mp-nl.h
trunk/help/help_mp-pl.h
trunk/help/help_mp-ru.h
trunk/help/help_mp-sv.h
trunk/help/help_mp-tr.h
trunk/help/help_mp-zh_CN.h
trunk/help/help_mp-zh_TW.h
Changes in other areas also in this revision:
Replaced:
trunk/stream/ai_alsa.c
- copied, changed from r34301, trunk/stream/ai_alsa1x.c
Deleted:
trunk/libao2/ao_alsa5.c
trunk/stream/ai_alsa1x.c
Modified:
trunk/DOCS/man/en/mplayer.1
trunk/DOCS/tech/MAINTAINERS
trunk/Makefile
trunk/TOOLS/movinfo.c
trunk/configure
trunk/help/help_mp-en.h
trunk/libao2/audio_out.c
Modified: trunk/DOCS/man/cs/mplayer.1
==============================================================================
--- trunk/DOCS/man/cs/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/cs/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -2548,10 +2548,6 @@ pokud pÅ™esnÄ› nevÃte jak to nastavit s
.PD 1
.
.TP
-.B "alsa5\ \ "
-Zvukové rozhranà ALSA 0.5.
-.
-.TP
.B "oss\ \ \ \ "
Rozhranà OSS.
.PD 0
Modified: trunk/DOCS/man/de/mplayer.1
==============================================================================
--- trunk/DOCS/man/de/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/de/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -2978,10 +2978,6 @@ denn, du weißt wirklich, wie sie gesetz
.PD 1
.
.TP
-.B "alsa5\ \ "
-ALSA 0.5 Audioausgabetreiber.
-.
-.TP
.B "oss\ \ \ \ "
OSS Audioausgabetreiber.
.PD 0
Modified: trunk/DOCS/man/es/mplayer.1
==============================================================================
--- trunk/DOCS/man/es/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/es/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -2398,10 +2398,6 @@ menos que realmente sepa como configurar
.PD 1
.
.TP
-.B "alsa5\ \ "
-Controlador de salida de audio ALSA 0.5.
-.
-.TP
.B "oss\ \ \ \ "
Controlador de salida de audio OSS.
.PD 0
Modified: trunk/DOCS/man/fr/mplayer.1
==============================================================================
--- trunk/DOCS/man/fr/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/fr/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -2864,9 +2864,6 @@ le configurer.
.PD 1
.
.TP
-.B "alsa5\ \ "
-Pilote de sortie audio ALSA 0.5
-.TP
.B "oss\ \ \ \ "
Pilote de sortie audio OSS.
.PD 0
Modified: trunk/DOCS/man/hu/mplayer.1
==============================================================================
--- trunk/DOCS/man/hu/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/hu/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -2819,10 +2819,6 @@ eszközt, feltéve, hogy tényleg tudod,
.PD 1
.
.TP
-.B "alsa5\ \ "
-ALSA 0.5 audió kimeneti meghajtó
-.
-.TP
.B "oss\ \ \ \ "
OSS audió kimeneti meghajtó
.PD 0
Modified: trunk/DOCS/man/it/mplayer.1
==============================================================================
--- trunk/DOCS/man/it/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/it/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -3141,10 +3141,6 @@ dispositivo, a meno che tu non sappia da
.PD 1
.
.TP
-.B "alsa5\ \ "
-driver di uscita audio ALSA 0.5
-.
-.TP
.B "oss\ \ \ \ "
driver di uscita audio OSS
.PD 0
Modified: trunk/DOCS/man/pl/mplayer.1
==============================================================================
--- trunk/DOCS/man/pl/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/pl/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -1870,10 +1870,6 @@ poprzez S/PDIF, chyba że dobrze wiesz j
.PD 1
.
.TP
-.B "alsa5\ \ "
-sterownik ALSA 0.5
-.
-.TP
.B "oss\ \ \ \ "
sterownik OSS
.PD 0
Modified: trunk/DOCS/man/ru/mplayer.1
==============================================================================
--- trunk/DOCS/man/ru/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/ru/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -2663,10 +2663,6 @@ OSD и очищать ее (по умоÐ
.PD 1
.
.TP
-.B "alsa5\ \ "
-Драйвер вывода звука ALSA 0.5
-.
-.TP
.B "oss\ \ \ \ "
Драйвер вывода звука OSS
.PD 0
Modified: trunk/DOCS/man/zh_CN/mplayer.1
==============================================================================
--- trunk/DOCS/man/zh_CN/mplayer.1 Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/DOCS/man/zh_CN/mplayer.1 Wed Nov 9 02:22:02 2011 (r34335)
@@ -3026,10 +3026,6 @@ ALSA 0.9/1.x 音频输出驱动
.PD 1
.
.TP
-.B "alsa5\ \ "
-ALSA 0.5 音频输出驱动
-.
-.TP
.B "oss\ \ \ \ "
OSS 音频输出驱动
.PD 0
Modified: trunk/help/help_mp-bg.h
==============================================================================
--- trunk/help/help_mp-bg.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-bg.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -928,39 +928,12 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** ВашиÑÑ‚ аудио драйвер ÐЕ поддържа функциÑта select() ***\nРекомпилирайте MPlayer Ñ #undef HAVE_AUDIO_SELECT в config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]Фатална грешка:\n *** ÐУДИО УСТРОЙСТВОТО (%s) ÐЕ МОЖЕ ДРБЪДЕ ПРЕ-ОТВОРЕÐО/РЕСТÐРТИРÐÐО ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: заÑвен формат: %d Hz, %d канала, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: не Ñа открити звукови карти.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: заÑвен е невалиден формат (%s) - отхвърлен.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: грешка при отварÑне за възпроизвеждане: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: pcm info грешка: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: %d звукови карти Ñа открити, ползва Ñе: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: pcm channel info грешка: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: грешка при наÑтройване на параметрите: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: грешка при наÑтройка на канал: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: грешка при подготовка на канал: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: грешка при изчиÑтване потока за възпроизвеждане: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: грешка при възÑтановÑване на буферите за възпроизвеждане: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: грешка при затварÑне на pcm: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: грешка при изчиÑтване на потока за възпроизвеждане: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: грешка при възÑтановÑване на буферите за възпроизвеждане: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: грешка при подготовка на канал: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: грешка при изчиÑтване на потока за възпроизвеждане: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: грешка при възÑтановÑване на буферите за възпроизвеждане: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: грешка при подготовка на канал: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: претоварване на alsa, реÑтартиране на потока.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: грешка при подготовка за възпроизвеждане: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: грешка при Ð·Ð°Ð¿Ð¸Ñ Ñлед реÑтартиране: %s - отказ от операциÑта.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: грешка на изхода: %s\n"
-
// ao_plugin.c
#define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] невалиден плъгин: %s\n"
// ======================= AF Audio Filters ================================
-// libaf
-
// af_ladspa.c
#define MSGTR_AF_LADSPA_AvailableLabels "доÑтъпни етикети в"
Modified: trunk/help/help_mp-cs.h
==============================================================================
--- trunk/help/help_mp-cs.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-cs.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1175,31 +1175,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** OvladaÄ VaÅ¡Ã zvukové karty NEPODPORUJE select() ***\n PÅ™ekompilujte MPlayer s #undef HAVE_AUDIO_SELECT v config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nKritická chyba: *** NELZE ZNOVUOTEVŘÃT / RESTARTOVAT ZVUKOVÉ ZAŘÃZENà (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: požadovaný formát: %d Hz, %d kanál(ů), %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: žádná zvuková karta nebyla nalezena.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: požadován neplatný formát (%s) - výstup odpojen.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: chyba otevřenà přehrávánà zvuku: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: chyba v PCM info: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: nalezeno %d zvukových karet, použÃvám: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: chyba info v PCM kanálu: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: chyba při nastavovánà parametrů: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: chyba při nastavovánà kanálu: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: chyba pÅ™i pÅ™ÃpravÄ› kanálu: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: chyba playback drain: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: chyba playback flush: %s\n" //to jsou názvy že by jeden pad
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: chyba uzavřenà PCM: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: chyba playback drain: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: chyba playback flush: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: chyba pÅ™i pÅ™ÃpravÄ› kanálů: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: chyba playback drain: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: chyba playback flush: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: chyba pÅ™i pÅ™ÃpravÄ› kanálů: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: podteÄenà v alsa, restartuji proud.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: chyba pÅ™Ãpravy pÅ™ehrávánà zvuku: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: chyba při zápisu po restartu: %s - vzdávám to.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: chyba výstupu: %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Neplatný index směšovaÄů. PoužÃvám výchozà 0.\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Chyba otevÅ™enà směšovaÄe: %s\n"
@@ -1691,12 +1666,12 @@ static const char help_text[]=
// ================================== stream ====================================
-// ai_alsa1x.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Nelze nastavit vzorkovacà kmitoÄet.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Nelze nastavit Äas bufferu.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Nelze nastavit Äas periody.\n"
+// ai_alsa.c
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Nelze nastavit vzorkovacà kmitoÄet.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Nelze nastavit Äas bufferu.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Nelze nastavit Äas periody.\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Vadná konfigurace pro toto PCM: žádná dostupná konfigurace.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Nedostupný typ pÅ™Ãstupu.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "Nedostupný formát vzorku.\n"
Modified: trunk/help/help_mp-de.h
==============================================================================
--- trunk/help/help_mp-de.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-de.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1198,31 +1198,6 @@ static const char help_text[]=
"Kompiliere MPlayer mit #undef HAVE_AUDIO_SELECT in der Datei config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nKritischer Fehler: *** KANN AUDIO-GERÄT NICHT ERNEUT ÖFFNEN / ZURÜCKSETZEN *** %s\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: angefordertes Format: %d Hz, %d Kanäle, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: Keine Soundkarten gefunden.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: ungültiges Format (%s) angefordert - Ausgabe deaktiviert.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: Fehler beim Öffnen der Wiedergabe: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: PCM-Informatationsfehler: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: %d Soundkarte(n) gefunden, benutze: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: PCM-Kanal-Informationsfehler: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: Fehler beim Setzen der Parameter: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: Fehler beim Setzen des Kanals: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: Fehler beim Vorbereiten des Kanals: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: Fehler beim Ablauf der Wiedergabe: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: Wiedergabe-Flush-Fehler: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: Fehler beim Schließen von PCM: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: Fehler beim Ablauf der Wiedergabe: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: Wiedergabe-Flush-Fehler: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: Fehler beim Vorbereiten des Kanals: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: Fehler beim Ablauf der Wiedergabe: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: Wiedergabe-Flush-Fehler: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: Fehler beim Vorbereiten des Kanals: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: Alsa-Underrun, setze Stream zurück.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: Fehler beim Vorbereiten der Wiedergabe: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: Schreibfehler nach Rücksetzen: %s - gebe auf.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: Ausgabefehler: %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Ungültiger Mixerindex. Verwende Standardwert 0.\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Fehler beim Öffnen des Mixers: %s\n"
@@ -1349,10 +1324,10 @@ static const char help_text[]=
// url.c
#define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "Zeichenkette scheint bereits im URL-Format %c%c1%c2 'escaped' zu sein.\n"
-// ai_alsa1x.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Konnte Samplingrate nicht setzen.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Konnte Pufferzeit nicht setzen.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Konnte Periode nicht setzen.\n"
+// ai_alsa.c
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Konnte Samplingrate nicht setzen.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Konnte Pufferzeit nicht setzen.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Konnte Periode nicht setzen.\n"
// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Kaputte Konfiguration für diesen PCM-Kanal: Keine Konfiguration verfügbar.\n"
Modified: trunk/help/help_mp-es.h
==============================================================================
--- trunk/help/help_mp-es.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-es.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1189,31 +1189,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Su controlador de audio no soporta select() ***\nRecompile MPlayer con #undef HAVE_AUDIO_SELECT en config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nError fatal: *** IMPOSIBLE RE-ABRIR / RESETEAR DISPOSITIVO DE AUDIO (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: formato solicitado: %d Hz, %d canales, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: No se encontró tarjeta de sonido alguna.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: formato inválido (%s) solicitado - deshabilitando salida.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: Fallo en playback open: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: Error en pcm info: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: %d tarjeta(s) de sonido encontrada(s), using: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: Error en la información del canal PCM: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: Error configurando parámetros: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: Error configurando canal: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: Error preparando canal: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: Error de 'playback drain': %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: Error de 'playback flush': %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: Error cerrando pcm: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: Error de 'playback drain': %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: Error de 'playback flush': %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: Error preparando canal: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: Error de 'playback drain': %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: Error de 'playback flush': %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: Error preparando canal: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: alsa underrun, reseteando stream.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: Error preparando playback: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: Error de escritura despues de resetear: %s - me rindo!.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: Error de salida: %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Ãndice del mezclador inválido. Usando 0.\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Mezclador, error abriendo: %s\n"
@@ -1560,12 +1535,12 @@ static const char help_text[]=
// url.c
#define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "Al parecer el string ya ha sido escapado en url_scape %c%c1%c2\n"
-// ai_alsa1x.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "No puedo setear el samplerate.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "No puedo setear el tiempo del buffer.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "No puedo setear el tiempo del periodo.\n"
+// ai_alsa.c
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "No puedo setear el samplerate.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "No puedo setear el tiempo del buffer.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "No puedo setear el tiempo del periodo.\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Configuración erronea para este PCM: no hay configuraciones disponibles.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Tipo de acceso no disponible.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "Formato de muestreo no disponible.\n"
Modified: trunk/help/help_mp-fr.h
==============================================================================
--- trunk/help/help_mp-fr.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-fr.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1101,31 +1101,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Votre pilote audio ne supporte PAS select() ***\nRecompiler MPlayer avec #undef HAVE_AUDIO_SELECT dans config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nÉrreur fatale : *** IMPOSSIBLE DE RÉOUVRIR/REPARTIR PÉRIPHÉRIQUE AUDIO (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init : format requis : %d Hz, %d canaux, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init : aucune carte son trouvée.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init : format invalide (%s) requis - sortie désactivée.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init : erreur ouverture lecture : %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init : erreur pcm info : %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init : %d carte(s) son trouvée(s), utilise : %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init : erreur info canal pcm : %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init : erreur parametrage : %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init : erreur ouverture canal : %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init : erreur préparation canal : %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit : erreur drain de lecture : %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit : erreur vidage de lecture : %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit : erreur fermeture pcm : %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset : erreur drain de lecture : %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset : erreur vidage de lecture : %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset : erreur préparation canal : %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause : erreur drain de lecture : %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause : erreur vidage de lecture : %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume : erreur préparation canal : %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play : sous-passement alsa, réinit flux.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play : erreur préparation lecture : %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play : erreur écriture après réinit : %s - abandon.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play : erreur de sortie : %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Index du mixeur invalide. Défaut à 0.\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Erreur ouverture mixeur : %s\n"
@@ -1256,13 +1231,13 @@ static const char help_text[]=
#define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "La chaîne semble déjà échappée dans url_escape %c%c1%c2\n"
-// ai_alsa1x.c
+// ai_alsa.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Impossible de régler taux échantillon\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Impossible de régler heure tampon\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Impossible de régler heure période\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Impossible de régler taux échantillon\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Impossible de régler heure tampon\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Impossible de régler heure période\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Configuration brisée pour ce PCM : aucune configuration disponible\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Type d'accès non disponible\n"
Modified: trunk/help/help_mp-hu.h
==============================================================================
--- trunk/help/help_mp-hu.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-hu.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1188,31 +1188,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** A hangkártyád NEM támogatja a select()-et ***\nFordÃtsd újra az MPlayer-t az #undef HAVE_AUDIO_SELECT sorral a config.h-ban !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nVégzetes hiba: *** NEM LEHET ÚJRA MEGNYITNI / BEÃLLÃTANI AZ AUDIO ESZKÖZT (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: kért formátum: %d Hz, %d csatorna, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: nem találtam hangkártyát.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: hibás formátumot (%s) kértél - kimenet letiltva.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: playback megnyitási hiba: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: PCM info hiba: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: %d hangkártyát találtam, ezt használom: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: PCM csatorna info hiba: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: hiba a paraméterek beállÃtásakor: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: hiba a csatorna beállÃtásakor: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: csatorna elÅ‘készÃtési hiba: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: lejátszás drain hiba: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: lejátszás ürÃtési hiba: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: PCM lezárási hiba: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: lejátszás drain hiba: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: lejátszás ürÃtési hiba: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: csatorna elÅ‘készÃtési hiba: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: lejátszás drain hiba: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: lejátszás ürÃtési hiba: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: csatorna elÅ‘készÃtési hiba: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: alsa underrun, folyam beállÃtása.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: lejátszás elÅ‘készÃtési hiba: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: Ãrási hiba a beállÃtás után: %s - feladom.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: kimeneti hiba: %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Hibás mixer index. Alapértelmezés 0-ra.\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Mixer megnyitási hiba: %s\n"
@@ -1704,12 +1679,12 @@ static const char help_text[]=
// ================================== stream ====================================
-// ai_alsa1x.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Nem állÃtható be a mintavételi ráta.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Nem állÃtható be a buffer idÅ‘.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Nem állÃtható be a periódus idÅ‘.\n"
+// ai_alsa.c
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Nem állÃtható be a mintavételi ráta.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Nem állÃtható be a buffer idÅ‘.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Nem állÃtható be a periódus idÅ‘.\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Hibás konfiguráció ehhez a PCM-hez: nincs elérhető konfiguráció.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Elérési tÃpus nem használható.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "Minta formátum nem elérhető.\n"
Modified: trunk/help/help_mp-it.h
==============================================================================
--- trunk/help/help_mp-it.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-it.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1184,31 +1184,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Il tuo driver audio NON supporta select() ***\n Ricompila MPlayer con #undef HAVE_AUDIO_SELECT in config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nErrore fatale: *** NON POSSO RIAPRIRE / RESETTARE IL DEVICE AUDIO *** %s\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: formato richiesto: %d Hz, %d canali, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: nessuna scheda audio trovata.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: formato voluto (%s) invalido - output disabilitato.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: errore apertura riproduzione: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: errore informazioni PCM: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: %d scheda/e audio travata/e, uso: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: errore informazioni canale PCM: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: errore impostazione parametri: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: errore nell'impostazione canale: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: preparazione del canale: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: errore 'drain' riproduzione: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: errore 'flush' riproduzione: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: errore chiusura PCM: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: errore 'drain' riproduzione: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: errore 'flush' riproduzione: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: errore preparazione canale: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: errore 'drain' riproduzione: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: errore 'flush' riproduzione: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: errore preparazione canale: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: ritardo alsa, reimposto il flusso.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: errore preparazione riproduzione: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: errore di scrittura dopo reset: %s - mi arrendo.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: errore di output: %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Indice mixer non valido. Uso il default 0.\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Errore di apertura mixer: %s\n"
@@ -1702,12 +1677,12 @@ static const char help_text[]=
// ================================== stream ====================================
-// ai_alsa1x.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Non posso impostare il samplerate.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Non posso impostare il tempo del buffer.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Non posso impostare il tempo del periodo.\n"
+// ai_alsa.c
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Non posso impostare il samplerate.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Non posso impostare il tempo del buffer.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Non posso impostare il tempo del periodo.\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Configurazione PCM rovinata: nessuna configurazione disponibile.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Tipo di accesso non disponibile.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "Formato sample non disponibile.\n"
Modified: trunk/help/help_mp-nl.h
==============================================================================
--- trunk/help/help_mp-nl.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-nl.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -861,31 +861,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Your audio driver DOES NOT support select() ***\nRecompile MPlayer with #undef HAVE_AUDIO_SELECT in config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nFatal error: *** CANNOT RE-OPEN / RESET AUDIO DEVICE (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: gevraagd formaat: %d Hz, %d channels, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: geen geluidskaart gevonden.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: ongeldig formaat (%s) gevraagd - output uitgeschakeld.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: fout bij het afspelen : %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: pcm info fout: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: %d geluidskaart(en) gevonden, in gebruik: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: pcm kanaal info fout: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: fout bij het instellen van de parameters: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: fout bij het instellen van het kanaal: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: fout bij het voorbereiden van het kanaal: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: playback drain fout: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: playback flush fout: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: fout bij het sluiten van de pcm : %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: playback drain fout: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: playback flush fout: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: fout bij het voorbereiden van het kanaal: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: playback drain fout: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: playback flush fout: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: fout bij het voorbereiden van het kanaal: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: alsa buffer leeg, de stream wordt gereset.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: fout bij het voorbereiden van het afspelen: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: schrijffout na reset: %s - we geven op.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: output fout: %s\n"
-
// ao_plugin.c
#define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] ongeldige plugin: %s\n"
Modified: trunk/help/help_mp-pl.h
==============================================================================
--- trunk/help/help_mp-pl.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-pl.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1067,31 +1067,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Twój sterownik dźwiÄ™ku NIE OBSÅUGUJE select() ***\nPrzekompiluj MPlayer z opcjÄ… #undef HAVE_AUDIO_SELECT w config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nFatal error: *** Nie mogę otworzyć ponownie/zresetować urządzenia audio (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: żądany format: %d Hz, %d kanały, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: nie znaleziono żadnych kart dźwiękowych.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: żądanie niewłaściwego formatu (%s)a - wyjście wyłączone.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: błąd odtwarzania: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: bład PCM info: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: znalazłem %d kart dźwiękowych, używam: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: błąd PCM channel info: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: błąd ustawiania paremetrów: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: błąd ustawiania kanału: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: błąd przygotowywania kanału: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: błąd odsączania odtwarzania: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: błąd czyszczenia odtwarzania: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: błąd zamykania PCM: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: błąd odsączania odtwarzania: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: błąd czyszczenia odtwarzania: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: błąd przygotowywania kanału: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: błąd odsączania odtwarzania: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: błąd czyszczenia odtwarzania: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: błąd przygotowywania kanału: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: błąd alsa, resetuję strumień.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: błąd przygotowywania do odtwarzania: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: błąd zapisu po resecie: %s - przestaję.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: błąd wyjścia: %s\n"
-
// ao_plugin.c
#define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] nieprawidłowa wtyczka: %s\n"
@@ -1165,13 +1140,13 @@ static const char help_text[]=
#define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "Åancuch wydaje siÄ™ być już zakodowany w url_escape %c%c1%c2\n"
-// ai_alsa1x.c
+// ai_alsa.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Nie mogę ustawić częstotliwości próbkowania.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Nie moge ustawić czasu bufora.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Nie mogę ustawić czasu okresu.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Nie mogę ustawić częstotliwości próbkowania.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Nie moge ustawić czasu bufora.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Nie mogę ustawić czasu okresu.\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Błędna konfiguracja tego PCM: brak dostępnych konfiguracji.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Niedostępny tryb dostępu.\n"
Modified: trunk/help/help_mp-ru.h
==============================================================================
--- trunk/help/help_mp-ru.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-ru.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1176,31 +1176,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Ваш аудиодрайвер ÐЕ поддерживает select() ***\nПерекомпилируйте MPlayer Ñ #undef HAVE_AUDIO_SELECT в config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN] Ð¤Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°:\n*** ÐЕ МОГУ ПОВТОРÐО ОТКРЫТЬ / СБРОСИТЬ ÐУДИОУСТРОЙСТВО (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: запрошенный формат: %d Гц, %d каналов, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: не найдено звуковых карт.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: запрошен неверный формат (%s) - вывод отключен.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¿Ð¾Ñ‚Ð¾ÐºÐ° воÑпроизведениÑ: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ pcm информации: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: найдена(о) %d звуковаÑ(Ñ‹Ñ…) карт(а), иÑпользую: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ð¸ pcm канала: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка уÑтановки параметров: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка уÑтановки канала: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] Ð¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка подготовки канала: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] Ð´ÐµÐ¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка очиÑтки потока воÑпроизведениÑ: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] Ð´ÐµÐ¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка ÑброÑа буферов потока воÑпроизведениÑ: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] Ð´ÐµÐ¸Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ alsa: ошибка Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ pcm: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] ÑÐ±Ñ€Ð¾Ñ alsa: ошибка очиÑтки потока воÑпроизведениÑ: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] ÑÐ±Ñ€Ð¾Ñ alsa: ошибка ÑброÑа буферов потока воÑпроизведениÑ: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] ÑÐ±Ñ€Ð¾Ñ alsa: ошибка подготовки канала: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] пауза alsa: ошибка очиÑтки потока воÑпроизведениÑ: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] пауза alsa: ошибка ÑброÑа буферов потока воÑпроизведениÑ: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] возобновление alsa: ошибка подготовки канала: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] воÑпроизведение alsa: alsa недогружена, ÑбраÑываю поток.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] воÑпроизведение alsa: ошибка подготовки потока воÑпроизведениÑ: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] воÑпроизведение alsa: ошибка запиÑи поÑле ÑброÑа: %s - безнадёжно.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] воÑпроизведение alsa: ошибка вывода: %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Ðеверный Ð¸Ð½Ð´ÐµÐºÑ Ð¼Ð¸ÐºÑˆÐµÑ€Ð°. Возврат к 0.\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Ошибка Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¼Ð¸ÐºÑˆÐµÑ€Ð°: %s\n"
@@ -1732,12 +1707,12 @@ static const char help_text[]=
// ================================== stream ====================================
-// ai_alsa1x.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Ðе могу задать чаÑтоту диÑкретизации.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Ðе могу задать Ð²Ñ€ÐµÐ¼Ñ Ð±ÑƒÑ„ÐµÑ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸.\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Ðе могу задать Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€Ð¸Ð¾Ð´Ð°.\n"
+// ai_alsa.c
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Ðе могу задать чаÑтоту диÑкретизации.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Ðе могу задать Ð²Ñ€ÐµÐ¼Ñ Ð±ÑƒÑ„ÐµÑ€Ð¸Ð·Ð°Ñ†Ð¸Ð¸.\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Ðе могу задать Ð²Ñ€ÐµÐ¼Ñ Ð¿ÐµÑ€Ð¸Ð¾Ð´Ð°.\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ PCM: нет доÑтупных конфигураций.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Тип доÑтупа не доÑтупен.\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "Формат образца не доÑтупен.\n"
Modified: trunk/help/help_mp-sv.h
==============================================================================
--- trunk/help/help_mp-sv.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-sv.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -881,31 +881,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Din ljudkortsenhet hanterar inte select() ***\nKompilera om med '#undef HAVE_AUDIO_SELECT' i config.h !\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nFatalt fel: *** KAN INTE ÅTERÖPPNA / ÅTERSTÄLLA AUDIOENHET (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-init: önskat format: %d Hz, %d kanaler, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init: inga ljudkort funna.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-init: icke godkänt format (%s) önskat - ut deaktiverat.\n" // FIXME output -> ut here?
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init: uppspelningsöppningsfel: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init: pcm-infofel: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-init: %d ljurtkort funna, använder: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init: pcm-kanalinfofel: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init: fel vid sättning av parametrarna: %s\n" // FIXME setting?
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init: fel vid initiering av kanal: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init: kanalprepareringsfel: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit: uppspelningslänsningsfel: %s\n" // FIXME drain -> länsning?
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit: uppspelningsspolningsfel: %s\n" // FIXME flush -> spolning?
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit: pcm-stängningsfel: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset: uppspelningslänsningsfel: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset: uppspelningsspolningsfel: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset: kanalprepareringsfel: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause: uppspelningslänsningsfel: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause: uppspelningsspolningsfel: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume: kanalprepareringsfel: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: alsa underrun, återställer ström.\n" // FIXME underun - translate?
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play: uppspelningsprepareringsfel: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play: skrivfel efter återställning: %s - ger upp.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play: utfel: %s\n" // FIXME output -> ut her?
-
// ao_plugin.c
#define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] icke godkänd plugin: %s\n" // FIXME plugin - translate?
Modified: trunk/help/help_mp-tr.h
==============================================================================
--- trunk/help/help_mp-tr.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-tr.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1115,31 +1115,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** Ses sürücünüzün select() desteği YOK ***\nconfig.h dosyasında #undef HAVE_AUDIO_SELECT ile Mplayer'ı yeniden derleyiniz!\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\nÖnemli Hata: ***SES AYGITI TEKRAR AÇILAMIYOR (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-açılış: istenen biçim: %d Hz, %d kanalları, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-açılış: ses kartı bulunamadı.\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-açılış: geçersiz biçim (%s) istenen - çıktı devredışı.\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-açılış: playback açma hatası: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-açılış: pcm bilgi hatası: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-açılış: %d ses kart(lar)ı bulundu, kullanılan: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-açılış: pcm kanal bilgi hatası: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-açılış: parametre ayarlama hatası: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-açılış: kanal kurulum hatası: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-açılış: kanal hazırlama hatası: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-kapanış: playback drain hatası: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-kapanış: playback flush hatası: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-kapanış: pcm kapanış hatası: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-sıfırla: playback drain hatası: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-sıfırla: playback yayın flush hatası: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-sıfırla: kanal hazırlama hatası: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-duraklat: playback drain hatası: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-duraklat: playback flush hatası: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-sürdür: kanal hazırlama hatası: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-oynat: alsa underrun, yayın tekrar ayarlanıyor.\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-oynat: playback hazırlama hatası: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-oynat: yeniden başlatma sonrası yazma hatası: %s - vazgeçiliyor.\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-oynat: çıktı hatası: %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] Geçersiz karıştırıcı içeriği. Varsayılan olarak 0. yapılıyor\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] Karıştırıcı açma hatası: %s\n"
@@ -1265,13 +1240,13 @@ static const char help_text[]=
#define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "%c%c1%c2 url_atlamasında dizgi zaten atlatılmış görünüyor.\n"
-// ai_alsa1x.c
+// ai_alsa.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "Örnekleme oranı ayarlanamıyor\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "Tampon zamanı ayarlanamıyor\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "Zaman aralığı ayarlanamıyor\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "Örnekleme oranı ayarlanamıyor\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "Tampon zamanı ayarlanamıyor\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "Zaman aralığı ayarlanamıyor\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "Bu PCM için bozuk ayar: kullanılabilir ayar yok\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "Erişim türü kullanılabilir değil\n"
Modified: trunk/help/help_mp-zh_CN.h
==============================================================================
--- trunk/help/help_mp-zh_CN.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-zh_CN.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1234,31 +1234,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** ä½ çš„éŸ³é¢‘é©±åŠ¨ä¸æ”¯æŒ select() ***\n需è¦åœ¨ config.h ä¸è®¾ç½® #undef HAVE_AUDIO_SELECT 并é‡æ–°ç¼–译 MPlayerï¼\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\n致命错误：*** æ— æ³•é‡æ–°æ‰“å¼€/é‡å¯éŸ³é¢‘设备（%s）***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-initï¼šæ‰€è¯·æ±‚æ ¼å¼ï¼š%d Hz，%d 声é“，%s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-init：未找到声å¡ã€‚\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-initï¼šæ‰€è¯·æ±‚æ ¼å¼æ— 效（%s）- ç¦ç”¨éŸ³é¢‘输出。\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-init：打开æ’放模å¼é”™è¯¯ï¼š%s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-init：PCM ä¿¡æ¯é”™è¯¯ï¼š%s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-initï¼šæ‰¾åˆ°å£°å¡ %d，使用：%s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-init：PCM 声é“ä¿¡æ¯é”™è¯¯ï¼š%s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-init：设定å‚数错误：%s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-init：设定声é“错误：%s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-init：准备声é“错误：%s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-uninit：æ’放数æ®æ¸…空错误：%s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-uninit：æ’放数æ®åˆ·æ–°é”™è¯¯ï¼š%s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-uninit：PCM å…³é—错误：%s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-reset：æ’放数æ®æ¸…空错误：%s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-reset：æ’放数æ®åˆ·æ–°é”™è¯¯ï¼š%s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-reset：声é“准备错误：%s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-pause：æ’放数æ®åˆ·æ–°é”™è¯¯ï¼š%s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-pause：æ’放数æ®åˆ·æ–°é”™è¯¯ï¼š%s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-resume：声é“准备错误：%s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play：alsa 输出滞åŽï¼Œé‡æ–°è®¾ç½®éŸ³é¢‘æµã€‚\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-play：æ’放准备错误：%s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-play：é‡ç½®åŽå†™å…¥é”™è¯¯ï¼š%s - 放弃。\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-play：输出错误：%s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] æ— æ•ˆçš„æ··éŸ³å™¨ç´¢å¼•å·ã€‚å–默认值 0。\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] 打开混音器错误：%s\n"
@@ -1751,12 +1726,12 @@ static const char help_text[]=
// ================================== stream ====================================
-// ai_alsa1x.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "æ— æ³•è®¾ç½®é‡‡æ ·çŽ‡ã€‚\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "æ— æ³•è®¾ç½®ç¼“å†²æ—¶é—´ã€‚\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "æ— æ³•è®¾ç½®é‡‡æ ·é—´éš”æ—¶é—´ã€‚\n"
+// ai_alsa.c
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "æ— æ³•è®¾ç½®é‡‡æ ·çŽ‡ã€‚\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "æ— æ³•è®¾ç½®ç¼“å†²æ—¶é—´ã€‚\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "æ— æ³•è®¾ç½®é‡‡æ ·é—´éš”æ—¶é—´ã€‚\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "该 PCM çš„é…置文件已æŸåï¼šæ— å¯ç”¨é…置。\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "æ— å¯ç”¨è®¿é—®ç±»åž‹ã€‚\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableSampleFmt "æ— å¯ç”¨é‡‡æ ·æ ¼å¼ã€‚\n"
Modified: trunk/help/help_mp-zh_TW.h
==============================================================================
--- trunk/help/help_mp-zh_TW.h Wed Nov 9 01:32:12 2011 (r34334)
+++ trunk/help/help_mp-zh_TW.h Wed Nov 9 02:22:02 2011 (r34335)
@@ -1086,31 +1086,6 @@ static const char help_text[]=
#define MSGTR_AO_SUN_CantUseSelect "[AO SUN]\n *** ä½ çš„éŸ³é »é©…å‹•ä¸æ”¯æŒ select() ***\n用 config.h ä¸çš„ #undef HAVE_AUDIO_SELECT é‡æ–°ç·¨è¯ MPlayer!\n\n"
#define MSGTR_AO_SUN_CantReopenReset "[AO SUN]\n致命錯誤: *** 無法é‡æ–°æ‰“開或é‡è¨éŸ³é »è¨å‚™ (%s) ***\n"
-// ao_alsa5.c
-#define MSGTR_AO_ALSA5_InitInfo "[AO ALSA5] alsa-åˆå§‹: è«‹æ±‚çš„æ ¼å¼: %d Hz, %d 通é“, %s\n"
-#define MSGTR_AO_ALSA5_SoundCardNotFound "[AO ALSA5] alsa-åˆå§‹: 找ä¸åˆ°è²å¡ã€‚\n"
-#define MSGTR_AO_ALSA5_InvalidFormatReq "[AO ALSA5] alsa-åˆå§‹: è«‹æ±‚ç„¡æ•ˆçš„æ ¼å¼ (%s) - åœç”¨è¼¸å‡ºã€‚\n"
-#define MSGTR_AO_ALSA5_PlayBackError "[AO ALSA5] alsa-åˆå§‹: 回放打開錯誤: %s\n"
-#define MSGTR_AO_ALSA5_PcmInfoError "[AO ALSA5] alsa-åˆå§‹: PCM ä¿¡æ¯éŒ¯èª¤: %s\n"
-#define MSGTR_AO_ALSA5_SoundcardsFound "[AO ALSA5] alsa-åˆå§‹: 找到 %d è²å¡, 使用: %s\n"
-#define MSGTR_AO_ALSA5_PcmChanInfoError "[AO ALSA5] alsa-åˆå§‹: PCM 通é“ä¿¡æ¯éŒ¯èª¤: %s\n"
-#define MSGTR_AO_ALSA5_CantSetParms "[AO ALSA5] alsa-åˆå§‹: è¨å®šåƒæ•¸éŒ¯èª¤: %s\n"
-#define MSGTR_AO_ALSA5_CantSetChan "[AO ALSA5] alsa-åˆå§‹: è¨å®šé€šé“錯誤: %s\n"
-#define MSGTR_AO_ALSA5_ChanPrepareError "[AO ALSA5] alsa-åˆå§‹: 通é“凖備錯誤: %s\n"
-#define MSGTR_AO_ALSA5_DrainError "[AO ALSA5] alsa-ååˆå§‹: 回放排出(drain)錯誤: %s\n"
-#define MSGTR_AO_ALSA5_FlushError "[AO ALSA5] alsa-ååˆå§‹: 回放清空(flush)錯誤: %s\n"
-#define MSGTR_AO_ALSA5_PcmCloseError "[AO ALSA5] alsa-ååˆå§‹: PCM 關閉錯誤: %s\n"
-#define MSGTR_AO_ALSA5_ResetDrainError "[AO ALSA5] alsa-é‡ç½®: 回放排出(drain)錯誤: %s\n"
-#define MSGTR_AO_ALSA5_ResetFlushError "[AO ALSA5] alsa-é‡ç½®: 回放清空(flush)錯誤: %s\n"
-#define MSGTR_AO_ALSA5_ResetChanPrepareError "[AO ALSA5] alsa-é‡ç½®: 通é“凖備錯誤: %s\n"
-#define MSGTR_AO_ALSA5_PauseDrainError "[AO ALSA5] alsa-æš«åœ: 回放排出(drain)錯誤: %s\n"
-#define MSGTR_AO_ALSA5_PauseFlushError "[AO ALSA5] alsa-æš«åœ: 回放清空(flush)錯誤: %s\n"
-#define MSGTR_AO_ALSA5_ResumePrepareError "[AO ALSA5] alsa-æ¢è¤‡: 通é“凖備錯誤: %s\n"
-#define MSGTR_AO_ALSA5_Underrun "[AO ALSA5] alsa-play: alsa 未é‹è¡Œ, é‡æ–°å•Ÿå‹•æµã€‚\n"
-#define MSGTR_AO_ALSA5_PlaybackPrepareError "[AO ALSA5] alsa-æ’放: 回放凖備錯誤: %s\n"
-#define MSGTR_AO_ALSA5_WriteErrorAfterReset "[AO ALSA5] alsa-æ’放: é‡å•Ÿå¾Œå¯«éŒ¯èª¤: %s - 放棄。\n"
-#define MSGTR_AO_ALSA5_OutPutError "[AO ALSA5] alsa-æ’放: 輸出錯誤: %s\n"
-
// ao_alsa.c
#define MSGTR_AO_ALSA_InvalidMixerIndexDefaultingToZero "[AO_ALSA] 無效的混音索引。å–默èªå€¼ 0。\n"
#define MSGTR_AO_ALSA_MixerOpenError "[AO_ALSA] 混音打開錯誤: %s\n"
@@ -1235,13 +1210,13 @@ static const char help_text[]=
#define MSGTR_MPDEMUX_URL_StringAlreadyEscaped "å—符轉義好åƒå·²ç™¼ç”Ÿåœ¨ url_escape %c%c1%c2\n"
-// ai_alsa1x.c
+// ai_alsa.c
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetSamplerate "無法è¨ç½®é‡‡æ§˜çŽ‡ã€‚\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetBufferTime "無法è¨ç½®ç·©è¡æ™‚間。\n"
-#define MSGTR_MPDEMUX_AIALSA1X_CannotSetPeriodTime "無法è¨ç½®é–“隔時間。\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetSamplerate "無法è¨ç½®é‡‡æ§˜çŽ‡ã€‚\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetBufferTime "無法è¨ç½®ç·©è¡æ™‚間。\n"
+#define MSGTR_MPDEMUX_AIALSA_CannotSetPeriodTime "無法è¨ç½®é–“隔時間。\n"
-// ai_alsa1x.c / ai_alsa.c
+// ai_alsa.c
#define MSGTR_MPDEMUX_AIALSA_PcmBrokenConfig "æ¤ PCM çš„é…置文件æ壞: é…ç½®ä¸å¯ç”¨ã€‚\n"
#define MSGTR_MPDEMUX_AIALSA_UnavailableAccessType "訪å•é¡žåž‹ä¸å¯ç”¨ã€‚\n"
More information about the MPlayer-translations
mailing list