Fixed utf8 characters for group names in RemoteDirModel (shared files).

Changed some strings in GroupFlagsWidget.
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5974 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-12-12 00:04:01 +00:00
parent 751756c543
commit 8078ad3aab
3 changed files with 44 additions and 44 deletions

View file

@ -30,6 +30,7 @@
#include <gui/common/RsCollectionFile.h>
#include <gui/common/RsUrlHandler.h>
#include <gui/common/FilesDefs.h>
#include <gui/common/GroupDefs.h>
#include "RemoteDirModel.h"
#include <retroshare/rsfiles.h>
#include <retroshare/rstypes.h>
@ -213,7 +214,7 @@ QString RetroshareDirModel::getGroupsString(const std::list<std::string>& group_
for(std::list<std::string>::const_iterator it(group_ids.begin());it!=group_ids.end();)
if(rsPeers->getGroupInfo(*it,group_info))
{
groups_str += QString::fromStdString(group_info.name) ;
groups_str += GroupDefs::name(group_info) ;
if(++it != group_ids.end())
groups_str += ", " ;