Massive consistency and spelling update inspired by Torinthiel.

-vop --> -vf
punctuation marks right after words
(XXX), not ( XXX )
Spelling: FFmpeg, BMP, TGA, PNG, LAN


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11162 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 36 insertions, 36 deletions

diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 304e1a0ece..48922f23ba 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -47,7 +47,7 @@ static char help_text[]=
 " o                cycle OSD mode:  none / seekbar / seekbar + timer\n"
 " * or /           increase or decrease PCM volume\n"
 " z or x           adjust subtitle delay by +/- 0.1 second\n"
-" r or t           adjust subtitle position up/down, also see -vop expand\n"
+" r or t           adjust subtitle position up/down, also see -vf expand\n"
 "\n"
 " * * * SEE THE MAN PAGE FOR DETAILS, FURTHER (ADVANCED) OPTIONS AND KEYS * * *\n"
 "\n";
@@ -78,12 +78,12 @@ static char help_text[]=
 #define MSGTR_CantOpenDumpfile "Cannot open dump file.\n"
 #define MSGTR_CoreDumped "Core dumped ;)\n"
 #define MSGTR_FPSnotspecified "FPS not specified in the header or invalid, use the -fps option.\n"
-#define MSGTR_TryForceAudioFmtStr "Trying to force audio codec driver family %s ...\n"
+#define MSGTR_TryForceAudioFmtStr "Trying to force audio codec driver family %s...\n"
 #define MSGTR_CantFindAfmtFallback "Cannot find audio codec for forced driver family, falling back to other drivers.\n"
 #define MSGTR_CantFindAudioCodec "Cannot find codec for audio format 0x%X.\n"
 #define MSGTR_RTFMCodecs "Read DOCS/HTML/en/codecs.html!\n"
 #define MSGTR_CouldntInitAudioCodec "Could not initialize audio codec -> no sound.\n"
-#define MSGTR_TryForceVideoFmtStr "Trying to force video codec driver family %s ...\n"
+#define MSGTR_TryForceVideoFmtStr "Trying to force video codec driver family %s...\n"
 #define MSGTR_CantFindVideoCodec "Cannot find codec matching selected -vo and video format 0x%X.\n"
 #define MSGTR_VOincompCodec "The selected video_out device is incompatible with this codec.\n"
 #define MSGTR_CannotInitVO "FATAL: Cannot initialize video driver.\n"
@@ -136,7 +136,7 @@ static char help_text[]=
 #define MSGTR_AODescription_AOAuthor "AO: Description: %s\nAO: Author: %s\n"
 #define MSGTR_AOComment "AO: Comment: %s\n"
 #define MSGTR_Video_NoVideo "Video: no video\n"
-#define MSGTR_NotInitializeVOPorVO "\nFATAL: Could not initialize video filters (-vop) or video output (-vo).\n"
+#define MSGTR_NotInitializeVOPorVO "\nFATAL: Could not initialize video filters (-vf) or video output (-vo).\n"
 #define MSGTR_Paused "\n  =====  PAUSE  =====\r" // no more than 23 characters (status line for audio files)
 #define MSGTR_PlaylistLoadUnable "\nUnable to load playlist %s.\n"
 #define MSGTR_Exit_SIGILL_RTCpuSel \
@@ -241,7 +241,7 @@ static char help_text[]=
 #define MSGTR_FileNotFound "File not found: '%s'\n"
 
 #define MSGTR_SMBInitError "Cannot init the libsmbclient library: %d\n"
-#define MSGTR_SMBFileNotFound "Could not open from lan: '%s'\n"
+#define MSGTR_SMBFileNotFound "Could not open from LAN: '%s'\n"
 #define MSGTR_SMBNotCompiled "MPlayer was not compiled with SMB reading support\n"
 
 #define MSGTR_CantOpenDVD "Couldn't open DVD device: %s\n"
@@ -356,7 +356,7 @@ static char help_text[]=
 // vd.c
 #define MSGTR_CodecDidNotSet "VDec: Codec did not set sh->disp_w and sh->disp_h, trying workaround.\n"
 #define MSGTR_VoConfigRequest "VDec: vo config request - %d x %d (preferred csp: %s)\n"
