Skip to Content.
Sympa Menu

ndt-dev - [ndt-dev] [ndt] r889 committed - Merge applet_104 branch into trunk

Subject: NDT-DEV email list created

List archive

[ndt-dev] [ndt] r889 committed - Merge applet_104 branch into trunk


Chronological Thread 
  • From:
  • To:
  • Subject: [ndt-dev] [ndt] r889 committed - Merge applet_104 branch into trunk
  • Date: Mon, 10 Feb 2014 12:12:06 +0000
Revision: 889
Author:

Date: Mon Feb 10 12:11:55 2014 UTC
Log: Merge applet_104 branch into trunk
http://code.google.com/p/ndt/source/detail?r=889

Modified:
/trunk
/trunk/Applet/src/edu/internet2/ndt/Tcpbw100.java
/trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ca_ES.properties
/trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties
/trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_en_US.properties
/trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_fr_FR.properties
/trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nb_NO.properties
/trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nl_NL.properties
/trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_pt_BR.properties
/trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ru_RU.properties

=======================================
--- /trunk/Applet/src/edu/internet2/ndt/Tcpbw100.java Thu Feb 6 11:20:09 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/Tcpbw100.java Mon Feb 10 12:11:55 2014 UTC
@@ -2527,6 +2527,19 @@
}
System.out.println("Server version: " +
vVersion.substring(1));

+ if (vVersion.endsWith("Web10G") || vVersion.endsWith("Web100")) {
+ if (!vVersion.substring(1, vVersion.lastIndexOf('-')).equals(NDTConstants.VERSION)) {
+ _resultsTxtPane.append(_resBundDisplayMsgs
+ .getString("diffrentVersion") + " (" + vVersion.substring(1, vVersion.lastIndexOf('-')) + ")\n");
+ System.out.println("WARNING: NDT server has different version number (" + vVersion.substring(1) + ")");
+ }
+ }
+ else if (!vVersion.substring(1).equals(NDTConstants.VERSION)) {
+ _resultsTxtPane.append(_resBundDisplayMsgs
+ .getString("diffrentVersion") + " (" + vVersion.substring(1) + ")\n");
+ System.out.println("WARNING: NDT server has different version number (" + vVersion.substring(1) + ")");
+ }
+
// If we have connected to a Web10G server rebrand ourselves
as such
_sServerType = vVersion.endsWith("Web10G") ? "web10g" :
"web100";

