more pl translations

* removed unused code
* notification about rejected call(not tested)
* notification about cancelled call

src/filetransferinstance.cpp

@@ -239,7 +239,9 @@ void FileTransferInstance::acceptRecvRequest()
                 if (isFileWritable(path))
                     break;
                 else
-                    QMessageBox::warning(0, tr("Location not writable","Title of permissions popup"), tr("You do not have permission to write that location. Choose another, or cancel the save dialog.", "text of permissions popup"));
+                    QMessageBox::warning(0,
+                                         tr("Location not writable","Title of permissions popup"),
+                                         tr("You do not have permission to write that location. Choose another, or cancel the save dialog.", "text of permissions popup"));
             }
         }
     }
@@ -263,9 +265,7 @@ void FileTransferInstance::pauseResumeRecv()
         return;
 
     Core::getInstance()->pauseResumeFileRecv(friendId, fileNum);
-//    if (state == tsProcessing)
-//        state = tsPaused;
-//    else state = tsProcessing;
+
     if (state == tsPaused)
     {
         effStartTime = QDateTime::currentDateTime();
@@ -284,9 +284,7 @@ void FileTransferInstance::pauseResumeSend()
         return;
 
     Core::getInstance()->pauseResumeFileSend(friendId, fileNum);
-//    if (state == tsProcessing)
-//        state = tsPaused;
-//    else state = tsProcessing;
+
     if (state == tsPaused)
     {
         effStartTime = QDateTime::currentDateTime();
@@ -307,7 +305,6 @@ QString FileTransferInstance::QImage2base64(const QImage &img)
 
 QString FileTransferInstance::getHtmlImage()
 {
-    //qDebug() << "QString FileTransferInstance::getHtmlImage() " << state;
 
     QString res;
     if (state == tsPending || state == tsProcessing || state == tsPaused)

src/widget/form/chatform.cpp

@@ -231,6 +231,7 @@ void ChatForm::onAvInvite(int FriendId, int CallId, bool video)
         videoButton->style()->polish(videoButton);
         connect(callButton, SIGNAL(clicked()), this, SLOT(onAnswerCallTriggered()));
     }
+    
     addSystemInfoMessage(tr("%1 calling").arg(f->getName()), "white", QDateTime::currentDateTime());    
 
     Widget* w = Widget::getInstance();
@@ -299,7 +300,8 @@ void ChatForm::onAvCancel(int FriendId, int)
     connect(videoButton, SIGNAL(clicked()), this, SLOT(onVideoCallTriggered()));
 
     netcam->hide();
-        
+    
+    addSystemInfoMessage(tr("%1 stopped calling").arg(f->getName()), "white", QDateTime::currentDateTime());        
 }
 
 void ChatForm::onAvEnd(int FriendId, int)
@@ -331,6 +333,7 @@ void ChatForm::onAvEnd(int FriendId, int)
 
 void ChatForm::onAvRinging(int FriendId, int CallId, bool video)
 {    
+    qDebug() << "onAvRinging";
     if (FriendId != f->friendId)
         return;
 
@@ -353,7 +356,8 @@ void ChatForm::onAvRinging(int FriendId, int CallId, bool video)
         videoButton->style()->polish(videoButton);
         connect(callButton, SIGNAL(clicked()), this, SLOT(onCancelCallTriggered()));
     }
-    addSystemInfoMessage(tr("%1 calling").arg(f->getName()), "white", QDateTime::currentDateTime());    
+    
+    addSystemInfoMessage(tr("Calling to %1").arg(f->getName()), "white", QDateTime::currentDateTime());    
 }
 
 void ChatForm::onAvStarting(int FriendId, int CallId, bool video)
