diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
| commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
| tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /help/help_mp-en.h | |
| parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
| parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
| download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz | |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'help/help_mp-en.h')
| -rw-r--r-- | help/help_mp-en.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 9ab96535b7..bb01af1222 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -1153,6 +1153,10 @@ static char help_text[]= // audio_out.c #define MSGTR_AO_ALSA9_1x_Removed "audio_out: alsa9 and alsa1x modules were removed, use -ao alsa instead.\n" +#define MSGTR_AO_TryingPreferredAudioDriver "Trying preferred audio driver '%.*s', options '%s'\n" +#define MSGTR_AO_NoSuchDriver "No such audio driver '%.*s'\n" +#define MSGTR_AO_FailedInit "Failed to initialize audio driver '%s'\n" +#define MSGTR_AO_TryingEveryKnown "Trying every known audio driver...\n" // ao_oss.c #define MSGTR_AO_OSS_CantOpenMixer "[AO OSS] audio_setup: Can't open mixer device %s: %s\n" |