Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-10 15:20:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into v0.6-FT4

Browse source
This commit is contained in:
csoler 2020-02-22 21:11:00 +01:00 • committed by GitHub
commit 737b846e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
324 changed files with 1296 additions and 2057 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -1025,7 +1025,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
static const int CANCEL = 3 ; // Admin list: no Subscription request: yes
const QString menu_titles[4] = { tr("Request subscription"), tr("Accept circle invitation"), tr("Quit this circle"),tr("Cancel subscribe request")} ;
const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/images/door_in.png",":/images/cancel.png" } ;
const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/icons/png/enter.png",":/images/cancel.png" } ;
std::vector< std::vector<RsGxsId> > ids(4) ;