* ./po/no.po: Norwegian translation by Sigmund Augdal. Berd� ka p� t�t.

  * ./src/misc/modules.c: shortcuts for --intf work again, gvlc launches the
    Gtk interface, qvlc launches the Qt interface, etc.
  * ./plugins/fx/scope.c: we now have sound together with --aout scope.

diff --git a/AUTHORS b/AUTHORS
index 031a541e83daa76cddfea7003415e1ff46674256..527d5da1611b0ad1c9e3c589ecffe201140fe59d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ D: communication with channel server
 N: Sigmund Augdal
 E: sigmunau@idi.ntnu.no
 D: lirc plugin
+D: norwegian translation
 
 N: Pierre Baillet
 E: oct@zoy.org

diff --git a/configure b/configure
index ec8a6f8c154f19a44d37d1354db29de04d6127a6..8e4e8c4cbbdb8c8e839a46eede292459db5b882f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1163,7 +1163,7 @@ fi
 fi
 
 
-ALL_LINGUAS="de fr ru"
+ALL_LINGUAS="de fr no ru"
 
 cat >> confdefs.h <<EOF
 #define PACKAGE "vlc"

diff --git a/configure.in b/configure.in
index a2e3afd02978795d4be07611541c7ed70d2b8e72..72d8048344c4aed927949a60228fa6a2d286fa85 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,7 +34,7 @@ dnl Find the right ranlib, even when cross-compiling
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 dnl Gettext stuff
-ALL_LINGUAS="de fr ru"
+ALL_LINGUAS="de fr no ru"
 
 AC_DEFINE_UNQUOTED(PACKAGE, "vlc")
 AC_DEFINE_UNQUOTED(VERSION, "$VLC_VERSION")

diff --git a/plugins/fx/scope.c b/plugins/fx/scope.c
index e9dbf10d8b5efc843c6f725dfff10021afa017d5..ecbc1a85e19ee3d5f5dcf84412616048c3467dba 100644 (file)
--- a/plugins/fx/scope.c
+++ b/plugins/fx/scope.c
@@ -2,7 +2,7 @@
  * scope.c : Scope effect module
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: scope.c,v 1.2 2002/02/27 22:57:10 sam Exp $
+ * $Id: scope.c,v 1.3 2002/03/01 16:07:00 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -35,8 +35,8 @@
 
 #include "audio_output.h"                                   /* aout_thread_t */
 
-#define SCOPE_WIDTH 640
-#define SCOPE_HEIGHT 200
+#define SCOPE_WIDTH 320
+#define SCOPE_HEIGHT 240
 #define SCOPE_ASPECT (VOUT_ASPECT_FACTOR*SCOPE_WIDTH/SCOPE_HEIGHT)
 
 /*****************************************************************************
@@ -111,13 +111,37 @@ static int aout_Open( aout_thread_t *p_aout )
     if( p_aout->p_sys == NULL )
     {
         intf_ErrMsg("error: %s", strerror(ENOMEM) );
-        return( 1 );
+        return -1;
     }
 
+    /* Open video output */
     p_aout->p_sys->p_vout =
         vout_CreateThread( NULL, SCOPE_WIDTH, SCOPE_HEIGHT,
                            FOURCC_I420, SCOPE_ASPECT );
 
+    /* Open audio output  */
+    p_aout->p_sys->aout.i_format   = p_aout->i_format;
+    p_aout->p_sys->aout.i_rate     = p_aout->i_rate;
+    p_aout->p_sys->aout.i_channels = p_aout->i_channels;
+
+    p_aout->p_sys->aout.p_module = module_Need( MODULE_CAPABILITY_AOUT, "",
+                                    (void *)&p_aout->p_sys->aout );
+    if( p_aout->p_sys->aout.p_module == NULL )
+    {
+        intf_ErrMsg( "aout error: no suitable aout module" );
+        vout_DestroyThread( p_aout->p_sys->p_vout, NULL );
+        free( p_aout->p_sys );
+        return -1;
+    }
+
+#define aout_functions p_aout->p_sys->aout.p_module->p_functions->aout.functions.aout
+    p_aout->p_sys->aout.pf_open       = aout_functions.pf_open;
+    p_aout->p_sys->aout.pf_setformat  = aout_functions.pf_setformat;
+    p_aout->p_sys->aout.pf_getbufinfo = aout_functions.pf_getbufinfo;
+    p_aout->p_sys->aout.pf_play       = aout_functions.pf_play;
+    p_aout->p_sys->aout.pf_close      = aout_functions.pf_close;
+#undef aout_functions
+    
     return( 0 );
 }
 
@@ -126,15 +150,35 @@ static int aout_Open( aout_thread_t *p_aout )
  *****************************************************************************/
 static int aout_SetFormat( aout_thread_t *p_aout )
 {
-    /* Force the output method */
-    p_aout->i_format = AOUT_FMT_U16_LE;
-    p_aout->i_channels = 2;
+    int i_ret;
 
+    /* Force the output method */
     p_aout->p_sys->aout.i_format = p_aout->i_format;
     p_aout->p_sys->aout.i_channels = p_aout->i_channels;
     p_aout->p_sys->aout.i_rate = p_aout->i_rate;
 
-    return( 0 );
+    /*
+     * Initialize audio device
+     */
+    i_ret = p_aout->p_sys->aout.pf_setformat( &p_aout->p_sys->aout );
+
+    if( i_ret )
+    {
+        return i_ret;
+    }
+
+    if( p_aout->p_sys->aout.i_format != p_aout->i_format
+         || p_aout->p_sys->aout.i_channels != p_aout->i_channels )
+    {
+        intf_ErrMsg( "aout error: plugin isn't cooperative" );
+        return 0;
+    }
+
+    p_aout->i_channels = p_aout->p_sys->aout.i_channels;
+    p_aout->i_format = p_aout->p_sys->aout.i_format;
+    p_aout->i_rate = p_aout->p_sys->aout.i_rate;
+
+    return 0;
 }
 
 /*****************************************************************************
@@ -142,8 +186,8 @@ static int aout_SetFormat( aout_thread_t *p_aout )
  *****************************************************************************/
 static int aout_GetBufInfo( aout_thread_t *p_aout, int i_buffer_limit )
 {
-    /* arbitrary value that should be changed */
-    return( i_buffer_limit );
+    return p_aout->p_sys->aout.pf_getbufinfo( &p_aout->p_sys->aout,
+                                              i_buffer_limit );
 }
 
 /*****************************************************************************
@@ -154,67 +198,87 @@ static int aout_GetBufInfo( aout_thread_t *p_aout, int i_buffer_limit )
 static void aout_Play( aout_thread_t *p_aout, byte_t *p_buffer, int i_size )
 {
     picture_t *p_outpic;
-    int i_index;
-    u8 *p_pixel;
+    int i_index, i_image;
+    u8  *ppp_area[2][3];
     u16 *p_sample;
 
-    /* This is a new frame. Get a structure from the video_output. */
-    while( ( p_outpic = vout_CreatePicture( p_aout->p_sys->p_vout, 0, 0, 0 ) )
-              == NULL )
+    /* Play the real sound */
+    p_aout->p_sys->aout.pf_play( &p_aout->p_sys->aout, p_buffer, i_size );
+
+    for( i_image = 0; (i_image + 1) * SCOPE_WIDTH * 8 < i_size ; i_image++ )
     {
-        if( p_aout->b_die )
+        /* Don't stay here forever */
+        if( mdate() >= p_aout->date - 10000 )
         {
-            return;
+            break;
         }
-        msleep( VOUT_OUTMEM_SLEEP );
-    }
-
-    /* Blank the picture */
-    for( i_index = 0 ; i_index < p_outpic->i_planes ; i_index++ )
-    {
-        memset( p_outpic->p[i_index].p_pixels, i_index ? 0x80 : 0x00,
-                p_outpic->p[i_index].i_lines * p_outpic->p[i_index].i_pitch );
-    }
 
