svn commit: r1713575 [3/7] - in /openmeetings: branches/3.1.x/ branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ branches/3.1.x/ope...

[so...@apache.org]

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Informació: descripció d'enquesta.</entry>
   <entry key="24">Crear enquesta</entry>
   <entry key="25">Cancel·lar</entry>
-  <entry key="26">Sí/No</entry>
-  <entry key="27">Valor numèric [1-10]</entry>
   <entry key="28">Enquesta</entry>
   <entry key="29">És necessita ser moderador per crear una enquesta.</entry>
   <entry key="30">El seu vot ha sigut registrat</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Anar a l'última pàgina</entry>
   <entry key="259">Disminuir Zoom</entry>
   <entry key="260">Aumentar Zoom</entry>
-  <entry key="261">Sr.</entry>
-  <entry key="262">Sra.</entry>
   <entry key="263">Configuració</entry>
   <entry key="264">ID</entry>
   <entry key="265">Clau</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Enquestes</entry>
   <entry key="320">No hi ha ningú connectat amb aquest nom d'usuari</entry>
   <entry key="321">El email conté un enllaç especial que ha estat enviat al seu correu. Si no apareix aquest correu revisi la configuració de filtres de spam del seu servidor i reenvée aquest correu novament.</entry>
-  <entry key="322">Error</entry>
-  <entry key="323">Missatge</entry>
   <entry key="324">No es va trobar a l'usuari (mètode de generació de claus incorrecte).</entry>
   <entry key="325">Generar contrasenya</entry>
   <entry key="326">Entrar</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Aquest usuari té el rol de supermoderador. No pot llevar-li la marca de moderació a un supermoderador.</entry>
   <entry key="839">¿Realment desitja esborrar aquest Fitxer/Directori?</entry>
   <entry key="840">¿Esborrar Fitxer/Directori ?</entry>
-  <entry key="841">Sra.</entry>
-  <entry key="842">D.</entry>
   <entry key="843">Propietats</entry>
   <entry key="844">Mostrar la posició del ratolí als participants</entry>
   <entry key="845">Compartir Àudio amb el applet SIP</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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">Sr.</entry>
+  <entry key="user.salutation.ms">Sra.</entry>
+  <entry key="user.salutation.mrs">Sra.</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">Missatge</entry>
+  <entry key="poll.type.yesNo">Sí/No</entry>
+  <entry key="poll.type.numeric">Valor numèric [1-10]</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Všichni připojení uživatelé obdrželi zprávu o nové anketě.</entry>
   <entry key="24">Vytvoř anketu</entry>
   <entry key="25">Zrušit</entry>
-  <entry key="26">Ano/Ne</entry>
-  <entry key="27">Čísla 1-10</entry>
   <entry key="28">Anketa</entry>
   <entry key="29">Pro vytvoření otázky musíte být moderátor</entry>
   <entry key="30">Vaše hlasování bylo uloženo.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Poslední strana</entry>
   <entry key="259">Zmenši --</entry>
   <entry key="260">Zvětši ++</entry>
-  <entry key="261">Pan</entry>
-  <entry key="262">Paní/slečna</entry>
   <entry key="263">Konfigurace</entry>
   <entry key="264">ID</entry>
   <entry key="265">Klíč</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Zadejte prosím mail, nebo uživatelské jméno</entry>
   <entry key="320">Takový uživatelský účet neexistuje</entry>
   <entry key="321">Email obsahuje speciální odkaz, skontrolujte Vaši schránku. Pokud jste mail neobdrželi, skontrolujte nastavení antispamového filtru a pošlete mail znovu.</entry>
-  <entry key="322">Chyba</entry>
-  <entry key="323">Zpráva</entry>
   <entry key="324">Špatný Hash. Uživatel nenalezen.</entry>
   <entry key="325">Reset Vašeho hesla</entry>
   <entry key="326">Login</entry>
@@ -860,8 +854,6 @@
   <entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
   <entry key="839">Do you really want to delete this File/Folder?</entry>
   <entry key="840">Delete File/Folder?</entry>
-  <entry key="841">Mrs.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Properties</entry>
   <entry key="844">Show mouse position to viewers</entry>
   <entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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">Pan</entry>
+  <entry key="user.salutation.ms">Paní/slečna</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">Chyba</entry>
+  <entry key="error.type.info">Zpráva</entry>
+  <entry key="poll.type.yesNo">Ano/Ne</entry>
+  <entry key="poll.type.numeric">Čísla 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">INFO: Alle tilsluttede brugere får tilsendt en meddelelse med den nye afstemning.</entry>
   <entry key="24">Opret afstemning</entry>
   <entry key="25">Annuller</entry>
-  <entry key="26">Ja/Nej</entry>
-  <entry key="27">Numerisk 1-10</entry>
   <entry key="28">Stem</entry>
   <entry key="29">Du skal vare moderator for at kunne oprette en afstemning</entry>
   <entry key="30">Din afstemning er accepteret</entry>
@@ -280,8 +278,6 @@
   <entry key="258">GÃ¥ til sidste side</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">Hr.</entry>
-  <entry key="262">Fr.</entry>
   <entry key="263">Konfiguration</entry>
   <entry key="264">ID</entry>
   <entry key="265">Nøgle</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Indsæt venligst emailadresse eller brugernavn</entry>
   <entry key="320">Ingen bruger er forbundet med dette brugernavn</entry>
   <entry key="321">Emailen med det specielle link er blevet sendt til din emailadresse. Kontroller venligst din indbakke. Hvis du ikke har modtaget en email, bedes du kontrollere dint SPAM-filter og genfremsende emailen fra systemet.</entry>
