From kde-i18n-doc Mon Oct 24 16:55:16 2005 From: Jason Harris Date: Mon, 24 Oct 2005 16:55:16 +0000 To: kde-i18n-doc Subject: typos in KStars Message-Id: <200510240955.16473.kstars () 30doradus ! org> X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=113017608404199 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--Boundary-00=_0HRXDDv+H1zZ0Dy" --Boundary-00=_0HRXDDv+H1zZ0Dy Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, Bug report #114927 (http://bugs.kde.org/show_bug.cgi?id=114927) points out some unfortunate typos in some (potentially) user-visible strings. In short, I am using arg() to fill in three values in an i18n() string, but I mistakenly use "%1", "%2", "%1" as the three placeholders. The bug reporter suggests this is worth breaking strings freeze to fix. However, I'd like to note that the affected lines appear in a function that will only be called if the user adds their own custom object catalog (and furthermore, only if there is an error parsing the catalog). This is probably going to be a very small number of users. With that caveat in mind, is it worth committing the change now, or should I wait until after 3.5.0 ? The patch is attached. thanks, Jason -- ------------------------------- KStars: KDE Desktop Planetarium http://edu.kde.org/kstars --Boundary-00=_0HRXDDv+H1zZ0Dy Content-Type: text/x-diff; charset="us-ascii"; name="kstarsdata.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="kstarsdata.patch" Index: kstarsdata.cpp =================================================================== --- kstarsdata.cpp (revision 473761) +++ kstarsdata.cpp (working copy) @@ -1280,7 +1280,7 @@ if ( Columns[i] == "Dc" ) { if ( ! Dec.setFromString( d[i], true ) ) { if ( showerrs ) - errs.append( i18n( "Line %1, field %2: Unable to parse Dec value: %1" ) + errs.append( i18n( "Line %1, field %2: Unable to parse Dec value: %3" ) .arg(lnum).arg(i).arg(d[i]) ); return false; } @@ -1292,14 +1292,14 @@ if ( ok ) { if ( iType == 2 || iType > 8 ) { if ( showerrs ) - errs.append( i18n( "Line %1, field %2: Invalid object type: %1" ) + errs.append( i18n( "Line %1, field %2: Invalid object type: %3" ) .arg(lnum).arg(i).arg(d[i]) + i18n( "Must be one of 0, 1, 3, 4, 5, 6, 7, 8." ) ); return false; } } else { if ( showerrs ) - errs.append( i18n( "Line %1, field %2: Unable to parse Object type: %1" ) + errs.append( i18n( "Line %1, field %2: Unable to parse Object type: %3" ) .arg(lnum).arg(i).arg(d[i]) ); return false; } @@ -1310,7 +1310,7 @@ mag = d[i].toFloat( &ok ); if ( ! ok ) { if ( showerrs ) - errs.append( i18n( "Line %1, field %2: Unable to parse Magnitude: %1" ) + errs.append( i18n( "Line %1, field %2: Unable to parse Magnitude: %3" ) .arg(lnum).arg(i).arg(d[i]) ); return false; } @@ -1321,7 +1321,7 @@ a = d[i].toFloat( &ok ); if ( ! ok ) { if ( showerrs ) - errs.append( i18n( "Line %1, field %2: Unable to parse Major Axis: %1" ) + errs.append( i18n( "Line %1, field %2: Unable to parse Major Axis: %3" ) .arg(lnum).arg(i).arg(d[i]) ); return false; } @@ -1332,7 +1332,7 @@ b = d[i].toFloat( &ok ); if ( ! ok ) { if ( showerrs ) - errs.append( i18n( "Line %1, field %2: Unable to parse Minor Axis: %1" ) + errs.append( i18n( "Line %1, field %2: Unable to parse Minor Axis: %3" ) .arg(lnum).arg(i).arg(d[i]) ); return false; } @@ -1343,7 +1343,7 @@ PA = d[i].toFloat( &ok ); if ( ! ok ) { if ( showerrs ) - errs.append( i18n( "Line %1, field %2: Unable to parse Position Angle: %1" ) + errs.append( i18n( "Line %1, field %2: Unable to parse Position Angle: %3" ) .arg(lnum).arg(i).arg(d[i]) ); return false; } --Boundary-00=_0HRXDDv+H1zZ0Dy--