mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-01 19:06:20 -05:00
Merge translation branch, add translated string to peerstats and ratestatus
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1199 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0c41943958
commit
705a51ac1f
@ -76,7 +76,7 @@ void PeerStatus::getPeerStatus()
|
|||||||
int others = 1 + ids.size();
|
int others = 1 + ids.size();
|
||||||
|
|
||||||
std::ostringstream out2;
|
std::ostringstream out2;
|
||||||
out2 << "<span style=\"color:#008000\"><strong>Online: </strong></span>" << online << " | <span style=\"color:#0000FF\"><strong>Friends: </strong></span>" << friends << " | <strong>Network: </strong>" << others << " ";
|
out2 << "<span style=\"color:#008000\"><strong>" << tr("Online:").toStdString() << " </strong></span>" << online << " | <span style=\"color:#0000FF\"><strong>" << tr("Friends:").toStdString() << " </strong></span>" << friends << " | <strong>" << tr("Network:").toStdString() << " </strong>" << others << " ";
|
||||||
|
|
||||||
|
|
||||||
if (statusPeers)
|
if (statusPeers)
|
||||||
|
@ -67,7 +67,7 @@ void RatesStatus::getRatesStatus()
|
|||||||
rsicontrol -> ConfigGetDataRates(downKb, upKb);
|
rsicontrol -> ConfigGetDataRates(downKb, upKb);
|
||||||
|
|
||||||
std::ostringstream out;
|
std::ostringstream out;
|
||||||
out << "<strong>Down:</strong> " << std::setprecision(2) << std::fixed << downKb << " (kB/s) | <strong>Up:</strong> " << std::setprecision(2) << std::fixed << upKb << " (kB/s) ";
|
out << "<strong>" << tr("Down:").toStdString() << "</strong> " << std::setprecision(2) << std::fixed << downKb << " (kB/s) | <strong>" << tr("Up:").toStdString() << "</strong> " << std::setprecision(2) << std::fixed << upKb << " (kB/s) ";
|
||||||
|
|
||||||
|
|
||||||
if (statusRates)
|
if (statusRates)
|
||||||
|
Loading…
Reference in New Issue
Block a user