January 2014 - MPlayer-DOCS - lists.mplayerhq.hu

Man page info on "-loop 0" flag for streaming
by Brett 30 Dec '17

30 Dec '17

Hi mplayer people, I have found that when streaming radio stations with mplayer, they are a lot more likely to recover from lost streams or changes to the next song/program if the "-loop 0" option is supplied. Unfortunately this is not explained in the man page (I only found out from looking at a lot of obscure internet sites). Currently the man page says: -loop <number> Loops movie playback <number> times. 0 means forever. Could it be changed to something like: -loop <number> Loops movie playback <number> times. 0 means forever, and should be used to keep (for example) streaming radio connected. I don't have a git repository of mplayer, otherwise I would send a diff. Cheers, Brett.

4 5

r36769 - in trunk: gui/dialog/skinbrowser.c help/help_mp-de.h help/help_mp-en.h
by ib 31 Jan '14

31 Jan '14

Author: ib Date: Fri Jan 31 18:08:39 2014 New Revision: 36769 Log: Prettify the skin browser. Use the same design as with the other similar lists (available audio and video drivers, playlist). Modified: trunk/help/help_mp-en.h Changes in other areas also in this revision: Modified: trunk/gui/dialog/skinbrowser.c trunk/help/help_mp-de.h Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h Fri Jan 31 17:37:52 2014 (r36768) +++ trunk/help/help_mp-en.h Fri Jan 31 18:08:39 2014 (r36769) @@ -627,7 +627,7 @@ static const char help_text[]= #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin '%s' not found.\n" #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Selected skin '%s' not found, trying skin 'default'...\n" #define MSGTR_SKIN_SKINCFG_SkinCfgError "Config file processing error with skin '%s'\n" -#define MSGTR_SKIN_LABEL "Skins" +#define MSGTR_SKIN_LABEL "Available skins" // --- GTK menus #define MSGTR_MENU_AboutMPlayer "About MPlayer"

1 0

r36768 - in trunk: gui/dialog/about.c gui/dialog/equalizer.c gui/dialog/menu.c gui/dialog/preferences.c gui/dialog/skinbrowser.c gui/win32/dialogs.c gui/win32/gui.c gui/win32/preferences.c help/hel...
by ib 31 Jan '14

31 Jan '14

