[vlc-commits] macosx: fix l10n for one menu item

[David Fuhrmann]

vlc/vlc-2.1 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Thu Sep 19 10:44:10 2013 +0200| [fe16b84eb2a8b01fe45e5a5cae8994f44a992576] | committer: David Fuhrmann

macosx: fix l10n for one menu item
(cherry picked from commit 6eeb082cd8e4bb0e4bbfcbcdf17079f2e2f10e0e)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=fe16b84eb2a8b01fe45e5a5cae8994f44a992576
---

 .../macosx/Resources/English.lproj/MainMenu.xib    |   29 +++++++++++++++-----
 modules/gui/macosx/MainMenu.h                      |    1 +
 modules/gui/macosx/MainMenu.m                      |    1 +
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index 43e99b5..5c064c7 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@ -2,7 +2,7 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
   <data>
     <int key="IBDocument.SystemTarget">1050</int>
-    <string key="IBDocument.SystemVersion">12F36</string>
+    <string key="IBDocument.SystemVersion">12F37</string>
     <string key="IBDocument.InterfaceBuilderVersion">851</string>
     <string key="IBDocument.AppKitVersion">1187.39</string>
     <string key="IBDocument.HIToolboxVersion">626.00</string>
@@ -21,11 +21,11 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="5238"/>
-      <integer value="2461"/>
-      <integer value="5260"/>
       <integer value="4850"/>
       <integer value="2730"/>
+      <integer value="2461"/>
+      <integer value="29"/>
+      <integer value="5260"/>
       <integer value="21"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -8444,6 +8444,14 @@ LCAuLi4</string>
           </object>
           <int key="connectionID">5596</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">o_mi_playlistTableColumns</string>
+            <reference key="source" ref="651263286"/>
+            <reference key="destination" ref="709859089"/>
+          </object>
+          <int key="connectionID">5597</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -12789,9 +12797,9 @@ LCAuLi4</string>
           <string>{{479, 492}, {137, 103}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{1036, 57}, {604, 310}}</string>
+          <string>{{760, 57}, {604, 310}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{1036, 57}, {604, 310}}</string>
+          <string>{{760, 57}, {604, 310}}</string>
           <boolean value="YES"/>
           <boolean value="YES"/>
           <boolean value="NO"/>
@@ -13664,7 +13672,7 @@ LCAuLi4</string>
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">5596</int>
+      <int key="maxID">5597</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -14818,6 +14826,7 @@ LCAuLi4</string>
               <string>o_mi_play</string>
               <string>o_mi_player</string>
               <string>o_mi_playlist</string>
+              <string>o_mi_playlistTableColumns</string>
               <string>o_mi_prefs</string>
               <string>o_mi_previous</string>
               <string>o_mi_program</string>
@@ -14991,6 +15000,7 @@ LCAuLi4</string>
               <string>NSMenuItem</string>
               <string>NSMenuItem</string>
               <string>NSMenuItem</string>
+              <string>NSMenuItem</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
@@ -15153,6 +15163,7 @@ LCAuLi4</string>
               <string>o_mi_play</string>
               <string>o_mi_player</string>
               <string>o_mi_playlist</string>
+              <string>o_mi_playlistTableColumns</string>
               <string>o_mi_prefs</string>
               <string>o_mi_previous</string>
               <string>o_mi_program</string>
@@ -15521,6 +15532,10 @@ LCAuLi4</string>
                 <string key="candidateClassName">NSMenuItem</string>
               </object>
               <object class="IBToOneOutletInfo">
+                <string key="name">o_mi_playlistTableColumns</string>
+                <string key="candidateClassName">NSMenuItem</string>
+              </object>
+              <object class="IBToOneOutletInfo">
                 <string key="name">o_mi_prefs</string>
                 <string key="candidateClassName">NSMenuItem</string>
               </object>
diff --git a/modules/gui/macosx/MainMenu.h b/modules/gui/macosx/MainMenu.h
index abb8146..e006b6b 100644
--- a/modules/gui/macosx/MainMenu.h
+++ b/modules/gui/macosx/MainMenu.h
@@ -83,6 +83,7 @@
     IBOutlet NSMenuItem * o_mi_toggleEffectsButton;
     IBOutlet NSMenuItem * o_mi_toggleSidebar;
     IBOutlet NSMenu * o_mu_playlistTableColumns;
+    IBOutlet NSMenuItem * o_mi_playlistTableColumns;
     NSMenu * o_mu_playlistTableColumnsContextMenu;
 
     IBOutlet NSMenu * o_mu_controls;
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 4e1d4a5..fba4a6c 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -344,6 +344,7 @@ static VLCMainMenu *_o_sharedInstance = nil;
     [o_mi_toggleSidebar setTitle: _NS("Show Sidebar")];
     [o_mi_toggleSidebar setState: config_GetInt(VLCIntf, "macosx-show-sidebar")];
     [o_mu_playlistTableColumns setTitle: _NS("Playlist Table Columns")];
+    [o_mi_playlistTableColumns setTitle: _NS("Playlist Table Columns")];
 
     [o_mu_controls setTitle: _NS("Playback")];
     [o_mi_play setTitle: _NS("Play")];