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

Fixed some utf8 issues and german language (patch from Henry)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-07-02 14:49:30 +00:00
parent 9d95832f6e
commit c103953360
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -615,7 +615,7 @@ void FriendsDialog::insertSendList()
/* add all the labels */ /* add all the labels */
/* (0) Person */ /* (0) Person */
item -> setText(0, QString::fromStdString(details.name)); item -> setText(0, QString::fromUtf8(details.name.c_str()));
item -> setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled); item -> setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
//item -> setFlags(Qt::ItemIsUserCheckable); //item -> setFlags(Qt::ItemIsUserCheckable);

8
retroshare-gui/src/gui/RetroShareLink.cpp
View file

@ -676,7 +676,7 @@ QString RetroShareLink::title() const
{ {
RsPeerDetails detail; RsPeerDetails detail;
rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ; rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ;
return QString("Click to send a private message to %1 (%2).").arg(QString::fromStdString(detail.name)).arg(_GPGid) ; return QString("Click to send a private message to %1 (%2).").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
} }
case TYPE_PRIVATE_CHAT: case TYPE_PRIVATE_CHAT:
{ {
@ -684,9 +684,9 @@ QString RetroShareLink::title() const
rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ; rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ;
if (_GPGid.toStdString() == rsPeers->getGPGOwnId()) if (_GPGid.toStdString() == rsPeers->getGPGOwnId())
return QString("Click to open a private chat canal to %1 (%2).").arg(QString::fromStdString(detail.name)).arg(_GPGid) ; return QString("Click to open a private chat canal to %1 (%2).").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
else else
return QString("This is a private chat invite for %1 (%2). You can't use it.").arg(QString::fromStdString(detail.name)).arg(_GPGid) ; return QString("This is a private chat invite for %1 (%2). You can't use it.").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
} }
case TYPE_EXTRAFILE: case TYPE_EXTRAFILE:
return QString("%1 (%2, Extra - Source included)").arg(hash()).arg(misc::friendlyUnit(size())); return QString("%1 (%2, Extra - Source included)").arg(hash()).arg(misc::friendlyUnit(size()));
@ -879,7 +879,7 @@ QString RetroShareLink::niceName() const
if(type() == TYPE_PUBLIC_MSG) { if(type() == TYPE_PUBLIC_MSG) {
RsPeerDetails detail; RsPeerDetails detail;
rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ; rsPeers->getPeerDetails(_GPGid.toStdString(), detail) ;
return QString("Click this link to send a private message to %1 (%2)").arg(QString::fromStdString(detail.name)).arg(_GPGid) ; return QString("Click this link to send a private message to %1 (%2)").arg(QString::fromUtf8(detail.name.c_str())).arg(_GPGid) ;
} }
if(type() == TYPE_CERTIFICATE) { if(type() == TYPE_CERTIFICATE) {
if (_location.isEmpty()) { if (_location.isEmpty()) {

2
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -1425,7 +1425,7 @@ void MessageComposer::setRecipientToRow(int row, enumType type, std::string id,
return ; return ;
} }
name = tr("Distant peer (name: %2, PGP key: %1)").arg(QString::fromStdString(_distant_peers[id])).arg(QString::fromStdString(details.name)) ; name = tr("Distant peer (name: %2, PGP key: %1)").arg(QString::fromStdString(_distant_peers[id])).arg(QString::fromUtf8(details.name.c_str())) ;
icon = QIcon(StatusDefs::imageUser(RS_STATUS_ONLINE)); icon = QIcon(StatusDefs::imageUser(RS_STATUS_ONLINE));
} }
else if(rsPeers->getPeerDetails(id, details) && (!details.isOnlyGPGdetail)) else if(rsPeers->getPeerDetails(id, details) && (!details.isOnlyGPGdetail))

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

@ -434,7 +434,7 @@ ChatPage::load()
else else
{ {
QListWidgetItem *item = new QListWidgetItem; QListWidgetItem *item = new QListWidgetItem;
item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromStdString(detail.name)+" ("+QString::fromStdString(invites[i].destination_pgp_id)+", " + QString::fromStdString(detail.name) + ", valid until " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() + ")") ; item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromUtf8(detail.name.c_str())+" ("+QString::fromStdString(invites[i].destination_pgp_id)+", " + QString::fromUtf8(detail.name.c_str()) + ", valid until " + QDateTime::fromTime_t(invites[i].time_of_validity).toString() + ")") ;
item->setData(Qt::UserRole,QString::fromStdString(invites[i].hash)) ; item->setData(Qt::UserRole,QString::fromStdString(invites[i].hash)) ;
ui._personal_invites_LW->insertItem(0,item) ; ui._personal_invites_LW->insertItem(0,item) ;

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

Binary file not shown.

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

@ -1765,11 +1765,11 @@ Doppelklicke auf Lobbys um sie zu betreten und zu chatten.</translation>
</message> </message>
<message> <message>
<source>Private chat invite from </source> <source>Private chat invite from </source>
<translation>Private Chateinladung von</translation> <translation>Private Chateinladung von </translation>
</message> </message>
<message> <message>
<source>Private chat invite to </source> <source>Private chat invite to </source>
<translation>Private Chateinladung an</translation> <translation>Private Chateinladung an </translation>
</message> </message>
<message> <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;In this tab you can setup how many chat messages Retroshare will keep saved on the disc and how much of the previous conversation it will display, for the different chat systems. The max storage period allows to discard old messages and prevents the chat history from filling up with volatile chat (e.g. chat lobbies and distant chat).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>