* ALL: fixed some gettext stuff in the subtitles-options-dialogue, cosmetics to the...

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index a5fed4d252cdc610ed554fcbe7efc46899be812b..8cdeed0ab6d7ad5dde90bf4f04798766071ff748 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -303,6 +303,8 @@
                 "o_file_sub_delay_stp" = id; 
                 "o_file_sub_encoding_lbl" = id; 
                 "o_file_sub_encoding_pop" = id; 
+                "o_file_sub_file_box" = id; 
+                "o_file_sub_font_box" = id; 
                 "o_file_sub_fps" = id; 
                 "o_file_sub_fps_lbl" = id; 
                 "o_file_sub_fps_stp" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index bd9e17d8ca46ac5d683bd29154b7fd59f6980029..3520cef69ad899aeb80550e838140a227f938f04 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>396 229 505 517 0 0 1024 746 </string>
+       <string>4 44 505 517 0 0 800 578 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
                <string>542 480 104 149 0 0 1024 746 </string>
                <key>29</key>
-               <string>41 667 419 44 0 0 1024 746 </string>
+               <string>26 507 419 44 0 0 800 578 </string>
                <key>915</key>
                <string>54 452 185 199 0 0 1024 746 </string>
        </dict>
@@ -21,8 +21,8 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>29</integer>
                <integer>1263</integer>
+               <integer>29</integer>
                <integer>21</integer>
        </array>
        <key>IBSystem Version</key>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 69577977b43fe81e970750567fddd2822071f794..a5242e44c1369cbca9455d1b9bef09a671f58c5e 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/open.h b/modules/gui/macosx/open.h
index 3a1f3957b981fd888044e9656a7eda5e3d04e035..6ec28f425f561e8c67638912c65cd8354122ee2b 100644 (file)
--- a/modules/gui/macosx/open.h
+++ b/modules/gui/macosx/open.h
@@ -89,6 +89,8 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_file_sub_align_pop;
     IBOutlet id o_file_sub_align_lbl;
     IBOutlet id o_file_sub_ok_btn;
+    IBOutlet id o_file_sub_font_box;
+    IBOutlet id o_file_sub_file_box;
 
     IBOutlet id o_output_ckbox;
     IBOutlet id o_sout_options;

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 3398f5d0681dc34f8a56bf205cf0a72f980e3136..4ebcdd5dd2666e98d8fd605f8feb814dd1a8c57b 100644 (file)
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -233,6 +233,8 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [o_file_sub_align_lbl setStringValue: _NS("Subtitles justification")];
     [o_file_sub_align_pop removeAllItems];
     [o_file_sub_ok_btn setStringValue: _NS("OK")];
+    [o_file_sub_font_box setTitle: _NS("Font Properties")];
+    [o_file_sub_file_box setTitle: _NS("Subtitle File")];
 
     p_item = config_FindConfig( VLC_OBJECT(p_intf), "subsdec-encoding" );