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