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-zh_TW.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-zh_TW.h')
-rw-r--r-- | help/help_mp-zh_TW.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h index 4ef549898e..5ae59cfce5 100644 --- a/help/help_mp-zh_TW.h +++ b/help/help_mp-zh_TW.h @@ -162,7 +162,6 @@ static char help_text[]= #define MSGTR_MenuInitFailed "菜單初始化失敗。\n" #define MSGTR_Getch2InitializedTwice "警告: getch2_init 被調用兩次!\n" #define MSGTR_DumpstreamFdUnavailable "無法轉儲此流 - 没有可用的文件描述符。\n" -#define MSGTR_FallingBackOnPlaylist "回退到試着解析播放列表 %s...\n" #define MSGTR_CantOpenLibmenuFilterWithThisRootMenu "不能用根菜單 %s 打開 libmenu 視頻過濾器。\n" #define MSGTR_AudioFilterChainPreinitError "音頻過濾器鏈預啟動錯誤!\n" #define MSGTR_LinuxRTCReadError "Linux RTC 讀取錯誤: %s\n" @@ -522,7 +521,7 @@ static char help_text[]= #define MSGTR_SMBFileNotFound "打不開局域網内的: '%s'\n" #define MSGTR_SMBNotCompiled "MPlayer 没有編譯成支持 SMB 的讀取。\n" -#define MSGTR_CantOpenDVD "打不開 DVD 設備: %s\n" +#define MSGTR_CantOpenDVD "打不開 DVD 設備: %s (%s)\n" // stream_dvd.c #define MSGTR_DVDspeedCantOpen "不能以寫方式打開DVD設備, 改變DVD速度需要寫方式。\n" @@ -1189,8 +1188,6 @@ static char help_text[]= "[AO_ALSA] device=<device-name>\n"\ "[AO_ALSA] 設置設備 (change , to . and : to =)\n" #define MSGTR_AO_ALSA_ChannelsNotSupported "[AO_ALSA] %d 聲道不被支持。\n" -#define MSGTR_AO_ALSA_CannotReadAlsaConfiguration "[AO_ALSA] 不能讀取 ALSA 配置: %s\n" -#define MSGTR_AO_ALSA_CannotCopyConfiguration "[AO_ALSA] 不能拷貝配置: %s\n" #define MSGTR_AO_ALSA_OpenInNonblockModeFailed "[AO_ALSA] 打開 nonblock-模式 失敗, 試着打開 block-模式。\n" #define MSGTR_AO_ALSA_PlaybackOpenError "[AO_ALSA] 回放打開錯誤: %s\n" #define MSGTR_AO_ALSA_ErrorSetBlockMode "[AL_ALSA] 錯誤設置 block-模式 %s。\n" @@ -1955,7 +1952,6 @@ static char help_text[]= #define MSGTR_RADIO_CaptureStarting "[radio] 開始捕獲。\n" #define MSGTR_RADIO_ClearBufferFailed "[radio] 清空緩衝失敗: %s\n" #define MSGTR_RADIO_StreamEnableCacheFailed "[radio] 調用 stream_enable_cache 失敗: %s\n" -#define MSGTR_RADIO_DriverUnknownId "[radio] 未知驅動號: %d\n" #define MSGTR_RADIO_DriverUnknownStr "[radio] 未知驅動名: %s\n" #define MSGTR_RADIO_DriverV4L2 "[radio] 使用 V4Lv2 廣播接口。\n" #define MSGTR_RADIO_DriverV4L "[radio] 使用 V4Lv1 廣播接口。\n" @@ -2018,7 +2014,6 @@ static char help_text[]= #define MSGTR_LIBASS_EmptyEvent "[ass] 空事件!\n" #define MSGTR_LIBASS_MAX_GLYPHS_Reached "[ass] 達到了字形最大值: 事件 %d, 開始 = %llu, 時長 = %llu\n 文本 = %s\n" #define MSGTR_LIBASS_EventHeightHasChanged "[ass] 警告! 事件高度(height) 已改變! \n" -#define MSGTR_LIBASS_TooManySimultaneousEvents "[ass] 過多同時的事件!\n" // ass_font.c #define MSGTR_LIBASS_GlyphNotFoundReselectingFont "[ass] 字形 0x%X 未找到, 重新選擇字體 (%s, %d, %d)\n" |