* fixed some untranslatable strings and strings which existed both with and without...

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index 9fa55a271890bd2ef5682d1fe5b3c7f9488587e4..6a45134fb342d5f40f419f2e520640e37221edc0 100644 (file)
--- a/modules/access/gnomevfs.c
+++ b/modules/access/gnomevfs.c
@@ -48,7 +48,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("GnomeVFS filesystem file input") );
-    set_shortname( _("GnomeVFS") );
+    set_shortname( "GnomeVFS" );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index cb1ac4ce9dc68a2ebef462af3288e92367688e55..e0588d8ed66e5edc805d5e5075ae14f8555d64d4 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -361,7 +361,7 @@ VCDEntryPoints( access_t * p_access )
          seekpoint_t *s = vlc_seekpoint_New();
          char psz_entry[100];
          
-         snprintf(psz_entry, sizeof(psz_entry), "%s%02d", _("Entry "), i );
+         snprintf(psz_entry, sizeof(psz_entry), "%s %02d", _("Entry"), i );
 
          p_vcdplayer->p_entries[i] = vcdinfo_get_entry_lsn(p_vcdplayer->vcd, i);
          
@@ -425,7 +425,7 @@ VCDSegments( access_t * p_access )
         seekpoint_t *s = vlc_seekpoint_New();
         p_vcdplayer->p_segments[i] = vcdinfo_get_seg_lsn(p_vcdplayer->vcd, i);
 
-        snprintf( psz_segment, sizeof(psz_segment), "%s%02d", _("Segment "),
+        snprintf( psz_segment, sizeof(psz_segment), "%s %02d", _("Segment"),
                   i );
 
         s->i_byte_offset = 0; /* Not sure what this would mean here */
@@ -469,7 +469,7 @@ VCDTitles( access_t * p_access )
               vlc_input_title_New();
             char psz_track[80];
 
-            snprintf( psz_track, sizeof(psz_track), "%s%02d", _("Track "),
+            snprintf( psz_track, sizeof(psz_track), "%s %02d", _("Track"),
                                                     i );
             t->i_size    = (int64_t) vcdinfo_get_track_size( p_vcdplayer->vcd, 
                                                             i ) 
@@ -530,7 +530,7 @@ VCDLIDs( access_t * p_access )
         char psz_lid[100];
         seekpoint_t *s = vlc_seekpoint_New();
 
-        snprintf( psz_lid, sizeof(psz_lid), "%s%02d", _("LID "),
+        snprintf( psz_lid, sizeof(psz_lid), "%s %02d", _("LID"),
                   i_lid );
 
         s->i_byte_offset = 0; /*  A lid doesn't have an offset

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 7f09149991a95f8a0ef3436528df733c6c99c094..6aed601fa3948a91df1de52301d3b943b4167bb7 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -5193,9 +5193,9 @@ void demux_sys_t::PreloadLinked( matroska_segment_c *p_segment )
             // create a name if there is none
             if ( p_title->psz_name == NULL )
             {
-                sz_name = N_("Segment ");
+                sz_name = N_("Segment");
                 char psz_str[6];
-                sprintf( psz_str, "%d", (int)i );
+                sprintf( psz_str, " %d", (int)i );
                 sz_name += psz_str;
                 p_title->psz_name = strdup( sz_name.c_str() );
             }

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 569ab389e0eaf0279fbdf70d3dcbabfea61bfa81..ef2193339f6268db965daa891498a5ca6da43003 100644 (file)
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -54,7 +54,7 @@ using namespace CyberLink;
     static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("UPnP"));
+    set_shortname( "UPnP");
     set_description( _("Universal Plug'n'Play discovery") );
     set_category( CAT_PLAYLIST );
     set_subcategory( SUBCAT_PLAYLIST_SD );
@@ -110,7 +110,7 @@ static int Open( vlc_object_t *p_this )
 
     p_view = playlist_ViewFind( p_sys->p_playlist, VIEW_CATEGORY );
     p_sys->p_node = playlist_NodeCreate( p_sys->p_playlist, VIEW_CATEGORY,
-                                         _("UPnP"), p_view->p_root );
+                                         "UPnP", p_view->p_root );
     p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
     p_sys->p_node->i_flags &= ~PLAYLIST_SKIP_FLAG;
     val.b_bool = VLC_TRUE;

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 2d279eb5d0b2a9eb884bdf7d4016b04f58bb1ada..6c349a284bbf50385942f32b671e312026dd2415 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -149,7 +149,7 @@ static char *ppsz_pos_descriptions[] =
  *****************************************************************************/
 vlc_module_begin();
     set_capability( "sub filter", 0 );
-    set_shortname( N_("RSS" ));
+    set_shortname( "RSS" );
     set_callbacks( CreateFilter, DestroyFilter );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_SUBPIC );

diff --git a/modules/video_output/wingdi.c b/modules/video_output/wingdi.c
index 00fa366d9804032e8e35bdd9a5ec56ae7ef401d0..c7c0d5bb2338203fef11a3012e33df0e5690e9f1 100644 (file)
--- a/modules/video_output/wingdi.c
+++ b/modules/video_output/wingdi.c
@@ -216,11 +216,11 @@ vlc_module_begin();
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
 #ifdef MODULE_NAME_IS_wingapi
-    set_shortname( _("Windows GAPI") );
+    set_shortname( "Windows GAPI" );
     set_description( _("Windows GAPI video output") );
     set_capability( "video output", 20 );
 #else
-    set_shortname( _("Windows GDI") );
+    set_shortname( "Windows GDI" );
     set_description( _("Windows GDI video output") );
     set_capability( "video output", 10 );
 #endif

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 09ff7b7b00b6492b6e941b2690f84aaea854248d..1f3fc5dc1c4a4facc9027db6d5064186a1f32d4d 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -231,13 +231,13 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_Change( p_vout, "crop", VLC_VAR_DELCHOICE, &val, 0 );
     val.psz_string = ""; text.psz_string = _("Default");
     var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "001:1"; text.psz_string = _("1:1");
+    val.psz_string = "001:1"; text.psz_string = "1:1";
     var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "004:3"; text.psz_string = _("4:3");
+    val.psz_string = "004:3"; text.psz_string = "4:3";
     var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "16:9"; text.psz_string = _("16:9");
+    val.psz_string = "16:9"; text.psz_string = "16:9";
     var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "221:100"; text.psz_string = _("221:100");
+    val.psz_string = "221:100"; text.psz_string = "221:100";
     var_Change( p_vout, "crop", VLC_VAR_ADDCHOICE, &val, &text );
 
     var_AddCallback( p_vout, "crop", CropCallback, NULL );