[vlc-commits] macosx: fix l10n issues

[David Fuhrmann]

vlc/vlc-2.1 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sun Sep  8 19:13:18 2013 +0200| [23250ef83cdffb752f6c7fcb13a51dad078d6ab2] | committer: David Fuhrmann

macosx: fix l10n issues
(cherry picked from commit a80285784103e6004a151a95582a7cf4fc58b56c)

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

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

 .../macosx/Resources/English.lproj/MainMenu.xib    |   42 ++++++++++----------
 modules/gui/macosx/playlist.m                      |    1 +
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index 4613f1a..43e99b5 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">12E55</string>
+    <string key="IBDocument.SystemVersion">12F36</string>
     <string key="IBDocument.InterfaceBuilderVersion">851</string>
     <string key="IBDocument.AppKitVersion">1187.39</string>
     <string key="IBDocument.HIToolboxVersion">626.00</string>
@@ -21,9 +21,9 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="5260"/>
-      <integer value="29"/>
+      <integer value="5238"/>
       <integer value="2461"/>
+      <integer value="5260"/>
       <integer value="4850"/>
       <integer value="2730"/>
       <integer value="21"/>
@@ -7586,14 +7586,6 @@ LCAuLi4</string>
         </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
-            <string key="label">o_mu_view</string>
-            <reference key="source" ref="651263286"/>
-            <reference key="destination" ref="782168084"/>
-          </object>
-          <int key="connectionID">5255</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
             <string key="label">o_mu_playlistTableColumns</string>
             <reference key="source" ref="651263286"/>
             <reference key="destination" ref="103150196"/>
@@ -8444,6 +8436,14 @@ LCAuLi4</string>
           </object>
           <int key="connectionID">5595</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">o_mu_view</string>
+            <reference key="source" ref="651263286"/>
+            <reference key="destination" ref="815243229"/>
+          </object>
+          <int key="connectionID">5596</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -12786,12 +12786,12 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{491, 312}, {137, 103}}</string>
+          <string>{{479, 492}, {137, 103}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{343, 329}, {604, 310}}</string>
+          <string>{{1036, 57}, {604, 310}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{343, 329}, {604, 310}}</string>
+          <string>{{1036, 57}, {604, 310}}</string>
           <boolean value="YES"/>
           <boolean value="YES"/>
           <boolean value="NO"/>
@@ -12984,7 +12984,7 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{379, 595}, {595, 20}}</string>
+          <string>{{398, 803}, {595, 20}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -13374,7 +13374,7 @@ LCAuLi4</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
-          <string>{{573, 212}, {222, 383}}</string>
+          <string>{{592, 420}, {222, 383}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -13429,12 +13429,12 @@ LCAuLi4</string>
           <boolean value="YES"/>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{535, 302}, {260, 113}}</string>
+          <string>{{542, 690}, {260, 113}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{854, 659}, {64, 6}}</string>
+          <string>{{802, 707}, {64, 6}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>{{930, 246}, {403, 21}}</string>
@@ -13664,7 +13664,7 @@ LCAuLi4</string>
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">5595</int>
+      <int key="maxID">5596</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -16271,7 +16271,7 @@ LCAuLi4</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
-              <string>id</string>
+              <string>VLCVolumeSliderCommon</string>
               <string>id</string>
               <string>id</string>
             </object>
@@ -16318,7 +16318,7 @@ LCAuLi4</string>
               </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_volume_sld</string>
-                <string key="candidateClassName">id</string>
+                <string key="candidateClassName">VLCVolumeSliderCommon</string>
               </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_volume_track_view</string>
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 01b8584..a69353c 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -442,6 +442,7 @@
     playlist_t * p_playlist = pl_Get(VLCIntf);
 
     [super awakeFromNib];
+    [self initStrings];
 
     [o_outline_view setDoubleAction: @selector(playItem:)];
     [o_outline_view_other setDoubleAction: @selector(playItem:)];