-  <entry key="322">Fejl</entry>
-  <entry key="323">Meddelelse</entry>
   <entry key="324">Forkert HASH. Ingen bruger fundet.</entry>
   <entry key="325">Nulstil din adgangskode</entry>
   <entry key="326">Login</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Denne bruger er en Super moderator. Du kan ikke fjerne moderator flaget fra en Super moderator!</entry>
   <entry key="839">Vil du virkelig slette denne fil/mappe?</entry>
   <entry key="840">Slet fil/mappe?</entry>
-  <entry key="841">Fr.</entry>
-  <entry key="842">Hr.</entry>
   <entry key="843">Egenskaber</entry>
   <entry key="844">Vis musens position for brugerne</entry>
   <entry key="845">Del lyd med SIP Appletten</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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">Hr.</entry>
+  <entry key="user.salutation.ms">Fr.</entry>
+  <entry key="user.salutation.mrs">Fr.</entry>
+  <entry key="user.salutation.dr">Hr.</entry>
+  <entry key="user.salutation.prof">Prof</entry>
+  <entry key="error.type.error">Fejl</entry>
+  <entry key="error.type.info">Meddelelse</entry>
+  <entry key="poll.type.yesNo">Ja/Nej</entry>
+  <entry key="poll.type.numeric">Numerisk 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Jeder verbundene Benutzer erhält eine Nachricht mit der neuen Umfrage.</entry>
   <entry key="24">Umfrage anlegen</entry>
   <entry key="25">Abbrechen</entry>
-  <entry key="26">Ja/Nein</entry>
-  <entry key="27">Numerisch 1-10</entry>
   <entry key="28">Umfrage</entry>
   <entry key="29">Sie müssen Moderator/Lehrer in diesem Raum sein, um eine Umfrage anzulegen.</entry>
   <entry key="30">Ihr Stimme wurde abgegeben.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">zur letzten Seite springen</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">Herr</entry>
-  <entry key="262">Frau</entry>
   <entry key="263">Konfiguration</entry>
   <entry key="264">ID</entry>
   <entry key="265">Schlüssel</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Geben Sie bitte entweder eine E-Mail oder einen Login an.</entry>
   <entry key="320">Es gibt keinen Benutzer mit diesem Benutzernamen.</entry>
   <entry key="321">Die E-Mail mit dem dazugehörigen Link wurde an Ihre E-Mail-Adresse gesandt. Bitte überprüfen Sie Ihren Posteingang. Falls Sie immer noch keine E-Mail erhalten haben, korrigieren Sie bitte Ihre Spam-Einstellungen und senden Sie die E-Mail nochmals.</entry>
-  <entry key="322">Fehler!</entry>
-  <entry key="323">Nachricht</entry>
   <entry key="324">Ungültiger Hash.</entry>
   <entry key="325">Passwort zurücksetzen</entry>
   <entry key="326">Login</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Dies ist ein Super-Moderator. Sie können die Moderationsrechte dem Nutzer nicht entziehen!</entry>
   <entry key="839">Wollen Sie wirklich diese Datei oder Ordner löschen?</entry>
   <entry key="840">Datei/Ordner löschen?</entry>
-  <entry key="841">Fräulein</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Einstellungen</entry>
   <entry key="844">Teilnehmern Mauszeiger anzeigen</entry>
   <entry key="845">Audio mit SIP Applet übertragen</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import von Systemsicherungen</entry>
   <entry key="1462">Sie verfügen nicht über die erforderlichen Berechtigungen für diese Funktion</entry>
   <entry key="1463">Text bearbeiten</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Veröffentlichen</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <entry key="1538">Aktivieren Sie SIP-Verkehr im Raum</entry>
   <entry key="1539">Wollen Sie wirklich diesem Benutzer exklusive Audiorechte geben?</entry>
   <entry key="1540">Please specify your timezone</entry>
-  <entry key="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1879,4 +1864,19 @@
 	<entry key="install.wizard.congrats.mail">Mailingliste</entry>
 	<entry key="install.wizard.congrats.commercial"><![CDATA[Einige Unternehmen bieten kommerziellen Support
 		f&uuml;r Apache OpenMeetings an:]]></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="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">Herr</entry>
+  <entry key="user.salutation.ms">Frau</entry>
+  <entry key="user.salutation.mrs">Fräulein</entry>
+  <entry key="user.salutation.dr">Dr.</entry>
+  <entry key="user.salutation.prof">Prof</entry>
+  <entry key="error.type.error">Fehler!</entry>
+  <entry key="error.type.info">Nachricht</entry>
+  <entry key="poll.type.yesNo">Ja/Nein</entry>
+  <entry key="poll.type.numeric">Numerisch 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Ενημέρωση: Κάθε συνδεδεμένος Χρήστης λαμβάνει ένα μήνυμα με τη νέα Ψηφοφορία.</entry>
   <entry key="24">Δημιουργία Ψηφοφορίας</entry>
   <entry key="25">Ακύρωση</entry>
-  <entry key="26">Ναι/Όχι</entry>
-  <entry key="27">Αριθμός 1-10</entry>
   <entry key="28">Ψηφοφορία</entry>
   <entry key="29">Μόνο ο Συντονιστής μπορεί να δημιουργεί Ερωτήσεις!</entry>
   <entry key="30">Η Ψήφος σας καταχωρήθηκε.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Μεταφορά στην Τελευταία Σελίδα</entry>
   <entry key="259">Εστίαση --</entry>
   <entry key="260">Εστίαση ++</entry>
