[vlc-devel] [PATCH 4/4] Strings: Use BluRay without -, remove identical (except .) longtext
Christoph Miebach
christoph.miebach at web.de
Fri Apr 26 11:31:24 CEST 2013
---
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/MainMenu.m | 6 +++---
modules/gui/macosx/playlist.m | 4 ++--
modules/gui/macosx/simple_prefs.m | 2 +-
modules/gui/qt4/ui/video_effects.ui | 2 +-
modules/services_discovery/udev.c | 2 +-
modules/stream_out/transcode/transcode.c | 2 +-
modules/video_filter/atmo/atmo.cpp | 4 ++--
src/libvlc-module.c | 4 ++--
src/video_output/vout_intf.c | 2 +-
13 files changed, 22 insertions(+), 22 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 bf24f8d..794f548 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/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 2c57585..13cfc40 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -392,8 +392,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_mi_snapshot setTitle: _NS("Snapshot")];
[o_mi_videotrack setTitle: _NS("Video Track")];
[o_mu_videotrack setTitle: _NS("Video Track")];
- [o_mi_aspect_ratio setTitle: _NS("Aspect-ratio")];
- [o_mu_aspect_ratio setTitle: _NS("Aspect-ratio")];
+ [o_mi_aspect_ratio setTitle: _NS("Aspect ratio")];
+ [o_mu_aspect_ratio setTitle: _NS("Aspect ratio")];
[o_mi_crop setTitle: _NS("Crop")];
[o_mu_crop setTitle: _NS("Crop")];
[o_mi_screen setTitle: _NS("Fullscreen Video Device")];
@@ -1307,7 +1307,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
[o_parent setEnabled:NO];
/* Aspect Ratio */
- if ([[o_parent title] isEqualToString: _NS("Aspect-ratio")] == YES) {
+ if ([[o_parent title] isEqualToString: _NS("Aspect ratio")] == YES) {
NSMenuItem *o_lmi_tmp2;
o_lmi_tmp2 = [o_menu addItemWithTitle: _NS("Lock Aspect Ratio") action: @selector(lockVideosAspectRatio:) keyEquivalent: @""];
[o_lmi_tmp2 setTarget: [[VLCMain sharedInstance] controls]];
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index c4360b8..734b82d 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -504,7 +504,7 @@
[o_mi_recursive_expand setTitle: _NS("Expand Node")];
[o_mi_selectall setTitle: _NS("Select All")];
[o_mi_info setTitle: _NS("Media Information...")];
- [o_mi_dl_cover_art setTitle: _NS("Download Cover Art")];
+ [o_mi_dl_cover_art setTitle: _NS("Download cover art")];
[o_mi_preparse setTitle: _NS("Fetch Meta Data")];
[o_mi_revealInFinder setTitle: _NS("Reveal in Finder")];
[o_mm_mi_revealInFinder setTitle: _NS("Reveal in Finder")];
@@ -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/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index f0bb678..03508cb 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -205,7 +205,7 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
[o_input_cachelevel_txt setStringValue: _NS("Default Caching Level")];
[o_input_caching_box setTitle: _NS("Caching")];
[o_input_cachelevel_custom_txt setStringValue: _NS("Use the complete preferences to configure custom caching values for each access module.")];
- [o_input_httpproxy_txt setStringValue: _NS("HTTP Proxy")];
+ [o_input_httpproxy_txt setStringValue: _NS("HTTP proxy")];
[o_input_httpproxypwd_txt setStringValue: _NS("Password for HTTP Proxy")];
[o_input_mux_box setTitle: _NS("Codecs / Muxers")];
[o_input_net_box setTitle: _NS("Network")];
diff --git a/modules/gui/qt4/ui/video_effects.ui b/modules/gui/qt4/ui/video_effects.ui
index 2d21e43..88a231c 100644
--- a/modules/gui/qt4/ui/video_effects.ui
+++ b/modules/gui/qt4/ui/video_effects.ui
@@ -931,7 +931,7 @@
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="puzzleBlackSlotCheck">
<property name="text">
- <string>Black slot</string>
+ <string>Black Slot</string>
</property>
</widget>
</item>
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/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 8998020..b4ff11b 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -93,7 +93,7 @@
#define ARATE_TEXT N_("Audio sample rate")
#define ARATE_LONGTEXT N_( \
"Sample rate of the transcoded audio stream (11250, 22500, 44100 or 48000).")
-#define ALANG_TEXT N_("Audio Language")
+#define ALANG_TEXT N_("Audio language")
#define ALANG_LONGTEXT N_( \
"This is the language of the audio stream.")
#define ACHANS_TEXT N_("Audio channels")
diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 56603aa..8b02a2e 100644
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -257,12 +257,12 @@ static const char *const ppsz_device_type_descriptions[] = {
"On Windows usually something like COM1 or " \
"COM2. On Linux /dev/ttyS01 f.e.")
-#define EDGE_TEXT N_("Edge Weightning")
+#define EDGE_TEXT N_("Edge weightning")
#define EDGE_LONGTEXT N_("Increasing this value will result in color "\
"more depending on the border of the frame.")
#define BRIGHTNESS_TEXT N_("Brightness")
#define BRIGHTNESS_LONGTEXT N_("Overall brightness of your LED stripes")
-#define DARKNESS_TEXT N_("Darkness Limit")
+#define DARKNESS_TEXT N_("Darkness limit")
#define DARKNESS_LONGTEXT N_("Pixels with a saturation lower than this will "\
"be ignored. Should be greater than one for "\
"letterboxed videos.")
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index bbe8ec0..fd80201 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1385,9 +1385,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")
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 9193487..c4c9f00 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -237,7 +237,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
var_Create( p_vout, "aspect-ratio", VLC_VAR_STRING | VLC_VAR_ISCOMMAND |
VLC_VAR_HASCHOICE | VLC_VAR_DOINHERIT );
- text.psz_string = _("Aspect-ratio");
+ text.psz_string = _("Aspect ratio");
var_Change( p_vout, "aspect-ratio", VLC_VAR_SETTEXT, &text, NULL );
val.psz_string = (char*)"";
--
1.8.1.4
More information about the vlc-devel
mailing list