[09/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type renamed, code clean-up

[solomax]

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index 0760444..1286983 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -120,11 +120,6 @@
   <entry key="100">Έλλειψη</entry>
   <entry key="101">Κλείσιμο</entry>
   <entry key="102">Σφάλμα Δεδομένων Εισόδου</entry>
-  <entry key="103">4 ή Περισσότεροι Χαρακτήρες: Π
ροβλήματα Καταχώρησης με Κεφαλαία 
Γράμματα!</entry>
-  <entry key="104">Login is too short</entry>
-  <entry key="105">Το συγκεκριμένο Όνομα Χρήστη 
έχει επιλεγεί ήδη!</entry>
-  <entry key="106">Το συγκεκριμένο Email έχει 
καταχωρηθεί ήδη!</entry>
-  <entry key="107">Σφάλμα Συστήματος: Παρακαλούμε 
επικοινωνήστε με τους Διαχειριστές Συ
στήματος!</entry>
   <entry key="108">Login</entry>
   <entry key="109">Χρήστης ή Email:</entry>
   <entry key="110">Κωδικός:</entry>
@@ -253,7 +248,6 @@
   <entry key="233">Λάθος Email</entry>
   <entry key="234">Μη Έγκυρη Διεύθυνση Email!</entry>
   <entry key="235">Η Kαταχώρηση Oλοκληρώθηκε</entry>
-  <entry key="236">Ο Λογαριασμός σας δημιουργήθηκε 
με επιτυχία. Τώρα μπορείτε να συ
νδεθείτε.</entry>
   <entry key="237">Δεν μπορείτε να μοιραστείτε την 
Οθόνη σας αυτή τη στιγμή! Κάποιος άλλος 
μοιράζεται ήδη την δική του.</entry>
   <entry key="238">Διαμοίραση Απαγορευμένη</entry>
   <entry key="239">Διαμοίραση Οθόνης</entry>
@@ -291,7 +285,6 @@
   <entry key="273">Χρήστες</entry>
   <entry key="274">Διαγραφή Χρήστη από 
Οργανισμό</entry>
   <entry key="275">Δ</entry>
-  <entry key="276">Ο Χρήστης είναι ήδη Μέλος του συ
γκεκριμένου Οργανισμού!</entry>
   <entry key="277">Νέα</entry>
   <entry key="278">Γρήγοροι Σύνδεσμοι</entry>
   <entry key="279">Συνδιάσκεψη</entry>
@@ -347,20 +340,9 @@
   <entry key="331">4 ή Περισσότεροι Χαρακτήρες: Π
ροβλήματα Καταχώρησης με Κεφαλαία 
Γράμματα!</entry>
   <entry key="332">Ο Κωδικός ρυθμίστηκε. Τώρα 
μπορείτε να συνδεθείτε.</entry>
   <entry key="333">Εντάξει</entry>
-  <entry key="334">Άγνωστο Σφάλμα: Παρακαλούμε να 
το αναφέρετε στην Ομάδα Εξυπηρέτησής 
σας.</entry>
-  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">Μη Έγκυρος Κωδικός</entry>
   <entry key="337">Επιτυχής Αποσύνδεση</entry>
-  <entry key="338">Frontend Εγγραφές 
Απενεργοποιημένες.</entry>
-  <entry key="339">Μη Έγκυρο Email</entry>
-  <entry key="340">Επανάληψη Ονόματος Αρχείου: Π
αρακαλούμε επιλέξτε διαφορετικό Όνομα 
Αρχείου!</entry>
-  <entry key="341">Πολύ μικρό Όνομα Αρχείου!</entry>
-  <entry key="342">Αδυναμία Αποθήκευσης Διεύθυ
νσης</entry>
-  <entry key="343">Ο Χρήστης προστέθηκε επιτυχώς, 
αλλά πρέπει να τοποθετηθεί σε κάποιον 
Οργανισμό, αλλιώς δεν θα μπορεί να συ
νδεθεί!</entry>
   <entry key="344">Νέα Εγγραφή</entry>
-  <entry key="345">Δεν βρέθηκε Πεδίο με το συ
γκεκριμένο ID (Κωδικό Αριθμό) Πεδίου!</entry>
-  <entry key="346">Δεν βρέθηκε Ετικέτα για το συ
γκεκριμένο Πεδίο!</entry>
-  <entry key="347">Απαιτείται Εξουσιοδότηση από το 
Διαχειριστή!</entry>
   <entry key="348">Σύνταξη Γλώσσας</entry>
   <entry key="349">Γλώσσα</entry>
   <entry key="350">ID Ετικέτας</entry>
@@ -370,8 +352,6 @@
   <entry key="354">Όνομα Ετικέτας:</entry>
   <entry key="355">Τιμή Ετικέτας:</entry>
   <entry key="356">Αριθμός Ετικέτας:</entry>
-  <entry key="357">Διαγράψατε μόνο την Ετικέτα και 
ΟΧΙ το Πεδίο! Δεν μπορείτε να διαγράψετε το 
Πεδίο, διότι ενδέχεται να περιέχει 
Ετικέτες σε άλλες Γλώσσες.</entry>
-  <entry key="358">Μη Έγκυρο ID (Κωδικός Αριθμός) 
Ετικέτας! Δεν βρέθηκε καταχωρημένο στη 
Βάση Δεδομένων.</entry>
   <entry key="359">Δεν μπορείτε να διαγράψετε το συ
γκεκριμένο Πεδίο! Μπορείτε να διαγράφετε 
Ετικέτες αλλά ΟΧΙ Πεδία. Αυτή τη στιγμή δεν 
έχει επιλεγεί κάποια Ετικέτα. Είτε δεν 
έγινε επιλογή Ετικέτας από κανένα Πεδίο, 
είτε δεν υπάρχει Ετικέτα για την συ
γκεκριμένη Γλώσσα και το συγκεκριμένο Π
εδίο.</entry>
   <entry key="360">Εξαγωγή</entry>
   <entry key="361">Πρέπει να αποσυνδεθείτε για να 
δείτε τις αλλαγές!</entry>
@@ -381,10 +361,6 @@
   <entry key="365">Όνομα</entry>
   <entry key="366">Προσθήκη Γλώσσας</entry>
   <entry key="367">Αντίγραφα Ασφαλείας</entry>
-  <entry key="368">Αρχή</entry>
-  <entry key="369">Προηγούμενο</entry>
-  <entry key="370">Επόμενο</entry>
-  <entry key="371">Τέλος</entry>
   <entry key="372">Ο Χρήστης μιλάει (By clicking here you can 
give exclusive audio / mute the microphone of others)</entry>
   <entry key="373">Ανοιγμα/Κλείσιμο Ήχου</entry>
   <entry key="374">Σύστημα</entry>
@@ -416,7 +392,6 @@
   <entry key="400"></entry>
   <entry key="401">Χρήστες σε αυτό το Δωμάτιο:</entry>
   <entry key="402">Ανανέωση</entry>
-  <entry key="403">Αυτό το Δωμάτιο είναι πλήρες! 
Δοκιμάστε ξανά σε μερικά λεπτά.</entry>
   <entry key="404">Επιλέξτε ένα Δωμάτιο για να 
δείτε Λεπτομέρειες.</entry>
   <entry key="405">Συνομιλήστε με τους Χρήστες σε 
αυτό το Δωμάτιο:</entry>
   <entry key="406">Δωμάτιο:</entry>
@@ -546,12 +521,8 @@
   <entry key="530">Έγκυρο Από:</entry>
   <entry key="531">Έγκυρο Έως:</entry>
   <entry key="532">Πρόσκληση στο {0}</entry>
-  <entry key="533">Δεν υπάρχει διαθέσιμη Πρόσκληση 
για το συγκεκριμένο Κωδικό!</entry>
-  <entry key="534">Η Πρόσκληση έχει ήδη 
χρησιμοποιηθεί! Αυτός ο τύπος Πρόσκλησης 
δεν μπορεί να χρησιμοποιηθεί ξανά.</entry>
-  <entry key="535">Ο συγκεκριμένος Κωδικός Π
ρόσκλησης δεν είναι έγκυρος!</entry>
   <entry key="536">Κωδικός:</entry>
   <entry key="537">Έλεγχος Κωδικού</entry>
-  <entry key="538">Μη Έγκυρος Κωδικός!</entry>
   <entry key="539">Ήχος/Βίντεο</entry>
   <entry key="540">Συγχρονισμός Ήχου/Βίντεο</entry>
   <entry key="541">Το login ήταν σωστό, αλλά η Σύνοδος 
που δοκιμάσατε δεν είναι ενεργή ή δεν είναι 
αποθηκευμένη στον Διακομιστή. Πρέπει να 
αποκτήσετε νέο Αριθμό Συνόδου και να 
δοκιμάσετε να συνδεθείτε ξανά.</entry>
@@ -671,18 +642,12 @@
   <entry key="660">Προσθέστε ή διαγράψτε 
Χρήστες/Δωμάτια στον Οργανισμό σας.</entry>
   <entry key="661">Θέλετε πραγματικά να διαγράψετε 
αυτήν την Εγγραφή;</entry>
   <entry key="662">Θέλετε πραγματικά να διαγράψετε 
αυτόν το Χρήστη από τον Οργανισμό σας; Θα 
διαγραφεί μόνο η Σύνδεση μεταξύ του Χρήστη 
και του Οργανισμού. Για να διαγράψετε 
πραγματικά τον Χρήστη πρέπει να συνδεθείτε 
στον Πίνακα Διαχείρισης.</entry>
-  <entry key="663">Δεν μπορείτε να διαγράψετε το 
δικό σας Χρήστη!</entry>
-  <entry key="664">Αυτή η Μέθοδος χρειάζεται 
Λογαριασμό Διαχειριστή για να 
εκτελεστεί!</entry>
-  <entry key="665">Δεν υπάρχει Σύνοδος που να 
σχετίζεται με το συγκεκριμένο Κωδικό 
Αριθμό (ID).</entry>
-  <entry key="666">Πρόκειται για Λογαριασμό 
Διαχειριστή ή Συντονιστή! Η επεξεργασία 
τέτοιων Λογαριασμών είναι δυνατή μόνο από 
τον Πίνακα Διαχείρισης.</entry>
   <entry key="667">Για την ολοκλήρωση της Εγγραφής 
σας παρακαλούμε κάντε κλικ στον παρακάτω 
Σύνδεσμο ή αντιγράψτε το URL στην μπάρα του 
Φυλλομετρητή σας.</entry>
   <entry key="668">Κάντε κλικ για να επιβεβαιώσετε 
το Email σας.</entry>
   <entry key="669">Δεν βρέθηκε Xρήστης για τη συ
γκεκριμένη τιμή Hash.</entry>
   <entry key="670">Αυτός ο Xρήστης έχει 
ενεργοποιηθεί ήδη!</entry>
   <entry key="671">Ο Λογαριασμός σας 
ενεργοποιήθηκε με επιτυχία!</entry>
   <entry key="672">Συνδεθείτε Τώρα</entry>
-  <entry key="673">Ο Λογαριασμός σας δεν είναι 
ενεργοποιημένος! Χρησιμοποιείστε πρώτα το 
Σύνδεσμο που βρίσκεται στο Email που λάβατε 
κατά την διάρκεια της Εγγραφής σας.</entry>
-  <entry key="674">Εγγραφήκατε με επιτυχία. Ένα 
μήνυμα με Επαναληπτικό Κωδικό έχει σταλεί 
στο Email σας. Παρακαλούμε ελέγξτε το Ταχυ
δρομείο σας.</entry>
   <entry key="675">Αφαίρεση Συντονιστικού Ρόλου 
από αυτόν το Χρήστη.</entry>
   <entry key="676">Παραχώρηση Δικαιωμάτων Συ
ντονισμού σε αυτόν το Χρήστη.</entry>
   <entry key="677">Χρήστης</entry>
@@ -794,7 +759,6 @@
   <entry key="784">Αίτηση Συντονισμού</entry>
   <entry key="785">Αίτηση Πρόσβασης στον Π
ίνακα</entry>
   <entry key="786">Αίτηση Πρόσβασης σε 
Κάμερα/Μικρόφωνο</entry>
-  <entry key="787">Η συγκεκριμένη τιμή Hash Συνόδου 
έχει χρησιμοποιηθεί ήδη. Δεν μπορείτε να 
την χρησιμοποιήσετε ξανά!</entry>
   <entry key="788">ΕΝΑΡΞΗ</entry>
   <entry key="789">ΕΧΙΤ</entry>
   <entry key="790">Θέλετε πραγματικά να 
εγκαταλείψετε την Συνδιάσκεψη; Καλό θα 
ήταν να καθαρίσετε τον Πίνακα και το 
Ιστορικό Συνομιλιών και να αφαιρέσετε 
Έγγραφα που πιθανώς έχουν φορτωθεί.</entry>
@@ -814,7 +778,6 @@
   <entry key="805">Σχέδιο Συνάντησης</entry>
   <entry key="806">Για να προγραμματίσετε μια Συ
νδιάσκεψη μπορείτε να προσθέσετε ένα νέο Συ
μβάν στο Ημερολόγιο. Για κάθε Συμβάν του 
Ημερολογίου δημιουργείται αυτόματα ένα 
Δωμάτιο Συνδιασκέψεων. Εσείς, μάζι με όλους 
τους Συμμετέχοντες στην Συνδιάσκεψη, θα 
λάβετε ένα mail με σύνδεσμο στο συγκεκριμένο 
Δωμάτιο.&lt;br/&gt;&lt;br/&gt;Μπορείτε να επιλέξετε 
μεταξύ διαφορετικών τύπων Δωματίων που 
έχουν διαφορετικές διατάξεις και 
διαφορετικά συστήματα Συντονισμού. 
Μπορείτε επίσης να επιλέξετε μεταξύ 
διαφορετικών τύπων Ειδοποίησης για το mail 
που θα σταλεί για κάθε 
 Συμβάν του Ημερολογίου.</entry>
   <entry key="807">Χρειάζεστε Βοήθεια;</entry>
-  <entry key="808">Περιορισμένη</entry>
   <entry key="809">Αναζήτηση</entry>
   <entry key="810">Προσθήκη</entry>
   <entry key="811">Δεν έχει επιλεγεί Χρήστης! Π
αρακαλούμε επιλέξτε πρώτα ένα στοιχείο από 
τη λίστα και έπειτα πατήστε "Προσθήκη".</entry>
@@ -923,7 +886,6 @@
   <entry key="917">The recording for this interview is already started!</entry>
   <entry key="918">Cancel</entry>
   <entry key="919">The post-processing of an interview takes 5 minutes per 1 
minute interview. The current progress of the interview post-processing 
transcoding is:</entry>
-  <entry key="920">You have to enter your password again to auto create the 
SIP Data</entry>
   <entry key="921">Re-generate SIP Data</entry>
   <entry key="922">You cannot move this file or folder into its own sub 
folder!</entry>
   <entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
   <entry key="997">Invoice</entry>
   <entry key="998"></entry>
   <entry key="999">You need to buy a volume flatrate to be able to send 
invitations or create meetings via the calendar. With Pay-per-minute it is only 
possible for you to access {0}. You cannot allow 3th Parties to access a 
Meeting.</entry>
-  <entry key="1000">This Email is already used by another User.</entry>
   <entry key="1001">SIP-Settings</entry>
   <entry key="1002">The Conference Number and PIN is automatically created via 
the OpenXG RPC-Gateway</entry>
   <entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
   <entry key="1192">Hi,</entry>
   <entry key="1193">would like to add you as contact.</entry>
   <entry key="1194">Check your contact requests in {0} or click on those links 
to accept or deny the request</entry>
-  <entry key="1195">This user is already in your contact list or has received 
an invitation to your contact list that is not answered yet.</entry>
   <entry key="1196">Your contact list</entry>
   <entry key="1197">Edit your contact and messages,&lt;br/&gt; manage your 
pending contacts!</entry>
   <entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
   <entry key="1223">Sent</entry>
   <entry key="1224">Trash</entry>
   <entry key="1225">This is you! You cannot add yourself as your own 
contact.</entry>
-  <entry key="1226">The user is already denied!</entry>
-  <entry key="1227">The user is already approved!</entry>
-  <entry key="1228">This user contact hash is invalid!</entry>
   <entry key="1229">User added to contact list!</entry>
   <entry key="1230">User denied as contact and removed from pending contact 
list!</entry>
-  <entry key="1231">There is no such contact!</entry>
   <entry key="1232">Would you really like to remove that contact?</entry>
   <entry key="1233">Confirm contact removal</entry>
   <entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
   <entry key="1268">The user does not share his personal contact data.</entry>
   <entry key="1269">The user does share his personal contact data only to 
contacts.</entry>
   <entry key="1270">Address &amp; Phone</entry>
-  <entry key="1271">You invitation code is no valid, the code is only valid 
during this specific date and time:</entry>
   <entry key="1272">This event is connected to several calendars of other 
users. Your change will also update their calendar. Would you really like to 
update the event?</entry>
   <entry key="1273">Confirm update</entry>
   <entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
   <entry key="1303">Reply</entry>
   <entry key="1304">Rooms and chats</entry>
   <entry key="1305">My rooms</entry>
-  <entry key="1306">My conference room (for 1-16 users)</entry>
-  <entry key="1307">My webinar room (for 1-120 users)</entry>
   <entry key="1308">Owner Id</entry>
-  <entry key="1309">Please enter a password</entry>
-  <entry key="1310">You need an account with User-Level User, Moderator or 
Admin</entry>
   <entry key="1311">Web-Service (only access via SOAP)</entry>
   <entry key="1312">Do directly load to whiteboard</entry>
   <entry key="1313">Do you really want to remove this whiteboard? This action 
cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
   <entry key="1413">active</entry>
   <entry key="1414">Simple Chart</entry>
   <entry key="1415">Pie Chart</entry>
-  <entry key="1416">Please enter email</entry>
   <entry key="1417">New message(s)</entry>
   <entry key="1418">Close Poll</entry>
   <entry key="1419">Are you sure you want to close this Poll? No one will be 
able to vote</entry>
@@ -1434,7 +1384,6 @@
   <entry key="1428">Give a permission for exclusive audio.</entry>
   <entry key="1429">Cam resolution</entry>
   <entry key="1430">Changing the resolution affects bandwidth, bigger picture 
needs more bandwith!</entry>
-  <entry key="1431">You don't have the right to give yourself or others 
exclusive audio. You need to apply for the right from the moderator or ask the 
moderator to give you exclusive audio.</entry>
   <entry key="1432">I would like to get the right for exclusive audio</entry>
   <entry key="1433">Give exclusive audio to me (alternatively click on your 
video pod or press F12)</entry>
   <entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
   <entry key="1537">Include uploaded files and recordings in backup</entry>
   <entry key="1538">Enable SIP transport in the room</entry>
   <entry key="1539">Do you really want to provide this user an exclusive 
audio?</entry>
-  <entry key="1540">Please specify your timezone</entry>
-  <entry key="1544">Configuration with given key already exists, please 
specify another key or edit existent configuration</entry>
   <entry key="1545">Content is Saving, Please wait.</entry>
   <entry key="1546">Welcome</entry>
   <entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
   <entry key="1605">Remove audio of this user</entry>
   <entry key="1606">I would like to share my audio</entry>
   <entry key="1607">You are allowed to share your audio</entry>
+       <entry key="error.unknown">Άγνωστο Σφάλμα: Π
αρακαλούμε να το αναφέρετε στην Ομάδα Εξυ
πηρέτησής σας.</entry>
+       <entry key="error.bad.credentials">Username/email and/or password are 
incorrect.</entry>
+       <entry key="error.short.login">Login is too short</entry>
+       <entry key="error.reg.disabled">Εγγραφές 
Απενεργοποιημένες.</entry>
+       <entry key="error.login.inuse">Το συγκεκριμένο Όνομα 
Χρήστη έχει επιλεγεί ήδη!</entry>
+       <entry key="error.email.inuse">Το συγκεκριμένο Email 
έχει καταχωρηθεί ήδη!</entry>
+       <entry key="error.notallowed">Απαιτείται Εξου
σιοδότηση από το Διαχειριστή!</entry>
+       <entry key="error.hash.used">Η Πρόσκληση έχει ήδη 
χρησιμοποιηθεί! Αυτός ο τύπος Πρόσκλησης 
δεν μπορεί να χρησιμοποιηθεί ξανά.</entry>
+       <entry key="error.hash.invalid">Ο συγκεκριμένος 
Κωδικός Πρόσκλησης δεν είναι έγκυρος!</entry>
+       <entry key="error.hash.period">You invitation code is not valid, the 
code is only valid during this specific date and time:</entry>
+       <entry key="error.bad.password">Μη Έγκυρος 
Κωδικός!</entry>
+       <entry key="error.nogroup">User is not assigned to group.</entry>
+       <entry key="error.notactivated">Ο Λογαριασμός σας δεν 
είναι ενεργοποιημένος! Χρησιμοποιείστε 
πρώτα το Σύνδεσμο που βρίσκεται στο Email που 
λάβατε κατά την διάρκεια της Εγγραφής 
σας.</entry>
+       <entry key="error.contact.added">This user is already in your contact 
list or has received an invitation to your contact list that is not answered 
yet.</entry>
+       <entry key="error.contact.denied">The user is already denied.</entry>
+       <entry key="error.contact.approved">The user is already 
approved.</entry>
+       <entry key="error.cfg.exist">Configuration with given key already 
exists, please specify another key or edit existent configuration</entry>
+       <entry key="warn.nogroup">Ο Χρήστης προστέθηκε 
επιτυχώς, αλλά πρέπει να τοποθετηθεί σε 
κάποιον Οργανισμό, αλλιώς δεν θα μπορεί να 
συνδεθεί!</entry>
+       <entry key="warn.notverified">Εγγραφήκατε με επιτυ
χία. Ένα μήνυμα με Επαναληπτικό Κωδικό έχει 
σταλεί στο Email σας. Παρακαλούμε ελέγξτε το 
Ταχυδρομείο σας.</entry>
+       <entry key="account.created">Ο Λογαριασμός σας 
δημιουργήθηκε με επιτυχία. Τώρα μπορείτε 
να συνδεθείτε.</entry>
        <entry key="install.wizard.install.header">Installation</entry>
        <entry key="install.wizard.welcome.panel"><![CDATA[
        <ol>
@@ -1774,25 +1741,25 @@
        <entry key="install.wizard.congrats.mail">Mailing list</entry>
        <entry key="install.wizard.congrats.commercial">There are some companies
                        that also offer commercial support for Apache 
OpenMeetings:</entry>
-  <entry key="room.type.conference">conference (1-25 users)</entry>
-  <entry key="room.type.restricted">restricted (1-150 users)</entry>
-  <entry key="room.type.interview">interview (1:1 meeting with 
recording)</entry>
-  <entry key="room.type.conference.desc">"democratic" by default, every user 
can directly enable audio/video without need for asking</entry>
-  <entry key="room.type.restricted.desc">"restricted" by default: Every 
regular user will need to ask if he wants to share audio/video</entry>
-  <entry key="room.type.interview.desc">only 2 users can have audio/video 
enabled (more users can be in the room and you can switch the audio/video 
between them of course)</entry>
-  <entry key="appointment.reminder.none">do not send notification</entry>
-  <entry key="appointment.reminder.email">simple email</entry>
-  <entry key="appointment.reminder.ical">iCal email</entry>
-  <entry key="user.salutation.mr">Κος</entry>
-  <entry key="user.salutation.ms">Κα</entry>
-  <entry key="user.salutation.mrs">Δις.</entry>
-  <entry key="user.salutation.dr">Δρ.</entry>
-  <entry key="user.salutation.prof">Prof</entry>
-  <entry key="error.type.error">Μήνυμα</entry>
-  <entry key="error.type.info">Μήνυμα</entry>
-  <entry key="poll.type.yesNo">Ναι/Όχι</entry>
-  <entry key="poll.type.numeric">Αριθμός 1-10</entry>
-  <entry key="wizard.button.finish">Finish</entry>
+       <entry key="room.type.conference">conference (1-25 users)</entry>
+       <entry key="room.type.presentation">presentation (1-150 users)</entry>
+       <entry key="room.type.interview">interview (1:1 meeting with 
recording)</entry>
+       <entry key="room.type.conference.desc">"democratic" by default, every 
user can directly enable audio/video without need for asking</entry>
+       <entry key="room.type.presentation.desc">"restricted" by default: Every 
regular user will need to ask if he wants to share audio/video</entry>
+       <entry key="room.type.interview.desc">only 2 users can have audio/video 
enabled (more users can be in the room and you can switch the audio/video 
between them of course)</entry>
+       <entry key="appointment.reminder.none">do not send notification</entry>
+       <entry key="appointment.reminder.email">simple email</entry>
+       <entry key="appointment.reminder.ical">iCal email</entry>
+       <entry key="user.salutation.mr">Κος</entry>
+       <entry key="user.salutation.ms">Κα</entry>
+       <entry key="user.salutation.mrs">Δις.</entry>
+       <entry key="user.salutation.dr">Δρ.</entry>
+       <entry key="user.salutation.prof">Prof</entry>
+       <entry key="error.type.error">Μήνυμα</entry>
+       <entry key="error.type.info">Μήνυμα</entry>
+       <entry key="poll.type.yesNo">Ναι/Όχι</entry>
+       <entry key="poll.type.numeric">Αριθμός 1-10</entry>
+       <entry key="wizard.button.finish">Finish</entry>
        <entry key="main.menu.admin.email">Email management</entry>
        <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
        <entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
        <entry key="install.room.public.conference">Public Conference 
Room</entry>
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
-       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.public.presentation">Public Presentation 
Room</entry>
+       <entry key="install.room.presentation.micro">Presentation room with 
microphone option set</entry>
        <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
        <entry key="download.pdf">Αποθήκευση ως PDF</entry>
        <entry key="zoom.fullFit">Full-Fit</entry>
        <entry key="zoom.pageWidth">Page Width</entry>
+       <entry key="my.room.conference">My conference room (for 1-16 
users)</entry>
+       <entry key="my.room.presentation">My presentation room (for 1-120 
users)</entry>
+       <entry key="goto.first">Αρχή</entry>
+       <entry key="goto.prev">Προηγούμενο</entry>
+       <entry key="goto.next">Επόμενο</entry>
+       <entry key="goto.last">Τέλος</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index c0498cd..f7c215c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -120,11 +120,6 @@
   <entry key="100">Elipse</entry>
   <entry key="101">Cerrado</entry>
   <entry key="102">error en la introducción de datos</entry>
-  <entry key="103">el nombre de usuario debe contener al menos 4 
caracteres</entry>
-  <entry key="104">Login is too short</entry>
-  <entry key="105">Este nombre de usuario ya existe</entry>
-  <entry key="106">Este email ya está registrado</entry>
-  <entry key="107">Error del sistema, por favor contacte con el 
administrador</entry>
   <entry key="108">Entrar</entry>
   <entry key="109">Usuario:</entry>
   <entry key="110">Contraseña:</entry>
@@ -253,7 +248,6 @@
   <entry key="233">Correo inválido</entry>
   <entry key="234">Usted ha introducido una dirección no válida de correo 
electrónico</entry>
   <entry key="235">El registro se ha completado con éxito</entry>
-  <entry key="236">Su cuenta ha sido creada, puede ingresar desde este 
momento</entry>
   <entry key="237">No puede compartir su escritorio en este momento. Alguien 
más ya está compartiendo su escritorio.</entry>
   <entry key="238">Compartición no permitida</entry>
   <entry key="239">Compartir/grabar escritorio</entry>
@@ -291,7 +285,6 @@
   <entry key="273">Usuarios</entry>
   <entry key="274">Eliminar usuario de la organización</entry>
   <entry key="275">Eliminar</entry>
-  <entry key="276">Este usuario ya es miembro de la organización</entry>
   <entry key="277">Noticias</entry>
   <entry key="278">Enlaces rápidos</entry>
   <entry key="279">Ir a la (Vídeo)Conferencia</entry>
@@ -347,20 +340,9 @@
   <entry key="331">Escriba 4 ó más caracteres. Distingue mayúsculas de 
minúsculas</entry>
   <entry key="332">La contraseña ha sido cambiada, ahora puede iniciar 
sesión.</entry>
   <entry key="333">Aceptar</entry>
-  <entry key="334">Error desconocido. Envíe esta información al 
administrador del sistema.</entry>
-  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">Contraseña incorrecta</entry>
   <entry key="337">Ha salido del sistema</entry>
-  <entry key="338">Registro desactivado.</entry>
-  <entry key="339">Correo incorrecto</entry>
-  <entry key="340">nombre de archivo duplicado, por favor seleccione 
otro</entry>
-  <entry key="341">el nombre del archivo es demasiado corto</entry>
-  <entry key="342">No se pudo guardar la dirección</entry>
-  <entry key="343">El usuario fue añadido, sin embargo deberá estar al menos 
en una organización para poder iniciar la sesión.</entry>
   <entry key="344">Nueva grabación</entry>
-  <entry key="345">No se encontró un campo en este FieldId.</entry>
-  <entry key="346">No se encontró una etiqueta para este campo.</entry>
-  <entry key="347">Se necesita autorización del administrador</entry>
   <entry key="348">Editor de idioma</entry>
   <entry key="349">Idioma</entry>
   <entry key="350">ID de la etiqueta</entry>
@@ -370,8 +352,6 @@
   <entry key="354">Nombre</entry>
   <entry key="355">Valor de la etiqueta</entry>
   <entry key="356">ID de la etiqueta</entry>
-  <entry key="357">Ha eliminado la etiqueta pero no el campo. No se puede 
eliminar un campo ya que puede tener etiquetas en otros idiomas.</entry>
-  <entry key="358">ID de la etiqueta incorrecto. Su FieldLanguagesvalues_Id no 
se encontró en la base de datos.</entry>
   <entry key="359">Usted no puede eliminar este campo, sólo las etiquetas. No 
hay una etiqueta cargada por el momento o no se encuentra seleccionada ninguna 
(puede que no exista en el idioma seleccionado).</entry>
   <entry key="360">exportar</entry>
   <entry key="361">Necesita cerrar la sesión para ver los cambios.</entry>
@@ -381,10 +361,6 @@
   <entry key="365">Nombre</entry>
   <entry key="366">añadir idioma</entry>
   <entry key="367">Copia de seguridad</entry>
-  <entry key="368">ir al inicio</entry>
-  <entry key="369">anterior</entry>
-  <entry key="370">siguiente</entry>
-  <entry key="371">ir al final</entry>
   <entry key="372">usuario habla (Haciendo clic aquí usted podrá dar audio 
exclusivo o silenciar el micrófono de los demás)</entry>
   <entry key="373">encender o apagar sonido</entry>
   <entry key="374">Sistema</entry>
@@ -416,7 +392,6 @@
   <entry key="400"/>
   <entry key="401">Usuarios en la sala:</entry>
   <entry key="402">actualizar</entry>
-  <entry key="403">La sala esta llena. Por favor, inténtelo más 
tarde.</entry>
   <entry key="404">Pulse sobre una sala para ver los detalles</entry>
   <entry key="405">Conversar con los usuarios de esta sala:</entry>
   <entry key="406">Sala:</entry>
@@ -546,12 +521,8 @@
   <entry key="530">Válido desde:</entry>
   <entry key="531">Válido hasta:</entry>
   <entry key="532">Invitación a {0}</entry>
-  <entry key="533">No existe una invitación disponible con este 
código.</entry>
-  <entry key="534">Esta invitación ya fue usada y no puede volverse a 
utilizar.</entry>
-  <entry key="535">El código de invitación no es válido.</entry>
   <entry key="536">Contraseña:</entry>
   <entry key="537">Verificar contraseña</entry>
-  <entry key="538">Contraseña incorrecta</entry>
   <entry key="539">Navegador</entry>
   <entry key="540">Sincronizar audio/vídeo</entry>
   <entry key="541">El login es correcto, pero la sesión en la que intenta 
entrar no está activa o no fue guardada en el servidor. Tiene que iniciar una 
nueva sesión.</entry>
@@ -671,18 +642,12 @@
   <entry key="660">Añadir o borrar usuarios y/o salas en su 
organización</entry>
   <entry key="661">¿Realmente quiere borrar este registro?</entry>
   <entry key="662">¿Realmente quiere borrar a este usuario de su 
organización? Sólo se borrará la conexión entre el usuario y su 
organización. En realidad, para borrar al usuario debe ingresar al Panel de 
administración.</entry>
-  <entry key="663">¡Vd no puede borrarse a sí mismo!</entry>
-  <entry key="664">¡Para usar este método necesita de una cuenta de 
administrador!</entry>
-  <entry key="665">No hay ninguna sesión asociada a este ID.</entry>
-  <entry key="666">Esta es una cuenta de administrador o de moderador. Sólo 
puede editar esta cuenta utilizando el Panel de administración.</entry>
   <entry key="667">Para completar su registro, haga el favor de pulsar en el 
siguiente enlace. Otra opción es copiar la URL en la barra de su 
navegador.</entry>
   <entry key="668">Pulse para verificar su correo</entry>
   <entry key="669">No se ha encontrado un usuario para ese algoritmo 
Hash.</entry>
   <entry key="670">¡Este usuario ya está activado!</entry>
   <entry key="671">¡Ha activado su cuenta con éxito!</entry>
   <entry key="672">Ingrese ahora</entry>
-  <entry key="673">Su cuenta no está activada. Utilice en primer lugar el 
enlace que hay en correo recibido al finalizar el proceso de registro.</entry>
-  <entry key="674">Se ha registrado con éxito. Le hemos enviado un correo con 
un código de verificación. Por favor, revise su cuenta de correo.</entry>
   <entry key="675">Quitar el rol de moderador a este usuario</entry>
   <entry key="676">Dar permisos de moderación a este usuario</entry>
   <entry key="677">Usuario</entry>
@@ -794,7 +759,6 @@
   <entry key="784">Solicitar la moderación</entry>
   <entry key="785">Solicitar acceso a la pizarra</entry>
   <entry key="786">Solicitar acceso a la cámara/micrófono</entry>
-  <entry key="787">La autenticación de esta sesión ya ha sido utilizada. No 
puede hacerse dos veces.</entry>
   <entry key="788">INICIAR</entry>
   <entry key="789">SALIR</entry>
   <entry key="790">¿Desea realmente salir? Es conveniente que antes borre los 
documentos subidos, la pizarra o el historial del chat.</entry>
@@ -814,7 +778,6 @@
   <entry key="805">Progr. Encuentro</entry>
   <entry key="806">Para planificar una conferencia, añada un nuevo Evento en 
el Calendario. Para cada Evento se creará automáticamente una sala de 
(vídeo)conferencia. Usted y el resto de asistentes recibirán un correo con un 
enlace de la sala.&lt;br/&gt;&lt;br/&gt;Puede escoger entre diferentes tipos de 
salas con diferentes diseños y sistemas de moderación. También puede escoger 
entre diferentes tipos de notificación de correo que se envían en cada evento 
del calendario.</entry>
   <entry key="807">¿Necesita ayuda?</entry>
-  <entry key="808">Restringido</entry>
   <entry key="809">Buscar</entry>
   <entry key="810">Añadir</entry>
   <entry key="811">No hay ningún usuario seleccionado. Seleccione primero un 
ítem de la lista y pulse en Añadir.</entry>
@@ -923,7 +886,6 @@
   <entry key="917">¡Ya se ha iniciado la grabación de esta 
entrevista!</entry>
   <entry key="918">Cancelar</entry>
   <entry key="919">El post-proceso de una entrevista lleva cinco veces más 
tiempo que el de la propia entrevista. El progreso actual de este proceso es el 
siguiente:</entry>
-  <entry key="920">Tiene que introducir de nuevo su contraseña para autocrear 
los datos SIP</entry>
   <entry key="921">Regenerar datos SIP</entry>
   <entry key="922">¡No puede mover este archivo o carpeta dentro de su propio 
subdirectorio!</entry>
   <entry key="923">Tamaño del dispositivo personal</entry>
@@ -1003,7 +965,6 @@
   <entry key="997">Factura</entry>
   <entry key="998"/>
   <entry key="999">Necesita comprar una tarifa plana para poder enviar 
invitaciones o crear encuentros utilizando el calendario. Con el sistema pago 
por minutos sólo es posible acceder a {0}.</entry>
-  <entry key="1000">Esta dirección de correo está siendo utilizada por otro 
usuario.</entry>
   <entry key="1001">Ajustes SIP</entry>
   <entry key="1002">El número de la videoconferencia y el PIN son creados 
automáticamente utilizando la pasarela OpenXG RPC-Gateway</entry>
   <entry key="1003">Número SIP</entry>
@@ -1198,7 +1159,6 @@
   <entry key="1192">Hola,</entry>
   <entry key="1193">me gustaría añadirle como contacto.</entry>
   <entry key="1194">Chequear sus peticiones de contacto {0} o hacer clic en 
los links para aceptar o denegar la petición</entry>
-  <entry key="1195">Este usuario ya se encuentra en su lista de contactos o ha 
recibido una invitación a su lista de contactos que aún no ha 
contestado.</entry>
   <entry key="1196">Su lista de contactos</entry>
   <entry key="1197">Editar sus Contactos y Mensajes,&lt;br/&gt; administrar 
sus contactos pendientes!</entry>
   <entry key="1198">está usted confirmado como contacto!</entry>
@@ -1229,12 +1189,8 @@
   <entry key="1223">Enviados</entry>
   <entry key="1224">Papelera</entry>
   <entry key="1225">Este es usted! No puede añadirse a sí mismo como 
contacto.</entry>
-  <entry key="1226">El usuario ya estaba denegado!</entry>
-  <entry key="1227">El usuario ya estaba aprobado!</entry>
-  <entry key="1228">El hash de este usuario-contacto es inválido!</entry>
   <entry key="1229">Usuario añadido a lista de contactos!</entry>
   <entry key="1230">Usuario denegado como contacto y eliminado de la lista de 
contactos pendiente!</entry>
-  <entry key="1231">No está ese contacto!</entry>
   <entry key="1232">Realmente quiere eliminar ese contacto?</entry>
   <entry key="1233">Confirmar eliminación del contacto</entry>
   <entry key="1234">Eliminar contacto de la lista</entry>
@@ -1274,7 +1230,6 @@
   <entry key="1268">El usuario no comparte sus datos personales de 
contacto.</entry>
   <entry key="1269">El usuario comparte sus datos personales solamente con sus 
contactos.</entry>
   <entry key="1270">Dirección &amp; Teléfono</entry>
-  <entry key="1271">Su código de invitación no es válido. El código 
solamente es válido durante la fecha y hora especificados:</entry>
   <entry key="1272">Este evento está conectado a los calendarios de otros 
usuarios. Los cambios que efectúe afectarán tambien a sus calendarios. 
Realmente quiere cambiar el evento?</entry>
   <entry key="1273">Confirmar cambios</entry>
   <entry key="1274">Permitir a los contactos ver mi calendario (ver 
solamente)</entry>
@@ -1309,11 +1264,7 @@
   <entry key="1303">Replicar</entry>
   <entry key="1304">Salas y Chats</entry>
   <entry key="1305">Mis salas</entry>
-  <entry key="1306">Mi sala de conferencias (para 1-16 usuarios)</entry>
-  <entry key="1307">Mi sala webinar (para 1-120 usuarios)</entry>
   <entry key="1308">Propietario Id</entry>
-  <entry key="1309">Por favor introduzca una contraseña</entry>
-  <entry key="1310">Necesita una cuenta con el Nivel de Usuario, Moderador o 
Admin.</entry>
   <entry key="1311">Web-Service (acceso solamente via SOAP)</entry>
   <entry key="1312">Cargar directamente a la pizarra</entry>
   <entry key="1313">Realmente quiere suprimir esta pizarra? Esta acción no 
puede ser deshecha!</entry>
@@ -1419,7 +1370,6 @@
   <entry key="1413">activa</entry>
   <entry key="1414">Cuadro Simple</entry>
   <entry key="1415">Cuadro Gráfico</entry>
-  <entry key="1416">Por favor, introduzca su dirección de correo</entry>
   <entry key="1417">Nuevo mensaje(s)</entry>
   <entry key="1418">Encuesta cerrada</entry>
   <entry key="1419">Realmente quiere cerrar esta encuesta? Nadie más podrá 
votar.</entry>
@@ -1434,7 +1384,6 @@
   <entry key="1428">Dar permiso para audio exclusivo.</entry>
   <entry key="1429">Resolución de cámara</entry>
   <entry key="1430">Cambiando la resolución a efecto de ancho de banda, fotos 
grandes necesitan más ancho de banda!</entry>
-  <entry key="1431">Usted no tiene los derechos para darse a sí mismo o a los 
demás audio exclusivo. Necesita solicitar los derechos al moderador o que 
éste le de audio exclusivo.</entry>
   <entry key="1432">Quisiera obtener los derechos para audio exclusivo</entry>
   <entry key="1433">Darme audio exclusivo a mí mismo (alternativamente hacer 
click en la ventana de video o pulsar F12)</entry>
   <entry key="1434">El micrófono está abierto!</entry>
@@ -1542,8 +1491,6 @@
   <entry key="1537">Incluir archivos subidos y grabaciones en el backup</entry>
   <entry key="1538">Permitir transporte SIP en la sala</entry>
   <entry key="1539">Realmente quiere proveer a este usuario de audio 
exclusivo?</entry>
-  <entry key="1540">Por favor, especifique su Zona Horaria</entry>
-  <entry key="1544">Ya existe la configuración con esa clave, por favor 
especifique otra clave o edite la configuración existente</entry>
   <entry key="1545">El contenido se está guardando, Por favor espere.</entry>
   <entry key="1546">BienVenidos</entry>
   <entry key="1547">El Widget muestra información básica del usuario y links 
soportados</entry>
@@ -1604,6 +1551,26 @@
   <entry key="1605">Remove audio of this user</entry>
   <entry key="1606">I would like to share my audio</entry>
   <entry key="1607">You are allowed to share your audio</entry>
+       <entry key="error.unknown">Error desconocido. Envíe esta información 
al administrador del sistema.</entry>
+       <entry key="error.bad.credentials">Username/email and/or password are 
incorrect.</entry>
+       <entry key="error.short.login">Login is too short</entry>
+       <entry key="error.reg.disabled">Registro desactivado.</entry>
+       <entry key="error.login.inuse">Este nombre de usuario ya existe</entry>
+       <entry key="error.email.inuse">Este email ya está registrado</entry>
+       <entry key="error.notallowed">Se necesita autorización del 
administrador</entry>
+       <entry key="error.hash.used">Esta invitación ya fue usada y no puede 
volverse a utilizar.</entry>
+       <entry key="error.hash.invalid">El código de invitación no es 
válido.</entry>
+       <entry key="error.hash.period">Su código de invitación no es válido. 
El código solamente es válido durante la fecha y hora especificados:</entry>
+       <entry key="error.bad.password">Contraseña incorrecta</entry>
+       <entry key="error.nogroup">User is not assigned to group.</entry>
+       <entry key="error.notactivated">Su cuenta no está activada. Utilice en 
primer lugar el enlace que hay en correo recibido al finalizar el proceso de 
registro.</entry>
+       <entry key="error.contact.added">Este usuario ya se encuentra en su 
lista de contactos o ha recibido una invitación a su lista de contactos que 
aún no ha contestado.</entry>
+       <entry key="error.contact.denied">El usuario ya estaba denegado!</entry>
+       <entry key="error.contact.approved">El usuario ya estaba 
aprobado!</entry>
+       <entry key="error.cfg.exist">Ya existe la configuración con esa clave, 
por favor especifique otra clave o edite la configuración existente</entry>
+       <entry key="warn.nogroup">El usuario fue añadido, sin embargo deberá 
estar al menos en una organización para poder iniciar la sesión.</entry>
+       <entry key="warn.notverified">Se ha registrado con éxito. Le hemos 
enviado un correo con un código de verificación. Por favor, revise su cuenta 
de correo.</entry>
+       <entry key="account.created">Su cuenta ha sido creada, puede ingresar 
desde este momento</entry>
        <entry key="install.wizard.install.header">Instalación</entry>
        <entry key="install.wizard.welcome.panel"><![CDATA[
        <ol>
@@ -1774,25 +1741,25 @@
        <entry key="install.wizard.congrats.mail">Listas de correo</entry>
        <entry key="install.wizard.congrats.commercial">Hay algunas compañias
                que tambien ofrecen soporte comercial para Apache 
OpenMeetings:</entry>
-  <entry key="room.type.conference">conferencia (1-25 usuarios)</entry>
-  <entry key="room.type.restricted">restringida (1-150 usuarios)</entry>
-  <entry key="room.type.interview">interview (1:1 reunión con 
grabación)</entry>
-  <entry key="room.type.conference.desc">"democratic" by default, every user 
can directly enable audio/video without need for asking</entry>
-  <entry key="room.type.restricted.desc">"restricted" by default: Every 
regular user will need to ask if he wants to share audio/video</entry>
-  <entry key="room.type.interview.desc">only 2 users can have audio/video 
enabled (more users can be in the room and you can switch the audio/video 
between them of course)</entry>
-  <entry key="appointment.reminder.none">no envíe notificación</entry>
-  <entry key="appointment.reminder.email">correo simple</entry>
-  <entry key="appointment.reminder.ical">iCal correo</entry>
-  <entry key="user.salutation.mr">Sr.</entry>
-  <entry key="user.salutation.ms">Sra.</entry>
-  <entry key="user.salutation.mrs">Dña.</entry>
-  <entry key="user.salutation.dr">D.</entry>
-  <entry key="user.salutation.prof">Prof</entry>
-  <entry key="error.type.error">Error</entry>
-  <entry key="error.type.info">Mensaje</entry>
-  <entry key="poll.type.yesNo">Sí/No</entry>
-  <entry key="poll.type.numeric">Valor numérico [1-10]</entry>
-  <entry key="wizard.button.finish">Finalizar</entry>
+       <entry key="room.type.conference">conferencia (1-25 usuarios)</entry>
+       <entry key="room.type.presentation">presentation (1-150 
usuarios)</entry>
+       <entry key="room.type.interview">interview (1:1 reunión con 
grabación)</entry>
+       <entry key="room.type.conference.desc">"democratic" by default, every 
user can directly enable audio/video without need for asking</entry>
+       <entry key="room.type.presentation.desc">"restricted" by default: Every 
regular user will need to ask if he wants to share audio/video</entry>
+       <entry key="room.type.interview.desc">only 2 users can have audio/video 
enabled (more users can be in the room and you can switch the audio/video 
between them of course)</entry>
+       <entry key="appointment.reminder.none">no envíe notificación</entry>
+       <entry key="appointment.reminder.email">correo simple</entry>
+       <entry key="appointment.reminder.ical">iCal correo</entry>
+       <entry key="user.salutation.mr">Sr.</entry>
+       <entry key="user.salutation.ms">Sra.</entry>
+       <entry key="user.salutation.mrs">Dña.</entry>
+       <entry key="user.salutation.dr">D.</entry>
+       <entry key="user.salutation.prof">Prof</entry>
+       <entry key="error.type.error">Error</entry>
+       <entry key="error.type.info">Mensaje</entry>
+       <entry key="poll.type.yesNo">Sí/No</entry>
+       <entry key="poll.type.numeric">Valor numérico [1-10]</entry>
+       <entry key="wizard.button.finish">Finalizar</entry>
        <entry key="main.menu.admin.email">Email management</entry>
        <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
        <entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
        <entry key="install.room.public.conference">Public Conference 
Room</entry>
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
-       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.public.presentation">Public Presentation 
Room</entry>
+       <entry key="install.room.presentation.micro">Presentation room with 
microphone option set</entry>
        <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
        <entry key="download.pdf">Descargar como PDF</entry>
        <entry key="zoom.fullFit">Pantalla completa</entry>
        <entry key="zoom.pageWidth">Page Width</entry>
+       <entry key="my.room.conference">Mi sala de conferencias (para 1-16 
usuarios)</entry>
+       <entry key="my.room.presentation">My presentation room (for 1-120 
users)</entry>
+       <entry key="goto.first">ir al inicio</entry>
+       <entry key="goto.prev">anterior</entry>
+       <entry key="goto.next">siguiente</entry>
+       <entry key="goto.last">ir al final</entry>
 </properties>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index c2c550e..992f9a1 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -120,11 +120,6 @@
   <entry key="100">بيضي</entry>
   <entry key="101">بستن</entry>
   <entry key="102"></entry>
-  <entry key="103">كاراكتر 4 از بيش يا 4</entry>
-  <entry key="104">Login is too short</entry>
-  <entry key="105">The username is already taken</entry>
-  <entry key="106">The email is already registered</entry>
-  <entry key="107">سيستم اخطار</entry>
   <entry key="108">ارتباط قطع</entry>
   <entry key="109">:كاربر</entry>
   <entry key="110">:عبور رمز</entry>
@@ -253,7 +248,6 @@
   <entry key="233">ايميل اخطار</entry>
   <entry key="234">كرديد وارد صحيح نا پستي آدرس</entry>
   <entry key="235">Registration Complete</entry>
-  <entry key="236">است شده ايجاد شما اكانت</entry>
   <entry key="237">بگذاريد اشتراك به را خود صفحه نم
يتوانيد شما</entry>
   <entry key="238">ممنوع گذاري اشتراك به</entry>
   <entry key="239">شما صفحه گذاري اشتراك</entry>
@@ -291,7 +285,6 @@
   <entry key="273">كاربر</entry>
   <entry key="274">سازمان از كاربر حذف</entry>
   <entry key="275">حذف</entry>
-  <entry key="276">This user is already member of this organisation.</entry>
   <entry key="277">خبر</entry>
   <entry key="278">Quicklinks</entry>
   <entry key="279">كنفرانس به بازگشت</entry>
@@ -347,20 +340,9 @@
   <entry key="331">4 از بيش يا كاراكتر 4</entry>
   <entry key="332">Password set. You can login now.</entry>
   <entry key="333">ادامه</entry>
-  <entry key="334">Unkown Error. Please report this to your 
Service-Team.</entry>
-  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">صحيح نا عبور رمز</entry>
   <entry key="337">Successfully Logged out</entry>
-  <entry key="338">Frontend Registration disabled.</entry>
-  <entry key="339">صحيح نا ايميل</entry>
-  <entry key="340">كنيد وارد را ديگري فايل نام لطفا 
است تكراري فايل نام</entry>
-  <entry key="341">است كوتاه خيلي فايل نام</entry>
-  <entry key="342">كنيد ذخيره توانيد نمي را 
آدرس</entry>
-  <entry key="343">User added but you need to assign this User to an 
Organisation, otherwise he won't be able to sign-in.</entry>
   <entry key="344">جديد ضبط</entry>
-  <entry key="345">No Field found with this FieldId.</entry>
-  <entry key="346">No Label found for that Field.</entry>
-  <entry key="347">Admin Authorization required</entry>
   <entry key="348">Language-Editor</entry>
   <entry key="349">زبان</entry>
   <entry key="350">Label-ID</entry>
@@ -370,8 +352,6 @@
   <entry key="354">LabelName</entry>
   <entry key="355">LabelValue</entry>
   <entry key="356">Label-ID</entry>
-  <entry key="357">You did only delete the Label NOT the Field! You cannot 
delete the Field, it may has Labels in other Languages.</entry>
-  <entry key="358">Invalid Labelid. The FieldLanguagesvalues_Id cannot be 
found in the database.</entry>
   <entry key="359">You cannot delete this Field. You can only delete Labels 
NOT Fields. There is no Label loaded at the moment, wether it is not selected 
any Field or there is no Label for this Language for that Field defined.</entry>
   <entry key="360">export</entry>
   <entry key="361">You need to logout to see any changes.</entry>
@@ -381,10 +361,6 @@
   <entry key="365">نام</entry>
   <entry key="366">زبان افزودن</entry>
   <entry key="367">پشتيبان</entry>
-  <entry key="368">اولين به بازگشت</entry>
-  <entry key="369">قبلي به بازگشت</entry>
-  <entry key="370">بعدي به رفتن</entry>
-  <entry key="371">آخر به رفتن</entry>
   <entry key="372">كاربر گفتگوي (By clicking here you can give 
exclusive audio / mute the microphone of others)</entry>
   <entry key="373">صدا كردن خاموش/روشن</entry>
   <entry key="374">سيستم</entry>
@@ -416,7 +392,6 @@
   <entry key="400"></entry>
   <entry key="401">:اطاق اين در كاربر</entry>
   <entry key="402">بيني باز</entry>
-  <entry key="403">This Room is Full. Try again in a few minutes.</entry>
   <entry key="404">click on a room to get details</entry>
   <entry key="405">Chat with the users in this Room:</entry>
   <entry key="406">:اطاق</entry>
@@ -546,12 +521,8 @@
   <entry key="530">:از اعتبار</entry>
   <entry key="531">:تا اعتبار</entry>
   <entry key="532">آنلاين كلاس به دعوت</entry>
-  <entry key="533">Not Invitation availible for this Invitation-Code</entry>
-  <entry key="534">The Invitation was already used. This type of Invitation 
cannot be re-used.</entry>
-  <entry key="535">This Invitation-Code is not valid.</entry>
   <entry key="536">:عبور رمز</entry>
   <entry key="537">Check Password</entry>
-  <entry key="538">Invalid Password!</entry>
   <entry key="539">گذاشتن اجرا به</entry>
   <entry key="540">بصري /سمعي بودن مطابق</entry>
   <entry key="541">Login was correct, but the Session you tried is not active 
or stored on the Server. You have to get a new SessionId and retry 
login.</entry>
@@ -671,18 +642,12 @@
   <entry key="660">Add or delete Users or Rooms within your 
Organization</entry>
   <entry key="661">Do you really want to delete this record?</entry>
   <entry key="662">Do you really want to delete this user from your 
organization? You will only delete the connection between the user and your 
organization, to really delete the user itself you have to login into the 
Administration-Panel.</entry>
-  <entry key="663">You cannot delete your own User!</entry>
-  <entry key="664">This Method needs a Adminstration Account to be 
invoked!</entry>
-  <entry key="665">There was no Session associated with this ID.</entry>
-  <entry key="666">This is an Administrator or Moderator account. You can only 
edit this account through the Administration Panel.</entry>
   <entry key="667">To complete your registration please click on the following 
link. Or copy the URL to your browser bar.</entry>
   <entry key="668">Click to verify your E-Mail</entry>
   <entry key="669">No user was found for this Hash.</entry>
   <entry key="670">This user is already activated!</entry>
   <entry key="671">You did successfully activate your account!</entry>
   <entry key="672">Login Now</entry>
-  <entry key="673">Your account is not activated. First use the link in the 
Email you've received during registration.</entry>
-  <entry key="674">You successfully signed up. We've send an EMail with a 
verification Code to your Mail. Please check your Inbox.</entry>
   <entry key="675">Remove Moderation Role from this User</entry>
   <entry key="676">Grant Moderation Rights to this User</entry>
   <entry key="677">User</entry>
@@ -794,7 +759,6 @@
   <entry key="784">Apply for moderation</entry>
   <entry key="785">Apply for whiteboard access</entry>
   <entry key="786">Apply for camera/microphone access</entry>
-  <entry key="787">This Session Hash was already used. You cannot use it 
twice.</entry>
   <entry key="788">START</entry>
   <entry key="789">EXIT</entry>
   <entry key="790">Do you really want to exit? You might should clear uploaded 
documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
   <entry key="805">Plan a Meeting</entry>
   <entry key="806">To set up a conference you can add a new Event in the 
Calendar.</entry>
   <entry key="807">Need help?</entry>
-  <entry key="808">Restricted</entry>
   <entry key="809">Search</entry>
   <entry key="810">Add</entry>
   <entry key="811">There is no User selected. Please select an item from the 
list first and then hit add.</entry>
@@ -923,7 +886,6 @@
   <entry key="917">The recording for this interview is already started!</entry>
   <entry key="918">Cancel</entry>
   <entry key="919">The post-processing of an interview takes 5 minutes per 1 
minute interview. The current progress of the interview post-processing 
transcoding is:</entry>
-  <entry key="920">You have to enter your password again to auto create the 
SIP Data</entry>
   <entry key="921">Re-generate SIP Data</entry>
   <entry key="922">You cannot move this file or folder into its own sub 
folder!</entry>
   <entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
   <entry key="997">Invoice</entry>
   <entry key="998"></entry>
   <entry key="999">You need to buy a volume flatrate to be able to send 
invitations or create meetings via the calendar. With Pay-per-minute it is only 
possible for you to access {0}. You cannot allow 3th Parties to access a 
Meeting.</entry>
-  <entry key="1000">This Email is already used by another User.</entry>
   <entry key="1001">SIP-Settings</entry>
   <entry key="1002">The Conference Number and PIN is automatically created via 
the OpenXG RPC-Gateway</entry>
   <entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
   <entry key="1192">Hi,</entry>
   <entry key="1193">would like to add you as contact.</entry>
   <entry key="1194">Check your contact requests in {0} or click on those links 
to accept or deny the request</entry>
-  <entry key="1195">This user is already in your contact list or has received 
an invitation to your contact list that is not answered yet.</entry>
   <entry key="1196">Your contact list</entry>
   <entry key="1197">Edit your contact and messages,&lt;br/&gt; manage your 
pending contacts!</entry>
   <entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
   <entry key="1223">Sent</entry>
   <entry key="1224">Trash</entry>
   <entry key="1225">This is you! You cannot add yourself as your own 
contact.</entry>
-  <entry key="1226">The user is already denied!</entry>
-  <entry key="1227">The user is already approved!</entry>
-  <entry key="1228">This user contact hash is invalid!</entry>
   <entry key="1229">User added to contact list!</entry>
   <entry key="1230">User denied as contact and removed from pending contact 
list!</entry>
-  <entry key="1231">There is no such contact!</entry>
   <entry key="1232">Would you really like to remove that contact?</entry>
   <entry key="1233">Confirm contact removal</entry>
   <entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
   <entry key="1268">The user does not share his personal contact data.</entry>
   <entry key="1269">The user does share his personal contact data only to 
contacts.</entry>
   <entry key="1270">Address &amp; Phone</entry>
-  <entry key="1271">You invitation code is no valid, the code is only valid 
during this specific date and time:</entry>
   <entry key="1272">This event is connected to several calendars of other 
users. Your change will also update their calendar. Would you really like to 
update the event?</entry>
   <entry key="1273">Confirm update</entry>
   <entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
   <entry key="1303">Reply</entry>
   <entry key="1304">Rooms and chats</entry>
   <entry key="1305">My rooms</entry>
-  <entry key="1306">My conference room (for 1-16 users)</entry>
-  <entry key="1307">My webinar room (for 1-120 users)</entry>
   <entry key="1308">Owner Id</entry>
-  <entry key="1309">Please enter a password</entry>
-  <entry key="1310">You need an account with User-Level User, Moderator or 
Admin</entry>
   <entry key="1311">Web-Service (only access via SOAP)</entry>
   <entry key="1312">Do directly load to whiteboard</entry>
   <entry key="1313">Do you really want to remove this whiteboard? This action 
cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
   <entry key="1413">active</entry>
   <entry key="1414">Simple Chart</entry>
   <entry key="1415">Pie Chart</entry>
-  <entry key="1416">Please enter email</entry>
   <entry key="1417">New message(s)</entry>
   <entry key="1418">Close Poll</entry>
   <entry key="1419">Are you sure you want to close this Poll? No one will be 
able to vote</entry>
@@ -1434,7 +1384,6 @@
   <entry key="1428">Give a permission for exclusive audio.</entry>
   <entry key="1429">Cam resolution</entry>
   <entry key="1430">Changing the resolution affects bandwidth, bigger picture 
needs more bandwith!</entry>
-  <entry key="1431">You don't have the right to give yourself or others 
exclusive audio. You need to apply for the right from the moderator or ask the 
moderator to give you exclusive audio.</entry>
   <entry key="1432">I would like to get the right for exclusive audio</entry>
   <entry key="1433">Give exclusive audio to me (alternatively click on your 
video pod or press F12)</entry>
   <entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
   <entry key="1537">Include uploaded files and recordings in backup</entry>
   <entry key="1538">Enable SIP transport in the room</entry>
   <entry key="1539">Do you really want to provide this user an exclusive 
audio?</entry>
-  <entry key="1540">Please specify your timezone</entry>
-  <entry key="1544">Configuration with given key already exists, please 
specify another key or edit existent configuration</entry>
   <entry key="1545">Content is Saving, Please wait.</entry>
   <entry key="1546">Welcome</entry>
   <entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
   <entry key="1605">Remove audio of this user</entry>
   <entry key="1606">I would like to share my audio</entry>
   <entry key="1607">You are allowed to share your audio</entry>
+       <entry key="error.unknown">Unknown error. Please report this to the 
administrator.</entry>
+       <entry key="error.bad.credentials">Username/email and/or password are 
incorrect.</entry>
+       <entry key="error.short.login">Login is too short</entry>
+       <entry key="error.reg.disabled">Registration disabled</entry>
+       <entry key="error.login.inuse">The username is already used</entry>
+       <entry key="error.email.inuse">The mail address is already 
registered</entry>
+       <entry key="error.notallowed">Admin Authorization required</entry>
+       <entry key="error.hash.used">The Invitation was already used. This type 
of Invitation cannot be re-used.</entry>
+       <entry key="error.hash.invalid">This Invitation-Code is not 
valid.</entry>
+       <entry key="error.hash.period">You invitation code is not valid, the 
code is only valid during this specific date and time:</entry>
+       <entry key="error.bad.password">Invalid Password!</entry>
+       <entry key="error.nogroup">User is not assigned to group.</entry>
+       <entry key="error.notactivated">Your account is not activated. First 
use the link in the Email you've received during registration.</entry>
+       <entry key="error.contact.added">This user is already in your contact 
list or has received an invitation to your contact list that is not answered 
yet.</entry>
+       <entry key="error.contact.denied">The user is already denied.</entry>
+       <entry key="error.contact.approved">The user is already 
approved.</entry>
+       <entry key="error.cfg.exist">Configuration with given key already 
exists, please specify another key or edit existent configuration</entry>
+       <entry key="warn.nogroup">User added but you need to assign this User 
to an Organisation, otherwise he won't be able to sign-in.</entry>
+       <entry key="warn.notverified">You successfully signed up. We've send an 
EMail with a verification Code to your Mail. Please check your Inbox.</entry>
+       <entry key="account.created">است شده ايجاد شما 
اكانت</entry>
        <entry key="install.wizard.install.header">Installation</entry>
        <entry key="install.wizard.welcome.panel"><![CDATA[
        <ol>
@@ -1774,25 +1741,25 @@
        <entry key="install.wizard.congrats.mail">Mailing list</entry>
        <entry key="install.wizard.congrats.commercial">There are some companies
                        that also offer commercial support for Apache 
OpenMeetings:</entry>
-  <entry key="room.type.conference">conference (1-25 users)</entry>
-  <entry key="room.type.restricted">restricted (1-150 users)</entry>
-  <entry key="room.type.interview">interview (1:1 meeting with 
recording)</entry>
-  <entry key="room.type.conference.desc">"democratic" by default, every user 
can directly enable audio/video without need for asking</entry>
-  <entry key="room.type.restricted.desc">"restricted" by default: Every 
regular user will need to ask if he wants to share audio/video</entry>
-  <entry key="room.type.interview.desc">only 2 users can have audio/video 
enabled (more users can be in the room and you can switch the audio/video 
between them of course)</entry>
-  <entry key="appointment.reminder.none">do not send notification</entry>
-  <entry key="appointment.reminder.email">simple email</entry>
-  <entry key="appointment.reminder.ical">iCal email</entry>
-  <entry key="user.salutation.mr">Mr.</entry>
-  <entry key="user.salutation.ms">Ms.</entry>
-  <entry key="user.salutation.mrs">Mrs.</entry>
-  <entry key="user.salutation.dr">Dr.</entry>
-  <entry key="user.salutation.prof">Prof</entry>
-  <entry key="error.type.error">خطا</entry>
-  <entry key="error.type.info">پيام</entry>
-  <entry key="poll.type.yesNo">خير/بله</entry>
-  <entry key="poll.type.numeric">1-10 اعداد</entry>
-  <entry key="wizard.button.finish">Finish</entry>
+       <entry key="room.type.conference">conference (1-25 users)</entry>
+       <entry key="room.type.presentation">presentation (1-150 users)</entry>
+       <entry key="room.type.interview">interview (1:1 meeting with 
recording)</entry>
+       <entry key="room.type.conference.desc">"democratic" by default, every 
user can directly enable audio/video without need for asking</entry>
+       <entry key="room.type.presentation.desc">"restricted" by default: Every 
regular user will need to ask if he wants to share audio/video</entry>
+       <entry key="room.type.interview.desc">only 2 users can have audio/video 
enabled (more users can be in the room and you can switch the audio/video 
between them of course)</entry>
+       <entry key="appointment.reminder.none">do not send notification</entry>
+       <entry key="appointment.reminder.email">simple email</entry>
+       <entry key="appointment.reminder.ical">iCal email</entry>
+       <entry key="user.salutation.mr">Mr.</entry>
+       <entry key="user.salutation.ms">Ms.</entry>
+       <entry key="user.salutation.mrs">Mrs.</entry>
+       <entry key="user.salutation.dr">Dr.</entry>
+       <entry key="user.salutation.prof">Prof</entry>
+       <entry key="error.type.error">خطا</entry>
+       <entry key="error.type.info">پيام</entry>
+       <entry key="poll.type.yesNo">خير/بله</entry>
+       <entry key="poll.type.numeric">1-10 اعداد</entry>
+       <entry key="wizard.button.finish">Finish</entry>
        <entry key="main.menu.admin.email">Email management</entry>
        <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
        <entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
        <entry key="install.room.public.conference">Public Conference 
Room</entry>
        <entry key="install.room.public.video.only">Public Video Only 
Room</entry>
        <entry key="install.room.public.video.wb">Public Video And Whiteboard 
Room</entry>
-       <entry key="install.room.public.restricted">Public Restricted 
Room</entry>
-       <entry key="install.room.restricted.micro">Restricted room with 
microphone option set</entry>
+       <entry key="install.room.public.presentation">Public Presentation 
Room</entry>
+       <entry key="install.room.presentation.micro">Presentation room with 
microphone option set</entry>
        <entry key="install.room.conference.micro">Conference room with 
microphone option set</entry>
        <entry key="install.room.private.conference">Private Conference 
Room</entry>
        <entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
        <entry key="download.pdf">Download as PDF</entry>
        <entry key="zoom.fullFit">Full-Fit</entry>
        <entry key="zoom.pageWidth">Page Width</entry>
+       <entry key="my.room.conference">My conference room (for 1-16 
users)</entry>
+       <entry key="my.room.presentation">My presentation room (for 1-120 
users)</entry>
+       <entry key="goto.first">اولين به بازگشت</entry>
+       <entry key="goto.prev">قبلي به بازگشت</entry>
+       <entry key="goto.next">بعدي به رفتن</entry>
+       <entry key="goto.last">آخر به رفتن</entry>
 </properties>