diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
| commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /help | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
| download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz | |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'help')
| -rw-r--r-- | help/help_mp-it.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/help/help_mp-it.h b/help/help_mp-it.h index dfecd6edeb..55bf3c071f 100644 --- a/help/help_mp-it.h +++ b/help/help_mp-it.h @@ -2,7 +2,7 @@ // Updated by: Roberto Togni <see AUTHORS for email address> // Updated by: PaulTT <see AUTHORS for email address> -// Updated to help_mp-en.h r27071 +// Updated to help_mp-en.h r27402 // ========================= MPlayer help =========================== @@ -1092,6 +1092,11 @@ static char help_text[]= // audio_out.c #define MSGTR_AO_ALSA9_1x_Removed "audio_out: i moduli alsa9/alsa1x sono stati rimossi, ora usa -ao alsa.\n" +#define MSGTR_AO_TryingPreferredAudioDriver "Provo con il driver audio preferito '%.*s', opzioni '%s'\n" +#define MSGTR_AO_NoSuchDriver "driver audio '%.*s' non trovato\n" +#define MSGTR_AO_FailedInit "Inizializzazione del driver audio '%s' non riuscita\n" +#define MSGTR_AO_TryingEveryKnown "Provo con tutti i driver audio conosciuti...\n" + // ao_oss.c #define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup: Non posso aprire il dispositivo mixer %s: %s\n" |