* Minor typographic corrections,

* Fixed a segfault in the Preferences window.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 740a5bf4f44943ba367ae56022321bf49ef48668..3c24a7a5067f354f7ef402dc01e159172846cdb9 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index dc74bf368ac5c68f4409c2cfc65d7fc7bfc4e09b..5cae5eeb58292f26fca335d4d5f7a81f00d93c8d 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.52 2003/02/09 01:50:35 massiot Exp $
+ * $Id: intf.m,v 1.53 2003/02/09 19:28:43 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -292,7 +292,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
 
     /* main menu */
     [o_mi_about setTitle: _NS("About VLC media player")];
-    [o_mi_prefs setTitle: _NS("Preferences")];
+    [o_mi_prefs setTitle: _NS("Preferences...")];
     [o_mi_hide setTitle: _NS("Hide VLC")];
     [o_mi_hide_others setTitle: _NS("Hide Others")];
     [o_mi_show_all setTitle: _NS("Show All")];
@@ -355,7 +355,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
 
     [o_mu_help setTitle: _NS("Help")];
     [o_mi_readme setTitle: _NS("ReadMe...")];
-    [o_mi_reportabug setTitle: _NS("Report A Bug")];
+    [o_mi_reportabug setTitle: _NS("Report a Bug")];
     [o_mi_website setTitle: _NS("VideoLAN Website")];
     [o_mi_license setTitle: _NS("License")];
 

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 6b99d5b76df6651b95ff909e8e2f065535b6639f..6fa69038ae5fad7386101af593c28aabe11db0b7 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -2,7 +2,7 @@
  * open.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: open.m,v 1.21 2003/02/05 22:48:13 hartman Exp $
+ * $Id: open.m,v 1.22 2003/02/09 19:28:43 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -164,7 +164,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
     [o_panel setTitle: _NS("Open Source")];
     [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
-    [o_ckbox_enqueue setTitle: _NS("Only enqueue in playlist. Do not play.")];
+    [o_ckbox_enqueue setTitle: _NS("Only enqueue in playlist, do not play")];
 
     [o_btn_ok setTitle: _NS("OK")];
     [o_btn_cancel setTitle: _NS("Cancel")];
@@ -177,7 +177,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")];
 
     [o_file_sub_btn_browse setTitle: _NS("Browse...")];
-    [o_file_sub_ckbox setTitle: _NS("Load subtitles")];
+    [o_file_sub_ckbox setTitle: _NS("Load subtitles file:")];
 
     [o_disc_device_lbl setStringValue: _NS("Device name")];
     [o_disc_title_lbl setStringValue: _NS("Title")];

diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index 0eb8e984fc0fa51076ce83928909dc1bbdda479c..82b6956e8c47719c294e6e000be6ff80abea9816 100644 (file)
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -2,7 +2,7 @@
  * prefs.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: prefs.m,v 1.11 2003/02/08 22:20:28 massiot Exp $
+ * $Id: prefs.m,v 1.12 2003/02/09 19:28:43 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *
@@ -238,12 +238,15 @@
         [o_text_field setSelectable: NO]; \
         [o_text_field setStringValue: \
             [NSApp localizedString: label]]; \
+        [o_text_field sizeToFit]; \
         [o_view addSubview: [o_text_field autorelease]]; \
     }
 
 #define INPUT_FIELD( ctype, cname, label, w, msg, param, tip ) \
     { \
-        char * psz_duptip = strdup(tip); \
+        char * psz_duptip = NULL; \
+        if ( p_item->psz_longtext != NULL ) \
+            psz_duptip = strdup(p_item->psz_longtext); \
         s_rc.size.height = 25; \
         s_rc.size.width = w; \
         s_rc.origin.y += 10; \
@@ -324,7 +327,9 @@
             NSPopUpButton *o_modules;
             NSButton *o_btn_select;
             NSButton *o_btn_configure;
-            char * psz_duptip = strdup(p_item->psz_longtext);
+            char * psz_duptip = NULL;
+            if ( p_item->psz_longtext != NULL )
+                psz_duptip = strdup(p_item->psz_longtext);
 
 #define MODULE_BUTTON( button, title, sel ) \
     { \
@@ -442,7 +447,9 @@
             {
                 int i;
                 VLCComboBox *o_combo_box;
-                char * psz_duptip = strdup(p_item->psz_longtext);
+                char * psz_duptip = NULL;
+                if ( p_item->psz_longtext != NULL )
+                    psz_duptip = strdup(p_item->psz_longtext);
 
                 s_rc.size.height = 27;
                 s_rc.size.width = 150;
@@ -501,7 +508,9 @@
         case CONFIG_ITEM_BOOL:
         {
             VLCButton *o_btn_bool;
-            char * psz_duptip = strdup(p_item->psz_longtext);
+            char * psz_duptip = NULL;
+            if ( p_item->psz_longtext != NULL )
+                psz_duptip = strdup(p_item->psz_longtext);
 
             s_rc.size.height = 27;
             s_rc.size.width = s_vrc.size.width - X_ORIGIN * 2 - 20;
@@ -562,7 +571,7 @@
     }
 
     s_rc.origin.y = s_panel_rc.origin.y + 14;
-    s_rc.size.height = 25; s_rc.size.width = 100;
+    s_rc.size.height = 25; s_rc.size.width = 105;
     s_rc.origin.x = s_panel_rc.size.width - s_rc.size.width - 14;
     DEF_PANEL_BUTTON( 0, _NS("OK"), clickedCancelOK: );
     [o_panel setDefaultButtonCell: [o_button cell]];