* ./toolbox: toolbox --update-po now automatically extracts strings from

    the Win32 interface.

modules/gui/win32/strings.cpp

+/* Automatically generated with 'toolbox --update-po' */
+
+
+/* from modules/gui/win32/about.dfm: */
+  Caption = _( "About" );
+    Caption = _( "VideoLAN Client" );
+    Caption = _( "(C) Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002" );
+    Caption = _(       "This is the VideoLAN Client, a DVD, MPEG and DivX player. It can"       " play MPEG and MPEG 2 files from a file or from a network source"       "." );
+    Caption = _( "The VideoLAN Team  <videolan@videolan.org>" );
+    Caption = _( "http://www.videolan.org/" );
+    Caption = _( "Version x.y.z" );
+    Caption = _( "OK" );
+
+/* from modules/gui/win32/disc.dfm: */
+  Caption = _( "Open disc" );
+    Caption = _( "Device &name:" );
+    Caption = _( "Starting position" );
+      Caption = _( "&Title:" );
+      Caption = _( "&Chapter:" );
+      Caption = _( "&Menus" );
+    Caption = _( "Disc type" );
+    Caption = _( "OK" );
+    Caption = _( "Cancel" );
+    Text = _( "F:\\" );
+
+/* from modules/gui/win32/mainframe.dfm: */
+  Caption = _( "VideoLAN Client (win32 interface)" );
+    Caption = _( "ToolBar" );
+      Caption = _( "ToolButtonSep1" );
+      Caption = _( "ToolButton1" );
+      Caption = _( "ToolButtonSep2" );
+      Caption = _( "File read" );
+      Caption = _( "Channel:" );
+      Caption = _( "No server!" );
+      Caption = _( "Go!" );
+      Caption = _( "Disc" );
+      Caption = _( "Title:" );
+      Caption = _( "Chapter:" );
+      Caption = _( "---" );
+      Caption = _( "---" );
+    Caption = _( "0:00:00" );
+      Caption = _( "&File" );
+        Caption = _( "Open &file..." );
+        Caption = _( "Open &disc..." );
+        Caption = _( "&Network stream..." );
+        Caption = _( "-" );
+      Caption = _( "&View" );
+        Caption = _( "&Hide interface" );
+        Hint = _( "Hide the main interface window" );
+        Caption = _( "-" );
+        Caption = _( "&Playlist..." );
+      Caption = _( "&Controls" );
+        Caption = _( "Audio device" );
+        Caption = _( "C&hannels" );
+        Hint = _( "Select audio channel" );
+        Caption = _( "-" );
+        Caption = _( "Sc&reen" );
+        Caption = _( "-" );
+        Caption = _( "&Program" );
+        Hint = _( "Select program" );
+        Caption = _( "&Title" );
+        Hint = _( "Select title" );
+        Caption = _( "&Chapter" );
+        Hint = _( "Select chapter" );
+        Caption = _( "&Angle" );
+        Hint = _( "Select angle" );
+        Caption = _( "&Language" );
+        Hint = _( "Select audio language" );
+        Caption = _( "&Subtitles" );
+        Hint = _( "Select subtitles language" );
+      Caption = _( "&Help" );
+      Caption = _( "Close this popup" );
+      Caption = _( "Show interface" );
+      Caption = _( "-" );
+      Caption = _( "Control" );
+        Caption = _( "-" );
+        Caption = _( "&Jump..." );
+        Caption = _( "-" );
+      Caption = _( "Audio settings" );
+        Caption = _( "Device" );
+        Caption = _( "Channels" );
+      Caption = _( "Screen" );
+      Caption = _( "-" );
+      Caption = _( "Navigation" );
+      Caption = _( "Program" );
+      Caption = _( "Language" );
+      Caption = _( "Subtitles" );
+      Caption = _( "-" );
+      Caption = _( "Playlist..." );
+      Caption = _( "New stream" );
+        Caption = _( "Open file..." );
+        Caption = _( "Open disc..." );
+        Caption = _( "Network stream..." );
+      Caption = _( "-" );
+      Caption = _( "File" );
+      Hint = _( "Open a file" );
+      Caption = _( "Disc" );
+      Hint = _( "Open a DVD or VCD" );
+      Caption = _( "Net" );
+      Hint = _( "Open a network stream" );
+      Caption = _( "Back" );
+      Caption = _( "Play" );
+      Hint = _( "Play stream" );
+      Caption = _( "Pause" );
+      Hint = _( "Pause stream" );
+      Caption = _( "Stop" );
+      Hint = _( "Stop stream" );
+      Caption = _( "Eject" );
+      Hint = _( "Eject disc" );
+      Caption = _( "Slow" );
+      Hint = _( "Play slower" );
+      Caption = _( "Fast" );
+      Hint = _( "Play faster" );
+      Caption = _( "Prev" );
+      Hint = _( "Previous file" );
+      Caption = _( "Next" );
+      Hint = _( "Next file" );
+      Caption = _( "Playlist" );
+      Hint = _( "Open the playlist window" );
+      Caption = _( "Exit" );
+      Hint = _( "Exit the program" );
+      Caption = _( "&Fullscreen" );
+      Hint = _( "Toggle fullscreen" );
+      Caption = _( "Preferences..." );
+      Hint = _( "Configure the application" );
+      Caption = _( "Messages..." );
+      Hint = _( "Open the messages window" );
+      Caption = _( "About..." );
+      Hint = _( "About this application" );
+      Caption = _( "Prev" );
+      Hint = _( "Jump to previous title" );
+      Caption = _( "Next" );
+      Hint = _( "Jump to next title" );
+      Caption = _( "Prev" );
+      Hint = _( "Jump to previous chapter" );
+      Caption = _( "Next" );
+      Hint = _( "Jump to next chapter" );
+      Caption = _( "Volume &Up" );
+      Hint = _( "Increase the volume" );
+      Caption = _( "Volume &Down" );
+      Hint = _( "Decrease the volume" );
+      Caption = _( "&Mute" );
+      Hint = _( "Toggle mute" );
+
+/* from modules/gui/win32/messages.dfm: */
+  Caption = _( "Messages" );
+    Caption = _( "OK" );
+
+/* from modules/gui/win32/network.dfm: */
+  Caption = _( "Open network" );
+    Caption = _( "Network mode" );
+      Caption = _( "Port:" );
+      Caption = _( "Port:" );
+      Caption = _( "Port:" );
+      Caption = _( "Address:" );
+      Caption = _( "Address:" );
+      Caption = _( "URL:" );
+      Caption = _( "UDP/RTP" );
+      Caption = _( "UDP/RTP Multicast" );
+      Caption = _( "Channel Server" );
+      Caption = _( "HTTP/FTP/MMS" );
+      Text = _( "vlcs" );
+
+/* from modules/gui/win32/playlist.dfm: */
+  Caption = _( "Playlist" );
+    Caption = _( "OK" );
+        Caption = _( "Filename" );
+        Caption = _( "Duration" );
+      Caption = _( "&Add" );
+        Caption = _( "&File..." );
+        Caption = _( "&Disc..." );
+        Caption = _( "&Network..." );
+        Caption = _( "&Url" );
+      Caption = _( "&Delete" );
+        Caption = _( "&Selection" );
+      Caption = _( "&Selection" );
+      Caption = _( "-" );
+      Caption = _( "&Invert selection" );
+      Caption = _( "&Crop selection" );
+      Caption = _( "-" );
+      Caption = _( "&Delete selection" );
+      Caption = _( "Delete &all" );
+      Caption = _( "Invert" );
+      Hint = _( "Invert selection" );
+      Caption = _( "Crop" );
+      Hint = _( "Crop selection" );
+      Caption = _( "Delete" );
+      Hint = _( "Delete selection" );
+      Caption = _( "All" );
+      Hint = _( "Delete all items" );
+      Caption = _( "Play" );
+      Hint = _( "Play the selected stream" );
+
+/* from modules/gui/win32/preferences.dfm: */
+  Caption = _( "Preferences" );
+    Caption = _( "Apply" );
+    Caption = _( "Save" );
+    Caption = _( "OK" );
+    Caption = _( "Cancel" );

