]> git.sesse.net Git - vlc/commitdiff
* Makefile.am: fixed 'make package-beos'
authorEric Petit <titer@videolan.org>
Tue, 22 Apr 2003 16:36:16 +0000 (16:36 +0000)
committerEric Petit <titer@videolan.org>
Tue, 22 Apr 2003 16:36:16 +0000 (16:36 +0000)
 * modules/gui/beos/*: added _()s so the whole interface is translated
 * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now)
   FIXME: currently, untranslated strings are not converted to UTF-8

Makefile.am
modules/gui/beos/InterfaceWindow.cpp
modules/gui/beos/MediaControlView.cpp
modules/gui/beos/PlayListWindow.cpp
modules/gui/beos/PreferencesWindow.cpp
modules/gui/beos/VideoOutput.cpp
modules/gui/beos/VlcWrapper.cpp
modules/gui/beos/VlcWrapper.h
src/libvlc.c

index 387e3e5c753511008e5ba58aa4181032d4bdad82..0abbc846fa73a1273c8691b0b1f5ed851935f5fd 100644 (file)
@@ -447,7 +447,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
 if HAVE_BEOS
        xres -o $@ ./share/vlc_beos.rsrc
        mimeset -f $@
-       $(INSTALL) -d locale
+       rm -Rf locale ; mkdir locale
        for i in $(ALL_LINGUAS); do \
                mkdir -p locale/$${i}/LC_MESSAGES ; \
                cp po/$${i}.gmo locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
@@ -562,26 +562,35 @@ package-beos:
        else \
                echo "OK."; mkdir tmp; \
        fi
-       
-# Create dir
-       mkdir -p tmp/vlc/share
+
 # Copy relevant files
-       cp vlc tmp/vlc/
-       $(STRIP) tmp/vlc/vlc
-       xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
-       cp AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
-       for file in default8x16.psf default8x9.psf ; \
-               do cp share/$$file tmp/vlc/share/ ; done
-       mkdir tmp/vlc/plugins
-       for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
-               $(INSTALL) $$i tmp/vlc/plugins/ ; \
-       fi ; done
-       for i in dummy tmp/vlc/plugins/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
-# Create package 
+       mkdir -p tmp/vlc
+       cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
+# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
+       if [ `find modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
+               mkdir -p tmp/vlc/plugins; \
+               find modules -name "lib*_plugin.so" | xargs -i{} cp {} tmp/vlc/plugins/; \
+       fi
+       for i in $(ALL_LINGUAS); do \
+               mkdir -p tmp/vlc/locale/$${i}/LC_MESSAGES ; \
+               cp po/$${i}.gmo tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+       done
+       mkdir -p tmp/vlc/share
+       cp share/*.rle tmp/vlc/share/
+
+# Create package with debug symbols
+       mimeset -f tmp/vlc/* tmp/vlc/*/*
        mv tmp/vlc tmp/vlc-${VERSION}
