* controls.m: added l10n of the volume-string shown when changing the volume

* vcdx/vcdplayer.c: disabled l10n of various error messages
* vcdx/vcd.c: disabled l10n of 2 debug masks. They are horribly to translate and used by advanced users only, who should speak English well enough for this purpose
* rest: disabled l10n of various strings or debug masks which cannot be translated

more to come

modules/access/vcdx/vcd.c

@@ -53,7 +53,7 @@ int  E_(BlocksPerReadCallback) ( vlc_object_t *p_this, const char *psz_name,
  * Option help text
  *****************************************************************************/
 
-#define DEBUG_LONGTEXT N_( \
+#define DEBUG_LONGTEXT \
     "This integer when viewed in binary is a debugging mask\n" \
     "meta info         1\n" \
     "event info        2\n" \
@@ -68,7 +68,7 @@ int  E_(BlocksPerReadCallback) ( vlc_object_t *p_this, const char *psz_name,
     "still    (400) 1024\n" \
     "vcdinfo  (800) 2048\n" )
 
-#define VCD_TITLE_FMT_LONGTEXT N_( \
+#define VCD_TITLE_FMT_LONGTEXT \
 "Format used in the GUI Playlist Title. Similar to the Unix date \n" \
 "Format specifiers that start with a percent sign. Specifiers are: \n" \
 "   %A : The album information\n" \

modules/access/vcdx/vcdplayer.c

@@ -83,7 +83,7 @@ vcdplayer_get_item_size(access_t * p_access, vcdinfo_itemid_t itemid)
   case VCDINFO_ITEM_TYPE_NOTFOUND:
   case VCDINFO_ITEM_TYPE_SPAREID2:
   default:
-    LOG_ERR("%s %d", _("bad item type"), itemid.type);
+    LOG_ERR("%s %d", "bad item type", itemid.type);
     return 0;
   }
 }
@@ -195,7 +195,7 @@ _vcdplayer_set_entry(access_t * p_access, unsigned int num)
   const unsigned int   i_entries = vcdinfo_get_num_entries(p_vcdinfo);
 
   if (num >= i_entries) {
-    LOG_ERR("%s %d", _("bad entry number"), num);
+    LOG_ERR("%s %d", "bad entry number", num);
     return;
   } else {
     vcdinfo_itemid_t itemid;
@@ -223,14 +223,14 @@ _vcdplayer_set_segment(access_t * p_access, unsigned int num)
   segnum_t       i_segs    = vcdinfo_get_num_segments(p_vcdinfo);
 
   if (num >= i_segs) {
-    LOG_ERR("%s %d", _("bad segment number"), num);
+    LOG_ERR("%s %d", "bad segment number", num);
     return;
   } else {
     vcdinfo_itemid_t itemid;
 
     if (VCDINFO_NULL_LSN==p_vcdplayer->i_lsn) {
       LOG_ERR("%s %d", 
-              _("Error in getting current segment number"), num);
+              "Error in getting current segment number", num);
       return;
     }
     
@@ -301,7 +301,7 @@ vcdplayer_play_single_item( access_t * p_access, vcdinfo_itemid_t itemid)
     }
     
   case VCDINFO_ITEM_TYPE_LID:
-    LOG_ERR("%s", _("Should have converted p_vcdplayer above"));
+    LOG_ERR("%s", "Should have converted p_vcdplayer above");
     return false;
     break;
 

modules/audio_filter/converter/a52tofloat32.c

@@ -100,7 +100,7 @@ struct filter_sys_t
     "listening room.")
 
 vlc_module_begin();
-    set_shortname( _("A/52") );
+    set_shortname( "A/52" );
     set_description( _("ATSC A/52 (AC-3) audio decoder") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACODEC );

modules/codec/svcdsub.c

@@ -39,14 +39,13 @@ static int  DecoderOpen   ( vlc_object_t * );
 static int  PacketizerOpen( vlc_object_t * );
 static void DecoderClose  ( vlc_object_t * );
 
-#define DEBUG_TEXT N_( \
+#define DEBUG_TEXT \
      "If nonzero, this gives additional debug information." \
-     )
 
-#define DEBUG_LONGTEXT N_( \
+#define DEBUG_LONGTEXT \
     "This integer when viewed in binary is a debugging mask\n" \
     "calls                 1\n" \
-    "packet assembly info  2\n" )
+    "packet assembly info  2\n"
 
 vlc_module_begin();
     set_description( _("Philips OGT (SVCD subtitle) decoder") );

modules/gui/macosx/controls.m

@@ -259,7 +259,7 @@
 
     aout_VolumeGet( p_intf, &i_volume );
 
-    o_text = [NSString stringWithFormat: @"Volume: %d", i_volume * 200 / AOUT_VOLUME_MAX];
+    o_text = [NSString stringWithFormat: _NS("Volume: %d"), i_volume * 200 / AOUT_VOLUME_MAX];
     [o_main setScrollField:o_text stopAfter:1000000];
     
     [o_volumeslider setFloatValue: (float)(i_volume / AOUT_VOLUME_STEP)];