Changeset e541f7f3aa33c65ad4e27d986251ce0eafdd96b2

Show
Ignore:
Timestamp:
06/13/08 02:16:11 (3 months ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1213316171 +0200
git-parent:

[5863629c3745e6dae9ba6a859beda1b35debde2b]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1213316171 +0200
Message:

Added complete l10n to the Capture interface and a useful error messages to the input module

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib

    r6a5fc04 re541f7f  
    366366                "o_playlist" = id; 
    367367                "o_screen_fps_fld" = id; 
     368                "o_screen_fps_lbl" = id; 
    368369                "o_screen_fps_stp" = id; 
    369370                "o_screen_lbl" = id; 

  • extras/package/macosx/Resources/English.lproj/Open.nib/info.nib

    r6a5fc04 re541f7f  
    88    <dict> 
    99        <key>2297</key> 
    10         <string>366 463 548 183 0 0 1280 778 </string> 
     10        <string>366 462 548 183 0 0 1280 778 </string> 
    1111        <key>2301</key> 
    12         <string>646 594 548 183 0 0 1280 778 </string> 
     12        <string>366 462 548 183 0 0 1280 778 </string> 
    1313        <key>2304</key> 
    14         <string>427 454 547 183 0 0 1280 778 </string> 
     14        <string>366 462 547 183 0 0 1280 778 </string> 
    1515        <key>2346</key> 
    16         <string>366 464 548 183 0 0 1280 778 </string> 
     16        <string>366 462 548 183 0 0 1280 778 </string> 
    1717    </dict> 
    1818    <key>IBFramework Version</key> 
    …… 
    2525        <integer>2199</integer> 
    2626    </array> 
    27     <key>IBOpenObjects</key> 
    28     <array> 
    29         <integer>2301</integer> 
    30         <integer>2297</integer> 
    31         <integer>636</integer> 
    32         <integer>2346</integer> 
    33     </array> 
    3427    <key>IBSystem Version</key> 
    3528    <string>9D34</string> 

  • modules/access/qtcapture.m

    r01744ab re541f7f  
    3636#include <vlc_vout.h> 
    3737#include <vlc_demux.h> 
     38#include <vlc_interface.h> 
    3839 
    3940#import <QTKit/QTKit.h> 
    …… 
    215216    if( !p_sys->device ) 
    216217    { 
     218        intf_UserFatal( p_demux, true, _("No Input device found"), 
     219                        _("Your Mac does not seem to be equipped with a suitable input device. " 
     220                          "Please check your connectors and drivers.") ); 
    217221        msg_Err( p_demux, "Can't find any Video device" ); 
     222         
    218223        goto error; 
    219224    } 

  • modules/gui/macosx/open.h

    r6a5fc04 re541f7f  
    127127    IBOutlet id o_screen_long_lbl; 
    128128    IBOutlet id o_screen_fps_stp; 
     129    IBOutlet id o_screen_fps_lbl; 
    129130 
    130131    BOOL b_autoplay; 

  • modules/gui/macosx/open.m

    r6a5fc04 re541f7f  
    199199    [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )]; 
    200200    [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )]; 
    201   
     201 
    202202    [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES]; 
    203203 
    204     /* FIXME: implement Capturing l10n here completely */ 
    205204    [o_capture_mode_pop removeAllItems]; 
    206205    if( MACOS_VERSION > 10.4f ) 
    207         [o_capture_mode_pop addItemWithTitle: _NS("iSight")]; 
     206        [o_capture_mode_pop addItemWithTitle: @"iSight"]; 
    208207    [o_capture_mode_pop addItemWithTitle: _NS("Screen")]; 
    209208    [o_capture_mode_pop addItemWithTitle: @"EyeTV"]; 
    210209    [o_screen_lbl setStringValue: _NS("Screen Capture Input")]; 
    211210    [o_screen_long_lbl setStringValue: _NS("This facility allows you to process your screen's output.")]; 
    212      
     211    [o_screen_fps_lbl setStringValue: _NS("Frames per Second:")]; 
     212    [o_eyetv_currentChannel_lbl setStringValue: _NS("Current channel:")]; 
     213    [o_eyetv_previousProgram_btn setTitle: _NS("Previous Channel")]; 
     214    [o_eyetv_nextProgram_btn setTitle: _NS("Next Channel")]; 
     215    [o_eyetv_chn_status_txt setStringValue: _NS("Retrieving Channel Info...")]; 
     216    [o_eyetv_noInstance_lbl setStringValue: _NS("EyeTV is not launched")]; 
     217    [o_eyetv_noInstanceLong_lbl setStringValue: _NS("VLC could not connect to EyeTV.\nMake sure that you installed VLC's EyeTV plugin.")]; 
     218    [o_eyetv_launchEyeTV_btn setTitle: _NS("Launch EyeTV now")]; 
     219 
    213220    [self setSubPanel]; 
    214  
    215221 
    216222    [[NSNotificationCenter defaultCenter] addObserver: self 
    …… 
    855861        [o_mrl setStringValue: @""]; 
    856862    }  
    857     else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"Screen"] ) 
     863    else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] ) 
    858864    { 
    859865        [self showCaptureView: o_screen_view];