Re: Bug#766311: update-alternatives, german translation: im manueller Modus bereitstellen

[Sven Joachim <svenjoac@gmx.de>]

On 2014-10-22 19:08 +0200, Guillem Jover wrote:

> On Wed, 2014-10-22 at 18:49:06 +0200, Sven Joachim wrote:
>> On 2014-10-22 08:46 +0200, Andrei POPESCU wrote:
>> > On Mi, 22 oct 14, 08:23:27, Oliver Grimm wrote:
>> >> Package: update-alternatives
>> >> Version: dpkg
>> >> Severity: minor
>> >> Tags: l10n
>
>> >> applying update-alternatives to x-session-manager gives the following message
>> >> (in German):
>> >> 
>> >> ---
>> >> update-alternatives: /usr/bin/xfce4-session wird verwendet, um /usr/bin/x
>> >> -session-manager (x-session-manager) im manueller Modus bereitzustellen
>> >> ---
>> >> 
>> >> where correct grammar should say "...im manuellen Modus...".
>> >
>> > You might want to CC the German translators list on such issues, doing 
>> > so with this message.
>> 
>> Fixing this bug requires changes in update-alternatives, since the same
>> very short string ("manual mode") is used in different places, and at
>> least two of them (update-alternatives --display|--config <package>) use
>> nominative case.
>
> Would the attached patch, fix it?

Yes, I think that should work.

Cheers,
       Sven


> commit 13cb8cbe1cbc7a24d9352127ceaa72fb9aa802e3
> Author: Guillem Jover <guillem@debian.org>
> Date:   Wed Oct 22 19:01:51 2014 +0200
>
>     u-a: Inline alternative status description into translatable string
>     
>     This makes it possible to correctly translate the string.
>
> diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
> index 62675e8..d5f9af5 100644
> --- a/utils/update-alternatives.c
> +++ b/utils/update-alternatives.c
> @@ -2331,9 +2331,12 @@ alternative_update(struct alternative *a,
>  	    (!current_choice || strcmp(new_choice, current_choice) != 0)) {
>  		log_msg("link group %s updated to point to %s", a->master_name,
>  		        new_choice);
> -		info(_("using %s to provide %s (%s) in %s"), new_choice,
> -		     a->master_link, a->master_name,
> -		     alternative_status_describe(a->status));
> +		if (a->status == ALT_ST_AUTO)
> +			info(_("using %s to provide %s (%s) in auto mode"),
> +			     new_choice, a->master_link, a->master_name);
> +		else
> +			info(_("using %s to provide %s (%s) in manual mode"),
> +			     new_choice, a->master_link, a->master_name);
>  		debug("prepare_install(%s)", new_choice);
>  		alternative_prepare_install(a, new_choice);
>  	} else if ((reason = alternative_needs_update(a))) {