Merge pull request #4145 from Chocobo1/misc_fix

Misc fixes

src/gui/advancedsettings.h

@@ -261,7 +261,7 @@ private slots:
         spin_maxhalfopen.setMinimum(0);
         spin_maxhalfopen.setMaximum(99999);
         spin_maxhalfopen.setValue(pref->getMaxHalfOpenConnections());
-        setRow(MAX_HALF_OPEN, tr("Maximum number of half-open connections [0: Disabled]"), &spin_maxhalfopen);
+        setRow(MAX_HALF_OPEN, tr("Maximum number of half-open connections [0: Unlimited]"), &spin_maxhalfopen);
         // Super seeding
         cb_super_seeding.setChecked(pref->isSuperSeedingEnabled());
         setRow(SUPER_SEEDING, tr("Strict super seeding"), &cb_super_seeding);

src/gui/properties/propertieswidget.cpp

@@ -400,8 +400,8 @@ void PropertiesWidget::loadDynamicData() {
         lbl_elapsed->setText(elapsed_txt);
 
         lbl_connections->setText(tr("%1 (%2 max)", "%1 and %2 are numbers, e.g. 3 (10 max)")
-                                .arg(m_torrent->connectionsCount() < 0 ? QString::fromUtf8(C_INFINITY) : QString::number(m_torrent->connectionsCount()))
-                                .arg(QString::number(m_torrent->connectionsLimit())));
+                                .arg(m_torrent->connectionsCount())
+                                .arg(m_torrent->connectionsLimit() < 0 ? QString::fromUtf8(C_INFINITY) : QString::number(m_torrent->connectionsLimit())));
 
         label_eta_val->setText(Utils::Misc::userFriendlyDuration(m_torrent->eta()));