SVN commit 743450 by jaham: fix some i18n isues reported by krazy M +3 -3 dialogs/vconfiguredlg.cc M +2 -2 dockers/KarbonLayerModel.cpp M +2 -2 karbon_view.cc M +1 -1 plugins/tools/KarbonPencilTool.cpp M +2 -2 widgets/KarbonStyleButtonBox.cpp M +4 -4 widgets/vgradienttabwidget.cc --- trunk/koffice/karbon/dialogs/vconfiguredlg.cc #743449:743450 @@ -71,7 +71,7 @@ connect( m_miscPage, SIGNAL( unitChanged( int ) ), m_gridPage, SLOT( slotUnitChanged( int ) ) ); m_defaultDocPage = new VConfigDefaultPage( parent ); - item = addPage( m_defaultDocPage, i18n( "Document" ) ); + item = addPage( m_defaultDocPage, i18nc( "@title:tab", "Document" ) ); item->setHeader( i18n( "Document Settings" ) ); item->setIcon(KIcon(BarIcon("document", KIconLoader::SizeMedium))); @@ -290,13 +290,13 @@ QGroupBox* spacingGrp = new QGroupBox( i18n( "Spacing" ), this ); QGridLayout* layoutSpacingGrp = new QGridLayout( spacingGrp ); - QLabel* spaceHorizLbl = new QLabel( i18n( "&Horizontal:" ) ); + QLabel* spaceHorizLbl = new QLabel( i18nc( "Horizontal grid spacing", "&Horizontal:" ) ); m_spaceHorizUSpin = new KoUnitDoubleSpinBox( spacingGrp ); m_spaceHorizUSpin->setMinMaxStep( 0.0, pageSize.width(), 0.1 ); m_spaceHorizUSpin->setUnit( unit ); m_spaceHorizUSpin->changeValue( gd.gridX() ); spaceHorizLbl->setBuddy( m_spaceHorizUSpin ); - QLabel* spaceVertLbl = new QLabel( i18n( "&Vertical:" ) ); + QLabel* spaceVertLbl = new QLabel( i18nc( "Vertical grid spacing", "&Vertical:" ) ); m_spaceVertUSpin = new KoUnitDoubleSpinBox( spacingGrp ); m_spaceVertUSpin->setMinMaxStep( 0.0, pageSize.height(), 0.1 ); m_spaceVertUSpin->setUnit( unit ); --- trunk/koffice/karbon/dockers/KarbonLayerModel.cpp #743449:743450 @@ -255,8 +255,8 @@ KoDocumentSectionModel::PropertyList KarbonLayerModel::properties( KoShape* shape ) const { PropertyList l; - l << Property(i18n("Visible"), SmallIcon("14_layer_visible"), SmallIcon("14_layer_novisible"), shape->isVisible()); - l << Property(i18n("Locked"), SmallIcon("encrypted"), SmallIcon("decrypted"), shape->isLocked()); + l << Property(i18nc("Visibility state of the shape","Visible"), SmallIcon("14_layer_visible"), SmallIcon("14_layer_novisible"), shape->isVisible()); + l << Property(i18nc("Lock state of the shape","Locked"), SmallIcon("encrypted"), SmallIcon("decrypted"), shape->isLocked()); return l; } --- trunk/koffice/karbon/karbon_view.cc #743449:743450 @@ -976,7 +976,7 @@ // edit <----- // object -----> - KAction *actionDuplicate = new KAction(KIcon("duplicate"), i18n("&Duplicate"), this); + KAction *actionDuplicate = new KAction(KIcon("duplicate"), i18nc("Duplicate selection", "&Duplicate"), this); actionCollection()->addAction("object_duplicate", actionDuplicate ); actionDuplicate->setShortcut(QKeySequence("Ctrl+D")); connect(actionDuplicate, SIGNAL(triggered()), this, SLOT(selectionDuplicate())); @@ -991,7 +991,7 @@ actionRaise->setShortcut(QKeySequence("Ctrl+]")); connect(actionRaise, SIGNAL(triggered()), this, SLOT(selectionMoveUp())); - KAction *actionLower = new KAction(KIcon("lower"), i18n("&Lower"), this); + KAction *actionLower = new KAction(KIcon("lower"), i18nc("Lower selected shapes", "&Lower"), this); actionCollection()->addAction("object_move_down", actionLower ); actionLower->setShortcut(QKeySequence("Ctrl+[")); connect(actionLower, SIGNAL(triggered()), this, SLOT(selectionMoveDown())); --- trunk/koffice/karbon/plugins/tools/KarbonPencilTool.cpp #743449:743450 @@ -251,7 +251,7 @@ QVBoxLayout * layout = new QVBoxLayout( optionWidget ); KComboBox * modeBox = new KComboBox( optionWidget ); - modeBox->addItem( i18n( "Raw" ) ); + modeBox->addItem( i18nc( "The raw line data", "Raw" ) ); modeBox->addItem( i18n( "Curve" ) ); modeBox->addItem( i18n( "Straight" ) ); layout->addWidget( modeBox ); --- trunk/koffice/karbon/widgets/KarbonStyleButtonBox.cpp #743449:743450 @@ -284,7 +284,7 @@ QPushButton* button = new QPushButton( this ); button->setIcon( QPixmap( (const char **) buttonnone ) ); button->setMinimumHeight( 20 ); - button->setToolTip( i18n( "None" ) ); + button->setToolTip( i18nc( "No stroke or fill", "None" ) ); group->addButton( button, None ); layout->addWidget( button, 0, 0 ); @@ -292,7 +292,7 @@ button = new QPushButton( this ); button->setIcon( QPixmap( (const char **) buttonsolid ) ); button->setMinimumHeight( 20 ); - button->setToolTip( i18n( "Solid" ) ); + button->setToolTip( i18nc( "Solid color stroke or fill", "Solid" ) ); group->addButton( button, Solid ); layout->addWidget( button, 0, 1 ); --- trunk/koffice/karbon/widgets/vgradienttabwidget.cc #743449:743450 @@ -321,13 +321,13 @@ editLayout->addWidget( new QLabel( i18n( "Target:" ), m_editTab ), 2, 0 ); m_gradientType = new KComboBox( false, m_editTab ); - m_gradientType->insertItem( 0, i18n( "Linear" ) ); - m_gradientType->insertItem( 1, i18n( "Radial" ) ); - m_gradientType->insertItem( 2, i18n( "Conical" ) ); + m_gradientType->insertItem( 0, i18nc( "Linear gradient type", "Linear" ) ); + m_gradientType->insertItem( 1, i18nc( "Radial gradient type", "Radial" ) ); + m_gradientType->insertItem( 2, i18nc( "Conical gradient type", "Conical" ) ); editLayout->addWidget( m_gradientType, 0, 1 ); m_gradientRepeat = new KComboBox( false, m_editTab ); - m_gradientRepeat->insertItem( 0, i18n( "None" ) ); + m_gradientRepeat->insertItem( 0, i18nc( "No gradient spread", "None" ) ); m_gradientRepeat->insertItem( 1, i18n( "Reflect" ) ); m_gradientRepeat->insertItem( 2, i18n( "Repeat" ) ); editLayout->addWidget( m_gradientRepeat, 1, 1 );