-  <entry key="261">Κος</entry>
-  <entry key="262">Κα</entry>
   <entry key="263">Διαμόρφωση</entry>
   <entry key="264">ID</entry>
   <entry key="265">Κλειδί</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Παρακαλούμε εισάγετε Διεύθυνση Email ή Όνομα Χρήστη</entry>
   <entry key="320">Δεν βρέθηκε Χρήστης που να αντιστοιχεί στο συγκεκριμένο Όνομα Χρήστη!</entry>
   <entry key="321">Ένα mail με Ειδικό Σύνδεσμο έχει σταλεί στη διεύθυνση Email σας. Παρακαλούμε ελέγξτε το ταχυδρομείο σας. Αν δεν έχετε λάβει ακόμα mail, παρακαλούμε προσαρμόστε τις ρυθμίσεις spam του ταχυδρομείου σας και επαναλάβατε την αποστολή του mail Επιβεβαίωσης.</entry>
-  <entry key="322">Μήνυμα</entry>
-  <entry key="323">Μήνυμα</entry>
   <entry key="324">Μη Έγκυρη Τιμή Hash! Δεν βρέθηκαν Χρήστες.</entry>
   <entry key="325">Αλλάξτε τον Κωδικό σας</entry>
   <entry key="326">Login</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Αυτός ο Χρήστης είναι Ανώτερος Συντονιστής! Δεν μπορείτε να αφαιρέσετε το Σήμα Συντονισμού από έναν Ανώτερο Συντονιστή!</entry>
   <entry key="839">Θέλετε πραγματικά να διαγράψετε το συγκεκριμένο Αρχείο/Φάκελο;</entry>
   <entry key="840">Διαγραφή Αρχείου/Φακέλου;</entry>
-  <entry key="841">Δις.</entry>
-  <entry key="842">Δρ.</entry>
   <entry key="843">Ιδιότητες</entry>
   <entry key="844">Εμφάνιση θέσης ποντικιού στους θεατές</entry>
   <entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Información: cada usuario conectado recibe un mensaje con la nueva encuesta.</entry>
   <entry key="24">Crear encuesta</entry>
   <entry key="25">Cancelar</entry>
-  <entry key="26">Sí/No</entry>
-  <entry key="27">Valor numérico [1-10]</entry>
   <entry key="28">Encuesta</entry>
   <entry key="29">Se necesita ser moderador para crear una encuesta.</entry>
   <entry key="30">Su voto ha sido registrado</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Ir a la última página</entry>
   <entry key="259">Disminuir Zoom</entry>
   <entry key="260">Aumentar Zoom</entry>
-  <entry key="261">Sr.</entry>
-  <entry key="262">Sra.</entry>
   <entry key="263">Configuración</entry>
   <entry key="264">ID</entry>
   <entry key="265">Clave</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Escriba o su correo o su nombre de usuario</entry>
   <entry key="320">No hay ningún usuario con ese nombre</entry>
   <entry key="321">Se le ha enviado un correo con un enlace especial. Si no aparece este correo revise la configuración de filtros de spam de su servidor y reenvée este correo nuevamente.</entry>
-  <entry key="322">Error</entry>
-  <entry key="323">Mensaje</entry>
   <entry key="324">No se encontró al usuario (método de generación de claves incorrecto).</entry>
   <entry key="325">Generar contraseña</entry>
   <entry key="326">Inicio</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Este usuario tiene el rol de supermoderador. No puede quitarle la marca de moderación a un supermoderador.</entry>
   <entry key="839">¿Realmente desea borrar este Archivo/Directorio?</entry>
   <entry key="840">¿Borrar archivo/directorio?</entry>
-  <entry key="841">Dña.</entry>
-  <entry key="842">D.</entry>
   <entry key="843">Propiedades</entry>
   <entry key="844">Mostrar la posición del ratón a los participantes</entry>
   <entry key="845">Compartir audio con el applet SIP</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Exportar/Importar Backups del Sistema</entry>
   <entry key="1462">Usted necesita la moderación o el derecho para dibujar en la pizarra, subir, añadir, suprimir o cargar archivos y carpetas.</entry>
   <entry key="1463">Editar texto</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publicar</entry>
   <entry key="1466">Comenzar Publicación</entry>
   <entry key="1467">Finalizar Publicación</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conferencia (1-25 usuarios)</entry>
-  <entry key="1542">restringida (1-150 usuarios)</entry>
-  <entry key="1543">interview (1:1 reunión con grabación)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dic</entry>
-  <entry key="1568">no envíe notificación</entry>
-  <entry key="1569">correo simple</entry>
-  <entry key="1570">iCal correo</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Administrar configuraciones de OAuth2</entry>
   <entry key="1573">Nombre</entry>
@@ -1865,4 +1850,19 @@
 	<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="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>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">اطلاعات پيام</entry>
   <entry key="24">سنجي نظر يك ايجاد</entry>
   <entry key="25">انصراف</entry>
-  <entry key="26">خير/بله</entry>
-  <entry key="27">1-10 اعداد</entry>
   <entry key="28">سنجي نظر</entry>
   <entry key="29">اعتدال</entry>
   <entry key="30">راي</entry>
@@ -280,8 +278,6 @@
   <entry key="258">آخر صفحه به رفتن</entry>
   <entry key="259">-- زوم</entry>
   <entry key="260">++ زوم</entry>
-  <entry key="261">Mr.</entry>
-  <entry key="262">Ms.</entry>
   <entry key="263">موقعيت</entry>
   <entry key="264">شناسه</entry>
   <entry key="265">راهنما</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Please enter either a Mail or a Username</entry>
   <entry key="320">There is no User connected to this Username</entry>
   <entry key="321">The email containing a special link has been sent to your email address, please check your mailbox. If you still have not received a email, please adjust your email spam settings and resend confirmation email.</entry>
-  <entry key="322">خطا</entry>
-  <entry key="323">پيام</entry>
   <entry key="324">Invalid Hash. No User found.</entry>
   <entry key="325">Reset Your Password</entry>
   <entry key="326">ارتباط قطع</entry>
@@ -860,8 +854,6 @@
   <entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
   <entry key="839">Do you really want to delete this File/Folder?</entry>
   <entry key="840">Delete File/Folder?</entry>
-  <entry key="841">Mrs.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Properties</entry>
   <entry key="844">Show mouse position to viewers</entry>
   <entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Tiedoksi: Jokainen paikalla oleva käyttäjä vastaanottaa viestin kyselystä.</entry>
   <entry key="24">Luo kysely</entry>
   <entry key="25">Peruuta</entry>
-  <entry key="26">Kyllä/Ei</entry>
-  <entry key="27">Numeerinen 1-10</entry>
   <entry key="28">Kysely</entry>
   <entry key="29">Sinun täytyy olla moderaattori luodaksesi kysymyksen.</entry>
   <entry key="30">Äänesi on rekisteröity.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Mene viimeiselle sivulle</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">Herra</entry>
-  <entry key="262">Rouva</entry>
   <entry key="263">Asetukset</entry>
   <entry key="264">ID</entry>
   <entry key="265">Avain</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Anna sähköpostiosoite tai käyttäjätunnus</entry>
   <entry key="320">Käyttäjätunnusta ei ole</entry>
   <entry key="321">Linkin sisältävä sähköposti on lähetetty osoitteeseesi, ole hyvä ja tarkista sähköpostisi. Jos et ole vielä vastaanottanut viestiä, tarkista roskapostiasetuksesi ja yritä uudestaan.</entry>
-  <entry key="322">Virhe</entry>
-  <entry key="323">Viesti</entry>
   <entry key="324">Epäkelpo hash. Käyttäjää ei löydy.</entry>
   <entry key="325">Nollaa salasanasi</entry>
   <entry key="326">Kirjaudu</entry>
@@ -860,8 +854,6 @@
   <entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
   <entry key="839">Do you really want to delete this File/Folder?</entry>
   <entry key="840">Delete File/Folder?</entry>
-  <entry key="841">Mrs.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Properties</entry>
   <entry key="844">Show mouse position to viewers</entry>
   <entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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">Herra</entry>
+  <entry key="user.salutation.ms">Rouva</entry>
+  <entry key="user.salutation.mrs">Mrs.</entry>
+  <entry key="user.salutation.dr">Dr.</entry>
+  <entry key="prof">Prof</entry>
+  <entry key="error.type.error">Virhe</entry>
+  <entry key="error.type.info">Viesti</entry>
+  <entry key="poll.type.yesNo">Kyllä/Ei</entry>
+  <entry key="poll.type.numeric">Numeerinen 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info : Chaque utilisateur reçoit le nouveau sondage.</entry>
   <entry key="24">Créer un sondage</entry>
   <entry key="25">Annuler</entry>
-  <entry key="26">Oui/Non</entry>
-  <entry key="27">Numérique 1-10</entry>
   <entry key="28">Sondage</entry>
   <entry key="29">Vous devez être modérateur pour créer un sondage.</entry>
   <entry key="30">Votre vote est enregistré.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Aller à la dernière page</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">M.</entry>
-  <entry key="262">Mme.</entry>
   <entry key="263">Configuration</entry>
   <entry key="264">ID</entry>
   <entry key="265">Clé</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Entrez votre e-mail ou nom d'utilisateur</entry>
   <entry key="320">Il n'y a pas d'utilisateur avec ce nom</entry>
   <entry key="321">Un e-mail contenant un lien vous a été envoyé. Si vous n'avez pas reçu d'e-mail, vérifiez votre antispam et redemandez une confirmation.</entry>
-  <entry key="322">Quitter</entry>
-  <entry key="323">Message</entry>
   <entry key="324">Hachage non valide. Pas d'utilisateur trouvé.</entry>
   <entry key="325">Changez votre mot de passe</entry>
   <entry key="326">Login</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Cet utilisateur est un super-modérateur. Vous ne pouvez pas enlever la modération à un super-modérateur !</entry>
   <entry key="839">Voulez-vous réellement supprimer ce fichier/dossier ?</entry>
   <entry key="840">Supprimer Fichier/Dossier ?</entry>
-  <entry key="841">Mlle.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Propriétés</entry>
   <entry key="844">Montrer la souris sur l'écran</entry>
   <entry key="845">Partager l'audio avec l'applet SIP</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Exporter/Importer les sauvegardes système</entry>
   <entry key="1462">Vous devez être modérateur ou avoir le droit d'accéder au tableau blanc pour pouvoir déposer ou télécharger des fichiers ou pour ajouter ou supprimer des dossiers.</entry>
   <entry key="1463">Editer texte</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publier</entry>
   <entry key="1466">Commencer la diffusion</entry>
   <entry key="1467">Arrêter la diffusion</entry>
@@ -1560,9 +1551,6 @@
   <entry key="1538">Activer le transport SIP dans la salle</entry>
   <entry key="1539">Voulez-vous vraiment donner l'audio exclusif à cet utilisateur ?</entry>
   <entry key="1540">Veuillez spécifier votre fuseau horaire</entry>
-  <entry key="1541">conférence (1-25 utilisateurs)</entry>
-  <entry key="1542">restreint (1-150 utilisateurs)</entry>
-  <entry key="1543">interview (1:1 réunion avec enregistrement)</entry>
   <entry key="1544">Une configuration avec cette clé existe déjà, veuillez spécifier une autre clé ou éditer la configuration existante</entry>
   <entry key="1545">Sauvegarde, veuillez patienter.</entry>
   <entry key="1546">Bienvenue</entry>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1835,4 +1820,19 @@
 	<entry key="install.wizard.congrats.mail">Liste de diffusion</entry>
 	<entry key="install.wizard.congrats.commercial">Il existe des sociétés
 		qui offrent un support commercial pour Apache OpenMeetings :</entry>
+  <entry key="room.type.conference">conférence (1-25 utilisateurs)</entry>
+  <entry key="room.type.restricted">restreint (1-150 utilisateurs)</entry>
+  <entry key="room.type.interview">interview (1:1 réunion avec enregistrement)</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">M.</entry>
+  <entry key="user.salutation.ms">Mme.</entry>
+  <entry key="user.salutation.mrs">Mlle.</entry>
+  <entry key="user.salutation.dr">Dr.</entry>
+  <entry key="user.salutation.prof">Prof</entry>
+  <entry key="error.type.error">Quitter</entry>
+  <entry key="error.type.info">Message</entry>
+  <entry key="poll.type.yesNo">Oui/Non</entry>
+  <entry key="poll.type.numeric">Numérique 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Información: Cada usuario conectado recibe unha mensaxe coa nova enquisa.</entry>
   <entry key="24">Crear unha enquisa</entry>
   <entry key="25">Cancelar</entry>
-  <entry key="26">Sí/Non</entry>
-  <entry key="27">Valor numérico 1-10</entry>
   <entry key="28">Enquisa</entry>
   <entry key="29">Precisase ser moderador para crear unha enquisa.</entry>
   <entry key="30">O seu voto foi rexistrado</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Ir á última páxina</entry>
   <entry key="259">Diminuir Zoom</entry>
   <entry key="260">Aumentar Zoom</entry>
-  <entry key="261">Sr.</entry>
-  <entry key="262">Sra.</entry>
   <entry key="263">Configuración</entry>
   <entry key="264">ID</entry>
   <entry key="265">Chave</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Escriba o seu correo-e ou o nome de usuario</entry>
   <entry key="320">Non hai ningun usuario con este nome</entry>
   <entry key="321">Enviouselle un correo-e cunha ligazón especial, revise a súa bandexa de entrada de correo. Se non atopa este correo revise a configuración de spam do seu servidor e reenvie o correo de confirmación.</entry>
-  <entry key="322">Erro</entry>
-  <entry key="323">Mensaxe</entry>
   <entry key="324">Non se atopou ó usuario (hash incorrecto).</entry>
   <entry key="325">Xerar contrasinal</entry>
   <entry key="326">Inicio de sesión</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Este usuario é supermoderador. Non pode quitarlle a marca de moderación a un supermoderador!</entry>
   <entry key="839">Ten a certeza de que desexa borrar este ficheiro/cartafol?</entry>
   <entry key="840">Borrar un ficheiro/cartafol?</entry>
-  <entry key="841">Dna.</entry>
-  <entry key="842">D.</entry>
   <entry key="843">Propiedades</entry>
   <entry key="844">Mostrar a posición do rato aos participantes</entry>
   <entry key="845">Compartir o son co miniaplicativo SIP</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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">Sr.</entry>
+  <entry key="user.salutation.ms">Sra.</entry>
+  <entry key="user.salutation.mrs">Dna.</entry>
+  <entry key="user.salutation.dr">D.</entry>
+  <entry key="user.salutation.prof">Prof</entry>
+  <entry key="error.type.error">Erro</entry>
+  <entry key="error.type.info">Mensaxe</entry>
+  <entry key="poll.type.yesNo">Sí/Non</entry>
+  <entry key="poll.type.numeric">Valor numérico 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Infó: Minden bejelentkezett felhasználó értesül az új szavazásról.</entry>
   <entry key="24">Szavazás létrehozása</entry>
   <entry key="25">Mégse</entry>
-  <entry key="26">Igen/Nem</entry>
-  <entry key="27">Szám 1-10</entry>
   <entry key="28">Szavazás</entry>
   <entry key="29">Előadónak kell lenned, hogy feltehess kérdést</entry>
   <entry key="30">A szavazatot elfogadtuk.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Ugrás az utolsó oldalra</entry>
   <entry key="259">Kicsinyít --</entry>
   <entry key="260">Nagyít ++</entry>
-  <entry key="261">Úr</entry>
-  <entry key="262">Hölgy</entry>
   <entry key="263">Beállítás</entry>
   <entry key="264">ID</entry>
   <entry key="265">Kulcs</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Kérlek add meg az e-mail címet vagy felhasználói nevet.</entry>
   <entry key="320">Nincs felhasználó ehhez a névhez.</entry>
   <entry key="321">A levél, amit küldtünk neked, tartalmaz egy speciális linket, ellenőrizd a postafiókodat. Ha még nem kaptad meg a levelet, állítsd be a spamszűrődet és küldd újra a megerősítő e-mail-t.</entry>
-  <entry key="322">Hiba</entry>
-  <entry key="323">Üzenet</entry>
   <entry key="324">Rossz Hash. A felhasználható nem található.</entry>
   <entry key="325">Jelszó törlése</entry>
   <entry key="326">Bejelentkező név</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Ez a felhazsnáló Super-Moderator. Nem veheti el a Super-Moderator jogot!</entry>
   <entry key="839">Biztosan törli ezt a filet/könyvtárat?</entry>
   <entry key="840">File/Könyvtár törlése?</entry>
