[vlc-devel] [vlc-commits] BluRay instead of Blu-Ray. Re-using short messages for long ones
Kaarlo Räihä
kaarlo.raiha at gmail.com
Sun Apr 28 20:15:53 CEST 2013
2013/4/28 Christoph Miebach <git at videolan.org>
> vlc | branch: master | Christoph Miebach <christoph.miebach at web.de> | Sun
> Apr 28 19:09:29 2013 +0200| [8ea8856cfdf4e4e3599799a2ce6d8b44553232e2] |
> committer: Christoph Miebach
>
> BluRay instead of Blu-Ray. Re-using short messages for long ones
>
Can I ask why the hyphens are removed?
>
> >
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8ea8856cfdf4e4e3599799a2ce6d8b44553232e2
> ---
>
> modules/access/bd/bd.c | 2 +-
> modules/access/bluray.c | 10 +++++-----
> modules/access/v4l2/v4l2.c | 2 +-
> modules/codec/x264.c | 2 +-
> modules/gui/macosx/playlist.m | 2 +-
> modules/services_discovery/udev.c | 2 +-
> src/libvlc-module.c | 4 ++--
> 7 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/modules/access/bd/bd.c b/modules/access/bd/bd.c
> index 9c598e2..fd98f2f 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_("Blu-Ray Disc Input") )
> + set_description( N_("BluRay 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 da9e314..d1f897a 100644
> --- a/modules/access/bluray.c
> +++ b/modules/access/bluray.c
> @@ -57,7 +57,7 @@
> * Module descriptor
>
> *****************************************************************************/
>
> -#define BD_MENU_TEXT N_( "Bluray menus" )
> +#define BD_MENU_TEXT N_( "BluRay menus" )
> #define BD_MENU_LONGTEXT N_( "Use bluray menus. If disabled, "\
> "the movie will start directly" )
>
> @@ -67,7 +67,7 @@ static void blurayClose( vlc_object_t * );
>
> vlc_module_begin ()
> set_shortname( N_("BluRay") )
> - set_description( N_("Blu-Ray Disc support (libbluray)") )
> + set_description( N_("BluRay Disc support (libbluray)") )
>
> set_category( CAT_INPUT )
> set_subcategory( SUBCAT_INPUT_ACCESS )
> @@ -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 Blu-Ray Disc needs a library for AACS
> decoding, "
> + error_msg = _("This BluRay Disc needs a library for AACS
> decoding, "
> "and your system does not have it.");
> goto error;
> }
> @@ -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 Blu-Ray Disc needs a library for BD+
> decoding, "
> + error_msg = _("This BluRay 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, _("Blu-Ray error"), "%s", error_msg);
> + dialog_Fatal(p_demux, _("BluRay error"), "%s", error_msg);
> blurayClose(object);
> return VLC_EGENERIC;
> }
> diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
> index f696a54..e06c80d 100644
> --- a/modules/access/v4l2/v4l2.c
> +++ b/modules/access/v4l2/v4l2.c
> @@ -137,7 +137,7 @@ static const char *const power_freq_user[] = {
> N_("Unspecified"),
> N_("Off"), N_("50 Hz"), N_("60 Hz"), N_("Automatic"),
> };
> #define BKLT_COMPENSATE_TEXT N_( "Backlight compensation" )
> -#define BKLT_COMPENSATE_LONGTEXT N_( "Backlight compensation." )
> +#define BKLT_COMPENSATE_LONGTEXT BKLT_COMPENSATE_TEXT
> #define BAND_STOP_FILTER_TEXT N_( "Band-stop filter" )
> #define BAND_STOP_FILTER_LONGTEXT N_( \
> "Cut a light band induced by fluorescent lighting (unit
> undocumented)." )
> diff --git a/modules/codec/x264.c b/modules/codec/x264.c
> index 7dd23c9..14be85a 100644
> --- a/modules/codec/x264.c
> +++ b/modules/codec/x264.c
> @@ -271,7 +271,7 @@ static void x264_log( void *, int i_level, const char
> *psz, va_list );
> "(p4x4 requires p8x8. i8x8 requires 8x8dct).")
>
> #define DIRECT_PRED_TEXT N_("Direct MV prediction mode")
> -#define DIRECT_PRED_LONGTEXT N_( "Direct MV prediction mode.")
> +#define DIRECT_PRED_LONGTEXT DIRECT_PRED_TEXT
>
> #define DIRECT_PRED_SIZE_TEXT N_("Direct prediction size")
> #define DIRECT_PRED_SIZE_LONGTEXT N_( "Direct prediction size: "\
> diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
> index c4360b8..2bd75b0 100644
> --- a/modules/gui/macosx/playlist.m
> +++ b/modules/gui/macosx/playlist.m
> @@ -518,7 +518,7 @@
> [o_save_accessory_text setStringValue: _NS("File Format:")];
> [[o_save_accessory_popup itemAtIndex:0] setTitle: _NS("Extended
> M3U")];
> [[o_save_accessory_popup itemAtIndex:1] setTitle: _NS("XML Shareable
> Playlist Format (XSPF)")];
> - [[o_save_accessory_popup itemAtIndex:2] setTitle: _NS("HTML
> Playlist")];
> + [[o_save_accessory_popup itemAtIndex:2] setTitle: _NS("HTML
> playlist")];
> }
>
> - (void)playlistUpdated
> diff --git a/modules/services_discovery/udev.c
> b/modules/services_discovery/udev.c
> index 8dbc2b3..827503d 100644
> --- a/modules/services_discovery/udev.c
> +++ b/modules/services_discovery/udev.c
> @@ -585,7 +585,7 @@ static char *disc_get_name (struct udev_device *dev)
> else if (!strncmp (name, "DVD", 3))
> cat = N_("DVD");
> else if (!strncmp (name, "BD", 2))
> - cat = N_("Blu-Ray");
> + cat = N_("BluRay");
> else if (!strncmp (name, "HDDVD", 5))
> cat = N_("HD DVD");
>
> diff --git a/src/libvlc-module.c b/src/libvlc-module.c
> index 6194d99..7a8f70d9 100644
> --- a/src/libvlc-module.c
> +++ b/src/libvlc-module.c
> @@ -1374,9 +1374,9 @@ static const char *const mouse_wheel_texts[] =
> #define TOGGLE_AUTOSCALE_KEY_TEXT N_("Toggle autoscaling")
> #define TOGGLE_AUTOSCALE_KEY_LONGTEXT N_("Activate or deactivate
> autoscaling.")
> #define SCALE_UP_KEY_TEXT N_("Increase scale factor")
> -#define SCALE_UP_KEY_LONGTEXT N_("Increase scale factor.")
> +#define SCALE_UP_KEY_LONGTEXT SCALE_UP_KEY_TEXT
> #define SCALE_DOWN_KEY_TEXT N_("Decrease scale factor")
> -#define SCALE_DOWN_KEY_LONGTEXT N_("Decrease scale factor.")
> +#define SCALE_DOWN_KEY_LONGTEXT SCALE_DOWN_KEY_TEXT
> #define DEINTERLACE_KEY_TEXT N_("Toggle deinterlacing")
> #define DEINTERLACE_KEY_LONGTEXT N_("Activate or deactivate
> deinterlacing.")
> #define DEINTERLACE_MODE_KEY_TEXT N_("Cycle deinterlace modes")
>
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> http://mailman.videolan.org/listinfo/vlc-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20130428/322873f0/attachment.html>
More information about the vlc-devel
mailing list