diff --git a/retroshare-gui/src/gui/ServicePermissionDialog.cpp b/retroshare-gui/src/gui/ServicePermissionDialog.cpp index 22847cf29..deb9073b4 100644 --- a/retroshare-gui/src/gui/ServicePermissionDialog.cpp +++ b/retroshare-gui/src/gui/ServicePermissionDialog.cpp @@ -52,6 +52,8 @@ ServicePermissionDialog::ServicePermissionDialog() : mColumns[column] = RS_SERVICE_PERM_DISCOVERY; column = ui->servicePermissionList->addColumn(tr("Forums/Channels")); mColumns[column] = RS_SERVICE_PERM_DISTRIB; + column = ui->servicePermissionList->addColumn(tr("Use as direct source, when available")); + mColumns[column] = RS_SERVICE_PERM_DIRECT_DL; ui->servicePermissionList->start(); } diff --git a/retroshare-gui/src/gui/ServicePermissionDialog.ui b/retroshare-gui/src/gui/ServicePermissionDialog.ui index 2b4494a5a..faaf8535c 100644 --- a/retroshare-gui/src/gui/ServicePermissionDialog.ui +++ b/retroshare-gui/src/gui/ServicePermissionDialog.ui @@ -6,8 +6,8 @@ 0 0 - 504 - 354 + 800 + 400 @@ -77,18 +77,18 @@ headerFrame - - FriendSelectionWidget - QWidget -
gui/common/FriendSelectionWidget.h
- 1 - HeaderFrame QFrame
gui/common/HeaderFrame.h
1 + + FriendSelectionWidget + QWidget +
gui/common/FriendSelectionWidget.h
+ 1 + diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index eb45e6626..12de7f27a 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -2614,6 +2614,377 @@ Some services (Discovery, anonymous routing) can be switched off globally, which + + ConnectProgressDialog + + Connection Progress + + + + Connecting to: + + + + TextLabel + + + + Network + + + + Net Result + + + + Connect Status + + + + Contact Result + + + + DHT Startup + + + + DHT Result + + + + Peer Lookup + + + + Peer Result + + + + UDP Setup + + + + UDP Result + + + + <!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:'Lucida Grande'; font-size:13pt; 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;">This Widget shows the progress of your connection to your new peer.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">It is helpful for problem-solving.</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;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">If you are an expert RS user, or trust that RS will do the right thing</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">you can close it.</p></body></html> + + + + Connection Assistant + + + + Invalid Peer ID + + + + Unknown State + + + + Offline + + + + Behind Symmetric NAT + + + + Behind NAT & No DHT + + + + NET Restart + + + + Behind NAT + + + + No DHT + + + + NET STATE GOOD! + + + + UNVERIFABLE FORWARD! + + + + UNVERIFABLE FORWARD & NO DHT + + + + DHT Failed + + + + DHT Disabled + + + + DHT Okay + + + + Finding RS Peers + + + + Lookup requires DHT + + + + Searching DHT + + + + Lookup Timeout + + + + Peer DHT NOT ACTIVE + + + + Lookup Failure + + + + Peer Offline + + + + Peer Firewalled + + + + Peer Online + + + + Udp Connect Timeout + + + + Connection In Progress + + + + Initial connections can take a while, please be patient + + + + If an error is detected it will be displayed here + + + + You can close this dialog at any time + + + + Retroshare will continue connecting in the background + + + + Connection Timeout + + + + Connection Attempt has taken too long + + + + But no error has been detected + + + + Try again shortly, Retroshare will continue connecting in the background + + + + If you continue to get this message, please contact developers + + + + DHT Lookup Timeout + + + + DHT Lookup has taken too long + + + + UDP Connection Timeout + + + + UDP Connection has taken too long + + + + UDP Connection Failed + + + + We are continually working to improve connectivity. + + + + In this case the UDP connection attempt has failed. + + + + Improve connectivity by opening a Port in your Firewall. + + + + Connected + + + + Congratulations, you are connected + + + + DHT startup Failed + + + + Your DHT has not started properly + + + + Common causes of this problem are: + + + + - You are not connected to the Internet + + + + - You have a missing or out-of-date DHT bootstrap file (bdboot.txt) + + + + DHT is Disabled + + + + The DHT is OFF, so Retroshare cannot find your Friends. + + + + Retroshare has tried All Known Addresses, with no success + + + + The DHT is needed if your friends have Dynamic IP Addresses. + + + + Only Advanced Retroshare users should switch of the DHT. + + + + Go to Settings->Server and change config to "Public: DHT and Discovery" + + + + Peer Denied Connection + + + + We successfully reached your Friend. + + + + but they have not added you as a Friend. + + + + Please contact them to add your Certificate + + + + Your Retroshare Node is configured Okay + + + + We successfully reached your Friend via UDP. + + + + Please contact them to add your Full Certificate + + + + They need a Certificate + Location for UDP connections to succeed + + + + We Cannot find your Friend. + + + + They are either offline or their DHT is Off + + + + Peer DHT is Disabled + + + + Your Friend has configured Retroshare with DHT Disabled. + + + + You have previously connected to this Friend + + + + Retroshare has determined that they have DHT switched off + + + + Without the DHT it is hard for Retroshare to locate your friend + + + + Try importing a fresh Certificate to get up-to-date connection information + + + + Incomplete Friend Details + + + + You have imported an incomplete Certificate + + + + Retroshare cannot connect without ths information + + + + Please retry importing the full Certificate + + + CreateBlog @@ -9354,10 +9725,6 @@ Right-click and select 'make friend' to be able to connect. Wrong password ! - - Please enter the password to unlock your PGP key: - - Unregistered plugin/executable @@ -11707,6 +12074,14 @@ The default value is 20. Forums/Channels + + Service Permissions + + + + Use as direct source, when available + + Settings