mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
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
parent
751756c543
commit
8078ad3aab
@ -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 += ", " ;
|
||||
|
||||
@ -134,14 +134,14 @@ QString GroupFlagsWidget::groupInfoString(FileStorageFlags flags, const QList<QS
|
||||
}
|
||||
|
||||
if(flags & DIR_FLAGS_BROWSABLE_OTHERS)
|
||||
res += tr("All your friends can browse this directory\n") ;
|
||||
res += tr("All your friends can browse this directory") + "\n" ;
|
||||
else if(flags & DIR_FLAGS_BROWSABLE_GROUPS)
|
||||
if(!groupNames.empty())
|
||||
res += tr("Only friends in groups ") + groups_string + tr(" can browse this directory\n") ;
|
||||
res += tr("Only friends in groups %1 can browse this directory").arg(groups_string) + "\n" ;
|
||||
else
|
||||
res += tr("No one can browse this directory\n") ;
|
||||
res += tr("No one can browse this directory") + "\n" ;
|
||||
else
|
||||
res += tr("No one can browse this directory\n") ;
|
||||
res += tr("No one can browse this directory") + "\n" ;
|
||||
|
||||
if(flags & DIR_FLAGS_NETWORK_WIDE_OTHERS)
|
||||
res += tr("All your friends can relay anonymous tunnels to this directory") ;
|
||||
|
||||
@ -1588,18 +1588,6 @@ p, li { white-space: pre-wrap; }
|
||||
<source>Services</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">User service permissions</span></p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This tab allows you to finely tune which services each of your contacts is allowed to use with you.</p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Some services (Discovery, anonymous routing) can be switched off globally, which always overrides the settings per-user.</p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><html><head/><body><p>Disabling anonymous routing will suppress all sending/retrieval of tunnel and anonymous search requests from/to this user. This user will not be able to transfer anonymously through you.</p><p>For a global switch, go to the server configuration panel.</p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
@ -1629,7 +1617,13 @@ p, li { white-space: pre-wrap; }
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>PushButton</source>
|
||||
<source>User service permissions</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>This tab allows you to finely tune which services each of your contacts is allowed to use with you.
|
||||
|
||||
Some services (Discovery, anonymous routing) can be switched off globally, which always overrides the settings per-user.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
@ -5557,25 +5551,10 @@ p, li { white-space: pre-wrap; }
|
||||
</context>
|
||||
<context>
|
||||
<name>GroupFlagsWidget</name>
|
||||
<message>
|
||||
<source>All your friends can browse this directory
|
||||
</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Only friends in groups </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source> can browse this directory
|
||||
</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>No one can browse this directory
|
||||
</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>All your friends can relay anonymous tunnels to this directory</source>
|
||||
<translation type="unfinished"></translation>
|
||||
@ -5588,6 +5567,18 @@ p, li { white-space: pre-wrap; }
|
||||
<source>No one can anonymously access this directory.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>All your friends can browse this directory</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Only friends in groups %1 can browse this directory</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>No one can browse this directory</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>GroupTreeWidget</name>
|
||||
@ -7916,6 +7907,13 @@ Right-click and select 'make friend' to be able to connect.</source>
|
||||
<source>Low Traffic</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Use this DropList to quickly change Retroshare's behaviour
|
||||
No Anon D/L: switches off file forwarding
|
||||
Gaming Mode: 25% standard traffic and TODO: reduced popups
|
||||
Low Traffic: 10% standard traffic and TODO: pauses all file-transfers</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>PeerDefs</name>
|
||||
@ -10057,6 +10055,10 @@ Reducing image to %1x%2 pixels?</source>
|
||||
<source>Accept Friend Request</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>wants to be friend with you on RetroShare</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>ServerPage</name>
|
||||
@ -10173,17 +10175,6 @@ many small packets that can significantly slow down your own file transfer.
|
||||
The default value is 20.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt; font-weight:600;">Warning</span></p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt; font-weight:600;"></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt; font-weight:600;"><br /></span></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:11pt; font-weight:600;"> </span><span style=" font-family:'Ubuntu'; font-size:11pt;">This tab contains hard-core parameters which are unlikely to need modification. Don't change them unless you really know what you're doing. </span></p></body></html></source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Enable anonymous data routing</source>
|
||||
<translation type="unfinished"></translation>
|
||||
@ -10208,6 +10199,14 @@ The friendship is never automatic however, and both
|
||||
peers still need to trust each other to allow connection. </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Warning</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>This tab contains hard-core parameters which are unlikely to need modification. Don't change them unless you really know what you're doing.</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Settings</name>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user