Commit 587ff0ca authored by Christophe Massiot's avatar Christophe Massiot

Worked around a bug with the Screens menu and localization.

parent 3593c15f
......@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.43 2003/02/01 23:46:24 massiot Exp $
* $Id: intf.m,v 1.44 2003/02/02 23:11:17 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -1253,7 +1253,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
NSMenuItem * o_lmi;
NSString * o_title;
o_title = [NSApp localizedString: val.p_list->p_values[i].psz_string];
//o_title = [NSApp localizedString: val.p_list->p_values[i].psz_string];
o_title = [NSString stringWithCString: val.p_list->p_values[i].psz_string];
o_lmi = [o_menu addItemWithTitle: o_title
action: pf_callback keyEquivalent: @""];
/* FIXME: this isn't 64-bit clean ! */
......
......@@ -2,7 +2,7 @@
* vout.m: MacOS X video output plugin
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: vout.m,v 1.21 2003/01/31 02:53:52 jlj Exp $
* $Id: vout.m,v 1.22 2003/02/02 23:11:17 massiot Exp $
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
......@@ -191,7 +191,7 @@ int E_(OpenVideo) ( vlc_object_t *p_this )
NSRect s_rect = [o_screen frame];
snprintf( psz_temp, sizeof(psz_temp)/sizeof(psz_temp[0])-1,
"%s %d (%dx%d)", _("Screen"), i,
"%s %d (%dx%d)", "Screen", i,
(int)s_rect.size.width, (int)s_rect.size.height );
val.psz_string = psz_temp;
......@@ -932,7 +932,7 @@ static void QTFreePicture( vout_thread_t *p_vout, picture_t *p_pic )
unsigned int i_index = 0;
NSArray *o_screens = [NSScreen screens];
if( !sscanf( val.psz_string, _("Screen %d"), &i_index ) ||
if( !sscanf( val.psz_string, "Screen %d", &i_index ) ||
[o_screens count] < i_index )
{
o_screen = [NSScreen mainScreen];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment