Merge branch 'pr560'

src/widget/tool/chattextedit.cpp

@@ -20,7 +20,7 @@
 ChatTextEdit::ChatTextEdit(QWidget *parent) :
     QTextEdit(parent)
 {
-    setPlaceholderText("Type your message here...");
+    setPlaceholderText(tr("Type your message here..."));
     setAcceptRichText(false);
 }
 

src/widget/widget.cpp

@@ -1016,7 +1016,7 @@ void Widget::onMessageSendResult(int friendId, const QString& message, int messa
         return;
 
     if (!messageId)
-        f->chatForm->addSystemInfoMessage("Message failed to send", "red", QDateTime::currentDateTime());
+        f->chatForm->addSystemInfoMessage(tr("Message failed to send"), "red", QDateTime::currentDateTime());
 }
 
 void Widget::onGroupSendResult(int groupId, const QString& message, int result)
@@ -1027,7 +1027,7 @@ void Widget::onGroupSendResult(int groupId, const QString& message, int result)
         return;
 
     if (result == -1)
-        g->chatForm->addSystemInfoMessage("Message failed to send", "red", QDateTime::currentDateTime());
+        g->chatForm->addSystemInfoMessage(tr("Message failed to send"), "red", QDateTime::currentDateTime());
 }
 
 void Widget::getPassword(QString info, int passtype, uint8_t* salt)