-    /* Left channel */
-    for( i_index = 0, p_sample = (u16*)p_buffer;
-         i_index < SCOPE_WIDTH && i_index < i_size / 2;
-         i_index++ )
-    {
-        int i;
-        u8 i_value = *p_sample / 256;
+        /* This is a new frame. Get a structure from the video_output. */
+        while( ( p_outpic = vout_CreatePicture( p_aout->p_sys->p_vout, 0, 0, 0 ) )
+                  == NULL )
+        {
+            if( p_aout->b_die )
+            {
+                return;
+            }
+            msleep( VOUT_OUTMEM_SLEEP );
+        }
 
-        for( i = 0 ; i < 8 ; i++ )
+        /* Blank the picture */
+        for( i_index = 0 ; i_index < p_outpic->i_planes ; i_index++ )
         {
-            p_pixel = p_outpic->p[0].p_pixels + (p_outpic->p[0].i_pitch * i_index) / SCOPE_WIDTH + p_outpic->p[0].i_lines * (u8)(i_value+128) / 512 * p_outpic->p[0].i_pitch;
-            *p_pixel = 0x9f;
-            p_pixel = p_outpic->p[1].p_pixels + (p_outpic->p[1].i_pitch * i_index) / SCOPE_WIDTH + p_outpic->p[1].i_lines * (u8)(i_value+128) / 512 * p_outpic->p[1].i_pitch;
-            *p_pixel = 0x00;
-            p_sample += 2;
+            memset( p_outpic->p[i_index].p_pixels, i_index ? 0x80 : 0x00,
+                    p_outpic->p[i_index].i_lines * p_outpic->p[i_index].i_pitch );
         }
-    }
 
-    /* Right channel */
-    for( i_index = 0, p_sample = (u16*)p_buffer + 1;
-         i_index < SCOPE_WIDTH && i_index < i_size / 2;
-         i_index++ )
-    {
-        int i;
-        u8 i_value = *p_sample / 256;
+        /* We only support 2 channels for now */
+        for( i_index = 0 ; i_index < 2 ; i_index++ )
+        {
+           ppp_area[i_index][0] = p_outpic->p[0].p_pixels + i_index * p_outpic->p[0].i_lines / p_aout->i_channels * p_outpic->p[0].i_pitch;
+           ppp_area[i_index][1] = p_outpic->p[1].p_pixels + i_index * p_outpic->p[1].i_lines / p_aout->i_channels * p_outpic->p[1].i_pitch;
+           ppp_area[i_index][2] = p_outpic->p[2].p_pixels + i_index * p_outpic->p[2].i_lines / p_aout->i_channels * p_outpic->p[2].i_pitch;
+        }
 
-        for( i = 0 ; i < 8 ; i++ )
+        for( i_index = 0, p_sample = (u16*)p_buffer;
+             i_index < SCOPE_WIDTH;
+             i_index++ )
         {
-            p_pixel = p_outpic->p[0].p_pixels + (p_outpic->p[0].i_pitch * i_index) / SCOPE_WIDTH + (p_outpic->p[0].i_lines * (u8)(i_value+128) / 512 + p_outpic->p[0].i_lines / 2) * p_outpic->p[0].i_pitch;
-            *p_pixel = 0x7f;
-            p_pixel = p_outpic->p[2].p_pixels + (p_outpic->p[2].i_pitch * i_index) / SCOPE_WIDTH + (p_outpic->p[2].i_lines * (u8)(i_value+128) / 512 + p_outpic->p[2].i_lines / 2) * p_outpic->p[2].i_pitch;
-            *p_pixel = 0xdd;
-            p_sample += 2;
+            int i;
+            u8 i_value;
+
+            for( i = 0 ; i < 2 ; i++ )
+            {
+                /* Left channel */
+                i_value = *p_sample++ / 256 + 128;
+                *(ppp_area[0][0]
+                   + p_outpic->p[0].i_pitch * i_index / SCOPE_WIDTH
+                   + p_outpic->p[0].i_lines * i_value / 512
+                       * p_outpic->p[0].i_pitch) = 0xbf;
+                *(ppp_area[0][1]
+                   + p_outpic->p[1].i_pitch * i_index / SCOPE_WIDTH
+                   + p_outpic->p[1].i_lines * i_value / 512
+                      * p_outpic->p[1].i_pitch) = 0xff;
+
+                /* Right channel */
+                i_value = *p_sample++ / 256 + 128;
+                *(ppp_area[1][0]
+                   + p_outpic->p[0].i_pitch * i_index / SCOPE_WIDTH
+                   + p_outpic->p[0].i_lines * i_value / 512
+                      * p_outpic->p[0].i_pitch) = 0x9f;
+                *(ppp_area[1][2]
+                   + p_outpic->p[2].i_pitch * i_index / SCOPE_WIDTH
+                   + p_outpic->p[2].i_lines * i_value / 512
+                      * p_outpic->p[2].i_pitch) = 0xdd;
+            }
         }
-    }
 
-    /* Display the picture */
-    vout_DatePicture( p_aout->p_sys->p_vout, p_outpic, p_aout->date );
-    vout_DisplayPicture( p_aout->p_sys->p_vout, p_outpic );
+        /* Display the picture - FIXME: find a better date :-) */
+        vout_DatePicture( p_aout->p_sys->p_vout, p_outpic,
+                          p_aout->date + i_image * 10000 );
+        vout_DisplayPicture( p_aout->p_sys->p_vout, p_outpic );
+
+        p_buffer += SCOPE_WIDTH * 4;
+    }
 }
 
 /*****************************************************************************
@@ -222,6 +286,8 @@ static void aout_Play( aout_thread_t *p_aout, byte_t *p_buffer, int i_size )
  *****************************************************************************/
 static void aout_Close( aout_thread_t *p_aout )
 {
+    p_aout->p_sys->aout.pf_close( &p_aout->p_sys->aout );
+    module_Unneed( p_aout->p_sys->aout.p_module );
     vout_DestroyThread( p_aout->p_sys->p_vout, NULL );
     free( p_aout->p_sys );
 }

diff --git a/plugins/kde/kde.cpp b/plugins/kde/kde.cpp
index 9daf9dd0b703e82f0d4d7acdc7e9e8cef6d4a71f..52a8da9fc434107c98a3ca95d646b7726e7dce32 100644 (file)
--- a/plugins/kde/kde.cpp
+++ b/plugins/kde/kde.cpp
@@ -2,7 +2,7 @@
  * kde.cpp : KDE plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: kde.cpp,v 1.7 2002/02/24 20:51:10 gbazin Exp $
+ * $Id: kde.cpp,v 1.8 2002/03/01 16:07:00 sam Exp $
  *
  * Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
  *
@@ -53,6 +53,7 @@ MODULE_CONFIG_STOP
 MODULE_INIT_START
     SET_DESCRIPTION( "KDE interface module" )
     ADD_CAPABILITY( INTF, 80 )