-  <entry key="841">Mrs.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Tulajdonságok</entry>
   <entry key="844">Mutasd az egér pozíciót a nézőknek</entry>
   <entry key="845">Audio megosztása SIP alkalmazáson</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Rendszer biztonsági mentés Export/Import</entry>
   <entry key="1462">Moderátornak kell lenned, hogy létrehozhass, feltölthess, módosíthass, táblához adhass filet/könyvtárat.</entry>
   <entry key="1463">Szöveg szerkezstése</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publikáció</entry>
   <entry key="1466">Publikálás indítása</entry>
   <entry key="1467">Publikáció befejezése</entry>
@@ -1560,9 +1551,6 @@
   <entry key="1538">SIP átvitel engedélyezése a szobában</entry>
   <entry key="1539">Egyéni hangkapcsolatot kezdeményez ezzel a felhasználóval?</entry>
   <entry key="1540">Adjameg az időzónáját</entry>
-  <entry key="1541">csoportmunka (n:n) konferencia (1-25 látogatóval)</entry>
-  <entry key="1542">moderált (1:n) konferencia (1-150 látogatóval)</entry>
-  <entry key="1543">interjú (1:1 megbeszélés felvétellel)</entry>
   <entry key="1544">Konfigurációs beállító kulcs már létezik, válasszon másikat, vagy szerkessze a meglévőt</entry>
   <entry key="1545">Tartalom mentése, kérem várjon...</entry>
   <entry key="1546">Üdvözöljük</entry>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">ne küldjön értesítést</entry>
-  <entry key="1569">egyszerű e-mail</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1857,4 +1842,19 @@
 	<entry key="install.wizard.congrats.config">változtassa meg a kliens szükséges konfigurációit</entry>
 	<entry key="install.wizard.congrats.mail">Levelező lista</entry>
 	<entry key="install.wizard.congrats.commercial">Néhány cég, akik üzleti támogatást nyújthatnak Apache OpenMeetings:</entry>
+  <entry key="room.type.conference">csoportmunka (n:n) konferencia (1-25 látogatóval)</entry>
+  <entry key="room.type.restricted">moderált (1:n) konferencia (1-150 látogatóval)</entry>
+  <entry key="room.type.interview">interjú (1:1 megbeszélés felvétellel)</entry>
+  <entry key="appointment.reminder.none">ne küldjön értesítést</entry>
+  <entry key="appointment.reminder.email">egyszerű e-mail</entry>
+  <entry key="appointment.reminder.ical">iCal email</entry>
+  <entry key="user.salutation.mr">Úr</entry>
+  <entry key="user.salutation.ms">Hölgy</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">Hiba</entry>
+  <entry key="error.type.info">Üzenet</entry>
+  <entry key="poll.type.yesNo">Igen/Nem</entry>
+  <entry key="poll.type.numeric">Szám 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Catatan: Setiap user terkoneksi akan menerima pesan dangan poling baru.</entry>
   <entry key="24">Buat Poling</entry>
   <entry key="25">Batal</entry>
-  <entry key="26">Ya/Tidak</entry>
-  <entry key="27">Angka dari 1-10</entry>
   <entry key="28">Poling</entry>
   <entry key="29">Hanya moderator yang bisa membuat pertanyaan</entry>
   <entry key="30">Pilihan anda udah tercatat.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Ke halaman terakhir</entry>
   <entry key="259">Kecilkan --</entry>
   <entry key="260">Besarkan ++</entry>
-  <entry key="261">Tuan.</entry>
-  <entry key="262">Nyonya.</entry>
   <entry key="263">Konfigurasi</entry>
   <entry key="264">ID</entry>
   <entry key="265">Kunci</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Silahkan masukan alamat email yang lain atau Username</entry>
   <entry key="320">Tidak ada User terkoneksi dengan Username ini</entry>
   <entry key="321">Email yang berisi informasi alamat baru telah dikirim ke email anda, silahkan cek email anda. Jika anda belum mendapatkan email, pastikan pada baigan seting spaming pada konfigurasi email anda dan kirimkan email lagi.</entry>
-  <entry key="322">Salah</entry>
-  <entry key="323">Pesan</entry>
   <entry key="324">Hash tidak valid. User tidak ditemukan.</entry>
   <entry key="325">Isi Ulang Password Anda</entry>
   <entry key="326">Login</entry>
@@ -860,8 +854,6 @@
   <entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
   <entry key="839">Do you really want to delete this File/Folder?</entry>
   <entry key="840">Delete File/Folder?</entry>
-  <entry key="841">Mrs.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Properties</entry>
   <entry key="844">Show mouse position to viewers</entry>
   <entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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">Tuan.</entry>
+  <entry key="user.salutation.ms">Nyonya.</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">Salah</entry>
+  <entry key="error.type.info">Pesan</entry>
+  <entry key="poll.type.yesNo">Ya/Tidak</entry>
+  <entry key="poll.type.numeric">Angka dari 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Informazione: Ogni utente connesso riceve un messaggio con il nuovo sondaggio.</entry>
   <entry key="24">Crea un sondaggio</entry>
   <entry key="25">Cancella</entry>
-  <entry key="26">Si/No</entry>
-  <entry key="27">Numerico 1-10</entry>
   <entry key="28">Sondaggio</entry>
   <entry key="29">Devi essere moderatore per creare una domanda</entry>
   <entry key="30">Il tuo voto è stato registrato.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Vai all'ultima pagina</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">sig.</entry>
