[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    koffice/karbon
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2006-03-15 18:55:56
Message-ID: 1142448956.241422.17765.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 518946 by jaham:

* some more i18n fixes on translator demand
* small fix for showing right text option dialog title (no new string)

CCMAIL:kde-i18n-doc@kde.org
CCBUG:123594



 M  +2 -1      tools/vselecttool.cc  
 M  +9 -10     tools/vtexttool.cc  
 M  +2 -2      visitors/vselectiondesc.cc  


--- trunk/koffice/karbon/tools/vselecttool.cc #518945:518946
@@ -417,7 +417,8 @@
 	{
 		KoRect rect = view()->part()->document().selection()->boundingBox();
 
-		QString selectMessage = QString( "Selection [(%1, %2), (%3, %4)] (%5)" ).arg( \
KoUnit::toUserValue( rect.x(), view()->part()->unit() ), 0, 'f', 1 ).arg( \
KoUnit::toUserValue( rect.y(), view()->part()->unit() ), 0, 'f', 1 ).arg( \
KoUnit::toUserValue( rect.right(), view()->part()->unit() ), 0, 'f', 1 ).arg( \
KoUnit::toUserValue( rect.bottom(), view()->part()->unit() ), 0, 'f', 1 ).arg( \
view()->part()->unitName() ); +		// print bottom-left (%1,%2), top-right (%3,%4) \
corner of selection bounding box and document unit (%5) +		QString selectMessage = \
QString( i18n( "Selection [(%1, %2), (%3, %4)] (%5)") ).arg( KoUnit::toUserValue( \
rect.x(), view()->part()->unit() ), 0, 'f', 1 ).arg( KoUnit::toUserValue( rect.y(), \
view()->part()->unit() ), 0, 'f', 1 ).arg( KoUnit::toUserValue( rect.right(), \
view()->part()->unit() ), 0, 'f', 1 ).arg( KoUnit::toUserValue( rect.bottom(), \
view()->part()->unit() ), 0, 'f', 1 ).arg( view()->part()->unitName() );  
 		VSelectionDescription selectionDesc;
 		selectionDesc.visit( *view()->part()->document().selection() );
--- trunk/koffice/karbon/tools/vtexttool.cc #518945:518946
@@ -387,14 +387,13 @@
 
 	m_convertToShapes->setEnabled( true );
 
-	// TODO: Find a way to display correctly the following icons...
-	m_textAlignment->insertItem( i18n( "Left") );
-	m_textAlignment->insertItem( i18n( "Center") );
-	m_textAlignment->insertItem( i18n( "Right") );
+	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Left") );
+	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Center") );
+	m_textAlignment->insertItem( i18n( "Horizontal alignment", "Right") );
 
-	m_textPosition->insertItem( i18n( "Above") );
-	m_textPosition->insertItem( i18n( "On") );
-	m_textPosition->insertItem( i18n( "Under") );
+	m_textPosition->insertItem( i18n( "Vertical alignment", "Above") );
+	m_textPosition->insertItem( i18n( "Vertical alignment", "On") );
+	m_textPosition->insertItem( i18n( "Vertical alignment", "Under") );
 
 	m_textOffset->setRange( 0.0, 100.0, 1.0, true );
 
@@ -692,7 +691,7 @@
 			return;
 	}
 
-	if( dynamic_cast<VText*>( selObj ) )
+	if( dynamic_cast<VText*>( selObj ) && selObj->boundingBox().contains( last() ) )
 		m_optionsWidget->setCaption( i18n( "Change Text") );
 	else 
 		m_optionsWidget->setCaption( i18n( "Insert Text") );
@@ -1120,9 +1119,9 @@
 		return false;
 
 	if( dynamic_cast<VText*>( selection->objects().getFirst() ) )
-		m_optionsWidget->setCaption( "Change Text" );
+		m_optionsWidget->setCaption(i18n( "Change Text") );
 	else 
-		m_optionsWidget->setCaption( "Insert Text" );
+		m_optionsWidget->setCaption(i18n( "Insert Text") );
 
 	m_optionsWidget->show();
 	return true;
--- trunk/koffice/karbon/visitors/vselectiondesc.cc #518945:518946
@@ -32,7 +32,7 @@
 	if( selection.objects().count() == 1 )
 		VVisitor::visitVSelection( selection );
 	else
-		m_desc = i18n( QString( "%1 objects" ).arg( selection.objects().count() ).latin1() \
); +		m_desc = i18n( "%1 objects" ).arg( selection.objects().count() );
 }
 
 void
@@ -44,7 +44,7 @@
 void
 VSelectionDescription::visitVGroup( VGroup &group )
 {
-	m_desc = i18n( QString( "1 group, containing %1 objects" ).arg( \
group.objects().count() ).latin1() ); +	m_desc = i18n( "1 group, containing %1 \
objects" ).arg( group.objects().count() );  m_shortdesc = !group.name().isEmpty() ? \
group.name() : i18n( "group" );  }
 


[prev in list] [next in list] [prev in thread] [next in thread]