=======================================
--- /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ca_ES.properties Tue Feb 4 10:07:07 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ca_ES.properties Mon Feb 10 12:11:55 2014 UTC
@@ -48,6 +48,7 @@
detailedStats = Estad\u00edstiques detallades
dialup = Modem telef\u00f2nic
dialup2 = Trucada
+diffrentVersion = Advert\u00e8ncia: N\u00famero de versi\u00f3 diferente
done = Fet.
done2 = Tcpbw100 fet
dupAcksIn = es reben ack's duplicats
=======================================
--- /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties Tue Feb 4 10:07:07 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_el_GR.properties Mon Feb 10 12:11:55 2014 UTC
@@ -48,6 +48,7 @@
detailedStats = \u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03b5\u03c1\u03b5\u03af\u03c2 \u03c3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ad\u03c2
dialup = Dial-up Modem
dialup2 = Dial-up
+diffrentVersion = \u03A0\u03C1\u03BF\u03C3\u03BF\u03C7\u03AE! \u03B4\u03B9\u03B1\u03C6\u03BF\u03C1\u03B5\u03C4\u03B9\u03BA\u03CC\u03C2 \u03B1\u03C1\u03B9\u03B8\u03BC\u03CC\u03C2 \u03AD\u03BA\u03B4\u03BF\u03C3\u03B7\u03C2
done = \u039f\u03bb\u03bf\u03ba\u03bb\u03b7\u03c1\u03ce\u03b8\u03b7\u03ba\u03b5.
done2 = \u03a4\u03bf Tcpbw100 \u03bf\u03bb\u03bf\u03ba\u03bb\u03ae\u03c1\u03c9\u03c3\u03b5
dupAcksIn = duplicate acks \u03b5\u03bb\u03ae\u03c6\u03b8\u03b7\u03c3\u03b1\u03bd
=======================================
--- /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_en_US.properties Tue Feb 4 10:07:07 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_en_US.properties Mon Feb 10 12:11:55 2014 UTC
@@ -48,6 +48,7 @@
detailedStats = Detailed Statistics
dialup = Dial-up Modem
dialup2 = Dial-up
+diffrentVersion = WARNING: NDT server has different version number
done = Done.
done2 = Tcpbw100 done
dupAcksIn = duplicate acks received
=======================================
--- /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_fr_FR.properties Tue Feb 4 10:07:07 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_fr_FR.properties Mon Feb 10 12:11:55 2014 UTC
@@ -48,6 +48,7 @@
detailedStats = Statistiques d\u00E9taill\u00E9es
dialup = Dial-up Modem
dialup2 = Dial-up
+diffrentVersion = Attention: Num\u00E9ro de version diff\u00E9rent
done = R\u00E9alis\u00E9.
done2 = Tcpbw100 r\u00E9alis\u00E9
dupAcksIn = r\u00E9ception de acks en doublon
=======================================
--- /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nb_NO.properties Tue Feb 4 10:07:07 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nb_NO.properties Mon Feb 10 12:11:55 2014 UTC
@@ -49,6 +49,7 @@
detailedStats = Detaljer
dialup = Oppringt modem
dialup2 = oppringt
+diffrentVersion = Alarm: Different versjonsnummer
done = Ferdig
done2 = Tcpbw100 ferdig
dupAcksIn = dupliserte ack ble mottatt
=======================================
--- /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nl_NL.properties Tue Feb 4 10:07:07 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_nl_NL.properties Mon Feb 10 12:11:55 2014 UTC
@@ -48,6 +48,7 @@
detailedStats = Gedetailleerde Statistieken
dialup = Inbel Modem
dialup2 = Inbel
+diffrentVersion = Melding: verschillend versie nummer
done = Klaar.
done2 = Tcpbw100 klaar
dupAcksIn = meerdere dezelfde acks ontvangen
=======================================
--- /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_pt_BR.properties Tue Feb 4 10:07:07 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_pt_BR.properties Mon Feb 10 12:11:55 2014 UTC
@@ -48,7 +48,8 @@
detailedStats = Estat\u00EDsticas detalhadas
dialup = Modem Dial-up
dialup2 = Discada
-done = Conclu\u00EDdo
+diffrentVersion = Aviso: N\u00FAmero da vers\u00E3o diferente
+done = Conclu\u00EDdo
done2 = Tcpbw100 conclu\u00EDdo.
dupAcksIn = acks duplicados recebidos
duplexFullHalf = Alerta: Dupla condi\u00E7\u00E3o de incompatibilidade detectada Switch=Full e Host=half
=======================================
--- /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ru_RU.properties Tue Feb 4 10:07:07 2014 UTC
+++ /trunk/Applet/src/edu/internet2/ndt/locale/Tcpbw100_msgs_ru_RU.properties Mon Feb 10 12:11:55 2014 UTC
@@ -48,7 +48,8 @@
detailedStats = \u041F\u043E\u0434\u0440\u043E\u0431\u043D\u0430\u044F \u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430
dialup = \u043C\u043E\u0434\u0435\u043C
dialup2 = \u043C\u043E\u0434\u0435\u043C
-done = \u0413\u043E\u0442\u043E\u0432\u043E
+diffrentVersion = \u041F\u0440\u0435\u0434\u0443\u043F\u0440\u0435\u0436\u0434\u0435\u043D\u0438\u0435: \u0434\u0440\u0443\u0433\u043E\u0439 \u0432\u0435\u0440\u0441\u0438\u044F
+done = \u0413\u043E\u0442\u043E\u0432\u043E
done2 = Tcpbw100 \u0433\u043E\u0442\u043E\u0432\u043E
dupAcksIn = \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u044B \u0434\u0443\u0431\u043B\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 acks
duplexFullHalf = \u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435: \u041E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u043E \u041D\u0435\u0441\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435 \u0434\u0443\u043F\u043B\u0435\u043A\u0441\u0430 Switch=\u0434\u0443\u043F\u043B\u0435\u043A\u0441 \u0438 Host=\u043F\u043E\u043B\u0443\u0434\u0443\u043F\u043B\u0435\u043A\u0441

  • [ndt-dev] [ndt] r889 committed - Merge applet_104 branch into trunk, ndt, 02/10/2014

Archive powered by MHonArc 2.6.16.

Top of Page