Translation system changes part 1: wrap translated strings

Replace mp_msg() calls which have a translated string as the format
argument with mp_tmsg and add _() around all other translated strings.

4 files changed, 28 insertions, 28 deletions

diff --git a/libaf/af_ladspa.c b/libaf/af_ladspa.c
index 34cf0a6d19..5d43784c21 100644
--- a/libaf/af_ladspa.c
+++ b/libaf/af_ladspa.c
@@ -213,7 +213,7 @@ static int af_ladspa_parse_plugin(af_ladspa_t *setup) {
 
     if (setup->ninputs == 0) {
         mp_msg(MSGT_AFILTER, MSGL_WARN, "%s: %s\n", setup->myname, 
-                                                MSGTR_AF_LADSPA_WarnNoInputs);
+                                                _(MSGTR_AF_LADSPA_WarnNoInputs));
     } else if (setup->ninputs == 1) {
         mp_msg(MSGT_AFILTER, MSGL_V, "%s: this is a mono effect\n", setup->myname);
     } else if (setup->ninputs == 2) {
@@ -225,13 +225,13 @@ static int af_ladspa_parse_plugin(af_ladspa_t *setup) {
 
     if (setup->noutputs == 0) {
         mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
-                                                MSGTR_AF_LADSPA_ErrNoOutputs);
+                                                _(MSGTR_AF_LADSPA_ErrNoOutputs));
         return AF_ERROR;
     }
 
     if (setup->noutputs != setup->ninputs ) {
         mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
-                                                MSGTR_AF_LADSPA_ErrInOutDiff);
+                                                _(MSGTR_AF_LADSPA_ErrInOutDiff));
         return AF_ERROR;
     }
 
@@ -391,7 +391,7 @@ static int af_ladspa_load_plugin(af_ladspa_t *setup) {
 
     if (!setup->libhandle) {
         mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s %s\n\t%s\n", setup->myname,
-                    MSGTR_AF_LADSPA_ErrFailedToLoad, setup->file, dlerror() );
+                    _(MSGTR_AF_LADSPA_ErrFailedToLoad), setup->file, dlerror() );
         return AF_ERROR;
     }
 
@@ -404,7 +404,7 @@ static int af_ladspa_load_plugin(af_ladspa_t *setup) {
 
     if (!descriptor_function) {
         mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n\t%s\n", setup->myname,
-                                MSGTR_AF_LADSPA_ErrNoDescriptor, dlerror());
+                                _(MSGTR_AF_LADSPA_ErrNoDescriptor), dlerror());
         return AF_ERROR;
     }
 
@@ -412,7 +412,7 @@ static int af_ladspa_load_plugin(af_ladspa_t *setup) {
 
     if (strcmp(setup->label, "help") == 0) {
         mp_msg(MSGT_AFILTER, MSGL_INFO, "%s: %s %s:\n", setup->myname, 
-                MSGTR_AF_LADSPA_AvailableLabels, setup->file);
+                _(MSGTR_AF_LADSPA_AvailableLabels), setup->file);
         for (i=0; ; i++) {
             ladspa_descriptor = descriptor_function(i);
             if (ladspa_descriptor == NULL) {
@@ -432,7 +432,7 @@ static int af_ladspa_load_plugin(af_ladspa_t *setup) {
         ladspa_descriptor = descriptor_function(i);
         if (ladspa_descriptor == NULL) {
             mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
-                                            MSGTR_AF_LADSPA_ErrLabelNotFound);
+                                            _(MSGTR_AF_LADSPA_ErrLabelNotFound));
             return AF_ERROR;
         }
         if (strcmp(ladspa_descriptor->Label, setup->label) == 0) {
@@ -520,7 +520,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg) {
 
         if (!arg) {
             mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
-                                            MSGTR_AF_LADSPA_ErrNoSuboptions);
+                                            _(MSGTR_AF_LADSPA_ErrNoSuboptions));
             return AF_ERROR;
         }
 
@@ -532,7 +532,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg) {
         sscanf(arg, "%[^:]", buf);
         if (buf[0] == '\0') {
             mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
-                                                MSGTR_AF_LADSPA_ErrNoLibFile);
+                                                _(MSGTR_AF_LADSPA_ErrNoLibFile));
             free(buf);
             return AF_ERROR;
         }
@@ -548,7 +548,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg) {
         sscanf(arg, "%[^:]", buf);
         if (buf[0] == '\0') {
             mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
-                                                MSGTR_AF_LADSPA_ErrNoLabel);
+                                                _(MSGTR_AF_LADSPA_ErrNoLabel));
             free(buf);
             return AF_ERROR;
         }
@@ -584,14 +584,14 @@ static int control(struct af_instance_s *af, int cmd, void *arg) {
         for(i=0; i<setup->ninputcontrols; i++) {
             if (!arg || (*(char*)arg != ':') ) {
                 mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
-                                        MSGTR_AF_LADSPA_ErrNotEnoughControls);
+                                        _(MSGTR_AF_LADSPA_ErrNotEnoughControls));
                 return AF_ERROR;
             }
             arg++;
             r = sscanf(arg, "%f", &val);
             if (r!=1) {
                 mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname,
-                                        MSGTR_AF_LADSPA_ErrNotEnoughControls);
+                                        _(MSGTR_AF_LADSPA_ErrNotEnoughControls));
                 return AF_ERROR;
             }
             setup->inputcontrols[setup->inputcontrolsmap[i]] = val;
