dolphin part context menu now displays delete and not send to trash for remote files...

[dolphin.git] / src / commenteditwidget.cpp

diff --git a/src/commenteditwidget.cpp b/src/commenteditwidget.cpp
index 3b98d44d7b8d659e3ac208529558ce8d1e30ccbf..e1069a92931187cf7bb72f96ac5ab69451981e46 100644 (file)
--- a/src/commenteditwidget.cpp
+++ b/src/commenteditwidget.cpp
@@ -126,8 +126,8 @@ CommentEditWidget::CommentEditWidget( QWidget* parent )
     d->buttonCancel->setAutoRaise( true );
     d->buttonSave->setIcon( KIcon( "document-save" ) );
     d->buttonCancel->setIcon( KIcon( "edit-delete" ) );
-    d->buttonSave->setText( i18n( "Save" ) );
-    d->buttonCancel->setText( i18n( "Cancel" ) );
+    d->buttonSave->setText( i18nc( "@action:button", "Save" ) );
+    d->buttonCancel->setText( i18nc( "@action:button", "Cancel" ) );
 
     QFont fnt( font() );
     fnt.setPointSize( fnt.pointSize()-2 );
@@ -162,7 +162,7 @@ QString CommentEditWidget::comment()
 bool CommentEditWidget::exec( const QPoint& pos )
 {
     d->success = false;
-    d->textEdit->setText( d->comment );
+    d->textEdit->setPlainText( d->comment );
     d->textEdit->setFocus();
     d->textEdit->moveCursor( QTextCursor::End );
     QEventLoop eventLoop;