diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c index 76cd31b8a575bb8ec7060a8ec73d26ac3db0c53c..bc397bf0273709daf5ad1cd8735f0791feb44565 100644 --- a/modules/access/vcdx/vcd.c +++ b/modules/access/vcdx/vcd.c @@ -53,7 +53,7 @@ int E_(BlocksPerReadCallback) ( vlc_object_t *p_this, const char *psz_name, * Option help text *****************************************************************************/ -#define DEBUG_LONGTEXT N_( \ +#define DEBUG_LONGTEXT \ "This integer when viewed in binary is a debugging mask\n" \ "meta info 1\n" \ "event info 2\n" \ @@ -68,7 +68,7 @@ int E_(BlocksPerReadCallback) ( vlc_object_t *p_this, const char *psz_name, "still (400) 1024\n" \ "vcdinfo (800) 2048\n" ) -#define VCD_TITLE_FMT_LONGTEXT N_( \ +#define VCD_TITLE_FMT_LONGTEXT \ "Format used in the GUI Playlist Title. Similar to the Unix date \n" \ "Format specifiers that start with a percent sign. Specifiers are: \n" \ " %A : The album information\n" \ diff --git a/modules/access/vcdx/vcdplayer.c b/modules/access/vcdx/vcdplayer.c index a60d610edb8ff055655fb875428268524b36a14c..fbeddad66abdf3d33e3668669c4dcdaac342b202 100644 --- a/modules/access/vcdx/vcdplayer.c +++ b/modules/access/vcdx/vcdplayer.c @@ -83,7 +83,7 @@ vcdplayer_get_item_size(access_t * p_access, vcdinfo_itemid_t itemid) case VCDINFO_ITEM_TYPE_NOTFOUND: case VCDINFO_ITEM_TYPE_SPAREID2: default: - LOG_ERR("%s %d", _("bad item type"), itemid.type); + LOG_ERR("%s %d", "bad item type", itemid.type); return 0; } } @@ -195,7 +195,7 @@ _vcdplayer_set_entry(access_t * p_access, unsigned int num) const unsigned int i_entries = vcdinfo_get_num_entries(p_vcdinfo); if (num >= i_entries) { - LOG_ERR("%s %d", _("bad entry number"), num); + LOG_ERR("%s %d", "bad entry number", num); return; } else { vcdinfo_itemid_t itemid; @@ -223,14 +223,14 @@ _vcdplayer_set_segment(access_t * p_access, unsigned int num) segnum_t i_segs = vcdinfo_get_num_segments(p_vcdinfo); if (num >= i_segs) { - LOG_ERR("%s %d", _("bad segment number"), num); + LOG_ERR("%s %d", "bad segment number", num); return; } else { vcdinfo_itemid_t itemid; if (VCDINFO_NULL_LSN==p_vcdplayer->i_lsn) { LOG_ERR("%s %d", - _("Error in getting current segment number"), num); + "Error in getting current segment number", num); return; } @@ -301,7 +301,7 @@ vcdplayer_play_single_item( access_t * p_access, vcdinfo_itemid_t itemid) } case VCDINFO_ITEM_TYPE_LID: - LOG_ERR("%s", _("Should have converted p_vcdplayer above")); + LOG_ERR("%s", "Should have converted p_vcdplayer above"); return false; break; diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c index 63e07193797fa960b4e00175877d7bdb88fc1c28..0816039b27e53201c65b046fad2a84a85ccf2a93 100644 --- a/modules/audio_filter/converter/a52tofloat32.c +++ b/modules/audio_filter/converter/a52tofloat32.c @@ -100,7 +100,7 @@ struct filter_sys_t "listening room.") vlc_module_begin(); - set_shortname( _("A/52") ); + set_shortname( "A/52" ); set_description( _("ATSC A/52 (AC-3) audio decoder") ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACODEC ); diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c index 40186b1e5bbe78fb4df42b1ee5052257438091b4..8f68ad0af49f77586f8cf45035b6b1d956601568 100644 --- a/modules/codec/svcdsub.c +++ b/modules/codec/svcdsub.c @@ -39,14 +39,13 @@ static int DecoderOpen ( vlc_object_t * ); static int PacketizerOpen( vlc_object_t * ); static void DecoderClose ( vlc_object_t * ); -#define DEBUG_TEXT N_( \ +#define DEBUG_TEXT \ "If nonzero, this gives additional debug information." \ - ) -#define DEBUG_LONGTEXT N_( \ +#define DEBUG_LONGTEXT \ "This integer when viewed in binary is a debugging mask\n" \ "calls 1\n" \ - "packet assembly info 2\n" ) + "packet assembly info 2\n" vlc_module_begin(); set_description( _("Philips OGT (SVCD subtitle) decoder") ); diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index da8ba321699752cc967d17b33c3b695781143cd8..c321552aba6fbd8207295063dab48c52a4bbc9c2 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -259,7 +259,7 @@ aout_VolumeGet( p_intf, &i_volume ); - o_text = [NSString stringWithFormat: @"Volume: %d", i_volume * 200 / AOUT_VOLUME_MAX]; + o_text = [NSString stringWithFormat: _NS("Volume: %d"), i_volume * 200 / AOUT_VOLUME_MAX]; [o_main setScrollField:o_text stopAfter:1000000]; [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];