@@ -617,13 +617,13 @@ static int control(struct af_instance_s *af, int cmd, void *arg) {
 
             if (LADSPA_IS_HINT_BOUNDED_BELOW(hint.HintDescriptor) &&
                     val < hint.LowerBound) {
-                mp_msg(MSGT_AFILTER, MSGL_ERR, MSGTR_AF_LADSPA_ErrControlBelow,
+                mp_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_AF_LADSPA_ErrControlBelow,
                                             setup->myname, i, hint.LowerBound);
                 return AF_ERROR;
             }
             if (LADSPA_IS_HINT_BOUNDED_ABOVE(hint.HintDescriptor) &&
                     val > hint.UpperBound) {
-                mp_msg(MSGT_AFILTER, MSGL_ERR, MSGTR_AF_LADSPA_ErrControlAbove,
+                mp_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_AF_LADSPA_ErrControlAbove,
                                             setup->myname, i, hint.UpperBound);
                 return AF_ERROR;
             }
diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c
index 36a19dad60..dde841c9a1 100644
--- a/libaf/af_lavcac3enc.c
+++ b/libaf/af_lavcac3enc.c
@@ -98,7 +98,7 @@ static int control(struct af_instance_s *af, int cmd, void *arg)
             s->lavc_actx->bit_rate = bit_rate;
 
             if(avcodec_open(s->lavc_actx, s->lavc_acodec) < 0) {
-                mp_msg(MSGT_AFILTER, MSGL_ERR, MSGTR_CouldntOpenCodec, "ac3", bit_rate);
+                mp_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_CouldntOpenCodec, "ac3", bit_rate);
                 return AF_ERROR;
             }
         }
@@ -295,13 +295,13 @@ static int af_open(af_instance_t* af){
 
     s->lavc_acodec = avcodec_find_encoder_by_name("ac3");
     if (!s->lavc_acodec) {
-        mp_msg(MSGT_AFILTER, MSGL_ERR, MSGTR_LavcAudioCodecNotFound, "ac3");
+        mp_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_LavcAudioCodecNotFound, "ac3");
         return AF_ERROR;
     }
 
     s->lavc_actx = avcodec_alloc_context();
     if (!s->lavc_actx) {
-        mp_msg(MSGT_AFILTER, MSGL_ERR, MSGTR_CouldntAllocateLavcContext);
+        mp_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_CouldntAllocateLavcContext);
         return AF_ERROR;
     }
 
diff --git a/libaf/af_scaletempo.c b/libaf/af_scaletempo.c
index 8b39290efa..2d420784c6 100644
--- a/libaf/af_scaletempo.c
+++ b/libaf/af_scaletempo.c
@@ -470,26 +470,26 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
       return AF_ERROR;
     }
     if (s->scale_nominal <= 0) {
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
-             MSGTR_ErrorParsingCommandLine ": " MSGTR_AF_ValueOutOfRange
+      mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
+             _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange)
              ": scale > 0\n");
       return AF_ERROR;
     }
     if (s->ms_stride <= 0) {
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
-             MSGTR_ErrorParsingCommandLine ": " MSGTR_AF_ValueOutOfRange
+      mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
+             _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange)
              ": stride > 0\n");
       return AF_ERROR;
     }
     if (s->percent_overlap < 0 || s->percent_overlap > 1) {
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
-             MSGTR_ErrorParsingCommandLine ": " MSGTR_AF_ValueOutOfRange
+      mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
+             _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange)
              ": 0 <= overlap <= 1\n");
       return AF_ERROR;
     }
     if (s->ms_search < 0) {
-      mp_msg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
-             MSGTR_ErrorParsingCommandLine ": " MSGTR_AF_ValueOutOfRange
+      mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
+             _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange)
              ": search >= 0\n");
       return AF_ERROR;
     }
@@ -507,8 +507,8 @@ static int control(struct af_instance_s* af, int cmd, void* arg)
         s->speed_tempo = 1;
         s->speed_pitch = 1;
       } else {
-        mp_msg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
-               MSGTR_ErrorParsingCommandLine ": " MSGTR_AF_ValueOutOfRange
+        mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] "
+               _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange)
                ": speed=[pitch|tempo|none|both]\n");
         return AF_ERROR;
       }
diff --git a/libaf/format.c b/libaf/format.c
index e681cc2050..4f53f10159 100644
--- a/libaf/format.c
+++ b/libaf/format.c
@@ -123,7 +123,7 @@ char* af_fmt2str(int format, char* str, int size)
     case(AF_FORMAT_IMA_ADPCM): 
       i+=snprintf(&str[i],size-i,"IMA-ADPCM "); break;
     default:
-      i+=snprintf(&str[i],size-i,MSGTR_AF_FORMAT_UnknownFormat); 
+      i+=snprintf(&str[i],size-i,mp_gtext(MSGTR_AF_FORMAT_UnknownFormat));
     }
   }
   else{