diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
| tree | a838e509fdc2468220466e6337097b3ef590b00c /help/help_mp-nb.h | |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
| download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz | |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'help/help_mp-nb.h')
| -rw-r--r-- | help/help_mp-nb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/help_mp-nb.h b/help/help_mp-nb.h index 6eb2e440ce..b914c6566f 100644 --- a/help/help_mp-nb.h +++ b/help/help_mp-nb.h @@ -98,7 +98,7 @@ static char help_text[]= #define MSGTR_ConnToServer "Koblet til server: %s\n" #define MSGTR_FileNotFound "Finner ikke filen: '%s'\n" -#define MSGTR_CantOpenDVD "Kan ikke åpne DVD enhet: %s\n" +#define MSGTR_CantOpenDVD "Kan ikke åpne DVD enhet: %s (%s)\n" #define MSGTR_DVDnumTitles "Det er %d titler på denne DVD.\n" #define MSGTR_DVDinvalidTitle "Ugyldig DVD tittelnummer: %d\n" #define MSGTR_DVDnumChapters "Det er %d kapitler i denne DVD tittelen.\n" |