X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.cpp;h=3ee98d9370761682095ca229dbab063754df4d92;hb=3202bf5340396b5c6b467e8d92d808b1cbbbf7fb;hp=874dce8fab20adcb7d11ffc5654f44799bdf752c;hpb=b56a8712f3063e93b68bfa6bd8f2ec67e955df50;p=quassel.git

diff --git a/src/uisupport/multilineedit.cpp b/src/uisupport/multilineedit.cpp
index 874dce8f..3ee98d93 100644
--- a/src/uisupport/multilineedit.cpp
+++ b/src/uisupport/multilineedit.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -637,11 +637,9 @@ void MultiLineEdit::on_returnPressed(const QString & text) {
       if(line.isEmpty())
         continue;
       addToHistory(line);
-    }
-    reset();
-    foreach(const QString &line, text.split('\n', QString::SkipEmptyParts)) {
       emit textEntered(line);
     }
+    reset();
     _tempHistory.clear();
   } else {
     emit noTextEntered();
@@ -660,7 +658,7 @@ void MultiLineEdit::on_textChanged() {
       clear();
 
       if(lines.count() >= 4) {
-        QString msg = tr("Do you really want to paste %n lines?", "", lines.count());
+        QString msg = tr("Do you really want to paste %n line(s)?", "", lines.count());
         msg += "<p>";
         for(int i = 0; i < 4; i++) {
           msg += Qt::escape(lines[i].left(40));