Merge branch 'pr569'

src/filetransferinstance.cpp

@@ -420,7 +420,7 @@ QString FileTransferInstance::draw2ButtonsForm(const QString &type, const QImage
     content += "<table cellspacing=\"0\"><tr>";
     content += "<td>" + size + "</td>";
     content += "<td align=center>" + speed + "</td>";
-    content += "<td align=right>ETA: " + eta + "</td>";
+    content += "<td align=right>" + tr("ETA") + ": " + eta + "</td>";
     content += "</tr><tr><td colspan=3>";
     content += progrBar;
     content += "</td></tr></table>";

src/widget/form/chatform.cpp

@@ -122,7 +122,7 @@ void ChatForm::onAttachClicked()
             continue;
         if (file.isSequential())
         {
-            QMessageBox::critical(0, "Bad Idea", "You're trying to send a special (sequential) file, that's not going to work!");
+            QMessageBox::critical(0, tr("Bad Idea"), tr("You're trying to send a special (sequential) file, that's not going to work!"));
             file.close();
             continue;
         }

src/widget/form/settings/generalform.cpp

@@ -58,7 +58,7 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
     if(QStyleFactory::keys().contains(Settings::getInstance().getStyle()))
         bodyUI->styleBrowser->setCurrentText(Settings::getInstance().getStyle());
     else
-        bodyUI->styleBrowser->setCurrentText("None");
+        bodyUI->styleBrowser->setCurrentText(tr("None"));
     
     bodyUI->autoAwaySpinBox->setValue(Settings::getInstance().getAutoAwayTime());
     

src/widget/netcamview.cpp

@@ -25,7 +25,7 @@ NetCamView::NetCamView(QWidget* parent)
     , mainLayout(new QHBoxLayout())
 {
     setLayout(mainLayout);
-    setWindowTitle("Tox video");
+    setWindowTitle(tr("Tox video"));
     setMinimumSize(320,240);
 
     videoSurface = new VideoSurface(this);