po/POTFILES.in

@@ -113,6 +113,7 @@ modules/gui/qnx/qnx.c
 modules/gui/qt/qt.cpp
 modules/gui/win32/misc.cpp
 modules/gui/win32/win32.cpp
+modules/gui/win32/strings.cpp
 
 # misc plugins
 modules/misc/dummy/dummy.c

toolbox

 #! /bin/sh
 
 ##  toolbox for vlc, the VideoLAN Client
-##  $Id: toolbox,v 1.1 2002/12/25 22:36:14 sam Exp $
+##  $Id: toolbox,v 1.2 2003/01/13 15:20:24 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -270,10 +270,20 @@ fi
 ##
 if test "$do_po" = "yes"
 then
+  # create a fake file containing win32 strings
+  rm -f modules/gui/win32/strings.cpp
+  printf "/* Automatically generated by 'toolbox --update-po', please don't compile */\n" > modules/gui/win32/strings.cpp
+  find modules/gui/win32 -name '*.dfm' | while read file
+  do
+    printf "\n/* from $file: */\n" >> modules/gui/win32/strings.cpp
+    perl -ne 'chop; chop; if( $_ =~ / (Caption|Text|Hint) / || $buffer =~ /[+=] *$/ ) { $buffer =~ s/\+ *$//; $buffer .= $_; } if( $buffer =~ /'"'"' *$/) { $buffer =~ s/'"'"'/"/g; $buffer =~ s/\\/\\\\/g; $buffer =~ s/=/= _(/; print $buffer." );\n"; $buffer = "";}' < $file >> modules/gui/win32/strings.cpp || exit 1
+  done
+  # clean old potfiles
   cd po
   rm -f vlc.pot
-  make vlc.pot
-  make update-po
+  # update
+  make vlc.pot || exit 1
+  make update-po || exit 1
   cd ..
 
   exit 0