+    ADD_SHORTCUT( "kde" )
     ADD_PROGRAM( "kvlc" )
 MODULE_INIT_STOP
 

diff --git a/plugins/qt/qt.cpp b/plugins/qt/qt.cpp
index fba7d5be3c41a415371c2250b3f9d136f57de18b..12532b6bb3374952a327a59a8c80a40b4c2516bc 100644 (file)
--- a/plugins/qt/qt.cpp
+++ b/plugins/qt/qt.cpp
@@ -2,7 +2,7 @@
  * qt.cpp : Qt plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: qt.cpp,v 1.7 2002/02/24 20:51:10 gbazin Exp $
+ * $Id: qt.cpp,v 1.8 2002/03/01 16:07:00 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -46,6 +46,7 @@ MODULE_INIT_START
     SET_DESCRIPTION( "Qt interface module" )
     ADD_CAPABILITY( INTF, 80 )
     ADD_PROGRAM( "qvlc" )
+    ADD_SHORTCUT( "qt" )
 MODULE_INIT_STOP
 
 MODULE_ACTIVATE_START

diff --git a/po/no.po b/po/no.po
new file mode 100644 (file)
index 0000000..ee68725
--- /dev/null
+++ b/po/no.po
@@ -0,0 +1,977 @@
+# Norwegian locale definition for vlc
+# Copyright (C) 2002 Sigmund Augdal <sigmunau@idi.ntnu.no>.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: vlc-cvs\n"
+"POT-Creation-Date: 2001-12-10 13:26+0100\n"
+"PO-Revision-Date: 2002-28-02 23.35+0100\n"
+"Last-Translator: Sigmund Augdal <sigmunau@idi.ntnu.no>.\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: plugins/gtk/gnome_interface.c:23 plugins/gtk/gnome_interface.c:747
+#: plugins/gtk/gtk_interface.c:152 plugins/gtk/gtk_interface.c:1096
+msgid "_Open File..."
+msgstr "_Åpne fil..."
+
+#: plugins/gtk/gnome_interface.c:24 plugins/gtk/gnome_interface.c:339
+#: plugins/gtk/gnome_interface.c:748 plugins/gtk/gtk_interface.c:160
+#: plugins/gtk/gtk_interface.c:453 plugins/gtk/gtk_interface.c:1104
+msgid "Open a File"
+msgstr "Åpne en fil"
+
+#: plugins/gtk/gnome_interface.c:30 plugins/gtk/gnome_interface.c:754
+#: plugins/gtk/gtk_interface.c:167 plugins/gtk/gtk_interface.c:1108
+msgid "Open _Disc..."
+msgstr "Åpne en _disk"
+
+#: plugins/gtk/gnome_interface.c:31 plugins/gtk/gnome_interface.c:351
+#: plugins/gtk/gnome_interface.c:755 plugins/gtk/gtk_interface.c:175
+#: plugins/gtk/gtk_interface.c:464 plugins/gtk/gtk_interface.c:1116
+msgid "Open a DVD or VCD"
+msgstr "Åpne en DVD eller VCD"
+
+#: plugins/gtk/gnome_interface.c:37 plugins/gtk/gnome_interface.c:761
+#: plugins/gtk/gtk_interface.c:182 plugins/gtk/gtk_interface.c:1120
+msgid "_Network Stream..."
+msgstr "_Nettverksstrøm"
+
+#: plugins/gtk/gnome_interface.c:38 plugins/gtk/gnome_interface.c:363
+#: plugins/gtk/gnome_interface.c:762 plugins/gtk/gtk_interface.c:190
+#: plugins/gtk/gtk_interface.c:475 plugins/gtk/gtk_interface.c:1128
+msgid "Select a Network Stream"
+msgstr "Velg en nettverksstrøm"
+
+#: plugins/gtk/gnome_interface.c:51 plugins/gtk/gtk_interface.c:238
+msgid "_Hide interface"
+msgstr "_Gjem grensesnitt"
+
+#: plugins/gtk/gnome_interface.c:58 plugins/gtk/gnome_interface.c:825
+#: plugins/gtk/gtk_interface.c:250 plugins/gtk/gtk_interface.c:986
+msgid "_Fullscreen"
+msgstr "_Fullskjerm"
+
+#: plugins/gtk/gnome_interface.c:66 plugins/gtk/gtk_interface.c:269
+msgid "_Title"
+msgstr "_Tittel"
+
+#: plugins/gtk/gnome_interface.c:67
+msgid "Choose title"
+msgstr "Velg tittel"
+
+#: plugins/gtk/gnome_interface.c:73 plugins/gtk/gtk_interface.c:282
+msgid "_Chapter"
+msgstr "_Kapittel"
+
+#: plugins/gtk/gnome_interface.c:74
+msgid "Choose chapter"
+msgstr "Velg Kapittel"
+
+#: plugins/gtk/gnome_interface.c:80 plugins/gtk/gnome_interface.c:861
+#: plugins/gtk/gtk_interface.c:294 plugins/gtk/gtk_interface.c:1042
+msgid "An_gle"
+msgstr "_Vinkel"
+
+#: plugins/gtk/gnome_interface.c:81
+msgid "Choose angle"
+msgstr "Velg vinkel"
+
+#: plugins/gtk/gnome_interface.c:88 plugins/gtk/gtk_interface.c:314
+msgid "_Playlist..."
+msgstr "_Spilleliste"
+
+#: plugins/gtk/gnome_interface.c:89 plugins/gtk/gtk_interface.c:322
+msgid "Open the playlist window"
+msgstr "Åpne spilleliste-vinduet"
+
+#: plugins/gtk/gnome_interface.c:95 plugins/gtk/gtk_interface.c:326
+msgid "_Modules..."
+msgstr "_Moduler"
+
+#: plugins/gtk/gnome_interface.c:96 plugins/gtk/gtk_interface.c:335
+msgid "Open the plugin manager"
+msgstr "Åpne plugin håndterer"
+
+#: plugins/gtk/gnome_interface.c:107 plugins/gtk/gnome_interface.c:868
+#: plugins/gtk/gtk_interface.c:1054
+msgid "_Audio"
+msgstr "_Lyd"
+
+#: plugins/gtk/gnome_interface.c:108 plugins/gtk/gnome_interface.c:869
+msgid "Select audio channel"
+msgstr "Velg lydkanal"
+
+#: plugins/gtk/gnome_interface.c:114 plugins/gtk/gnome_interface.c:875
+#: plugins/gtk/gtk_interface.c:370 plugins/gtk/gtk_interface.c:1066
+msgid "_Subtitles"
+msgstr "_Teksting"
+
+#: plugins/gtk/gnome_interface.c:115
+msgid "Select subtitle unit"
+msgstr "Velg teksting enhet"
+
+#: plugins/gtk/gnome_interface.c:189 plugins/gtk/gtk_interface.c:108
+#: plugins/gtk/gtk_interface.c:1278
+msgid "VideoLAN Client"
+msgstr "VideoLAN Client"
+
+#: plugins/gtk/gnome_interface.c:338 plugins/gtk/gnome_interface.c:1658
+#: plugins/gtk/gnome_interface.c:2230 plugins/gtk/gtk_interface.c:452
+#: plugins/gtk/gtk_interface.c:2060 plugins/gtk/gtk_interface.c:2177
+#: plugins/gtk/gtk_interface.c:2437
+msgid "File"
+msgstr "Fil"
+
+#: plugins/gtk/gnome_interface.c:350 plugins/gtk/gnome_interface.c:529
+#: plugins/gtk/gnome_interface.c:1651 plugins/gtk/gnome_interface.c:2297
+#: plugins/gtk/gtk_interface.c:463 plugins/gtk/gtk_interface.c:628
+#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2530
+msgid "Disc"
+msgstr "Disk"
+
+#: plugins/gtk/gnome_interface.c:362 plugins/gtk/gtk_interface.c:474
+msgid "Net"
+msgstr "Nett"
+
+#: plugins/gtk/gnome_interface.c:376 plugins/gtk/gnome_interface.c:796
+#: plugins/gtk/gtk_interface.c:487 plugins/gtk/gtk_interface.c:941
+msgid "Back"
+msgstr "Tilbake"
+
+#: plugins/gtk/gnome_interface.c:377 plugins/gtk/gtk_interface.c:488
+msgid "Go Backwards"
+msgstr "Gå tilbake"
+
+#: plugins/gtk/gnome_interface.c:389 plugins/gtk/gnome_interface.c:789
+#: plugins/gtk/gtk_interface.c:499 plugins/gtk/gtk_interface.c:934
+msgid "Stop"
+msgstr "Stopp"
+
+#: plugins/gtk/gnome_interface.c:390 plugins/gtk/gtk_interface.c:500
+msgid "Stop Stream"
+msgstr "Stopp strøm"
+
+#: plugins/gtk/gnome_interface.c:401 plugins/gtk/gnome_interface.c:775
+#: plugins/gtk/gtk_interface.c:510
+msgid "Play"
+msgstr "Spill"
+
+#: plugins/gtk/gnome_interface.c:402 plugins/gtk/gtk_interface.c:511
+msgid "Play Stream"
+msgstr "Spill strøm"
+
+#: plugins/gtk/gnome_interface.c:413 plugins/gtk/gnome_interface.c:782
+#: plugins/gtk/gtk_interface.c:521 plugins/gtk/gtk_interface.c:926
+msgid "Pause"
+msgstr "Pause"
+
+#: plugins/gtk/gnome_interface.c:414 plugins/gtk/gtk_interface.c:522
+msgid "Pause Stream"
+msgstr "Pause strøm"
+
+#: plugins/gtk/gnome_interface.c:426 plugins/gtk/gnome_interface.c:803
+#: plugins/gtk/gtk_interface.c:533 plugins/gtk/gtk_interface.c:949
+msgid "Slow"
+msgstr "Sakte"
+
+#: plugins/gtk/gnome_interface.c:427 plugins/gtk/gtk_interface.c:534
+msgid "Play Slower"
+msgstr "Spill saktere"
+
+#: plugins/gtk/gnome_interface.c:439 plugins/gtk/gnome_interface.c:810
+#: plugins/gtk/gtk_interface.c:545 plugins/gtk/gtk_interface.c:957
+msgid "Fast"
+msgstr "Fort"
+
+#: plugins/gtk/gnome_interface.c:440 plugins/gtk/gtk_interface.c:546
+msgid "Play Faster"
+msgstr "Spill fortere"
+
+#: plugins/gtk/gnome_interface.c:454 plugins/gtk/gnome_interface.c:1768
+#: plugins/gtk/gnome_interface.c:1792 plugins/gtk/gnome_interface.c:2866
+#: plugins/gtk/gtk_interface.c:559 plugins/gtk/gtk_interface.c:2024
+#: plugins/gtk/gtk_interface.c:3114
+msgid "Playlist"
+msgstr "Spilleliste"
+
+#: plugins/gtk/gnome_interface.c:455 plugins/gtk/gtk_interface.c:560
+msgid "Open Playlist"
+msgstr "Åpne Spilleliste"
+
+#: plugins/gtk/gnome_interface.c:466 plugins/gtk/gnome_interface.c:840
+#: plugins/gtk/gtk_interface.c:570 plugins/gtk/gtk_interface.c:656
+#: plugins/gtk/gtk_interface.c:700 plugins/gtk/gtk_interface.c:1010
+msgid "Prev"
+msgstr "Forrige"
+
+#: plugins/gtk/gnome_interface.c:467 plugins/gtk/gtk_interface.c:571
+msgid "Previous File"
+msgstr "Forrige fil"
+
+#: plugins/gtk/gnome_interface.c:478 plugins/gtk/gnome_interface.c:833
+#: plugins/gtk/gtk_interface.c:581 plugins/gtk/gtk_interface.c:664
+#: plugins/gtk/gtk_interface.c:708 plugins/gtk/gtk_interface.c:1003
+msgid "Next"
+msgstr "Neste"
+
+#: plugins/gtk/gnome_interface.c:479 plugins/gtk/gtk_interface.c:582
+msgid "Next File"
+msgstr "Neste fil"
+
+#: plugins/gtk/gnome_interface.c:493 plugins/gtk/gtk_interface.c:589
+msgid "-:--:--"
+msgstr "-:--:--"
+
+#: plugins/gtk/gnome_interface.c:543
+msgid "Title:"
+msgstr "Tittel:"
+
+#: plugins/gtk/gnome_interface.c:550 plugins/gtk/gtk_interface.c:649
+msgid "--"
+msgstr "--"
+
+#: plugins/gtk/gnome_interface.c:563
+msgid "Select previous title"
+msgstr "Velg forrige tittel"
+
+#: plugins/gtk/gnome_interface.c:588
+msgid "Chapter:"
+msgstr "Kapittel:"
+
+#: plugins/gtk/gnome_interface.c:595 plugins/gtk/gtk_interface.c:693
+msgid "---"
+msgstr "---"
+
+#: plugins/gtk/gnome_interface.c:608
+msgid "Select previous chapter"
+msgstr "Velg forrige kapittel"
+
+#: plugins/gtk/gnome_interface.c:617
+msgid "Select next chapter"
+msgstr "Velg neste Kapittel"
+
+#: plugins/gtk/gnome_interface.c:626
+msgid "No server"
+msgstr "Ingen tjener"
+
+#: plugins/gtk/gnome_interface.c:640
+msgid "Network Channel:"
+msgstr "Nettverkskanal:"
+
+#: plugins/gtk/gnome_interface.c:655 plugins/gtk/gtk_interface.c:752
+msgid "Go!"
+msgstr "Gå!"
+
+#: plugins/gtk/gnome_interface.c:818 plugins/gtk/gtk_interface.c:975
+msgid "Toggle _Interface"
+msgstr "Grensesnitt"
+
+#: plugins/gtk/gnome_interface.c:826
+msgid "Toggle fullscreen mode"
+msgstr "Fullskjerm"
+
+#: plugins/gtk/gnome_interface.c:847 plugins/gtk/gtk_interface.c:1019
+msgid "_Jump..."
+msgstr "_Hopp..."
+
+#: plugins/gtk/gnome_interface.c:848
+msgid "Got directly so specified point"
+msgstr "Fikk direkte så spesifisert punkt"
+
+#: plugins/gtk/gnome_interface.c:854 plugins/gtk/gtk_interface.c:1030
+msgid "_Navigation"
+msgstr "_Navigasjon"
+
+#: plugins/gtk/gnome_interface.c:855
+msgid "Navigate through titles and chapters"
+msgstr "Navigere gjennom tittler og kapittler"
+
+#: plugins/gtk/gnome_interface.c:876
+msgid "Select subtitle channel"
+msgstr "Velg teksting kanal"
+
+#: plugins/gtk/gnome_interface.c:884 plugins/gtk/gtk_interface.c:1149
+msgid "Playlist..."
+msgstr "Spilleliste..."
+
+#: plugins/gtk/gnome_interface.c:1081 plugins/gtk/gtk_interface.c:1286
+msgid "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team"
+msgstr "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team"
+
+#: plugins/gtk/gnome_interface.c:1083 plugins/gtk/gtk_interface.c:1312
+msgid ""
+"This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and "
+"MPEG 2 files from a file or from a network source."
+msgstr ""
+"Dette er VideoLAN client, en DVD og MPEG spiller. Den kan spille MPEG og "
+"MPEG 2 filer fra en fil eller en nettverkskilde"
+
+#: plugins/gtk/gnome_interface.c:1097
+msgid "Open File"
+msgstr "Åpne fil"
+
+#: plugins/gtk/gnome_interface.c:1134
+msgid "Modules"
+msgstr "Moduler"
+
+#: plugins/gtk/gnome_interface.c:1142
+msgid ""
+"Sorry, the module manager isn't functional yet. Please retry in a later "
+"version."
+msgstr ""
+"Beklager, modul håndtereren virker ikke ennå. Vennligst prøv på nytt i "
+"en senere versjon."
+
+#: plugins/gtk/gnome_interface.c:1208 plugins/gtk/gtk_interface.c:1405
+msgid "Open Disc"
+msgstr "Åpne Disk"
+
+#: plugins/gtk/gnome_interface.c:1224 plugins/gtk/gtk_interface.c:1429
+msgid "Disc type"
+msgstr "Disktype"
+
+#: plugins/gtk/gnome_interface.c:1238 plugins/gtk/gtk_interface.c:1443
+msgid "DVD"
+msgstr "DVD"
+
+#: plugins/gtk/gnome_interface.c:1246 plugins/gtk/gtk_interface.c:1451
+msgid "VCD"
+msgstr "VCD"
+
+#: plugins/gtk/gnome_interface.c:1254 plugins/gtk/gtk_interface.c:1459
+msgid "Starting position"
+msgstr "Startposisjon"
+
+#: plugins/gtk/gnome_interface.c:1271 plugins/gtk/gtk_interface.c:1506
+msgid "Title"
+msgstr "Tittel"
+
+#: plugins/gtk/gnome_interface.c:1281 plugins/gtk/gtk_interface.c:1496
+msgid "Chapter"
+msgstr "Kapittel"
+
+#: plugins/gtk/gnome_interface.c:1318
+msgid "Device name:"
+msgstr "Enhets navn:"
+
+#: plugins/gtk/gnome_interface.c:1331 plugins/gtk/gtk_interface.c:1536
+#: plugins/gtk/gtk_interface.c:2482 plugins/gtk/gtk_interface.c:2491
+msgid "/dev/dvd"
+msgstr "/dev/dvd"
+
+#: plugins/gtk/gnome_interface.c:1409
+msgid "Network Stream"
+msgstr "Nettverksstrøm"
+
+#: plugins/gtk/gnome_interface.c:1425 plugins/gtk/gtk_interface.c:1644
+msgid "Protocol"
+msgstr "Protokoll"
+
+#: plugins/gtk/gnome_interface.c:1439 plugins/gtk/gnome_interface.c:2394
+#: plugins/gtk/gtk_interface.c:1658 plugins/gtk/gtk_interface.c:2637
+msgid "TS"
+msgstr "TS"
+
+#: plugins/gtk/gnome_interface.c:1447 plugins/gtk/gnome_interface.c:2404
+#: plugins/gtk/gtk_interface.c:1666 plugins/gtk/gtk_interface.c:2647
+msgid "RTP"
+msgstr "RTP"
+
+#: plugins/gtk/gnome_interface.c:1456 plugins/gtk/gnome_interface.c:2414
+#: plugins/gtk/gtk_interface.c:1675 plugins/gtk/gtk_interface.c:2657
+msgid "HTTP"
+msgstr "HTTP"
+
+#: plugins/gtk/gnome_interface.c:1464 plugins/gtk/gtk_interface.c:1683
+msgid "Server"
+msgstr "Tjener"
+
+#: plugins/gtk/gnome_interface.c:1481 plugins/gtk/gtk_interface.c:1720
+msgid "Address"
+msgstr "Adresse"
+
+#: plugins/gtk/gnome_interface.c:1491 plugins/gtk/gtk_interface.c:1710
+msgid "Port"
+msgstr "Port"
+
+#: plugins/gtk/gnome_interface.c:1510
+msgid "Port of the stream server"
+msgstr "Port til strømtjener"
+
+#: plugins/gtk/gnome_interface.c:1512 plugins/gtk/gtk_interface.c:1730
+msgid "Broadcast"
+msgstr "Kringkasting"
+
+#: plugins/gtk/gnome_interface.c:1536 plugins/gtk/gtk_interface.c:1755
+msgid "138.195.143.255"
+msgstr "138.195.143.255"
+
+#: plugins/gtk/gnome_interface.c:1552 plugins/gtk/gnome_interface.c:2368
+#: plugins/gtk/gtk_interface.c:1765 plugins/gtk/gtk_interface.c:1774
+msgid "vls"
+msgstr "vls"
+
+#: plugins/gtk/gnome_interface.c:1554 plugins/gtk/gtk_interface.c:1776
+msgid "Channels"
+msgstr "Kanaler"
+
+#: plugins/gtk/gnome_interface.c:1569 plugins/gtk/gtk_interface.c:1791
+msgid "Channel server:"
+msgstr "Kanaltjener:"
+
+#: plugins/gtk/gnome_interface.c:1589 plugins/gtk/gtk_interface.c:1810
+msgid "138.195.143.120"
+msgstr "138.195.143.120"
+
+#: plugins/gtk/gnome_interface.c:1591 plugins/gtk/gtk_interface.c:1812
+msgid "port:"
+msgstr "port:"
+
+#: plugins/gtk/gnome_interface.c:1665 plugins/gtk/gnome_interface.c:2434
+#: plugins/gtk/gtk_interface.c:2067 plugins/gtk/gtk_interface.c:2667
+msgid "Network"
+msgstr "Nettverk"
+
+#: plugins/gtk/gnome_interface.c:1672 plugins/gtk/gnome_interface.c:1811
+#: plugins/gtk/gtk_interface.c:2074
+msgid "Url"
+msgstr "Url"
+
+#: plugins/gtk/gnome_interface.c:1684 plugins/gtk/gtk_interface.c:2095
+msgid "All"
+msgstr "Alle"
+
+#: plugins/gtk/gnome_interface.c:1691
+msgid "Item"
+msgstr "Ting"
+
+#: plugins/gtk/gnome_interface.c:1703
+msgid "Crop"
+msgstr "Crop?"
+
+#: plugins/gtk/gnome_interface.c:1710
+msgid "Invert"
+msgstr "Inverter"
+
+#: plugins/gtk/gnome_interface.c:1717
+msgid "Select"
+msgstr "Velg"
+
+#: plugins/gtk/gnome_interface.c:1729 plugins/gtk/gtk_interface.c:2039
+msgid "Add"
+msgstr "Legg til"
+
+#: plugins/gtk/gnome_interface.c:1736 plugins/gtk/gtk_interface.c:2081
+msgid "Delete"
+msgstr "Slett"
+
+#: plugins/gtk/gnome_interface.c:1743 plugins/gtk/gtk_interface.c:2109
+msgid "Selection"
+msgstr "Valg"
+
+#: plugins/gtk/gnome_interface.c:1818 plugins/gtk/gtk_interface.c:2184
+msgid "Duration"
+msgstr "Varighet"
+
+#: plugins/gtk/gnome_interface.c:1970
+msgid "Jump to: "
+msgstr "Hopp til: "
+
+#: plugins/gtk/gnome_interface.c:1987 plugins/gtk/gtk_interface.c:1915
+msgid "s."
+msgstr "s."
+
+#: plugins/gtk/gnome_interface.c:2002 plugins/gtk/gtk_interface.c:1930
+msgid "m:"
+msgstr "m:"
+
+#: plugins/gtk/gnome_interface.c:2017 plugins/gtk/gtk_interface.c:1945
+msgid "h:"
+msgstr "h:"
+
+#: plugins/gtk/gnome_interface.c:2170 plugins/gtk/gnome_interface.c:2180
+#: plugins/gtk/gtk_interface.c:2378
+msgid "Preferences"
+msgstr "Innstillinger"
+
+#: plugins/gtk/gnome_interface.c:2220
+msgid "Default path: "
+msgstr "Standard sti: "
+
+#: plugins/gtk/gnome_interface.c:2277
+msgid "Default DVD path: "
+msgstr "Default DVD sti: "
+
+#: plugins/gtk/gnome_interface.c:2287
+msgid "Default VCD path: "
+msgstr "Standard VCD sti: "
+
+#: plugins/gtk/gnome_interface.c:2314
+msgid "Default server: "
+msgstr "Standard tjener: "
+
+#: plugins/gtk/gnome_interface.c:2334
+msgid "Broadcast address: "
+msgstr "Kringkasingsadresse"
+
+#: plugins/gtk/gnome_interface.c:2344
+msgid "Default port: "
+msgstr "Standard port: "
+
+#: plugins/gtk/gnome_interface.c:2385 plugins/gtk/gtk_interface.c:2618
+msgid "Broadcast mode"
+msgstr "Kringkastingsmodus"
+
+#: plugins/gtk/gnome_interface.c:2424
+msgid "Default protocol: "
+msgstr "Standard protokoll: "
+
+#: plugins/gtk/gnome_interface.c:2451
+msgid "Default interface: "
+msgstr "Standard grensesnitt: "
+
+#: plugins/gtk/gnome_interface.c:2476 plugins/gtk/gtk_interface.c:2714
+msgid "Interface"
+msgstr "Grensesnitt"
+
+#: plugins/gtk/gnome_interface.c:2493 plugins/gtk/gnome_interface.c:2684
+msgid "Default output: "
+msgstr "Standard output?: "
+
+#: plugins/gtk/gnome_interface.c:2503
+msgid "Default height: "
+msgstr "Standard høyde: "
+
+#: plugins/gtk/gnome_interface.c:2533
+msgid "Default width: "
+msgstr "Standard bredde: "
+
+#: plugins/gtk/gnome_interface.c:2558 plugins/gtk/gtk_interface.c:2823
+msgid "Default depth:"
+msgstr "Standard dybde:"
+
+#: plugins/gtk/gnome_interface.c:2577 plugins/gtk/gnome_interface.c:2608
+#: plugins/gtk/gtk_interface.c:2811 plugins/gtk/gtk_interface.c:2852
+msgid "15 bits"
+msgstr "15 bit"
+
+#: plugins/gtk/gnome_interface.c:2580 plugins/gtk/gnome_interface.c:2611
+#: plugins/gtk/gnome_interface.c:2761 plugins/gtk/gtk_interface.c:2814
+#: plugins/gtk/gtk_interface.c:2855 plugins/gtk/gtk_interface.c:2931
+msgid "16 bits"
+msgstr "16 bit"
+
+#: plugins/gtk/gnome_interface.c:2583 plugins/gtk/gnome_interface.c:2614
+#: plugins/gtk/gtk_interface.c:2817 plugins/gtk/gtk_interface.c:2858
+msgid "32 bits"
+msgstr "32 bit"
+
+#: plugins/gtk/gnome_interface.c:2589 plugins/gtk/gtk_interface.c:2833
+msgid "Fullscreen depth:"
+msgstr "Fullskjermdybde:"
+
+#: plugins/gtk/gnome_interface.c:2620 plugins/gtk/gtk_interface.c:2884
+msgid "Fullscreen on play"
+msgstr "Start avspilling med full skjerm"
+
+#: plugins/gtk/gnome_interface.c:2629 plugins/gtk/gtk_interface.c:2893
+msgid "Grayscale"
+msgstr "Gråtoner"
+
+#: plugins/gtk/gnome_interface.c:2638 plugins/gtk/gtk_interface.c:2874
+msgid "Gamma:"
+msgstr "Gamma:"
+
+#: plugins/gtk/gnome_interface.c:2658 plugins/gtk/gtk_interface.c:2902
+msgid "Video"
+msgstr "Video"
+
+#: plugins/gtk/gnome_interface.c:2675 plugins/gtk/gtk_interface.c:3022
+msgid "Spdif output"
+msgstr "Spdif output"
+
+#: plugins/gtk/gnome_interface.c:2709
+msgid "Frequency: "
+msgstr "Frekvens: "
+
+#: plugins/gtk/gnome_interface.c:2728 plugins/gtk/gtk_interface.c:2946
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: plugins/gtk/gnome_interface.c:2731 plugins/gtk/gtk_interface.c:2949
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: plugins/gtk/gnome_interface.c:2734
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: plugins/gtk/gnome_interface.c:2737
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: plugins/gtk/gnome_interface.c:2742
+msgid "Quality: "
+msgstr "Kvalitet: "
+
+#: plugins/gtk/gnome_interface.c:2764 plugins/gtk/gtk_interface.c:2928
+msgid "8 bits"
+msgstr "8 bit"
+
+#: plugins/gtk/gnome_interface.c:2769
+msgid "Channels: "
+msgstr "Kanaler: "
+
+#: plugins/gtk/gnome_interface.c:2788 plugins/gtk/gtk_interface.c:2963
+msgid "Mono"
+msgstr "Mono"
+
+#: plugins/gtk/gnome_interface.c:2791 plugins/gtk/gtk_interface.c:2966
+msgid "Stereo"
+msgstr "Stereo"
+
+#: plugins/gtk/gnome_interface.c:2797 plugins/gtk/gtk_interface.c:2982
+msgid "Default device:"
+msgstr "Standardenhet:"
+
+#: plugins/gtk/gnome_interface.c:2822 plugins/gtk/gtk_interface.c:3070
+msgid "Audio"
+msgstr "Lyd"
+
+#: plugins/gtk/gnome_interface.c:2839 plugins/gtk/gtk_interface.c:3087
+msgid "Launch on startup"
+msgstr "Kjør ved oppstart"
+
+#: plugins/gtk/gnome_interface.c:2848 plugins/gtk/gtk_interface.c:3105
+msgid "Loop on playlist end"
+msgstr "Gå tilbake til start ved slutten av Spillelisten"
+
+#: plugins/gtk/gnome_interface.c:2857 plugins/gtk/gtk_interface.c:3096
+msgid "Enqueue as default"
+msgstr "Legg til i kø som standard"
+
+#: plugins/gtk/gnome_interface.c:2883
+msgid "Files associated with vlc"
+msgstr "filtyper tilordnet til vlc"
+
+#: plugins/gtk/gnome_interface.c:2901 plugins/gtk/gtk_interface.c:3174
+msgid "ts"
+msgstr "ts"
+
+#: plugins/gtk/gnome_interface.c:2910 plugins/gtk/gtk_interface.c:3165
+msgid "vob"
+msgstr "vob"
+
+#: plugins/gtk/gnome_interface.c:2919 plugins/gtk/gtk_interface.c:3156
+msgid "mp2"
+msgstr "mp2"
+
+#: plugins/gtk/gnome_interface.c:2928 plugins/gtk/gtk_interface.c:3147
+msgid "mpeg"
+msgstr "mpeg"
+
+#: plugins/gtk/gnome_interface.c:2937 plugins/gtk/gtk_interface.c:3183
+msgid "Messages"
+msgstr "Beskjeder"
+
+#: plugins/gtk/gnome_interface.c:2954 plugins/gtk/gtk_interface.c:3199
+msgid "Warning level: "
+msgstr "Advarselsnivå: "
+
+#: plugins/gtk/gnome_interface.c:2973 plugins/gtk/gtk_interface.c:3219
+msgid "Misc"
+msgstr "Diverse"
+
+#: plugins/gtk/gtk_interface.c:134 plugins/gtk/gtk_interface.c:1078
+msgid "_File"
+msgstr "_Fil"
+
+#: plugins/gtk/gtk_interface.c:205 plugins/gtk/gtk_interface.c:1177
+msgid "E_xit"
+msgstr "_Avslutt"
+
+#: plugins/gtk/gtk_interface.c:213
+msgid "Exit the program"
+msgstr "Avslutt programmet"
+
+#: plugins/gtk/gtk_interface.c:220
+msgid "_View"
+msgstr "_Vis"
+
+#: plugins/gtk/gtk_interface.c:246
+msgid "Hide the main interface window"
+msgstr "Skjul grensesnittvinduet"
+
+#: plugins/gtk/gtk_interface.c:278
+msgid "Navigate through the stream"
+msgstr "Naviger gjennom strømmen"
+
+#: plugins/gtk/gtk_interface.c:339
+msgid "_Settings"
+msgstr "_Innstillinger"
+
+#: plugins/gtk/gtk_interface.c:357
+msgid "A_udio"
+msgstr "_Lyd"
+
+#: plugins/gtk/gtk_interface.c:366
+msgid "Select audio language"
+msgstr "Velg lydspråk"
+
+#: plugins/gtk/gtk_interface.c:379
+msgid "Select sub-title"
+msgstr "Velg språk på teksting"
+
+#: plugins/gtk/gtk_interface.c:391 plugins/gtk/gtk_interface.c:1158
+msgid "_Preferences..."
+msgstr "_Preferanser..."
+
+#: plugins/gtk/gtk_interface.c:399
+msgid "Configure the application"
+msgstr "Konfigurer programmet"
+
+#: plugins/gtk/gtk_interface.c:403
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: plugins/gtk/gtk_interface.c:421 plugins/gtk/gtk_interface.c:1140
+msgid "_About..."
+msgstr "_Om..."
+
+#: plugins/gtk/gtk_interface.c:429
+msgid "About this application"
+msgstr "Om dette programmet"
+
+#: plugins/gtk/gtk_interface.c:642
+msgid "Title:  "
+msgstr "Tittel: "
+
+#: plugins/gtk/gtk_interface.c:686
+msgid "Chapter:  "
+msgstr "Kapittel: "
+
+#: plugins/gtk/gtk_interface.c:723
+msgid "No server !"
+msgstr "Ingen tjener !"
+
+#: plugins/gtk/gtk_interface.c:737
+msgid "Channel:  "
+msgstr "Kanaler: "
+
+#: plugins/gtk/gtk_interface.c:917
+msgid "_Play"
+msgstr "_Spill"
+
+#: plugins/gtk/gtk_interface.c:1263
+msgid "About"
+msgstr "Om"
+
+#: plugins/gtk/gtk_interface.c:1295
+msgid "Authors"
+msgstr "Forfattere"
+
+#: plugins/gtk/gtk_interface.c:1302
+msgid ""
+"Régis Duchesne <regis@via.ecp.fr>\n"
+"Michel Lespinasse <walken@zoy.org>\n"
+"Olivier Pomel <pomel@via.ecp.fr>\n"
+"Pierre Baillet <oct@zoy.org>\n"
+"Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>\n"
+"Andres Krapf <dae@via.ecp.fr>\n"
+"Christophe Massiot <massiot@via.ecp.fr>\n"
+"Vincent Seguin <seguin@via.ecp.fr>\n"
+"Benoit Steiner <benny@via.ecp.fr>\n"
+"Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>\n"
+"Jean-Marc Dressler <polux@via.ecp.fr>\n"
+"Gaël Hendryckx <jimmy@via.ecp.fr>\n"
+"Samuel Hocevar <sam@zoy.org>\n"
+"Brieuc Jeunhomme <bbp@via.ecp.fr>\n"
+"Michel Kaempf <maxx@via.ecp.fr>\n"
+"Stéphane Borel <stef@via.ecp.fr>\n"
+"Renaud Dartus <reno@via.ecp.fr>\n"
+"Henri Fallon <henri@via.ecp.fr>"
+msgstr ""
+"Régis Duchesne <regis@via.ecp.fr>\n"
+"Michel Lespinasse <walken@zoy.org>\n"
+"Olivier Pomel <pomel@via.ecp.fr>\n"
+"Pierre Baillet <oct@zoy.org>\n"
+"Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>\n"
+"Andres Krapf <dae@via.ecp.fr>\n"
+"Christophe Massiot <massiot@via.ecp.fr>\n"
+"Vincent Seguin <seguin@via.ecp.fr>\n"
+"Benoit Steiner <benny@via.ecp.fr>\n"
+"Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>\n"
+"Jean-Marc Dressler <polux@via.ecp.fr>\n"
+"Gaël Hendryckx <jimmy@via.ecp.fr>\n"
+"Samuel Hocevar <sam@zoy.org>\n"
+"Brieuc Jeunhomme <bbp@via.ecp.fr>\n"
+"Michel Kaempf <maxx@via.ecp.fr>\n"
+"Stéphane Borel <stef@via.ecp.fr>\n"
+"Renaud Dartus <reno@via.ecp.fr>\n"
+"Henri Fallon <henri@via.ecp.fr>"
+
+#: plugins/gtk/gtk_interface.c:1327 plugins/gtk/gtk_interface.c:1550
+#: plugins/gtk/gtk_interface.c:1840
+msgid "OK"
+msgstr "OK"
+
+#: plugins/gtk/gtk_interface.c:1350
+msgid "Select File"
+msgstr "Velg fil"
+
+#: plugins/gtk/gtk_interface.c:1523
+msgid "Device name"
+msgstr "Navn på enhet"
+
+#: plugins/gtk/gtk_interface.c:1557 plugins/gtk/gtk_interface.c:1847
+#: plugins/gtk/gtk_interface.c:1972 plugins/gtk/gtk_interface.c:2203
+#: plugins/gtk/gtk_interface.c:3245
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: plugins/gtk/gtk_interface.c:1620
+msgid "Open Network"
+msgstr "Åpne nettverk"
+
+#: plugins/gtk/gtk_interface.c:1892
+msgid "Jump"
+msgstr "Hopp"
+
+#: plugins/gtk/gtk_interface.c:1899
+msgid "Go to:"
+msgstr "Gå til:"
+
+#: plugins/gtk/gtk_interface.c:1965 plugins/gtk/gtk_interface.c:2196
+#: plugins/gtk/gtk_interface.c:3231
+msgid "Ok"
+msgstr "Ok"
+
+#: plugins/gtk/gtk_interface.c:2102
+msgid "Selected"
+msgstr "Valgte"
+
+#: plugins/gtk/gtk_interface.c:2125
+msgid "_Crop"
+msgstr "_Crop?"
+
+#: plugins/gtk/gtk_interface.c:2136
+msgid "_Invert"
+msgstr "_Invertert"
+
+#: plugins/gtk/gtk_interface.c:2147
+msgid "_Select"
+msgstr "_Valgt"
+
+#: plugins/gtk/gtk_interface.c:2403
+msgid "Default path:"
+msgstr "Standard sti:"
+
+#: plugins/gtk/gtk_interface.c:2428 plugins/gtk/gtk_interface.c:2512
+#: plugins/gtk/gtk_interface.c:2521
+msgid "Browse"
+msgstr "Utforsk"
+
+#: plugins/gtk/gtk_interface.c:2454
+msgid "Default VCD path"
+msgstr "Standard VCD-sti"
+
+#: plugins/gtk/gtk_interface.c:2464
+msgid "Default DVD path:"
+msgstr "Standard DVD-sti:"
+
+#: plugins/gtk/gtk_interface.c:2501 plugins/gtk/gtk_interface.c:2510
+msgid "/dev/cdrom"
+msgstr "/dev/cdrom"
+
+#: plugins/gtk/gtk_interface.c:2561
+msgid "vls "
+msgstr "vls "
+
+#: plugins/gtk/gtk_interface.c:2578
+msgid "Default server:"
+msgstr "Standard tjener:"
+
+#: plugins/gtk/gtk_interface.c:2588
+msgid "Default port:"
+msgstr "Standard port:"
+
+#: plugins/gtk/gtk_interface.c:2608
+msgid "Broadcast address:"
+msgstr "Kringkastingsadresse:"
+
+#: plugins/gtk/gtk_interface.c:2627
+msgid "Default protocol:"
+msgstr "Standard protokoll"
+
+#: plugins/gtk/gtk_interface.c:2692 plugins/gtk/gtk_interface.c:2702
+msgid "Gtk+"
+msgstr "Gtk+"
+
+#: plugins/gtk/gtk_interface.c:2693
+msgid "Gnome"
+msgstr "Gnome"
+
+#: plugins/gtk/gtk_interface.c:2704
+msgid "Default interface:"
+msgstr "Standard grensesnitt:"
+
+#: plugins/gtk/gtk_interface.c:2739 plugins/gtk/gtk_interface.c:2750
+msgid "sdl"
+msgstr "sdl"
+
+#: plugins/gtk/gtk_interface.c:2740
+msgid "xvideo"
+msgstr "xvideo"
+
+#: plugins/gtk/gtk_interface.c:2741
+msgid "x11"
+msgstr "x11"
+
+#: plugins/gtk/gtk_interface.c:2752 plugins/gtk/gtk_interface.c:2972
+msgid "Default output:"
+msgstr "Standard output:"
+
+#: plugins/gtk/gtk_interface.c:2762
+msgid "Default width:"
+msgstr "Standard bredde:"
+
+#: plugins/gtk/gtk_interface.c:2792
+msgid "Default height:"
+msgstr "Standard høyde:"
+
+#: plugins/gtk/gtk_interface.c:2992
+msgid "Quality:"
+msgstr "Kvalitet:"
+
+#: plugins/gtk/gtk_interface.c:3002
+msgid "Frequency:"
+msgstr "Frekvens:"
+
+#: plugins/gtk/gtk_interface.c:3012
+msgid "Channels:"
+msgstr "Kanaler:"
+
+#: plugins/gtk/gtk_interface.c:3039 plugins/gtk/gtk_interface.c:3049
+msgid "dsp"
+msgstr "dsp"
+
+#: plugins/gtk/gtk_interface.c:3040
+msgid "alsa"
+msgstr "alsa"
+
+#: plugins/gtk/gtk_interface.c:3059 plugins/gtk/gtk_interface.c:3068
+msgid "/dev/dsp"
+msgstr "/dev/dsp"
+
+#: plugins/gtk/gtk_interface.c:3131
+msgid "Types associated with vlc"
+msgstr "filtyper tilordnet vlc"
+
+#: plugins/gtk/gtk_interface.c:3238
+msgid "Apply"
+msgstr "Bruk"
+

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 99f08701e981356732a42b424e30540e306ef975..db9c3d73d3e7848cc7b6d38b43c153d732c36af3 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Built-in and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.55 2002/03/01 00:33:18 massiot Exp $
+ * $Id: modules.c,v 1.56 2002/03/01 16:07:00 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -258,9 +258,10 @@ module_t * module_Need( int i_capability, char *psz_name, void *p_data )
         struct module_s *p_module;
         struct module_list_s* p_next;
     } module_list_t;