Author: ib Date: Fri Jan 31 17:37:52 2014 New Revision: 36768 Log: Revise GUI help message texts. Remove colons, ellipses and newlines from the end of the texts. This reduces the amount of texts to be translated, enhances reusability and harmonizes the visual appearance of the different GUI localizations. Additionally, make the necessary code changes. Modified: trunk/help/help_mp-en.h Changes in other areas also in this revision: Modified: trunk/gui/dialog/about.c trunk/gui/dialog/equalizer.c trunk/gui/dialog/menu.c trunk/gui/dialog/preferences.c trunk/gui/dialog/skinbrowser.c trunk/gui/win32/dialogs.c trunk/gui/win32/gui.c trunk/gui/win32/preferences.c trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nb.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ro.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h Fri Jan 31 15:06:25 2014 (r36767) +++ trunk/help/help_mp-en.h Fri Jan 31 17:37:52 2014 (r36768) @@ -627,20 +627,20 @@ static const char help_text[]= #define MSGTR_SKIN_SKINCFG_SkinNotFound "Skin '%s' not found.\n" #define MSGTR_SKIN_SKINCFG_SelectedSkinNotFound "Selected skin '%s' not found, trying skin 'default'...\n" #define MSGTR_SKIN_SKINCFG_SkinCfgError "Config file processing error with skin '%s'\n" -#define MSGTR_SKIN_LABEL "Skins:" +#define MSGTR_SKIN_LABEL "Skins" // --- GTK menus #define MSGTR_MENU_AboutMPlayer "About MPlayer" #define MSGTR_MENU_Open "Open" -#define MSGTR_MENU_PlayFile "File..." +#define MSGTR_MENU_PlayFile "File" #define MSGTR_MENU_PlayCD "CD" #define MSGTR_MENU_PlayVCD "VCD" #define MSGTR_MENU_PlayDVD "DVD" -#define MSGTR_MENU_PlayURL "URL..." +#define MSGTR_MENU_PlayURL "URL" #define MSGTR_MENU_PlayTV "TV" -#define MSGTR_MENU_LoadSubtitle "Subtitle..." +#define MSGTR_MENU_LoadSubtitle "Subtitle" #define MSGTR_MENU_DropSubtitle "Drop subtitle" -#define MSGTR_MENU_LoadExternAudioFile "Audio track..." +#define MSGTR_MENU_LoadExternAudioFile "Audio track" #define MSGTR_MENU_Playing "Playback" #define MSGTR_MENU_Play "Play" #define MSGTR_MENU_Pause "Pause" @@ -678,10 +678,10 @@ static const char help_text[]= // --- equalizer #define MSGTR_EQU_Audio "Audio" #define MSGTR_EQU_Video "Video" -#define MSGTR_EQU_Contrast "Contrast:" -#define MSGTR_EQU_Brightness "Brightness:" -#define MSGTR_EQU_Hue "Hue:" -#define MSGTR_EQU_Saturation "Saturation:" +#define MSGTR_EQU_Contrast "Contrast" +#define MSGTR_EQU_Brightness "Brightness" +#define MSGTR_EQU_Hue "Hue" +#define MSGTR_EQU_Saturation "Saturation" #define MSGTR_EQU_Front_Left "Front left" #define MSGTR_EQU_Front_Right "Front right" #define MSGTR_EQU_Back_Left "Rear left" @@ -689,12 +689,12 @@ static const char help_text[]= #define MSGTR_EQU_Center "Center" #define MSGTR_EQU_Bass "Bass" #define MSGTR_EQU_All "All channels" -#define MSGTR_EQU_Channel1 "Channel 1:" -#define MSGTR_EQU_Channel2 "Channel 2:" -#define MSGTR_EQU_Channel3 "Channel 3:" -#define MSGTR_EQU_Channel4 "Channel 4:" -#define MSGTR_EQU_Channel5 "Channel 5:" -#define MSGTR_EQU_Channel6 "Channel 6:" +#define MSGTR_EQU_Channel1 "Channel 1" +#define MSGTR_EQU_Channel2 "Channel 2" +#define MSGTR_EQU_Channel3 "Channel 3" +#define MSGTR_EQU_Channel4 "Channel 4" +#define MSGTR_EQU_Channel5 "Channel 5" +#define MSGTR_EQU_Channel6 "Channel 6" #define MSGTR_EQU_Frequency0 "31.25 Hz" #define MSGTR_EQU_Frequency1 "62.50 Hz" #define MSGTR_EQU_Frequency2 "125 Hz" @@ -725,37 +725,37 @@ static const char help_text[]= #define MSGTR_PREFERENCES_EnableEqualizer "Enable equalizer" #define MSGTR_PREFERENCES_SoftwareMixer "Enable software mixer" #define MSGTR_PREFERENCES_ExtraStereo "Enable extra stereo" -#define MSGTR_PREFERENCES_Coefficient "Coefficient:" -#define MSGTR_PREFERENCES_AudioDelay "Audio delay:" +#define MSGTR_PREFERENCES_Coefficient "Coefficient" +#define MSGTR_PREFERENCES_AudioDelay "Audio delay" #define MSGTR_PREFERENCES_DoubleBuffer "Enable double buffering" #define MSGTR_PREFERENCES_DirectRender "Enable direct rendering" #define MSGTR_PREFERENCES_FrameDrop "Enable frame dropping" #define MSGTR_PREFERENCES_HFrameDrop "Enable intense frame dropping (possible image distortion)" #define MSGTR_PREFERENCES_Flip "Flip image upside down" -#define MSGTR_PREFERENCES_Panscan "Pan and scan:" +#define MSGTR_PREFERENCES_Panscan "Pan and scan" #define MSGTR_PREFERENCES_OSD_LEVEL0 "Subtitles only" #define MSGTR_PREFERENCES_OSD_LEVEL1 "Volume and seek" #define MSGTR_PREFERENCES_OSD_LEVEL2 "Volume, seek, timer and percentage" #define MSGTR_PREFERENCES_OSD_LEVEL3 "Volume, seek, timer, percentage and total time" -#define MSGTR_PREFERENCES_Subtitle "Subtitle:" -#define MSGTR_PREFERENCES_SUB_Delay "Delay:" -#define MSGTR_PREFERENCES_SUB_FPS "Frame rate (fps):" -#define MSGTR_PREFERENCES_SUB_POS "Position:" +#define MSGTR_PREFERENCES_Subtitle "Subtitle" +#define MSGTR_PREFERENCES_SUB_Delay "Delay" +#define MSGTR_PREFERENCES_SUB_FPS "Frame rate (fps)" +#define MSGTR_PREFERENCES_SUB_POS "Position" #define MSGTR_PREFERENCES_SUB_AutoLoad "Subtitle autoloading" #define MSGTR_PREFERENCES_SUB_MPSUB "Convert the given subtitle to MPlayer's subtitle format (mpsub)" #define MSGTR_PREFERENCES_SUB_SRT "Convert the given subtitle to SubRip subtitle format (srt)" #define MSGTR_PREFERENCES_SUB_Overlap "Allow subtitle overlapping" #define MSGTR_PREFERENCES_SUB_USE_ASS "Enable ssa/ass subtitle rendering" #define MSGTR_PREFERENCES_SUB_ASS_USE_MARGINS "Add margins for subtitle" -#define MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN "Top:" -#define MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN "Bottom:" -#define MSGTR_PREFERENCES_Font "Font:" +#define MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN "Top" +#define MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN "Bottom" +#define MSGTR_PREFERENCES_Font "Font" #define MSGTR_PREFERENCES_PostProcess "Enable post-processing" -#define MSGTR_PREFERENCES_AutoQuality "Maximum usage of spare CPU time:" +#define MSGTR_PREFERENCES_AutoQuality "Maximum usage of spare CPU time" #define MSGTR_PREFERENCES_NI "Use non-interleaved AVI parser" #define MSGTR_PREFERENCES_IDX "Allow seeking in broken media" -#define MSGTR_PREFERENCES_VideoCodecFamily "Video codec family:" -#define MSGTR_PREFERENCES_AudioCodecFamily "Audio codec family:" +#define MSGTR_PREFERENCES_VideoCodecFamily "Video codec family" +#define MSGTR_PREFERENCES_AudioCodecFamily "Audio codec family" #define MSGTR_PREFERENCES_FRAME_OSD_Level "OSD mode" #define MSGTR_PREFERENCES_FRAME_Subtitle "Subtitle" #define MSGTR_PREFERENCES_FRAME_Font "Font" @@ -764,11 +764,11 @@ static const char help_text[]= #define MSGTR_PREFERENCES_FRAME_Codecs "Codecs" #define MSGTR_PREFERENCES_FRAME_Cache "Cache" #define MSGTR_PREFERENCES_FRAME_Misc "Misc" -#define MSGTR_PREFERENCES_Audio_Device "Device:" -#define MSGTR_PREFERENCES_Audio_Mixer "Mixer:" -#define MSGTR_PREFERENCES_Audio_MixerChannel "Mixer channel:" +#define MSGTR_PREFERENCES_Audio_Device "Device" +#define MSGTR_PREFERENCES_Audio_Mixer "Mixer" +#define MSGTR_PREFERENCES_Audio_MixerChannel "Mixer channel" #define MSGTR_PREFERENCES_Message "You need to restart playback for some options to take effect." -#define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:" +#define MSGTR_PREFERENCES_DXR3_VENC "Video encoder" #define MSGTR_PREFERENCES_DXR3_NoEnc "None" #define MSGTR_PREFERENCES_DXR3_LAVC "lavc (realtime mpeg1 encoding)" #define MSGTR_PREFERENCES_Default "(Default)" @@ -812,14 +812,14 @@ static const char help_text[]= #define MSGTR_PREFERENCES_FontPropWidth "Proportional to movie width" #define MSGTR_PREFERENCES_FontPropHeight "Proportional to movie height" #define MSGTR_PREFERENCES_FontPropDiagonal "Proportional to movie diagonal" -#define MSGTR_PREFERENCES_FontEncoding "Encoding:" -#define MSGTR_PREFERENCES_FontAutoScaleMode "Scale mode:" -#define MSGTR_PREFERENCES_FontBlur "Blur:" -#define MSGTR_PREFERENCES_FontOutLine "Outline:" -#define MSGTR_PREFERENCES_FontTextScale "Size (subtitles):" -#define MSGTR_PREFERENCES_FontOSDScale "Size (OSD):" +#define MSGTR_PREFERENCES_FontEncoding "Encoding" +#define MSGTR_PREFERENCES_FontAutoScaleMode "Scale mode" +#define MSGTR_PREFERENCES_FontBlur "Blur" +#define MSGTR_PREFERENCES_FontOutLine "Outline" +#define MSGTR_PREFERENCES_FontTextScale "Size (subtitles)" +#define MSGTR_PREFERENCES_FontOSDScale "Size (OSD)" #define MSGTR_PREFERENCES_Cache "Enable Cache" -#define MSGTR_PREFERENCES_CacheSize "Cache size:" +#define MSGTR_PREFERENCES_CacheSize "Cache size" #define MSGTR_PREFERENCES_LoadFullscreen "Start in fullscreen" #define MSGTR_PREFERENCES_SaveWinPos "Save window positions" #define MSGTR_PREFERENCES_XSCREENSAVER "Turn off XScreenSaver" @@ -827,19 +827,19 @@ static const char help_text[]= #define MSGTR_PREFERENCES_TV_Digital "Enable digital TV reception" #define MSGTR_PREFERENCES_NoIdle "Quit after playing" #define MSGTR_PREFERENCES_AutoSync "Enable automatic A/V sync" -#define MSGTR_PREFERENCES_AutoSyncValue "Sync value:" -#define MSGTR_PREFERENCES_CDROMDevice "CD-ROM device:" -#define MSGTR_PREFERENCES_DVDDevice "DVD device:" -#define MSGTR_PREFERENCES_FPS "Frame rate (fps):" +#define MSGTR_PREFERENCES_AutoSyncValue "Sync value" +#define MSGTR_PREFERENCES_CDROMDevice "CD-ROM device" +#define MSGTR_PREFERENCES_DVDDevice "DVD device" +#define MSGTR_PREFERENCES_FPS "Frame rate (fps)" #define MSGTR_PREFERENCES_ShowVideoWindow "Hide video window after playing" #define MSGTR_PREFERENCES_ArtsBroken "Newer aRts versions are incompatible with GTK 1.x and will crash GMPlayer!" // -- aboutbox -#define MSGTR_ABOUT_UHU "GUI development has been sponsored by UHU-Linux:\n" -#define MSGTR_ABOUT_Contributors "Code and documentation contributors:\n" -#define MSGTR_ABOUT_Codecs_libs_contributions "Codecs and third party libraries:\n" -#define MSGTR_ABOUT_Translations "Translations:\n" -#define MSGTR_ABOUT_Skins "Skins:\n" +#define MSGTR_ABOUT_UHU "GUI development has been sponsored by UHU-Linux" +#define MSGTR_ABOUT_Contributors "Code and documentation contributors" +#define MSGTR_ABOUT_Codecs_libs_contributions "Codecs and third party libraries" +#define MSGTR_ABOUT_Translations "Translations" +#define MSGTR_ABOUT_Skins "Skins" // --- messagebox #define MSGTR_MSGBOX_LABEL_FatalError "Fatal error" @@ -878,19 +878,19 @@ static const char help_text[]= #define MSGTR_Load "Load" #define MSGTR_Save "Save" #define MSGTR_Up "Up" -#define MSGTR_DirectorySelect "Directory list:" +#define MSGTR_DirectorySelect "Directory list" #define MSGTR_PlaylistSave "Save playlist" #define MSGTR_PlaylistSelect "Select playlist" -#define MSGTR_SelectTitleChapter "Select title/chapter..." +#define MSGTR_SelectTitleChapter "Select title/chapter" #define MSGTR_MENU_DebugConsole "Debug Console" #define MSGTR_MENU_OnlineHelp "Online Help" -#define MSGTR_MENU_PlayDirectory "Directory..." +#define MSGTR_MENU_PlayDirectory "Directory" #define MSGTR_MENU_SeekBack "Seek backwards" #define MSGTR_MENU_SeekForw "Seek forwards" #define MSGTR_MENU_ShowHide "Show/Hide" #define MSGTR_MENU_SubtitlesOnOff "Subtitle visibility on/off" -#define MSGTR_PLAYLIST_AddFile "Add file..." -#define MSGTR_PLAYLIST_AddURL "Add URL..." +#define MSGTR_PLAYLIST_AddFile "Add file" +#define MSGTR_PLAYLIST_AddURL "Add URL" #define MSGTR_PREFERENCES_Priority "Priority" #define MSGTR_PREFERENCES_PriorityHigh "high" #define MSGTR_PREFERENCES_PriorityLow "low"

