Author: toad
Date: 2008-09-03 16:38:01 +0000 (Wed, 03 Sep 2008)
New Revision: 22370
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
Log:
Split the user's situation and what Freenet has to say up, the latter being on
the next line in italics.
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-09-03
16:19:13 UTC (rev 22369)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-09-03
16:38:01 UTC (rev 22370)
@@ -418,7 +418,9 @@
}
input.addChild("b",
l10nSec("networkThreatLevel.name."+level));
input.addChild("#", ": ");
- L10n.addL10nSubstitution(input,
"SecurityLevels.networkThreatLevel.desc."+level, new String[] { "bold", "/bold"
}, new String[] { "<b>", "</b>" });
+ L10n.addL10nSubstitution(input,
"SecurityLevels.networkThreatLevel.choice."+level, new String[] { "bold",
"/bold" }, new String[] { "<b>", "</b>" });
+ HTMLNode inner = input.addChild("p").addChild("i");
+ L10n.addL10nSubstitution(inner,
"SecurityLevels.networkThreatLevel.desc."+level, new String[] { "bold", "/bold"
}, new String[] { "<b>", "</b>" });
}
// Friends security level
@@ -439,7 +441,9 @@
}
input.addChild("b",
l10nSec("friendsThreatLevel.name."+level));
input.addChild("#", ": ");
- L10n.addL10nSubstitution(input,
"SecurityLevels.friendsThreatLevel.desc."+level, new String[] { "bold", "/bold"
}, new String[] { "<b>", "</b>" });
+ L10n.addL10nSubstitution(input,
"SecurityLevels.friendsThreatLevel.choice."+level, new String[] { "bold",
"/bold" }, new String[] { "<b>", "</b>" });
+ HTMLNode inner = input.addChild("p").addChild("i");
+ L10n.addL10nSubstitution(inner,
"SecurityLevels.friendsThreatLevel.desc."+level, new String[] { "bold", "/bold"
}, new String[] { "<b>", "</b>" });
}
// Physical security level
@@ -460,7 +464,9 @@
}
input.addChild("b",
l10nSec("physicalThreatLevel.name."+level));
input.addChild("#", ": ");
- L10n.addL10nSubstitution(input,
"SecurityLevels.physicalThreatLevel.desc."+level, new String[] { "bold",
"/bold" }, new String[] { "<b>", "</b>" });
+ L10n.addL10nSubstitution(input,
"SecurityLevels.physicalThreatLevel.choice."+level, new String[] { "bold",
"/bold" }, new String[] { "<b>", "</b>" });
+ HTMLNode inner = input.addChild("p").addChild("i");
+ L10n.addL10nSubstitution(inner,
"SecurityLevels.physicalThreatLevel.desc."+level, new String[] { "bold",
"/bold" }, new String[] { "<b>", "</b>" });
}
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-09-03
16:19:13 UTC (rev 22369)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-09-03
16:38:01 UTC (rev 22370)
@@ -1047,10 +1047,14 @@
SecurityLevels.networkThreatLevel.name.HIGH=HIGH
SecurityLevels.networkThreatLevel.name.NORMAL=NORMAL
SecurityLevels.networkThreatLevel.name.LOW=LOW
-SecurityLevels.networkThreatLevel.desc.MAXIMUM=I intend to access information
that could get me arrested, imprisoned, or worse. I understand that Freenet is
experimental and cannot ensure security against certain known attacks, but I
accept the risks compared to the alternatives. Freenet will be
${bold}significantly${/bold} slower than in HIGH, and ${bold}you must have
friends running Freenet to select this mode${/bold}.
-SecurityLevels.networkThreatLevel.desc.HIGH=I would like to make it much more
difficult for others to monitor my communications, or I am worried about ISPs
trying to block Freenet. Freenet will only connect to your friends, so
${bold}you must have friends already using Freenet to select this mode${/bold}.
Freenet will be slow unless you add at least 5-10 friends, and won't work at
all if you don't have at least 1.
-SecurityLevels.networkThreatLevel.desc.NORMAL=I live in a relatively free
country, but I would like to make it more difficult for others to monitor my
communications. Freenet will be reasonably careful to protect your anonymity,
at some performance cost. Freenet will automatically connect to unknown nodes.
We recommend that you add friends running Freenet and upgrade to HIGH.
-SecurityLevels.networkThreatLevel.desc.LOW=I do not care about monitoring and
want maximum performance. It may be quite easy for others to discover my
identity.
+SecurityLevels.networkThreatLevel.choice.MAXIMUM=I intend to access
information that could get me arrested, imprisoned, or worse. I understand that
Freenet is experimental and cannot ensure security against certain known
attacks, but I accept the risks compared to the alternatives.
+SecurityLevels.networkThreatLevel.desc.MAXIMUM=Freenet will be
${bold}significantly${/bold} slower than in HIGH, and ${bold}you must have
friends running Freenet to use this mode${/bold}.
+SecurityLevels.networkThreatLevel.choice.HIGH=I would like to make it much
more difficult for others to monitor my communications, or I am worried about
ISPs trying to block Freenet.
+SecurityLevels.networkThreatLevel.desc.HIGH=Freenet will only connect to your
friends, so ${bold}you must have friends already using Freenet to select this
mode${/bold}. Freenet will be slow unless you add at least 5-10 friends, and
won't work at all if you don't have at least 1.
+SecurityLevels.networkThreatLevel.choice.NORMAL=I live in a relatively free
country, but I would like to make it more difficult for others to monitor my
communications.
+SecurityLevels.networkThreatLevel.desc.NORMAL=Freenet will be reasonably
careful to protect your anonymity, at some performance cost. Freenet will
automatically connect to unknown nodes. We recommend that you add friends
running Freenet and upgrade to HIGH.
+SecurityLevels.networkThreatLevel.choice.LOW=I do not care about monitoring
and want maximum performance.
+SecurityLevels.networkThreatLevel.desc.LOW=It may be quite easy for others to
discover your identity!
SecurityLevels.noFriendsWarning=You have not added any Friends. If you set the
network security level to high or maximum, you will be unable to connect to
Freenet until you have at least one connected Friend! Note that for there to be
any meaningful security benefit, these must be people you actually know and at
least marginally trust, and for good performance you will need at least 5-10 of
them connected at any time. Are you sure?
SecurityLevels.noFriendsCheckbox=I am sure, enable high network security
level, I will add some Friends ASAP.
SecurityLevels.noConnectedFriendsWarning=You do not have any connected
Friends, although you have added ${added} friends. If you set the network
security level to high or maximum, you will only be able to connect to Freenet
when your friends are online, which they are not at the moment. You should add
additional Friends, only use Freenet when your friends are connected, or not
upgrade to high security. Note that for there to be any meaningful security
benefit, your Friends must be people you actually know and at least marginally
trust, and for good performance you will need at least 5-10 of them connected
at any time. Are you sure?
@@ -1067,15 +1071,20 @@
SecurityLevels.friendsThreatLevel.name.HIGH=HIGH
SecurityLevels.friendsThreatLevel.name.NORMAL=NORMAL
SecurityLevels.friendsThreatLevel.name.LOW=LOW
-SecurityLevels.friendsThreatLevel.desc.HIGH=I would like Freenet to take extra
precautions to avoid attacks from friends. Freenet will not share any
additional information with friends and so will be somewhat slower than in
NORMAL mode.
-SecurityLevels.friendsThreatLevel.desc.NORMAL=I am not overly concerned about
attacks from friends, but I would like Freenet to take reasonable precautions
at some performance cost. Freenet will share a limited amount of information
with friends.
-SecurityLevels.friendsThreatLevel.desc.LOW=I am not concerned about attacks
from friends. I trust my friends and their computer security abilities.
Freenet will trust friends fully, for maximum performance.
+SecurityLevels.friendsThreatLevel.choice.HIGH=I would like Freenet to take
extra precautions to avoid attacks from friends.
+SecurityLevels.friendsThreatLevel.desc.HIGH=Freenet will avoid sharing
information with friends and so will be somewhat slower than in NORMAL mode.
+SecurityLevels.friendsThreatLevel.choice.NORMAL=I am not overly concerned
about attacks from friends, but I would like Freenet to take reasonable
precautions.
+SecurityLevels.friendsThreatLevel.desc.NORMAL=Freenet will share a limited
amount of information with friends, and be slower than in LOW mode.
+SecurityLevels.friendsThreatLevel.choice.LOW=I am not concerned about attacks
from friends. I trust my friends and their computer security abilities.
+SecurityLevels.friendsThreatLevel.desc.LOW=Freenet will share a lot of
information with your friends' nodes to maximize performance.
SecurityLevels.physicalThreatLevelShort=Protection if your computer is seized
or stolen
SecurityLevels.physicalThreatLevel=How concerned are you about your computer
being physically seized and examined?
SecurityLevels.physicalThreatLevel.name.NORMAL=NORMAL
SecurityLevels.physicalThreatLevel.name.LOW=LOW
-SecurityLevels.physicalThreatLevel.desc.NORMAL=I am concerned. Freenet will
encrypt temporary files etc, at a small performance cost, but you should take
additional precautions such as disabling your browser cache when browsing
freesites.
-SecurityLevels.physicalThreatLevel.desc.LOW=I am not concerned. Freenet will
avoid disk encryption and leave traces of what you have visited on your hard
disk, improving performance.
+SecurityLevels.physicalThreatLevel.choice.NORMAL=I am concerned.
+SecurityLevels.physicalThreatLevel.desc.NORMAL=Freenet will encrypt temporary
files etc, at a small performance cost, but you should take additional
precautions such as disabling your browser cache when using the web interface.
+SecurityLevels.physicalThreatLevel.choice.LOW=I am not concerned.
+SecurityLevels.physicalThreatLevel.desc.LOW=Freenet will avoid disk encryption
and leave traces of what you have visited on your hard disk, improving
performance at the expense of lower security if your computer is seized.
ShortOption.parseError=Cannot parse value as a string array: ${error}
ShortOption.parseError=The value specified can't be parsed as a 16-bit integer
: ${val}
SimpleToadletServer.advancedMode=Enable Advanced Mode?