-#define MSGTR_CouldNotFindColorspace "Could not find matching colorspace - retrying with -vop scale...\n"
+#define MSGTR_CouldNotFindColorspace "Could not find matching colorspace - retrying with -vf scale...\n"
 #define MSGTR_MovieAspectIsSet "Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n"
 #define MSGTR_MovieAspectUndefined "Movie-Aspect is undefined - no prescaling applied.\n"
 
@@ -366,15 +366,15 @@ static char help_text[]=
 
 // --- labels ---
 #define MSGTR_About "About"
-#define MSGTR_FileSelect "Select file ..."
-#define MSGTR_SubtitleSelect "Select subtitle ..."
-#define MSGTR_OtherSelect "Select ..."
-#define MSGTR_AudioFileSelect "Select external audio channel ..."
-#define MSGTR_FontSelect "Select font ..."
+#define MSGTR_FileSelect "Select file..."
+#define MSGTR_SubtitleSelect "Select subtitle..."
+#define MSGTR_OtherSelect "Select..."
+#define MSGTR_AudioFileSelect "Select external audio channel..."
+#define MSGTR_FontSelect "Select font..."
 #define MSGTR_PlayList "Playlist"
 #define MSGTR_Equalizer "Equalizer"
 #define MSGTR_SkinBrowser "Skin Browser"
-#define MSGTR_Network "Network streaming ..."
+#define MSGTR_Network "Network streaming..."
 #define MSGTR_Preferences "Preferences"
 #define MSGTR_OSSPreferences "OSS driver configuration"
 #define MSGTR_SDLPreferences "SDL driver configuration"
@@ -402,39 +402,39 @@ static char help_text[]=
 
 // --- skin loader error messages
 #define MSGTR_SKIN_ERRORMESSAGE "[skin] error in skin config file on line %d: %s"
-#define MSGTR_SKIN_WARNING1 "[skin] warning in skin config file on line %d: widget found but before \"section\" not found ( %s )"
+#define MSGTR_SKIN_WARNING1 "[skin] warning in skin config file on line %d: widget found but before \"section\" not found (%s)"
 #define MSGTR_SKIN_WARNING2 "[skin] warning in skin config file on line %d: widget found but before \"subsection\" not found (%s)"
 #define MSGTR_SKIN_WARNING3 "[skin] warning in skin config file on line %d: this subsection not supported by this widget (%s)"
-#define MSGTR_SKIN_BITMAP_16bit  "16 bits or less depth bitmap not supported ( %s ).\n"
-#define MSGTR_SKIN_BITMAP_FileNotFound  "file not found ( %s )\n"
-#define MSGTR_SKIN_BITMAP_BMPReadError "bmp read error ( %s )\n"
-#define MSGTR_SKIN_BITMAP_TGAReadError "tga read error ( %s )\n"
-#define MSGTR_SKIN_BITMAP_PNGReadError "png read error ( %s )\n"
-#define MSGTR_SKIN_BITMAP_RLENotSupported "RLE packed tga not supported ( %s )\n"
-#define MSGTR_SKIN_BITMAP_UnknownFileType "unknown file type ( %s )\n"
-#define MSGTR_SKIN_BITMAP_ConvertError "24 bit to 32 bit convert error ( %s )\n"
+#define MSGTR_SKIN_BITMAP_16bit  "16 bits or less depth bitmap not supported (%s).\n"
+#define MSGTR_SKIN_BITMAP_FileNotFound  "file not found (%s)\n"
+#define MSGTR_SKIN_BITMAP_BMPReadError "BMP read error (%s)\n"
+#define MSGTR_SKIN_BITMAP_TGAReadError "TGA read error (%s)\n"
+#define MSGTR_SKIN_BITMAP_PNGReadError "PNG read error (%s)\n"
+#define MSGTR_SKIN_BITMAP_RLENotSupported "RLE packed TGA not supported (%s)\n"
+#define MSGTR_SKIN_BITMAP_UnknownFileType "unknown file type (%s)\n"
+#define MSGTR_SKIN_BITMAP_ConvertError "24 bit to 32 bit convert error (%s)\n"
 #define MSGTR_SKIN_BITMAP_UnknownMessage "unknown message: %s\n"
 #define MSGTR_SKIN_FONT_NotEnoughtMemory "not enough memory\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "too many fonts declared\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "font file not found\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "font image file not found\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "non-existent font identifier ( %s )\n"