-       (cd tmp ; find vlc-${VERSION} | \
-       zip -9 -@ vlc-${VERSION}-BeOS-x86.zip )
-       mv tmp/vlc-${VERSION}-BeOS-x86.zip .
+       (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+       mv tmp/vlc-${VERSION}-BeOS.zip .
+
+# Create package without debug symbols
+       strip tmp/vlc-${VERSION}/vlc tmp/vlc-${VERSION}/plugins/lib*_plugin.so
+       xres -o tmp/vlc-${VERSION}/vlc share/vlc_beos.rsrc
+       mimeset -f tmp/vlc-${VERSION}/* tmp/vlc-${VERSION}/*/*
+       (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS-stripped.zip vlc-${VERSION} )
+       mv tmp/vlc-${VERSION}-BeOS-stripped.zip .
+
 # Clean up
        rm -Rf tmp
 
index 60352ad479f28b1a17ec6697b83ecaea80c72498..092d36df5657313c29f1f46b5ac8b9603ac9665f 100644 (file)
@@ -2,7 +2,7 @@
  * InterfaceWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.33 2003/04/18 16:10:28 titer Exp $
+ * $Id: InterfaceWindow.cpp,v 1.34 2003/04/22 16:36:16 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -156,8 +156,8 @@ collect_folder_contents( BDirectory& dir, BList& list, bool& deep, bool& asked,
                        {
                                // ask user if we should parse sub-folders as well
                                BAlert* alert = new BAlert( "sub-folders?",
-                                                                                       "Open files from all sub-folders as well?",
-                                                                                       "No", "Yes", NULL, B_WIDTH_AS_USUAL,
+                                                                                       _("Open files from all sub-folders as well?"),
+                                                                                       _("No"), _("Yes"), NULL, B_WIDTH_AS_USUAL,
                                                                                        B_IDEA_ALERT );
                                int32 buttonIndex = alert->Go();
                                deep = buttonIndex == 1;
@@ -202,17 +202,17 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name,
                      ( screen_rect.bottom - PREFS_WINDOW_HEIGHT ) / 2,
                      ( screen_rect.right + PREFS_WINDOW_WIDTH ) / 2,
                      ( screen_rect.bottom + PREFS_WINDOW_HEIGHT ) / 2 );
-    fPreferencesWindow = new PreferencesWindow( p_intf, window_rect, "Settings" );
+    fPreferencesWindow = new PreferencesWindow( p_intf, window_rect, _("Settings") );
     window_rect.Set( screen_rect.right - 500,
                      screen_rect.top + 50,
                      screen_rect.right - 150,
                      screen_rect.top + 250 );
-    fPlaylistWindow = new PlayListWindow( window_rect, "Playlist", this, p_intf );
+    fPlaylistWindow = new PlayListWindow( window_rect, _("Playlist"), this, p_intf );
     window_rect.Set( screen_rect.right - 500,
                      screen_rect.top + 300,
                      screen_rect.right - 150,
                      screen_rect.top + 600 );
-    fMessagesWindow = new MessagesWindow( p_intf, window_rect, "Messages" );
+    fMessagesWindow = new MessagesWindow( p_intf, window_rect, _("Messages") );
 
     // the media control view
     p_mediaControl = new MediaControlView( BRect( 0.0, 0.0, 250.0, 50.0 ),
@@ -241,23 +241,23 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name,
     // Add the file Menu
     BMenu* fileMenu = new BMenu( _("File") );
     fMenuBar->AddItem( fileMenu );
-    fileMenu->AddItem( new BMenuItem( "Open File" B_UTF8_ELLIPSIS,
+    fileMenu->AddItem( new BMenuItem( _AddEllipsis(_("Open Subtitles")),
                                       new BMessage( OPEN_FILE ), 'O') );
     
-    fileMenu->AddItem( new CDMenu( "Open Disc" ) );
+    fileMenu->AddItem( new CDMenu( _("Open Disc") ) );
 
-    fileMenu->AddItem( new BMenuItem( "Open Subtitles" B_UTF8_ELLIPSIS,
+    fileMenu->AddItem( new BMenuItem( _AddEllipsis(_("Open Subtitles")),
                                       new BMessage( LOAD_SUBFILE ) ) );
     
     fileMenu->AddSeparatorItem();
-    BMenuItem* item = new BMenuItem( "About" B_UTF8_ELLIPSIS,
+    BMenuItem* item = new BMenuItem( _AddEllipsis(_("About")),
                                      new BMessage( B_ABOUT_REQUESTED ), 'A');
     item->SetTarget( be_app );
     fileMenu->AddItem( item );
-    fileMenu->AddItem( new BMenuItem( "Quit", new BMessage( B_QUIT_REQUESTED ), 'Q') );
+    fileMenu->AddItem( new BMenuItem( _("Quit"), new BMessage( B_QUIT_REQUESTED ), 'Q') );
 
-    fLanguageMenu = new LanguageMenu("Language", AUDIO_ES, p_wrapper);
-    fSubtitlesMenu = new LanguageMenu("Subtitles", SPU_ES, p_wrapper);
+    fLanguageMenu = new LanguageMenu( _("Language"), AUDIO_ES, p_wrapper);
+    fSubtitlesMenu = new LanguageMenu( _("Subtitles"), SPU_ES, p_wrapper);
 
     /* Add the Audio menu */
     fAudioMenu = new BMenu( _("Audio") );
@@ -265,11 +265,11 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name,
     fAudioMenu->AddItem( fLanguageMenu );
     fAudioMenu->AddItem( fSubtitlesMenu );
 
-    fPrevTitleMI = new BMenuItem( "Prev Title", new BMessage( PREV_TITLE ) );
-    fNextTitleMI = new BMenuItem( "Next Title", new BMessage( NEXT_TITLE ) );
-    fPrevChapterMI = new BMenuItem( "Prev Chapter", new BMessage( PREV_CHAPTER ) );
-    fNextChapterMI = new BMenuItem( "Next Chapter", new BMessage( NEXT_CHAPTER ) );
-    fGotoMenuMI = new BMenuItem( "Goto Menu", new BMessage( NAVIGATE_MENU ) );
+    fPrevTitleMI = new BMenuItem( _("Prev Title"), new BMessage( PREV_TITLE ) );
+    fNextTitleMI = new BMenuItem( _("Next Title"), new BMessage( NEXT_TITLE ) );
+    fPrevChapterMI = new BMenuItem( _("Prev Chapter"), new BMessage( PREV_CHAPTER ) );
+    fNextChapterMI = new BMenuItem( _("Next Chapter"), new BMessage( NEXT_CHAPTER ) );
+    fGotoMenuMI = new BMenuItem( _("Goto Menu"), new BMessage( NAVIGATE_MENU ) );
 
     /* Add the Navigation menu */
     fNavigationMenu = new BMenu( _("Navigation") );
@@ -278,30 +278,30 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char* name,
     fNavigationMenu->AddSeparatorItem();
     fNavigationMenu->AddItem( fPrevTitleMI );
     fNavigationMenu->AddItem( fNextTitleMI );
-    fNavigationMenu->AddItem( fTitleMenu = new TitleMenu( "Go to Title", p_intf ) );
+    fNavigationMenu->AddItem( fTitleMenu = new TitleMenu( _("Go to Title"), p_intf ) );
     fNavigationMenu->AddSeparatorItem();
     fNavigationMenu->AddItem( fPrevChapterMI );
     fNavigationMenu->AddItem( fNextChapterMI );
-    fNavigationMenu->AddItem( fChapterMenu = new ChapterMenu( "Go to Chapter", p_intf ) );
+    fNavigationMenu->AddItem( fChapterMenu = new ChapterMenu( _("Go to Chapter"), p_intf ) );
 
     /* Add the Speed menu */
     fSpeedMenu = new BMenu( _("Speed") );
     fSpeedMenu->SetRadioMode( true );
-    fSpeedMenu->AddItem( fSlowerMI = new BMenuItem( "Slower", new BMessage( SLOWER_PLAY ) ) );
-    fNormalMI = new BMenuItem( "Normal", new BMessage( NORMAL_PLAY ) );
+    fSpeedMenu->AddItem( fSlowerMI = new BMenuItem( _("Slower"), new BMessage( SLOWER_PLAY ) ) );
+    fNormalMI = new BMenuItem( _("Normal"), new BMessage( NORMAL_PLAY ) );
     fNormalMI->SetMarked(true); // default to normal speed
     fSpeedMenu->AddItem( fNormalMI );
-    fSpeedMenu->AddItem( fFasterMI = new BMenuItem( "Faster", new BMessage( FASTER_PLAY) ) );
+    fSpeedMenu->AddItem( fFasterMI = new BMenuItem( _("Faster"), new BMessage( FASTER_PLAY) ) );
     fSpeedMenu->SetTargetForItems( this );
     fMenuBar->AddItem( fSpeedMenu );
 
     /* Add the Show menu */
     fShowMenu = new BMenu( _("Window") );
-    fShowMenu->AddItem( new BMenuItem( "Play List" B_UTF8_ELLIPSIS,
+    fShowMenu->AddItem( new BMenuItem( _AddEllipsis(_("Play List")),
                                        new BMessage( OPEN_PLAYLIST ), 'P') );
-    fShowMenu->AddItem( new BMenuItem( "Messages" B_UTF8_ELLIPSIS,
+    fShowMenu->AddItem( new BMenuItem( _AddEllipsis(_("Messages")),
                                        new BMessage( OPEN_MESSAGES ), 'M' ) );
-    fShowMenu->AddItem( new BMenuItem( "Settings" B_UTF8_ELLIPSIS,
+    fShowMenu->AddItem( new BMenuItem( _AddEllipsis(_("Settings")),
                                        new BMessage( OPEN_PREFERENCES ), 'S' ) );
     fMenuBar->AddItem( fShowMenu );                            
 
@@ -356,8 +356,8 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
         case B_ABOUT_REQUESTED:
         {
             BAlert* alert = new BAlert( "VLC " PACKAGE_VERSION,
-                                        "VLC " PACKAGE_VERSION " for BeOS\n\n"
-                                        "<www.videolan.org>", "OK");
+                                        "VLC " PACKAGE_VERSION " for BeOS"
+                                        "\n\n<www.videolan.org>", _("OK"));
             alert->Go();
             break;
         }
@@ -365,11 +365,11 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
             break;
             
         case OPEN_FILE:
-               _ShowFilePanel( B_REFS_RECEIVED, "VideoLAN Client: Open Media Files" );
+               _ShowFilePanel( B_REFS_RECEIVED, _("VideoLAN Client: Open Media Files") );
             break;
 
         case LOAD_SUBFILE:
-               _ShowFilePanel( SUBFILE_RECEIVED, "VideoLAN Client: Open Subtitle File" );
+               _ShowFilePanel( SUBFILE_RECEIVED, _("VideoLAN Client: Open Subtitle File") );
             break;
 
         case OPEN_PLAYLIST:
@@ -1180,6 +1180,7 @@ int CDMenu::GetCD( const char *directory )
                vol.Unset();
                status = volRoster.GetNextVolume( &vol );
        }
+       return 0;
 }
 
 /*****************************************************************************
index 8ab9d17a007b76d69a01fb61953430fedd289125..e5cbf842512f1aa8178622f7f3757ea10d93aef8 100644 (file)
@@ -2,7 +2,7 @@
  * MediaControlView.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: MediaControlView.cpp,v 1.15 2003/02/03 17:18:48 stippi Exp $
+ * $Id: MediaControlView.cpp,v 1.16 2003/04/22 16:36:16 titer Exp $
  *
  * Authors: Tony Castley <tony@castley.net>
  *          Stephan Aßmus <stippi@yellowbites.com>
@@ -61,7 +61,7 @@ const rgb_color kSeekRed = (rgb_color){ 255, 0, 0, 255 };
 const rgb_color kSeekRedLight = (rgb_color){ 255, 152, 152, 255 };
 const rgb_color kSeekRedShadow = (rgb_color){ 178, 0, 0, 255 };
 
-const char* kDisabledSeekMessage = "Drop files to play";
+const char* kDisabledSeekMessage = _("Drop files to play");
 
 enum
 {
@@ -1254,9 +1254,9 @@ PositionInfoView::Draw( BRect updateRect )
                        float height = ( r.Height() - timeHeight ) / 3.0;
                        SetFont( &tinyFont );
                        SetHighColor( 0, 180, 0, 255 );
-                       DrawString( "File", BPoint( r.left + 3.0, r.top + height ) );
-                       DrawString( "Title", BPoint( r.left + 3.0, r.top + 2.0 * height ) );
-                       DrawString( "Chapter", BPoint( r.left + 3.0, r.top + 3.0 * height ) );
+                       DrawString( _("File"), BPoint( r.left + 3.0, r.top + height ) );
+                       DrawString( _("Title"), BPoint( r.left + 3.0, r.top + 2.0 * height ) );
+                       DrawString( _("Chapter"), BPoint( r.left + 3.0, r.top + 3.0 * height ) );
                        SetFont( &smallFont );
                        BString helper;
                        SetHighColor( 0, 255, 0, 255 );
index c65427bf83530444983fe4b2a2a33bb7c21a9ade..2515a86437b314637c948a99c0d11f79fa6f8dbe 100644 (file)
@@ -2,7 +2,7 @@
  * PlayListWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: PlayListWindow.cpp,v 1.8 2003/02/03 17:18:48 stippi Exp $
+ * $Id: PlayListWindow.cpp,v 1.9 2003/04/22 16:36:16 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -79,69 +79,69 @@ PlayListWindow::PlayListWindow( BRect frame, const char* name,
     AddChild( fMenuBar );
 
        // Add the File menu
-       BMenu *fileMenu = new BMenu( "File" );
+       BMenu *fileMenu = new BMenu( _("File") );
        fMenuBar->AddItem( fileMenu );
-       BMenuItem* item = new BMenuItem( "Open File" B_UTF8_ELLIPSIS,
+       BMenuItem* item = new BMenuItem( _AddEllipsis(_("Open File")),
                                                                         new BMessage( OPEN_FILE ), 'O' );
        item->SetTarget( fMainWindow );
        fileMenu->AddItem( item );
 
-       CDMenu* cd_menu = new CDMenu( "Open Disc" );
+       CDMenu* cd_menu = new CDMenu( _("Open Disc") );
        fileMenu->AddItem( cd_menu );
 
        fileMenu->AddSeparatorItem();
-       item = new BMenuItem( "Close",
+       item = new BMenuItem( _("Close"),
                                                  new BMessage( B_QUIT_REQUESTED ), 'W' );
        fileMenu->AddItem( item );
 
        // Add the Edit menu
-       BMenu *editMenu = new BMenu( "Edit" );
+       BMenu *editMenu = new BMenu( _("Edit") );
        fMenuBar->AddItem( editMenu );
-       fSelectAllMI = new BMenuItem( "Select All",
+       fSelectAllMI = new BMenuItem( _("Select All"),
                                                                  new BMessage( MSG_SELECT_ALL ), 'A' );
        editMenu->AddItem( fSelectAllMI );
-       fSelectNoneMI = new BMenuItem( "Select None",
+       fSelectNoneMI = new BMenuItem( _("Select None"),
                                                                   new BMessage( MSG_SELECT_NONE ), 'A', B_SHIFT_KEY );
        editMenu->AddItem( fSelectNoneMI );
 
        editMenu->AddSeparatorItem();
-       fSortReverseMI = new BMenuItem( "Sort Reverse",
+       fSortReverseMI = new BMenuItem( _("Sort Reverse"),
                                                                 new BMessage( MSG_SORT_REVERSE ), 'F' );
        editMenu->AddItem( fSortReverseMI );
-       fSortNameMI = new BMenuItem( "Sort by Name",
+       fSortNameMI = new BMenuItem( _("Sort by Name"),
                                                                 new BMessage( MSG_SORT_NAME ), 'N' );
 fSortNameMI->SetEnabled( false );
        editMenu->AddItem( fSortNameMI );
-       fSortPathMI = new BMenuItem( "Sort by Path",
+       fSortPathMI = new BMenuItem( _("Sort by Path"),
                                                                 new BMessage( MSG_SORT_PATH ), 'P' );
 fSortPathMI->SetEnabled( false );
        editMenu->AddItem( fSortPathMI );
-       fRandomizeMI = new BMenuItem( "Randomize",
+       fRandomizeMI = new BMenuItem( _("Randomize"),
                                                                  new BMessage( MSG_RANDOMIZE ), 'R' );
 fRandomizeMI->SetEnabled( false );
        editMenu->AddItem( fRandomizeMI );
        editMenu->AddSeparatorItem();
-       fRemoveMI = new BMenuItem( "Remove",
+       fRemoveMI = new BMenuItem( _("Remove"),
                                                  new BMessage( MSG_REMOVE ) );
        editMenu->AddItem( fRemoveMI );
-       fRemoveAllMI = new BMenuItem( "Remove All",
+       fRemoveAllMI = new BMenuItem( _("Remove All"),
                                                                  new BMessage( MSG_REMOVE_ALL ) );
        editMenu->AddItem( fRemoveAllMI );
 
        // Add View menu
-       fViewMenu = new BMenu( "View" );
+       fViewMenu = new BMenu( _("View") );
        fMenuBar->AddItem( fViewMenu );
 
        fViewMenu->SetRadioMode( true );
        BMessage* message = new BMessage( MSG_SET_DISPLAY );
        message->AddInt32( "mode", DISPLAY_PATH );
-       item = new BMenuItem( "Path", message );
+       item = new BMenuItem( _("Path"), message );
        item->SetMarked( true );
        fViewMenu->AddItem( item );
 
        message = new BMessage( MSG_SET_DISPLAY );
        message->AddInt32( "mode", DISPLAY_NAME );
-       item = new BMenuItem( "Name", message );
+       item = new BMenuItem( _("Name"), message );
        fViewMenu->AddItem( item );
 
        // make menu bar resize to correct height
index ce0cffba67cb42b6f05fc37845587dc24b832d69..c9e0f04904a61061d5e4e1755164def8fceb3370 100644 (file)
@@ -2,7 +2,7 @@
  * PreferencesWindow.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: PreferencesWindow.cpp,v 1.13 2003/02/09 17:10:52 stippi Exp $
+ * $Id: PreferencesWindow.cpp,v 1.14 2003/04/22 16:36:16 titer Exp $
  *
  * Authors: Eric Petit <titer@videolan.org>
  *
@@ -235,37 +235,37 @@ PreferencesWindow::PreferencesWindow( intf_thread_t * p_interface,
     
     fGeneralTab = new BTab();
     fTabView->AddTab( fGeneralView, fGeneralTab );
-    fGeneralTab->SetLabel( "General" );
+    fGeneralTab->SetLabel( _("General") );
     
     fAdjustTab = new BTab();
     fTabView->AddTab( fAdjustView, fAdjustTab );
-    fAdjustTab->SetLabel( "Picture" );
+    fAdjustTab->SetLabel( _("Picture") );
     
     /* fills the tabs */
     /* general tab */
     rect = fGeneralView->Bounds();
     rect.InsetBy( 10, 10 );
     rect.bottom = rect.top + 10;
-    fDvdMenusCheck = new BCheckBox( rect, "dvdmenus", "Use DVD menus",
+    fDvdMenusCheck = new BCheckBox( rect, "dvdmenus", _("Use DVD menus"),
                                   new BMessage( DVDMENUS_CHECK ) );
     fGeneralView->AddChild( fDvdMenusCheck );
     
     rect.top = rect.bottom + 20;
     rect.bottom = rect.top + 30;
-    fPpSlider = new BSlider( rect, "post-processing", "MPEG4 post-processing level",
+    fPpSlider = new BSlider( rect, "post-processing", _("MPEG4 post-processing level"),
                                new BMessage( FFMPEG_UPDATE ),
                                0, 6, B_TRIANGLE_THUMB,
                                B_FOLLOW_LEFT, B_WILL_DRAW ); 
     fPpSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
     fPpSlider->SetHashMarkCount( 7 );
-    fPpSlider->SetLimitLabels( "None", "Maximum" );
+    fPpSlider->SetLimitLabels( _("None"), _("Maximum") );
     fGeneralView->AddChild( fPpSlider );
 
 
        rect.top = fPpSlider->Frame().bottom + 5.0;
        rect.bottom = rect.top + 15.0;
        fScreenShotPathTC = new DirectoryTextControl( rect, "screenshot path",
-                                                                                                 "Screenshot Path:",
+                                                                                                 _("Screenshot Path:"),
                                                                                                  fScreenShotPathBackup.String(),
                                                                                                  new BMessage( SET_FOLDER ) );
 //     fScreenShotPathTC->ResizeToPreferred();
@@ -275,7 +275,7 @@ PreferencesWindow::PreferencesWindow( intf_thread_t * p_interface,
        BMenu* translatorMenu = new BMenu( "translators" );
        add_translator_items( translatorMenu, B_TRANSLATOR_BITMAP, SET_TRANSLATOR );
        fScreenShotFormatMF = new BMenuField( rect, "translators field",
-                                                                                 "Screenshot Format:", translatorMenu );
+                                                                                 _("Screenshot Format:"), translatorMenu );
        fScreenShotFormatMF->Menu()->SetRadioMode( true );
        fScreenShotFormatMF->Menu()->SetLabelFromMarked( true );
        // this will most likely not work for BMenuFields
@@ -305,7 +305,7 @@ PreferencesWindow::PreferencesWindow( intf_thread_t * p_interface,
     be_plain_font->GetHeight( &fh );
     rect.top = rect.bottom - ceilf( fh.ascent + fh.descent ) - 2.0;
     fRestartString = new BStringView( rect, NULL,
-        "DVD-menu and MPEG4 settings take effect after playback is restarted." );
+        _("DVD-menu and MPEG4 settings take effect after playback is restarted.") );
     fRestartString->SetAlignment( B_ALIGN_CENTER );
     fGeneralView->AddChild( fRestartString );
 
@@ -314,22 +314,22 @@ PreferencesWindow::PreferencesWindow( intf_thread_t * p_interface,
     rect = fAdjustView->Bounds();
     rect.InsetBy( 10, 10 );
     rect.bottom = rect.top + 30;
-    fBrightnessSlider = new BSlider( rect, "brightness", "Brightness",
+    fBrightnessSlider = new BSlider( rect, "brightness", _("Brightness"),
                                        new BMessage( ADJUST_UPDATE ),
                                        0, 200, B_TRIANGLE_THUMB,
                                        B_FOLLOW_LEFT, B_WILL_DRAW );
     rect.OffsetBy( 0, 40 );
-    fContrastSlider = new BSlider( rect, "contrast", "Contrast",
+    fContrastSlider = new BSlider( rect, "contrast", _("Contrast"),
                                      new BMessage( ADJUST_UPDATE ),
                                      0, 200, B_TRIANGLE_THUMB,
                                      B_FOLLOW_LEFT, B_WILL_DRAW );
     rect.OffsetBy( 0, 40 );
-    fHueSlider = new BSlider( rect, "hue", "Hue",
+    fHueSlider = new BSlider( rect, "hue", _("Hue"),
                                 new BMessage( ADJUST_UPDATE ),
                                 0, 360, B_TRIANGLE_THUMB,
                                 B_FOLLOW_LEFT, B_WILL_DRAW );
     rect.OffsetBy( 0, 40 );
-    fSaturationSlider = new BSlider( rect, "saturation", "Saturation",
+    fSaturationSlider = new BSlider( rect, "saturation", _("Saturation"),
                                        new BMessage( ADJUST_UPDATE ),
                                        0, 200, B_TRIANGLE_THUMB,
                                        B_FOLLOW_LEFT, B_WILL_DRAW );
@@ -346,22 +346,22 @@ PreferencesWindow::PreferencesWindow( intf_thread_t * p_interface,
     rect.InsetBy( 10, 10 );
     rect.top = rect.bottom - 25;
     rect.left = rect.right - 80;
-    button = new BButton( rect, NULL, "OK", new BMessage( PREFS_OK ) );
+    button = new BButton( rect, NULL, _("OK"), new BMessage( PREFS_OK ) );
     fPrefsView->AddChild( button );
 
        SetDefaultButton( button );
 
     rect.OffsetBy( -90, 0 );
-    button = new BButton( rect, NULL, "Cancel", new BMessage( PREFS_CANCEL ) );
+    button = new BButton( rect, NULL, _("Cancel"), new BMessage( PREFS_CANCEL ) );
     fPrefsView->AddChild( button );
 
     rect.OffsetBy( -90, 0 );
-    button = new BButton( rect, NULL, "Revert", new BMessage( PREFS_REVERT ) );
+    button = new BButton( rect, NULL, _("Revert"), new BMessage( PREFS_REVERT ) );
     fPrefsView->AddChild( button );
 
        rect.left = Bounds().left + 10.0;
        rect.right = rect.left + 80.0;
-    button = new BButton( rect, NULL, "Defaults", new BMessage( PREFS_DEFAULTS ) );
+    button = new BButton( rect, NULL, _("Defaults"), new BMessage( PREFS_DEFAULTS ) );
     fPrefsView->AddChild( button );
 
 
index af0e61162e18f8a3af1cfadcdd1753797131cf46..b65123be524362b7fff4cabad21798997520ea47 100644 (file)
@@ -2,7 +2,7 @@
  * vout_beos.cpp: beos video output display method
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: VideoOutput.cpp,v 1.16 2003/04/18 19:26:38 titer Exp $
+ * $Id: VideoOutput.cpp,v 1.17 2003/04/22 16:36:16 titer Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -1126,27 +1126,27 @@ VLCView::MouseDown(BPoint where)
                                BPopUpMenu *menu = new BPopUpMenu("context menu");
                                menu->SetRadioMode(false);
                                // Resize to 50%
-                               BMenuItem *halfItem = new BMenuItem("50%", new BMessage(RESIZE_50));
+                               BMenuItem *halfItem = new BMenuItem(_("50%"), new BMessage(RESIZE_50));
                                menu->AddItem(halfItem);
                                // Resize to 100%
-                               BMenuItem *origItem = new BMenuItem("100%", new BMessage(RESIZE_100));
+                               BMenuItem *origItem = new BMenuItem(_("100%"), new BMessage(RESIZE_100));
                                menu->AddItem(origItem);
                                // Resize to 200%
-                               BMenuItem *doubleItem = new BMenuItem("200%", new BMessage(RESIZE_200));
+                               BMenuItem *doubleItem = new BMenuItem(_("200%"), new BMessage(RESIZE_200));
                                menu->AddItem(doubleItem);
                                // Toggle FullScreen
-                               BMenuItem *zoomItem = new BMenuItem("Fullscreen", new BMessage(TOGGLE_FULL_SCREEN));
+                               BMenuItem *zoomItem = new BMenuItem(_("Fullscreen"), new BMessage(TOGGLE_FULL_SCREEN));
                                zoomItem->SetMarked(videoWindow->IsFullScreen());
                                menu->AddItem(zoomItem);
        
                                menu->AddSeparatorItem();
        
                                // Toggle vSync
-                               BMenuItem *vsyncItem = new BMenuItem("Vertical Sync", new BMessage(VERT_SYNC));
+                               BMenuItem *vsyncItem = new BMenuItem(_("Vertical Sync"), new BMessage(VERT_SYNC));
                                vsyncItem->SetMarked(videoWindow->IsSyncedToRetrace());
                                menu->AddItem(vsyncItem);
                                // Correct Aspect Ratio
-                               BMenuItem *aspectItem = new BMenuItem("Correct Aspect Ratio", new BMessage(ASPECT_CORRECT));
+                               BMenuItem *aspectItem = new BMenuItem(_("Correct Aspect Ratio"), new BMessage(ASPECT_CORRECT));
                                aspectItem->SetMarked(videoWindow->CorrectAspectRatio());
                                menu->AddItem(aspectItem);
        
@@ -1175,13 +1175,13 @@ VLCView::MouseDown(BPoint where)
                                bool onTop = videoWindow->Feel() == B_FLOATING_ALL_WINDOW_FEEL;
                                window_feel feel = onTop ? B_NORMAL_WINDOW_FEEL : B_FLOATING_ALL_WINDOW_FEEL;
                                windowFeelMsg->AddInt32( "WinFeel", (int32)feel );
-                               BMenuItem *windowFeelItem = new BMenuItem( "Stay On Top", windowFeelMsg );
+                               BMenuItem *windowFeelItem = new BMenuItem( _("Stay On Top"), windowFeelMsg );
                                windowFeelItem->SetMarked( onTop );
                                menu->AddItem( windowFeelItem );
 
                                menu->AddSeparatorItem();
 
-                               BMenuItem* screenShotItem = new BMenuItem( "Take Screen Shot",
+                               BMenuItem* screenShotItem = new BMenuItem( _("Take Screen Shot"),
                                                                                                                   new BMessage( SCREEN_SHOT ) );
                                menu->AddItem( screenShotItem );
 
index 723486aef4f3e6ee79b7bc94ee14035bf98b8f5b..73115e6935ba71343b31339e900a8204548b77b4 100644 (file)
@@ -2,7 +2,7 @@
  * VlcWrapper.cpp: BeOS plugin for vlc (derived from MacOS X port)
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: VlcWrapper.cpp,v 1.26 2003/02/09 17:10:52 stippi Exp $
+ * $Id: VlcWrapper.cpp,v 1.27 2003/04/22 16:36:16 titer Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -41,6 +41,13 @@ extern "C"
 #include "VlcWrapper.h"
 #include "MsgVals.h"
 
+const char * _AddEllipsis( char * string )
+{
+    BString newString( string );
+    newString << B_UTF8_ELLIPSIS;
+    return newString.String();
+}
+
 /* constructor */
 VlcWrapper::VlcWrapper( intf_thread_t *p_interface )
 {
@@ -174,7 +181,7 @@ BList * VlcWrapper::GetChannels( int i_cat )
         /* "None" */
         message = new BMessage( what );
         message->AddInt32( fieldName, -1 );
-        menuItem = new BMenuItem( "None", message );
+        menuItem = new BMenuItem( _("None"), message );
         if( !p_es )
             menuItem->SetMarked( true );
         list->AddItem( menuItem );
@@ -188,7 +195,7 @@ BList * VlcWrapper::GetChannels( int i_cat )
                 if( strlen( p_input->stream.pp_es[i]->psz_desc ) )
                     trackName = strdup( p_input->stream.pp_es[i]->psz_desc );
                 else
-                    trackName = "<unknown>";
+                    trackName = _("<unknown>");
                 menuItem = new BMenuItem( trackName, message );
                 if( p_input->stream.pp_es[i] == p_es )
                     menuItem->SetMarked( true );
index c41b6f6ec23cb58e1fc445cf1bec944718597f7d..48880af6b55c917d0561a8120aadc60162ba6f7a 100644 (file)
@@ -2,7 +2,7 @@
  * VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port)
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: VlcWrapper.h,v 1.20 2003/02/09 11:51:36 titer Exp $
+ * $Id: VlcWrapper.h,v 1.21 2003/04/22 16:36:16 titer Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -25,6 +25,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#include <String.h>
+
 #define SEEKSLIDER_RANGE 2048
 
 class InterfaceWindow;
@@ -49,6 +51,9 @@ struct intf_sys_t
     VlcWrapper *         p_wrapper;
 };
 
+/* Necessary because of i18n */
+const char * _AddEllipsis( char * string );
+
 /*****************************************************************************
  * VlcWrapper
  *****************************************************************************
index f96c6c57693315de550b8ea227acf2e7a21fbb3b..f56cc04812aaed872200d7b87a35bc3fb6eff2d0 100644 (file)
@@ -2,7 +2,7 @@
  * libvlc.c: main libvlc source
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.c,v 1.79 2003/04/18 15:25:51 titer Exp $
+ * $Id: libvlc.c,v 1.80 2003/04/22 16:36:16 titer Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -1058,6 +1058,12 @@ static void SetLanguage ( char const *psz_lang )
 
     /* Set the default domain */
     textdomain( PACKAGE );
+
+#ifdef SYS_BEOS
+    /* BeOS only support UTF8 strings */
+    bind_textdomain_codeset( PACKAGE, "UTF-8" );
+#endif
+
 #endif
 }