diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts
index 6cefecd83..4ffd7228a 100644
--- a/retroshare-gui/src/lang/retroshare_en.ts
+++ b/retroshare-gui/src/lang/retroshare_en.ts
@@ -483,6 +483,13 @@ p, li { white-space: pre-wrap; }
+
+ BWListDelegate
+
+ N/A
+
+
+BandwidthGraph
@@ -1437,6 +1444,14 @@ Select lobbies at left to show details.
Double click lobbies to enter and chat.
+
+ Private Subscribed Lobbies
+
+
+
+ Public Subscribed Lobbies
+
+ ChatMsgItem
@@ -1700,7 +1715,23 @@ Double click lobbies to enter and chat.
- Maximum storage period, in days:
+ Maximum storage period, in days (0=keep all):
+
+
+
+ Name :
+
+
+
+ Authentified signature
+
+
+
+ Signed with key not in keyring
+
+
+
+ Not signed.
@@ -2702,6 +2733,25 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
Please select at least one friend as recipient.
+
+ 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.
+
+
+
+ Add key to keyring
+
+
+
+ This key is already in your keyring
+
+
+
+ Check this to add the key to your keyring
+This might be useful for sending
+distant messages to this peer
+even if you don't make friends.
+
+ ConnectProgressDialog
@@ -4249,10 +4299,6 @@ p, li { white-space: pre-wrap; }
Location ID:
-
- Identity ID:
-
- Number of Friends:
@@ -4321,6 +4367,18 @@ p, li { white-space: pre-wrap; }
RetroShare Certificate (*.rsc );;All Files (*)
+
+ Identity ID
+
+
+
+ TextLabel
+
+
+
+ PGP fingerprint:
+
+ DHTStatus
@@ -6448,7 +6506,7 @@ the same identity (PGP key).
- Passwords to not match
+ Passwords do not match
@@ -10126,6 +10184,10 @@ Right-click and select 'make friend' to be able to connect.
Notify
+
+ <h1><img width="24" src=":/images/64px_help.png"> Notify</h1> <p>Retroshare will notify you about what happens in your network. Depending on your usage, you may want to enable or disable some of the notifications. This page is designed for that!</p>
+
+ NotifyQt
@@ -10670,6 +10732,10 @@ malicious behavior of crafted plugins.
Plugins
+
+ <h1><img width="24" src=":/images/64px_help.png"> Plugins</h1> <p>Plugins are loaded from the directories listed in the bottom list.</p> <p>For security reasons, accepted plugins load automatically until the main Retroshare executable or the plugin library changes. In such a case, the user needs to confirm them again. After the program is started, you can enable a plugin manually by clicking on the "Enable" button and then restart Retroshare.</p> <p>If you want to develop your own plugins, contact the developpers team they will be happy to help you out!</p>
+
+ PopularityDefs
@@ -11550,6 +11616,15 @@ Reported error is:
%2
+
+ Chat connection is unauthentified
+
+
+
+ Signature check failed!
+Make sure you know who you're talking to.
+
+ QuickStartWizard
@@ -11837,6 +11912,10 @@ p, li { white-space: pre-wrap; }
Relay
+
+ <h1><img width="24" src=":/images/64px_help.png"> Relays</h1> <p>By activating relays, you allow your Retroshare node to act as a bridge between Retroshare users who cannot connect directly, e.g. because they're firewalled.</p> <p>You may choose to act as a relay by checking <i>enable relay connections</i>, or simply benefit from other peers acting as relay, by checking <i>use relay servers</i>. For the former, you may specify the bandwidth allocated when acting as a relay for friends of you, for friends of your friends, or anyone in the Retroshare network.</p> <p>In any case, a Retroshare node acting as a relay cannot see the relayed traffic, since it is encrypted and authenticated by the two relayed nodes.</p>
+
+ RemoteSharedFilesDialog
@@ -12448,18 +12527,10 @@ behind a firewall or a VPN.
Max Transfer Rates
-
- Download (KB/s)
-
- kB/s
-
- Upload (KB/s)
-
- If you uncheck this, RetroShare will not use tunnel connection between peers that are firewalled and cannot connect directly. This is independent from F2F routing (turtle router).
@@ -12502,6 +12573,22 @@ The default value is 20.
Server
+
+ Download when active (KB/s)
+
+
+
+ Upload when active (KB/s)
+
+
+
+ Download when idle (KB/s)
+
+
+
+ Upload when idle (KB/s)
+
+ ServicePermissionDialog