Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-02 11:16:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1963 from csoler/v0.6-GxsGroup

Browse source 
fixed compilaiton of photoshare due to changes in GxsChange class
This commit is contained in:
csoler 2020-05-22 18:21:33 +02:00 • committed by GitHub
commit eeca7c6d3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/gui/feeds/GxsCircleItem.cpp
View file

@ -129,7 +129,7 @@ void GxsCircleItem::setup()
{
if(circleDetails.mAmIAdmin)
{
ui->titleLabel->setText(idName + tr(" which you invited, has join this circle you're administrating."));
ui->titleLabel->setText(idName + tr(" which you invited, has joined this circle you're administrating."));
ui->inviteeButton->setHidden(false);
ui->inviteeButton->setText(tr("Revoke membership"));
ui->inviteeButton->setToolTip(tr("Revoke membership for that identity"));
@ -137,7 +137,7 @@ void GxsCircleItem::setup()
else
{
ui->inviteeButton->setHidden(true);
ui->titleLabel->setText(idName + tr(" has join this circle."));
ui->titleLabel->setText(idName + tr(" has joined this circle."));
}
ui->iconLabel->setPixmap(pixmap);