NDT-DEV email list created

Revision: 1168
Author:   

Date:     Fri Nov 14 16:19:31 2014 UTC
Log:      Merge in from trunk


https://code.google.com/p/ndt/source/detail?r=1168

Modified:
 /branches/Issue162
 /branches/Issue162/Applet/MANIFEST.MF
 /branches/Issue162/HTML5-frontend/script.js
 /branches/Issue162/HTML5-frontend/set-active-client.sh
 /branches/Issue162/HTML5-frontend/style.css
 /branches/Issue162/HTML5-frontend/widget.html
 /branches/Issue162/flash-client/ndt-flash-config.xml
 /branches/Issue162/flash-client/src/GUI.as
 /branches/Issue162/flash-client/src/TestResultsUtils.as
 /branches/Issue162/flash-client/src/locale/ca_ES/DisplayMessages.properties
 /branches/Issue162/flash-client/src/locale/el_GR/DisplayMessages.properties
 /branches/Issue162/flash-client/src/locale/en_US/DisplayMessages.properties
 /branches/Issue162/flash-client/src/locale/fr_FR/DisplayMessages.properties
 /branches/Issue162/flash-client/src/locale/nb_NO/DisplayMessages.properties
 /branches/Issue162/flash-client/src/locale/nl_NL/DisplayMessages.properties
 /branches/Issue162/flash-client/src/locale/pt_BR/DisplayMessages.properties
 /branches/Issue162/flash-client/src/locale/ru_RU/DisplayMessages.properties

=======================================
--- /branches/Issue162/Applet/MANIFEST.MF       Wed Jun 25 17:56:39 2014 UTC
+++ /branches/Issue162/Applet/MANIFEST.MF       Fri Nov 14 16:19:31 2014 UTC
@@ -1,5 +1,7 @@
 Manifest-Version: 1.0
 Class-Path: lib/json-simple-1.1.1.jar
 Created-By: Rich Carlson
+Application-Name: NDT
 Main-Class: edu.internet2.ndt.Tcpbw100
 Permissions: sandbox
