Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-21 23:40:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some source code for better translation, added some new words to translate and removed some words not to be translated.

Browse source 
Fixed german translation.
Please review the other languages.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-05 21:05:11 +00:00
parent 3b1c26de35
commit 04dedf5ce0
15 changed files with 315 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

19
retroshare-gui/src/gui/TurtleRouterDialog.cpp
View file

@ -42,7 +42,6 @@ TurtleRouterDialog::TurtleRouterDialog(QWidget *parent)
TurtleRouterDialog::~TurtleRouterDialog()
{
// save settings
processSettings(false);
}
@ -133,10 +132,10 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector<std::vector<std
QTreeWidgetItem *parent = findParentHashItem(hash) ;
if(parent->text(0).left(14) == QString("Unknown hashes"))
if(parent->text(0).left(14) == tr("Unknown hashes"))
unknown_hash_found = true ;
QString str = "Tunnel id: " + QString::fromUtf8(tunnels_info[i][0].c_str()) + "\t [" + QString::fromUtf8(tunnels_info[i][2].c_str()) + "] --> [" + QString::fromUtf8(tunnels_info[i][1].c_str()) + "]\t\t last transfer: " + QString::fromStdString(tunnels_info[i][4]) + "\t Speed: " + QString::fromStdString(tunnels_info[i][5]) ;
QString str = tr("Tunnel id") + ": " + QString::fromUtf8(tunnels_info[i][0].c_str()) + "\t [" + QString::fromUtf8(tunnels_info[i][2].c_str()) + "] --> [" + QString::fromUtf8(tunnels_info[i][1].c_str()) + "]\t\t " + tr("last transfer") + ": " + QString::fromStdString(tunnels_info[i][4]) + "\t " + tr("Speed") + ": " + QString::fromStdString(tunnels_info[i][5]) ;
stl.clear() ;
stl.push_back(str) ;
@ -145,7 +144,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector<std::vector<std
for(uint i=0;i<search_reqs_info.size();++i)
{
QString str = "Request id: " + QString::number(search_reqs_info[i].request_id,16) + "\t from [" + getPeerName(search_reqs_info[i].source_peer_id) + "]\t " + QString::number(search_reqs_info[i].age)+" secs ago" ;
QString str = tr("Request id: %1\t from [%2]\t %3 secs ago").arg(search_reqs_info[i].request_id,0,16).arg(getPeerName(search_reqs_info[i].source_peer_id)).arg(search_reqs_info[i].age);
stl.clear() ;
stl.push_back(str) ;
@ -157,7 +156,7 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector<std::vector<std
for(uint i=0;i<tunnel_reqs_info.size();++i)
if(i+MAX_TUNNEL_REQUESTS_DISPLAY >= tunnel_reqs_info.size() || i < MAX_TUNNEL_REQUESTS_DISPLAY)
{
QString str = "Request id: " + QString::number(tunnel_reqs_info[i].request_id,16) + "\t from [" + getPeerName(tunnel_reqs_info[i].source_peer_id) + "]\t " + QString::number(tunnel_reqs_info[i].age)+" secs ago" ;
QString str = tr("Request id: %1\t from [%2]\t %3 secs ago").arg(tunnel_reqs_info[i].request_id,0,16).arg(getPeerName(tunnel_reqs_info[i].source_peer_id)).arg(tunnel_reqs_info[i].age);
stl.clear() ;
stl.push_back(str) ;
@ -175,14 +174,14 @@ void TurtleRouterDialog::updateTunnelRequests( const std::vector<std::vector<std
top_level_t_requests->setText(0, tr("Tunnel requests") + "("+QString::number(tunnel_reqs_info.size()) + ")") ;
QTreeWidgetItem *unknown_hashs_item = findParentHashItem("") ;
unknown_hashs_item->setText(0,QString("Unknown hashes (") + QString::number(unknown_hashs_item->childCount())+QString(")")) ;
unknown_hashs_item->setText(0,tr("Unknown hashes") + " (" + QString::number(unknown_hashs_item->childCount())+QString(")")) ;
// Ok, this is a N2 search, but there are very few elements in the list.
for(int i=2;i<_f2f_TW->topLevelItemCount();)
{
bool found = false ;
if(_f2f_TW->topLevelItem(i)->text(0).left(14) == "Unknown hashes" && unknown_hash_found)
if(_f2f_TW->topLevelItem(i)->text(0).left(14) == tr("Unknown hashes") && unknown_hash_found)
found = true ;
if(_f2f_TW->topLevelItem(i)->childCount() > 0) // this saves uploading hashes
@ -203,12 +202,12 @@ QTreeWidgetItem *TurtleRouterDialog::findParentHashItem(const std::string& hash)
{
// look for the hash, and insert a new element if necessary.
//
QList<QTreeWidgetItem*> items = _f2f_TW->findItems((hash=="")?QString("Unknown hashes"):QString::fromStdString(hash),Qt::MatchStartsWith) ;
QList<QTreeWidgetItem*> items = _f2f_TW->findItems((hash=="")?tr("Unknown hashes"):QString::fromStdString(hash),Qt::MatchStartsWith) ;
if(items.empty())
{
QStringList stl ;
stl.push_back((hash=="")?QString("Unknown hashes"):QString::fromStdString(hash)) ;
stl.push_back((hash=="")?tr("Unknown hashes"):QString::fromStdString(hash)) ;
QTreeWidgetItem *item = new QTreeWidgetItem(_f2f_TW,stl) ;
_f2f_TW->insertTopLevelItem(0,item) ;
@ -217,5 +216,3 @@ QTreeWidgetItem *TurtleRouterDialog::findParentHashItem(const std::string& hash)
else
return items.front() ;
}