Author: sebawagner
Date: Fri Nov 23 04:30:36 2012
New Revision: 1412746
URL: http://svn.apache.org/viewvc?rev=1412746&view=rev
Log:
OPENMEETINGS-460 fix duplicated labels and perform JUnit test optimization for
English labels sync
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
Fri Nov 23 04:30:36 2012
@@ -6031,7 +6031,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Fri
Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
Fri Nov 23 04:30:36 2012
@@ -4578,7 +4578,7 @@ see http://incubator.apache.org/openmeet
<value>Last ping</value>
</string>
<string id="1518" name="server admin section lastping info">
- <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave. "Ping running" shows if the ping is currently running.</value>
+ <value>Every slave sends a ping to the master every 3 seconds
(configurable). Slave lastPing must be smaller then 1 minute so that the master
uses the slave.</value>
</string>
<string id="1519" name="server admin port">
<value>HTTP Port</value>
@@ -4598,9 +4598,6 @@ see http://incubator.apache.org/openmeet
<string id="1524" name="server admin ping running">
<value>Ping running</value>
</string>
- <string id="1524" name="server admin ping running">
- <value>Ping running</value>
- </string>
<string id="1525" name="server admin active">
<value>Active</value>
</string>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cluster/sync/RestClient.java
Fri Nov 23 04:30:36 2012
@@ -236,7 +236,7 @@ public class RestClient {
if (!loginSuccess) {
loginUser();
} else {
-
+
Options options = new Options();
options.setTo(new
EndpointReference(getServerServiceEndPoint()));
options.setProperty(Constants.Configuration.ENABLE_REST,
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java?rev=1412746&r1=1412745&r2=1412746&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/FillLabels.java
Fri Nov 23 04:30:36 2012
@@ -25,9 +25,10 @@ import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
@@ -63,9 +64,9 @@ public class FillLabels {
* other label-id's will be only filled up if missing at the end of the
* language file
*/
- private final int[] replaceIds = {};
+ private final long[] replaceIds = { 1518L };
- private final List<Fieldlanguagesvalues> masterLabels = new
ArrayList<Fieldlanguagesvalues>();
+ private Map<Long, Fieldlanguagesvalues> masterLabels;
@Test
public void test() {
@@ -73,7 +74,7 @@ public class FillLabels {
try {
// Read master file
- masterLabels.addAll(parseToLabelsArray(masterLangFile));
+ masterLabels = parseToLabelsArray(masterLangFile);
File languagesFilesFolder = new File(basePath);
@@ -92,39 +93,23 @@ public class FillLabels {
}
})) {
- List<Fieldlanguagesvalues> labelsArray =
parseToLabelsArray(file
+ Map<Long, Fieldlanguagesvalues> labelsArray =
parseToLabelsArray(file
.getName());
- for (int i = 0; i < masterLabels.size(); i++) {
+ for (Entry<Long, Fieldlanguagesvalues>
entryMaster : masterLabels.entrySet()) {
+
boolean isReplaced = false;
- if (i + 1 < labelsArray.size()) {
- for (int replaceId :
replaceIds) {
- if (replaceId ==
labelsArray.get(i)
-
.getFieldvalues_id().intValue()) {
-
labelsArray.set(i, masterLabels.get(i));
- isReplaced =
true;
- }
+ for (long replaceId : replaceIds) {
+ if (replaceId ==
entryMaster.getKey()) {
+
labelsArray.put(entryMaster.getKey(), entryMaster.getValue());
+ isReplaced = true;
}
}
- if (!isReplaced) {
- if (i + 1 < labelsArray.size())
{
- if (!labelsArray
- .get(i)
-
.getFieldvalues_id()
-
.equals(masterLabels.get(i)
-
.getFieldvalues_id())) {
- throw new
Exception(
-
"Master and fill language has another index in labelid: "
-
+ masterLabels.get(i)
-
.getFieldvalues_id()
-
+ " Check file: "
-
+ file.getName() + " "
-
+ labelsArray.get(i).getValue());
- }
- } else {
-
labelsArray.add(masterLabels.get(i));
- }
+
+ if
(!labelsArray.containsKey(entryMaster.getKey())) {
+
labelsArray.put(entryMaster.getKey(), entryMaster.getValue());
}
+
}
OutputStream out = new FileOutputStream(basePath
@@ -147,10 +132,10 @@ public class FillLabels {
* @throws FileNotFoundException
* @throws DocumentException
*/
- private List<Fieldlanguagesvalues> parseToLabelsArray(String fileName)
+ private Map<Long, Fieldlanguagesvalues> parseToLabelsArray(String
fileName)
throws FileNotFoundException, DocumentException {
- List<Fieldlanguagesvalues> labelsArray = new
ArrayList<Fieldlanguagesvalues>();
+ Map<Long, Fieldlanguagesvalues> labelsArray = new
LinkedHashMap<Long, Fieldlanguagesvalues>();
InputStream is = new FileInputStream(basePath + fileName);
SAXReader reader = new SAXReader();
@@ -171,7 +156,7 @@ public class FillLabels {
Fieldvalues fLabel = new Fieldvalues();
fLabel.setName(fieldName);
fValue.setFieldvalues(fLabel);
- labelsArray.add(fValue);
+ labelsArray.put(fieldvalues_id, fValue);
}
return labelsArray;
@@ -184,7 +169,7 @@ public class FillLabels {
* @return
* @throws Exception
*/
- private Document createDocument(List<Fieldlanguagesvalues> flvList)
+ private Document createDocument(Map<Long, Fieldlanguagesvalues>
labelsArray)
throws Exception {
Document document = DocumentHelper.createDocument();
@@ -221,12 +206,12 @@ public class FillLabels {
"http://www.w3.org/2001/XMLSchema-instance";));
root.add(new Namespace("noNamespaceSchemaLocation",
"language.xsd"));
- for (Fieldlanguagesvalues flv : flvList) {
+ for (Entry<Long, Fieldlanguagesvalues> entryLabel :
labelsArray.entrySet()) {
Element eTemp = root.addElement("string")
- .addAttribute("id",
flv.getFieldvalues_id().toString())
- .addAttribute("name",
flv.getFieldvalues().getName());
+ .addAttribute("id",
entryLabel.getValue().getFieldvalues_id().toString())
+ .addAttribute("name",
entryLabel.getValue().getFieldvalues().getName());
Element value = eTemp.addElement("value");
- value.addText(flv.getValue());
+ value.addText(entryLabel.getValue().getValue());
}
return document;
