diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index dfc3bb07d..2387516bd 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -444,6 +444,11 @@ p, li { white-space: pre-wrap; } GxsForums + + Warning: The services here are experimental. Please help us test them. + But Remember: Any data here *WILL* be lost when we upgrade the protocols. + + AttachFileItem @@ -9726,14 +9731,6 @@ Reported error is: %2 - - Directory is browsable for friends from parent groups - - - - Directory is accessible by anonymous tunnels from friends from parent groups - - Directory is browsable for any friend @@ -9765,14 +9762,6 @@ and open the Make Friend Wizard. Characters <b>",|,/,\,&lt;,&gt;,*,?</b> will be replaced by '_'. - - Directory is NOT browsable for friends from parent groups - - - - Directory is NOT accessible by anonymous tunnels from friends from parent groups - - Directory is NOT browsable for any friend @@ -9781,6 +9770,22 @@ Characters <b>",|,/,\,&lt;,&gt;,*,?</b> will be replace Directory is NOT accessible by anonymous tunnels from any friend + + Directory is browsable for friends from groups + + + + Directory is accessible by anonymous tunnels from friends from groups + + + + Directory is NOT browsable for friends from groups + + + + Directory is NOT accessible by anonymous tunnels from friends from groups + + QuickStartWizard @@ -10883,10 +10888,6 @@ p, li { white-space: pre-wrap; } Share flags - - Parent groups - - Apply and close @@ -10895,6 +10896,10 @@ p, li { white-space: pre-wrap; } Edit Shared Folder + + Groups + + SharedFilesDialog @@ -11461,13 +11466,17 @@ It is however recommended to leave at least a few slots for cache files.Transfer + + Progressive + + <!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:'Ubuntu'; font-size:11pt; 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;"><span style=" font-family:'Sans'; font-size:8pt; font-weight:600;">RetroShare</span><span style=" font-family:'Sans'; font-size:8pt;"> is capable of transferring data and search requests between peers that are not necessarily friends. This traffic however only transits through a connected list of friends and is anonymous.</span></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; font-family:'Sans'; font-size:8pt;"></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; font-family:'Sans'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:8pt;">You can separately setup share flags for each shared directory in the shared files dialog to be:</span></p> <ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-family:'Sans'; font-size:8pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Browsable by friends</span>: files are seen by your friends.</li> <li style=" font-family:'Sans'; font-size:8pt;" style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Anonymously shared</span>: files are anonymously reachable through distant F2F tunnels.</li></ul></body></html> @@ -11782,11 +11791,43 @@ Try to be patient! - Your files + Download from collection file... - Download from collection file... + My files + + + + Progressive + + + + Rename file... + + + + Specify... + + + + Set destination directory + + + + Choose directory + + + + Change file name + + + + Please enter a new file name + + + + Please enter a new--and valid--filename @@ -12198,18 +12239,6 @@ Try to be patient! WikiDialog - - Wiki Group - - - - Page - - - - Id - - << @@ -12246,6 +12275,42 @@ Try to be patient! Search + + Page Name + + + + Page Id + + + + Orig Id + + + + My Groups + + + + Subscribed Groups + + + + Popular Groups + + + + Other Groups + + + + Subscribe to Group + + + + Unsubscribe to Group + + WikiEditDialog