@@ -748,9 +752,11 @@ void ChatForm::stopCounter()
 {
     if(timer)
     {
-        addSystemInfoMessage(tr("Call with %1 ended. %2").arg(f->getName(), secondsToDHMS(timeElapsed.elapsed()/1000)),
+        addSystemInfoMessage(tr("Call with %1 ended. %2").arg(f->getName(),
+                                                              secondsToDHMS(timeElapsed.elapsed()/1000)),
                              "white", QDateTime::currentDateTime());
         timer->stop();
+        callDuration->setText("");
         callDuration->hide();
         timer = nullptr;
         delete timer;

src/widget/form/settings/identityform.cpp

@@ -183,7 +183,10 @@ void IdentityForm::onDeleteClicked()
 
 void IdentityForm::onImportClicked()
 {
-    QString path = QFileDialog::getOpenFileName(this, tr("Import profile", "import dialog title"), QDir::homePath(), tr("Tox save file (*.tox)", "import dialog filter"));
+    QString path = QFileDialog::getOpenFileName(this,
+                                                tr("Import profile", "import dialog title"),
+                                                QDir::homePath(),
+                                                tr("Tox save file (*.tox)", "import dialog filter"));
     if (path.isEmpty())
         return;
 
@@ -192,7 +195,9 @@ void IdentityForm::onImportClicked()
 
     if (info.suffix() != "tox")
     {
-        QMessageBox::warning(this, tr("Ignoring non-Tox file", "popup title"), tr("Warning: you've chosen a file that is not a Tox save file; ignoring.", "popup text"));
+        QMessageBox::warning(this,
+                             tr("Ignoring non-Tox file", "popup title"),
+                             tr("Warning: you've chosen a file that is not a Tox save file; ignoring.", "popup text"));
         return;
     }
 

translations/pl.ts

@@ -11,10 +11,6 @@
 </context>
 <context>
     <name>AVSettings</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Ustawienia</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/avsettings.ui" line="41"/>
         <source>Audio Settings</source>
@@ -176,23 +172,34 @@
         <translation>Nie można przesłać tego pliku!</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="234"/>
-        <location filename="../src/widget/form/chatform.cpp" line="356"/>
+        <location filename="../src/widget/form/chatform.cpp" line="235"/>
         <source>%1 calling</source>
         <translation>%1 dzwoni</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="497"/>
+        <location filename="../src/widget/form/chatform.cpp" line="304"/>
+        <source>%1 stopped calling</source>
+        <translatorcomment>?</translatorcomment>
+        <translation>Nieodebrana rozmowa od %1</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="360"/>
+        <source>Calling to %1</source>
+        <translatorcomment>at least gender neutral...</translatorcomment>
+        <translation>Dzwonisz do %1</translation>
+    </message>
+    <message>
+        <location filename="../src/widget/form/chatform.cpp" line="501"/>
         <source>Call rejected</source>
-        <translation>Połączenie odrzucone</translation>
+        <translation>Połączenie zostało odrzucone</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="751"/>
+        <location filename="../src/widget/form/chatform.cpp" line="755"/>
         <source>Call with %1 ended. %2</source>
         <translation>Rozmowa z %1 została zakończona. %2</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/chatform.cpp" line="769"/>
+        <location filename="../src/widget/form/chatform.cpp" line="775"/>
         <source>Call duration: </source>
         <translation>Czas trwania rozmowy: </translation>
     </message>
@@ -291,7 +298,7 @@ Czy chcesz spróbować z innym hasłem?</translation>
         <location filename="../src/core.cpp" line="1251"/>
         <source>Loggin</source>
         <translatorcomment>pasuje do kontekstu</translatorcomment>
-        <translation type="unfinished">Błąd</translation>
+        <translation>Błąd</translation>
     </message>
     <message>
         <location filename="../src/core.cpp" line="1251"/>
@@ -320,19 +327,19 @@ Czy chcesz spróbować z innym hasłem?</translation>
         <translation>Zapisz plik</translation>
     </message>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="242"/>
+        <location filename="../src/filetransferinstance.cpp" line="243"/>
         <source>Location not writable</source>
         <comment>Title of permissions popup</comment>
         <translation>Nie można zapisać w lokacji</translation>
     </message>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="242"/>
+        <location filename="../src/filetransferinstance.cpp" line="244"/>
         <source>You do not have permission to write that location. Choose another, or cancel the save dialog.</source>
         <comment>text of permissions popup</comment>
         <translation>Nie masz uprawnienia by zapisać w tej lokacji. Wybierz inną lub anuluj zapis.</translation>
     </message>
     <message>
-        <location filename="../src/filetransferinstance.cpp" line="423"/>
+        <location filename="../src/filetransferinstance.cpp" line="420"/>
         <source>ETA</source>
         <translation>ETA</translation>
     </message>
@@ -473,10 +480,6 @@ Czy chcesz spróbować z innym hasłem?</translation>
 </context>
 <context>
     <name>GeneralSettings</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Ustawienia</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="56"/>
         <source>General Settings</source>
@@ -573,26 +576,6 @@ Czy chcesz spróbować z innym hasłem?</translation>
         <source>Theme</source>
         <translation>Motyw</translation>
     </message>
-    <message>
-        <source>:)</source>
-        <translation type="vanished">:)</translation>
-    </message>
-    <message>
-        <source>;)</source>
-        <translation type="vanished">;)</translation>
-    </message>
-    <message>
-        <source>:p</source>
-        <translation type="vanished">:p</translation>
-    </message>
-    <message>
-        <source>:O</source>
-        <translation type="vanished">:O</translation>
-    </message>
-    <message>
-        <source>:&apos;(</source>
-        <translation type="vanished">:&apos;(</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="280"/>
         <source>Connection Settings</source>
@@ -610,11 +593,6 @@ Czy chcesz spróbować z innym hasłem?</translation>
         <extracomment>force tcp checkbox tooltip</extracomment>
         <translation>To pozwala np. na toxowanie przez Tora. Niestety obciąża to sieć Tox, więc używaj tylko w razie potrzeby.</translation>
     </message>
-    <message>
-        <source>Disable UDP (not recommended)</source>
-        <extracomment>Text on checkbox to disable UDP</extracomment>
-        <translation type="vanished">Wyłącz UDP (nie zalecane)</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/generalsettings.ui" line="309"/>
         <source>Use proxy (SOCKS5)</source>
@@ -796,37 +774,37 @@ Czy chcesz spróbować z innym hasłem?</translation>
         <translation>Czy na pewno chcesz usunąć ten profil?</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="186"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="187"/>
         <source>Import profile</source>
         <comment>import dialog title</comment>
         <translation>Importuj profil</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="186"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="189"/>
         <source>Tox save file (*.tox)</source>
         <comment>import dialog filter</comment>
         <translation>Plik zapisu Tox (*.tox)</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="195"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="199"/>
         <source>Ignoring non-Tox file</source>
         <comment>popup title</comment>
         <translation>Zignorowano niepoprawny plik profilu</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="195"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="200"/>
         <source>Warning: you&apos;ve chosen a file that is not a Tox save file; ignoring.</source>
         <comment>popup text</comment>
         <translation>Ostrzeżenie: Wybrano plik który nie jest plikiem zapisu Tox; zignorowano.</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="199"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="204"/>
         <source>Profile already exists</source>
         <comment>import confirm title</comment>
         <translation>Profil już istnieje</translation>
     </message>
     <message>
-        <location filename="../src/widget/form/settings/identityform.cpp" line="200"/>
+        <location filename="../src/widget/form/settings/identityform.cpp" line="205"/>
         <source>A profile named &quot;%1&quot; already exists. Do you want to erase it?</source>
         <comment>import confirm text</comment>
         <translation>Profil pod nazwą &quot;%1&quot; już istnieje. Czy chcesz go usunąć?</translation>
@@ -834,10 +812,6 @@ Czy chcesz spróbować z innym hasłem?</translation>
 </context>
 <context>
     <name>IdentitySettings</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Ustawienia</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/identitysettings.ui" line="53"/>
         <source>Public Information</source>
@@ -951,10 +925,6 @@ Czy chcesz spróbować z innym hasłem?</translation>
 </context>
 <context>
     <name>MainWindow</name>
-    <message>
-        <source>qTox</source>
-        <translation type="vanished">qTox</translation>
-    </message>
     <message>
         <location filename="../src/mainwindow.ui" line="859"/>
         <source>Your name</source>
@@ -991,17 +961,13 @@ Czy chcesz spróbować z innym hasłem?</translation>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
-    <message>
-        <source>Ctrl+Q</source>
-        <translation type="vanished">Ctrl+Q</translation>
-    </message>
 </context>
 <context>
     <name>NetCamView</name>
     <message>
         <location filename="../src/widget/netcamview.cpp" line="28"/>
         <source>Tox video</source>
-        <translation type="unfinished">Tox video</translation>
+        <translation>Tox video</translation>
     </message>
 </context>
 <context>
@@ -1026,10 +992,6 @@ Czy chcesz usunąć stary plik historii?</translation>
 </context>
 <context>
     <name>PrivacySettings</name>
-    <message>
-        <source>Form</source>
-        <translation type="vanished">Ustawienia</translation>
-    </message>
     <message>
         <location filename="../src/widget/form/settings/privacysettings.ui" line="50"/>
         <source>Typing Notification</source>