Author: toad
Date: 2008-04-19 16:39:26 +0000 (Sat, 19 Apr 2008)
New Revision: 19429
Modified:
trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
Log:
Prefix depends on NAT type: "Serious connection problems" if symmetric,
"Connection problems" otherwise.
Modified: trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties
===================================================================
--- trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-04-19
16:34:50 UTC (rev 19428)
+++ trunk/freenet/src/freenet/l10n/freenet.l10n.en.properties 2008-04-19
16:39:26 UTC (rev 19429)
@@ -479,8 +479,10 @@
IPDetectorPluginManager.suggestForwardTwoPortsWithLink= You may want to
${link}forward the ports${/link} (UDP port numbers ${port1} and ${port2})
manually (or you may already have done so, Freenet cannot easily detect this).
IPDetectorPluginManager.symmetric=Your internet connection appears to be
behind a symmetric NAT or firewall. You will probably only be able to connect
to users directly connected to the internet or behind restricted cone NATs.
IPDetectorPluginManager.symmetricTitle=Symmetric firewall detected
-IPDetectorPluginManager.forwardPortShort=Connection problems: Please forward
UDP port ${port}.
-IPDetectorPluginManager.forwardTwoPortsShort=Connection problems: Please
forward UDP ports ${port1} and ${port2}.
+IPDetectorPluginManager.seriousConnectionProblems=Serious connection problems:
+IPDetectorPluginManager.connectionProblems=Connection problems:
+IPDetectorPluginManager.forwardPortShort=Please forward UDP port ${port}.
+IPDetectorPluginManager.forwardTwoPortsShort=Please forward UDP ports ${port1}
and ${port2}.
IPDetectorPluginManager.forwardPort=Your node appears to be behind some sort
of NAT (see the connectivity page for details). You should forward UDP (not
TCP) port ${port} if possible to improve connectivity. It is possible you have
already done this; it takes a while for Freenet to detect a port forward. See
${link}here${/link} for some more information.
IPDetectorPluginManager.forwardTwoPorts=Your node appears to be behind some
sort of NAT (see the connectivity page for details). You should forward UDP
(not TCP) ports ${port1} and ${port2} if possible to improve connectivity. It
is possible you have already done this; it takes a while for Freenet to detect
a port forward. See ${link}here${/link} for some more information.
IPDetectorPluginManager.portForwardHelpURL=http://wiki.freenetproject.org/FirewallAndRouterIssues
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
16:34:50 UTC (rev 19428)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-04-19
16:39:26 UTC (rev 19429)
@@ -80,10 +80,13 @@
}
public String getShortText() {
+ String prefix = innerGetPriorityClass() ==
UserAlert.ERROR ?
+ l10n("seriousConnectionProblems") :
l10n("connectionProblems");
+ prefix += " ";
if(portsNotForwarded.length == 1) {
- return l10n("forwardPortShort", "port",
Integer.toString(portsNotForwarded[0]));
+ return prefix + l10n("forwardPortShort",
"port", Integer.toString(portsNotForwarded[0]));
} else if(portsNotForwarded.length == 2) {
- return l10n("forwardTwoPortsShort", new
String[] { "port1", "port2" },
+ return prefix + l10n("forwardTwoPortsShort",
new String[] { "port1", "port2" },
new String[] {
Integer.toString(portsNotForwarded[0]), Integer.toString(portsNotForwarded[1])
});
} else {
Logger.error(this, "Unknown number of ports to
forward: "+portsNotForwarded.length);
