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, 39 insertions, 39 deletions

diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h
index 5149ecb2a2..c086306e3e 100644
--- a/help/help_mp-zh_CN.h
+++ b/help/help_mp-zh_CN.h
@@ -42,7 +42,7 @@ static char help_text[]=
 " o               循环OSD模式:  none/seekbar/seekbar+timer\n"
 " * or /          增加或减少pcm音量\n"
 " z or x          调整字幕延迟+/-0.1秒\n"
-" r or t          上/下调整字幕位置, 参见-vop expand !\n"
+" r or t          上/下调整字幕位置, 参见-vf expand!\n"
 "\n"
 " * * * 详细内容，进一步(高级)的选项和控制键参见MANPAGE！* * *\n"
 "\n";
@@ -73,11 +73,11 @@ static char help_text[]=
 #define MSGTR_CantOpenDumpfile "无法打开dump文件.\n"
 #define MSGTR_CoreDumped "core dumped :)\n"
 #define MSGTR_FPSnotspecified "FPS在文件头中没有指定(或者是无效数据)! 用-fps选项!\n"
-#define MSGTR_TryForceAudioFmtStr "尝试指定音频解码器驱动族 %s ...\n"
+#define MSGTR_TryForceAudioFmtStr "尝试指定音频解码器驱动族 %s...\n"
 #define MSGTR_CantFindAfmtFallback "找不到指定驱动族的音频解码器, 只能使用其他驱动.\n"
 #define MSGTR_CantFindAudioCodec "找不到音频格式 0x%X 的解码器.\n"
 #define MSGTR_CouldntInitAudioCodec "无法初始化音频解码器! -> nosound\n"
-#define MSGTR_TryForceVideoFmtStr "尝试指定视频解码器驱动族 %s ...\n"
+#define MSGTR_TryForceVideoFmtStr "尝试指定视频解码器驱动族 %s...\n"
 #define MSGTR_CantFindVideoCodec "找不到适合所选的-vo和视频格式 0x%X 的解码器!\n"
 #define MSGTR_VOincompCodec "抱歉, 所选的视频输出设备与这个解码器不兼容.\n"
 #define MSGTR_CannotInitVO "致命错误: 无法初始化视频驱动!\n"
@@ -130,7 +130,7 @@ static char help_text[]=
 #define MSGTR_AODescription_AOAuthor "AO: 描述: %s\nAO: 作者: %s\n"
 #define MSGTR_AOComment "AO: 备注: %s\n"
 #define MSGTR_Video_NoVideo "视频: no video\n"
-#define MSGTR_NotInitializeVOPorVO "\n致命错误: 无法初始化视频插件(-vop)或视频输出(-vo) !\n"
+#define MSGTR_NotInitializeVOPorVO "\n致命错误: 无法初始化视频插件(-vf)或视频输出(-vo)!\n"
 #define MSGTR_Paused "\n  =====  暂停  =====\r"
 #define MSGTR_PlaylistLoadUnable "\n无法装载播放列表 %s\n"
 #define MSGTR_Exit_SIGILL_RTCpuSel \
@@ -160,8 +160,8 @@ static char help_text[]=
 #define MSGTR_CannotOpenFile_Device "无法打开文件/设备\n"
 #define MSGTR_ErrorDVDAuth "DVD授权错误...\n"
 #define MSGTR_CannotOpenDemuxer "无法打开demuxer\n"
-#define MSGTR_NoAudioEncoderSelected "\n没有选择音频编码器(-oac)! 选择一个或者使用-nosound. 使用-oac help !\n"
-#define MSGTR_NoVideoEncoderSelected "\nNo video encoder (-ovc) selected! Select one, use -ovc help !\n"
+#define MSGTR_NoAudioEncoderSelected "\n没有选择音频编码器(-oac)! 选择一个或者使用-nosound. 使用-oac help!\n"
+#define MSGTR_NoVideoEncoderSelected "\nNo video encoder (-ovc) selected! Select one, use -ovc help!\n"
 #define MSGTR_InitializingAudioCodec "初始化音频解码器...\n"
 #define MSGTR_CannotOpenOutputFile "无法打开输出文件 '%s'\n"
 #define MSGTR_EncoderOpenFailed "无法打开编码器\n"
