Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-27 18:31:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #105 from ericthefish/master

Browse Source 
Improve wordings
This commit is contained in:
Cyril Soler 2015-09-10 09:41:28 -04:00
commit 7195d4c20d
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -22,7 +22,7 @@
<string>Add a new Friend</string>
</property>
<property name="subTitle">
<string>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;These ways are possible to do this:</string>
<string>This wizard will help you to connect to your friend(s) to RetroShare network.&lt;br&gt;Select how you would like to add a friend:</string>
</property>
<attribute name="pageId">
<string notr="true">ConnectFriendWizard::Page_Intro</string>
@ -60,14 +60,14 @@
<widget class="QRadioButton" name="emailRadioButton">
<property name="text">
<string>&amp;Send an Invitation by Email
(She/He receives an email with instructions how to to download RetroShare)</string>
(Your friend will receive an email with instructions how to to download RetroShare)</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="friendRecommendationsRadioButton">
<property name="text">
<string>Recommend many friends to each others</string>
<string>Recommend many friends to each other</string>
</property>
</widget>
</item>
@ -271,7 +271,7 @@
<item>
<widget class="QLabel" name="friendCertLabel">
<property name="text">
<string>Please, paste your friends PGP certificate into the box below</string>
<string>Please, paste your friend's PGP certificate into the box below</string>
</property>
</widget>
</item>
@ -883,7 +883,8 @@
<enum>QFrame::Box</enum>
</property>
<property name="text">
<string>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add to many friends. You can add as many friends as you like, but more than 40 will probably require too much resources.</string>
<string>Please note that RetroShare will require excessive amounts of bandwidth, memory and CPU if you add too many friends. You can add as many friends as you like, but more than 40 will probably require too much
resources.</string>
</property>
<property name="wordWrap">
<bool>true</bool>

2
retroshare-gui/src/gui/help/content/en/addfriends.html
View File

@ -32,7 +32,7 @@
<td><img src="qrc:/images/help/addfriendkey.png"/></td>
<p>
When your friends send you a their invitations, Click to open the Add Friends window.
When your friends send you their invitations, click to open the Add Friends window.
Cut and Paste your Friend's "ID Certificates" into the window and add them as friends.
</p>

6
retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp
View File

@ -46,12 +46,12 @@ ServicePermissionsPage::ServicePermissionsPage(QWidget * parent, Qt::WindowFlags
QString ServicePermissionsPage::helpText() const
{
return tr("<h1><img width=\"24\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Permissions</h1> \
<p>Permissions allow you to control which services are available to which friends</p>\
<p>Permissions allow you to control which services are available to which friends.</p>\
<p>Each interruptor shows two lights, indicating whether you or your friend has enabled\
that service. Both needs to be ON (showing <img height=20 src=\":/images/switch11.png\"/>) to\
that service. Both need to be ON (showing <img height=20 src=\":/images/switch11.png\"/>) to\
let information transfer for a specific service/friend combination.</p>\
<p>For each service, the global switch <img height=20 src=\":/images/global_switch_on.png\"> / <img height=20 src=\":/images/global_switch_off.png\">\
allow to turn a service ON/OFF for all friends at once.</p>\
allows you to turn a service ON/OFF for all friends at once.</p>\
<p>Be very careful: Some services depend on each other. For instance turning turtle OFF will also\
stop all anonymous transfer, distant chat and distant messaging.</p>");
}

2
retroshare-gui/src/gui/settings/WebuiPage.cpp
View File

@ -67,7 +67,7 @@ void WebuiPage::load()
QString WebuiPage::helpText() const
{
return tr("<h1><img width=\"24\" src=\":/icons/help_64.png\">&nbsp;&nbsp;Webinterface</h1> \
<p>The webinterface allows to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.</p>\
<p>The webinterface allows you to control Retroshare from the browser. Multiple devices can share control over one Retroshare instance. So you could start a conversation on a tablet computer and later use a desktop computer to continue it.</p>\
<p>Warning: don't expose the webinterface to the internet, because there is no access control and no encryption. If you want to use the webinterface over the internet, use a SSH tunnel or a proxy to secure the connection.</p>");
}