#include "vlc_keys.h"
static char *ppsz_language[] =
-{ "auto", "en", "en_GB", "ca", "da", "de", "es", "fr", "it", "ja",
-"ka","ko", "nl", "oc", "pt_BR", "ro", "ru", "tr", "zh_CN", "zh_TW" };
+{ "auto", "en", "en_GB", "ca", "cs", "da", "de", "es", "fr", "gl", "he", "hu",
+ "it", "ja", "ka", "ko", "nl", "oc", "pt_BR", "ro", "ru", "sv", "tr",
+ "zh_CN", "zh_TW" };
static char *ppsz_language_text[] =
{ N_("Auto"), N_("American English"), N_("British English"),
-N_("Catalan"), N_("Danish"), N_("German"), N_("Spanish"), N_("French"),
-N_("Italian"), N_("Japanese"),N_("Georgian"), N_("Korean"),
-N_("Dutch"), N_("Occitan"), N_("Brazilian Portuguese"), N_("Romanian"),
-N_("Russian"), N_("Turkish"), N_("Simplified Chinese"),
-N_("Chinese Traditional") };
+N_("Catalan"), N_("Czech"), N_("Danish"), N_("German"), N_("Spanish"),
+N_("French"), N_("Galician"), N_("Hebrew"), N_("Hungarian"),N_("Italian"),
+N_("Japanese"),N_("Georgian"), N_("Korean"), N_("Dutch"), N_("Occitan"),
+N_("Brazilian Portuguese"), N_("Romanian"), N_("Russian"), N_("Swedish"),
+N_("Turkish"), N_("Simplified Chinese"), N_("Chinese Traditional") };
static char *ppsz_snap_formats[] =
{ "png", "jpg" };
"aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \
"squareness.")
+#define CUSTOM_CROP_RATIOS_TEXT N_("Custom crop ratios list")
+#define CUSTOM_CROP_RATIOS_LONGTEXT N_( \
+ "Comma seperated list of crop ratios which will be added in the " \
+ "interface's crop ratios list.")
+
+#define CUSTOM_ASPECT_RATIOS_TEXT N_("Custom aspect ratios list")
+#define CUSTOM_ASPECT_RATIOS_LONGTEXT N_( \
+ "Comma seperated list of aspect ratios which will be added in the " \
+ "interface's aspect ratio list.")
+
#define HDTV_FIX_TEXT N_("Fix HDTV height")
#define HDTV_FIX_LONGTEXT N_( \
"This allows proper handling of HDTV-1080 video format " \
"pixels (1:1). If you have a 16:9 screen, you might need to change this " \
"to 4:3 in order to keep proportions.")
+/// \bug [String] Remove "this option"
#define SKIP_FRAMES_TEXT N_("Skip frames")
#define SKIP_FRAMES_LONGTEXT N_( \
"This option enables framedropping on MPEG2 stream. Framedropping " \
"VLC can display messages on the video. This is called OSD (On Screen " \
"Display).")
+#define TEXTRENDERER_TEXT N_("Text rendering module")
+#define TEXTRENDERER_LONGTEXT N_( \
+ "VLC normally uses Freetype for rendering, but this allows you to use svg for instance.")
+
+/// \bug typo arbitraty
#define SUB_FILTER_TEXT N_("Subpictures filter module")
#define SUB_FILTER_LONGTEXT N_( \
"This adds so-called \"subpicture filters\". These filters overlay " \
"double-click on a file in the explorer. This option will allow you " \
"to play the file with the already running instance or enqueue it.")
+#define STARTEDFROMFILE_TEXT N_("VLC is started from file association")
+#define STARTEDFROMFILE_LONGTEXT N_( \
+ "Tell VLC that it is being launched due to a file association in the OS" )
+
+#define ONEINSTANCEWHENSTARTEDFROMFILE_TEXT N_( \
+ "Allow only on running instance when started from file")
+#define ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT N_( \
+ "Allow only on running instance when started from file")
+
#define HPRIORITY_TEXT N_("Increase the priority of the process")
#define HPRIORITY_LONGTEXT N_( \
"Increasing the priority of the process will very likely improve your " \
#define RECORD_KEY_TEXT N_("Record")
#define RECORD_KEY_LONGTEXT N_("Record access filter start/stop.")
+#define ZOOM_KEY_TEXT N_("Zoom")
+#define ZOOM_KEY_LONGTEXT N_("Zoom")
+
+#define UNZOOM_KEY_TEXT N_("Un-Zoom")
+#define UNZOOM_KEY_LONGTEXT N_("Un-Zoom")
+
+#define CROP_TOP_KEY_TEXT N_("Crop one pixel from the top of the video")
+#define CROP_TOP_KEY_LONGTEXT N_("Crop one pixel from the top of the video")
+#define UNCROP_TOP_KEY_TEXT N_("Uncrop one pixel from the top of the video")
+#define UNCROP_TOP_KEY_LONGTEXT N_("Uncrop one pixel from the top of the video")
+
+#define CROP_LEFT_KEY_TEXT N_("Crop one pixel from the left of the video")
+#define CROP_LEFT_KEY_LONGTEXT N_("Crop one pixel from the left of the video")
+#define UNCROP_LEFT_KEY_TEXT N_("Uncrop one pixel from the left of the video")
+#define UNCROP_LEFT_KEY_LONGTEXT N_("Uncrop one pixel from the left of the video")
+
+#define CROP_BOTTOM_KEY_TEXT N_("Crop one pixel from the bottom of the video")
+#define CROP_BOTTOM_KEY_LONGTEXT N_("Crop one pixel from the bottom of the video")
+#define UNCROP_BOTTOM_KEY_TEXT N_("Uncrop one pixel from the bottom of the video")
+#define UNCROP_BOTTOM_KEY_LONGTEXT N_("Uncrop one pixel from the bottom of the video")
+
+#define CROP_RIGHT_KEY_TEXT N_("Crop one pixel from the right of the video")
+#define CROP_RIGHT_KEY_LONGTEXT N_("Crop one pixel from the right of the video")
+#define UNCROP_RIGHT_KEY_TEXT N_("Uncrop one pixel from the right of the video")
+#define UNCROP_RIGHT_KEY_LONGTEXT N_("Uncrop one pixel from the right of the video")
+
#define VLC_USAGE N_( \
"Usage: %s [options] [stream] ..." \
add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
DROP_LATE_FRAMES_LONGTEXT, VLC_TRUE );
/* Used in vout_synchro */
- add_bool( "skip-frames", 0, NULL, SKIP_FRAMES_TEXT,
+ add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT,
SKIP_FRAMES_LONGTEXT, VLC_TRUE );
add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
QUIET_SYNCHRO_LONGTEXT, VLC_TRUE );
add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE );
add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE );
add_string( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, VLC_FALSE );
+ add_string( "custom-crop-ratios", NULL, NULL, CUSTOM_CROP_RATIOS_TEXT,
+ CUSTOM_CROP_RATIOS_LONGTEXT, VLC_FALSE );
add_string( "aspect-ratio", NULL, NULL,
ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE );
add_string( "monitor-par", NULL, NULL,
MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, VLC_TRUE );
+ add_string( "custom-aspect-ratios", NULL, NULL, CUSTOM_ASPECT_RATIOS_TEXT,
+ CUSTOM_ASPECT_RATIOS_LONGTEXT, VLC_FALSE );
add_bool( "hdtv-fix", 1, NULL, HDTV_FIX_TEXT, HDTV_FIX_LONGTEXT, VLC_TRUE );
add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT,
VIDEO_DECO_LONGTEXT, VLC_TRUE );
add_bool( "spu", 1, NULL, SPU_TEXT, SPU_LONGTEXT, VLC_TRUE );
add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, VLC_FALSE );
+ add_module( "text-renderer", "text renderer", NULL, NULL, TEXTRENDERER_TEXT,
+ TEXTRENDERER_LONGTEXT, VLC_TRUE );
set_section( N_("Subtitles") , NULL );
add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT,
add_string( "bookmarks", NULL, NULL,
BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, VLC_TRUE );
- set_section( N_( "Default devices") , NULL )
+ set_section( N_( "Default devices") , NULL );
add_file( "dvd", NULL, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
VLC_FALSE );
add_integer( "ipv4-timeout", 5 * 1000, NULL, TIMEOUT_TEXT,
TIMEOUT_LONGTEXT, VLC_TRUE );
- set_section( N_( "Socks proxy") , NULL )
+ set_section( N_( "Socks proxy") , NULL );
add_string( "socks", NULL, NULL,
SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT, VLC_TRUE );
add_string( "socks-user", NULL, NULL,
SOCKS_PASS_TEXT, SOCKS_PASS_LONGTEXT, VLC_TRUE );
- set_section( N_("Metadata" ) , NULL )
+ set_section( N_("Metadata" ) , NULL );
add_string( "meta-title", NULL, NULL, META_TITLE_TEXT,
META_TITLE_LONGTEXT, VLC_TRUE );
add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT,
#if defined(WIN32)
add_bool( "one-instance", 0, NULL, ONEINSTANCE_TEXT,
ONEINSTANCE_LONGTEXT, VLC_TRUE );
+ add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT,
+ STARTEDFROMFILE_LONGTEXT, VLC_TRUE );
+ add_bool( "one-instance-when-started-from-file", 1, NULL,
+ ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
+ ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, VLC_TRUE );
add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT,
PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
add_bool( "high-priority", 0, NULL, HPRIORITY_TEXT,
VLC_TRUE );
#endif
+#if defined (WIN32) || defined (__APPLE__)
add_string( "language", "auto", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
VLC_FALSE );
change_string_list( ppsz_language, ppsz_language_text, 0 );
+#endif
+
add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
VLC_FALSE );
# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
# define KEY_CHAPTER_NEXT KEY_MODIFIER_CTRL|'d'
# define KEY_SNAPSHOT KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'s'
+# define KEY_ZOOM 'z'
+# define KEY_UNZOOM KEY_MODIFIER_SHIFT|'z'
+
+# define KEY_CROP_TOP KEY_MODIFIER_ALT|'i'
+# define KEY_UNCROP_TOP KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'i'
+# define KEY_CROP_LEFT KEY_MODIFIER_ALT|'j'
+# define KEY_UNCROP_LEFT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'j'
+# define KEY_CROP_BOTTOM KEY_MODIFIER_ALT|'k'
+# define KEY_UNCROP_BOTTOM KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'k'
+# define KEY_CROP_RIGHT KEY_MODIFIER_ALT|'l'
+# define KEY_UNCROP_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'l'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_COMMAND|KEY_F2
# define KEY_INTF_HIDE 'I'
# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m'
# define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p'
-# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n'
+# define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'f'
# define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u'
# define KEY_CHAPTER_NEXT KEY_MODIFIER_CTRL|'d'
# define KEY_SNAPSHOT KEY_MODIFIER_CTRL|KEY_MODIFIER_ALT|'s'
+# define KEY_ZOOM 'z'
+# define KEY_UNZOOM KEY_MODIFIER_SHIFT|'z'
+
+# define KEY_CROP_TOP KEY_MODIFIER_ALT|'i'
+# define KEY_UNCROP_TOP KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'i'
+# define KEY_CROP_LEFT KEY_MODIFIER_ALT|'j'
+# define KEY_UNCROP_LEFT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'j'
+# define KEY_CROP_BOTTOM KEY_MODIFIER_ALT|'k'
+# define KEY_UNCROP_BOTTOM KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'k'
+# define KEY_CROP_RIGHT KEY_MODIFIER_ALT|'l'
+# define KEY_UNCROP_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'l'
# define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1
# define KEY_SET_BOOKMARK2 KEY_MODIFIER_CTRL|KEY_F2
HISTORY_FORWARD_TEXT, HISTORY_FORWARD_LONGTEXT, VLC_TRUE );
add_key( "key-record", KEY_RECORD, NULL,
RECORD_KEY_TEXT, RECORD_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-zoom", KEY_ZOOM, NULL,
+ ZOOM_KEY_TEXT, ZOOM_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-unzoom", KEY_UNZOOM, NULL,
+ UNZOOM_KEY_TEXT, UNZOOM_KEY_LONGTEXT, VLC_TRUE );
+
+ add_key( "key-crop-top", KEY_CROP_TOP, NULL,
+ CROP_TOP_KEY_TEXT, CROP_TOP_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-uncrop-top", KEY_UNCROP_TOP, NULL,
+ UNCROP_TOP_KEY_TEXT, UNCROP_TOP_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-crop-left", KEY_CROP_LEFT, NULL,
+ CROP_LEFT_KEY_TEXT, CROP_LEFT_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-uncrop-left", KEY_UNCROP_LEFT, NULL,
+ UNCROP_LEFT_KEY_TEXT, UNCROP_LEFT_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-crop-bottom", KEY_CROP_BOTTOM, NULL,
+ CROP_BOTTOM_KEY_TEXT, CROP_BOTTOM_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-uncrop-bottom", KEY_UNCROP_BOTTOM, NULL,
+ UNCROP_BOTTOM_KEY_TEXT, UNCROP_BOTTOM_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-crop-right", KEY_CROP_RIGHT, NULL,
+ CROP_RIGHT_KEY_TEXT, CROP_RIGHT_KEY_LONGTEXT, VLC_TRUE );
+ add_key( "key-uncrop-right", KEY_UNCROP_RIGHT, NULL,
+ UNCROP_RIGHT_KEY_TEXT, UNCROP_RIGHT_KEY_LONGTEXT, VLC_TRUE );
set_section ( N_("Jump sizes" ), NULL );
add_integer( "extrashort-jump-size", 3, NULL, JIEXTRASHORT_TEXT,
{ CONFIG_ITEM_BOOL, NULL, "help", 'h',
N_("print help for VLC (can be combined with --advanced)") },
{ CONFIG_ITEM_BOOL, NULL, "longhelp", 'H',
- N_("print help for VLC and all it's modules (can be combined with --advanced)") },
+ N_("print help for VLC and all its modules (can be combined with --advanced)") },
{ CONFIG_ITEM_BOOL, NULL, "advanced", '\0',
N_("print help for the advanced options") },
{ CONFIG_ITEM_BOOL, NULL, "help-verbose", '\0',
{ "key-intf-show", ACTIONID_INTF_SHOW, 0, 0, 0, 0 },
{ "key-intf-hide", ACTIONID_INTF_HIDE, 0, 0, 0, 0 },
{ "key-snapshot", ACTIONID_SNAPSHOT, 0, 0, 0, 0 },
+ { "key-zoom", ACTIONID_ZOOM, 0, 0, 0, 0 },
+ { "key-unzoom", ACTIONID_UNZOOM, 0, 0, 0, 0 },
+ { "key-crop-top", ACTIONID_CROP_TOP, 0, 0, 0, 0 },
+ { "key-uncrop-top", ACTIONID_UNCROP_TOP, 0, 0, 0, 0 },
+ { "key-crop-left", ACTIONID_CROP_LEFT, 0, 0, 0, 0 },
+ { "key-uncrop-left", ACTIONID_UNCROP_LEFT, 0, 0, 0, 0 },
+ { "key-crop-bottom", ACTIONID_CROP_BOTTOM, 0, 0, 0, 0 },
+ { "key-uncrop-bottom", ACTIONID_UNCROP_BOTTOM, 0, 0, 0, 0 },
+ { "key-crop-right", ACTIONID_CROP_RIGHT, 0, 0, 0, 0 },
+ { "key-uncrop-right", ACTIONID_UNCROP_RIGHT, 0, 0, 0, 0 },
{ "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0, 0, 0, 0 },
{ "key-nav-up", ACTIONID_NAV_UP, 0, 0, 0, 0 },
{ "key-nav-down", ACTIONID_NAV_DOWN, 0, 0, 0, 0 },
projects / vlc / blobdiff