-  <entry key="262">Sig.ra</entry>
   <entry key="263">Configurazione</entry>
   <entry key="264">ID</entry>
   <entry key="265">Chiave</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Sondaggio</entry>
   <entry key="320">Non ci sono utenti collegati con questo Username</entry>
   <entry key="321">Una mail, contenente un link, è stata inviata al tuo indirizzo email, controlla la tua posta. Se non hai ricevuto la mail, controlla il tuo filtro di spam e richiedi nuovamente la mail di conferma.</entry>
-  <entry key="322">Errore</entry>
-  <entry key="323">Messaggio</entry>
   <entry key="324">Hash non valida. Utente non trovato.</entry>
   <entry key="325">Resetta la tua password</entry>
   <entry key="326">Login</entry>
@@ -860,8 +854,6 @@
   <entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
   <entry key="839">Do you really want to delete this File/Folder?</entry>
   <entry key="840">Delete File/Folder?</entry>
-  <entry key="841">Mrs.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Properties</entry>
   <entry key="844">Show mouse position to viewers</entry>
   <entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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">sig.</entry>
+  <entry key="user.salutation.ms">Sig.ra</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">Errore</entry>
+  <entry key="error.type.info">Messaggio</entry>
+  <entry key="poll.type.yesNo">Si/No</entry>
+  <entry key="poll.type.numeric">Numerico 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">ヒント: 接続中の全参加者に対して、投票を促すメッセージを送信します</entry>
   <entry key="24">投票の作成</entry>
   <entry key="25">キャンセル</entry>
-  <entry key="26">はい/いいえ</entry>
-  <entry key="27">1～10の数字</entry>
   <entry key="28">投票</entry>
   <entry key="29">質問を作成するには司会者になる必要があります</entry>
   <entry key="30">投票が登録されました</entry>
@@ -280,8 +278,6 @@
   <entry key="258">最後へ</entry>
   <entry key="259">縮小</entry>
   <entry key="260">拡大</entry>
-  <entry key="261">Mr.</entry>
-  <entry key="262">Ms.</entry>
   <entry key="263">グローバル設定</entry>
   <entry key="264">ID</entry>
   <entry key="265">キー</entry>
@@ -341,8 +337,6 @@
   <entry key="319">メール・アドレスまたはユーザー名を入力してください。</entry>
   <entry key="320">このユーザー名で接続するユーザーはありません。</entry>
   <entry key="321">専用リンクを含むメールをあなたのメール・アドレスに対して送信しました。メール受信箱をご確認ください。もし受信できない場合は、スパムとして除外されている可能性があります。その場合はスパム設定を見直し、再度、確認メールを送信してください。</entry>
-  <entry key="322">エラー</entry>
-  <entry key="323">メッセージ</entry>
   <entry key="324">ハッシュ値が不正です。ユーザーが見つかりません。</entry>
   <entry key="325">パスワードのリセット</entry>
   <entry key="326">ログイン</entry>
@@ -860,8 +854,6 @@
   <entry key="838">この参加者は、特別司会進行権を付与されています。あなたは、特別司会進行権保持者から当該権利を剥奪することはできません。</entry>
   <entry key="839">このファイル/フォルダを削除してよろしいですか？</entry>
   <entry key="840">ファイル/フォルダを削除しますか？</entry>
-  <entry key="841">Mrs.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">プロパティ</entry>
   <entry key="844">ビューア上でマウス・ポインタを表示する</entry>
   <entry key="845">SIPアプレットと音声を共有する</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">システム・バックアップをエクスポート／インポートする</entry>
   <entry key="1462">ファイル／フォルダのアップロード／追加／削除／ロードを行うためには、司会者であるか、あるいはホワイトボード描画権限が必要です。</entry>
   <entry key="1463">テキストを編集</entry>
-  <entry key="1464">教授</entry>
   <entry key="1465">共有画面公開</entry>
   <entry key="1466">共有画面を公開開始</entry>
   <entry key="1467">共有画面を公開終了</entry>
@@ -1560,9 +1551,6 @@
   <entry key="1538">会議室のSIPトランスポートを有効にする</entry>
   <entry key="1539">このユーザーに単独話者権限を付与してよろしいですか？</entry>
   <entry key="1540">タイムゾーンを指定してください</entry>
-  <entry key="1541">会議(ユーザー数:1〜25)</entry>
-  <entry key="1542">大人数向け会議(ユーザー数:1〜150)</entry>
-  <entry key="1543">インタビュー(1対1のミーティング；録画付き)</entry>
   <entry key="1544">指定されたキーの構成は既に存在しています。別のキーを指定するか、既存の構成を編集してください。</entry>
   <entry key="1545">保存中です。しばらくお待ちください。</entry>
   <entry key="1546">ようこそ</entry>
@@ -1587,9 +1575,6 @@
   <entry key="1565">10月</entry>
   <entry key="1566">11月</entry>
   <entry key="1567">12月</entry>
-  <entry key="1568">リマインダーを送信しない</entry>
-  <entry key="1569">Eメール</entry>
-  <entry key="1570">iCal Eメール</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">OAuth2設定</entry>
   <entry key="1573">名前</entry>
@@ -1869,4 +1854,19 @@
 	<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">会議(ユーザー数:1〜25)</entry>
