vlc | branch: master | Christoph Miebach <[email protected]> | Mon Apr 29 13:07:16 2013 +0200| [c27af0888ef34032894d23803b514a47e0bc31b0] | committer: Christoph Miebach
It's Blu-ray now > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c27af0888ef34032894d23803b514a47e0bc31b0 --- modules/access/bd/bd.c | 2 +- modules/access/bluray.c | 18 +++++++++--------- modules/gui/qt4/ui/open_disk.ui | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c index fd98f2f..42f9941 100644 --- a/modules/access/bd/bd.c +++ b/modules/access/bd/bd.c @@ -52,7 +52,7 @@ static void Close( vlc_object_t * ); vlc_module_begin () set_shortname( N_("BD") ) - set_description( N_("BluRay Disc Input") ) + set_description( N_("Blu-ray Disc Input") ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) set_capability( "access_demux", 60 ) diff --git a/modules/access/bluray.c b/modules/access/bluray.c index d1f897a..df32d07 100644 --- a/modules/access/bluray.c +++ b/modules/access/bluray.c @@ -57,8 +57,8 @@ * Module descriptor *****************************************************************************/ -#define BD_MENU_TEXT N_( "BluRay menus" ) -#define BD_MENU_LONGTEXT N_( "Use bluray menus. If disabled, "\ +#define BD_MENU_TEXT N_( "Blu-ray menus" ) +#define BD_MENU_LONGTEXT N_( "Use Blu-ray menus. If disabled, "\ "the movie will start directly" ) /* Callbacks */ @@ -66,8 +66,8 @@ static int blurayOpen ( vlc_object_t * ); static void blurayClose( vlc_object_t * ); vlc_module_begin () - set_shortname( N_("BluRay") ) - set_description( N_("BluRay Disc support (libbluray)") ) + set_shortname( N_("Blu-ray") ) + set_description( N_("Blu-ray Disc support (libbluray)") ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) @@ -247,7 +247,7 @@ static int blurayOpen( vlc_object_t *object ) /* Is it a bluray? */ if (!disc_info->bluray_detected) { - error_msg = "Path doesn't appear to be a bluray"; + error_msg = "Path doesn't appear to be a Blu-ray"; goto error; } @@ -260,7 +260,7 @@ static int blurayOpen( vlc_object_t *object ) /* AACS */ if (disc_info->aacs_detected) { if (!disc_info->libaacs_detected) { - error_msg = _("This BluRay Disc needs a library for AACS decoding, " + error_msg = _("This Blu-ray Disc needs a library for AACS decoding, " "and your system does not have it."); goto error; } @@ -269,7 +269,7 @@ static int blurayOpen( vlc_object_t *object ) if (disc_info->aacs_error_code) { switch (disc_info->aacs_error_code) { case BD_AACS_CORRUPTED_DISC: - error_msg = _("BluRay Disc is corrupted."); + error_msg = _("Blu-ray Disc is corrupted."); break; case BD_AACS_NO_CONFIG: error_msg = _("Missing AACS configuration file!"); @@ -300,7 +300,7 @@ static int blurayOpen( vlc_object_t *object ) /* BD+ */ if (disc_info->bdplus_detected) { if (!disc_info->libbdplus_detected) { - error_msg = _("This BluRay Disc needs a library for BD+ decoding, " + error_msg = _("This Blu-ray Disc needs a library for BD+ decoding, " "and your system does not have it."); goto error; } @@ -367,7 +367,7 @@ static int blurayOpen( vlc_object_t *object ) error: if (error_msg) - dialog_Fatal(p_demux, _("BluRay error"), "%s", error_msg); + dialog_Fatal(p_demux, _("Blu-ray error"), "%s", error_msg); blurayClose(object); return VLC_EGENERIC; } diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui index 171002b..7b4c5d2 100644 --- a/modules/gui/qt4/ui/open_disk.ui +++ b/modules/gui/qt4/ui/open_disk.ui @@ -62,7 +62,7 @@ <item row="0" column="3"> <widget class="QRadioButton" name="bdRadioButton"> <property name="text"> - <string>BluRay</string> + <string>Blu-ray</string> </property> </widget> </item> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
