From 77b064b371a382c467d80ad9e43b2e38ca553459 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Sat, 1 Jul 2017 17:24:58 +0200
Subject: [PATCH] fixed translation of built-in group names in GxsGroupDialog

---
 retroshare-gui/src/gui/common/GroupChooser.cpp | 3 ++-
 retroshare-gui/src/gui/gxs/GxsGroupDialog.ui   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/retroshare-gui/src/gui/common/GroupChooser.cpp b/retroshare-gui/src/gui/common/GroupChooser.cpp
index 02b43fb56..b82bc85e7 100644
--- a/retroshare-gui/src/gui/common/GroupChooser.cpp
+++ b/retroshare-gui/src/gui/common/GroupChooser.cpp
@@ -27,6 +27,7 @@
 #include <iostream>
 
 #include <retroshare/rspeers.h>
+#include <gui/common/GroupDefs.h>
 
 /** Constructor */
 GroupChooser::GroupChooser(QWidget *parent)
@@ -88,7 +89,7 @@ void GroupChooser::loadGroups()
 			std::cerr << std::endl;
 			continue;
 		}
-        QString id = QString::fromStdString(it->id.toStdString());
+		QString id = GroupDefs::name(*it) ;
 
 		addItem(str, id);
 
diff --git a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
index 78fa9011b..50c1191fc 100644
--- a/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
+++ b/retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1237</width>
-    <height>622</height>
+    <height>1145</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -370,7 +370,7 @@
                <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Messages will only be distributed to the selected subset of your friend nodes. They will not forward messages with each other, but only use your own node as a central hub to distribute them.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="text">
-               <string>Only For Your Friends</string>
+               <string>Restricted node group </string>
               </property>
               <property name="icon">
                <iconset resource="../icons.qrc">
@@ -917,8 +917,8 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../images.qrc"/>
   <include location="../icons.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>