-#define MSGTR_SKIN_UnknownParameter "unknown parameter ( %s )\n"
+#define MSGTR_SKIN_FONT_NonExistentFontID "non-existent font identifier (%s)\n"
+#define MSGTR_SKIN_UnknownParameter "unknown parameter (%s)\n"
 #define MSGTR_SKINBROWSER_NotEnoughMemory "[skinbrowser] not enough memory.\n"
-#define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin not found ( %s ).\n"
-#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Skin configfile read error ( %s ).\n"
+#define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin not found (%s).\n"
+#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Skin configfile read error (%s).\n"
 #define MSGTR_SKIN_LABEL "Skins:"
 
 // --- gtk menus
 #define MSGTR_MENU_AboutMPlayer "About MPlayer"
-#define MSGTR_MENU_Open "Open ..."
-#define MSGTR_MENU_PlayFile "Play file ..."
-#define MSGTR_MENU_PlayVCD "Play VCD ..."
-#define MSGTR_MENU_PlayDVD "Play DVD ..."
-#define MSGTR_MENU_PlayURL "Play URL ..."
-#define MSGTR_MENU_LoadSubtitle "Load subtitle ..."
-#define MSGTR_MENU_DropSubtitle "Drop subtitle ..."
-#define MSGTR_MENU_LoadExternAudioFile "Load external audio file ..."
+#define MSGTR_MENU_Open "Open..."
+#define MSGTR_MENU_PlayFile "Play file..."
+#define MSGTR_MENU_PlayVCD "Play VCD..."
+#define MSGTR_MENU_PlayDVD "Play DVD..."
+#define MSGTR_MENU_PlayURL "Play URL..."
+#define MSGTR_MENU_LoadSubtitle "Load subtitle..."
+#define MSGTR_MENU_DropSubtitle "Drop subtitle..."
+#define MSGTR_MENU_LoadExternAudioFile "Load external audio file..."
 #define MSGTR_MENU_Playing "Playing"
 #define MSGTR_MENU_Play "Play"
 #define MSGTR_MENU_Pause "Pause"
@@ -447,7 +447,7 @@ static char help_text[]=
 #define MSGTR_MENU_FullScreen "Fullscreen"
 #define MSGTR_MENU_DVD "DVD"
 #define MSGTR_MENU_VCD "VCD"
-#define MSGTR_MENU_PlayDisc "Open disc ..."
+#define MSGTR_MENU_PlayDisc "Open disc..."
 #define MSGTR_MENU_ShowDVDMenu "Show DVD menu"
 #define MSGTR_MENU_Titles "Titles"
 #define MSGTR_MENU_Title "Title %2d"
@@ -459,7 +459,7 @@ static char help_text[]=
 #define MSGTR_MENU_PlayList "Playlist"
 #define MSGTR_MENU_SkinBrowser "Skin browser"
 #define MSGTR_MENU_Preferences "Preferences"
-#define MSGTR_MENU_Exit "Exit ..."
+#define MSGTR_MENU_Exit "Exit..."
 #define MSGTR_MENU_Mute "Mute"
 #define MSGTR_MENU_Original "Original"
 #define MSGTR_MENU_AspectRatio "Aspect ratio"
@@ -547,7 +547,7 @@ static char help_text[]=
 #define MSGTR_PREFERENCES_SDL_Driver "Driver:"
 #define MSGTR_PREFERENCES_Message "Please remember that you need to restart playback for some options to take effect!"
 #define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:"
-#define MSGTR_PREFERENCES_DXR3_LAVC "Use LAVC (ffmpeg)"
+#define MSGTR_PREFERENCES_DXR3_LAVC "Use LAVC (FFmpeg)"
 #define MSGTR_PREFERENCES_DXR3_FAME "Use FAME"
 #define MSGTR_PREFERENCES_FontEncoding1 "Unicode"
 #define MSGTR_PREFERENCES_FontEncoding2 "Western European Languages (ISO-8859-1)"