From b34a88e4f44ee2a926c8c30f8fb3954fc7d71b90 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 7 Mar 2010 19:25:52 +0200 Subject: translations: tweak cases that relied on concatenating adjacent strings Tweak some code parts that used to rely on string literals from translation macros being concatenated with other adjacent string literals. Break up the resulting string into independently translated parts, so that the existing translations for those parts can still be used. --- libaf/af_scaletempo.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'libaf/af_scaletempo.c') diff --git a/libaf/af_scaletempo.c b/libaf/af_scaletempo.c index 6534a124ec..4c86744231 100644 --- a/libaf/af_scaletempo.c +++ b/libaf/af_scaletempo.c @@ -471,27 +471,28 @@ static int control(struct af_instance_s* af, int cmd, void* arg) return AF_ERROR; } if (s->scale_nominal <= 0) { - mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _("error parsing command line") ": " _("value out of range") - ": scale > 0\n"); + mp_msg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] %s: %s: scale > 0\n", + mp_gtext("error parsing command line"), + mp_gtext("value out of range")); return AF_ERROR; } if (s->ms_stride <= 0) { - mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _("error parsing command line") ": " _("value out of range") - ": stride > 0\n"); + mp_msg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] %s: %s: stride > 0\n", + mp_gtext("error parsing command line"), + mp_gtext("value out of range")); return AF_ERROR; } if (s->percent_overlap < 0 || s->percent_overlap > 1) { - mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _("error parsing command line") ": " _("value out of range") - ": 0 <= overlap <= 1\n"); + mp_msg(MSGT_AFILTER, MSGL_ERR, + "[scaletempo] %s: %s: 0 <= overlap <= 1\n", + mp_gtext("error parsing command line"), + mp_gtext("value out of range")); return AF_ERROR; } if (s->ms_search < 0) { - mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _("error parsing command line") ": " _("value out of range") - ": search >= 0\n"); + mp_msg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] %s: %s: search >= 0\n", + mp_gtext("error parsing command line"), + mp_gtext("value out of range")); return AF_ERROR; } if (speed.len > 0) { @@ -508,9 +509,10 @@ static int control(struct af_instance_s* af, int cmd, void* arg) s->speed_tempo = 1; s->speed_pitch = 1; } else { - mp_tmsg(MSGT_AFILTER, MSGL_ERR, "[scaletempo] " - _("error parsing command line") ": " _("value out of range") - ": speed=[pitch|tempo|none|both]\n"); + mp_msg(MSGT_AFILTER, MSGL_ERR, + "[scaletempo] %s: %s: speed=[pitch|tempo|none|both]\n", + mp_gtext("error parsing command line"), + mp_gtext("value out of range")); return AF_ERROR; } } -- cgit v1.2.3