@@ -226,7 +226,7 @@ static char help_text[]=
 "                 <8-320>: 以所给比特率为平均比特率的ABR编码。\n\n"
 
 // open.c, stream.c:
-#define MSGTR_CdDevNotfound "找不到CD-ROM设备 '%s' !\n"
+#define MSGTR_CdDevNotfound "找不到CD-ROM设备 '%s'!\n"
 #define MSGTR_ErrTrackSelect "选择VCD track出错!"
 #define MSGTR_ReadSTDIN "从stdin读取...\n"
 #define MSGTR_UnableOpenURL "无法打开URL: %s\n"
@@ -252,8 +252,8 @@ static char help_text[]=
 // demuxer.c, demux_*.c:
 #define MSGTR_AudioStreamRedefined "警告! 音频流头部 %d 被重新定义.\n"
 #define MSGTR_VideoStreamRedefined "警告! 视频流头部 %d 被重新定义.\n"
-#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: buffer中音频包太多(%d in %d bytes) !\n"
-#define MSGTR_TooManyVideoInBuffer "\nDEMUXER: buffer中视频包太多(%d in %d bytes) !\n"
+#define MSGTR_TooManyAudioInBuffer "\nDEMUXER: buffer中音频包太多(%d in %d bytes)!\n"
+#define MSGTR_TooManyVideoInBuffer "\nDEMUXER: buffer中视频包太多(%d in %d bytes)!\n"
 #define MSGTR_MaybeNI "(也许你播放了一个非交错的流/文件或者是解码失败)?\n" \
 		      "对于AVI文件, 尝试用-ni选项指定非交错模式.\n"
 #define MSGTR_SwitchToNi "\n检测到糟糕的交错格式的AVI - 切换到-ni模式...\n"
@@ -349,7 +349,7 @@ static char help_text[]=
 // vd.c
 #define MSGTR_CodecDidNotSet "VDec: 解码器无法设置sh->disp_w和sh->disp_h, 尝试绕过!\n"
 #define MSGTR_VoConfigRequest "VDec: vo配置要求 - %d x %d (选择 csp: %s)\n"
-#define MSGTR_CouldNotFindColorspace "无法找到匹配的色彩空间 - 重新尝试 -vop scale...\n"
+#define MSGTR_CouldNotFindColorspace "无法找到匹配的色彩空间 - 重新尝试 -vf scale...\n"
 #define MSGTR_MovieAspectIsSet "电影宽高比为 %.2f:1 - 预放大到正确的电影宽高比.\n"
 #define MSGTR_MovieAspectUndefined "电影宽高比未定义 - 无法使用预放大.\n"
 
@@ -367,7 +367,7 @@ static char help_text[]=
 #define MSGTR_PlayList "播放列表"
 #define MSGTR_Equalizer "均衡器"
 #define MSGTR_SkinBrowser "Skin浏览器"
-#define MSGTR_Network "网络流媒体 ..."
+#define MSGTR_Network "网络流媒体..."
 #define MSGTR_Preferences "属性设置"
 #define MSGTR_OSSPreferences "OSS驱动配置"
 #define MSGTR_SDLPreferences "SDL驱动配置"
@@ -395,39 +395,39 @@ static char help_text[]=
 
 // --- skin loader error messages
 #define MSGTR_SKIN_ERRORMESSAGE "[skin] skin配置文件的 %d: %s行出错"
