mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
removed tabs in help strings that caused translated text to show arrows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6718 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
7f7a596191
commit
f474663fc2
@ -113,20 +113,20 @@ ChannelFeed::ChannelFeed(QWidget *parent)
|
|||||||
|
|
||||||
updateChannelMsgs();
|
updateChannelMsgs();
|
||||||
|
|
||||||
QString help_str = tr(
|
QString help_str = tr(
|
||||||
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Channels</h1> \
|
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Channels</h1> \
|
||||||
<p>Channels allow you to post data (e.g. movies, music) that will spread in the network \
|
<p>Channels allow you to post data (e.g. movies, music) that will spread in the network \
|
||||||
among people who subscribed your channel. If you activate auto-download on a channel, files attached to each post will start \
|
among people who subscribed your channel. If you activate auto-download on a channel, files attached to each post will start \
|
||||||
downloading automatically when the post is received.</p> \
|
downloading automatically when the post is received.</p> \
|
||||||
<p>You see channels your friends are subscribed to, and forward subscribed channels to \
|
<p>You see channels your friends are subscribed to, and forward subscribed channels to \
|
||||||
your friends. This promotes good channels in the network. \
|
your friends. This promotes good channels in the network. \
|
||||||
When you first connect to a new friend, it's likely \
|
When you first connect to a new friend, it's likely \
|
||||||
you will receive many such cache files, and new channels will appear. \
|
you will receive many such cache files, and new channels will appear. \
|
||||||
</p> \
|
</p> \
|
||||||
<p>Only the channel's creator can post on that channel. Other peers \
|
<p>Only the channel's creator can post on that channel. Other peers \
|
||||||
in the network can only read from it, unless the channel is private. You can however share the posting rights or the reading rights \
|
in the network can only read from it, unless the channel is private. You can however share the posting rights or the reading rights \
|
||||||
with your friends.</p> \
|
with your friends.</p> \
|
||||||
") ;
|
") ;
|
||||||
|
|
||||||
|
|
||||||
registerHelpButton(helpButton,help_str) ;
|
registerHelpButton(helpButton,help_str) ;
|
||||||
|
@ -481,17 +481,17 @@ TransfersDialog::TransfersDialog(QWidget *parent)
|
|||||||
// load settings
|
// load settings
|
||||||
processSettings(true);
|
processSettings(true);
|
||||||
|
|
||||||
QString help_str = tr(
|
QString help_str = tr(
|
||||||
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> File Transfer</h1> \
|
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> File Transfer</h1> \
|
||||||
<p>Retroshare brings two ways of transferring files: direct transfers from your friends, and \
|
<p>Retroshare brings two ways of transferring files: direct transfers from your friends, and \
|
||||||
distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming \
|
distant anonymous tunnelled transfers. In addition, file transfer is multi-source and allows swarming \
|
||||||
(you can be a source while downloading)</p> \
|
(you can be a source while downloading)</p> \
|
||||||
<p>You can share files using the <img src=\":/images/directoryadd_24x24_shadow.png\" width=16 /> icon from the left side bar. \
|
<p>You can share files using the <img src=\":/images/directoryadd_24x24_shadow.png\" width=16 /> icon from the left side bar. \
|
||||||
These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files \
|
These files will be listed in the My Files tab. You can decide for each friend group whether they can or not see these files \
|
||||||
in their Friends Files tab</p>\
|
in their Friends Files tab</p>\
|
||||||
<p>The search tab reports files from your friends' file lists, and distant files that can be reached \
|
<p>The search tab reports files from your friends' file lists, and distant files that can be reached \
|
||||||
anonymously using the multi-hop tunnelling system.</p> \
|
anonymously using the multi-hop tunnelling system.</p> \
|
||||||
") ;
|
") ;
|
||||||
|
|
||||||
|
|
||||||
registerHelpButton(ui.helpButton,help_str) ;
|
registerHelpButton(ui.helpButton,help_str) ;
|
||||||
|
@ -205,18 +205,18 @@ ForumsDialog::ForumsDialog(QWidget *parent)
|
|||||||
#ifdef Q_WS_WIN
|
#ifdef Q_WS_WIN
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
QString help_str = tr(
|
QString help_str = tr(
|
||||||
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Forums</h1> \
|
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Forums</h1> \
|
||||||
<p>Retroshare Forums look like internet forums, but they work in a decentralized way: \
|
<p>Retroshare Forums look like internet forums, but they work in a decentralized way: \
|
||||||
You see forums your friends are subscribed to, and you forward subscribed forums to \
|
You see forums your friends are subscribed to, and you forward subscribed forums to \
|
||||||
your friends. This automatically promotes interesting forums in the network.</p> \
|
your friends. This automatically promotes interesting forums in the network.</p> \
|
||||||
<p>Forums are either Authenticated (<img src=\":/images/konv_message2.png\" width=\"12\"/>) in which case you need to cryptographically sign \
|
<p>Forums are either Authenticated (<img src=\":/images/konv_message2.png\" width=\"12\"/>) in which case you need to cryptographically sign \
|
||||||
your posts, or anonymous (<img src=\":/images/konversation.png\" width=\"12\"/>). The former class is more resistant to spamming.</p> \
|
your posts, or anonymous (<img src=\":/images/konversation.png\" width=\"12\"/>). The former class is more resistant to spamming.</p> \
|
||||||
<p>Forum posts propagate from friend to friend using small cache file exchanges. When you first connect to a new friend, it's likely \
|
<p>Forum posts propagate from friend to friend using small cache file exchanges. When you first connect to a new friend, it's likely \
|
||||||
you will receive many such cache files, and new forums will appear. \
|
you will receive many such cache files, and new forums will appear. \
|
||||||
</p> \
|
</p> \
|
||||||
") ;
|
") ;
|
||||||
|
|
||||||
|
|
||||||
registerHelpButton(ui.helpButton,help_str) ;
|
registerHelpButton(ui.helpButton,help_str) ;
|
||||||
|
@ -203,19 +203,19 @@ FriendsDialog::FriendsDialog(QWidget *parent)
|
|||||||
ui.nicknameLabel->setText(PeerDefs::nameWithLocation(pd));
|
ui.nicknameLabel->setText(PeerDefs::nameWithLocation(pd));
|
||||||
}
|
}
|
||||||
|
|
||||||
QString hlp_str = tr(
|
QString hlp_str = tr(
|
||||||
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Friends</h1> \
|
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Friends</h1> \
|
||||||
<p>The Friends tab shows...your friends: the list of persons you have accepted to connect to. \
|
<p>The Friends tab shows...your friends: the list of persons you have accepted to connect to. \
|
||||||
</p> \
|
</p> \
|
||||||
<p>You can group friends together to allow a finer level of information access, for instance to only allow \
|
<p>You can group friends together to allow a finer level of information access, for instance to only allow \
|
||||||
some friends to see some files.</p> \
|
some friends to see some files.</p> \
|
||||||
<p>On the right, you will find 3 useful tabs: \
|
<p>On the right, you will find 3 useful tabs: \
|
||||||
<ul> \
|
<ul> \
|
||||||
<li>Broadcast sends messages to all connected friends at once</li> \
|
<li>Broadcast sends messages to all connected friends at once</li> \
|
||||||
<li>Local Network shows the network around you, including friends of your friends</li> \
|
<li>Local Network shows the network around you, including friends of your friends</li> \
|
||||||
<li>Keyring contains keys you collected, mostly forwarded to you by your friends</li> \
|
<li>Keyring contains keys you collected, mostly forwarded to you by your friends</li> \
|
||||||
</ul> </p> \
|
</ul> </p> \
|
||||||
") ;
|
") ;
|
||||||
|
|
||||||
registerHelpButton(ui.helpButton, hlp_str) ;
|
registerHelpButton(ui.helpButton, hlp_str) ;
|
||||||
|
|
||||||
|
@ -283,15 +283,15 @@ MessagesDialog::MessagesDialog(QWidget *parent)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
QString help_str = tr(
|
QString help_str = tr(
|
||||||
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Messages</h1> \
|
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Messages</h1> \
|
||||||
<p>Messages are like <b>e-mail</b>: you send/receive them from your friends when both of you are connected.</p> \
|
<p>Messages are like <b>e-mail</b>: you send/receive them from your friends when both of you are connected.</p> \
|
||||||
<p>It is also possible to send messages to non friends, using tunnels. Such messages are always encrypted. It is \
|
<p>It is also possible to send messages to non friends, using tunnels. Such messages are always encrypted. It is \
|
||||||
recommended to cryptographically sign distant messages, as a proof of your identity, using the <img width=\"16\" src=\":/images/stock_signature_ok.png\"/> button \
|
recommended to cryptographically sign distant messages, as a proof of your identity, using the <img width=\"16\" src=\":/images/stock_signature_ok.png\"/> button \
|
||||||
in the message composer window. Distant messages are not guarrantied to arrive, since this requires the distant peer to accept them (You need yourself to switch this on in Config-Messages).</p>\
|
in the message composer window. Distant messages are not guarrantied to arrive, since this requires the distant peer to accept them (You need yourself to switch this on in Config-Messages).</p>\
|
||||||
<p>Some additional features allow you to exchange data in messages: you may recommend files to your friends by pasting file links, \
|
<p>Some additional features allow you to exchange data in messages: you may recommend files to your friends by pasting file links, \
|
||||||
or recommend friends-to-be to other friends, in order to streathen your network.</p> \
|
or recommend friends-to-be to other friends, in order to streathen your network.</p> \
|
||||||
") ;
|
") ;
|
||||||
|
|
||||||
registerHelpButton(ui.helpButton,help_str) ;
|
registerHelpButton(ui.helpButton,help_str) ;
|
||||||
}
|
}
|
||||||
|
@ -85,19 +85,19 @@ NewsFeed::NewsFeed(QWidget *parent)
|
|||||||
connect(removeAllButton, SIGNAL(clicked()), this, SLOT(removeAll()));
|
connect(removeAllButton, SIGNAL(clicked()), this, SLOT(removeAll()));
|
||||||
connect(feedOptionsButton, SIGNAL(clicked()), this, SLOT(feedoptions()));
|
connect(feedOptionsButton, SIGNAL(clicked()), this, SLOT(feedoptions()));
|
||||||
|
|
||||||
QString hlp_str = tr(
|
QString hlp_str = tr(
|
||||||
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> News Feed</h1> \
|
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> News Feed</h1> \
|
||||||
<p>The News Feed displays the last events on your network, sorted by the time you received them. \
|
<p>The News Feed displays the last events on your network, sorted by the time you received them. \
|
||||||
This gives you a summary of the activity of your friends. \
|
This gives you a summary of the activity of your friends. \
|
||||||
You can configure which events to show by pressing on <b>Options</b>. </p> \
|
You can configure which events to show by pressing on <b>Options</b>. </p> \
|
||||||
<p>The various events shown are: \
|
<p>The various events shown are: \
|
||||||
<ul> \
|
<ul> \
|
||||||
<li>Connection attempts (useful to make friends with new people and control who's trying to reach you)</li> \
|
<li>Connection attempts (useful to make friends with new people and control who's trying to reach you)</li> \
|
||||||
<li>Channel and Forum posts</li> \
|
<li>Channel and Forum posts</li> \
|
||||||
<li>New Channels and Forums you can subscribe to</li> \
|
<li>New Channels and Forums you can subscribe to</li> \
|
||||||
<li>Private messages from your friends</li> \
|
<li>Private messages from your friends</li> \
|
||||||
</ul> </p> \
|
</ul> </p> \
|
||||||
") ;
|
") ;
|
||||||
|
|
||||||
registerHelpButton(helpButton,hlp_str) ;
|
registerHelpButton(helpButton,hlp_str) ;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user