* fixed some intf-strings and connected a few menu-items properly

* changed wizard-shortcut to shift-cmd-w
* re-ordered the file-menu slightly

Thanks to thedj for pointing most of that out.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index 93478314dd36dcd5b1ed447fe0b622d4047e5eb2..b0991c121aec63f361a6418221e0c9ee035890aa 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -160,6 +160,7 @@
                 "o_mi_deinterlace" = id; 
                 "o_mi_device" = id; 
                 "o_mi_documentation" = id; 
+                "o_mi_donation" = id; 
                 "o_mi_double_window" = id; 
                 "o_mi_equalizer" = id; 
                 "o_mi_extended" = id; 
@@ -167,6 +168,7 @@
                 "o_mi_ffmpeg_pp" = id; 
                 "o_mi_fittoscreen" = id; 
                 "o_mi_floatontop" = id; 
+                "o_mi_forum" = id; 
                 "o_mi_fullscreen" = id; 
                 "o_mi_fwd" = id; 
                 "o_mi_half_window" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 007211220c60bf792084770f5c26f1060609b325..ff714045831f3556a9a71a856b610cf96d1c0bee 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>531 112 496 270 0 0 1280 1002 </string>
+       <string>496 156 496 270 0 0 1440 878 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
@@ -11,18 +11,18 @@
                <key>2197</key>
                <string>422 532 596 143 0 0 1440 878 </string>
                <key>29</key>
-               <string>468 906 437 44 0 0 1280 1002 </string>
+               <string>503 790 438 44 0 0 1440 878 </string>
                <key>915</key>
                <string>678 573 187 249 0 0 1280 1002 </string>
        </dict>
        <key>IBFramework Version</key>
-       <string>439.0</string>
+       <string>437.0</string>
        <key>IBLockedObjects</key>
        <array/>
        <key>IBOpenObjects</key>
        <array>
-               <integer>21</integer>
                <integer>2029</integer>
+               <integer>21</integer>
                <integer>29</integer>
        </array>
        <key>IBSystem Version</key>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
index 4a3fed180217b71ce65128a982d6ad6f0d5dc9a9..c352716075b6378b6819f776e58f084770cbc0bf 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index abf4202c596e1fa2e61b4229353cc98f4333d364..719dd358c029e000d8b9df5430c68b3a13b472e0 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -247,6 +247,8 @@ struct intf_sys_t
     IBOutlet id o_mi_reportabug;
     IBOutlet id o_mi_website;
     IBOutlet id o_mi_license;
+    IBOutlet id o_mi_donation;
+    IBOutlet id o_mi_forum;
 
     /* dock menu */
     IBOutlet id o_dmi_play;

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 94fa5ac467833223a8081cd9d4f12635d16e7bf8..37417ec1da958f65ddc0b63fcb8614acb3bd1075 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -465,8 +465,9 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
 
     /* main menu */
-    [o_mi_about setTitle: _NS("About VLC media player...")];
-    [o_mi_checkForUpdate setTitle: _NS("Check for update...")];
+    [o_mi_about setTitle: [_NS("About VLC media player") \
+        stringByAppendingString: @"..."]];
+    [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];
     [o_mi_prefs setTitle: _NS("Preferences...")];
     [o_mi_add_intf setTitle: _NS("Add Interface")];
     [o_mu_add_intf setTitle: _NS("Add Interface")];
@@ -483,7 +484,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_open_net setTitle: _NS("Open Network...")];
     [o_mi_open_recent setTitle: _NS("Open Recent")];
     [o_mi_open_recent_cm setTitle: _NS("Clear Menu")];
-    [o_mi_open_wizard setTitle: _NS("Wizard...")];
+    [o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
 
     [o_mu_edit setTitle: _NS("Edit")];
     [o_mi_cut setTitle: _NS("Cut")];
@@ -492,7 +493,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_clear setTitle: _NS("Clear")];
     [o_mi_select_all setTitle: _NS("Select All")];
 
-    [o_mu_controls setTitle: _NS("Controls")];
+    [o_mu_controls setTitle: _NS("Playback")];
     [o_mi_play setTitle: _NS("Play")];
     [o_mi_stop setTitle: _NS("Stop")];
     [o_mi_faster setTitle: _NS("Faster")];
@@ -549,7 +550,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_close_window setTitle: _NS("Close Window")];
     [o_mi_controller setTitle: _NS("Controller")];
     [o_mi_equalizer setTitle: _NS("Equalizer")];
-    [o_mi_extended setTitle: _NS("Extended controls")];
+    [o_mi_extended setTitle: _NS("Extended Controls")];
     [o_mi_bookmarks setTitle: _NS("Bookmarks")];
     [o_mi_playlist setTitle: _NS("Playlist")];
     [o_mi_info setTitle: _NS("Info")];
@@ -563,6 +564,8 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_reportabug setTitle: _NS("Report a Bug")];
     [o_mi_website setTitle: _NS("VideoLAN Website")];
     [o_mi_license setTitle: _NS("License")];
+    [o_mi_donation setTitle: _NS("Make a donation")];
+    [o_mi_forum setTitle: _NS("Online Forum")];
 
     /* dock menu */
     [o_dmi_play setTitle: _NS("Play")];