Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-09 14:52:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added patch from Henry:

Browse source 
- Fixed utf8 issues
- Added new translatable strings
- Fixed german translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7446 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-10 17:58:46 +00:00
parent 903818d68f
commit a54224e3e0
6 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/GenCertDialog.cpp
View file

@ -316,7 +316,7 @@ void GenCertDialog::importIdentity()
RsInit::GetPGPLoginDetails(gpg_id, name, email);
std::cerr << "Adding PGPUser: " << name << " id: " << gpg_id << std::endl;
QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromStdString(name)+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id)+"\n\n"+tr("You can use it now to create a new location.")) ;
QMessageBox::information(this,tr("New identity imported"),tr("Your identity was imported successfully:")+" \n"+"\nName :"+QString::fromUtf8(name.c_str())+"\nemail: " + QString::fromStdString(email)+"\nKey ID: "+QString::fromStdString(gpg_id)+"\n\n"+tr("You can use it now to create a new location.")) ;
}
init() ;

6
retroshare-gui/src/gui/bwctrl/BwCtrlWindow.cpp
View file

@ -282,8 +282,8 @@ void BwCtrlWindow::updateBandwidth()
peerTreeWidget->addTopLevelItem(item);
/* do Totals */
item -> setData(COLUMN_PEERID, Qt::DisplayRole, QString("TOTALS"));
item -> setData(COLUMN_RSNAME, Qt::DisplayRole, QString("Totals"));
item -> setData(COLUMN_PEERID, Qt::DisplayRole, tr("TOTALS"));
item -> setData(COLUMN_RSNAME, Qt::DisplayRole, tr("Totals"));
item -> setData(COLUMN_IN_RATE, Qt::DisplayRole, totalRates.mRateIn);
item -> setData(COLUMN_IN_MAX, Qt::DisplayRole,totalRates.mRateMaxIn);
@ -326,7 +326,7 @@ void BwCtrlWindow::updateBandwidth()
std::string name = rsPeers->getPeerName(it->first);
peer_item -> setData(COLUMN_PEERID, Qt::DisplayRole, QString::fromStdString(it->first));
peer_item -> setData(COLUMN_RSNAME, Qt::DisplayRole, QString::fromStdString(name));
peer_item -> setData(COLUMN_RSNAME, Qt::DisplayRole, QString::fromUtf8(name.c_str()));
peer_item -> setData(COLUMN_IN_RATE, Qt::DisplayRole, it->second.mRateIn);
peer_item -> setData(COLUMN_IN_MAX, Qt::DisplayRole, it->second.mRateMaxIn);

2
retroshare-gui/src/gui/dht/DhtWindow.cpp
View file

@ -385,7 +385,7 @@ void DhtWindow::updateNetPeers()
std::string name = rsPeers->getPeerName(*it);
peer_item -> setData(PTW_COL_PEERID, Qt::DisplayRole, QString::fromStdString(status.mDhtId));
peer_item -> setData(PTW_COL_RSNAME, Qt::DisplayRole, QString::fromStdString(name));
peer_item -> setData(PTW_COL_RSNAME, Qt::DisplayRole, QString::fromUtf8(name.c_str()));
peer_item -> setData(PTW_COL_RSID, Qt::DisplayRole, QString::fromStdString(status.mRsId));
QString dhtstate;

2
retroshare-gui/src/gui/settings/ChatPage.cpp
View file

@ -405,7 +405,7 @@ ChatPage::load()
item->setData(Qt::DisplayRole,tr("Private chat invite from ")+QString::fromUtf8(detail.name.c_str())) ;
QString tt ;
tt += tr("Name : ") + QString::fromStdString(detail.name) ;
tt += tr("Name : ") + QString::fromUtf8(detail.name.c_str()) ;
tt += "\n" + tr("PGP id : ") + QString::fromStdString(invites[i].destination_pgp_id) ;
tt += "\n" + tr("Valid until : ") + QDateTime::fromTime_t(invites[i].time_of_validity).toString() ;

BIN
retroshare-gui/src/lang/retroshare_de.qm
View file

Binary file not shown.

8
retroshare-gui/src/lang/retroshare_de.ts
View file

@ -916,6 +916,14 @@ p, li { white-space: pre-wrap; }
<source>Allowed Recvd</source>
<translation>Erlaubt Empfang</translation>
</message>
<message>
<source>TOTALS</source>
<translation>ALLE</translation>
</message>
<message>
<source>Totals</source>
<translation>Alle</translation>
</message>
</context>
<context>
<name>CalDialog</name>