Author: toad
Date: 2008-08-14 18:13:40 +0000 (Thu, 14 Aug 2008)
New Revision: 21858

Modified:
   trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
   trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Commit theo's improved wording for the Opennet Question.


Modified: trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java  
2008-08-14 17:39:14 UTC (rev 21857)
+++ trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java  
2008-08-14 18:13:40 UTC (rev 21858)
@@ -78,9 +78,6 @@
                        opennetDiv.addChild("input", new String[] { "type", 
"name", "value" }, new String[] { "radio", "enableOpennet", "true" }, 
l10n("opennetYes"));
                        opennetDiv.addChild("br");
                        opennetDiv.addChild("input", new String[] { "type", 
"name", "value" }, new String[] { "radio", "enableOpennet", "false" }, 
l10n("opennetNo"));
-                       HTMLNode para = opennetForm.addChild("p");
-                       para.addChild("b", l10n("warningTitle")+' ');
-                       L10n.addL10nSubstitution(para, 
"FirstTimeWizardToadlet.opennetWarning", new String[] { "bold", "/bold" }, new 
String[] { "<b>", "</b>" });
                        opennetForm.addChild("input", new String[] { "type", 
"name", "value" }, new String[] { "submit", "opennetF", 
L10n.getString("FirstTimeWizardToadlet.continue")});
                        opennetForm.addChild("input", new String[] { "type", 
"name", "value" }, new String[] { "submit", "cancel", 
L10n.getString("Toadlet.cancel")});
                        this.writeHTMLReply(ctx, 200, "OK", 
pageNode.generate());

Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-08-14 
17:39:14 UTC (rev 21857)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties   2008-08-14 
18:13:40 UTC (rev 21858)
@@ -257,12 +257,10 @@
 FirstTimeWizardToadlet.chooseNodeName=Node name required!
 FirstTimeWizardToadlet.chooseNodeNameLong=Please enter a node name in the 
field below (we recommend a nickname possibly with an email address). This is 
so that your friends (trusted peers, which you have manually added) can easily 
tell your node from their other nodes. This is not visible to strangers 
(untrusted automatically added peers). Note that any friend or stranger may 
trivially identify you from your IP address, since you are connected to them, 
but they cannot easily tell what you are requesting.
 FirstTimeWizardToadlet.connectToStrangers=Connect to strangers?
-FirstTimeWizardToadlet.connectToStrangersLong=Ideally, all Freenet users would 
connect only to people they know. This is far more secure, making it very 
difficult for others to tell that you are using Freenet. However, if you don't 
know at least 5 people already running Freenet, you can choose to connect to 
strangers. You can always add connections to your friends later, and eventually 
turn off insecure mode so your node only connects to your Friends, but please 
read the warning below.
-FirstTimeWizardToadlet.enableOpennet=Do you know anyone already using Freenet?
-FirstTimeWizardToadlet.opennetYes=No, I want the node to automatically find 
strangers to connect to. 
-FirstTimeWizardToadlet.opennetNo=Yes, I have at least 5 friends already using 
Freenet and I will add their details on the Friends page.
-FirstTimeWizardToadlet.warningTitle=Warning!
-FirstTimeWizardToadlet.opennetWarning=If Freenet is illegal where you live, or 
if you are using it to access materials that may get you into trouble, telling 
the node to automatically connect to strangers may be dangerous as it makes 
life much easier for an attacker. Freenet is still experimental, and we offer 
no guarantees about security.
+FirstTimeWizardToadlet.connectToStrangersLong=To run Freenet, you must connect 
to at least five other nodes.  These should ideally be run by people whom you 
know and trust.  If you don't know enough friends running Freenet, you can 
choose to connect to strangers' nodes as well.  However, connecting to 
strangers allows others to find out that you are using Freenet and adds some 
additional security risks.  If you want to keep your use of Freenet secret, 
this may get you into trouble.
+FirstTimeWizardToadlet.enableOpennet=It is possible to turn off stranger 
connections later on, once you have added enough friends, although you will 
already have revealed some information to strangers in the meantime.  Freenet 
is still experimental, and we offer no guarantees about security.
+FirstTimeWizardToadlet.opennetYes=I want the node to automatically find 
strangers to connect to. 
+FirstTimeWizardToadlet.opennetNo=I have at least 5 friends already using 
Freenet and I will add their details on the Friends page.
 FirstTimeWizardToadlet.welcomeInfoboxTitle=Welcome to Freenet first time 
wizard!
 FirstTimeWizardToadlet.welcomeInfoboxContent1=Welcome to Freenet first time 
wizard. This tool will enable you to configure your node quickly and easily to 
get you started.
 FirstTimeWizardToadlet.bandwidthLimit=Bandwidth limits


Reply via email to