macosx: Work-around a NSUIHeartBeat crash on quit by not allowing the sprefs window...

No, better don't ask oO

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
index 96cd57c2dc65c8661e148e57a5368b8da9a78489..c80c45052cb9261858e5785f04774e479a9a852e 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
@@ -7,17 +7,17 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>2311</key>
-               <string>345 426 590 230 0 0 1280 778 </string>
+               <string>345 425 590 230 0 0 1280 778 </string>
                <key>2330</key>
-               <string>345 222 590 502 0 0 1280 778 </string>
+               <string>345 221 590 502 0 0 1280 778 </string>
                <key>2440</key>
                <string>345 307 590 389 0 0 1280 778 </string>
                <key>2523</key>
                <string>345 319 590 373 0 0 1280 778 </string>
                <key>2562</key>
-               <string>345 220 590 505 0 0 1280 778 </string>
+               <string>345 219 590 505 0 0 1280 778 </string>
                <key>2668</key>
-               <string>345 256 590 457 0 0 1280 778 </string>
+               <string>345 255 590 457 0 0 1280 778 </string>
        </dict>
        <key>IBFramework Version</key>
        <string>489.0</string>
@@ -27,8 +27,13 @@
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
+               <integer>2562</integer>
+               <integer>2311</integer>
                <integer>2265</integer>
+               <integer>1530</integer>
+               <integer>2330</integer>
                <integer>2668</integer>
+               <integer>2677</integer>
        </array>
        <key>IBSystem Version</key>
        <string>9E17</string>

diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
index 2b2a5df0c790d0d75508ce1789cf4d1b528fc9db..42e1208d3d0bd022c45325fd4f2830f97ef7785a 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index fa6532af87ef15f90bf384921ed4d30c2f16d2b7..8bfc2fc1714e4b1aeada549bdec52fefeb49059a 100644 (file)
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -293,7 +293,7 @@ static VLCSimplePrefs *_o_sharedInstance = nil;
     [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 0] setStringValue: _NS("Basic")];
     [[o_sprefs_basicFull_matrix cellAtRow: 0 column: 1] setStringValue: _NS("All")];
     [o_sprefs_cancel_btn setTitle: _NS("Cancel")];
-    [o_sprefs_reset_btn setTitle: _NS("Reset Preferences")];
+    [o_sprefs_reset_btn setTitle: _NS("Reset All")];
     [o_sprefs_save_btn setTitle: _NS("Save")];
     [o_sprefs_win setTitle: _NS("Preferences")];
 }