diff options
| -rw-r--r-- | help/help_mp-bg.h | 2 | ||||
| -rw-r--r-- | help/help_mp-cs.h | 3 | ||||
| -rw-r--r-- | help/help_mp-de.h | 3 | ||||
| -rw-r--r-- | help/help_mp-dk.h | 2 | ||||
| -rw-r--r-- | help/help_mp-el.h | 2 | ||||
| -rw-r--r-- | help/help_mp-en.h | 41 | ||||
| -rw-r--r-- | help/help_mp-es.h | 3 | ||||
| -rw-r--r-- | help/help_mp-fr.h | 2 | ||||
| -rw-r--r-- | help/help_mp-hu.h | 2 | ||||
| -rw-r--r-- | help/help_mp-it.h | 2 | ||||
| -rw-r--r-- | help/help_mp-ja.h | 2 | ||||
| -rw-r--r-- | help/help_mp-ko.h | 2 | ||||
| -rw-r--r-- | help/help_mp-mk.h | 2 | ||||
| -rw-r--r-- | help/help_mp-nl.h | 2 | ||||
| -rw-r--r-- | help/help_mp-pl.h | 5 | ||||
| -rw-r--r-- | help/help_mp-pt_BR.h | 2 | ||||
| -rw-r--r-- | help/help_mp-ro.h | 2 | ||||
| -rw-r--r-- | help/help_mp-ru.h | 2 | ||||
| -rw-r--r-- | help/help_mp-sk.h | 2 | ||||
| -rw-r--r-- | help/help_mp-tr.h | 2 | ||||
| -rw-r--r-- | help/help_mp-uk.h | 2 | ||||
| -rw-r--r-- | help/help_mp-zh_CN.h | 2 | ||||
| -rw-r--r-- | help/help_mp-zh_TW.h | 2 | ||||
| -rw-r--r-- | mencoder.c | 2 | ||||
| -rw-r--r-- | mplayer.c | 114 |
25 files changed, 97 insertions, 110 deletions
diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h index a30b8b57de..c99adf2bbf 100644 --- a/help/help_mp-bg.h +++ b/help/help_mp-bg.h @@ -129,8 +129,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice " / (-vo)!\n" #define MSGTR_ForcedVideoCodec " : %s\n" #define MSGTR_ForcedAudioCodec " : %s\n" -#define MSGTR_AODescription_AOAuthor "AO: : %s\nAO: : %s\n" -#define MSGTR_AOComment "AO: : %s\n" #define MSGTR_Video_NoVideo ": !!!\n" #define MSGTR_NotInitializeVOPorVO "\n: (-vf) (-vo)!\n" #define MSGTR_Paused "\n ===== =====\r" diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h index 3ef616aeff..2463335bf0 100644 --- a/help/help_mp-cs.h +++ b/help/help_mp-cs.h @@ -118,8 +118,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Chyba pi otevrn/inicializaci vybranho video_out (-vo) zazen.\n" #define MSGTR_ForcedVideoCodec "Vynucen video kodek: %s\n" #define MSGTR_ForcedAudioCodec "Vynucen audio kodek: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Popis: %s\nAO: Autor: %s\n" -#define MSGTR_AOComment "AO: Poznmka: %s\n" #define MSGTR_Video_NoVideo "Video: dn video\n" #define MSGTR_NotInitializeVOPorVO "\nKritick chyba: Nemohu inicializovat video filtry (-vf) nebo video ovlada (-vo)!\n" #define MSGTR_Paused "\n===== POZASTAVENO =====\r" @@ -291,7 +289,6 @@ static char help_text[]= #define MSGTR_LavcAudioCodecNotFound "Audio LAVC, nemohu najt enkodr pro kodek %s\n" #define MSGTR_CouldntAllocateLavcContext "Audio LAVC, nemohu alokovat kontext!\n" #define MSGTR_CouldntOpenCodec "nemohu otevt kodek %s, br=%d\n" -#define MSGTR_FramesizeBufsizeTag "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n" // cfg-mencoder.h: diff --git a/help/help_mp-de.h b/help/help_mp-de.h index 94e989328d..9628fa7b57 100644 --- a/help/help_mp-de.h +++ b/help/help_mp-de.h @@ -126,8 +126,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Fehler beim ffnen/Initialisieren des ausgewhlten Videoausgabetreibers (-vo).\n" #define MSGTR_ForcedVideoCodec "Erzwungener Videocodec: %s\n" #define MSGTR_ForcedAudioCodec "Erzwungener Audiocodec: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Beschreibung: %s\nAO: Autor: %s\n" -#define MSGTR_AOComment "AO: Kommentar: %s\n" #define MSGTR_Video_NoVideo "Video: kein Video\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Konnte Videofilter (-vf) oder -ausgabetreiber (-vo) nicht initialisieren.\n" #define MSGTR_Paused "\n ===== PAUSE =====\r" @@ -319,7 +317,6 @@ static char help_text[]= #define MSGTR_LavcAudioCodecNotFound "Audio LAVC, konnte Encoder fr Codec %s nicht finden.\n" #define MSGTR_CouldntAllocateLavcContext "Audio LAVC, konnte Kontext nicht zuordnen!\n" #define MSGTR_CouldntOpenCodec "Konnte Codec %s nicht ffnen, br=%d\n" -#define MSGTR_FramesizeBufsizeTag "FRAME_GRSSE: %d, BUFFER_GRSSE: %d, TAG: 0x%x\n" // cfg-mencoder.h: diff --git a/help/help_mp-dk.h b/help/help_mp-dk.h index 0ed9c01018..3ed3db235b 100644 --- a/help/help_mp-dk.h +++ b/help/help_mp-dk.h @@ -120,8 +120,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Fejl under bning/initialisering af den valgte videodriver (-vo)!\n" #define MSGTR_ForcedVideoCodec "Gennemtvunget video-codec: %s\n" #define MSGTR_ForcedAudioCodec "Gennemtvunget lyd-codec: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Beskrivelse: %s\nAO: forfatter: %s\n" -#define MSGTR_AOComment "AO: Kommentar: %s\n" #define MSGTR_Video_NoVideo "Video: ingen video\n" #define MSGTR_NotInitializeVOPorVO "\nFATALT: Kunne ikke initialisere videofiltre (-vf) eller videodriver (-vo)!\n" #define MSGTR_Paused "\n ===== PAUSE =====\r" diff --git a/help/help_mp-el.h b/help/help_mp-el.h index ac30d207c9..963983d8ba 100644 --- a/help/help_mp-el.h +++ b/help/help_mp-el.h @@ -119,8 +119,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice " / video_out (-vo) !\n" #define MSGTR_ForcedVideoCodec " codec: %s\n" #define MSGTR_ForcedAudioCodec " codec : %s\n" -#define MSGTR_AODescription_AOAuthor "AO: : %s\n AO: : %s\n" -#define MSGTR_AOComment "AO: : %s\n" #define MSGTR_Video_NoVideo ": !!!\n" #define MSGTR_NotInitializeVOPorVO "\n : (-vf) (-vo)!\n" #define MSGTR_Paused "\n ===== =====\r" diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 9e44d92c1f..dcf46386ae 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -125,8 +125,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Error opening/initializing the selected video_out (-vo) device.\n" #define MSGTR_ForcedVideoCodec "Forced video codec: %s\n" #define MSGTR_ForcedAudioCodec "Forced audio codec: %s\n" -#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 (-vf) or video output (-vo).\n" #define MSGTR_Paused "\n ===== PAUSE =====\r" // no more than 23 characters (status line for audio files) @@ -150,6 +148,44 @@ static char help_text[]= " gcc version. If you think it's MPlayer's fault, please read\n"\ " DOCS/HTML/en/bugreports.html and follow the instructions there. We can't and\n"\ " won't help unless you provide this information when reporting a possible bug.\n" +#define MSGTR_LoadingConfig "Loading config '%s'\n" +#define MSGTR_AddedSubtitleFile "SUB: added subtitle file (%d): %s\n" +#define MSGTR_ErrorOpeningOutputFile "Error opening file [%s] for writing!\n" +#define MSGTR_CommandLine "CommandLine:" +#define MSGTR_RTCDeviceNotOpenable "Failed to open %s: %s (it should be readable by the user.)\n" +#define MSGTR_LinuxRTCInitErrorIrqpSet "Linux RTC init error in ioctl (rtc_irqp_set %lu): %s\n" +#define MSGTR_IncreaseRTCMaxUserFreq "Try adding \"echo %lu > /proc/sys/dev/rtc/max-user-freq\" to your system startup scripts.\n" +#define MSGTR_LinuxRTCInitErrorPieOn "Linux RTC init error in ioctl (rtc_pie_on): %s\n" +#define MSGTR_UsingTimingType "Using %s timing.\n" +#define MSGTR_MenuInitialized "Menu inited: %s\n" +#define MSGTR_MenuInitFailed "Menu init failed.\n" +#define MSGTR_Getch2InitializedTwice "WARNING: getch2_init called twice!\n" +#define MSGTR_DumpstreamFdUnavailable "Cannot dump this stream - no 'fd' available.\n" +#define MSGTR_FallingBackOnPlaylist "Falling back on trying to parse playlist %s...\n" +#define MSGTR_CantOpenLibmenuFilterWithThisRootMenu "Can't open libmenu video filter with root menu %s.\n" +#define MSGTR_AudioFilterChainPreinitError "Error at audio filter chain pre-init!\n" +#define MSGTR_LinuxRTCReadError "Linux RTC read error: %s\n" +#define MSGTR_SoftsleepUnderflow "Warning! Softsleep underflow!\n" +#define MSGTR_EDLSKIPStartStopLength "\nEDL_SKIP: start [%f], stop [%f], length [%f]\n" +#define MSGTR_AnsSubVisibility "ANS_SUB_VISIBILITY=%ld\n" +#define MSGTR_AnsLength "ANS_LENGTH=%ld\n" +#define MSGTR_AnsVoFullscreen "ANS_VO_FULLSCREEN=%ld\n" +#define MSGTR_AnsPercentPos "ANS_PERCENT_POSITION=%ld\n" +#define MSGTR_DvdnavNullEvent "DVDNAV Event NULL?!\n" +#define MSGTR_DvdnavHighlightEventBroken "DVDNAV Event: Highlight event broken\n" +#define MSGTR_DvdnavEvent "DVDNAV Event: %s\n" +#define MSGTR_DvdnavHighlightHide "DVDNAV Event: Highlight Hide\n" +#define MSGTR_DvdnavStillFrame "######################################## DVDNAV Event: Still Frame: %d sec(s)\n" +#define MSGTR_DvdnavNavStop "DVDNAV Event: Nav Stop\n" +#define MSGTR_DvdnavNavNOP "DVDNAV Event: Nav NOP\n" +#define MSGTR_DvdnavNavSpuStreamChangeVerbose "DVDNAV Event: Nav SPU Stream Change: phys: %d/%d/%d logical: %d\n" +#define MSGTR_DvdnavNavSpuStreamChange "DVDNAV Event: Nav SPU Stream Change: phys: %d logical: %d\n" +#define MSGTR_DvdnavNavAudioStreamChange "DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n" +#define MSGTR_DvdnavNavVTSChange "DVDNAV Event: Nav VTS Change\n" +#define MSGTR_DvdnavNavCellChange "DVDNAV Event: Nav Cell Change\n" +#define MSGTR_DvdnavNavSpuClutChange "DVDNAV Event: Nav SPU CLUT Change\n" +#define MSGTR_DvdnavNavSeekDone "DVDNAV Event: Nav Seek Done\n" +#define MSGTR_MenuCall "Menu call\n" #define MSGTR_EdlCantUseBothModes "Can't use -edl and -edlout at the same time.\n" #define MSGTR_EdlOutOfMem "Can't allocate enough memory to hold EDL data.\n" @@ -313,7 +349,6 @@ static char help_text[]= #define MSGTR_LavcAudioCodecNotFound "Audio LAVC, couldn't find encoder for codec %s\n" #define MSGTR_CouldntAllocateLavcContext "Audio LAVC, couldn't allocate context!\n" #define MSGTR_CouldntOpenCodec "Couldn't open codec %s, br=%d\n" -#define MSGTR_FramesizeBufsizeTag "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n" // cfg-mencoder.h: diff --git a/help/help_mp-es.h b/help/help_mp-es.h index de2bace410..9f6c4d1f16 100644 --- a/help/help_mp-es.h +++ b/help/help_mp-es.h @@ -127,8 +127,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Error abriendo/inicializando el dispositivo de la salida de vdeo (-vo)!\n" #define MSGTR_ForcedVideoCodec "Forzado el codec de vdeo: %s.\n" #define MSGTR_ForcedAudioCodec "Forzado el codec de audio: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Descripcin: %s\nAO: Autor: %s.\n" -#define MSGTR_AOComment "AO: Comentario: %s.\n" #define MSGTR_Video_NoVideo "Vdeo: no hay vdeo!\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: No se pudieron inicializar los filtros de vdeo (-vf) o de salida de vdeo (-vo)!\n" #define MSGTR_Paused "\n ===== PAUSA =====\r" @@ -323,7 +321,6 @@ static char help_text[]= #define MSGTR_LavcAudioCodecNotFound "LAVC Audio, no se encuentra el codificador para el codec %s\n" #define MSGTR_CouldntAllocateLavcContext "LAVC Audio, no se puede asignar contexto!\n" #define MSGTR_CouldntOpenCodec "No se puede abrir el codec %s, br=%d\n" -#define MSGTR_FramesizeBufsizeTag "TAMAO_DEL_CUADRO: %d, TAMAO_DEL_BUFFER: %d, ETIQUETA: 0x%x\n" // cfg-mencoder.h diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h index 3e6e98cdee..7244bf16c7 100644 --- a/help/help_mp-fr.h +++ b/help/help_mp-fr.h @@ -120,8 +120,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Erreur l'ouverture/initialisation de la sortie vido choisie (-vo).\n" #define MSGTR_ForcedVideoCodec "Codec vido forc: %s\n" #define MSGTR_ForcedAudioCodec "Codec audio forc: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Description: %s\nAO: Auteur: %s\n" -#define MSGTR_AOComment "AO: Commentaire: %s\n" #define MSGTR_Video_NoVideo "Vido: pas de vido\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: impossible d'initialiser les filtres vido (-vf) ou la sortie vido (-vo).\n" #define MSGTR_Paused "\n ===== PAUSE =====\r" // no more than 23 characters (status line for audio files) diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h index b13b78bf2d..15b661306d 100644 --- a/help/help_mp-hu.h +++ b/help/help_mp-hu.h @@ -121,8 +121,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Hiba a kivlasztott video_out (-vo) egysg inicializsakor!\n" #define MSGTR_ForcedVideoCodec "Knyszertett video codec: %s\n" #define MSGTR_ForcedAudioCodec "Knyszertett audio codec: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Lers: %s\nAO: Kszt: %s\n" -#define MSGTR_AOComment "AO: Komment: %s\n" #define MSGTR_Video_NoVideo "Video: nincs video!!!\n" #define MSGTR_NotInitializeVOPorVO "\nHIBA: Nem sikerlt a video filterek (-vf) vagy a video kimenet (-vo) inicializlsa!\n" #define MSGTR_Paused "\n ===== SZNET =====\r" diff --git a/help/help_mp-it.h b/help/help_mp-it.h index 3061bad4be..f0c9956b21 100644 --- a/help/help_mp-it.h +++ b/help/help_mp-it.h @@ -115,8 +115,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Errore aprendo/inizializzando il dispositivo di output video (-vo) selezionato!\n" #define MSGTR_ForcedVideoCodec "Codec video forzato: %s\n" #define MSGTR_ForcedAudioCodec "Codec audio forzato: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Descrizione: %s\nAO: Autore: %s\n" -#define MSGTR_AOComment "AO: Commento: %s\n" #define MSGTR_Video_NoVideo "Video: no video!!!\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Impossibile inizializzare i filtri video (-vf) o l'output video (-vo)!\n" #define MSGTR_Paused "\n ===== PAUSA =====\r" diff --git a/help/help_mp-ja.h b/help/help_mp-ja.h index 246f3234e5..bb29da64cb 100644 --- a/help/help_mp-ja.h +++ b/help/help_mp-ja.h @@ -116,8 +116,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "줿(-vo)ǥХޤǤ.\n" #define MSGTR_ForcedVideoCodec "ꤵ줿ǥå: %s\n" #define MSGTR_ForcedAudioCodec "ꤵ줿ǥå: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: ܺ: %s\nAO: : %s\n" -#define MSGTR_AOComment "AO: : %s\n" #define MSGTR_Video_NoVideo "Video: ޤ\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: ե륿(-vf)(-vo)ν˼Ԥޤ.\n" #define MSGTR_Paused "\n ===== =====\r" // no more than 23 characters (status line for audio files) diff --git a/help/help_mp-ko.h b/help/help_mp-ko.h index f2ca714eb3..3dbb06569d 100644 --- a/help/help_mp-ko.h +++ b/help/help_mp-ko.h @@ -118,8 +118,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "선택한 비디오 출력 (-vo) 장치를 열거나 초기화할 수 없습니다.\n" #define MSGTR_ForcedVideoCodec "강제로 사용된 비디오 코덱: %s\n" #define MSGTR_ForcedAudioCodec "강제로 사용된 오디오 코덱: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: 설명: %s\nAO: 만든이: %s\n" -#define MSGTR_AOComment "AO: 덧말: %s\n" #define MSGTR_Video_NoVideo "비디오: 비디오 없음\n" #define MSGTR_NotInitializeVOPorVO "\n치명적 오류: 비디오 필터(-vf) 또는 비디오 출력(-vo)을 초기화할 수 없습니다.\n" #define MSGTR_Paused "\n ===== 잠시멈춤 =====\r" diff --git a/help/help_mp-mk.h b/help/help_mp-mk.h index 8267f63204..44799b9e69 100644 --- a/help/help_mp-mk.h +++ b/help/help_mp-mk.h @@ -119,8 +119,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Грешка при отварањето/иницијализирањето на избраниот излезен видео (-vo) уред.\n" #define MSGTR_ForcedVideoCodec "Присилен видео кодек: %s\n" #define MSGTR_ForcedAudioCodec "Присилен аудио кодек: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Опис: %s\nAO: Автор: %s\n" -#define MSGTR_AOComment "AO: Коментар: %s\n" #define MSGTR_Video_NoVideo "Видео: нема слика\n" #define MSGTR_NotInitializeVOPorVO "\nФАТАЛНО: Не може да ги иницијализира видео филтерите (-vf) или видео излезот (-vo).\n" #define MSGTR_Paused "\n ===== ПАУЗА =====\r" // не повеќе од 23 карактери (статус линија за аудио датотеките) diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h index 9c2ca25e56..b3d28fcfa6 100644 --- a/help/help_mp-nl.h +++ b/help/help_mp-nl.h @@ -117,8 +117,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Fout bij het openen/initialiseren van het gekozen video_out (-vo) apparaat!\n" #define MSGTR_ForcedVideoCodec "Gedwongen video codec: %s\n" #define MSGTR_ForcedAudioCodec "Gedwongen audio codec: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Beschrijving: %s\nAO: Auteur: %s\n" -#define MSGTR_AOComment "AO: Commentaar: %s\n" #define MSGTR_Video_NoVideo "Video: geen video!!!\n" #define MSGTR_NotInitializeVOPorVO "\nFATAAL: Kon de video filters (-vf) of de video uitvoer (-vo) niet initialiseren!\n" #define MSGTR_Paused "\n------ GEPAUZEERD -------\r" diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h index 7bb6405f90..c730f7d63b 100644 --- a/help/help_mp-pl.h +++ b/help/help_mp-pl.h @@ -119,8 +119,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Bd przy otwieraniu/inicjalizacji wybranego urzdzenia video (-vo).\n" #define MSGTR_ForcedVideoCodec "Wymuszony kodek video: %s\n" #define MSGTR_ForcedAudioCodec "Wymuszony kodek audio: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Opis: %s\nAO: Autor: %s\n" -#define MSGTR_AOComment "AO: Komentarz: %s\n" #define MSGTR_Video_NoVideo "Video: brak video\n" #define MSGTR_NotInitializeVOPorVO "\nBD KRYTYCZNY: Nie mog zainicjalizowa filtra video (-vf) lub wyjcia video (-vo).\n" #define MSGTR_Paused "\n ===== PAUZA =====\r" // no more than 23 characters (status line for audio files) @@ -305,7 +303,6 @@ static char help_text[]= #define MSGTR_LavcAudioCodecNotFound "Audio LAVC - nie mog znale kodeka dla %s\n" #define MSGTR_CouldntAllocateLavcContext "Audio LAVC - nie mog zaalokowa treci!\n" #define MSGTR_CouldntOpenCodec "Nie mog otworzy kodeka %s, br=%d\n" -#define MSGTR_FramesizeBufsizeTag "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n" // cfg-mencoder.h: #define MSGTR_MEncoderMP3LameHelp "\n\n"\ @@ -894,4 +891,4 @@ static char help_text[]= // ao_plugin.c -#define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] nieprawidowa wtyczka: %s\n"
\ No newline at end of file +#define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] nieprawidowa wtyczka: %s\n" diff --git a/help/help_mp-pt_BR.h b/help/help_mp-pt_BR.h index dc37e030ac..35b3869ab5 100644 --- a/help/help_mp-pt_BR.h +++ b/help/help_mp-pt_BR.h @@ -126,8 +126,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Erro abrindo/inicializando o dispositivo da sada de vdeo (-vo)!\n" #define MSGTR_ForcedVideoCodec "Codec de vdeo forado: %s\n" #define MSGTR_ForcedAudioCodec "Codec de audio forado: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Descrio: %s\nAO: Autor: %s\n" -#define MSGTR_AOComment "AO: Comentrio: %s\n" #define MSGTR_Video_NoVideo "Vdeo: sem vdeo\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Impossvel inicializar os filtros de vdeo (-vf) ou a sada de vdeo (-vo)!\n" #define MSGTR_Paused "\n================= PAUSADO =================\r" diff --git a/help/help_mp-ro.h b/help/help_mp-ro.h index 29172e4f88..1520549d77 100644 --- a/help/help_mp-ro.h +++ b/help/help_mp-ro.h @@ -123,8 +123,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Eroare la activarea ieirii video (-vo) aleas.\n" #define MSGTR_ForcedVideoCodec "Codec video forat: %s\n" #define MSGTR_ForcedAudioCodec "Codec audio forat: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Descriere: %s\nAO: Autor: %s\n" -#define MSGTR_AOComment "AO: Comentariu: %s\n" #define MSGTR_Video_NoVideo "Video: nu exist video\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Nu pot iniializa filtrele video (-vf) sau ieirea video (-vo).\n" #define MSGTR_Paused "\n ===== PAUZ =====\r" // no more than 23 characters (status line for audio files) diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h index 5849d1be14..6fe7393388 100644 --- a/help/help_mp-ru.h +++ b/help/help_mp-ru.h @@ -117,8 +117,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice " / (-vo).\n" #define MSGTR_ForcedVideoCodec " : %s\n" #define MSGTR_ForcedAudioCodec " : %s\n" -#define MSGTR_AODescription_AOAuthor "AO: : %s\nAO: : %s\n" -#define MSGTR_AOComment "AO: : %s\n" #define MSGTR_Video_NoVideo ": \n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: (-vf) (-vo).\n" #define MSGTR_Paused "\n========\r" // no more than 23 characters (status line for audio files) diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h index 8f216296b5..04225d95e2 100644 --- a/help/help_mp-sk.h +++ b/help/help_mp-sk.h @@ -112,8 +112,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Chyba pri otvran/inicializcii vybranch video_out (-vo) zariaden!\n" #define MSGTR_ForcedVideoCodec "Vnten video kodek: %s\n" #define MSGTR_ForcedAudioCodec "Vnten video kodek: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Popis: %s\nAO: Autor: %s\n" -#define MSGTR_AOComment "AO: Komentr: %s\n" #define MSGTR_Video_NoVideo "Video: iadne video!!!\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Nemem inicializova video filtre (-vf) alebo video vstup (-vo)!\n" #define MSGTR_Paused "\n ===== PAUZA =====\r" diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h index f7e61a01af..70b24ced48 100644 --- a/help/help_mp-tr.h +++ b/help/help_mp-tr.h @@ -111,8 +111,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "Video k (-vo) srcsn aarken/yklerken hata!\n" #define MSGTR_ForcedVideoCodec "Video codecine zorland: %s\n" #define MSGTR_ForcedAudioCodec "Ses codecine zorland: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: Aklama: %s\nAO: Yapan: %s\n" -#define MSGTR_AOComment "AO: Yorum: %s\n" #define MSGTR_Video_NoVideo "Video: video yok!!!\n" #define MSGTR_NotInitializeVOPorVO "\nLMCL: Video Filtreleri (-vf) veya video k (-vo) yklenemedi!\n" #define MSGTR_Paused "\n------ DURAKLADI -------\r" diff --git a/help/help_mp-uk.h b/help/help_mp-uk.h index d1d6e3d784..cf63dbe303 100644 --- a/help/help_mp-uk.h +++ b/help/help_mp-uk.h @@ -119,8 +119,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice " צ/Φæ̦æ video_out (-vo) .\n" #define MSGTR_ForcedVideoCodec " צ : %s\n" #define MSGTR_ForcedAudioCodec " Ħ : %s\n" -#define MSGTR_AODescription_AOAuthor "AO: : %s\nAO: : %s\n" -#define MSGTR_AOComment "AO: Ҧ: %s\n" #define MSGTR_Video_NoVideo ": צ\n" #define MSGTR_NotInitializeVOPorVO "\nFATAL: Φæ̦ צ Ʀ (-vf) צ צ (-vo).\n" #define MSGTR_Paused "\n ===== =====\r" diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h index b2d7793fb0..b8ec674d06 100644 --- a/help/help_mp-zh_CN.h +++ b/help/help_mp-zh_CN.h @@ -118,8 +118,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "/ʼѡƵ(-vo)豸dz!\n" #define MSGTR_ForcedVideoCodec "ָƵ: %s\n" #define MSGTR_ForcedAudioCodec "ָƵ: %s\n" -#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: ʼƵ(-vf)Ƶ(-vo)!\n" #define MSGTR_Paused "\n ===== ͣ =====\r" diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h index bb39c22bf7..64b58ee40c 100644 --- a/help/help_mp-zh_TW.h +++ b/help/help_mp-zh_TW.h @@ -120,8 +120,6 @@ static char help_text[]= #define MSGTR_ErrorInitializingVODevice "}/lƩҿܪTX (-vo) ˸mɵoͿ~C\n" #define MSGTR_ForcedVideoCodec "jϥΪT codec: %s\n" #define MSGTR_ForcedAudioCodec "jϥΪ codec: %s\n" -#define MSGTR_AODescription_AOAuthor "AO: yz: %s\nAO: @: %s\n" -#define MSGTR_AOComment "AO: : %s\n" #define MSGTR_Video_NoVideo "T: Sv\n" #define MSGTR_NotInitializeVOPorVO "\nPR~: LklƼvLo (-vf) vX (-vo)C\n" #define MSGTR_Paused "\n ====== Ȱ ======\r" diff --git a/mencoder.c b/mencoder.c index 30f19d51c1..5cdc5104fc 100644 --- a/mencoder.c +++ b/mencoder.c @@ -989,7 +989,7 @@ case ACODEC_LAVC: exit(1); } - mp_msg(MSGT_MENCODER, MSGL_V, MSGTR_FramesizeBufsizeTag, lavc_actx->frame_size, lavc_actx->frame_size * 2 * lavc_actx->channels, mux_a->wf->wFormatTag); + mp_msg(MSGT_MENCODER, MSGL_V, "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n", lavc_actx->frame_size, lavc_actx->frame_size * 2 * lavc_actx->channels, mux_a->wf->wFormatTag); break; #endif @@ -601,7 +601,7 @@ void load_per_file_config (m_config_t* conf, const char *const file) if (!stat (cfg, &st)) { - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Loading config '%s'\n", cfg); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, cfg); m_config_parse_config_file (conf, cfg); return; } @@ -615,7 +615,7 @@ void load_per_file_config (m_config_t* conf, const char *const file) { if (!stat (confpath, &st)) { - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Loading config '%s'\n", confpath); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, confpath); m_config_parse_config_file (conf, confpath); } @@ -722,7 +722,7 @@ void add_subtitles(char *filename, float fps, int silent) if (subd == NULL || set_of_sub_size >= MAX_SUBTITLE_FILES) return; set_of_subtitles[set_of_sub_size] = subd; ++set_of_sub_size; - printf("SUB: added subtitle file (%d): %s\n", set_of_sub_size, filename); + mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_AddedSubtitleFile, set_of_sub_size, filename); } // FIXME: if/when the GUI calls this, global sub numbering gets (potentially) broken. @@ -960,29 +960,29 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ int i; video_codec=video_codec_list[0]; for(i=0;video_codec_list[i];i++) - printf("vc#%d: '%s'\n",i,video_codec_list[i]); + mp_msg(MSGT_FIXME,MSGL_FIXME,"vc#%d: '%s'\n",i,video_codec_list[i]); } #endif if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){ mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs); list_codecs(1); - printf("\n"); + mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); exit_player_with_rc(NULL, 0); } if(video_codec_list && strcmp(video_codec_list[0],"help")==0){ mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs); list_codecs(0); - printf("\n"); + mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); exit_player_with_rc(NULL, 0); } if(video_fm_list && strcmp(video_fm_list[0],"help")==0){ vfm_help(); - printf("\n"); + mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); exit_player_with_rc(NULL, 0); } if(audio_fm_list && strcmp(audio_fm_list[0],"help")==0){ afm_help(); - printf("\n"); + mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); exit_player_with_rc(NULL, 0); } if(af_cfg.list && strcmp(af_cfg.list[0],"help")==0){ @@ -993,7 +993,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ #ifdef HAVE_X11 if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){ fstype_help(); - printf("\n"); + mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); exit_player_with_rc(NULL, 0); } #endif @@ -1050,9 +1050,9 @@ if (edl_check_mode() == EDL_ERROR && edl_filename) // Many users forget to include command line in bugreports... if(verbose>0){ - mp_msg(MSGT_CPLAYER, MSGL_INFO, "CommandLine:"); - for(i=1;i<argc;i++)printf(" '%s'",argv[i]); - printf("\n"); + mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine); + for(i=1;i<argc;i++)mp_msg(MSGT_FIXME, MSGL_FIXME," '%s'",argv[i]); + mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); } mp_msg_set_level(verbose+MSGL_STATUS); @@ -1089,19 +1089,19 @@ if (edl_check_mode() == EDL_ERROR && edl_filename) { // seteuid(0); /* Can't hurt to try to get root here */ if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0) - mp_msg(MSGT_CPLAYER, MSGL_WARN, "Failed to open %s: %s (it should be readable by the user.)\n", + mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable, rtc_device ? rtc_device : "/dev/rtc", strerror(errno)); else { unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */ if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) { - mp_msg(MSGT_CPLAYER, MSGL_WARN, "Linux RTC init error in ioctl (rtc_irqp_set %lu): %s\n", irqp, strerror(errno)); - mp_msg(MSGT_CPLAYER, MSGL_HINT, "Try adding \"echo %lu > /proc/sys/dev/rtc/max-user-freq\" to your system startup scripts.\n", irqp); + mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno)); + mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp); close (rtc_fd); rtc_fd = -1; } else if (ioctl(rtc_fd, RTC_PIE_ON, 0) < 0) { /* variable only by the root */ - mp_msg(MSGT_CPLAYER, MSGL_ERR, "Linux RTC init error in ioctl (rtc_pie_on): %s\n", strerror(errno)); + mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCInitErrorPieOn, strerror(errno)); close (rtc_fd); rtc_fd = -1; } else @@ -1154,16 +1154,16 @@ current_module = NULL; #ifdef HAVE_MENU if(use_menu) { if(menu_cfg && menu_init(menu_cfg)) - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", menu_cfg); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg); else { menu_cfg = get_path("menu.conf"); if(menu_init(menu_cfg)) - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", menu_cfg); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg); else { if(menu_init(MPLAYER_CONFDIR "/menu.conf")) - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", MPLAYER_CONFDIR"/menu.conf"); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, MPLAYER_CONFDIR"/menu.conf"); else { - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu init failed\n"); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitFailed); use_menu = 0; } } @@ -1216,7 +1216,7 @@ play_next_file: // or cache filling if(!noconsolecontrols && !slave_mode){ if(inited_flags&INITED_GETCH2) - mp_msg(MSGT_CPLAYER,MSGL_WARN,"WARNING: getch2_init called twice!\n"); + mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice); else getch2_enable(); // prepare stdin for hotkeys... inited_flags|=INITED_GETCH2; @@ -1335,7 +1335,7 @@ if(stream_dump_type==5){ FILE *f; current_module="dumpstream"; if(stream->type==STREAMTYPE_STREAM && stream->fd<0){ - mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Cannot dump this stream - no 'fd' available\n"); + mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpstreamFdUnavailable); exit_player(MSGTR_Exit_error); } strea |