-#define MSGTR_SKIN_WARNING1 "[skin] 警告, 在skin配置文件的 %d行: 找到widget但在这之前没有找到\"section\" ( %s )"
-#define MSGTR_SKIN_WARNING2 "[skin] 警告, 在skin配置文件的 %d行: 找到widget但在这之前没有找到 \"subsection\" ( %s) "
+#define MSGTR_SKIN_WARNING1 "[skin] 警告, 在skin配置文件的 %d行: 找到widget但在这之前没有找到\"section\" (%s)"
+#define MSGTR_SKIN_WARNING2 "[skin] 警告, 在skin配置文件的 %d行: 找到widget但在这之前没有找到 \"subsection\" (%s) "
 #define MSGTR_SKIN_WARNING3 "[skin] 警告, 在skin配置文件的 %d行: 这个widget不支持这个subsection(%s)"
-#define MSGTR_SKIN_BITMAP_16bit  "不支持少于16 bits色深的位图( %s ).\n"
-#define MSGTR_SKIN_BITMAP_FileNotFound  "找不到文件( %s )\n"
-#define MSGTR_SKIN_BITMAP_BMPReadError "bmp读取错误( %s )\n"
-#define MSGTR_SKIN_BITMAP_TGAReadError "tga读取错误( %s )\n"
-#define MSGTR_SKIN_BITMAP_PNGReadError "png读取错误( %s )\n"
-#define MSGTR_SKIN_BITMAP_RLENotSupported "不支持RLE格式压缩的tga( %s )\n"
-#define MSGTR_SKIN_BITMAP_UnknownFileType "未知的文件格式( %s )\n"
-#define MSGTR_SKIN_BITMAP_ConvertError "24 bit到32 bit的转换发生错误( %s )\n"
+#define MSGTR_SKIN_BITMAP_16bit  "不支持少于16 bits色深的位图(%s).\n"
+#define MSGTR_SKIN_BITMAP_FileNotFound  "找不到文件(%s)\n"
+#define MSGTR_SKIN_BITMAP_BMPReadError "BMP读取错误(%s)\n"
+#define MSGTR_SKIN_BITMAP_TGAReadError "TGA读取错误(%s)\n"
+#define MSGTR_SKIN_BITMAP_PNGReadError "PNG读取错误(%s)\n"
+#define MSGTR_SKIN_BITMAP_RLENotSupported "不支持RLE格式压缩的TGA(%s)\n"
+#define MSGTR_SKIN_BITMAP_UnknownFileType "未知的文件格式(%s)\n"
+#define MSGTR_SKIN_BITMAP_ConvertError "24 bit到32 bit的转换发生错误(%s)\n"
 #define MSGTR_SKIN_BITMAP_UnknownMessage "未知信息: %s\n"
 #define MSGTR_SKIN_FONT_NotEnoughtMemory "没有足够内存\n"
 #define MSGTR_SKIN_FONT_TooManyFontsDeclared "声明了太多字体\n"
 #define MSGTR_SKIN_FONT_FontFileNotFound "找不到字体文件\n"
 #define MSGTR_SKIN_FONT_FontImageNotFound "找不到字体图像文件\n"
-#define MSGTR_SKIN_FONT_NonExistentFontID "不存在的字体标签( %s )\n"
-#define MSGTR_SKIN_UnknownParameter "未知参数( %s )\n"
+#define MSGTR_SKIN_FONT_NonExistentFontID "不存在的字体标签(%s)\n"
+#define MSGTR_SKIN_UnknownParameter "未知参数(%s)\n"
 #define MSGTR_SKINBROWSER_NotEnoughMemory "[skinbrowser]没有足够内存.\n"
-#define MSGTR_SKIN_SKINCFG_SkinNotFound "找不到Skin( %s ).\n"
-#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Skin配置文件( %s )读取错误.\n"
+#define MSGTR_SKIN_SKINCFG_SkinNotFound "找不到Skin(%s).\n"
+#define MSGTR_SKIN_SKINCFG_SkinCfgReadError "Skin配置文件(%s)读取错误.\n"
 #define MSGTR_SKIN_LABEL "Skins:"
 
 // --- gtk menus
 #define MSGTR_MENU_AboutMPlayer "关于MPlayer"