1 0

r36766 - in trunk: gui/dialog/about.c gui/dialog/equalizer.c gui/dialog/preferences.c gui/ui/main.c gui/ui/menu.c gui/ui/playbar.c gui/win32/gui.c gui/win32/preferences.c help/help_mp-bg.h help/hel...
by ib 30 Jan '14

30 Jan '14

Author: ib Date: Thu Jan 30 14:26:45 2014 New Revision: 36766 Log: Revise GUI help message texts. In particular, revise the English and German translations, but remove some unused definitions from all language files as well, and don't define a symbolic constant by an other one. Additionally, make some necessary code changes. Modified: trunk/help/help_mp-en.h Changes in other areas also in this revision: Modified: trunk/gui/dialog/about.c trunk/gui/dialog/equalizer.c trunk/gui/dialog/preferences.c trunk/gui/ui/main.c trunk/gui/ui/menu.c trunk/gui/ui/playbar.c trunk/gui/win32/gui.c trunk/gui/win32/preferences.c trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nb.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ro.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-sv.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h Thu Jan 30 13:05:35 2014 (r36765) +++ trunk/help/help_mp-en.h Thu Jan 30 14:26:45 2014 (r36766) @@ -535,22 +535,18 @@ static const char help_text[]= #define MSGTR_LOADER_DYLD_Warning "WARNING: Attempting to use DLL codecs but environment variable\n DYLD_BIND_AT_LAUNCH not set. This will likely crash.\n" -// ====================== GUI messages/buttons ======================== +// ================================ GUI ================================ // --- 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..." -// Note: If you change MSGTR_PlayList please see if it still fits MSGTR_MENU_PlayList +#define MSGTR_FileSelect "Select file" +#define MSGTR_SubtitleSelect "Select subtitle" +#define MSGTR_AudioFileSelect "Select audio file" +#define MSGTR_FontSelect "Select font" #define MSGTR_PlayList "Playlist" #define MSGTR_Equalizer "Equalizer" -#define MSGTR_ConfigureEqualizer "Configure Equalizer" -#define MSGTR_SkinBrowser "Skin Browser" -#define MSGTR_Network "Network streaming..." -// Note: If you change MSGTR_Preferences please see if it still fits MSGTR_MENU_Preferences +#define MSGTR_ConfigureEqualizer "Equalizer configuration" +#define MSGTR_SkinBrowser "Skin browser" +#define MSGTR_Network "Network streaming" #define MSGTR_Preferences "Preferences" #define MSGTR_AudioPreferences "Audio driver configuration" #define MSGTR_NoMediaOpened "No media opened." @@ -562,12 +558,12 @@ static const char help_text[]= #define MSGTR_Filter_UTF8Subtitles "UTF-8 encoded subtitles (*.utf, *.utf-8, *.utf8)" #define MSGTR_Filter_AllSubtitles "All subtitles" #define MSGTR_Filter_AllFiles "All files" -#define MSGTR_Filter_TTF "True Type fonts (*.ttf)" +#define MSGTR_Filter_TTF "TrueType fonts (*.ttf)" #define MSGTR_Filter_Type1 "Type1 fonts (*.pfb)" #define MSGTR_Filter_AllFonts "All fonts" -#define MSGTR_Filter_FontFiles "Font files (*.desc)" +#define MSGTR_Filter_FontFiles "Bitmap fonts (*.desc)" #define MSGTR_Filter_DDRawAudio "Dolby Digital / PCM (*.ac3, *.pcm)" -#define MSGTR_Filter_MPEGAudio "MPEG audio (*.mp2, *.mp3, *.mpga, *.m4a, *.aac, *.f4a)" +#define MSGTR_Filter_MPEGAudio "MPEG audio (*.aac, *.f4a, *.m4a, *.mp2, *.mp3, *.mpga)" #define MSGTR_Filter_MatroskaAudio "Matroska audio (*.mka)" #define MSGTR_Filter_OGGAudio "Ogg audio (*.oga, *.ogg, *.spx)" #define MSGTR_Filter_WAVAudio "WAV audio (*.wav)" @@ -596,15 +592,14 @@ static const char help_text[]= #define MSGTR_Add "Add" #define MSGTR_Remove "Remove" #define MSGTR_Clear "Clear" -#define MSGTR_Config "Config" +#define MSGTR_Config "Configure" #define MSGTR_ConfigDriver "Configure driver" #define MSGTR_Browse "Browse" // --- error messages --- -#define MSGTR_NEMDB "Sorry, not enough memory to draw buffer.\n" -#define MSGTR_NEMFMR "Sorry, not enough memory for menu rendering." -#define MSGTR_IDFGCVD "Sorry, no GUI-compatible video output driver found.\n" -#define MSGTR_NEEDLAVC "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc in the DXR3/H+ configuration box." +#define MSGTR_NEMDB "Not enough memory for window rendering.\n" +#define MSGTR_IDFGCVD "No GUI supporting video output driver found.\n" +#define MSGTR_NEEDLAVC "You cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc in the DXR3/H+ configuration box.\n" #define MSGTR_ICONERROR "Icon '%s' (size %d) not found or unsupported format.\n" #define MSGTR_LOCALE_ENCODING "G_FILENAME_ENCODING=@locale or G_BROKEN_FILENAMES isn't supported,\nencoding must be explicitly specified in G_FILENAME_ENCODING.\n" @@ -623,8 +618,8 @@ static const char help_text[]= #define MSGTR_SKIN_BITMAP_ConversionError "24 bit to 32 bit conversion error in %s\n" #define MSGTR_SKIN_UnknownMessage "Unknown message '%s'\n" #define MSGTR_SKIN_NotEnoughMemory "Not enough memory\n" -#define MSGTR_SKIN_TooManyItemsDeclared "Too many items declared.\n" -#define MSGTR_SKIN_FONT_TooManyFontsDeclared "Too many fonts declared.\n" +#define MSGTR_SKIN_TooManyItemsDeclared "Too many items defined.\n" +#define MSGTR_SKIN_FONT_TooManyFontsDeclared "Too many fonts defined.\n" #define MSGTR_SKIN_FONT_FontFileNotFound "Font description file not found.\n" #define MSGTR_SKIN_FONT_FontImageNotFound "Font image file not found.\n" #define MSGTR_SKIN_FONT_NonExistentFont "Font '%s' not found.\n" @@ -636,23 +631,22 @@ static const char help_text[]= // --- GTK menus #define MSGTR_MENU_AboutMPlayer "About MPlayer" -#define MSGTR_MENU_Open "Open..." -#define MSGTR_MENU_PlayFile "Play file..." -#define MSGTR_MENU_PlayCD "Play CD..." -#define MSGTR_MENU_PlayVCD "Play VCD..." -#define MSGTR_MENU_PlayDVD "Play DVD..." -#define MSGTR_MENU_PlayURL "Play URL..." -#define MSGTR_MENU_PlayTV "Play TV..." -#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_Open "Open" +#define MSGTR_MENU_PlayFile "File..." +#define MSGTR_MENU_PlayCD "CD" +#define MSGTR_MENU_PlayVCD "VCD" +#define MSGTR_MENU_PlayDVD "DVD" +#define MSGTR_MENU_PlayURL "URL..." +#define MSGTR_MENU_PlayTV "TV" +#define MSGTR_MENU_LoadSubtitle "Subtitle..." +#define MSGTR_MENU_DropSubtitle "Drop subtitle" +#define MSGTR_MENU_LoadExternAudioFile "Audio track..." +#define MSGTR_MENU_Playing "Playback" #define MSGTR_MENU_Play "Play" #define MSGTR_MENU_Pause "Pause" #define MSGTR_MENU_Stop "Stop" -#define MSGTR_MENU_NextStream "Next stream" -#define MSGTR_MENU_PrevStream "Prev stream" -#define MSGTR_MENU_Size "Size" +#define MSGTR_MENU_NextStream "Next" +#define MSGTR_MENU_PrevStream "Previous" #define MSGTR_MENU_HalfSize "Half size" #define MSGTR_MENU_NormalSize "Normal size" #define MSGTR_MENU_DoubleSize "Double size" @@ -660,119 +654,124 @@ static const char help_text[]= #define MSGTR_MENU_CD "CD" #define MSGTR_MENU_DVD "DVD" #define MSGTR_MENU_VCD "VCD" -#define MSGTR_MENU_PlayDisc "Open disc..." -#define MSGTR_MENU_ShowDVDMenu "Show DVD menu" +#define MSGTR_MENU_PlayDisc "Play" #define MSGTR_MENU_Titles "Titles" #define MSGTR_MENU_Title "Title %2d" #define MSGTR_MENU_None "(none)" #define MSGTR_MENU_Chapters "Chapters" #define MSGTR_MENU_Chapter "Chapter %2d" -#define MSGTR_MENU_AudioLanguages "Audio languages" -#define MSGTR_MENU_SubtitleLanguages "Subtitle languages" -#define MSGTR_MENU_PlayList MSGTR_PlayList +#define MSGTR_MENU_AudioLanguages "Audio tracks" +#define MSGTR_MENU_SubtitleLanguages "Subtitles" +#define MSGTR_MENU_PlayList "Playlist" #define MSGTR_MENU_SkinBrowser "Skin browser" -#define MSGTR_MENU_Preferences MSGTR_Preferences -#define MSGTR_MENU_Exit "Exit" +#define MSGTR_MENU_Preferences "Preferences" +#define MSGTR_MENU_Exit "Quit" #define MSGTR_MENU_Mute "Mute" #define MSGTR_MENU_Original "Original" #define MSGTR_MENU_235 "2.35:1" #define MSGTR_MENU_AspectRatio "Aspect ratio" -#define MSGTR_MENU_AudioTrack "Audio track" +#define MSGTR_MENU_AudioTrack "Audio tracks" #define MSGTR_MENU_Track "Track %d" -#define MSGTR_MENU_VideoTrack "Video track" +#define MSGTR_MENU_VideoTrack "Video tracks" #define MSGTR_MENU_Subtitles "Subtitles" // --- equalizer -// Note: If you change MSGTR_EQU_Audio please see if it still fits MSGTR_PREFERENCES_Audio #define MSGTR_EQU_Audio "Audio" -// Note: If you change MSGTR_EQU_Video please see if it still fits MSGTR_PREFERENCES_Video #define MSGTR_EQU_Video "Video" -#define MSGTR_EQU_Contrast "Contrast: " -#define MSGTR_EQU_Brightness "Brightness: " -#define MSGTR_EQU_Hue "Hue: " -#define MSGTR_EQU_Saturation "Saturation: " -#define MSGTR_EQU_Front_Left "Front Left" -#define MSGTR_EQU_Front_Right "Front Right" -#define MSGTR_EQU_Back_Left "Rear Left" -#define MSGTR_EQU_Back_Right "Rear Right" +#define MSGTR_EQU_Contrast "Contrast:" +#define MSGTR_EQU_Brightness "Brightness:" +#define MSGTR_EQU_Hue "Hue:" +#define MSGTR_EQU_Saturation "Saturation:" +#define MSGTR_EQU_Front_Left "Front left" +#define MSGTR_EQU_Front_Right "Front right" +#define MSGTR_EQU_Back_Left "Rear left" +#define MSGTR_EQU_Back_Right "Rear right" #define MSGTR_EQU_Center "Center" #define MSGTR_EQU_Bass "Bass" -#define MSGTR_EQU_All "All" +#define MSGTR_EQU_All "All channels" #define MSGTR_EQU_Channel1 "Channel 1:" #define MSGTR_EQU_Channel2 "Channel 2:" #define MSGTR_EQU_Channel3 "Channel 3:" #define MSGTR_EQU_Channel4 "Channel 4:" #define MSGTR_EQU_Channel5 "Channel 5:" #define MSGTR_EQU_Channel6 "Channel 6:" +#define MSGTR_EQU_Frequency0 "31.25 Hz" +#define MSGTR_EQU_Frequency1 "62.50 Hz" +#define MSGTR_EQU_Frequency2 "125 Hz" +#define MSGTR_EQU_Frequency3 "250 Hz" +#define MSGTR_EQU_Frequency4 "500 Hz" +#define MSGTR_EQU_Frequency5 "1 kHz" +#define MSGTR_EQU_Frequency6 "2 kHz" +#define MSGTR_EQU_Frequency7 "4 kHz" +#define MSGTR_EQU_Frequency8 "8 kHz" +#define MSGTR_EQU_Frequency9 "16 kHz" // --- playlist -#define MSGTR_PLAYLIST_Path "Path" +#define MSGTR_PLAYLIST_Path "Directory" #define MSGTR_PLAYLIST_Selected "Selected files" #define MSGTR_PLAYLIST_Files "Files" #define MSGTR_PLAYLIST_DirectoryTree "Directory tree" // --- preferences -#define MSGTR_PREFERENCES_Audio MSGTR_EQU_Audio -#define MSGTR_PREFERENCES_Video MSGTR_EQU_Video +#define MSGTR_PREFERENCES_Audio "Audio" +#define MSGTR_PREFERENCES_Video "Video" #define MSGTR_PREFERENCES_SubtitleOSD "OSD / Subtitles" -#define MSGTR_PREFERENCES_Codecs "Demuxer / Codecs" -// Note: If you change MSGTR_PREFERENCES_Misc see if it still fits MSGTR_PREFERENCES_FRAME_Misc +#define MSGTR_PREFERENCES_Codecs "Demuxers / Codecs" #define MSGTR_PREFERENCES_Misc "Misc" #define MSGTR_PREFERENCES_None "(none)" -#define MSGTR_PREFERENCES_DriverDefault "driver default" -#define MSGTR_PREFERENCES_AvailableDrivers "Available drivers:" -#define MSGTR_PREFERENCES_DoNotPlaySound "Do not play sound" +#define MSGTR_PREFERENCES_DriverDefault "Default setting" +#define MSGTR_PREFERENCES_AvailableDrivers "Available drivers" #define MSGTR_PREFERENCES_NormalizeSound "Normalize sound" #define MSGTR_PREFERENCES_EnableEqualizer "Enable equalizer" -#define MSGTR_PREFERENCES_SoftwareMixer "Enable Software Mixer" +#define MSGTR_PREFERENCES_SoftwareMixer "Enable software mixer" #define MSGTR_PREFERENCES_ExtraStereo "Enable extra stereo" #define MSGTR_PREFERENCES_Coefficient "Coefficient:" -#define MSGTR_PREFERENCES_AudioDelay "Audio delay" +#define MSGTR_PREFERENCES_AudioDelay "Audio delay:" #define MSGTR_PREFERENCES_DoubleBuffer "Enable double buffering" #define MSGTR_PREFERENCES_DirectRender "Enable direct rendering" #define MSGTR_PREFERENCES_FrameDrop "Enable frame dropping" -#define MSGTR_PREFERENCES_HFrameDrop "Enable HARD frame dropping (dangerous)" +#define MSGTR_PREFERENCES_HFrameDrop "Enable intense frame dropping (possible image distortion)" #define MSGTR_PREFERENCES_Flip "Flip image upside down" -#define MSGTR_PREFERENCES_Panscan "Panscan: " +#define MSGTR_PREFERENCES_Panscan "Pan and scan:" #define MSGTR_PREFERENCES_OSD_LEVEL0 "Subtitles only" #define MSGTR_PREFERENCES_OSD_LEVEL1 "Volume and seek" #define MSGTR_PREFERENCES_OSD_LEVEL2 "Volume, seek, timer and percentage" #define MSGTR_PREFERENCES_OSD_LEVEL3 "Volume, seek, timer, percentage and total time" #define MSGTR_PREFERENCES_Subtitle "Subtitle:" -#define MSGTR_PREFERENCES_SUB_Delay "Delay: " -#define MSGTR_PREFERENCES_SUB_FPS "FPS:" -#define MSGTR_PREFERENCES_SUB_POS "Position: " -#define MSGTR_PREFERENCES_SUB_AutoLoad "Disable subtitle autoloading" -#define MSGTR_PREFERENCES_SUB_MPSUB "Convert the given subtitle to MPlayer's subtitle format" -#define MSGTR_PREFERENCES_SUB_SRT "Convert the given subtitle to the time based SubViewer (SRT) format" -#define MSGTR_PREFERENCES_SUB_Overlap "Toggle subtitle overlapping" -#define MSGTR_PREFERENCES_SUB_USE_ASS "SSA/ASS subtitle rendering" -#define MSGTR_PREFERENCES_SUB_ASS_USE_MARGINS "Use margins" -#define MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN "Top: " -#define MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN "Bottom: " +#define MSGTR_PREFERENCES_SUB_Delay "Delay:" +#define MSGTR_PREFERENCES_SUB_FPS "Frame rate (fps):" +#define MSGTR_PREFERENCES_SUB_POS "Position:" +#define MSGTR_PREFERENCES_SUB_AutoLoad "Subtitle autoloading" +#define MSGTR_PREFERENCES_SUB_MPSUB "Convert the given subtitle to MPlayer's subtitle format (mpsub)" +#define MSGTR_PREFERENCES_SUB_SRT "Convert the given subtitle to SubRip subtitle format (srt)" +#define MSGTR_PREFERENCES_SUB_Overlap "Allow subtitle overlapping" +#define MSGTR_PREFERENCES_SUB_USE_ASS "Enable ssa/ass subtitle rendering" +#define MSGTR_PREFERENCES_SUB_ASS_USE_MARGINS "Add margins for subtitle" +#define MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN "Top:" +#define MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN "Bottom:" #define MSGTR_PREFERENCES_Font "Font:" -#define MSGTR_PREFERENCES_PostProcess "Enable postprocessing" -#define MSGTR_PREFERENCES_AutoQuality "Auto quality: " +#define MSGTR_PREFERENCES_PostProcess "Enable post-processing" +#define MSGTR_PREFERENCES_AutoQuality "Maximum usage of spare CPU time:" #define MSGTR_PREFERENCES_NI "Use non-interleaved AVI parser" -#define MSGTR_PREFERENCES_IDX "Rebuild index table, if needed" +#define MSGTR_PREFERENCES_IDX "Allow seeking in broken media" #define MSGTR_PREFERENCES_VideoCodecFamily "Video codec family:" #define MSGTR_PREFERENCES_AudioCodecFamily "Audio codec family:" #define MSGTR_PREFERENCES_FRAME_OSD_Level "OSD mode" #define MSGTR_PREFERENCES_FRAME_Subtitle "Subtitle" #define MSGTR_PREFERENCES_FRAME_Font "Font" -#define MSGTR_PREFERENCES_FRAME_PostProcess "Postprocessing" +#define MSGTR_PREFERENCES_FRAME_PostProcess "Post-processing" #define MSGTR_PREFERENCES_FRAME_Demuxer "Demuxer" #define MSGTR_PREFERENCES_FRAME_Codecs "Codecs" #define MSGTR_PREFERENCES_FRAME_Cache "Cache" -#define MSGTR_PREFERENCES_FRAME_Misc MSGTR_PREFERENCES_Misc +#define MSGTR_PREFERENCES_FRAME_Misc "Misc" #define MSGTR_PREFERENCES_Audio_Device "Device:" #define MSGTR_PREFERENCES_Audio_Mixer "Mixer:" #define MSGTR_PREFERENCES_Audio_MixerChannel "Mixer channel:" -#define MSGTR_PREFERENCES_Message "Please remember that you need to restart playback for some options to take effect!" +#define MSGTR_PREFERENCES_Message "You need to restart playback for some options to take effect." #define MSGTR_PREFERENCES_DXR3_VENC "Video encoder:" #define MSGTR_PREFERENCES_DXR3_NoEnc "None" -#define MSGTR_PREFERENCES_DXR3_LAVC "Use LAVC (FFmpeg)" -#define MSGTR_PREFERENCES_DefaultEnc "(Default)" +#define MSGTR_PREFERENCES_DXR3_LAVC "lavc (realtime mpeg1 encoding)" +#define MSGTR_PREFERENCES_Default "(Default)" #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" #define MSGTR_PREFERENCES_FontEncoding2 "Western European (ISO-8859-1)" #define MSGTR_PREFERENCES_FontEncoding3 "Western European, extended (ISO-8859-15)" @@ -819,61 +818,58 @@ static const char help_text[]= #define MSGTR_PREFERENCES_FontOutLine "Outline:" #define MSGTR_PREFERENCES_FontTextScale "Size (subtitles):" #define MSGTR_PREFERENCES_FontOSDScale "Size (OSD):" -#define MSGTR_PREFERENCES_Cache "Cache on/off" -#define MSGTR_PREFERENCES_CacheSize "Cache size: " +#define MSGTR_PREFERENCES_Cache "Enable Cache" +#define MSGTR_PREFERENCES_CacheSize "Cache size:" #define MSGTR_PREFERENCES_LoadFullscreen "Start in fullscreen" -#define MSGTR_PREFERENCES_SaveWinPos "Save window position" -#define MSGTR_PREFERENCES_XSCREENSAVER "Stop XScreenSaver" +#define MSGTR_PREFERENCES_SaveWinPos "Save window positions" +#define MSGTR_PREFERENCES_XSCREENSAVER "Turn off XScreenSaver" #define MSGTR_PREFERENCES_PlayBar "Enable playbar" -#define MSGTR_PREFERENCES_TV_Digital "Digital TV reception" +#define MSGTR_PREFERENCES_TV_Digital "Enable digital TV reception" #define MSGTR_PREFERENCES_NoIdle "Quit after playing" -#define MSGTR_PREFERENCES_AutoSync "AutoSync on/off" -#define MSGTR_PREFERENCES_AutoSyncValue "Autosync: " +#define MSGTR_PREFERENCES_AutoSync "Enable automatic A/V sync" +#define MSGTR_PREFERENCES_AutoSyncValue "Sync value:" #define MSGTR_PREFERENCES_CDROMDevice "CD-ROM device:" #define MSGTR_PREFERENCES_DVDDevice "DVD device:" -#define MSGTR_PREFERENCES_FPS "Movie FPS:" -#define MSGTR_PREFERENCES_ShowVideoWindow "Show video window when inactive" -#define MSGTR_PREFERENCES_ArtsBroken "Newer aRts versions are incompatible "\ - "with GTK 1.x and will crash GMPlayer!" +#define MSGTR_PREFERENCES_FPS "Frame rate (fps):" +#define MSGTR_PREFERENCES_ShowVideoWindow "Hide video window after playing" +#define MSGTR_PREFERENCES_ArtsBroken "Newer aRts versions are incompatible with GTK 1.x and will crash GMPlayer!" // -- aboutbox -#define MSGTR_ABOUT_UHU "GUI development sponsored by UHU Linux\n" -#define MSGTR_ABOUT_Contributors "Code and documentation contributors\n" -#define MSGTR_ABOUT_Codecs_libs_contributions "Codecs and third party libraries\n" -#define MSGTR_ABOUT_Translations "Translations\n" -#define MSGTR_ABOUT_Skins "Skins\n" +#define MSGTR_ABOUT_UHU "GUI development has been sponsored by UHU-Linux:\n" +#define MSGTR_ABOUT_Contributors "Code and documentation contributors:\n" +#define MSGTR_ABOUT_Codecs_libs_contributions "Codecs and third party libraries:\n" +#define MSGTR_ABOUT_Translations "Translations:\n" +#define MSGTR_ABOUT_Skins "Skins:\n" // --- messagebox -#define MSGTR_MSGBOX_LABEL_FatalError "Fatal error!" -#define MSGTR_MSGBOX_LABEL_Error "Error!" -#define MSGTR_MSGBOX_LABEL_Warning "Warning!" +#define MSGTR_MSGBOX_LABEL_FatalError "Fatal error" +#define MSGTR_MSGBOX_LABEL_Error "Error" +#define MSGTR_MSGBOX_LABEL_Warning "Warning" // cfg.c #define MSGTR_UnableToSaveOption "Unable to save option '%s'.\n" // interface.c -#define MSGTR_DeletingSubtitles "Deleting subtitles.\n" -#define MSGTR_LoadingSubtitles "Loading subtitles '%s'.\n" +#define MSGTR_DeletingSubtitles "Removing subtitle.\n" +#define MSGTR_LoadingSubtitles "Loading subtitle file '%s'.\n" #define MSGTR_AddingVideoFilter "Adding video filter '%s'.\n" // mw.c -#define MSGTR_NotAFile "This does not seem to be a file: %s !\n" +#define MSGTR_NotAFile "%s does not seem to be a file!\n" // ws.c -#define MSGTR_WS_RemoteDisplay "Remote display, disabling XMITSHM.\n" -#define MSGTR_WS_NoXshm "Sorry, your system does not support the X shared memory extension.\n" -#define MSGTR_WS_NoXshape "Sorry, your system does not support the XShape extension.\n" -#define MSGTR_WS_ColorDepthTooLow "Sorry, the color depth is too low.\n" -#define MSGTR_WS_TooManyOpenWindows "There are too many open windows.\n" -#define MSGTR_WS_ShmError "shared memory extension error\n" -#define MSGTR_WS_NotEnoughMemoryDrawBuffer "Sorry, not enough memory to draw buffer.\n" -#define MSGTR_WS_DpmsUnavailable "DPMS not available?\n" -#define MSGTR_WS_DpmsNotEnabled "Could not enable DPMS.\n" -#define MSGTR_WS_XError "An X11 Error has occurred!\n" +#define MSGTR_WS_RemoteDisplay "Remote display, disabling X shared memory.\n" +#define MSGTR_WS_NoXshm "X shared memory is not available!\n" +#define MSGTR_WS_NoXshape "This system does not support the XShape extension!\n" +#define MSGTR_WS_ColorDepthTooLow "The color depth of the display is too low!\n" +#define MSGTR_WS_TooManyOpenWindows "Too many windows have been created!\n" +#define MSGTR_WS_ShmError "An X shared memory extension error has occurred!\n" +#define MSGTR_WS_NotEnoughMemoryDrawBuffer "Not enough memory for image rendering!\n" +#define MSGTR_WS_XError "An X11 error has occurred!\n" // wsxdnd.c -#define MSGTR_WS_NotAFile "This does not seem to be a file...\n" -#define MSGTR_WS_DDNothing "D&D: Nothing returned!\n" +#define MSGTR_WS_NotAFile "This does not seem to be a file!\n" +#define MSGTR_WS_DDNothing "Drag and drop: Nothing returned!\n" // Win32 GUI #define MSGTR_Close "Close" @@ -882,20 +878,20 @@ static const char help_text[]= #define MSGTR_Load "Load" #define MSGTR_Save "Save" #define MSGTR_Up "Up" -#define MSGTR_DirectorySelect "Select directory..." -#define MSGTR_PlaylistSave "Save playlist..." -#define MSGTR_PlaylistSelect "Select playlist..." +#define MSGTR_DirectorySelect "Directory list:" +#define MSGTR_PlaylistSave "Save playlist" +#define MSGTR_PlaylistSelect "Select playlist" #define MSGTR_SelectTitleChapter "Select title/chapter..." #define MSGTR_MENU_DebugConsole "Debug Console" #define MSGTR_MENU_OnlineHelp "Online Help" -#define MSGTR_MENU_PlayDirectory "Play directory..." -#define MSGTR_MENU_SeekBack "Seek Backwards" -#define MSGTR_MENU_SeekForw "Seek Forwards" +#define MSGTR_MENU_PlayDirectory "Directory..." +#define MSGTR_MENU_SeekBack "Seek backwards" +#define MSGTR_MENU_SeekForw "Seek forwards" #define MSGTR_MENU_ShowHide "Show/Hide" -#define MSGTR_MENU_SubtitlesOnOff "Subtitle Visibility On/Off" -#define MSGTR_PLAYLIST_AddFile "Add File..." +#define MSGTR_MENU_SubtitlesOnOff "Subtitle visibility on/off" +#define MSGTR_PLAYLIST_AddFile "Add file..." #define MSGTR_PLAYLIST_AddURL "Add URL..." -#define MSGTR_PREFERENCES_Priority "Priority:" +#define MSGTR_PREFERENCES_Priority "Priority" #define MSGTR_PREFERENCES_PriorityHigh "high" #define MSGTR_PREFERENCES_PriorityLow "low" #define MSGTR_PREFERENCES_PriorityNormal "normal"

