diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:07:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-07 13:15:37 +0300 |
| commit | 267a3f4c9c00848f32c341595d2d831157a79bee (patch) | |
| tree | cdef15bb746e3a41b1813076f24035fcc8385c30 /help/help_mp-en.h | |
| parent | 5484215d044522bcd30516e458e421f403ca8e35 (diff) | |
| parent | 96fa9c4e249e9467f21e32191882e511e762fb1f (diff) | |
| download | mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.bz2 mpv-267a3f4c9c00848f32c341595d2d831157a79bee.tar.xz | |
Merge svn changes up to r26680
Conflicts:
Makefile
configure
osdep/timer-darwin.c
Diffstat (limited to 'help/help_mp-en.h')
| -rw-r--r-- | help/help_mp-en.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 650757da9e..a97938e8c2 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -2034,7 +2034,7 @@ static char help_text[]= #define MSGTR_LIBASS_ErrorOpeningFont "[ass] Error opening font: %s, %d\n" // ass_fontconfig.c -#define MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne "[ass] fontconfig: Selected font family is not the requested one: '%s' != '%s'\n" +#define MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne "[ass] fontconfig: Selected font is not the requested one: '%s' != '%s'\n" #define MSGTR_LIBASS_UsingDefaultFontFamily "[ass] fontconfig_select: Using default font family: (%s, %d, %d) -> %s, %d\n" #define MSGTR_LIBASS_UsingDefaultFont "[ass] fontconfig_select: Using default font: (%s, %d, %d) -> %s, %d\n" #define MSGTR_LIBASS_UsingArialFontFamily "[ass] fontconfig_select: Using 'Arial' font family: (%s, %d, %d) -> %s, %d\n" @@ -2065,7 +2065,7 @@ static char help_text[]= #define MSGTR_LIBASS_EventHeightHasChanged "[ass] Warning! Event height has changed! \n" // ass_font.c -#define MSGTR_LIBASS_GlyphNotFoundReselectingFont "[ass] Glyph 0x%X not found, reselecting font for (%s, %d, %d)\n" +#define MSGTR_LIBASS_GlyphNotFoundReselectingFont "[ass] Glyph 0x%X not found, selecting one more font for (%s, %d, %d)\n" #define MSGTR_LIBASS_GlyphNotFound "[ass] Glyph 0x%X not found in font for (%s, %d, %d)\n" #define MSGTR_LIBASS_ErrorOpeningMemoryFont "[ass] Error opening memory font: %s\n" #define MSGTR_LIBASS_NoCharmaps "[ass] font face with no charmaps\n" |