-#define MSGTR_MENU_Open "打开 ..."
-#define MSGTR_MENU_PlayFile "播放文件 ..."
-#define MSGTR_MENU_PlayVCD "播放VCD ..."
-#define MSGTR_MENU_PlayDVD "播放DVD ..."
-#define MSGTR_MENU_PlayURL "播放URL ..."
-#define MSGTR_MENU_LoadSubtitle "加载字幕 ..."
-#define MSGTR_MENU_DropSubtitle "丢弃字幕 ..."
-#define MSGTR_MENU_LoadExternAudioFile "加载外部音频文件 ..."
+#define MSGTR_MENU_Open "打开..."
+#define MSGTR_MENU_PlayFile "播放文件..."
+#define MSGTR_MENU_PlayVCD "播放VCD..."
+#define MSGTR_MENU_PlayDVD "播放DVD..."
+#define MSGTR_MENU_PlayURL "播放URL..."
+#define MSGTR_MENU_LoadSubtitle "加载字幕..."
+#define MSGTR_MENU_DropSubtitle "丢弃字幕..."
+#define MSGTR_MENU_LoadExternAudioFile "加载外部音频文件..."
 #define MSGTR_MENU_Playing "播放控制"
 #define MSGTR_MENU_Play "播放"
 #define MSGTR_MENU_Pause "暂停"
@@ -440,7 +440,7 @@ static char help_text[]=
 #define MSGTR_MENU_FullScreen "全屏"
 #define MSGTR_MENU_DVD "DVD"
 #define MSGTR_MENU_VCD "VCD"
-#define MSGTR_MENU_PlayDisc "打开碟片 ..."
+#define MSGTR_MENU_PlayDisc "打开碟片..."
 #define MSGTR_MENU_ShowDVDMenu "显示DVD菜单"
 #define MSGTR_MENU_Titles "Titles"
 #define MSGTR_MENU_Title "Title %2d"
@@ -452,7 +452,7 @@ static char help_text[]=
 #define MSGTR_MENU_PlayList "播放列表"
 #define MSGTR_MENU_SkinBrowser "Skin浏览器"
 #define MSGTR_MENU_Preferences "属性设置"
-#define MSGTR_MENU_Exit "退出 ..."
+#define MSGTR_MENU_Exit "退出..."
 #define MSGTR_MENU_Mute "静音"
 #define MSGTR_MENU_Original "原始的"
 #define MSGTR_MENU_AspectRatio "长宽比"
@@ -540,7 +540,7 @@ static char help_text[]=
 #define MSGTR_PREFERENCES_SDL_Driver "驱动:"
 #define MSGTR_PREFERENCES_Message "请记住, 有些功能只有重新播放后才有效果."
 #define MSGTR_PREFERENCES_DXR3_VENC "视频编码器:"
-#define MSGTR_PREFERENCES_DXR3_LAVC "使用LAVC(ffmpeg)"
+#define MSGTR_PREFERENCES_DXR3_LAVC "使用LAVC(FFmpeg)"
 #define MSGTR_PREFERENCES_DXR3_FAME "使用FAME"
 #define MSGTR_PREFERENCES_FontEncoding1 "Unicode"
 #define MSGTR_PREFERENCES_FontEncoding2 "西欧(ISO-8859-1)"
@@ -592,8 +592,8 @@ static char help_text[]=
 #define MSGTR_ABOUT_MainTesters "   主要测试者:\n"
 
 // --- messagebox
-#define MSGTR_MSGBOX_LABEL_FatalError "致命错误 ..."
-#define MSGTR_MSGBOX_LABEL_Error "错误 ..."
-#define MSGTR_MSGBOX_LABEL_Warning "警告 ..."
+#define MSGTR_MSGBOX_LABEL_FatalError "致命错误..."
+#define MSGTR_MSGBOX_LABEL_Error "错误..."
+#define MSGTR_MSGBOX_LABEL_Warning "警告..."
 
 #endif