From e306174952d42e1cd6cc5efc50ae6bb0410501bc Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Tue, 7 Jul 2009 01:15:02 +0300 Subject: Translation system changes part 2: replace macros by strings Replace all MSGTR_ macros in the source by the corresponding English string. --- libaf/af_ladspa.c | 30 +++++++++++++++--------------- libaf/af_lavcac3enc.c | 6 +++--- libaf/af_scaletempo.c | 10 +++++----- libaf/format.c | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'libaf') diff --git a/libaf/af_ladspa.c b/libaf/af_ladspa.c index 5d43784c21..547dd6816e 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)); + _("WARNING! This LADSPA plugin has no audio inputs.\n The incoming audio signal will be lost.")); } 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)); + _("This LADSPA plugin has no audio outputs.")); return AF_ERROR; } if (setup->noutputs != setup->ninputs ) { mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname, - _(MSGTR_AF_LADSPA_ErrInOutDiff)); + _("The number of audio inputs and audio outputs of the LADSPA plugin differ.")); 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() ); + _("failed to load"), 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()); + _("Couldn't find ladspa_descriptor() function in the specified library file."), 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); + _("available labels in"), 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)); + _("Couldn't find label in plugin library.")); return AF_ERROR; } if (strcmp(ladspa_descriptor->Label, setup->label) == 0) { @@ -458,7 +458,7 @@ static int af_ladspa_load_plugin(af_ladspa_t *setup) { */ static int af_ladspa_malloc_failed(char *myname) { - mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s", myname, MSGTR_MemAllocFailed); + mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s", myname, "Memory allocation failed.\n"); return AF_ERROR; } @@ -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)); + _("No suboptions specified.")); 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)); + _("No library file specified.")); 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)); + _("No filter label specified.")); free(buf); return AF_ERROR; } @@ -584,14 +584,14 @@ static int control(struct af_instance_s *af, int cmd, void *arg) { for(i=0; ininputcontrols; i++) { if (!arg || (*(char*)arg != ':') ) { mp_msg(MSGT_AFILTER, MSGL_ERR, "%s: %s\n", setup->myname, - _(MSGTR_AF_LADSPA_ErrNotEnoughControls)); + _("Not enough controls specified on the command line.")); 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)); + _("Not enough controls specified on the command line.")); 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_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_AF_LADSPA_ErrControlBelow, + mp_tmsg(MSGT_AFILTER, MSGL_ERR, "%s: Input control #%d is below lower boundary of %0.4f.\n", setup->myname, i, hint.LowerBound); return AF_ERROR; } if (LADSPA_IS_HINT_BOUNDED_ABOVE(hint.HintDescriptor) && val > hint.UpperBound) { - mp_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_AF_LADSPA_ErrControlAbove, + mp_tmsg(MSGT_AFILTER, MSGL_ERR, "%s: Input control #%d is above upper boundary of %0.4f.\n", setup->myname, i, hint.UpperBound); return AF_ERROR; } diff --git a/libaf/af_lavcac3enc.c b/libaf/af_lavcac3enc.c index dde841c9a1..761debec01 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_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_CouldntOpenCodec, "ac3", bit_rate); + mp_tmsg(MSGT_AFILTER, MSGL_ERR, "Couldn't open codec %s, br=%d.\n", "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_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_LavcAudioCodecNotFound, "ac3"); + mp_tmsg(MSGT_AFILTER, MSGL_ERR, "Audio LAVC, couldn't find encoder for codec %s.\n", "ac3"); return AF_ERROR; } s->lavc_actx = avcodec_alloc_context(); if (!s->lavc_actx) { - mp_tmsg(MSGT_AFILTER, MSGL_ERR, MSGTR_CouldntAllocateLavcContext); + mp_tmsg(MSGT_AFILTER, MSGL_ERR, "Audio LAVC, couldn't allocate context!\n"); return AF_ERROR; } diff --git a/libaf/af_scaletempo.c b/libaf/af_scaletempo.c index 2d420784c6..a7926712cb 100644 --- a/libaf/af_scaletempo.c +++ b/libaf/af_scaletempo.c @@ -471,25 +471,25 @@ static int control(struct af_instance_s* af, int cmd, void* arg) } if (s->scale_nominal <= 0) { mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange) + _("error parsing command line") ": " _("value out of range") ": scale > 0\n"); return AF_ERROR; } if (s->ms_stride <= 0) { mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange) + _("error parsing command line") ": " _("value out of range") ": stride > 0\n"); return AF_ERROR; } if (s->percent_overlap < 0 || s->percent_overlap > 1) { mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange) + _("error parsing command line") ": " _("value out of range") ": 0 <= overlap <= 1\n"); return AF_ERROR; } if (s->ms_search < 0) { mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange) + _("error parsing command line") ": " _("value out of range") ": search >= 0\n"); return AF_ERROR; } @@ -508,7 +508,7 @@ static int control(struct af_instance_s* af, int cmd, void* arg) s->speed_pitch = 1; } else { mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _(MSGTR_ErrorParsingCommandLine) ": " _(MSGTR_AF_ValueOutOfRange) + _("error parsing command line") ": " _("value out of range") ": speed=[pitch|tempo|none|both]\n"); return AF_ERROR; } diff --git a/libaf/format.c b/libaf/format.c index 4f53f10159..7dc677f5af 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,mp_gtext(MSGTR_AF_FORMAT_UnknownFormat)); + i+=snprintf(&str[i],size-i,mp_gtext("unknown format ")); } } else{ -- cgit v1.2.3