Merge the changes from the ndt-web10g branch into trunk

Applet/NDTConstants.java

@@ -18,15 +18,15 @@ public class NDTConstants {
 	public static final String META_BROWSER_OS = "client.browser.name";
 	public static final String META_CLIENT_KERNEL_VERSION = "client.kernel.version";
 	public static final String META_CLIENT_VERSION = "client.version";
-        public static final String META_CLIENT_APPLICATION = "client.application";
+    public static final String META_CLIENT_APPLICATION = "client.application";
 
 	/*
 	 * TODO for a later release: Version could be moved to some "configurable"
 	 * or "property" area instead of being in code that needs compilation.
 	 */
 	public static final String VERSION = "3.6.5.2";
 
-	public static final String NDT_TITLE_STR = "TCP/Web100 Network Diagnostic Tool v";
+	public static final String NDT_TITLE_STR = "Network Diagnostic Tool Client v";
 
 	// Section: Test type
 	public static final byte TEST_MID = (1 << 0);
@@ -101,7 +101,22 @@ public class NDTConstants {
 
 	public static final int RFC_1323_DISABLED = 0;
 	public static final int RFC_1323_ENABLED = 1;
-
+ 	// Note Self disabled from servers standpoint i.e. disabled by server
+ 	public static final int RFC_1323_SELF_DISABLED = 2;
+ 	public static final int RFC_1323_PEER_DISABLED = 3;
+
+ 	// Section: RFC2018 SAck
+ 	public static final int RFC_2018_ENABLED = 1;
+
+ 	// Section: RFC2018 Nagle
+ 	public static final int RFC_896_ENABLED = 1;
+
+ 	// Section: RFC3168
+ 	public static final int RFC_3168_ENABLED = 1;
+ 	// Note Self disabled from servers standpoint i.e. disabled by server
+ 	public static final int RFC_3168_SELF_DISABLED = 2;
+ 	public static final int RFC_3168_PEER_DISABLED = 3;
+
 	// Section: Buffer limitation test thresholds
 	public static final float BUFFER_LIMITED = 0.15f; //unused right now
 

Applet/Tcpbw100.java

@@ -177,6 +177,8 @@ public class Tcpbw100 extends JApplet implements ActionListener {
 	// int _iPkts, _iLength=8192, _iCurrentRTO;
 	int _iPkts, _iLength = NDTConstants.PREDEFINED_BUFFER_SIZE, _iCurrentRTO;
 	int _iC2sData, _iC2sAck, _iS2cData, _iS2cAck;
+	// Lowercase string either web100 or web10g used to select Message based upon server type
+	String _sServerType = "web100";
 	// added for mailto url
 	protected URL _targetURL;
 
@@ -550,8 +552,6 @@ public void run() {
 				int testsNum = ((Integer) _spinnerTestCount.getValue())
 						.intValue();
 				_bTestInProgress = true;
-				createDiagnoseWindow();
-				createStatsWindow();
 				_buttonStartTest.setEnabled(false);
 				_buttonDetails.setEnabled(false);
 				_buttonStatistics.setEnabled(false);
@@ -902,15 +902,18 @@ public void actionPerformed(ActionEvent e) {
 	 * Create the "More details" window.
 	 */
 	public void createDiagnoseWindow() {
-		showStatus(_resBundDisplayMsgs.getString("getWeb100Var"));
+		if (_sServerType.compareTo("web100") == 0)
+			showStatus(_resBundDisplayMsgs.getString("getWeb100Var"));
+		else
+			showStatus(_resBundDisplayMsgs.getString("getWeb10gVar"));
 
 		// create new frame
 		if (_frameWeb100Vars == null) {
 			_frameWeb100Vars = new NewFrame();
 		}
 
 		// Get title for this window
-		_frameWeb100Vars.setTitle(_resBundDisplayMsgs.getString("web100Var"));
+		_frameWeb100Vars.setTitle(_resBundDisplayMsgs.getString(_sServerType + "Var"));
 		Panel buttons = new Panel();
 		_frameWeb100Vars.getContentPane().add("South", buttons);
 
@@ -924,7 +927,7 @@ public void createDiagnoseWindow() {
 
 		// Create Text area for displaying results, add "Heading"
 		_txtDiagnosis = new JTextArea(
-				_resBundDisplayMsgs.getString("web100KernelVar") + ":\n", 15,
+				_resBundDisplayMsgs.getString(_sServerType + "KernelVar") + ":\n", 15,
 				30);
 		_txtDiagnosis.setEditable(true);
 		_buttonDismiss.setEnabled(true);
@@ -965,7 +968,7 @@ public void createStatsWindow() {
 
 		// Text area for Statistics, add "heading"
 		_txtStatistics = new JTextArea(
-				_resBundDisplayMsgs.getString("web100Stats") + ":\n", 25, 70);
+				_resBundDisplayMsgs.getString(_sServerType + "Stats") + ":\n", 25, 70);
 		_txtStatistics.setEditable(true);
 		_buttonStatsDismiss.setEnabled(true);
 		_buttonStatsCopy.setEnabled(_bCanCopy);
@@ -2484,9 +2487,6 @@ public void dottcp(StatusPanel sPanel) throws IOException {
 									// already encountered
 		} // end waiting
 
-		_frameWeb100Vars.toBack();
-		_frameDetailedStats.toBack();
-
 		// Tests can be started. Read server response again.
 		// The server must send a message to verify version, and this is
 		// a MSG_LOGIN type of message
@@ -2524,6 +2524,15 @@ public void dottcp(StatusPanel sPanel) throws IOException {
 		}
 		System.out.println("Server version: " + vVersion.substring(1));
 
+		// If we have connected to a Web10G server rebrand ourselves as such
+		_sServerType = vVersion.endsWith("Web10G") ? "web10g" : "web100";
+
+		// Only create the windows once we have connected to the server so this works
+		createDiagnoseWindow();
+		createStatsWindow();
+		_frameWeb100Vars.toBack();
+		_frameDetailedStats.toBack();
+
 		// Read server message again. Server must send a message to negotiate
 		// the test suite, and this is
 		// a MSG_LOGIN type of message which indicates the same set of tests as
@@ -2756,7 +2765,7 @@ public void testResults(String sTestResParam) {
 						iSysval = Integer.parseInt(sStrval);
 						// If it fails as an int it's probably to big since the values are often unsigned
 					} catch (Exception e) {
-						System.out.println("Exception occured reading a web100 var - " + e);
+						System.out.println("Exception occured reading a web100 var " + sSysvar + " - " + e);
 						iSysval = -1;
 					}
 					// save value into a key value expected by us
@@ -3070,7 +3079,7 @@ public void mouseClicked(MouseEvent e) {
 			// System.getProperty("java.class.version") + "\n");
 
 			_txtStatistics.append("\n\t------  "
-					+ _resBundDisplayMsgs.getString("web100Details")
+					+ _resBundDisplayMsgs.getString(_sServerType + "Details")
 					+ "  ------\n");
 
 			// Now add data to the statistics pane about access speed/technology
@@ -3173,9 +3182,9 @@ else if (mismatch == NDTConstants.DUPLEX_NOK_INDICATOR) {
 			}
 
 			_txtStatistics.append("\n"
-					+ _resBundDisplayMsgs.getString("web100rtt") + " =  "
+					+ _resBundDisplayMsgs.getString(_sServerType + "rtt") + " =  "
 					+ NDTUtils.prtdbl(avgrtt) + " " + "ms" + "; ");
-			_sEmailText += "\n%0A" + _resBundDisplayMsgs.getString("web100rtt")
+			_sEmailText += "\n%0A" + _resBundDisplayMsgs.getString(_sServerType + "rtt")
 					+ " = " + NDTUtils.prtdbl(avgrtt) + " " + "ms" + "; ";
 
 			_txtStatistics.append(_resBundDisplayMsgs.getString("packetsize")
@@ -3383,37 +3392,37 @@ else if (mismatch == NDTConstants.DUPLEX_NOK_INDICATOR) {
 
 			// Update statistics on TCP negotiated optional Performance Settings
 			_txtStatistics.append("\n"
-					+ _resBundDisplayMsgs.getString("web100tcpOpts") + " \n");
+					+ _resBundDisplayMsgs.getString(_sServerType + "tcpOpts") + " \n");
 			_txtStatistics.append("RFC 2018 Selective Acknowledgment: ");
-			if (_iSACKEnabled == iZero)
-				_txtStatistics.append(_resBundDisplayMsgs.getString("off")
+			if (_iSACKEnabled != 0)
+				_txtStatistics.append(_resBundDisplayMsgs.getString("on")
 						+ "\n");
 			else
-				_txtStatistics.append(_resBundDisplayMsgs.getString("on")
+				_txtStatistics.append(_resBundDisplayMsgs.getString("off")
 						+ "\n");
 
 			_txtStatistics.append("RFC 896 Nagle Algorithm: ");
-			if (_iNagleEnabled == iZero)
-				_txtStatistics.append(_resBundDisplayMsgs.getString("off")
+			if (_iNagleEnabled != 0)
+				_txtStatistics.append(_resBundDisplayMsgs.getString("on")
 						+ "\n");
 			else
-				_txtStatistics.append(_resBundDisplayMsgs.getString("on")
+				_txtStatistics.append(_resBundDisplayMsgs.getString("off")
 						+ "\n");
 
 			_txtStatistics.append("RFC 3168 Explicit Congestion Notification: ");
-			if (_iECNEnabled == iZero)
-				_txtStatistics.append(_resBundDisplayMsgs.getString("off")
+			if (_iECNEnabled != 0)
+				_txtStatistics.append(_resBundDisplayMsgs.getString("on")
 						+ "\n");
 			else
-				_txtStatistics.append(_resBundDisplayMsgs.getString("on")
+				_txtStatistics.append(_resBundDisplayMsgs.getString("off")
 						+ "\n");
 
 			_txtStatistics.append("RFC 1323 Time Stamping: ");
-			if (_iTimestampsEnabled == NDTConstants.RFC_1323_DISABLED)
-				_txtStatistics.append(_resBundDisplayMsgs.getString("off")
+			if (_iTimestampsEnabled != 0)
+				_txtStatistics.append(_resBundDisplayMsgs.getString("on")
 						+ "\n");
 			else
-				_txtStatistics.append(_resBundDisplayMsgs.getString("on")
+				_txtStatistics.append(_resBundDisplayMsgs.getString("off")
 						+ "\n");
 
 			_txtStatistics.append("RFC 1323 Window Scaling: ");

Applet/Tcpbw100_msgs_ca_ES.properties

@@ -73,9 +73,10 @@ foundDsl = Trobat enlla\u00e7 de Cable modem/DSL/T1.
 fullDuplex = subxaxarxa Full duplex Fast Ethernet
 general = General
 generatingReport = Generant informe de problemes: Aquest informe s'enviar\u00e0 per e-mail a la persona que especifiquis
-getWeb100Var = Obt\u00e9 les variables WEB100
+getWeb100Var = Obt\u00e9 les variables Web100
+getWeb10gVar = Obt\u00e9 les variables Web10G
 halfDuplex = subxarxa Half duplex Fast Ethernet
-id = Eina de diagn\u00f2stic de xara TCP/Web100
+id = Eina de diagn\u00f2stic de xara TCP/Web100/Web10G
 immediate = immediat
 inboundTest = Test d'entrada Tcpbw100...
 inboundWrongMessage = Test de throughput C2S: Rebut un tipus de missatge erroni
@@ -212,11 +213,17 @@ vendor = Fabricant
 version = Versi\u00f3
 versionWrongMessage = Negociant la versi\u00f3 de NDT: S'ha rebut un missatge erroni.
 web100Details = An\u00e0lisi detallat Web100
-web100KernelVar = Variables de Kernel WEB100
-web100Stats = Estad\u00edstiques WEB100 habilitades
+web100KernelVar = Variables de Kernel Web100
+web100Stats = Estad\u00edstiques Web100 habilitades
 web100Var = Variables Web100
 web100rtt = Web100 informa el temps d'anada i tornada (RTT)
 web100tcpOpts = Web100 informa que TCP ha negociat els par\u00e0metres de funcionament \u00f2ptims a:
+web10gDetails = An\u00e0lisi detallat Web10G
+web10gKernelVar = Variables de Kernel Web10G
+web10gStats = Estad\u00edstiques Web10G habilitades
+web10gVar = Variables Web10G
+web10grtt = Web10G informa el temps d'anada i tornada (RTT)
+web10gtcpOpts = Web10G informa que TCP ha negociat els par\u00e0metres de funcionament \u00f2ptims a:
 willImprove = Millorar\u00e0 el funcionament
 workstation = Estaci\u00f3 de treball
 your = El seu

Applet/Tcpbw100_msgs_el_GR.properties

@@ -73,9 +73,10 @@ foundDsl = \u03b2\u03c1\u03ad\u03b8\u03b7\u03ba\u03b5 \u03c3\u03cd\u03bd\u03b4\u
 fullDuplex = \u03c5\u03c0\u03bf\u03b4\u03af\u03ba\u03c4\u03c5\u03bf Full duplex Fast Ethernet 
 general = \u0393\u03b5\u03bd\u03b9\u03ba\u03ac
 generatingReport = \u03a0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae \u03b4\u03b5\u03bb\u03c4\u03af\u03bf\u03c5 \u03c0\u03c1\u03bf\u03b2\u03bb\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2:  \u0391\u03c5\u03c4\u03ae \u03b7 \u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03b8\u03b1 \u03c4\u03b1\u03c7\u03c5\u03b4\u03c1\u03bf\u03bc\u03b7\u03b8\u03b5\u03af \u03c3\u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03c9\u03c0\u03bf \u03c0\u03bf\u03c5 \u03b8\u03b1 \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03b5\u03c4\u03b5
-getWeb100Var = Get WEB100 Variables
+getWeb100Var = Get Web100 Variables
+getWeb10gVar = Get Web10G Variables
 halfDuplex = \u03c5\u03c0\u03bf\u03b4\u03af\u03ba\u03c4\u03c5\u03bf Half duplex Fast Ethernet 
-id = TCP/Web100 \u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf \u0394\u03b9\u03ac\u03b3\u03bd\u03c9\u03c3\u03b7\u03c2 \u0394\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5
+id = TCP/Web100/Web10G \u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf \u0394\u03b9\u03ac\u03b3\u03bd\u03c9\u03c3\u03b7\u03c2 \u0394\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5
 immediate = \u03b1\u03bc\u03ad\u03c3\u03c9\u03c2
 inboundTest = Tcpbw100 \u03b4\u03bf\u03ba\u03b9\u03bc\u03ae \u03b5\u03b9\u03c3\u03b5\u03c1\u03c7\u03cc\u03bc\u03b5\u03bd\u03b7\u03c2 \u03ba\u03af\u03bd\u03b7\u03c3\u03b7\u03c2...
 inboundWrongMessage = \u0394\u03bf\u03ba\u03b9\u03bc\u03ae: \u03c4\u03b1\u03c7\u03cd\u03c4\u03b7\u03c4\u03b1 \u03b4\u03b9\u03b1\u03bc\u03b5\u03c4\u03b1\u03b3\u03c9\u03b3\u03ae\u03c2 \u03b1\u03c0\u03cc \u03c0\u03b5\u03bb\u03ac\u03c4\u03b7 \u03c0\u03c1\u03bf\u03c2 \u03b5\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae: \u039b\u03ac\u03b2\u03b1\u03bc\u03b5 \u03bb\u03ac\u03b8\u03bf\u03c2 \u03c4\u03cd\u03c0\u03bf \u03bc\u03b7\u03bd\u03cd\u03bc\u03b1\u03c4\u03bf\u03c2
@@ -211,11 +212,17 @@ vendor = \u039a\u03b1\u03c4\u03b1\u03c3\u03ba\u03b5\u03c5\u03b1\u03c3\u03c4\u03a
 version = \u0388\u03ba\u03b4\u03bf\u03c3\u03b7
 versionWrongMessage = \u0394\u03b9\u03b1\u03c0\u03c1\u03b1\u03b3\u03bc\u03ac\u03c4\u03b5\u03c5\u03c3\u03b7 \u03ad\u03ba\u03b4\u03bf\u03c3\u03b7\u03c2 \u03c4\u03bf\u03c5 NDT: \u039b\u03ac\u03b2\u03b1\u03bc\u03b5 \u03bb\u03ac\u03b8\u03bf\u03c2 \u03c4\u03cd\u03c0\u03bf\u03c5 \u03bc\u03b7\u03bd\u03cd\u03bc\u03b1\u03c4\u03bf\u03c2
 web100Details = Web100 \u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03b5\u03c1\u03ae\u03c2 \u03b1\u03bd\u03ac\u03bb\u03c5\u03c3\u03b7
-web100KernelVar = WEB100 \u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2 \u03c4\u03bf\u03c5 \u03c0\u03c5\u03c1\u03ae\u03bd\u03b1
-web100Stats = \u03a3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac \u03bc\u03ad\u03c3\u03c9 \u03c4\u03bf\u03c5 WEB100
+web100KernelVar = Web100 \u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2 \u03c4\u03bf\u03c5 \u03c0\u03c5\u03c1\u03ae\u03bd\u03b1
+web100Stats = \u03a3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac \u03bc\u03ad\u03c3\u03c9 \u03c4\u03bf\u03c5 Web100
 web100Var = \u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2 Web100 
 web100rtt = To Web100 \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9 \u03cc\u03c4\u03b9 \u03bf \u03c7\u03c1\u03cc\u03bd\u03bf\u03c2 \u03b1\u03c0\u03cc\u03ba\u03c1\u03b9\u03c3\u03b7\u03c2 (Round trip time) 
 web100tcpOpts = To Web100 \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9 \u03cc\u03c4\u03b9 \u03c4\u03bf TCP \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af \u03c4\u03b9\u03c2 \u03b5\u03be\u03ae\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2:
+web10gDetails = Web10G \u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03b5\u03c1\u03ae\u03c2 \u03b1\u03bd\u03ac\u03bb\u03c5\u03c3\u03b7
+web10gKernelVar = Web10G \u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2 \u03c4\u03bf\u03c5 \u03c0\u03c5\u03c1\u03ae\u03bd\u03b1
+web10gStats = \u03a3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac \u03bc\u03ad\u03c3\u03c9 \u03c4\u03bf\u03c5 Web10G
+web10gVar = \u039c\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2 Web10G 
+web10grtt = To Web10G \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9 \u03cc\u03c4\u03b9 \u03bf \u03c7\u03c1\u03cc\u03bd\u03bf\u03c2 \u03b1\u03c0\u03cc\u03ba\u03c1\u03b9\u03c3\u03b7\u03c2 (Round trip time) 
+web10gtcpOpts = To Web10G \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9 \u03cc\u03c4\u03b9 \u03c4\u03bf TCP \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af \u03c4\u03b9\u03c2 \u03b5\u03be\u03ae\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2:
 willImprove = \u03b8\u03b1 \u03b2\u03b5\u03bb\u03c4\u03b9\u03ce\u03c3\u03b5\u03b9 \u03c4\u03b7\u03bd \u03b5\u03c0\u03af\u03b4\u03bf\u03c3\u03b7
 workstation = \u03a3\u03c4\u03b1\u03b8\u03bc\u03cc\u03c2 \u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1\u03c2
 your = \u03a4\u03bf \u03b4\u03b9\u03ba\u03cc \u03c3\u03b1\u03c2

Applet/Tcpbw100_msgs_en_US.properties

@@ -73,9 +73,10 @@ foundDsl = Cable modem/DSL/T1 link found.
 fullDuplex = Full duplex Fast Ethernet subnet
 general = General
 generatingReport = Generating Trouble Report:  This report will be emailed to the person you specify
-getWeb100Var = Get WEB100 Variables
+getWeb100Var = Get Web100 Variables
+getWeb10gVar = Get Web10G Variables
 halfDuplex = Half duplex Fast Ethernet subnet
-id = TCP/Web100 Network Diagnostic Tool
+id = TCP/Web100/Web10G Network Diagnostic Tool
 immediate = immediate
 inboundTest = Tcpbw100 inbound test...
 inboundWrongMessage = C2S throughput test: Received wrong type of the message
@@ -211,11 +212,17 @@ vendor = Vendor
 version = Version
 versionWrongMessage = Negotiating NDT version: Received wrong type of the message
 web100Details = Web100 Detailed Analysis
-web100KernelVar = WEB100 Kernel Variables
-web100Stats = WEB100 Enabled Statistics
+web100KernelVar = Web100 Kernel Variables
+web100Stats = Web100 Enabled Statistics
 web100Var = Web100 Variables
 web100rtt = Web100 reports the Round trip time
 web100tcpOpts = Web100 reports TCP negotiated the optional Performance Settings to:
+web10gDetails = Web10G Detailed Analysis
+web10gKernelVar = Web10G Kernel Variables
+web10gStats = Web10G Enabled Statistics
+web10gVar = Web10G Variables
+web10grtt = Web10G reports the Round trip time
+web10gtcpOpts = Web10G reports TCP negotiated the optional Performance Settings to:
 willImprove = will improve performance
 workstation = Workstation
 your = Your

Applet/Tcpbw100_msgs_fr_FR.properties

@@ -73,9 +73,10 @@ foundDsl = Lien C\u00E2ble modem/DSL/T1 d\u00E9tect\u00E9.
 fullDuplex = Full duplex Fast Ethernet subnet
 general = G\u00E9n\u00E9ral
 generatingReport = G\u00E9n\u00E9ration du rapport d'incident:  Ce rapport sera envoy\u00E9 \u00E0 la personne sp\u00E9cifi\u00E9e
-getWeb100Var = R\u00E9cup\u00E9rer les variables WEB100
+getWeb100Var = R\u00E9cup\u00E9rer les variables Web100
+getWeb10gVar = R\u00E9cup\u00E9rer les variables Web10G
 halfDuplex = Half duplex Fast Ethernet subnet
-id = Outil de diagnostics r\u00E9seau TCP/Web100
+id = Outil de diagnostics r\u00E9seau TCP/Web100/Web10G
 immediate = imm\u00E9diat
 inboundTest = test d'entr\u00E9e Tcpbw100...
 inboundWrongMessage = Test de d\u00E9bit C2S : r\u00E9ception du mauvais type de message
@@ -211,11 +212,17 @@ vendor = Vendeur
 version = Version
 versionWrongMessage = Negotiating NDT version: r\u00E9ception du mauvais type de message
 web100Details = Analyse d\u00E9taill\u00E9e Web100
-web100KernelVar = Variables du noyau WEB100
-web100Stats = Statistiques activ\u00E9es WEB100
+web100KernelVar = Variables du noyau Web100
+web100Stats = Statistiques activ\u00E9es Web100
 web100Var = Variables Web100
 web100rtt = Web100 rapporte le temps d'aller-retour (RTT)
 web100tcpOpts = Web100 rapporte que TCP a n\u00E9goci\u00E9 les param\u00E8tres de performances facultatifs \u00E0 :
+web10gDetails = Analyse d\u00E9taill\u00E9e Web10G
+web10gKernelVar = Variables du noyau Web10G
+web10gStats = Statistiques activ\u00E9es WebB10G
+web10gVar = Variables Web10G
+web10grtt = Web10G rapporte le temps d'aller-retour (RTT)
+web10gtcpOpts = Web10G rapporte que TCP a n\u00E9goci\u00E9 les param\u00E8tres de performances facultatifs \u00E0 :
 willImprove = am\u00E9liorera les performances
 workstation = Poste de travail
 your = Votre

Applet/Tcpbw100_msgs_nb_NO.properties

@@ -74,9 +74,10 @@ foundDsl = Link med kabelmodem/DSL/T1 funnet.
 fullDuplex = full dupleks "Fast Ethernet"-subnett
 general = Annet
 generatingReport = Genererer feilrapport; denne vil bli sendt til personen du spesifiserer
-getWeb100Var = Viser variabler fra WEB100
+getWeb100Var = Viser variabler fra Web100
+getWeb10gVar = Viser variabler fra Web10G
 halfDuplex = Halv-dupleks "Fast Ethernet"-subnett
-id = TCP/Web100 nettverksdiagnostikkverkt\u00f8y
+id = TCP/Web100/Web10G nettverksdiagnostikkverkt\u00f8y
 immediate = umiddelbart
 inboundTest = Tcpbw100 innkommende test...
 inboundWrongMessage = Klient-til-tjener-ytelsestest: mottok feil melding
@@ -213,11 +214,17 @@ vendor = Leverand\u00f8r
 version = Versjon
 versionWrongMessage = Avtaler NDT-versjon: Mottok feil type melding
 web100Details = Detaljerte opplysninger fra Web100
-web100KernelVar = Kjernevariabler fra WEB100
-web100Stats = Statistikk fra WEB100
+web100KernelVar = Kjernevariabler fra Web100
+web100Stats = Statistikk fra Web100
 web100Var = Variabler fra Web100
 web100rtt = Web100 melder at rundreisetid
 web100tcpOpts = Web100 melder at valgbare felt i  TCP som p\u00e5virker ytelse er satt til:
+web10gDetails = Detaljerte opplysninger fra Web10G
+web10gKernelVar = Kjernevariabler fra Web10G
+web10gStats = Statistikk fra Web10G
+web10gVar = Variabler fra Web10G
+web10grtt = Web10G melder at rundreisetid
+web10gtcpOpts = Web10G melder at valgbare felt i  TCP som p\u00e5virker ytelse er satt til:
 willImprove = vil forbedre ytelsen
 workstation = Arbeidsstasjon
 your = Din