Rebuild the array of currently playing items as a background task.

[vlc] / modules / gui / macosx / macosx.m

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index a725696b83c892ab84523230fffb5d9f245a7590..5f9c525fd3fd7df4e5adad230cad917c3fa170e0 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -47,14 +47,14 @@ void E_(CloseVideoGL) ( vlc_object_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define EMBEDDED_TEXT N_("Use embedded video output")
-#define EMBEDDED_LONGTEXT N_("Disable this if you want the video output to " \
-    "be opened in a separate window instead of in the control window.")
+#define EMBEDDED_TEXT N_("Embedded video output")
+#define EMBEDDED_LONGTEXT N_( \
+   "Display the video in the controller window instead of a in separate window.")
 
 #define VDEV_TEXT N_("Video device")
-#define VDEV_LONGTEXT N_("Choose a number corresponding to " \
-    "a screen in you video device selection menu and this screen " \
-    "will be used by default as the screen for 'fullscreen'.")
+#define VDEV_LONGTEXT N_("Number of the screen to use by default to display " \
+    "videos in 'fullscreen'. The screen number correspondance can be found in "\
+    "the video device selection menu.")
 
 #define OPAQUENESS_TEXT N_("Opaqueness")
 #define OPAQUENESS_LONGTEXT N_( \
@@ -62,27 +62,32 @@ void E_(CloseVideoGL) ( vlc_object_t * );
     "0 is fully transparent.")
     
 #define STRETCH_TEXT N_("Stretch video to fill window")
-#define STRETCH_LONGTEXT N_("Instead of keeping the aspect ratio " \
-        "of the movie when resizing the video, stretch the video " \
-        "to fill the entire window." )
+#define STRETCH_LONGTEXT N_("Stretch the video to fill the entire window when "\
+        "resizing the video instead of keeping the aspect ratio and "\
+        "displaying black borders.")
+
+#define BLACK_TEXT N_("Black screens in fullscreen")
+#define BLACK_LONGTEXT N_("In fullscreen mode, keep screen where there is no " \
+        "video displayed black" )
 
-#define FILL_TEXT N_("Fill fullscreen")
-#define FILL_LONGTEXT N_("In fullscreen mode, crop the picture if " \
-        "necessary in order to fill the screen without black " \
-        "borders (OpenGL only)." )
-        
 #define BACKGROUND_TEXT N_("Use as Desktop Background")
 #define BACKGROUND_LONGTEXT N_("Use the video as the Desktop Background " \
-        "of the Finder. Desktop icons cannot be interacted with in this mode." )
+        "Desktop icons cannot be interacted with in this mode." )
+        
+#define WIZARD_OPTIONS_SAVING_TEXT N_("Remember wizard options")
+#define WIZARD_OPTIONS_SAVING_LONGTEXT N_("Remember the options in the " \
+        "wizard during one session of VLC.") 
 
 vlc_module_begin();
     set_description( _("Mac OS X interface") );
     set_capability( "interface", 100 );
     set_callbacks( E_(OpenIntf), E_(CloseIntf) );
     set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    set_subcategory( SUBCAT_INTERFACE_MAIN );
     add_bool( "macosx-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
                      VLC_FALSE );
+    add_bool( "macosx-wizard-keep", 1, NULL, WIZARD_OPTIONS_SAVING_TEXT,
+                WIZARD_OPTIONS_SAVING_LONGTEXT, VLC_TRUE );
 
     add_submodule();
         set_description( _("Quartz video") );
@@ -97,7 +102,7 @@ vlc_module_begin();
                      VLC_FALSE );
         add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL,
                 OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE );
-        add_bool( "macosx-fill", 0, NULL, FILL_TEXT, FILL_LONGTEXT,
+        add_bool( "macosx-black", 0, NULL, BLACK_TEXT, BLACK_LONGTEXT,
                   VLC_TRUE );
         add_bool( "macosx-background", 0, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
                      VLC_FALSE );