* modules/codec/dvbsub.c: disabled translation of some internal error messages

* po/de.po: removed my reminders
* modules/demux/mkv.cpp: disabled translation of the string "Matroska"

* src/libvlc.h: small corrections of to-be-localised strings
* modules/gui/macosx/macosx.m: ditto
* modules/video_output/fb.c: ditto

modules/codec/dvbsub.c

@@ -3,7 +3,7 @@
  *****************************************************************************
  * Copyright (C) 2003 ANEVIA
  * Copyright (C) 2003 VideoLAN
- * $Id: dvbsub.c,v 1.9 2004/01/25 20:40:59 gbazin Exp $
+ * $Id: dvbsub.c,v 1.10 2004/03/02 13:53:13 kuehne Exp $
  *
  * Authors: Damien LUCAS <damien.lucas@anevia.com>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -1172,14 +1172,14 @@ static void dvbsub_RenderDVBSUB( vout_thread_t *p_vout, picture_t *p_pic,
 
         /* RV16 target, scaling */
         case VLC_FOURCC('R','V','1','6'):
-            msg_Err(p_vout, _("unimplemented chroma: RV16"));
+            msg_Err(p_vout, "unimplemented chroma: RV16");
             /* RenderRV16( p_vout, p_pic, p_spu ); */
             break;
 
         /* RV32 target, scaling */
         case VLC_FOURCC('R','V','2','4'):
         case VLC_FOURCC('R','V','3','2'):
-            msg_Err(p_vout, _("unimplemented chroma: RV32"));
+            msg_Err(p_vout, "unimplemented chroma: RV32");
             /* RenderRV32( p_vout, p_pic, p_spu ); */
             break;
 
@@ -1228,7 +1228,7 @@ static void dvbsub_render( dvbsub_all_t *dvbsub, vout_thread_t *p_vout )
 
             if(p_object==NULL)
             {
-                msg_Err(p_vout, _("internal DvbSub decoder error"));
+                msg_Err(p_vout, "internal DvbSub decoder error");
                 return;
             }
 

modules/demux/mkv.cpp

@@ -2,7 +2,7 @@
  * mkv.cpp : matroska demuxer
  *****************************************************************************
  * Copyright (C) 2003-2004 VideoLAN
- * $Id: mkv.cpp,v 1.57 2004/03/01 17:36:26 gbazin Exp $
+ * $Id: mkv.cpp,v 1.58 2004/03/02 13:53:14 kuehne Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -2176,7 +2176,7 @@ static void InformationsCreate( input_thread_t *p_input )
     playlist_t            *p_playlist;
     int                   i_track;
 
-    p_cat = input_InfoCategory( p_input, _("Matroska") );
+    p_cat = input_InfoCategory( p_input, "Matroska" );
     if( p_sys->f_duration > 1000.1 )
     {
         char psz_buffer[MSTRTIME_MAX_SIZE];

modules/gui/macosx/macosx.m

@@ -2,7 +2,7 @@
  * macosx.m: MacOS X module for vlc
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: macosx.m,v 1.22 2004/02/26 13:04:55 hartman Exp $
+ * $Id: macosx.m,v 1.23 2004/03/02 13:53:14 kuehne Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
@@ -67,7 +67,7 @@ void E_(CloseVideo)   ( vlc_object_t * );
 #define OPENGL_EFFECT_LONGTEXT N_("Use 'None' to display the video " \
         "without any fantasy, 'Cube' to let the video play on " \
         "the faces of a rotating cube, 'Transparent cube' do make this " \
-        "cube transparent" )
+        "cube transparent." )
 
 static char * effect_list[] = { "none", "cube", "transparent-cube" };
 static char * effect_list_text[] = { N_("None"), N_("Cube"),

modules/video_output/fb.c

@@ -2,7 +2,7 @@
  * fb.c : framebuffer plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: fb.c,v 1.8 2004/01/26 16:45:02 zorglub Exp $
+ * $Id: fb.c,v 1.9 2004/03/02 13:53:14 kuehne Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -67,7 +67,7 @@ static void GfxMode        ( int i_tty );
 #define DEVICE_TEXT N_("Framebuffer device")
 #define DEVICE_LONGTEXT N_( \
     "You can select here the framebuffer device that will be used " \
-    "for rendering (ususally /dev/fb0).")
+    "for rendering (usually /dev/fb0).")
 
 vlc_module_begin();
     add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,

po/de.po

@@ -1011,7 +1011,6 @@ msgstr ""
 "knnen Sie den \"headphone\"-Mixer benutzen, der Ihnen ein 5.1-Feeling mit "
 "einem Kopfhrer gibt."
 
