vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Apr 7 20:32:49 2013 +0300| [e27cd64846cf19547043091db36157a7bcab34d5] | committer: Rémi Denis-Courmont
po: do not translate "" For the umpteenth time, this does NOT work. "" is special in gettext. Furthermore, use of conditionals is not allowed within gettext macros. > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e27cd64846cf19547043091db36157a7bcab34d5 --- modules/gui/macosx/prefs.m | 2 +- modules/gui/macosx/simple_prefs.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index d48525e..96ce5e3 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -487,7 +487,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; @implementation VLCTreePluginItem - (id)initWithPlugin:(module_t *)plugin { - NSString * name = _NS( module_get_name( plugin, false )?:"" ); + NSString * name = _NS( module_get_name( plugin, false ) ); if(self = [super initWithName:name]) { _configItems = module_config_get( plugin, &_configSize ); diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index a3a1b75..99e6eb7 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -448,7 +448,7 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na - (void)setupButton: (NSButton *)object forBoolValue: (const char *)name { [object setState: config_GetInt( p_intf, name )]; - [object setToolTip: _NS(config_GetLabel( p_intf, name ) ?: "")]; + [object setToolTip: _NS(config_GetLabel( p_intf, name ))]; } - (void)setupField:(NSTextField *)o_object forOption:(const char *)psz_option _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
