svn commit: r1713575 [4/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...

[solomax]

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.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_pl.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
 Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Uwaga: Każdy połączony użytkownik otrzyma wiadomość z 
nowym głosowaniem.</entry>
   <entry key="24">Utwórz głosowanie.</entry>
   <entry key="25">Anuluj</entry>
-  <entry key="26">Tak/Nie</entry>
-  <entry key="27">Liczba 1-10</entry>
   <entry key="28">Głosowanie</entry>
   <entry key="29">Musisz być moderatorem aby utworzyć pytanie</entry>
   <entry key="30">Twój głos został zarejestrowany.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Przejdź do ostatniej strony</entry>
   <entry key="259">Zmniejsz</entry>
   <entry key="260">Powiększ</entry>
-  <entry key="261">Pan</entry>
-  <entry key="262">Pani</entry>
   <entry key="263">Konfiguracja</entry>
   <entry key="264">ID</entry>
   <entry key="265">Klucz</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Proszę podać e-mail lub nazwę użytkownika.</entry>
   <entry key="320">Nie ma użytkownika o takiej nazwie</entry>
   <entry key="321">E-mail zawierający specjalne łącze (link) został 
wysłany na twój adres. Sprawdź swoją pocztę. Jeśli nie otrzymałe(a)ś 
listu, sprawdź/zmień ustawienia antyspamowe swojej skrzynki i ponownie 
wygeneruj mail potwierdzający zmianę hasła.</entry>
-  <entry key="322">Informacja</entry>
-  <entry key="323">Błąd</entry>
   <entry key="324">Niepoprawny kod. Nie ma takiego użytkownika.</entry>
   <entry key="325">Ustaw nowe hasło.</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">Pani</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">Informacja</entry>
+  <entry key="error.type.info">Błąd</entry>
+  <entry key="poll.type.yesNo">Tak/Nie</entry>
+  <entry key="poll.type.numeric">Liczba 1-10</entry>
 </properties>

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.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_pt.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
 Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Cada usuário conectado recebe uma menssagem com a 
nova enquete.</entry>
   <entry key="24">Criar uma enquete</entry>
   <entry key="25">Cancelar</entry>
-  <entry key="26">Sim/Não</entry>
-  <entry key="27">Numérico 1-10</entry>
   <entry key="28">Enquete</entry>
   <entry key="29">Eles podem ser moderadores/professores nessa área de 
enquetes</entry>
   <entry key="30">Seu voto foi registrado.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Ir para a última página</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">Sr.</entry>
-  <entry key="262">Sra.</entry>
   <entry key="263">Configuração</entry>
   <entry key="264">ID</entry>
   <entry key="265">Chave</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Conjuntos</entry>
   <entry key="320">Não existe usuário conectado a este nome</entry>
   <entry key="321">Um email contendo um link foi enviado a seu endereço de 
email, por favor confira sua caixa postal. Se você ainda não tiver recebido 
um email, por favor ajuste as configurações de spam e remande a confirmação 
de email.</entry>
-  <entry key="322">Erro</entry>
-  <entry key="323">Mensagem</entry>
   <entry key="324">Hash inválido. Nenhum usuáio encontrado.</entry>
   <entry key="325">Reset sua senha</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">Sr.</entry>
+  <entry key="user.salutation.ms">Sra.</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">Erro</entry>
+  <entry key="error.type.info">Mensagem</entry>
+  <entry key="poll.type.yesNo">Sim/Não</entry>
+  <entry key="poll.type.numeric">Numérico 1-10</entry>
 </properties>

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.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_pt_BR.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
 Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Cada usuário conectado recebe uma menssagem com a 
nova enquete.</entry>
   <entry key="24">Criar uma enquete</entry>
   <entry key="25">Cancelar</entry>
-  <entry key="26">Sim/Não</entry>
-  <entry key="27">Numérico 1-10</entry>
   <entry key="28">Enquete</entry>
   <entry key="29">Eles podem ser moderadores/professores nessa área de 
enquetes</entry>
   <entry key="30">Seu voto foi registrado.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Ir para a última página</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">Sr.</entry>
-  <entry key="262">Sra.</entry>
   <entry key="263">Configuração</entry>
   <entry key="264">ID</entry>
   <entry key="265">Chave</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Por favor, indique um endereço de e-mail ou um nome de 
usuário</entry>
   <entry key="320">Não existe usuário conectado com este nome</entry>
   <entry key="321">Um email contendo um link foi enviado a seu endereço de 
email, por favor confira sua caixa postal. Se você ainda não tiver recebido 
um email, por favor ajuste as configurações de spam e re-envie a 
confirmação de email.</entry>
-  <entry key="322">Erro</entry>
-  <entry key="323">Mensagem</entry>
   <entry key="324">Hash inválido. Nenhum usuário encontrado.</entry>
   <entry key="325">Redefina sua senha</entry>
   <entry key="326">Login</entry>
@@ -860,8 +854,6 @@
   <entry key="838">É um Super-moderador. Você não pode remover a permissão 
de Moderação de um Super-moderador!</entry>
   <entry key="839">Tem certeza que quer exclurir esse 
Arquivo/Diretório?</entry>
   <entry key="840">Excluir Arquivo/Diretório?</entry>
-  <entry key="841">Sr.</entry>
-  <entry key="842">Dr.</entry>
   <entry key="843">Propriedades</entry>
   <entry key="844">Mostra a posição do mouse para os espectadores</entry>
   <entry key="845">Compartilhar Audio com o SIP Applet</entry>
@@ -1483,7 +1475,6 @@
   <entry key="1461">Exportar/Importar Backups do Sistema</entry>
   <entry key="1462">Você precisa ser um moderador ou ter direitos para 
"desenhar na lousa", adicionar, excluir ou carregar arquivos e pastas.</entry>
   <entry key="1463">Editar texto</entry>
-  <entry key="1464">Prof</entry>
   <entry key="1465">Publicar</entry>
   <entry key="1466">Iniciar Publicação</entry>
   <entry key="1467">Parar Publicação</entry>
@@ -1560,9 +1551,6 @@
   <entry key="1538">Permitir "SIP transport" na sala</entry>
   <entry key="1539">Dar exclusividade de áudio a este usuário?</entry>
   <entry key="1540">Por favor, especifique seu fuso horário / 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">Salvando conteúdo. Por favor, aguarde!</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">Sr.</entry>
+  <entry key="user.salutation.dr">Dr.</entry>
+  <entry key="user.salutation.prof">Prof</entry>
+  <entry key="error.type.error">Erro</entry>
+  <entry key="error.type.info">Mensagem</entry>
+  <entry key="poll.type.yesNo">Sim/Não</entry>
+  <entry key="poll.type.numeric">Numérico 1-10</entry>
 </properties>

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.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_ru.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.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">Введите e-mail или имя 
пользователя</entry>
   <entry key="320">Никто больше не подключился с 
таким именем пользователя</entry>
   <entry key="321">Письмо, содержащее специальную 
ссылку, выслано на ваш e-mail, пожалуйста, 
проверьте ваш почтовый ящик. Если вы все 
еще не получили письмо, проверьте анти-спам 
фильтры и пошлите еще раз подтверждающее 
письмо.</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">Г-жа</entry>
-  <entry key="842">Д-р</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">Окт</entry>
   <entry key="1566">Ноя</entry>
   <entry key="1567">Дек</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>
@@ -1882,4 +1867,19 @@
        <entry key="install.wizard.congrats.mail">Список 
рассылки</entry>
        <entry key="install.wizard.congrats.commercial">Это компании,
                которые так же оказывают 
коммерческую поддержку 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">Г-н</entry>
+  <entry key="user.salutation.ms">Г-жа</entry>
+  <entry key="user.salutation.mrs">Г-жа</entry>
+  <entry key="user.salutation.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_sk.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.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_sk.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Všetci pripojení používatelia prijímajú správu s 
novým hlasovaním</entry>
   <entry key="24">Vytvoriť hlasovanie</entry>
   <entry key="25">Zrušiť</entry>
-  <entry key="26">Áno/Nie</entry>
-  <entry key="27">Čísla 1-10</entry>
   <entry key="28">Hlasovanie</entry>
   <entry key="29">Musíte byť moderátor pre vytvorenie otázky</entry>
   <entry key="30">Váš hlas bol zaznamenaný</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Posledná strana</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">Pán</entry>
-  <entry key="262">Pani</entry>
   <entry key="263">Nastavenie</entry>
   <entry key="264">ID</entry>
   <entry key="265">Kľúč</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Prosím zadajte email alebo používateľské meno</entry>
   <entry key="320">There is no user connected to this username</entry>
   <entry key="321">Email bol zaslaný</entry>
-  <entry key="322">Chyba</entry>
-  <entry key="323">Správa</entry>
   <entry key="324">Používateľ sa nenašiel</entry>
   <entry key="325">Resetovať vaše heslo</entry>
   <entry key="326">Prihlásenie</entry>
@@ -860,8 +854,6 @@
   <entry key="838">This user is a super moderator. You cannot remove the 
moderation flag.</entry>
   <entry key="839">Chcete naozaj vymazať?</entry>
   <entry key="840">Vymazať?</entry>
-  <entry key="841">Pani</entry>
-  <entry key="842">Dr</entry>
   <entry key="843">Vlastnosti</entry>
   <entry key="844">Zobraziť pozíciu kurzora</entry>
   <entry key="845">Zdieľať audio cez 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">Pán</entry>
+  <entry key="user.salutation.ms">Pani</entry>
+  <entry key="user.salutation.mrs">Pani</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">Správa</entry>
+  <entry key="poll.type.yesNo">Áno/Nie</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_sv.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.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_sv.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Info: Varje ansluten användare får ett meddelande med den 
nya röstningen.</entry>
   <entry key="24">Skapa en omröstning</entry>
   <entry key="25">Avbryt</entry>
-  <entry key="26">Ja/Nej</entry>
-  <entry key="27">Numerisk 1-10</entry>
   <entry key="28">Röst</entry>
   <entry key="29">Du måste vara Moderator för att skapa en 
omröstning</entry>
   <entry key="30">Din röst är accepterad</entry>
@@ -280,8 +278,6 @@
   <entry key="258">GÃ¥ till sista sidan</entry>
   <entry key="259">Zoom --</entry>
   <entry key="260">Zoom ++</entry>
-  <entry key="261">Herr</entry>
-  <entry key="262">Fröken</entry>
   <entry key="263">Konfiguration</entry>
   <entry key="264">ID</entry>
   <entry key="265">Nyckel</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Omröstningar</entry>
   <entry key="320">Det finns ingen Användare kopplad till detta 
Användarnamn</entry>
   <entry key="321">Ett e-postmeddelande innehållande en unik länk har 
skickats till din epostadress, var vänlig kolla din epost. Om du fortfarande 
inte fått något e-postmeddelande, var vänlig ändra spaminställningarna 
för din e-post och skicka bekräftelsemeddelandet på nytt.</entry>
-  <entry key="322">Bearbetar</entry>
-  <entry key="323">Meddelande</entry>
   <entry key="324">Ogiltig Hash. Ingen Användare Funnen.</entry>
   <entry key="325">Återställ Ditt Lösenord</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">Herr</entry>
+  <entry key="user.salutation.ms">Fröken</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">Bearbetar</entry>
+  <entry key="error.type.info">Meddelande</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_th.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.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_th.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.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">หมายเลขประจำตัว</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">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">นาย</entry>
+  <entry key="user.salutation.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_tr.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.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_tr.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 Tue Nov 10 02:59:26 2015
@@ -45,8 +45,6 @@
   <entry key="23">Bilgi: Bağlı her kullanıcı yeni anketle ilgili bir mesaj 
alır.</entry>
   <entry key="24">Bir anket yarat</entry>
   <entry key="25">Ä°ptal</entry>
-  <entry key="26">Evet/Hayır</entry>
-  <entry key="27">Sayısal 1-10</entry>
   <entry key="28">Anket</entry>
   <entry key="29">Soru oluşturabilmek için Düzenleyici olmanız 
gerekmekte</entry>
   <entry key="30">Oyunuz kaydedildi.</entry>
@@ -280,8 +278,6 @@
   <entry key="258">Son sayfaya git</entry>
   <entry key="259">Uzaklaştır --</entry>
   <entry key="260">Yakınlaştır ++</entry>
-  <entry key="261">Sayın</entry>
-  <entry key="262">Sayın</entry>
   <entry key="263">Konfigürasyon</entry>
   <entry key="264">KOD</entry>
   <entry key="265">Anahtar</entry>
@@ -341,8 +337,6 @@
   <entry key="319">Lütfen bir e-posta adresi ya da bir kullanıcı adı 
giriniz</entry>
   <entry key="320">Bu kullanıcı adı ile bağlanmış bir kullanıcı 
yok</entry>
   <entry key="321">Özel bir bağlantıya sahip olan bir e-posta, e-posta 
adresinize yollanmış durumda. Lütfen posta kutunuzu kontrol edin. Eğer 
e-posta mesajını alamazsanız, lütfen posta kutunuzun gereksiz posta 
ayarlarını kontrol edin ve/veya yeniden doğrulama mesajının 
gönderilmesini sağlayın.</entry>
-  <entry key="322">Hata</entry>
-  <entry key="323">Mesaj</entry>
   <entry key="324">Geçersiz Komut. Hiçbir Kullanıcı Bulunamadı.</entry>
   <entry key="325">Şifrenizi Sıfırlayın</entry>
   <entry key="326">Oturum Aç</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">Sayın</entry>
+  <entry key="user.salutation.ms">Sayın</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">Hata</entry>
+  <entry key="error.type.info">Mesaj</entry>
+  <entry key="poll.type.yesNo">Evet/Hayır</entry>
+  <entry key="poll.type.numeric">Sayısal 1-10</entry>
 </properties>

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.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_uk.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.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">Опитування</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">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">П.</entry>
+  <entry key="user.salutation.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_zh_CN.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.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_zh_CN.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.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">序号</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">女士</entry>
-  <entry key="842">先生</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">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">教授</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_zh_TW.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.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_zh_TW.properties.xml
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.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">编号</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">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">先生</entry>
+  <entry key="user.salutation.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/Client.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Client.java
 Tue Nov 10 02:59:26 2015
@@ -42,7 +42,6 @@ public class Client implements IDataProv
        private String uid;
        private Set<Right> rights = new HashSet<Right>();
        private Date connectedSince;
-       private int serverId = 0;
 
        public Client() {
                this.connectedSince = new Date();

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
 Tue Nov 10 02:59:26 2015
@@ -18,76 +18,51 @@
  */
 package org.apache.openmeetings.web.app;
 
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
 import org.apache.openmeetings.db.entity.user.User.Type;
 import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
 import org.apache.wicket.util.string.Strings;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
 
 public class OmAuthenticationStrategy extends DefaultAuthenticationStrategy {
-       /** The separator used to concatenate the username and password */
-       private static final String VALUE_SEPARATOR = "-sep-";
        private static final String COOKIE_KEY = "LoggedIn";
-       private static final Logger log = 
Red5LoggerFactory.getLogger(OmAuthenticationStrategy.class, webAppRootKey);
-       /** The cookie name to store the username/password/type/domain */
-       private final String cookieKey;
 
        public OmAuthenticationStrategy() {
                super(COOKIE_KEY);
-               cookieKey = COOKIE_KEY;
        }
 
        /**
-        * @see org.apache.wicket.authentication.IAuthenticationStrategy#load()
+        * @see DefaultAuthenticationStrategy#decode(String value)
+        * Additionally decodes stored login type and domain
         */
        @Override
-       public String[] load() {
-               String value = getCookieUtils().load(cookieKey);
-               if (Strings.isEmpty(value) == false) {
-                       try {
-                               value = getCrypt().decryptUrlSafe(value);
-                       } catch (RuntimeException e) {
-                               log.info("Error decrypting login cookie: {}. 
The cookie will be deleted. Possible cause is that a "
-                                               + "session-relative encryption 
key was used to encrypt this cookie while this decryption attempt "
-                                               + "is happening in a different 
session, eg user coming back to the application after session expiration",
-                                               cookieKey);
-                               getCookieUtils().remove(cookieKey);
-                               value = null;
+       protected String[] decode(String value) {
+               if (!Strings.isEmpty(value)) {
+                       String username = null;
+                       String password = null;
+                       String type = null;
+                       String domainId = null;
+
+                       String[] values = value.split(VALUE_SEPARATOR);
+                       if (values.length > 0 && !Strings.isEmpty(values[0])) {
+                               username = values[0];
                        }
-                       if (!Strings.isEmpty(value)) {
-                               String username = null;
-                               String password = null;
-                               String type = null;
-                               String domainId = null;
-
-                               String[] values = value.split(VALUE_SEPARATOR);
-                               if (values.length > 0 && 
!Strings.isEmpty(values[0])) {
-                                       username = values[0];
-                               }
-                               if (values.length > 1 && 
!Strings.isEmpty(values[1])) {
-                                       password = values[1];
-                               }
-                               if (values.length > 2 && 
!Strings.isEmpty(values[2])) {
-                                       type = values[2];
-                               }
-                               if (values.length > 3 && 
!Strings.isEmpty(values[3])) {
-                                       domainId = values[3];
-                               }
-
-                               return new String[] { username, password, type, 
domainId };
+                       if (values.length > 1 && !Strings.isEmpty(values[1])) {
+                               password = values[1];
+                       }
+                       if (values.length > 2 && !Strings.isEmpty(values[2])) {
+                               type = values[2];
+                       }
+                       if (values.length > 3 && !Strings.isEmpty(values[3])) {
+                               domainId = values[3];
                        }
-               }
 
+                       return new String[] { username, password, type, 
domainId };
+               }
                return null;
        }
 
        public void save(final String username, final String password, final 
Type type, final Long domainId) {
                if (type != Type.oauth) {
-                       String value = username + VALUE_SEPARATOR + password + 
VALUE_SEPARATOR + type.name() + VALUE_SEPARATOR + domainId;
-                       String encryptedValue = 
getCrypt().encryptUrlSafe(value);
-                       getCookieUtils().save(cookieKey, encryptedValue);
+                       super.save(username, password, type.name(), "" + 
domainId);
                }
        }
 }

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/BasePanel.java
 Tue Nov 10 02:59:26 2015
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.comm
 
 import org.apache.openmeetings.db.util.FormatHelper;
 import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.common.menu.MenuPanel;
 import org.apache.openmeetings.web.pages.MainPage;
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -52,7 +53,9 @@ public abstract class BasePanel extends
         * 
         * @param target
         */
-       public void onMenuPanelLoad(IPartialPageRequestHandler target) {
+       public void onMenuPanelLoad(IPartialPageRequestHandler handler) {
+               handler.add(getMainPage().getHeader().setVisible(true), 
getMainPage().getMenu().setVisible(true)
+                               , getMainPage().getTopLinks().setVisible(true));
        }
 
        /**
@@ -60,6 +63,6 @@ public abstract class BasePanel extends
         * 
         * @param target
         */
-       public void cleanup(IPartialPageRequestHandler target) {
+       public void cleanup(IPartialPageRequestHandler handler) {
        }
 }

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
 Tue Nov 10 02:59:26 2015
@@ -39,9 +39,9 @@ public class ComunityUserForm extends Fo
 
                        public Long getObject() {
                                User u = ComunityUserForm.this.getModelObject();
-                               if (u.getShowContactData()) {
+                               if (u.isShowContactData()) {
                                        return 1L;
-                               } else if (u.getShowContactDataToContacts()) {
+                               } else if (u.isShowContactDataToContacts()) {
                                        return 2L;
                                }
                                return 3L;

Copied: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
 (from r1713574, 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.html)
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html?p2=openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html&p1=openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.html&r1=1713574&r2=1713575&rev=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.html
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
 Tue Nov 10 02:59:26 2015
@@ -19,34 +19,17 @@
   
 -->
 <html xmlns:wicket="http://wicket.apache.org";>
-       <wicket:head>
-               <link media="screen" type="text/css" rel="stylesheet" 
href="css/jquery.ui.menubar.css"/>
-       </wicket:head>
-       <wicket:panel>
-               <script type="text/javascript" 
src="js/jquery.ui.menubar.js"></script>
-               <script type="text/javascript">
-                       $(function() {
-                               $("#jMenu").menubar({
-                                       autoExpand: true
-                                       , menuIcon: true
-                                       , buttons: true
-                                       , position: {
-                                               within: 
$("#menu").add(window).first()
-                                       }
-                                       //, select: select
-                               });
-                       });
-               </script>
-               <ul id="jMenu">
-                       <li wicket:id="mainItem">
-                               <a class="fNiv" href="#" onclick="return 
false;"><span wicket:id="label"></span></a>
-                               <ul wicket:enclosure="childItem">
-                                       <li wicket:id="childItem"><a>
-                                               <span class="menuName" 
wicket:id="name"></span><br />
-                                               <span class="menuDesc" 
wicket:id="description"></span>
-                                       </a></li>
-                               </ul>
-                       </li>
-               </ul>
-       </wicket:panel>
+<wicket:panel>
+       <ul wicket:id="menuContainer">
+               <li wicket:id="mainItem">
+                       <a href="#" wicket:id="link"><span 
wicket:id="label"></span></a>
+                       <ul wicket:id="childItems">
+                               <li wicket:id="childItem"><a>
+                                       <span class="menuName" 
wicket:id="name"></span><br />
+                                       <span class="menuDesc" 
wicket:id="description"></span>
+                               </a></li>
+                       </ul>
+               </li>
+       </ul>
+</wicket:panel>
 </html>

Copied: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
 (from r1713478, 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.java)
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java?p2=openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java&p1=openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.java&r1=1713478&r2=1713575&rev=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MenuPanel.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.java
 Tue Nov 10 02:59:26 2015
@@ -16,25 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openmeetings.web.common;
+package org.apache.openmeetings.web.common.menu;
 
-import org.apache.openmeetings.db.dao.basic.NavigationDao;
-import org.apache.openmeetings.db.entity.basic.Naviglobal;
-import org.apache.openmeetings.db.entity.basic.Navimain;
-import org.apache.openmeetings.db.util.AuthLevelUtil;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.pages.MainPage;
-import org.apache.openmeetings.web.util.OmUrlFragment;
-import org.apache.openmeetings.web.util.OmUrlFragment.MenuActions;
-import org.apache.openmeetings.web.util.OmUrlFragment.MenuParams;
+import java.util.List;
+
+import org.apache.openmeetings.web.common.BasePanel;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Loads the menu items into the main area
@@ -44,49 +42,72 @@ import org.apache.wicket.markup.html.lis
  */
 public class MenuPanel extends BasePanel {
        private static final long serialVersionUID = 1L;
+       private final WebMarkupContainer menuContainer = new 
WebMarkupContainer("menuContainer");
+       private final MenuFunctionsBehavior mfb;
 
-       public MenuPanel(String id) {
+       public MenuPanel(String id, List<MenuItem> menus) {
                super(id);
+               setOutputMarkupPlaceholderTag(true);
                setMarkupId(id);
                
-               final NavigationDao man = 
Application.getBean(NavigationDao.class);
-               add(new ListView<Naviglobal>("mainItem", 
man.getMainMenu(AuthLevelUtil.hasAdminLevel(WebSession.getRights()), 
WebSession.getUserId())) {
+               add(menuContainer.setOutputMarkupId(true));
+               menuContainer.add(new ListView<MenuItem>("mainItem", menus) {
                        private static final long serialVersionUID = 1L;
 
                        @Override
-                       protected void populateItem(ListItem<Naviglobal> item) {
-                               Naviglobal gl = item.getModelObject();
-                               item.add(new Label("label", getString("" + 
gl.getFieldvalues_id())).setRenderBodyOnly(true));
-                               
-                               item.add(new ListView<Navimain>("childItem", 
gl.getMainnavi()) {
+                       protected void populateItem(final ListItem<MenuItem> 
item) {
+                               final MenuItem gl = item.getModelObject();
+                               AjaxLink<Void> link = new 
AjaxLink<Void>("link") {
                                        private static final long 
serialVersionUID = 1L;
 
-                                       @Override
-                                       protected void 
populateItem(ListItem<Navimain> item) {
-                                               Navimain m = 
item.getModelObject();
-                                               final String name = 
getString("" + m.getFieldvalues_id());
-                                               final String desc = 
getString("" + m.getTooltip_fieldvalues_id());
-                                               final MenuActions action = 
MenuActions.valueOf(m.getAction());
-                                               final MenuParams params = 
m.getParams() != null ? MenuParams.valueOf(m.getParams()) : 
MenuParams.publicTabButton;
-                                               item.add(new Label("name", 
name), new Label("description", desc));
-                                               item.add(new 
AjaxEventBehavior("click") {
-                                                       private static final 
long serialVersionUID = 1L;
-
-                                                       @Override
-                                                       protected void 
onEvent(AjaxRequestTarget target) {
-                                                               
((MainPage)getPage()).updateContents(new OmUrlFragment(action, params), target);
-                                                       }
-                                               });
-                                       }
-                               }.setReuseItems(true));
+                                       public void onClick(AjaxRequestTarget 
target) {
+                                               gl.onClick(getMainPage(), 
target);
+                                       };
+                               };
+                               if (null != gl.getChildren()) {
+                                       link.add(new AttributeAppender("click", 
"return false;"));
+                               }
+                               item.add(link.add(new Label("label", 
gl.getName()).setRenderBodyOnly(true)));
+                               if (!Strings.isEmpty(gl.getCssClass())) {
+                                       
link.add(AttributeAppender.append("class", gl.getCssClass()));
+                               }
+                               if (!Strings.isEmpty(gl.getDesc())) {
+                                       
link.add(AttributeAppender.append("title", gl.getDesc()));
+                               }
+                               item.setVisible(gl.isActive());
+                               item.add(new 
WebMarkupContainer("childItems").add(new ListView<MenuItem>("childItem", 
gl.getChildren()) {
+                                               private static final long 
serialVersionUID = 1L;
+       
+                                               @Override
+                                               protected void 
populateItem(final ListItem<MenuItem> item1) {
+                                                       final MenuItem m = 
item1.getModelObject();
+                                                       
item1.setVisible(m.isActive());
+                                                       item1.add(new 
Label("name", m.getName()), new Label("description", m.getDesc()));
+                                                       item1.add(new 
AjaxEventBehavior("click") {
+                                                               private static 
final long serialVersionUID = 1L;
+
+                                                               @Override
+                                                               protected void 
onEvent(AjaxRequestTarget target) {
+                                                                       
m.onClick(getMainPage(), target);
+                                                               }
+                                                       });
+                                               }
+                                       }).setVisible(null != 
gl.getChildren()));
                        }
-               }.setReuseItems(true));
+               });
+               add(mfb = new 
MenuFunctionsBehavior(menuContainer.getMarkupId(), id));
+       }
+       
+       public void update(IPartialPageRequestHandler target) {
+               target.add(menuContainer);
+               //target.appendJavaScript(String.format("$(function() {%s;});", 
mfb.getInitScript()));
+               target.appendJavaScript(mfb.getInitScript());
        }
        
        @Override
        public void renderHead(IHeaderResponse response) {
                super.renderHead(response);
-               if (getMainPage().isRtl()) {
+               if (isRtl()) {
                        
response.render(CssHeaderItem.forUrl("css/jquery.ui.menubar-rtl.css"));
                }
        }

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
 Tue Nov 10 02:59:26 2015
@@ -28,7 +28,7 @@ import org.apache.openmeetings.web.commo
 import org.apache.wicket.markup.html.WebMarkupContainer;
 
 public class DataViewContainer<T extends IDataProviderEntity> implements 
Serializable {
-       private static final long serialVersionUID = -1027478954223527890L;
+       private static final long serialVersionUID = 1L;
        public WebMarkupContainer container;
        public SearchableDataView<T> view;
        public PagedEntityListPanel navigator;

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
 Tue Nov 10 02:59:26 2015
@@ -36,7 +36,7 @@ import org.apache.wicket.model.IModel;
  * @param <T>
  */
 public class SearchableDataProvider<T extends IDataProviderEntity> extends 
SortableDataProvider<T, String> {
-       private static final long serialVersionUID = 4325721185888905204L;
+       private static final long serialVersionUID = 1L;
        protected Class<? extends IDataProviderDao<T>> clazz;
        protected String search = null;
        

Modified: 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java?rev=1713575&r1=1713574&r2=1713575&view=diff
==============================================================================
--- 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
 (original)
+++ 
openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ActivatePage.java
 Tue Nov 10 02:59:26 2015
@@ -39,7 +39,7 @@ public class ActivatePage extends BaseNo
                        if (user != null && 
!AuthLevelUtil.hasLoginLevel(user.getRights())) {
                                // activate
                                user.getRights().add(Right.Login);
-                               user.setUpdatetime(new Date());
+                               user.setUpdated(new Date());
 
                                Application.getBean(UserDao.class).update(user, 
null);
                        }