-# BUGGY
 #: src/libvlc.h:178
 msgid ""
 "These options allow you to modify the behaviour of the video output "
@@ -1747,7 +1746,6 @@ msgstr ""
 msgid "Adjust VLC priority"
 msgstr "Prioritt von VLC anpassen"
 
-# BUGGY
 #: src/libvlc.h:528
 msgid ""
 "This options adds an offset (positive or negative) to VLC default "
@@ -2972,7 +2970,6 @@ msgstr ""
 msgid "HTTP user name"
 msgstr "HTTP-Benutzername"
 
-# BUGGY
 #: modules/access/http.c:54
 msgid ""
 "Allows you to modify the user name that will be used for the connection "
@@ -3010,7 +3007,6 @@ msgstr ""
 msgid "Force selection of all streams"
 msgstr "Auswahl von allen Streams erzwingen"
 
-# BUGGY
 #: modules/access/mms/mms.c:64
 msgid "Selct maximum bitrate stream"
 msgstr "Maximale Datenrate auswhlen"
@@ -3721,17 +3717,14 @@ msgstr "DV Bilddekoder"
 msgid "DVB subtitles decoder"
 msgstr "DVB Untertitel Dekoder"
 
-# UNUSED
 #: modules/codec/dvbsub.c:1175
 msgid "unimplemented chroma: RV16"
 msgstr ""
 
-# UNUSED
 #: modules/codec/dvbsub.c:1182
 msgid "unimplemented chroma: RV32"
 msgstr ""
 
-# UNUSED
 #: modules/codec/dvbsub.c:1231
 msgid "internal DvbSub decoder error"
 msgstr ""
@@ -3836,10 +3829,9 @@ msgstr ""
 "Hhere Level bentigen mehr Prozessorleistung, produzieren aber besser "
 "aussehende Bilder."
 
-# BUGGY
 #: modules/codec/ffmpeg/ffmpeg.h:114
 msgid "ffmpeg postproc filter chains"
-msgstr "Ffmpeg Nachbearbeitungsfilterketten"
+msgstr "ffmpeg Nachbearbeitungsfilterketten"
 
 #: modules/codec/ffmpeg/postprocess.c:84
 msgid "Post processing"
@@ -3938,7 +3930,6 @@ msgstr ""
 msgid "Subtitle aspect-ratio correction"
 msgstr "Untertitelbildseitenformatkorrektur"
 
-# BUGGY
 #: modules/codec/ogt/subtitle.h:55
 msgid ""
 "Use this to force the subtitle aspect ratio. If you give a null string the "
@@ -4560,10 +4551,9 @@ msgstr "Matroskastream Demuxer"
 msgid "Seek based on percent not time"
 msgstr "Auf Prozent, nicht auf Zeit, basiert suchen"
 
-# UNUSED
 #: modules/demux/mkv.cpp:2179
 msgid "Matroska"
-msgstr "Matroska"
+msgstr ""
 
 #: modules/demux/mkv.cpp:2193
 msgid "UTC date"
@@ -6619,7 +6609,6 @@ msgstr ""
 msgid "OpenGL effect"
 msgstr "OpenGL Effekt"
 
-# BUGGY
 #: modules/gui/macosx/macosx.m:67
 msgid ""
 "Use 'None' to display the video without any fantasy, 'Cube' to let the video "
@@ -8789,7 +8778,6 @@ msgstr "DirectX Video-Ausgabe"
 msgid "Framebuffer device"
 msgstr "Framepuffer-Device"
 
-# BUGGY
 #: modules/video_output/fb.c:69
 msgid ""
 "You can select here the framebuffer device that will be used for rendering "

src/libvlc.h

@@ -2,7 +2,7 @@
  * libvlc.h: main libvlc header
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.134 2004/02/20 17:20:01 massiot Exp $
+ * $Id: libvlc.h,v 1.135 2004/03/02 13:53:14 kuehne Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -177,8 +177,8 @@ static char *ppsz_language_text[] =
 #define VOUT_CAT_LONGTEXT N_( \
     "These options allow you to modify the behaviour of the video output " \
     "subsytem. You can for example enable video filters (deinterlacing, " \
-    "image adjusting, ...\n ). Enable these filters here and configure " \
-    "them in the \"video filters\" modules section. You can also set many" \
+    "image adjusting, ...). Enable these filters here and configure " \
+    "them in the \"video filters\" modules section. You can also set many " \
     "miscellaneous video options." )
 
 #define VOUT_TEXT N_("Video output module")