From 705a51ac1f784306f892130056cbb2c483c3ef0b Mon Sep 17 00:00:00 2001
From: joss17 <joss17@users.sourceforge.net>
Date: Fri, 8 May 2009 18:56:01 +0000
Subject: [PATCH] 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
---
 retroshare-gui/src/gui/statusbar/peerstatus.cpp  | 2 +-
 retroshare-gui/src/gui/statusbar/ratesstatus.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/retroshare-gui/src/gui/statusbar/peerstatus.cpp b/retroshare-gui/src/gui/statusbar/peerstatus.cpp
index d4ee8551c..18d646479 100644
--- a/retroshare-gui/src/gui/statusbar/peerstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/peerstatus.cpp
@@ -76,7 +76,7 @@ void PeerStatus::getPeerStatus()
     int others = 1 + ids.size();
 
     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)
diff --git a/retroshare-gui/src/gui/statusbar/ratesstatus.cpp b/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
index ff2022b77..03961b112 100644
--- a/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
@@ -67,7 +67,7 @@ void RatesStatus::getRatesStatus()
     rsicontrol -> ConfigGetDataRates(downKb, upKb);
 
     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)