From 75a7a89e8f924a4a26c9a3ccf632fdc9a80b2c0e Mon Sep 17 00:00:00 2001 From: Ivan Lucas Date: Wed, 9 Sep 2015 15:19:17 +0100 Subject: [PATCH 1/3] Fix typo --- retroshare-gui/src/gui/help/content/en/addfriends.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/gui/help/content/en/addfriends.html b/retroshare-gui/src/gui/help/content/en/addfriends.html index bb78dc4ad..8d2f749e1 100644 --- a/retroshare-gui/src/gui/help/content/en/addfriends.html +++ b/retroshare-gui/src/gui/help/content/en/addfriends.html @@ -32,7 +32,7 @@

-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.

From 840e9306d63a7417a4cbf602c67c5697676af7b6 Mon Sep 17 00:00:00 2001 From: Ivan Lucas Date: Thu, 10 Sep 2015 10:29:15 +0100 Subject: [PATCH 2/3] Fix Spelling and Grammar --- retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp | 6 +++--- retroshare-gui/src/gui/settings/WebuiPage.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp index 5cf0a59c0..5ded8fb80 100644 --- a/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp +++ b/retroshare-gui/src/gui/settings/ServicePermissionsPage.cpp @@ -46,12 +46,12 @@ ServicePermissionsPage::ServicePermissionsPage(QWidget * parent, Qt::WindowFlags QString ServicePermissionsPage::helpText() const { return tr("

  Permissions

\ -

Permissions allow you to control which services are available to which friends

\ +

Permissions allow you to control which services are available to which friends.

\

Each interruptor shows two lights, indicating whether you or your friend has enabled\ - that service. Both needs to be ON (showing ) to\ + that service. Both need to be ON (showing ) to\ let information transfer for a specific service/friend combination.

\

For each service, the global switch / \ - allow to turn a service ON/OFF for all friends at once.

\ + allows you to turn a service ON/OFF for all friends at once.

\

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.

"); } diff --git a/retroshare-gui/src/gui/settings/WebuiPage.cpp b/retroshare-gui/src/gui/settings/WebuiPage.cpp index 3b6770c6c..b05bf8698 100644 --- a/retroshare-gui/src/gui/settings/WebuiPage.cpp +++ b/retroshare-gui/src/gui/settings/WebuiPage.cpp @@ -67,7 +67,7 @@ void WebuiPage::load() QString WebuiPage::helpText() const { return tr("

  Webinterface

\ -

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.

\ +

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.

\

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.

"); } From 4880fc489ba5a4d28526bd540bd0019fb03e8b1c Mon Sep 17 00:00:00 2001 From: Ivan Lucas Date: Thu, 10 Sep 2015 11:21:01 +0100 Subject: [PATCH 3/3] Fixed grammar on add friend wizard by rewording slightly --- retroshare-gui/src/gui/connect/ConnectFriendWizard.ui | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui index f5f6ce6bf..df4209e44 100644 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.ui @@ -22,7 +22,7 @@ Add a new Friend - This wizard will help you to connect to your friend(s) to RetroShare network.<br>These ways are possible to do this: + This wizard will help you to connect to your friend(s) to RetroShare network.<br>Select how you would like to add a friend: ConnectFriendWizard::Page_Intro @@ -60,14 +60,14 @@ &Send an Invitation by Email - (She/He receives an email with instructions how to to download RetroShare) + (Your friend will receive an email with instructions how to to download RetroShare) - Recommend many friends to each others + Recommend many friends to each other @@ -271,7 +271,7 @@ - Please, paste your friends PGP certificate into the box below + Please, paste your friend's PGP certificate into the box below @@ -883,7 +883,8 @@ QFrame::Box - 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. + 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. true