1 0

r36756 - in trunk: help/help_mp-de.h help/help_mp-en.h help/help_mp-zh_CN.h stream/stream.c
by reimar 26 Jan '14

26 Jan '14

Author: reimar Date: Sun Jan 26 19:59:15 2014 New Revision: 36756 Log: stream.c: remove pointless NULL check. Since it currently is a fixed-size array it can never be NULL. But even if this was changed, this check has no real value: it should still only be possible in case of an obvious code bug during development and the crash it would cause would be easy enough to debug. Modified: trunk/help/help_mp-en.h Changes in other areas also in this revision: Modified: trunk/help/help_mp-de.h trunk/help/help_mp-zh_CN.h trunk/stream/stream.c Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h Sun Jan 26 19:19:31 2014 (r36755) +++ trunk/help/help_mp-en.h Sun Jan 26 19:59:15 2014 (r36756) @@ -1929,7 +1929,6 @@ static const char help_text[]= #define MSGTR_URLParsingFailed "URL parsing failed on url %s\n" #define MSGTR_FailedSetStreamOption "Failed to set stream option %s=%s\n" #define MSGTR_StreamNeedType "Streams need a type!\n" -#define MSGTR_StreamProtocolNULL "Stream type %s has protocols == NULL, it's a bug\n" #define MSGTR_StreamCantHandleURL "No stream found to handle url %s\n" #define MSGTR_StreamNULLFilename "open_output_stream(), NULL filename, report this bug\n" #define MSGTR_StreamErrorWritingCapture "Error writing capture file: %s\n"