+Caller-Allowable-Codebase: *
=======================================
--- /branches/Issue162/HTML5-frontend/script.js Tue Nov  4 15:27:14 2014 UTC
+++ /branches/Issue162/HTML5-frontend/script.js Fri Nov 14 16:19:31 2014 UTC
@@ -56,6 +56,11 @@
 function startTest(evt) {
   evt.stopPropagation();
   evt.preventDefault();
+  if (!isPluginLoaded()) {
+    $('#warning').show();
+    return;
+  }
+  $('#warning').hide();
   document.getElementById('javaButton').disabled = true;
   document.getElementById('flashButton').disabled = true;
   showPage('test', resetGauges);
@@ -472,7 +477,6 @@

 // BACKEND METHODS
 function useJavaAsBackend() {
-  //document.getElementById('javaButton').toggleClass('active');
   var backendContainer = document.getElementById('backendContainer');
   while (backendContainer.firstChild) {
     backendContainer.removeChild(backendContainer.firstChild);
@@ -486,6 +490,8 @@
   app.width = '400';
   app.height = '400';
   document.getElementById('backendContainer').appendChild(app);
+  $('#flashButton').removeClass("active");
+  $('#javaButton').addClass("active");
 }

 function useFlashAsBackend() {
@@ -500,8 +506,10 @@
   embed.type = 'application/x-shockwave-flash';
   embed.src = 'FlashClt.swf';
   embed.width = '600';
-  embed.height = '400';
-  document.getElementById('backendContainer').appendChild(embed);
+  embed.height = '10';
+  document.getElementById('backendContainer').appendChild(embed);
+  $('#javaButton').removeClass("active");
+  $('#flashButton').addClass("active");
 }

 // UTILITIES
@@ -509,9 +517,20 @@
 function debug(message) {
   if (allowDebug && window.console) console.debug(message);
 }
+
+function isPluginLoaded() {
+  try {
+    testStatus();
+    return true;
+  } catch(e) {
+    return false;
+  }
+}

 function checkInstalledPlugins() {
   var hasFlash = false, hasJava = false;
+
+  $('#warning').hide();
   try {
     var activeXObject = new ActiveXObject('ShockwaveFlash.ShockwaveFlash');
     if(activeXObject) hasFlash = true;
@@ -520,7 +539,7 @@
   }

   if (!hasFlash) {
-    document.getElementById('flashButton').disabled = true
+    document.getElementById('flashButton').disabled = true;
   }

   if (deployJava.getJREs() == '') {
@@ -531,6 +550,8 @@

   if (hasJava) {
     useJavaAsBackend();
+  } else if (hasFlash) {
+    useFlashAsBackend();
   }
 }

=======================================
--- /branches/Issue162/HTML5-frontend/set-active-client.sh	Fri Mar 21  
10:33:50 2014 UTC
+++ /branches/Issue162/HTML5-frontend/set-active-client.sh	Fri Nov 14  
16:19:31 2014 UTC
@@ -6,8 +6,8 @@
 flash="flash"
 java="java"
 widget="widget.html"
-embed_tag="<embed id=\"NDT\" name=\"NDT\"  
type=\"application\/x-shockwave-flash\" src=\"FlashClt.swf\" width=\"600\"  
height=\"400\" \/>"
-applet_tag="<applet id=\"NDT\" name=\"NDT\"  
code=\"edu.internet2.ndt.Tcpbw100.class\" codebase=\"<?php print  
\$applet_url ?>\" archive=\"Tcpbw100.jar\" width=\"400\"  
height=\"400\"><\/applet>"
+embed_tag="<embed id=\"NDT\" name=\"NDT\"  
type=\"application\/x-shockwave-flash\" src=\"FlashClt.swf\" width=\"600\"  
height=\"10\" \/>"
+applet_tag="<applet id=\"NDT\" name=\"NDT\"  
code=\"edu.internet2.ndt.Tcpbw100.class\" codebase=\"<?php print  
\$applet_url ?>\" archive=\"Tcpbw100.jar\" width=\"400\"  
height=\"10\"><\/applet>"

 echo "This script allows you to change NDT client being used in $widget  
page."
 if test ! -f "$widget"; then
=======================================
--- /branches/Issue162/HTML5-frontend/style.css Tue Nov  4 15:27:14 2014 UTC
+++ /branches/Issue162/HTML5-frontend/style.css Fri Nov 14 16:19:31 2014 UTC
@@ -12,6 +12,7 @@
   padding: 0;
   border: 0;
   overflow: hidden;
+  height: 2000px;
 }
 a img {
   border: 0;
@@ -26,6 +27,15 @@
   text-transform: uppercase;
   font-size: 36px;
   font-family: "League Gothic", Impact, "Arial Narrow", sans-serif;
+  margin-bottom: 15px;
+}
+.header {
+  margin: 10px;
+}
+#warning {
+  font-size: 20px;
+  color: red;
+  margin: 10px;
 }
 .page {
   width: 640px;
@@ -98,8 +108,8 @@
   margin: 10px;
 }

-.backendButton .active {
-  background-color:blue;
+.active {
+  background-color:black;
 }

 .backendButton:disabled {
=======================================
--- /branches/Issue162/HTML5-frontend/widget.html	Tue Nov  4 15:27:14 2014  
UTC
+++ /branches/Issue162/HTML5-frontend/widget.html	Fri Nov 14 16:19:31 2014  
UTC
@@ -17,6 +17,19 @@
     </script>
 </head>
 <body class="initializing">
+<div class="header">
+    <p>You can choose which plugin (flash/java) you want to use by  
clicking on proper button below. <br />
+       Make sure that specific plugin is not blocked by your browser (if  
you use some kind of "flash block" extension <br />
+       then you may need to click on small bar at the bottom of this page  
to enable content).</p>
+</div>
+<div>
+  <button id="javaButton" class="backendButton button"  
onclick="useJavaAsBackend()" type="button">Use java</button>
+  <button id="flashButton" class="backendButton button"  
onclick="useFlashAsBackend()" type="button">Use flash</button>
+</div>
+<div id="warning">
+    <p>Selected plugin was not loaded properly. <br />
+       Make sure that you have proper plugin installed and it is not  
blocked by your browser.</p>
+</div>
 <div id="widget">
   <div id="welcome" class="page">
     <div class="info">
@@ -123,16 +136,11 @@
   </div>
 </div>

-<div>
-  <button id="javaButton" class="backendButton button"  
onclick="useJavaAsBackend()" type="button">Use java</button>
-  <button id="flashButton" class="backendButton button"  
onclick="useFlashAsBackend()" type="button">Use flash</button>
-</div>
-
 <div id="backendContainer">
   <!--Use embed tag to have flash client being background for JS UI or  
applet tag if you want to use java applet instead. -->
-  <embed id="NDT" name="NDT" type="application/x-shockwave-flash"  
src="FlashClt.swf" width="600" height="400" />
+  <embed id="NDT" name="NDT" type="application/x-shockwave-flash"  
src="FlashClt.swf" width="600" height="10" />

-  <!--<applet id="NDT" name="NDT" code="edu.internet2.ndt.Tcpbw100.class"  
codebase="<?php print $applet_url ?>" archive="Tcpbw100.jar"      
width="400" height="400"></applet>-->
+  <!--<applet id="NDT" name="NDT" code="edu.internet2.ndt.Tcpbw100.class"  
codebase="<?php print $applet_url ?>" archive="Tcpbw100.jar"      
width="400" height="10"></applet>-->
 </div>

 </body>
=======================================
--- /branches/Issue162/flash-client/ndt-flash-config.xml	Sun Feb  2  
19:14:17 2014 UTC
+++ /branches/Issue162/flash-client/ndt-flash-config.xml	Fri Nov 14  
16:19:31 2014 UTC
@@ -8,7 +8,7 @@
     <define append="true">
       <name>CONFIG::debug</name>
       <!--TODO(tiziana): Change to false, right before the first public  
release. -->
-      <value>true</value>
+      <value>false</value>
     </define>
     <define append="true">
       <name>CONFIG::release</name>
@@ -27,7 +27,7 @@
     <!-- The current NDT version -->
     <define append="true">
       <name>CONFIG::serverVersion</name>
-      <value>"v3.6.5.2"</value>
+      <value>"v3.7.0-rc1"</value>
     </define>
     <define append="true">
       <name>CONFIG::clientVersion</name>
=======================================
--- /branches/Issue162/flash-client/src/GUI.as  Tue Nov  4 15:27:14 2014 UTC
+++ /branches/Issue162/flash-client/src/GUI.as  Fri Nov 14 16:19:31 2014 UTC
@@ -25,6 +25,8 @@
   import flash.display.DisplayObjectContainer;
   import flash.display.DisplayObject;
   import flash.filters.BlurFilter;
+  import flash.desktop.Clipboard;
+  import flash.desktop.ClipboardFormats;
   import spark.effects.*;

   /**
@@ -54,6 +56,11 @@
     private var _debugButton:NDTButton;
     private var _activeButton:NDTButton;
     private var _restartButton:Sprite;
+    private var _copyButton:Sprite;
+    private var _yesButton:Sprite;
+    private var _noButton:Sprite;
+    private var _upArrowButton:ArrowButton;
+    private var _downArrowButton:ArrowButton;

     public function GUI(
         stageWidth:int, stageHeight:int, callerObj:NDTPController) {
@@ -165,7 +172,7 @@
     }

     private function rollOver(e:MouseEvent):void {
-      e.target.alpha = 0.8;
+      e.target.alpha = 0.7;
     }

     private function rollOut(e:MouseEvent):void {
@@ -198,6 +205,11 @@
       this.addChild(_progressText);
       _callerObj.startNDTTest();
     }
+
+    private function clickCopy(e:MouseEvent):void {
+      Clipboard.generalClipboard.clear();
+      Clipboard.generalClipboard.setData(ClipboardFormats.TEXT_FORMAT,  
_resultsTextField.text);
+    }

     public function updateProgressText(completed:int, total:int):void {
       if (_progressText) {
@@ -220,23 +232,37 @@
       while (this.numChildren > 0)
         this.removeChildAt(0);

+      _resultsTextField.removeEventListener(Event.SCROLL, scroll);
+
       _resultsButton.removeEventListener(MouseEvent.ROLL_OVER, rollOver);
       _detailsButton.removeEventListener(MouseEvent.ROLL_OVER, rollOver);
       if (_debugButton)
         _debugButton.removeEventListener(MouseEvent.ROLL_OVER, rollOver);
       _restartButton.removeEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _yesButton.removeEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _noButton.removeEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _upArrowButton.removeEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _downArrowButton.removeEventListener(MouseEvent.ROLL_OVER, rollOver);

       _resultsButton.removeEventListener(MouseEvent.ROLL_OUT, rollOut);
       _detailsButton.removeEventListener(MouseEvent.ROLL_OUT, rollOut);
       if (_debugButton)
         _debugButton.removeEventListener(MouseEvent.ROLL_OUT, rollOut);
       _restartButton.removeEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _yesButton.removeEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _noButton.removeEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _upArrowButton.removeEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _downArrowButton.removeEventListener(MouseEvent.ROLL_OUT, rollOut);

       _resultsButton.removeEventListener(MouseEvent.CLICK, clickResults);
       _detailsButton.removeEventListener(MouseEvent.CLICK, clickDetails);
       if (_debugButton)
         _debugButton.removeEventListener(MouseEvent.CLICK, clickDebug);
       _restartButton.removeEventListener(MouseEvent.CLICK, clickRestart);
+      _yesButton.removeEventListener(MouseEvent.CLICK, clickYes);
+      _noButton.removeEventListener(MouseEvent.CLICK, clickNo);
+      _upArrowButton.removeEventListener(MouseEvent.CLICK, clickUpArrow);
+      _downArrowButton.removeEventListener(MouseEvent.CLICK,  
clickDownArrow);
     }

     /**
@@ -271,51 +297,86 @@
       _resultsTextField.x = 0.275 * _stageWidth;
       _resultsTextField.y = 0.05 * _stageHeight;
       _resultsTextField.width = 0.725 * _stageWidth;
-      _resultsTextField.height = 0.90 * _stageHeight;
+      _resultsTextField.height = 0.85 * _stageHeight;
       this.addChild(_resultsTextField);

+      _upArrowButton = new ArrowButton(ArrowOrientation.UP, 0.5);
+      _downArrowButton = new ArrowButton(ArrowOrientation.DOWN, 0.5);
+
       _resultsButton = new NDTButton("RESULTS", 18, 30, 0.25);
       _detailsButton = new NDTButton("DETAILS", 18, 30, 0.25);
       if (CONFIG::debug)
         _debugButton = new NDTButton("DEBUG", 18, 30, 0.25);
          _restartButton = new NDTButton("RESTART", 18, 30, 0.25);
+      _copyButton = new NDTButton("Copy log \nto Clipboard", 12, 35, 0.25);
+      _yesButton = new NDTButton("YES", 18, 30, 0.25);
+      _noButton = new NDTButton("NO", 18, 30, 0.25);

       var verticalMargin:Number = _stageHeight / 5;
       if (CONFIG::debug)
         verticalMargin = _stageHeight / 6;
       _resultsButton.y = verticalMargin;
       _detailsButton.y = _resultsButton.y + verticalMargin;
-      _debugButton.y = _detailsButton.y + verticalMargin;
+      if (_debugButton)
+        _debugButton.y = _detailsButton.y + verticalMargin;
       _restartButton.y = CONFIG::debug ? _debugButton.y + verticalMargin
                                        : _detailsButton.y + verticalMargin;
+      _copyButton.y = _restartButton.y + verticalMargin;
+      _yesButton.y = _stageHeight / 2 - verticalMargin;
+      _noButton.y = _yesButton.y + verticalMargin;
+      _upArrowButton.y = 12 * _stageHeight / 13;
+      _downArrowButton.y = _upArrowButton.y;
       _resultsButton.x += _resultsButton.width / 2;
       _detailsButton.x += _detailsButton.width / 2;
-      _debugButton.x += _debugButton.width / 2;
+      if (_debugButton)
+        _debugButton.x += _debugButton.width / 2;
       _restartButton.x += _restartButton.width / 2;
+      _copyButton.x += _copyButton.width / 2;
+      _yesButton.x = 0.6 * _stageWidth;
+      _noButton.x = _yesButton.x;
+      _upArrowButton.x = _resultsTextField.x + 2 * _resultsTextField.width  
/ 5;
+      _downArrowButton.x = _resultsTextField.x + 3 *  
_resultsTextField.width / 5;

       this.addChild(_resultsButton);
       this.addChild(_detailsButton);
       if (_debugButton)
         this.addChild(_debugButton);
       this.addChild(_restartButton);
+
+      _resultsTextField.addEventListener(Event.SCROLL, scroll);

       _resultsButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);
       _detailsButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);
       if (_debugButton)
         _debugButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);
       _restartButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _copyButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _yesButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _noButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _upArrowButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);
+      _downArrowButton.addEventListener(MouseEvent.ROLL_OVER, rollOver);

       _resultsButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);
       _detailsButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);
       if (_debugButton)
         _debugButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);
       _restartButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _copyButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _yesButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _noButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _upArrowButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);
+      _downArrowButton.addEventListener(MouseEvent.ROLL_OUT, rollOut);

       _resultsButton.addEventListener(MouseEvent.CLICK, clickResults);
       _detailsButton.addEventListener(MouseEvent.CLICK, clickDetails);
       if (_debugButton)
         _debugButton.addEventListener(MouseEvent.CLICK, clickDebug);
       _restartButton.addEventListener(MouseEvent.CLICK, clickRestart);
+      _copyButton.addEventListener(MouseEvent.CLICK, clickCopy);
+      _yesButton.addEventListener(MouseEvent.CLICK, clickYes);
+      _noButton.addEventListener(MouseEvent.CLICK, clickNo);
+      _upArrowButton.addEventListener(MouseEvent.CLICK, clickUpArrow);
+      _downArrowButton.addEventListener(MouseEvent.CLICK, clickDownArrow);

       changeActiveButton(_resultsButton);
       setSummaryResultText();
@@ -389,13 +450,15 @@
     }

     private function clickResults(e:MouseEvent):void {
-      changeActiveButton(NDTButton(e.target));
+      changeActiveButton(_resultsButton);
+      hideCopyButton();
       _resultsTextField.htmlText = _summaryResultText;
       _resultsTextField.scrollV = 0;
     }

     private function clickDetails(e:MouseEvent):void {
       changeActiveButton(NDTButton(e.target));
+      showCopyButton();
       _resultsTextField.htmlText = "<font size=\"14\">"
                                    + TestResults.getResultDetails();
       _resultsTextField.scrollV = 0;
@@ -403,26 +466,89 @@

     private function clickDebug(e:MouseEvent):void {
       changeActiveButton(NDTButton(e.target));
+      showCopyButton();
       _resultsTextField.htmlText = "<font size=\"14\">"
                                    + TestResults.getDebugMsg();
       _resultsTextField.scrollV = 0;
     }

     private function clickRestart(e:MouseEvent):void {
+      changeActiveButton(NDTButton(e.target));
+      hideCopyButton();
+      _resultsTextField.htmlText = "<font size=\"16\"><b>"
+                                   + "\nRestarting test will clear all  
current results. Are you sure you want to continue? </b></font>";
+      _resultsTextField.scrollV = 0;
+      if (!this.contains(_yesButton))
+        this.addChild(_yesButton);
+      if (!this.contains(_noButton))
+        this.addChild(_noButton);
+    }
+
+    private function clickYes(e:MouseEvent):void {
       hideResultsScreen();
       if (_consoleText) {
         _consoleText.text = "";
         this.addChild(_consoleText);
       }
-      _callerObj.startNDTTest();
+      _callerObj.startNDTTest();
+    }
+
+    private function clickNo(e:MouseEvent):void {
+      cancelRestart();
+      clickResults(null);
+    }
+
+    private function clickUpArrow(e:MouseEvent):void {
+      _resultsTextField.scrollV -= 20;
+    }
+
+    private function clickDownArrow(e:MouseEvent):void {
+      _resultsTextField.scrollV += 20;
+    }
+
+    private function scroll(e:Event):void {
+      if (_resultsTextField.scrollV >= _resultsTextField.maxScrollV) {
+        if (this.contains(_downArrowButton))
+          this.removeChild(_downArrowButton);
+         } else {
+        if (!this.contains(_downArrowButton))
+          this.addChild(_downArrowButton);
+         }
+
+      if (_resultsTextField.scrollV <= 1) {
+        if (this.contains(_upArrowButton))
+          this.removeChild(_upArrowButton);
+      } else {
+        if (!this.contains(_upArrowButton))
+          this.addChild(_upArrowButton);
+      }
     }

     private function changeActiveButton(target:NDTButton):void {
+      if (_activeButton == _restartButton)
+        cancelRestart();
       if (_activeButton)
         _activeButton.setInactive();
       target.setActive();
       _activeButton = target;
     }
+
+    private function showCopyButton():void {
+      if (!this.contains(_copyButton))
+        this.addChild(_copyButton);
+    }
+
+    private function hideCopyButton():void {
+      if (this.contains(_copyButton))
+        this.removeChild(_copyButton);
+    }
+
+    private function cancelRestart():void {
+      if (this.contains(_yesButton))
+        this.removeChild(_yesButton);
+      if (this.contains(_noButton))
+           this.removeChild(_noButton);
+    }
   }
 }

@@ -478,6 +604,38 @@
     _textField.setTextFormat(textFormat);
   }
 }
+
+final class ArrowOrientation
+{
+    public static const UP:String = "up";
+    public static const DOWN:String = "down";
+}
+
+class ArrowButton extends Sprite {
+  [Embed(source="../assets/downArrow.png")]
+  private var downArrowImg:Class;
+
+  [Embed(source="../assets/upArrow.png")]
+  private var upArrowImg:Class;
+
+  function ArrowButton(orientation:String, prop:Number) {
+    super();
+    this.buttonMode = true;
+    var buttonShape:DisplayObject;
+
+    if (orientation == ArrowOrientation.DOWN)
+      buttonShape = new downArrowImg();
+    else
+      buttonShape = new upArrowImg();
+
+    buttonShape.width *= prop;
+    buttonShape.height *= prop;
+    buttonShape.x -= buttonShape.width / 2;
+    buttonShape.y -= buttonShape.height / 2;
+
+    this.addChild(buttonShape);
+  }
+}

 class ResultsTextField extends TextField {
   public function ResultsTextField() {
=======================================
--- /branches/Issue162/flash-client/src/TestResultsUtils.as	Wed Mar 26  
08:38:44 2014 UTC
+++ /branches/Issue162/flash-client/src/TestResultsUtils.as	Fri Nov 14  
16:19:31 2014 UTC
@@ -159,6 +159,9 @@
     public static function appendClientInfo():void {
        
TestResults.appendResultDetails(ResourceManager.getInstance().getString(
           NDTConstants.BUNDLE_NAME, "clientInfo", null, Main.locale));
+       
TestResults.appendResultDetails(ResourceManager.getInstance().getString(
+          NDTConstants.BUNDLE_NAME, "clientVersion", null, Main.locale)
+          + ": " + CONFIG::clientVersion);
       TestResults.appendResultDetails(
           ResourceManager.getInstance().getString(
               NDTConstants.BUNDLE_NAME, "osData", null, Main.locale)
=======================================
---  
/branches/Issue162/flash-client/src/locale/ca_ES/DisplayMessages.properties	 
Sun Feb  2 19:14:17 2014 UTC
+++  
/branches/Issue162/flash-client/src/locale/ca_ES/DisplayMessages.properties	 
Fri Nov 14 16:19:31 2014 UTC
@@ -34,6 +34,7 @@
 clientIpNotFound = No es troba l'adre\u00e7a del client. Per a usuaris  
d'Internet Explorer, modifiqui els par\u00e0metres de Java\n Click a Eines  
- Opcions d'Internet - Seguretat - Nivell personalitzat, trobi la  
l\u00ednia\n Microsoft VM - Java Permissions i faci click a personalitzar\  
Editar permisos - Acc\u00e9s a totes les Adreces de xarxa, click a  
Habilitar i desar els canvis.
 clientIpPreserved = Les Adreces IP de servidor son conservades  
Extrem-a-Extrem
 clientSays = per\u00f2 el Client diu
+clientVersion = Client versi\u00f3
 close = Tancar
 comments = Comentaris
 congestNo = No s'ha trobat congesti\u00f3 de xarxa
=======================================
---  
/branches/Issue162/flash-client/src/locale/el_GR/DisplayMessages.properties	 
Sun Feb  2 19:14:17 2014 UTC
+++  
/branches/Issue162/flash-client/src/locale/el_GR/DisplayMessages.properties	 
Fri Nov 14 16:19:31 2014 UTC
@@ -34,6 +34,7 @@
 clientIpNotFound = \u0397  
\u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 IP  
\u03c4\u03bf\u03c5 \u03c0\u03b5\u03bb\u03ac\u03c4\u03b7 \u03b4\u03b5\u03bd  
\u03b2\u03c1\u03ad\u03b8\u03b7\u03ba\u03b5.  \u0393\u03b9\u03b1  
\u03c7\u03c1\u03ae\u03c3\u03c4\u03b5\u03c2 Internet Explorer,  
\u03c0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce  
\u03c4\u03c1\u03bf\u03c0\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5   
\u03c4\u03b9\u03c2  
\u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03bf\u03c5\u03c2  
\u03c4\u03b7\u03c2 Java \n \u03ba\u03ac\u03bd\u03c4\u03b5  
\u03ba\u03bb\u03b9\u03ba \u03c3\u03c4\u03bf Tools - Internet Options -  
Security - Custom Level,  
\u03c0\u03b7\u03b3\u03b1\u03af\u03bd\u03b5\u03c4\u03b5 \u03c3\u03c4\u03bf\n  
Microsoft VM - Java permissions, \u03ba\u03bb\u03b9\u03ba  
\u03c3\u03c4\u03bf Custom, \u03ba\u03bb\u03b9\u03ba \u03c3\u03c4\u03bf Java  
Custom Settings\n Edit Permissions - Access to all Network Addresses,  
\u03ba\u03ac\u03bd\u03c4\u03b5 \u03ba\u03bb\u03b9\u03ba \u03c3\u03c4\u03bf  
Enable \u03ba\u03b1\u03b9 \u03bc\u03b5\u03c4\u03ac  
\u03c3\u03ce\u03c3\u03c4\u03b5
 clientIpPreserved = \u039f\u03b9  
\u03b4\u03b9\u03b5\u03c5\u03b8\u03cd\u03bd\u03c3\u03b5\u03b9\u03c2  
\u03c4\u03bf\u03c5  
\u03b5\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae  
\u03b4\u03b9\u03b1\u03c4\u03b7\u03c1\u03bf\u03cd\u03bd\u03c4\u03b1\u03b9  
\u03b1\u03c0\u03cc \u03ac\u03ba\u03c1\u03bf \u03c3\u03b5  
\u03ac\u03ba\u03c1\u03bf
 clientSays = \u03b1\u03bb\u03bb\u03ac \u03bf  
\u03c0\u03b5\u03bb\u03ac\u03c4\u03b7\u03c2 \u03bb\u03ad\u03b5\u03b9
+clientVersion =  \u039f \u03c0\u03b5\u03bb\u03ac\u03c4\u03b7\u03c2  
\u0388\u03ba\u03b4\u03bf\u03c3\u03b7
 close = \u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf
 comments = \u03a3\u03c7\u03cc\u03bb\u03b9\u03b1
 congestNo = \u0394\u03b5\u03bd  
\u03b1\u03bd\u03b9\u03c7\u03bd\u03b5\u03cd\u03b8\u03b7\u03ba\u03b5  
\u03c3\u03c5\u03bc\u03c6\u03cc\u03c1\u03b7\u03c3\u03b7 \u03c3\u03c4\u03bf  
\u03b4\u03af\u03ba\u03c4\u03c5\u03bf.
=======================================
---  
/branches/Issue162/flash-client/src/locale/en_US/DisplayMessages.properties	 
Wed May 28 11:17:18 2014 UTC
+++  
/branches/Issue162/flash-client/src/locale/en_US/DisplayMessages.properties	 
Fri Nov 14 16:19:31 2014 UTC
@@ -34,6 +34,7 @@
 clientIpNotFound = Client IP address not found.  For IE users, modify the  
Java parameters\n click Tools - Internet Options - Security - Custom Level,  
scroll down to\n Microsoft VM - Java permissions and click Custom, click  
Java Custom Settings\n Edit Permissions - Access to all Network Addresses,  
click Eanble and save changes
 clientIpPreserved = Client IP addresses are preserved End-to-End
 clientSays = but Client says
+clientVersion = Client version
 close = Close
 comments = Comments
 congestNo = No network congestion discovered.
=======================================
---  
/branches/Issue162/flash-client/src/locale/fr_FR/DisplayMessages.properties	 
Sun Feb  2 19:14:17 2014 UTC
+++  
/branches/Issue162/flash-client/src/locale/fr_FR/DisplayMessages.properties	 
Fri Nov 14 16:19:31 2014 UTC
@@ -34,6 +34,7 @@
 clientIpNotFound = L'adresse IP du client non trouv\u00E9e. Pour les  
utilisateurs IE, modifiez les param\u00E8tres Java \n Cliquez sur Outils -  
Options Internet - S\u00E9curit\u00E9 - Niveau personnalis\u00E9, descendez  
jusqu'\u00E0\n Microsoft VM - permissions Java et cliquez sur  
Personnalis\u00E9, cliquez sur Param\u00E8tres Java personnalis\u00E9s\n  
\u00C9diter les permissions - Acc\u00E8s \u00E0 toutes les adresses  
r\u00E9seau, cliquez sur Appliquer et sauvegardez
 clientIpPreserved = Les adresses IP serveur sont pr\u00E9serv\u00E9es de  
bout en bout
 clientSays = mais le Client dit
+clientVersion = Client version
 close = Fermez
 comments = Commentaires
 congestNo = Aucune congestion r\u00E9seau d\u00E9tect\u00E9e.
=======================================
---  
/branches/Issue162/flash-client/src/locale/nb_NO/DisplayMessages.properties	 
Sun Feb  2 19:14:17 2014 UTC
+++  
/branches/Issue162/flash-client/src/locale/nb_NO/DisplayMessages.properties	 
Fri Nov 14 16:19:31 2014 UTC
@@ -34,6 +34,7 @@
 clientIpNotFound = IP-addressen til klientmaskinen ble ikke funnet
 clientIpPreserved = Tjenermaskinens IP-adresse blir bevart fra ende til  
ende
 clientSays = men klienten sier
+clientVersion = Klient versjon
 close = Lukk
 comments = Kommentarer
 congestNo = Overbelastning i nettet ikke funnet.
=======================================
---  
/branches/Issue162/flash-client/src/locale/nl_NL/DisplayMessages.properties	 
Sun Feb  2 19:14:17 2014 UTC
+++  
/branches/Issue162/flash-client/src/locale/nl_NL/DisplayMessages.properties	 
Fri Nov 14 16:19:31 2014 UTC
@@ -34,6 +34,7 @@
 clientIpNotFound = Client IP adres niet gevonden.  Voor IE gebruikers,  
verander de Java parameters\n Klik Tools - Internet Options - Security -  
Custom Level, scroll naar\n Microsoft VM - Java permissions en klik Custom,  
click Java Custom Settings\n Edit Permissions - Access to all Network  
Addresses, klik Enable en sla uw wijzigingen op
 clientIpPreserved = Server IP adressen zijn beveiligd End-to-End
 clientSays = maar Client zegt
+clientVersion = Client versie
 close = Sluiten
 comments = Commentaar
 congestNo = Geen netwerk overgebruik ontdekt.
=======================================
---  
/branches/Issue162/flash-client/src/locale/pt_BR/DisplayMessages.properties	 
Sun Feb  2 19:14:17 2014 UTC
+++  
/branches/Issue162/flash-client/src/locale/pt_BR/DisplayMessages.properties	 
Fri Nov 14 16:19:31 2014 UTC
@@ -34,6 +34,7 @@
 clientIpNotFound = Endere\u00E7o IP do Cliente n\u00E3o encontrado. Para  
usu\u00E1rios do IE, altere os par\u00E2metros do Java\n clique em  
Ferramentas - Op\u00E7\u00F5es da Internet - Seguran\u00E7a - N\u00EDvel  
personalizado, role para baixo at\u00E9 Microsoft VM - Permiss\u00F5es Java  
e clique em Customizar, clique Customizar configura\u00E7\u00F5es do Java\n  
Edite as Permiss\u00F5es - Acesse todos Endere\u00E7os de Rede, clique em  
habilitar e salve as altera\u00E7\u00F5es
 clientIpPreserved = Endere\u00E7os IP do Servidor s\u00E3o preservados fim  
a fim
 clientSays = mas o Cliente diz
+clientVersion = Cliente vers\u00E3o
 close = Fechar
 comments = Comment\u00E1rios
 congestNo = Congestionamento da rede n\u00E3o foi detectado
=======================================
---  
/branches/Issue162/flash-client/src/locale/ru_RU/DisplayMessages.properties	 
Sun Feb  2 19:14:17 2014 UTC
+++  
/branches/Issue162/flash-client/src/locale/ru_RU/DisplayMessages.properties	 
Fri Nov 14 16:19:31 2014 UTC
@@ -34,6 +34,7 @@
 clientIpNotFound = IP-\u0430\u0434\u0440\u0435\u0441  
\u041A\u043B\u0438\u0435\u043D\u0442\u0430 \u043D\u0435  
\u043D\u0430\u0439\u0434\u0435\u043D. \u0414\u043B\u044F IE  
\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439,  
\u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435  
\u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C  
\u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B Java \n  
\u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0432  
\u043C\u0435\u043D\u044E Service \u2013 Network Options - Security -   
Level, \u043F\u0440\u043E\u043B\u0438\u0441\u0442\u043D\u0438\u0442\u0435  
\u0432\u043D\u0438\u0437 \u0434\u043E \n Microsoft VM  -  Java Permissions   
\u0438 \u043D\u0430\u0436\u043C\u0438\u0442\u0435  
\u043A\u043D\u043E\u043F\u043A\u0443 Custom,  
\u0449\u0435\u043B\u043A\u043D\u0438\u0442\u0435 na Java Custom Settings \n  
Edit Persmissions - \u0434\u043E\u0441\u0442\u0443\u043F \u043A\u043E  
\u0432\u0441\u0435\u043C \u0441\u0435\u0442\u0435\u0432\u044B\u043C  
\u0430\u0434\u0440\u0435\u0441\u0430\u043C,  
\u043D\u0430\u0436\u043C\u0438\u0442\u0435  
\u043A\u043D\u043E\u043F\u043A\u0443 En\u0430ble \u0438  
\u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442e  
\u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F
 clientIpPreserved = IP \u0430\u0434\u0440\u0435\u0441\u0430  
\u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u044B\u043B\u0438  
\u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u044B \u0431\u0435\u0437  
\u0438\u0437\u043C\u0435\u043D\u0430\u043D\u0438\u044F \u043D\u0430  
\u0432\u0441\u0435\u043C \u043F\u0443\u0442\u0438
 clientSays =, \u043D\u043E \u043A\u043B\u0438\u0435\u043D\u0442  
\u0441\u043E\u043E\u0431\u0449\u0430\u0435\u0442
+clientVersion = \u041A\u043B\u0438\u0435\u043D\u0442  
\u0412\u0435\u0440\u0441\u0438\u044F
 close = \u0417\u0430\u043A\u0440\u044B\u0442\u044C
 comments =  
\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438
 congestNo =  
\u041F\u0435\u0440\u0435\u0433\u0440\u0443\u0436\u0435\u043D\u043D\u043E\u0441\u0442\u044C  
\u0441\u0435\u0442\u0438 \u043D\u0435  
\u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u0430.