-    struct module_list_s *p_list, *p_first;
+    struct module_list_s *p_list, *p_first, *p_tolock;
 
     int i_ret, i_index = 0;
+    boolean_t  b_intf = 0;
 
     module_t *p_module;
     char     *psz_realname = NULL;
@@ -325,25 +326,36 @@ module_t * module_Need( int i_capability, char *psz_name, void *p_data )
             }
         }
 
-        /* Test if we requested a particular intf plugin */
-#if 0
-        if( i_capability == MODULE_CAPABILITY_INTF
-             && p_module->psz_program != NULL
-             && strcmp( p_module->psz_program, p_main->psz_arg0 ) )
+        /* Special case: test if we requested a particular intf plugin */
+        if( i_capability == MODULE_CAPABILITY_INTF )
         {
-            continue;
+            if( p_module->psz_program != NULL
+                 && !strcmp( p_module->psz_program, p_main->psz_arg0 ) )
+            {
+                if( !b_intf ) 
+                {
+                    /* Remove previous non-matching plugins */
+                    i_index = 0;
+                    b_intf = 1;
+                }
+            }
+            else
+            {
+                if( b_intf )
+                {
+                    /* This one doesn't match */
+                    continue;
+                }
+            }
         }
-#endif
 
         /* Store this new module */
         p_list[ i_index ].p_module = p_module;
 
-        /* Lock it */
-        LockModule( p_module );
-
+        /* Add it to the modules-to-probe list */
         if( i_index == 0 )
         {
-            p_list[ i_index ].p_next = NULL;
+            p_list[ 0 ].p_next = NULL;
             p_first = p_list;
         }
         else
@@ -376,7 +388,15 @@ module_t * module_Need( int i_capability, char *psz_name, void *p_data )
         i_index++;
     }
 
-    /* We can release the global lock, module refcount were incremented */
+    /* Lock all selected modules */
+    p_tolock = p_first;
+    while( p_tolock != NULL )
+    {
+        LockModule( p_tolock->p_module );
+        p_tolock = p_tolock->p_next;
+    }
+
+    /* We can release the global lock, module refcounts were incremented */
     vlc_mutex_unlock( &p_module_bank->lock );
 
     /* Parse the linked list and use the first successful module */