1 0

r36721 - trunk/DOCS/man/en/mplayer.1
by ib 24 Jan '14

24 Jan '14

Author: ib Date: Fri Jan 24 18:10:38 2014 New Revision: 36721 Log: Revise documentation of option '-fontconfig'. Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Fri Jan 24 16:36:07 2014 (r36720) +++ trunk/DOCS/man/en/mplayer.1 Fri Jan 24 18:10:38 2014 (r36721) @@ -31,7 +31,7 @@ .\" Title .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2014-01-23" "The MPlayer Project" "The Movie Player" +.TH MPlayer 1 "2014-01-24" "The MPlayer Project" "The Movie Player" . .SH NAME mplayer \- movie player @@ -2585,7 +2585,7 @@ With Fontconfig, this option determines . .TP .B \-fontconfig (fontconfig only) -Enables the usage of fontconfig managed fonts. +Enables the usage of fontconfig managed fonts (default: autodetect). .br .I NOTE: By default fontconfig is used for libass-rendered subtitles and not used for

1 0

r36707 - in trunk/DOCS/man: de/mplayer.1 en/mplayer.1
by ib 23 Jan '14

23 Jan '14

Author: ib Date: Thu Jan 23 17:42:18 2014 New Revision: 36707 Log: Be pedantic with documentation of option '-fontconfig'. Modified: trunk/DOCS/man/en/mplayer.1 Changes in other areas also in this revision: Modified: trunk/DOCS/man/de/mplayer.1 Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Thu Jan 23 16:42:49 2014 (r36706) +++ trunk/DOCS/man/en/mplayer.1 Thu Jan 23 17:42:18 2014 (r36707) @@ -2590,7 +2590,8 @@ Enables the usage of fontconfig managed .I NOTE: By default fontconfig is used for libass-rendered subtitles and not used for OSD. With \-fontconfig it is used for both libass and OSD, with \-nofontconfig -it is not used at all. +it is not used at all, i.e. only then \-font and \-subfont will work with a +given path to font. . .TP .B \-forcedsubsonly

