Merge branch 'pr1719'

src/widget/form/chatform.cpp

@@ -79,7 +79,7 @@ ChatForm::ChatForm(Friend* chatFriend)
     headTextLayout->addWidget(callDuration, 1, Qt::AlignCenter);
     callDuration->hide();
 
-    menu.addAction(tr("Load chat history..."), this, SLOT(onLoadHistory()));
+    menu.addAction(QObject::tr("Load chat history..."), this, SLOT(onLoadHistory()));
 
     connect(Core::getInstance(), &Core::fileSendStarted, this, &ChatForm::startFileSend);
     connect(sendButton, &QPushButton::clicked, this, &ChatForm::onSendTriggered);

translations/it.ts

@@ -2115,7 +2115,7 @@ Verrà installata al riavvio del programma.</translation>
 Permettimi di aggiungerti alla mia lista contatti.</translation>
     </message>
     <message>
-        <location filename="../src/chatlog/chatmessage.cpp" line="124"/>
+        <location filename="../src/chatlog/chatmessage.cpp" line="129"/>
         <source>Resizing</source>
         <translation>Ridimensiona</translation>
     </message>
@@ -2124,6 +2124,11 @@ Permettimi di aggiungerti alla mia lista contatti.</translation>
         <source>User Profile</source>
         <translation>Profilo Utente</translation>
     </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="82"/>
+        <source>Load chat history...</source>
+        <translation>Carica cronologia chat...</translation>
+    </message>
 </context>
 <context>
     <name>ScreenshotGrabber</name>