+  <entry key="room.type.restricted">大人数向け会議(ユーザー数:1〜150)</entry>
+  <entry key="room.type.interview">インタビュー(1対1のミーティング；録画付き)</entry>
+  <entry key="appointment.reminder.none">リマインダーを送信しない</entry>
+  <entry key="appointment.reminder.email">Eメール</entry>
+  <entry key="appointment.reminder.ical">iCal Eメール</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">教授</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>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Each connected user receives a message with the new poll.</entry>
   <entry key="24">선거를 만드셨습니다.</entry>
   <entry key="25">무효</entry>
-  <entry key="26">네/아니오</entry>
-  <entry key="27">숫자 1-10</entry>
   <entry key="28">투표</entry>
   <entry key="29">질문을 만들기 위해서 의장이 되어야합니다.</entry>
   <entry key="30">당신의 투표가 등록 되었습니다.</entry>
@@ -341,8 +339,6 @@
   <entry key="319">Polls</entry>
   <entry key="320">There is no User connected to this Username</entry>
   <entry key="321">The email containing a special link has been sent to your email address, please check your mailbox. If you still have not received a email, please adjust your email spam settings and resend confirmation email.</entry>
-  <entry key="322">Error</entry>
-  <entry key="323">Message</entry>
   <entry key="324">Invalid Hash. No User found.</entry>
   <entry key="325">Reset Your Password</entry>
   <entry key="326">Login</entry>
@@ -860,8 +856,6 @@
   <entry key="838">This User is a Super-Moderator. You cannot remove the Moderation flag from a Super-Moderator!</entry>
   <entry key="839">Do you really want to delete this File/Folder?</entry>
   <entry key="840">Delete File/Folder?</entry>
-  <entry key="841">Mrs.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Properties</entry>
   <entry key="844">Show mouse position to viewers</entry>
   <entry key="845">Share Audio with SIP Applet</entry>
@@ -1483,7 +1477,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1553,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1577,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1856,19 @@
 	<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="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">Error</entry>
+  <entry key="error.type.info">Message</entry>
+  <entry key="poll.type.yesNo">네/아니오</entry>
+  <entry key="poll.type.numeric">숫자 1-10</entry>
 </properties>

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Informatie: Iedere gebruiker krijgt een bericht over de stembus.</entry>
   <entry key="24">Stembus aanmaken</entry>
   <entry key="25">Annuleren</entry>
-  <entry key="26">Ja/Nee</entry>
-  <entry key="27">Getal 1-10</entry>
   <entry key="28">Stembus</entry>
   <entry key="29">Je moet een organisator zijn om een vraag aan te maken</entry>
   <entry key="30">Jouw stem is geregistreerd.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Ga naar de laatste pagina</entry>
   <entry key="259">Uitzoomen</entry>
   <entry key="260">Inzoomen</entry>
-  <entry key="261">Dhr.</entry>
-  <entry key="262">Mevr.</entry>
   <entry key="263">Instellingen</entry>
   <entry key="264">ID</entry>
   <entry key="265">Instelling</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Geeft inlognaam of E-mail adres</entry>
   <entry key="320">Er is geen gebruiker met deze inlognaam</entry>
   <entry key="321">Een E-mail met een link is naar je toegestuurd, controller je Postvak-In. Als je dan nog steeds niets hebt ontvangen bekijk je E-mail spam instellingen.</entry>
-  <entry key="322">Foutmelding</entry>
-  <entry key="323">Bericht</entry>
   <entry key="324">Er is geen gebruiker met deze gegevens.</entry>
   <entry key="325">Wachtwoord opnieuw instellen</entry>
   <entry key="326">Inlognaam</entry>
@@ -860,8 +854,6 @@
   <entry key="838">Dit een een hoofd-organisator. Je kunt een organisator rol niet verwijderen van een hoofd-organisator!</entry>
   <entry key="839">Weet je zeker dat dit bestand/directory verwijder kan worden?</entry>
   <entry key="840">Verwijder bestand/directory?</entry>
-  <entry key="841">Mevrouw</entry>
-  <entry key="842">Meneer</entry>
   <entry key="843">Eigenschappen</entry>
   <entry key="844">Toon muis positie aan kijkers</entry>
   <entry key="845">Deel geluid middels SIP</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Export/Import System Backups</entry>
   <entry key="1462">You need moderation or the right to draw on whiteboard to upload, add, delete or load files and folders.</entry>
   <entry key="1463">Edit text</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publish</entry>
   <entry key="1466">Start Publish</entry>
   <entry key="1467">Stop Publish</entry>
@@ -1560,9 +1551,6 @@
   <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="1541">conference (1-25 users)</entry>
-  <entry key="1542">restricted (1-150 users)</entry>
-  <entry key="1543">interview (1:1 meeting with recording)</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>
@@ -1587,9 +1575,6 @@
   <entry key="1565">Oct</entry>
   <entry key="1566">Nov</entry>
   <entry key="1567">Dec</entry>
-  <entry key="1568">do not send notification</entry>
-  <entry key="1569">simple email</entry>
-  <entry key="1570">iCal email</entry>
   <entry key="1571">OAuth2</entry>
   <entry key="1572">Manage OAuth2 configurations</entry>
   <entry key="1573">Name</entry>
@@ -1869,4 +1854,19 @@
 	<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="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">Dhr.</entry>
+  <entry key="user.salutation.ms">Mevr.</entry>
+  <entry key="user.salutation.mrs">Mevrouw</entry>
+  <entry key="user.salutation.dr">Meneer</entry>
+  <entry key="user.salutation.prof">Prof</entry>
+  <entry key="error.type.error">Foutmelding</entry>
+  <entry key="error.type.info">Bericht</entry>
+  <entry key="poll.type.yesNo">Ja/Nee</entry>
+  <entry key="poll.type.numeric">Getal 1-10</entry>
 </properties>