1 0

r36706 - trunk/DOCS/man/en/mplayer.1
by ib 23 Jan '14

23 Jan '14

Author: ib Date: Thu Jan 23 16:42:49 2014 New Revision: 36706 Log: Cosmetic: Fix spacing. Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Thu Jan 23 16:39:08 2014 (r36705) +++ trunk/DOCS/man/en/mplayer.1 Thu Jan 23 16:42:49 2014 (r36706) @@ -2562,7 +2562,7 @@ instead of at the end. . .TP .B \-font <path to font.desc file, path to font (FreeType), font pattern (Fontconfig)> -Search for the OSD /\: subtitle fonts in an alternative directory (default for normal +Search for the OSD/\:subtitle fonts in an alternative directory (default for normal fonts: ~/\:.mplayer/\:font/\:font.desc, default for FreeType fonts: ~/.mplayer/\:subfont.ttf, default for Fontconfig: "sans-serif"). .br

1 0

r36705 - in trunk/DOCS/man: de/mplayer.1 en/mplayer.1
by ib 23 Jan '14

23 Jan '14

Author: ib Date: Thu Jan 23 16:39:08 2014 New Revision: 36705 Log: Revise documentation of option '-font'. Modified: trunk/DOCS/man/en/mplayer.1 Changes in other areas also in this revision: Modified: trunk/DOCS/man/de/mplayer.1 Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Thu Jan 23 14:20:03 2014 (r36704) +++ trunk/DOCS/man/en/mplayer.1 Thu Jan 23 16:39:08 2014 (r36705) @@ -31,7 +31,7 @@ .\" Title .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2014-01-22" "The MPlayer Project" "The Movie Player" +.TH MPlayer 1 "2014-01-23" "The MPlayer Project" "The Movie Player" . .SH NAME mplayer \- movie player @@ -2562,12 +2562,12 @@ instead of at the end. . .TP .B \-font <path to font.desc file, path to font (FreeType), font pattern (Fontconfig)> -Search for the OSD/\:SUB fonts in an alternative directory (default for normal +Search for the OSD /\: subtitle fonts in an alternative directory (default for normal fonts: ~/\:.mplayer/\:font/\:font.desc, default for FreeType fonts: -~/.mplayer/\:subfont.ttf). +~/.mplayer/\:subfont.ttf, default for Fontconfig: "sans-serif"). .br .I NOTE: -With FreeType, this option determines the path to the text font file. +With FreeType, this option determines the path to the font file. With Fontconfig, this option determines the Fontconfig font pattern. .sp 1 .I EXAMPLE:

1 0

r36699 - in trunk/DOCS/man: de/mplayer.1 en/mplayer.1
by ib 22 Jan '14

22 Jan '14

Author: ib Date: Wed Jan 22 20:27:47 2014 New Revision: 36699 Log: Revise the man page after r36697 and r36698. Modified: trunk/DOCS/man/en/mplayer.1 Changes in other areas also in this revision: Modified: trunk/DOCS/man/de/mplayer.1 Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Wed Jan 22 20:26:30 2014 (r36698) +++ trunk/DOCS/man/en/mplayer.1 Wed Jan 22 20:27:47 2014 (r36699) @@ -31,7 +31,7 @@ .\" Title .\" -------------------------------------------------------------------------- . -.TH MPlayer 1 "2014-01-19" "The MPlayer Project" "The Movie Player" +.TH MPlayer 1 "2014-01-22" "The MPlayer Project" "The Movie Player" . .SH NAME mplayer \- movie player @@ -2904,7 +2904,8 @@ Sets the font blur radius (default: 2). .B \-subfont\-encoding <value> (FreeType only) Sets the font encoding. When set to 'unicode', all the glyphs from the font file will be rendered and -unicode will be used (default: unicode). +unicode will be used (default: unicode). (For other values than 'unicode' +your system has to support iconv(3) in order for this to work.) . .TP .B \-subfont\-osd\-scale <0\-100> (FreeType only)

1 0