Re: [Cvslog] r15872 - in /lyx-devel/trunk: Status.15x src/frontends/qt...

[Georg Baum]

Am Sonntag, 12. November 2006 10:36 schrieb [EMAIL PROTECTED]:
> Author: baum
> Date: Sun Nov 12 10:36:08 2006
> New Revision: 15872
> 
> URL: http://www.lyx.org/trac/changeset/15872
> Log:
> Fix translation of ambiguous messages
> 
>       * src/frontends/qt4/ui/QPrefConvertersUi.ui: Readd translation hint
>       to label and remove broken tooltip that somebody created instead
> 
>       * src/messages.C
>       (Messages::Pimpl::get): reenable stripping of [[..]] from
>       untranslated messages
> 
> Modified:
>     lyx-devel/trunk/Status.15x
>     lyx-devel/trunk/src/frontends/qt4/ui/QPrefConvertersUi.ui
>     lyx-devel/trunk/src/messages.C


It turned out that somebody converted the translation hint to a tooltip:


> Modified: lyx-devel/trunk/src/frontends/qt4/ui/QPrefConvertersUi.ui
> URL: 
http://www.lyx.org/trac/file/lyx-devel/trunk/src/frontends/qt4/ui/QPrefConvertersUi.ui?rev=15872
> 
==============================================================================
> --- lyx-devel/trunk/src/frontends/qt4/ui/QPrefConvertersUi.ui (original)
> +++ lyx-devel/trunk/src/frontends/qt4/ui/QPrefConvertersUi.ui Sun Nov 12 
10:36:08 2006
> @@ -146,11 +146,8 @@
>       </item>
>       <item row="1" column="0" >
>        <widget class="QLabel" name="converterToLA" >
> -       <property name="toolTip" >
> -        <string>&lt;html>&lt;head>&lt;meta name="qrichtext" 
content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; 
font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; 
text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; 
margin-left:0px; margin-right:0px; -qt-block-indent:0; 
text-indent:0px;">[[as in 'From format x to format 
y']]&lt;/p>&lt;/body>&lt;/html></string>
> -       </property>
> -       <property name="text" >
> -        <string>&amp;To:</string>
> +       <property name="text" >
> +        <string>&amp;To:[[as in 'From format x to format y']]</string>
>         </property>
>         <property name="buddy" >
>          <cstring>converterToCO</cstring>
> 


Because of the recent translation remerge the translations for this tstring 
are lost. This is a reminder that a suffix [[....]] of a message is a 
translation hint for ambigous messages. It gets stripped if no translation 
is provided, and it should not be removed!


Georg