summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TOOLS/subfont-c/font.desc.tail10
-rw-r--r--TOOLS/subfont-c/subfont.c2
-rwxr-xr-xTOOLS/wma2ogg.pl2
-rw-r--r--help/help_mp-el.h2
-rw-r--r--help/help_mp-fr.h2
-rw-r--r--help/help_mp-it.h2
-rw-r--r--help/help_mp-ja.h2
-rw-r--r--help/help_mp-zh_CN.h4
-rw-r--r--libmpdemux/demux_ty.c2
-rw-r--r--libmpdemux/demux_xmms.c2
-rw-r--r--libmpdemux/tvi_v4l2.c2
11 files changed, 16 insertions, 16 deletions
diff --git a/TOOLS/subfont-c/font.desc.tail b/TOOLS/subfont-c/font.desc.tail
index 004887e6de..c1205e9960 100644
--- a/TOOLS/subfont-c/font.desc.tail
+++ b/TOOLS/subfont-c/font.desc.tail
@@ -1,12 +1,12 @@
;
-; Mplayer subtitle font description file - HighreS ONE
+; MPlayer subtitle font description file - HighreS ONE
; font created by a'rpi & chass
; .desc created by chass & atmosfear
; -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
;
;
-; This file contains the data for Mplayer to build up the font
+; This file contains the data for MPlayer to build up the font
; table from the bitmap files. These fonts are used for the OSD
; (On Screen Display) and for the subtitles.
;
@@ -14,7 +14,7 @@
; A few words for the novice user about the fonts:
; -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
;
-; Mplayer uses antialiased bitmap fonts, which look far better
+; MPlayer uses antialiased bitmap fonts, which look far better
; then the TTF rendering used by other players. A letter consists
; of two main parts: the Bitmap and the Alpha chanel. The bitmap
; is what you see on the screen, and the Aplha chanel makes the
@@ -22,10 +22,10 @@
; the alpha to get a smooth black outline of the letters, which
; makes them visible even on white areas of the movie.
;
-; Mplayer needs at least two seperate 8bit/pixel format bitmap
+; MPlayer needs at least two seperate 8bit/pixel format bitmap
; files and a .desc file to be able to use the font. One of the
; files is the bitmap the other is the alpha. The .desc (like this
-; one) gives Mplayer the information needed to convert a bitmap
+; one) gives MPlayer the information needed to convert a bitmap
; to characters. But the .desc allows to use more bitmap and alpha
; files: this feature is useful when one wants to add local language
; support for the subtitles.
diff --git a/TOOLS/subfont-c/subfont.c b/TOOLS/subfont-c/subfont.c
index e1b2d65c04..70619280a3 100644
--- a/TOOLS/subfont-c/subfont.c
+++ b/TOOLS/subfont-c/subfont.c
@@ -252,7 +252,7 @@ void render() {
if (append_mode) {
fprintf(f, "\n\n# ");
} else {
- fprintf(f, "# This file was generated with subfont for Mplayer.\n"
+ fprintf(f, "# This file was generated with subfont for MPlayer.\n"
"# Subfont by Artur Zaprzala <zybi@fanthom.irc.pl>.\n\n");
fprintf(f, "[info]\n");
}
diff --git a/TOOLS/wma2ogg.pl b/TOOLS/wma2ogg.pl
index ee8aacbdd3..7b81b430f4 100755
--- a/TOOLS/wma2ogg.pl
+++ b/TOOLS/wma2ogg.pl
@@ -10,7 +10,7 @@
# Needed programs:
#
# Getopt::Long - Perl Module
-# Mplayer - http://www.mplayerhq.hu
+# MPlayer - http://www.mplayerhq.hu
# BladeEnc - http://bladeenc.mp3.no
# oggenc - http://www.vorbis.com
# mp3info - http://www.ibiblio.org/mp3info
diff --git a/help/help_mp-el.h b/help/help_mp-el.h
index 13aa38efc5..ced7620f6a 100644
--- a/help/help_mp-el.h
+++ b/help/help_mp-el.h
@@ -142,7 +142,7 @@ static char help_text[]=
" ç ìåôáãëþôôéóç/âåëôéóôïðïßçóç.\n"\
" ÅëÝãîôå ôï!\n"
#define MSGTR_Exit_SIGSEGV_SIGFPE \
-"- Ôï Mplayer êáôÝññåõóå áðü êáêÞ ÷ñÞóç ôïõ åðåîåñãáóôÞ Þ ôçò ìíÞìçò.\n"\
+"- Ôï MPlayer êáôÝññåõóå áðü êáêÞ ÷ñÞóç ôïõ åðåîåñãáóôÞ Þ ôçò ìíÞìçò.\n"\
" Áíáìåôáãëùôôßóôå ôï MPlayer ìå --enable-debug êáé ôñÝîôå 'gdb' backtrace êáé\n"\
" disassembly. Ãéá ëåðôïìÝñåéåò, äåßôå ôï DOCS/HTML/en/bugreports_what.html#bugreports_crash\n"
#define MSGTR_Exit_SIGCRASH \
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h
index 4bf4222741..c9e4e5e127 100644
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@@ -499,7 +499,7 @@ static char help_text[]=
#define MSGTR_PREFERENCES_ExtraStereo "Activer l'extra-stéréo"
#define MSGTR_PREFERENCES_Coefficient "Coefficient:"
#define MSGTR_PREFERENCES_AudioDelay "Retard audio"
-#define MSGTR_PREFERENCES_DoubleBuffer "Activer le double-buffering"
+#define MSGTR_PREFERENCES_DoubleBuffer "Activer le doublebuffering"
#define MSGTR_PREFERENCES_DirectRender "Activer le rendu direct"
#define MSGTR_PREFERENCES_FrameDrop "Activer le saut de trame"
#define MSGTR_PREFERENCES_HFrameDrop "Activer le saut de trame VIOLENT (dangereux)"
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index f0a188658f..bbd051ae07 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -105,7 +105,7 @@ static char help_text[]=
#define MSGTR_Playing "In riproduzione %s\n"
#define MSGTR_NoSound "Audio: nessun suono!!!\n"
#define MSGTR_FPSforced "FPS forzato a %5.3f (ftime: %5.3f)\n"
-#define MSGTR_CompiledWithRuntimeDetection "Complato con riconoscimento run time della cpu - attenzione, non è il metodo ideale! Per avere le migliori prestazioni, ricompila Mplayer con --disable-runtime-cpudetection\n"
+#define MSGTR_CompiledWithRuntimeDetection "Complato con riconoscimento run time della cpu - attenzione, non è il metodo ideale! Per avere le migliori prestazioni, ricompila MPlayer con --disable-runtime-cpudetection\n"
#define MSGTR_CompiledWithCPUExtensions "Compilato per CPU x86 con estensioni:"
#define MSGTR_AvailableVideoOutputPlugins "Plugin di output video disponibili:\n"
#define MSGTR_AvailableVideoOutputDrivers "Driver di output video disponibili:\n"
diff --git a/help/help_mp-ja.h b/help/help_mp-ja.h
index dce8e0ec41..07c4ff47d9 100644
--- a/help/help_mp-ja.h
+++ b/help/help_mp-ja.h
@@ -137,7 +137,7 @@ static char help_text[]=
" compiled/optimized for.\n"\
" Verify this!\n"
#define MSGTR_Exit_SIGSEGV_SIGFPE \
-"- Mplayer¤ÏÉÔÎÉ¤Ê CPU/FPU/RAM ¤Ë¤è¤Ã¤Æ¥¯¥é¥Ã¥·¥å¤·¤Þ¤·¤¿.\n"\
+"- MPlayer¤ÏÉÔÎÉ¤Ê CPU/FPU/RAM ¤Ë¤è¤Ã¤Æ¥¯¥é¥Ã¥·¥å¤·¤Þ¤·¤¿.\n"\
" Recompile MPlayer with --enable-debug and make a 'gdb' backtrace and\n"\
" --enable-debug¤ò¤Ä¤±¤ÆMPlyaer¤ò¥³¥ó¥Ñ¥¤¥ë¤·¤Ê¤ª¤·¡¢gdb¤ÇÄ´ºº¤·¤Þ¤·¤ç¤¦\n"\
" ¾ÜºÙ¤Ï DOCS/HTML/en/bugreports.html#bugreports_crash ¤Ë¤¢¤ê¤Þ¤¹\n"
diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h
index 11ea4b1320..0725fe016e 100644
--- a/help/help_mp-zh_CN.h
+++ b/help/help_mp-zh_CN.h
@@ -103,7 +103,7 @@ static char help_text[]=
"ÔĶÁDOCS/zh/video.htmlºÍDOCS/zh/sound.htmlÀ´Ñ°ÕÒµ÷Õû/¼ÓËٵļ¼ÇÉ¡£\n"\
"Èç¹ûÕâЩһ¸ö¶¼Óò»ÉÏ£¬ÔĶÁDOCS/zh/bugreports.html£¡\n\n"
-#define MSGTR_NoGui "MplayerûÓбàÒëGUIµÄÖ§³Ö!\n"
+#define MSGTR_NoGui "MPlayerûÓбàÒëGUIµÄÖ§³Ö!\n"
#define MSGTR_GuiNeedsX "MPlayer GUIÐèÒªX11!\n"
#define MSGTR_Playing "²¥·Å %s.\n"
#define MSGTR_NoSound "񙮵: no sound\n"
@@ -524,7 +524,7 @@ static char help_text[]=
#define MSGTR_PREFERENCES_SUB_POS "λÖÃ: "
#define MSGTR_PREFERENCES_SUB_AutoLoad "½ûÓÃ×ÖÄ»×Ô¶¯×°ÔØ"
#define MSGTR_PREFERENCES_SUB_Unicode "Unicode×ÖÄ»"
-#define MSGTR_PREFERENCES_SUB_MPSUB "½«Ëù¸ø×ÖĻת»»ÎªMplayerµÄ×ÖÄ»Îļþ"
+#define MSGTR_PREFERENCES_SUB_MPSUB "½«Ëù¸ø×ÖĻת»»ÎªMPlayerµÄ×ÖÄ»Îļþ"
#define MSGTR_PREFERENCES_SUB_SRT "½«Ëù¸ø×ÖĻת»»Îª»ùÓÚʱ¼äµÄSubViewer(SRT) ¸ñʽ"
#define MSGTR_PREFERENCES_SUB_Overlap "¿ªÆô×ÖÄ»Öصþ"
#define MSGTR_PREFERENCES_Font "×ÖÌå:"
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c
index 69329a5166..4f35a93906 100644
--- a/libmpdemux/demux_ty.c
+++ b/libmpdemux/demux_ty.c
@@ -532,7 +532,7 @@ int demux_ty_fill_buffer( demuxer_t *demux )
0x20000 ) );
- // Let's make a Video Demux Stream for Mplayer
+ // Let's make a Video Demux Stream for MPlayer
aid = 0x0;
if( !demux->v_streams[ aid ] ) new_sh_video( demux, aid );
if( demux->video->id == -1 ) demux->video->id = aid;
diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c
index 44a09a2217..ca905683f6 100644
--- a/libmpdemux/demux_xmms.c
+++ b/libmpdemux/demux_xmms.c
@@ -119,7 +119,7 @@ static OutputPlugin xmms_output_plugin =
{
NULL,
NULL,
- "Mplayer output interface Plugin ", /* Description */
+ "MPlayer output interface plugin ", /* Description */
disk_init,
NULL, /* about */
NULL, /* configure */
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c
index 0f7bbf048d..41b59eaafe 100644
--- a/libmpdemux/tvi_v4l2.c
+++ b/libmpdemux/tvi_v4l2.c
@@ -405,7 +405,7 @@ static int set_mute(priv_t *priv, int value)
}
/*
-** Mplayer uses values from -100 up to 100 for controls.
+** MPlayer uses values from -100 up to 100 for controls.
** Here they are scaled to what the tv card needs and applied.
*/
static int set_control(priv_t *priv, struct v4l2_control *control, int val_signed) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 20:03:47 +0000