You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/29 10:25:52 UTC
[2/4] openmeetings git commit: [OPENMEETINGS-1685] duplicated
'Cancel' labels are unified
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index c771235..893e3e7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">Criar</entry>
<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="28">Enquete</entry>
<entry key="29">Eles podem ser moderadores/professores nessa área de enquetes</entry>
<entry key="30">Seu voto foi registrado.</entry>
@@ -72,13 +71,12 @@
<entry key="52">Escolher webcam:</entry>
<entry key="53">Escolher microfone:</entry>
<entry key="54">ok</entry>
- <entry key="55">Cancelar</entry>
+ <entry key="lbl.cancel">Cancelar</entry>
<entry key="56">Você precisa reconectar.</entry>
<entry key="57">Editar configurações.</entry>
<entry key="58">Curso:</entry>
<entry key="59">Idioma:</entry>
<entry key="60">Ok</entry>
- <entry key="61">Cancelar</entry>
<entry key="62">Limpar a lousa.</entry>
<entry key="63">Você quer que a lousa seja apagada antes que uma figura seja adicionada ?</entry>
<entry key="64">Não perguntar de novo.</entry>
@@ -100,7 +98,6 @@
<entry key="80">excluir ítem selecionado</entry>
<entry key="81">Aplicar para moderação</entry>
<entry key="82">Aplicar</entry>
- <entry key="83">fechar</entry>
<entry key="84">Tornar-se moderador</entry>
<entry key="85">fechar</entry>
<entry key="86">italic</entry>
@@ -109,7 +106,6 @@
<entry key="89">Um usuário quer se tornar moderador:</entry>
<entry key="90">aceitar</entry>
<entry key="91">rejeitar</entry>
- <entry key="92">cancelar</entry>
<entry key="93">Enviando requisição para os seguintes usuários</entry>
<entry key="94">Aceito</entry>
<entry key="95">Rejeitado</entry>
@@ -134,7 +130,6 @@
<entry key="119">E-Mail:</entry>
<entry key="120">País:</entry>
<entry key="121">Registrar</entry>
- <entry key="122">cancelar</entry>
<entry key="123">Registrar</entry>
<entry key="124">Início</entry>
<entry key="125">Usuários</entry>
@@ -165,7 +160,6 @@
<entry key="150">Mostrar próximo</entry>
<entry key="151">mostrar anterior</entry>
<entry key="152">excluir registro</entry>
- <entry key="153">cancelar</entry>
<entry key="154">excluir</entry>
<entry key="155">novo registro</entry>
<entry key="157">excluir registro</entry>
@@ -185,7 +179,6 @@
<entry key="171">nome</entry>
<entry key="172">Adicionar organização</entry>
<entry key="173">Adicionar organização</entry>
- <entry key="174">cancelar</entry>
<entry key="175">adicionar</entry>
<entry key="176">Remover organização</entry>
<entry key="177">usuário</entry>
@@ -213,7 +206,6 @@
<entry key="199">salvar como</entry>
<entry key="200">nome do arquivo</entry>
<entry key="201">nome do arquivo</entry>
- <entry key="202">cancelar</entry>
<entry key="203">salvar</entry>
<entry key="204">erro</entry>
<entry key="205">carregando</entry>
@@ -230,7 +222,6 @@
<entry key="216">Destinatário</entry>
<entry key="217">Mensagem</entry>
<entry key="218">Enviar</entry>
- <entry key="219">cancelar</entry>
<entry key="220">enviar</entry>
<entry key="221">Dados do usuário</entry>
<entry key="222">Seu apelido para essa conferência</entry>
@@ -407,7 +398,6 @@
<entry key="417">Gravação:</entry>
<entry key="418">Já existe alguém gravando nesse momento:</entry>
<entry key="419">Gravando! Pelo usuário:</entry>
- <entry key="420">cancelar</entry>
<entry key="421">Gravação será cancelada e não será salva.</entry>
<entry key="422">continuar</entry>
<entry key="423">Fechar essa janela e continuar a gravação.</entry>
@@ -425,7 +415,6 @@
<entry key="435">Nome</entry>
<entry key="436">Sala</entry>
<entry key="437">Data</entry>
- <entry key="438">cancelar</entry>
<entry key="439">start</entry>
<entry key="440">Nome</entry>
<entry key="441">Data</entry>
@@ -573,7 +562,6 @@
<entry key="592">Upload completo, convertendo documento...</entry>
<entry key="593">Inicia Upload</entry>
<entry key="594">Upload e Importação. Por favor, selecione um arquivo do seu disco.</entry>
- <entry key="595">Cancela</entry>
<entry key="596">Seleciona arquivo</entry>
<entry key="597">Conexões</entry>
<entry key="598">Valor</entry>
@@ -669,7 +657,6 @@
<entry key="694">gostaria de desenhar na lousa.</entry>
<entry key="695">gostaria de compartilhar meu áudio / vídeo</entry>
<entry key="696">Você tem que aguardar enquanto o moderador entra na sala.</entry>
- <entry key="697">Cancela</entry>
<entry key="698">Salva</entry>
<entry key="699">Dia</entry>
<entry key="700">Mês</entry>
@@ -714,7 +701,6 @@
<entry key="740">Largura:</entry>
<entry key="741">Altura:</entry>
<entry key="742">A conexão foi terminada pelo servidor</entry>
- <entry key="743">Cancelar</entry>
<entry key="744">Iniciar externo</entry>
<entry key="745">Se você fechar essa sessão completamente, você não será capaz de reiniciar o visualizador para essa sessão.</entry>
<entry key="746">Confirme o fechamento do visualizador de sessão</entry>
@@ -731,7 +717,6 @@
<entry key="757">Teste as conf.</entry>
<entry key="758">Verifique se o microfone e a camera antes de entrar em uma sala .</entry>
<entry key="759">Não mostre esse teste novamente</entry>
- <entry key="760">Cancela</entry>
<entry key="761">Iniciar conferência</entry>
<entry key="762">Não pergunte novamente</entry>
<entry key="763">GRAVA</entry>
@@ -882,7 +867,6 @@
<entry key="915">A gravação da entrevista já foi iniciada.</entry>
<entry key="916">A gravação está parada ou não foi iniciada ainda.</entry>
<entry key="917">A gravação desta entrevista já começou!</entry>
- <entry key="918">Cancelar</entry>
<entry key="919">O processamento de uma entrevista demora 5 minutos por 1 minutos de entrevista. O progresso atual da transcodificacao da entrevista e processamento é a seguinte:</entry>
<entry key="921">Re-generar SIP Data</entry>
<entry key="922">Você não pode mover o arquivo ou pasta em sua própria pasta!</entry>
@@ -977,7 +961,6 @@
<entry key="1012">Login</entry>
<entry key="1013">Usuários para a nova sala de equipe:</entry>
<entry key="1014">Criar equipe da sala</entry>
- <entry key="1015">Cancelar</entry>
<entry key="1016">Escolha pelo menos um usuário para a equipe da sala!</entry>
<entry key="1017">Adicionar usuário a equipe</entry>
<entry key="1018">Remover usuário da sala de equipe</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">Não mostrar caixa de informação no controle remoto sobre Copiar e Colar</entry>
<entry key="1128">Salvar</entry>
<entry key="1129">Remover</entry>
- <entry key="1130">Cancelar</entry>
<entry key="1131">Convidar usuário a sala de conferência</entry>
<entry key="1132">Escolha uma sala de conferência. O usuário convidado irá receber uma mensagem com seu nome e um link para a sala.</entry>
<entry key="1133">Conectado desde:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index b86bb3a..2381fd0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">Создать</entry>
<entry key="23">Информация: каждый подключённый участник получает сообщение с новым опросом.</entry>
<entry key="24">Создать опрос</entry>
- <entry key="25">Отменить</entry>
<entry key="28">Опрос</entry>
<entry key="29">Для создания опроса Вы должны быть модератором/лектором в этой комнате.</entry>
<entry key="30">Вы проголосовали.</entry>
@@ -72,13 +71,12 @@
<entry key="52">Выбрать камеру:</entry>
<entry key="53">Выбрать микрофон:</entry>
<entry key="54">OK</entry>
- <entry key="55">Отменить</entry>
+ <entry key="lbl.cancel">Отменить</entry>
<entry key="56">Чтобы активировать изменения, войдите заново</entry>
<entry key="57">Изменить установки</entry>
<entry key="58">Курс:</entry>
<entry key="59">Язык курса:</entry>
<entry key="60">OK</entry>
- <entry key="61">Отменить</entry>
<entry key="62">Очистить доску</entry>
<entry key="63">Очистить доску перед добавлением нового изображения</entry>
<entry key="64">Больше не спрашивать</entry>
@@ -100,7 +98,6 @@
<entry key="80">Удалить выбранный элемент</entry>
<entry key="81">Запрос функции модератора</entry>
<entry key="82">Запрос</entry>
- <entry key="83">Отменить</entry>
<entry key="84">Запросить ф-ции модератора</entry>
<entry key="85">Закрыть</entry>
<entry key="86">Курсив</entry>
@@ -109,7 +106,6 @@
<entry key="89">Участник желает запросить функцию модератора:</entry>
<entry key="90">Согласие</entry>
<entry key="91">Отклонение</entry>
- <entry key="92">Отменить</entry>
<entry key="93">Отсылка запроса следующему участнику</entry>
<entry key="94">Выдано согласие</entry>
<entry key="95">Отклонено</entry>
@@ -134,7 +130,6 @@
<entry key="119">E-Mail:</entry>
<entry key="120">Страна:</entry>
<entry key="121">Регистрировать</entry>
- <entry key="122">Отменить</entry>
<entry key="123">Регистрация</entry>
<entry key="124">На главную</entry>
<entry key="125">Пользователи</entry>
@@ -165,7 +160,6 @@
<entry key="150">вперед</entry>
<entry key="151">назад</entry>
<entry key="152">Удалить запись</entry>
- <entry key="153">Отменить</entry>
<entry key="154">Удалить</entry>
<entry key="155">Создать запись</entry>
<entry key="157">Удалить запись</entry>
@@ -185,7 +179,6 @@
<entry key="171">Имя</entry>
<entry key="172">Добавить организацию</entry>
<entry key="173">Добавить организацию</entry>
- <entry key="174">Отменить</entry>
<entry key="175">Добавить</entry>
<entry key="176">Удалить организацию</entry>
<entry key="177">Пользователь</entry>
@@ -213,7 +206,6 @@
<entry key="199">Сохранить как</entry>
<entry key="200">Имя файла</entry>
<entry key="201">Имя файла</entry>
- <entry key="202">Отменить</entry>
<entry key="203">Сохранить</entry>
<entry key="204">Ошибка</entry>
<entry key="205">Загрузить</entry>
@@ -230,7 +222,6 @@
<entry key="216">Адрес получателя</entry>
<entry key="217">Сообщение</entry>
<entry key="218">Отправить</entry>
- <entry key="219">Отменить</entry>
<entry key="220">Отправить</entry>
<entry key="221">Данные пользователя</entry>
<entry key="222">Ник для данной конференции</entry>
@@ -407,7 +398,6 @@
<entry key="417">Запись:</entry>
<entry key="418">Кто-то уже записывает в данный момент:</entry>
<entry key="419">Идет запись! Участник:</entry>
- <entry key="420">отмена</entry>
<entry key="421">Запись будет отменена и не будет записана.</entry>
<entry key="422">продолжить</entry>
<entry key="423">Закрыть окно и продолжить запись</entry>
@@ -425,7 +415,6 @@
<entry key="435">Имя</entry>
<entry key="436">Комната</entry>
<entry key="437">Дата</entry>
- <entry key="438">отменить</entry>
<entry key="439">старт</entry>
<entry key="440">Имя</entry>
<entry key="441">Дата</entry>
@@ -573,7 +562,6 @@
<entry key="592">Загружено, конвертация документа</entry>
<entry key="593">Начать</entry>
<entry key="594">Импорт файла. Выберите файл на вашем компьютере.</entry>
- <entry key="595">Отмена</entry>
<entry key="596">Выбрать файл</entry>
<entry key="597">Соединения</entry>
<entry key="598">Значение</entry>
@@ -669,7 +657,6 @@
<entry key="694">желает рисовать на доске. Для того, чтобы разрешить или запретить рисовать на доске, используйте иконки статуса рядом с именами в списке участников.</entry>
<entry key="695">желает сделать своё Аудио/Видео общим. Для того, чтобы разрешить или запретить участникам делать Аудио/Видео общим, используйте иконки статуса рядом с именами в списке участников.</entry>
<entry key="696">Нужно подождать, пока модератор войдёт в комнату.</entry>
- <entry key="697">Отменить</entry>
<entry key="698">Сохранить</entry>
<entry key="699">День</entry>
<entry key="700">Месяц</entry>
@@ -714,7 +701,6 @@
<entry key="740">Ширина:</entry>
<entry key="741">Высота:</entry>
<entry key="742">Соединение завершено сервером</entry>
- <entry key="743">Отмена</entry>
<entry key="744">Запустить внешний</entry>
<entry key="745">Полностью закрыв сессию, вы не сможете больше перезапустить просмотрщик для неё</entry>
<entry key="746">Подтвердите закрытие сессии просмотрщика</entry>
@@ -731,7 +717,6 @@
<entry key="757">Настройки теста</entry>
<entry key="758">Проверьте установки микрофона и камеры перед тем, как войти в комнату. Запишите 5-секундное тестовое видео. После записи можно проиграть видео и проверить качество картинки и звука.</entry>
<entry key="759">Больше не показывать этот текст</entry>
- <entry key="760">Отмена</entry>
<entry key="761">К конференции</entry>
<entry key="762">Больше не спрашивать</entry>
<entry key="763">ЗАПИСЬ</entry>
@@ -882,7 +867,6 @@
<entry key="915">Запись интервью уже начата.</entry>
<entry key="916">Запись уже остановлена или ещё не начата.</entry>
<entry key="917">Запись этого интервью уже начата!</entry>
- <entry key="918">Отменить</entry>
<entry key="919">Обработка интервью занимает 5 минут на каждую минуту интервью. Текущий прогресс обработки:</entry>
<entry key="921">Авто-генерация SIP</entry>
<entry key="922">Вы не можете переместить этот файл или папку в его собственную подпапку!</entry>
@@ -977,7 +961,6 @@
<entry key="1012"></entry>
<entry key="1013">Пользователи в новой групповой комнате:</entry>
<entry key="1014">Создать групповую комнату</entry>
- <entry key="1015">Отмена</entry>
<entry key="1016">Выберите хотя бы одного пользователя для комнаты!</entry>
<entry key="1017">Добавить пользователя в группу</entry>
<entry key="1018">Удалить пользователя из комнаты</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">Не показывать информацию о копировании и вставке в удалённом доступе</entry>
<entry key="1128">Сохранить</entry>
<entry key="1129">Удалить</entry>
- <entry key="1130">Отменить</entry>
<entry key="1131">Пригласить польз-ля в комнату для конференций</entry>
<entry key="1132">Выбрать комнату для конференций. Приглашённый участник получит сообщение с вашим именем и ссылку на комнату.</entry>
<entry key="1133">Присоединён с:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index dff9bec..4212609 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">Vytvoriť</entry>
<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="28">Hlasovanie</entry>
<entry key="29">Musíte byť moderátor pre vytvorenie otázky</entry>
<entry key="30">Váš hlas bol zaznamenaný</entry>
@@ -72,13 +71,12 @@
<entry key="52">Vybrať webkameru</entry>
<entry key="53">Vybrať mikrofón</entry>
<entry key="54">OK</entry>
- <entry key="55">Zrušiť</entry>
+ <entry key="lbl.cancel">Zrušiť</entry>
<entry key="56">Musíte sa znovu pripojiť</entry>
<entry key="57">Upraviť nastavenia</entry>
<entry key="58">Kurz</entry>
<entry key="59">Jazyk</entry>
<entry key="60">OK</entry>
- <entry key="61">Zrušiť</entry>
<entry key="62">Zmazať tabuľu</entry>
<entry key="63">Chcete zmazať tabuľu pred vložením nového obrázka?</entry>
<entry key="64">Nepýtať sa ma znova</entry>
@@ -100,7 +98,6 @@
<entry key="80">Zmazať vybranú položku</entry>
<entry key="81">Požiadať o moderáciu</entry>
<entry key="82">Aplikovať</entry>
- <entry key="83">Zrušiť</entry>
<entry key="84">Nemám otázku</entry>
<entry key="85">Zatvoriť</entry>
<entry key="86">ležatý</entry>
@@ -109,7 +106,6 @@
<entry key="89">Používateľ požiadal o moderáciu. Môžte mu sprístupniť len prístup k tabuli, alebo plnú moderáciu. Používateľ:</entry>
<entry key="90">Prijať</entry>
<entry key="91">Odmietnuť</entry>
- <entry key="92">Zrušiť</entry>
<entry key="93">Posielanie žiadosti nasledovným používateľom</entry>
<entry key="94">Potvrdené</entry>
<entry key="95">Odmietnuté</entry>
@@ -134,7 +130,6 @@
<entry key="119">Email</entry>
<entry key="120">Krajina</entry>
<entry key="121">Registrovať</entry>
- <entry key="122">Zrušiť</entry>
<entry key="123">Nie ste členom?</entry>
<entry key="124">Domov</entry>
<entry key="125">Používatelia</entry>
@@ -165,7 +160,6 @@
<entry key="150">Ďalšie</entry>
<entry key="151">Predchádzajúce</entry>
<entry key="152">Zmazať nahrávku</entry>
- <entry key="153">Zrušiť</entry>
<entry key="154">Zmazať</entry>
<entry key="155">Nové nahrávanie</entry>
<entry key="157">Zmazať nahrávku</entry>
@@ -185,7 +179,6 @@
<entry key="171">Meno</entry>
<entry key="172">Pridať organizáciu</entry>
<entry key="173">Pridať organizáciu</entry>
- <entry key="174">Zrušiť</entry>
<entry key="175">Pridať</entry>
<entry key="176">Odstrániť organizáciu</entry>
<entry key="177">Používateľ</entry>
@@ -213,7 +206,6 @@
<entry key="199">Uložiť ako</entry>
<entry key="200">Meno súboru</entry>
<entry key="201">Meno súboru</entry>
- <entry key="202">Zrušiť</entry>
<entry key="203">Uložiť</entry>
<entry key="204">Chyba</entry>
<entry key="205">Nahrávanie</entry>
@@ -230,7 +222,6 @@
<entry key="216">Príjemca</entry>
<entry key="217">Správa</entry>
<entry key="218">Poslať</entry>
- <entry key="219">Zrušiť</entry>
<entry key="220">Poslať</entry>
<entry key="221">Informácie o používateľovi</entry>
<entry key="222">Vaša prezývka pre túto miestnosť</entry>
@@ -407,7 +398,6 @@
<entry key="417">Nahrávanie</entry>
<entry key="418">Niekto už nahráva túto miestnosť</entry>
<entry key="419">Nahrávanie. Používateľ:</entry>
- <entry key="420">Zrušiť</entry>
<entry key="421">Nahrávanie bude zrušené a neuloží sa</entry>
<entry key="422">výsledok</entry>
<entry key="423">Zavrieť toto okno a zhrnúť nahrávanie</entry>
@@ -425,7 +415,6 @@
<entry key="435">Meno</entry>
<entry key="436">Miestnosť</entry>
<entry key="437">Dátum</entry>
- <entry key="438">Zrušiť</entry>
<entry key="439">Začať</entry>
<entry key="440">Meno</entry>
<entry key="441">Dátum</entry>
@@ -573,7 +562,6 @@
<entry key="592">Nahratie kompletné, konvertujem dokument</entry>
<entry key="593">Začať nahrávanie</entry>
<entry key="594">Nahrať a importovať dialóg. Prosím vyberte súbor.</entry>
- <entry key="595">Zrušiť</entry>
<entry key="596">Vybrať súbor</entry>
<entry key="597">Pripojenia</entry>
<entry key="598">Hodnota</entry>
@@ -669,7 +657,6 @@
<entry key="694">chce písať na tabuľu</entry>
<entry key="695">chce zdieľať svoje audio/video</entry>
<entry key="696">Musíte počkať pokiaľ moderátor vstúpi do miestnosti</entry>
- <entry key="697">Zrušiť</entry>
<entry key="698">Uložiť</entry>
<entry key="699">Deň</entry>
<entry key="700">Mesiac</entry>
@@ -714,7 +701,6 @@
<entry key="740">Šírka:</entry>
<entry key="741">Výška:</entry>
<entry key="742">Spojenie zavreté serverom</entry>
- <entry key="743">Zrušiť</entry>
<entry key="744">Začať Java</entry>
<entry key="745">Ak zavriete toto stretnutie, nebudete môcť reštartovať prehliadač pre toto stretnutie</entry>
<entry key="746">Potvrdiť zavretie okna</entry>
@@ -731,7 +717,6 @@
<entry key="757">Testovať nastavenie</entry>
<entry key="758">Otestovať audio alebo video nastavenie pred vstupom do miestnosti môžte nahratím stretnutia na pár sekúnd. Môžte si potom prehrať nahrávku a skontrolovať svoje audio/video.</entry>
<entry key="759">Tento test nezobrazovať viac</entry>
- <entry key="760">Zrušiť</entry>
<entry key="761">Začať stretnutie</entry>
<entry key="762">Nepýtať sa znova</entry>
<entry key="763">REC</entry>
@@ -882,7 +867,6 @@
<entry key="915">Nahrávanie rozhovoru už prebieha.</entry>
<entry key="916">Nahrávanie je zastavené alebo ešte nezačalo.</entry>
<entry key="917">Nahrávanie rozhovoru už prebieha!</entry>
- <entry key="918">Zrušiť</entry>
<entry key="919">Spracovanie rozhovoru zaberie 5 minút za každú 1 min nahrávky. Súčasný status spracovania je:</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">Nemôžte premiestniť súbor do jeho podsúboru!</entry>
@@ -977,7 +961,6 @@
<entry key="1012"></entry>
<entry key="1013">Používatelia pre novú tímovú miestnosť:</entry>
<entry key="1014">Vytvoriť tímovú miestnosť</entry>
- <entry key="1015">Zrušiť</entry>
<entry key="1016">Vyberte aspoň 1 používateľa pre tímovú miestnosť!</entry>
<entry key="1017">Pridať používateľa pre tím</entry>
<entry key="1018">Odstrániť používateľa z tímovej miestnosti</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">Do not show info box in Remote Control about Copy and Paste</entry>
<entry key="1128">Save</entry>
<entry key="1129">Remove</entry>
- <entry key="1130">Cancel</entry>
<entry key="1131">Invite user to conference room</entry>
<entry key="1132">Choose a conference room. The invited user will get a message with your name and a link to the room.</entry>
<entry key="1133">Connected since:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 7d0ccc6..cabc2de 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">Skapa</entry>
<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="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>
@@ -72,13 +71,12 @@
<entry key="52">Välj webcam:</entry>
<entry key="53">Välj mikrofon:</entry>
<entry key="54">ok</entry>
- <entry key="55">Avbryt</entry>
+ <entry key="lbl.cancel">Avbryt</entry>
<entry key="56">Återanslut.</entry>
<entry key="57">Ändra setup.</entry>
<entry key="58">Kurs:</entry>
<entry key="59">Språk:</entry>
<entry key="60">Ok</entry>
- <entry key="61">Avbryt</entry>
<entry key="62">Rensa skrivbordet</entry>
<entry key="63">Vill du att skrivbordet skall rensas innan du lägger till en ny bild?</entry>
<entry key="64">Fråga inte igen</entry>
@@ -100,7 +98,6 @@
<entry key="80">radera valt objekt</entry>
<entry key="81">Lägg till för moderation</entry>
<entry key="82">Lägg till</entry>
- <entry key="83">Avbryt</entry>
<entry key="84">Bli moderator</entry>
<entry key="85">Stäng</entry>
<entry key="86">italic</entry>
@@ -109,7 +106,6 @@
<entry key="89">En användare väntar för att bli moderator:</entry>
<entry key="90">Acceptera</entry>
<entry key="91">Neka</entry>
- <entry key="92">Avbryt</entry>
<entry key="93">Skicka fråga till följande användare</entry>
<entry key="94">Accepterad</entry>
<entry key="95">Nekad</entry>
@@ -134,7 +130,6 @@
<entry key="119">E-post:</entry>
<entry key="120">Land:</entry>
<entry key="121">Registrera</entry>
- <entry key="122">Avbryt</entry>
<entry key="123">Registrera</entry>
<entry key="124">Hem</entry>
<entry key="125">Användare</entry>
@@ -165,7 +160,6 @@
<entry key="150">Visa nästa</entry>
<entry key="151">Visa föregående</entry>
<entry key="152">Radera innehåll</entry>
- <entry key="153">Avbryt</entry>
<entry key="154">Radera</entry>
<entry key="155">Nytt innehåll</entry>
<entry key="157">Radera innehåll</entry>
@@ -185,7 +179,6 @@
<entry key="171">Namn</entry>
<entry key="172">Lägg till organisation</entry>
<entry key="173">Lägg till organisation</entry>
- <entry key="174">Avbryt</entry>
<entry key="175">Lägg till</entry>
<entry key="176">Ta bort organisation</entry>
<entry key="177">Användare</entry>
@@ -213,7 +206,6 @@
<entry key="199">Spara som</entry>
<entry key="200">Filnamn</entry>
<entry key="201">Filnamn</entry>
- <entry key="202">Avbryt</entry>
<entry key="203">Spara</entry>
<entry key="204">Bearbetar</entry>
<entry key="205">Laddar</entry>
@@ -230,7 +222,6 @@
<entry key="216">Mottagare</entry>
<entry key="217">Meddelande</entry>
<entry key="218">Skicka</entry>
- <entry key="219">Avbryt</entry>
<entry key="220">Skicka</entry>
<entry key="221">Användardata</entry>
<entry key="222">Ditt alias i denna konferens</entry>
@@ -407,7 +398,6 @@
<entry key="417">Inspelning:</entry>
<entry key="418">Det är redan någon som spelar in:</entry>
<entry key="419">Inspelning! Av användare:</entry>
- <entry key="420">Avbryt</entry>
<entry key="421">Inspelningen kommer att avbryts och inte heller sparas.</entry>
<entry key="422">Återuppta</entry>
<entry key="423">Stäng det här fönstret och återuppta inspelningen</entry>
@@ -425,7 +415,6 @@
<entry key="435">Namn</entry>
<entry key="436">Rum</entry>
<entry key="437">Datum</entry>
- <entry key="438">Avbryt</entry>
<entry key="439">Starta</entry>
<entry key="440">Namn</entry>
<entry key="441">Datum</entry>
@@ -573,7 +562,6 @@
<entry key="592">Uppladdning klar, konverterar Dokument ...</entry>
<entry key="593">Påbörja Uppladdning</entry>
<entry key="594">Dialog för Uppladdning och Importering. Var vänlig välj en Fil från din Hårdskiva.</entry>
- <entry key="595">Avbryt</entry>
<entry key="596">Välj Fil</entry>
<entry key="597">Anslutningar</entry>
<entry key="598">Värde</entry>
@@ -669,7 +657,6 @@
<entry key="694">vill rita på Whiteboarden. Använd Statusikonerna i Användarlistan för att dela ut och ta bort rättigheter att rita på Whiteboarden.</entry>
<entry key="695">vill publicera Ljud/Video. Använd Statusikonerna i Användarlistan för att dela ut och ta bort rättigheter att publicera Ljud/Video.</entry>
<entry key="696">Du måste vänta tills en Moderator har stigit in i rummet.</entry>
- <entry key="697">Avbryt</entry>
<entry key="698">Spara</entry>
<entry key="699">Dag</entry>
<entry key="700">Månad</entry>
@@ -714,7 +701,6 @@
<entry key="740">Width:</entry>
<entry key="741">Height:</entry>
<entry key="742">Connection was closed by Server</entry>
- <entry key="743">Cancel</entry>
<entry key="744">Start External</entry>
<entry key="745">If you close this session completely you are not able to restart the viewer for this session.</entry>
<entry key="746">Confirm Closing Viewer Session</entry>
@@ -731,7 +717,6 @@
<entry key="757">Test Setup</entry>
<entry key="758">Check you Microphone and Camera setup before you enter a room by recording some seconds. You can then replay your recording to check your voice and picture.</entry>
<entry key="759">Don't show this test anymore</entry>
- <entry key="760">Cancel</entry>
<entry key="761">Start Conference</entry>
<entry key="762">Do not ask again</entry>
<entry key="763">REC</entry>
@@ -882,7 +867,6 @@
<entry key="915">The recording of the Interview is already started.</entry>
<entry key="916">The recording is already stopped or not been started yet.</entry>
<entry key="917">The recording for this interview is already started!</entry>
- <entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
@@ -977,7 +961,6 @@
<entry key="1012"></entry>
<entry key="1013">Users for the new Team-Room:</entry>
<entry key="1014">Create Team-Room</entry>
- <entry key="1015">Cancel</entry>
<entry key="1016">Choose at least one user for the Team-Room!</entry>
<entry key="1017">Add user to team</entry>
<entry key="1018">Remove user from Team-Room</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">Do not show info box in Remote Control about Copy and Paste</entry>
<entry key="1128">Save</entry>
<entry key="1129">Remove</entry>
- <entry key="1130">Cancel</entry>
<entry key="1131">Invite user to conference room</entry>
<entry key="1132">Choose a conference room. The invited user will get a message with your name and a link to the room.</entry>
<entry key="1133">Connected since:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 45e182b..5144105 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">จัดทำ</entry>
<entry key="23">ข้อมูล: ผู้ใช้ที่เชื่อมต่ออยู่แต่ละรายได้รับข้อความพร้อมด้วยโพลล์ใหม่</entry>
<entry key="24">จัดทำโพลล์</entry>
- <entry key="25">ยกเลิก</entry>
<entry key="28">โพลล์</entry>
<entry key="29">ต้องเป็นผู้ดำเนินรายการจึงจะตั้งคำถามได้</entry>
<entry key="30">การโหวตของคุณได้รับการลงทะเบียนแล้ว</entry>
@@ -72,13 +71,12 @@
<entry key="52">เลือกเว็บแคม:</entry>
<entry key="53">เลือกไมโครโฟน:</entry>
<entry key="54">ตกลง</entry>
- <entry key="55">ยกเลิก</entry>
+ <entry key="lbl.cancel">ยกเลิก</entry>
<entry key="56">คุณต้องทำการเชื่อมต่อใหม่</entry>
<entry key="57">แก้ไขการตั้งค่า</entry>
<entry key="58">หลักสูตร:</entry>
<entry key="59">ภาษา:</entry>
<entry key="60">ตกลง</entry>
- <entry key="61">ยกเลิก</entry>
<entry key="62">ลบไวท์บอร์ด</entry>
<entry key="63">คุณต้องการให้ลบไวท์บอร์ดให้ว่างก่อนที่จะเพิ่มรูปใหม่หรือไม่</entry>
<entry key="64">ไม่ต้องถามอีก</entry>
@@ -100,7 +98,6 @@
<entry key="80">ลบรายการที่เลือกไว้</entry>
<entry key="81">สมัครเพื่อทำหน้าที่ดำเนินรายการ</entry>
<entry key="82">สมัคร</entry>
- <entry key="83">ยกเลิก</entry>
<entry key="84">กลายเป็นผู้ดำเนินรายการ</entry>
<entry key="85">ปิด</entry>
<entry key="86">ตัวเอียง</entry>
@@ -109,7 +106,6 @@
<entry key="89">ผู้ใช้ต้องการสมัครเป็นผู้ดำเนินรายการ:</entry>
<entry key="90">ยอมรับ</entry>
<entry key="91">ปฏิเสธ</entry>
- <entry key="92">ยกเลิก</entry>
<entry key="93">ส่งคำขอไปยังผู้ใช้ดังต่อไปนี้</entry>
<entry key="94">ยอมรับแล้ว</entry>
<entry key="95">ปฏิเสธแล้ว</entry>
@@ -134,7 +130,6 @@
<entry key="119">อีเมล์:</entry>
<entry key="120">ประเทศ:</entry>
<entry key="121">ลงทะเบียน</entry>
- <entry key="122">ยกเลิก</entry>
<entry key="123">ไม่ได้เป็นสมาชิก?</entry>
<entry key="124">หน้าแรก</entry>
<entry key="125">ผู้ใช้</entry>
@@ -165,7 +160,6 @@
<entry key="150">แสดงถัดไป</entry>
<entry key="151">แสดงก่อนหน้านี้</entry>
<entry key="152">ลบบันทึก</entry>
- <entry key="153">ยกเลิก</entry>
<entry key="154">ลบ</entry>
<entry key="155">บันทึกใหม่</entry>
<entry key="157">ลบบันทึก</entry>
@@ -185,7 +179,6 @@
<entry key="171">ชื่อ</entry>
<entry key="172">เพิ่มองค์กร</entry>
<entry key="173">เพิ่มองค์กร</entry>
- <entry key="174">ยกเลิก</entry>
<entry key="175">เพิ่ม</entry>
<entry key="176">ย้ายองค์กรออก</entry>
<entry key="177">ผู้ใช้</entry>
@@ -213,7 +206,6 @@
<entry key="199">บันทึกเป็น</entry>
<entry key="200">ชื่อไฟล์</entry>
<entry key="201">ชื่อไฟล์</entry>
- <entry key="202">ยกเลิก</entry>
<entry key="203">ยกเลิก</entry>
<entry key="204">ขัดข้อง</entry>
<entry key="205">กำลังโหลด</entry>
@@ -230,7 +222,6 @@
<entry key="216">ผู้รับ</entry>
<entry key="217">ข้อความ</entry>
<entry key="218">ส่ง</entry>
- <entry key="219">ยกเลิก</entry>
<entry key="220">ส่ง</entry>
<entry key="221">ข้อมูลผู้ใช้</entry>
<entry key="222">ชื่อเล่นของคุณในการประชุมครั้งนี้</entry>
@@ -407,7 +398,6 @@
<entry key="417">Recording: / บันทึก:</entry>
<entry key="418">มีคนกำลังบันทึกอยู่ในขณะนี้</entry>
<entry key="419">กำลังบันทึก! โดยผู้ใช้:</entry>
- <entry key="420">ยกเลิก</entry>
<entry key="421">การบันทึกจะถูกยกเลิกและไม่บันทึกไว้</entry>
<entry key="422">เล่นต่อ</entry>
<entry key="423">ปิดหน้าต่างนี้และกลับเข้าสู่การบันทึก</entry>
@@ -425,7 +415,6 @@
<entry key="435">ชื่อ</entry>
<entry key="436">ห้อง</entry>
<entry key="437">วันที่</entry>
- <entry key="438">ยกเลิก</entry>
<entry key="439">เริ่ม</entry>
<entry key="440">ชื่อ</entry>
<entry key="441">วันที่</entry>
@@ -573,7 +562,6 @@
<entry key="592">Upload complete, converting Document ...</entry>
<entry key="593">Start Upload</entry>
<entry key="594">Upload and Import Dialog. Please select a File from your Disk.</entry>
- <entry key="595">Cancel</entry>
<entry key="596">Select File</entry>
<entry key="597">Connections</entry>
<entry key="598">Value</entry>
@@ -669,7 +657,6 @@
<entry key="694">would like to draw on whiteboard. Use the status Icons next to the user in the List of Users to add or remove the right to draw anything on the whiteboard.</entry>
<entry key="695">would like to share his Audio/Video. Use the status Icons next to the user in the List of Users to add or remove the right to share Audio/Video for any User.</entry>
<entry key="696">You have to wait untill a Moderator enters the room.</entry>
- <entry key="697">Cancel</entry>
<entry key="698">Save</entry>
<entry key="699">Day</entry>
<entry key="700">Month</entry>
@@ -714,7 +701,6 @@
<entry key="740">Width:</entry>
<entry key="741">Height:</entry>
<entry key="742">Connection was closed by Server</entry>
- <entry key="743">Cancel</entry>
<entry key="744">Start External</entry>
<entry key="745">If you close this session completely you are not able to restart the viewer for this session.</entry>
<entry key="746">Confirm Closing Viewer Session</entry>
@@ -731,7 +717,6 @@
<entry key="757">Test Setup</entry>
<entry key="758">Check you Microphone and Camera setup before you enter a room by recording some seconds. You can then replay your recording to check your voice and picture.</entry>
<entry key="759">Don't show this test anymore</entry>
- <entry key="760">Cancel</entry>
<entry key="761">Start Conference</entry>
<entry key="762">Do not ask again</entry>
<entry key="763">REC</entry>
@@ -882,7 +867,6 @@
<entry key="915">The recording of the Interview is already started.</entry>
<entry key="916">The recording is already stopped or not been started yet.</entry>
<entry key="917">The recording for this interview is already started!</entry>
- <entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
@@ -977,7 +961,6 @@
<entry key="1012"></entry>
<entry key="1013">Users for the new Team-Room:</entry>
<entry key="1014">Create Team-Room</entry>
- <entry key="1015">Cancel</entry>
<entry key="1016">Choose at least one user for the Team-Room!</entry>
<entry key="1017">Add user to team</entry>
<entry key="1018">Remove user from Team-Room</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">Do not show info box in Remote Control about Copy and Paste</entry>
<entry key="1128">Save</entry>
<entry key="1129">Remove</entry>
- <entry key="1130">Cancel</entry>
<entry key="1131">Invite user to conference room</entry>
<entry key="1132">Choose a conference room. The invited user will get a message with your name and a link to the room.</entry>
<entry key="1133">Connected since:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index ca520a4..845d3d7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">Yarat</entry>
<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="28">Anket</entry>
<entry key="29">Soru oluşturabilmek için Düzenleyici olmanız gerekmekte</entry>
<entry key="30">Oyunuz kaydedildi.</entry>
@@ -72,13 +71,12 @@
<entry key="52">Web Kamerası seçiniz:</entry>
<entry key="53">Mikrofon seçiniz:</entry>
<entry key="54">tamam</entry>
- <entry key="55">iptal</entry>
+ <entry key="lbl.cancel">iptal</entry>
<entry key="56">Yeniden bağlanmanız gerekmekte.</entry>
<entry key="57">Ayarları düzenle.</entry>
<entry key="58">Ders:</entry>
<entry key="59">Dil:</entry>
<entry key="60">tamam</entry>
- <entry key="61">iptal</entry>
<entry key="62">Tahtayı temizle</entry>
<entry key="63">Yeni resim eklenmeden önce tahtanın temizlenmesini istiyor musunuz?</entry>
<entry key="64">Tekrar sormayın</entry>
@@ -100,7 +98,6 @@
<entry key="80">Seçili öğeyi sil</entry>
<entry key="81">Düzenleme için uygula</entry>
<entry key="82">uygula</entry>
- <entry key="83">iptal</entry>
<entry key="84">Düzenleyici ol</entry>
<entry key="85">kapat</entry>
<entry key="86">eğik</entry>
@@ -109,7 +106,6 @@
<entry key="89">Düzenleyicilik için bir kullanıcı bekleniyor:</entry>
<entry key="90">onay</entry>
<entry key="91">reddet</entry>
- <entry key="92">iptal</entry>
<entry key="93">Bu kullanıcılar için istek gönder</entry>
<entry key="94">Onaylandı</entry>
<entry key="95">Reddedildi</entry>
@@ -134,7 +130,6 @@
<entry key="119">E-posta:</entry>
<entry key="120">Ülke:</entry>
<entry key="121">Kayıt</entry>
- <entry key="122">İptal</entry>
<entry key="123">Üye değil misiniz?</entry>
<entry key="124">Ev</entry>
<entry key="125">Kullanıcılar</entry>
@@ -165,7 +160,6 @@
<entry key="150">sonrakini göster</entry>
<entry key="151">öncekini göster</entry>
<entry key="152">kaydı sil</entry>
- <entry key="153">iptal</entry>
<entry key="154">sil</entry>
<entry key="155">yeni kayıt</entry>
<entry key="157">kayıt sil</entry>
@@ -185,7 +179,6 @@
<entry key="171">ad</entry>
<entry key="172">kurum ekle</entry>
<entry key="173">kurum ekle</entry>
- <entry key="174">iptal</entry>
<entry key="175">ekle</entry>
<entry key="176">kurumu kaldır</entry>
<entry key="177">kullanıcı</entry>
@@ -213,7 +206,6 @@
<entry key="199">farklı kaydet</entry>
<entry key="200">Dosya adı</entry>
<entry key="201">dosya adı</entry>
- <entry key="202">iptal</entry>
<entry key="203">kaydet</entry>
<entry key="204">hata</entry>
<entry key="205">yükleniyor</entry>
@@ -230,7 +222,6 @@
<entry key="216">Alıcı</entry>
<entry key="217">Mesaj</entry>
<entry key="218">Yolla</entry>
- <entry key="219">İptal</entry>
<entry key="220">gönder</entry>
<entry key="221">Kullanıcı verisi</entry>
<entry key="222">Bu konferans için takma adınız</entry>
@@ -407,7 +398,6 @@
<entry key="417">Kayıt:</entry>
<entry key="418">Şu an zaten biri kayıtta:</entry>
<entry key="419">Kayıt! Kullanıcıya göre:</entry>
- <entry key="420">iptal</entry>
<entry key="421">Kayıt iptal edilecek ve kaydedilmeyecek.</entry>
<entry key="422">devam et</entry>
<entry key="423">Bu pencereyi kapat ve kayda devam et</entry>
@@ -425,7 +415,6 @@
<entry key="435">Ad</entry>
<entry key="436">Oda</entry>
<entry key="437">Tarih</entry>
- <entry key="438">iptal</entry>
<entry key="439">başlat</entry>
<entry key="440">Ad</entry>
<entry key="441">Tarih</entry>
@@ -573,7 +562,6 @@
<entry key="592">Aktarım tamamlandı, belge dönüştürülüyor ...</entry>
<entry key="593">Aktarımı Başlat</entry>
<entry key="594">Aktarım ve Yükleme Penceresi. Lütfen Diskinizden bir Dosya seçiniz.</entry>
- <entry key="595">İptal</entry>
<entry key="596">Dosya Seç</entry>
<entry key="597">Bağlantılar</entry>
<entry key="598">Değer</entry>
@@ -669,7 +657,6 @@
<entry key="694">tahtayı düzenlemek istiyor. Kullanıcıya bu hakkı vermek istiyorsanız durum simgelerini kullanın.</entry>
<entry key="695">Ses ve Görüntüsünü paylaşmak istiyor. Kullanıcıya bu hakkı vermek istiyorsanız durum simgelerini kullanın.</entry>
<entry key="696">Düzenleyici odaya giriş yapana kadar beklemelisiniz.</entry>
- <entry key="697">İptal</entry>
<entry key="698">Kaydet</entry>
<entry key="699">Gün</entry>
<entry key="700">Ay</entry>
@@ -714,7 +701,6 @@
<entry key="740">Width:</entry>
<entry key="741">Height:</entry>
<entry key="742">Connection was closed by Server</entry>
- <entry key="743">Cancel</entry>
<entry key="744">Start External</entry>
<entry key="745">If you close this session completely you are not able to restart the viewer for this session.</entry>
<entry key="746">Confirm Closing Viewer Session</entry>
@@ -731,7 +717,6 @@
<entry key="757">Test Setup</entry>
<entry key="758">Check you Microphone and Camera setup before you enter a room by recording some seconds. You can then replay your recording to check your voice and picture.</entry>
<entry key="759">Don't show this test anymore</entry>
- <entry key="760">Cancel</entry>
<entry key="761">Start Conference</entry>
<entry key="762">Do not ask again</entry>
<entry key="763">REC</entry>
@@ -882,7 +867,6 @@
<entry key="915">The recording of the Interview is already started.</entry>
<entry key="916">The recording is already stopped or not been started yet.</entry>
<entry key="917">The recording for this interview is already started!</entry>
- <entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
@@ -977,7 +961,6 @@
<entry key="1012"></entry>
<entry key="1013">Users for the new Team-Room:</entry>
<entry key="1014">Create Team-Room</entry>
- <entry key="1015">Cancel</entry>
<entry key="1016">Choose at least one user for the Team-Room!</entry>
<entry key="1017">Add user to team</entry>
<entry key="1018">Remove user from Team-Room</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">Do not show info box in Remote Control about Copy and Paste</entry>
<entry key="1128">Save</entry>
<entry key="1129">Remove</entry>
- <entry key="1130">Cancel</entry>
<entry key="1131">Invite user to conference room</entry>
<entry key="1132">Choose a conference room. The invited user will get a message with your name and a link to the room.</entry>
<entry key="1133">Connected since:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 92a3171..b7e6c35 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">Створити</entry>
<entry key="23">Інформація: кожен пов'язани користувач отримує повідомлення з новим опитуванням</entry>
<entry key="24">Створити опитування</entry>
- <entry key="25">Відмінити</entry>
<entry key="28">Опитування</entry>
<entry key="29">Для створення опитування Ви повинні бути модератором/інструктором даної кімнати.</entry>
<entry key="30">Ви проголосували.</entry>
@@ -72,13 +71,12 @@
<entry key="52">Обрати камеру:</entry>
<entry key="53">Обрати мікрофон:</entry>
<entry key="54">OK</entry>
- <entry key="55">Скасувати</entry>
+ <entry key="lbl.cancel">Скасувати</entry>
<entry key="56">Ви повинні ввійти знову, щоб активізувати зміни.</entry>
<entry key="57">Змінити налаштування.</entry>
<entry key="58">Курс:</entry>
<entry key="59">Мова:</entry>
<entry key="60">OK</entry>
- <entry key="61">Скасувати</entry>
<entry key="62">Очистити планшет</entry>
<entry key="63">Очистити планшет перед додаванням нового зображення?</entry>
<entry key="64">чистити планшет перед додаванням нового зображення</entry>
@@ -100,7 +98,6 @@
<entry key="80">Стерти обраний елемент</entry>
<entry key="81">Запит функції модератора</entry>
<entry key="82">Запит</entry>
- <entry key="83">Скасувати</entry>
<entry key="84">Отримати функцію модератора</entry>
<entry key="85">Закрити</entry>
<entry key="86">Курсив</entry>
@@ -109,7 +106,6 @@
<entry key="89">Користувач бажає отримати функцію модератора</entry>
<entry key="90">Згода</entry>
<entry key="91">Скасування</entry>
- <entry key="92">Скасувати</entry>
<entry key="93">Надсилання запиту наступному користувачу</entry>
<entry key="94">Дано згоду</entry>
<entry key="95">Скасовано</entry>
@@ -134,7 +130,6 @@
<entry key="119">E-Mail:</entry>
<entry key="120">Країна:</entry>
<entry key="121">Зареєструватись</entry>
- <entry key="122">Скасувати</entry>
<entry key="123">Регістр</entry>
<entry key="124">На головну</entry>
<entry key="125">Користувачі</entry>
@@ -165,7 +160,6 @@
<entry key="150">Вперед</entry>
<entry key="151">Назад</entry>
<entry key="152">Стерти запис</entry>
- <entry key="153">Скасувати</entry>
<entry key="154">Стери</entry>
<entry key="155">Створити запис</entry>
<entry key="157">Стерти запис</entry>
@@ -185,7 +179,6 @@
<entry key="171">Ім'я</entry>
<entry key="172">Додати організацію</entry>
<entry key="173">Додати організацію</entry>
- <entry key="174">Скасувати</entry>
<entry key="175">Додати</entry>
<entry key="176">Стерти організацію</entry>
<entry key="177">Користувач</entry>
@@ -213,7 +206,6 @@
<entry key="199">Зберегти як</entry>
<entry key="200">Ім'я файлу</entry>
<entry key="201">Ім'я файлу</entry>
- <entry key="202">Скасувати</entry>
<entry key="203">Зберегти</entry>
<entry key="204">Помилка</entry>
<entry key="205">Завантажити</entry>
@@ -230,7 +222,6 @@
<entry key="216">Адреса одержувача</entry>
<entry key="217">Повідомлення</entry>
<entry key="218">Відправити</entry>
- <entry key="219">Скасувати</entry>
<entry key="220">Відправити</entry>
<entry key="221">Данні користувача</entry>
<entry key="222">Нік для даної конфренції</entry>
@@ -407,7 +398,6 @@
<entry key="417">Запис:</entry>
<entry key="418">На даний момент хтось уже виконує запис:</entry>
<entry key="419">Запис! Користувач:</entry>
- <entry key="420">Скасувати</entry>
<entry key="421">Запису був скасований і не може бути збережений.</entry>
<entry key="422">Продовжити</entry>
<entry key="423">Закрити це вікно і продовжити запис</entry>
@@ -425,7 +415,6 @@
<entry key="435">Ім'я</entry>
<entry key="436">Кімната</entry>
<entry key="437">Дата</entry>
- <entry key="438">Відміна</entry>
<entry key="439">Старт</entry>
<entry key="440">Ім'я</entry>
<entry key="441">Дата</entry>
@@ -573,7 +562,6 @@
<entry key="592">Завантажено, конвертація документа</entry>
<entry key="593">Почати</entry>
<entry key="594">Імпорт файлу. Виберіть файл на вашому комп'ютері.</entry>
- <entry key="595">Скасувати</entry>
<entry key="596">Вибрати файл</entry>
<entry key="597">З'єднання</entry>
<entry key="598">Значення</entry>
@@ -669,7 +657,6 @@
<entry key="694">бажає малювати на дошці. Для того, щоб дозволити або заборонити малювати на дошці, використовуйте іконки статусу поруч з іменами в списку учасників.</entry>
<entry key="695">бажає зробити своє Аудіо/Відео загальним. Для того, щоб дозволити або заборонити учасникам робити Аудіо/Відео загальним, використовуйте іконки статусу поруч з іменами в списку учасників.</entry>
<entry key="696">Потрібно почекати, поки модератор увійде в кімнату.</entry>
- <entry key="697">Скасувати</entry>
<entry key="698">Зберегти</entry>
<entry key="699">День</entry>
<entry key="700">Місяць</entry>
@@ -714,7 +701,6 @@
<entry key="740">Ширина:</entry>
<entry key="741">Висота:</entry>
<entry key="742">З'єднання завершено сервером</entry>
- <entry key="743">Скасувати</entry>
<entry key="744">Запустити зовнішній</entry>
<entry key="745">Повністю закривши сесію, ви не зможете більше перезапустити переглядач для неї</entry>
<entry key="746">Підтвердіть закриття сесії переглядача</entry>
@@ -731,7 +717,6 @@
<entry key="757">Налаштування тесту</entry>
<entry key="758">Перевірте установки мікрофона та камери перед тим, як увійти в кімнату. Запишіть 5-секундне тестове відео. Після запису можна програти відео і перевірити якість зображення і звуку.</entry>
<entry key="759">не показувати цей текст</entry>
- <entry key="760">Скасувати</entry>
<entry key="761">До форуму</entry>
<entry key="762">Більше не питати</entry>
<entry key="763">ЗАПИС</entry>
@@ -882,7 +867,6 @@
<entry key="915">Запис інтерв'ю вже розпочато.</entry>
<entry key="916">Запис зупинена або ще не розпочато.</entry>
<entry key="917">Запис цього інтерв'ю вже розпочато!</entry>
- <entry key="918">Скасувати</entry>
<entry key="919">Обробка інтерв'ю займає 5 хвилин на кожну хвилину інтерв'ю. Поточний прогрес обробки:</entry>
<entry key="921">Авто-генерація SIP</entry>
<entry key="922">Ви не можете перемістити файл або папку в його власну папку!</entry>
@@ -977,7 +961,6 @@
<entry key="1012"></entry>
<entry key="1013">Користувачі нової груповій кімнаті:</entry>
<entry key="1014">Створити групову кімнату</entry>
- <entry key="1015">Скасувати</entry>
<entry key="1016">Виберіть хоча б одного користувача для кімнати!</entry>
<entry key="1017">Додати користувача до групи</entry>
<entry key="1018">Видалити користувача з кімнати</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">Не показувати інформацію про копіювання та вставлення у віддаленому доступі</entry>
<entry key="1128">Зберегти</entry>
<entry key="1129">Видалити</entry>
- <entry key="1130">Скасувати</entry>
<entry key="1131">Запросити корис-ля в кімнату для нарад</entry>
<entry key="1132">Вибрати кімнату для нарад. Запрошений учасник отримає повідомлення з вашим ім'ям і посилання на кімнату.</entry>
<entry key="1133">Приєднаний з:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 4a92830..734e2f8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">创建</entry>
<entry key="23">提示:每个连接用户将收到一个新投票的消息提示.</entry>
<entry key="24">创建投票</entry>
- <entry key="25">取消</entry>
<entry key="28">投票</entry>
<entry key="29">主持人才能提问</entry>
<entry key="30">已您的投票.</entry>
@@ -72,13 +71,12 @@
<entry key="52">请选择摄像头:</entry>
<entry key="53">请选择话筒:</entry>
<entry key="54">确定</entry>
- <entry key="55">取消</entry>
+ <entry key="lbl.cancel">取消</entry>
<entry key="56">需要从新连接.</entry>
<entry key="57">编辑设置.</entry>
<entry key="58">课题:</entry>
<entry key="59">语言:</entry>
<entry key="60">确定</entry>
- <entry key="61">取消</entry>
<entry key="62">清除白板</entry>
<entry key="63">新图片加入后清除白板?</entry>
<entry key="64">不再询问</entry>
@@ -100,7 +98,6 @@
<entry key="80">删除已选项</entry>
<entry key="81">接受主持</entry>
<entry key="82">应用</entry>
- <entry key="83">取消</entry>
<entry key="84">成为主持</entry>
<entry key="85">关闭</entry>
<entry key="86">斜体</entry>
@@ -109,7 +106,6 @@
<entry key="89">用户想申请为主持:</entry>
<entry key="90">接受</entry>
<entry key="91">拒绝</entry>
- <entry key="92">取消</entry>
<entry key="93">向下列用户发送请求</entry>
<entry key="94">接受</entry>
<entry key="95">拒绝</entry>
@@ -134,7 +130,6 @@
<entry key="119">邮件:</entry>
<entry key="120">国家:</entry>
<entry key="121">注册</entry>
- <entry key="122">取消</entry>
<entry key="123">注册</entry>
<entry key="124">首页</entry>
<entry key="125">用户管理</entry>
@@ -165,7 +160,6 @@
<entry key="150">显示下一个</entry>
<entry key="151">显示前一个</entry>
<entry key="152">删除记录</entry>
- <entry key="153">取消</entry>
<entry key="154">删除</entry>
<entry key="155">新记录</entry>
<entry key="157">删除记录</entry>
@@ -185,7 +179,6 @@
<entry key="171">名称</entry>
<entry key="172">添加组织</entry>
<entry key="173">添加组织</entry>
- <entry key="174">取消</entry>
<entry key="175">添加</entry>
<entry key="176">删除组织</entry>
<entry key="177">用户</entry>
@@ -213,7 +206,6 @@
<entry key="199">另存为</entry>
<entry key="200">文件名</entry>
<entry key="201">文件名</entry>
- <entry key="202">取消</entry>
<entry key="203">保存</entry>
<entry key="204">错误</entry>
<entry key="205">读取中</entry>
@@ -230,7 +222,6 @@
<entry key="216">收信人</entry>
<entry key="217">消息</entry>
<entry key="218">发送</entry>
- <entry key="219">取消</entry>
<entry key="220">发送</entry>
<entry key="221">用户数据</entry>
<entry key="222">会议昵称</entry>
@@ -407,7 +398,6 @@
<entry key="417">记录中:</entry>
<entry key="418">现在已经有人在记录:</entry>
<entry key="419">记录中! 记录用户:</entry>
- <entry key="420">取消</entry>
<entry key="421">记录将被取消且不被保存.</entry>
<entry key="422">继续</entry>
<entry key="423">关闭此窗口并且继续记录</entry>
@@ -425,7 +415,6 @@
<entry key="435">名称</entry>
<entry key="436">房间</entry>
<entry key="437">日期</entry>
- <entry key="438">取消</entry>
<entry key="439">开始</entry>
<entry key="440">名称</entry>
<entry key="441">日期</entry>
@@ -573,7 +562,6 @@
<entry key="592">上传结束, 正在转换文档 ...</entry>
<entry key="593">开始上传</entry>
<entry key="594">上传，导入对话框. 请从硬盘上选择一个文件.</entry>
- <entry key="595">取消</entry>
<entry key="596">选择文件</entry>
<entry key="597">连接</entry>
<entry key="598">值</entry>
@@ -669,7 +657,6 @@
<entry key="694">如果要在演示板上书写，请在用户列表中，通过该用户的状态图标添加或删除此用户的书写权限。</entry>
<entry key="695">如果要共享声音和视频，请在用户列表中，通过该用户的状态图标设置是否共享此用户的声音和图像。</entry>
<entry key="696">会议室中必需有一个主持人</entry>
- <entry key="697">取消</entry>
<entry key="698">保存</entry>
<entry key="699">日</entry>
<entry key="700">月</entry>
@@ -714,7 +701,6 @@
<entry key="740">宽：</entry>
<entry key="741">高：</entry>
<entry key="742">连接被服务器关闭</entry>
- <entry key="743">取消</entry>
<entry key="744">启动Java</entry>
<entry key="745">如果你关闭本次会话，你将不能再重启本次会话的共享浏览器！</entry>
<entry key="746">确认关闭浏览会话</entry>
@@ -731,7 +717,6 @@
<entry key="757">测试音频视频配置</entry>
<entry key="758">你在进入会议室前，可以使用音频视频测试来录制几秒钟的声音图像。然后通过回放你的录像录音来检查你的声音图像是否正常。</entry>
<entry key="759">下次不要再显示这个测试对话框</entry>
- <entry key="760">取消</entry>
<entry key="761">开始进入会议室</entry>
<entry key="762">不要再次询问</entry>
<entry key="763">录制</entry>
@@ -882,7 +867,6 @@
<entry key="915">会议视频录制已经开始</entry>
<entry key="916">视频录制已经停止，也可能还没开始</entry>
<entry key="917">会议视频录制已经开始d!</entry>
- <entry key="918">取消</entry>
<entry key="919">录制的视频后续处理每1分钟时间需5分钟时间来处理，正在转码处理的录制视频是:</entry>
<entry key="921">重新产生SIP数据</entry>
<entry key="922">您不能将文件或者文件夹移入自己所在的子目录!</entry>
@@ -977,7 +961,6 @@
<entry key="1012"></entry>
<entry key="1013">新团队会议室的所有成员：</entry>
<entry key="1014">创建团队会议室</entry>
- <entry key="1015">取消</entry>
<entry key="1016">至少为团队会议室选择一个用户</entry>
<entry key="1017">为团队增加用户</entry>
<entry key="1018">从团队会议室中移除该用户</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">不要在远程控制中显示拷贝和粘贴的信息框</entry>
<entry key="1128">保存</entry>
<entry key="1129">移除</entry>
- <entry key="1130">取消</entry>
<entry key="1131">邀请用户参与会议</entry>
<entry key="1132">选择一个会议室，被邀请者会受到一条您的名字和进入会议室的链接</entry>
<entry key="1133">连接时间:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 67dafe6..0d65a77 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -44,7 +44,6 @@
<entry key="22">建立</entry>
<entry key="23">信息:每個接入用戶收到新的民意信息</entry>
<entry key="24">創造一個新的民調</entry>
- <entry key="25">取诮</entry>
<entry key="28">民調</entry>
<entry key="29">必須是主持人能提出問題</entry>
<entry key="30">你的投票己登記</entry>
@@ -72,13 +71,12 @@
<entry key="52">選擇攝像机 :</entry>
<entry key="53">選擇麥克風 :</entry>
<entry key="54">设定好了</entry>
- <entry key="55">取消</entry>
+ <entry key="lbl.cancel">取消</entry>
<entry key="56">你需要重新連接 .</entry>
<entry key="57">編輯設定 .</entry>
<entry key="58">課程 :</entry>
<entry key="59">語言 :</entry>
<entry key="60">设定好了</entry>
- <entry key="61">取消</entry>
<entry key="62">清掉電子白板</entry>
<entry key="63">你想要在加圖片之前先清掉白板嗎?</entry>
<entry key="64">不要再問</entry>
@@ -100,7 +98,6 @@
<entry key="80">刪除選定項目</entry>
<entry key="81">申請成為主持人</entry>
<entry key="82">應用</entry>
- <entry key="83">取消</entry>
<entry key="84">成為主持人</entry>
<entry key="85">關閉</entry>
<entry key="86">斜體字</entry>
@@ -109,7 +106,6 @@
<entry key="89">有用户想申請成為主持人</entry>
<entry key="90">接受</entry>
<entry key="91">拒绝</entry>
- <entry key="92">取诮</entry>
<entry key="93">送出請求到以下的用戶</entry>
<entry key="94">接受</entry>
<entry key="95">拒绝</entry>
@@ -134,7 +130,6 @@
<entry key="119">郵件 :</entry>
<entry key="120">國家 :</entry>
<entry key="121">登記</entry>
- <entry key="122">取消</entry>
<entry key="123">登記</entry>
<entry key="124">首頁</entry>
<entry key="125">用戶管理</entry>
@@ -165,7 +160,6 @@
<entry key="150">顯示下一個</entry>
<entry key="151">顯示前一個</entry>
<entry key="152">刪除紀錄</entry>
- <entry key="153">取消</entry>
<entry key="154">刪除</entry>
<entry key="155">新紀錄</entry>
<entry key="157">刪除紀錄</entry>
@@ -185,7 +179,6 @@
<entry key="171">名稱</entry>
<entry key="172">增加組織</entry>
<entry key="173">增加組織</entry>
- <entry key="174">取消</entry>
<entry key="175">增加</entry>
<entry key="176">移除組織</entry>
<entry key="177">用戶</entry>
@@ -213,7 +206,6 @@
<entry key="199">另存為</entry>
<entry key="200">文件名稱</entry>
<entry key="201">文件名稱</entry>
- <entry key="202">取消</entry>
<entry key="203">保存</entry>
<entry key="204">錯誤</entry>
<entry key="205">輸入中</entry>
@@ -230,7 +222,6 @@
<entry key="216">受邀者</entry>
<entry key="217">信息</entry>
<entry key="218">送出</entry>
- <entry key="219">取消</entry>
<entry key="220">送出</entry>
<entry key="221">用戶資料</entry>
<entry key="222">你這次會議的別名</entry>
@@ -407,7 +398,6 @@
<entry key="417">錄影:</entry>
<entry key="418">現在已經有人在錄影:</entry>
<entry key="419">錄影！按用戶:</entry>
- <entry key="420">取消</entry>
<entry key="421">錄影將被取消，並不會被保存</entry>
<entry key="422">恢復</entry>
<entry key="423">關閉此窗口，並恢復錄影</entry>
@@ -425,7 +415,6 @@
<entry key="435">姓名</entry>
<entry key="436">房間</entry>
<entry key="437">日期</entry>
- <entry key="438">取消</entry>
<entry key="439">開始</entry>
<entry key="440">姓名</entry>
<entry key="441">日期</entry>
@@ -573,7 +562,6 @@
<entry key="592">Upload complete, converting Document ...</entry>
<entry key="593">Start Upload</entry>
<entry key="594">Upload and Import Dialog. Please select a File from your Disk.</entry>
- <entry key="595">Cancel</entry>
<entry key="596">Select File</entry>
<entry key="597">Connections</entry>
<entry key="598">Value</entry>
@@ -669,7 +657,6 @@
<entry key="694">would like to draw on whiteboard. Use the status Icons next to the user in the List of Users to add or remove the right to draw anything on the whiteboard.</entry>
<entry key="695">would like to share his Audio/Video. Use the status Icons next to the user in the List of Users to add or remove the right to share Audio/Video for any User.</entry>
<entry key="696">You have to wait untill a Moderator enters the room.</entry>
- <entry key="697">Cancel</entry>
<entry key="698">Save</entry>
<entry key="699">Day</entry>
<entry key="700">Month</entry>
@@ -714,7 +701,6 @@
<entry key="740">Width:</entry>
<entry key="741">Height:</entry>
<entry key="742">Connection was closed by Server</entry>
- <entry key="743">Cancel</entry>
<entry key="744">Start External</entry>
<entry key="745">If you close this session completely you are not able to restart the viewer for this session.</entry>
<entry key="746">Confirm Closing Viewer Session</entry>
@@ -731,7 +717,6 @@
<entry key="757">Test Setup</entry>
<entry key="758">Check you Microphone and Camera setup before you enter a room by recording some seconds. You can then replay your recording to check your voice and picture.</entry>
<entry key="759">Don't show this test anymore</entry>
- <entry key="760">Cancel</entry>
<entry key="761">Start Conference</entry>
<entry key="762">Do not ask again</entry>
<entry key="763">REC</entry>
@@ -882,7 +867,6 @@
<entry key="915">The recording of the Interview is already started.</entry>
<entry key="916">The recording is already stopped or not been started yet.</entry>
<entry key="917">The recording for this interview is already started!</entry>
- <entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
@@ -977,7 +961,6 @@
<entry key="1012"></entry>
<entry key="1013">Users for the new Team-Room:</entry>
<entry key="1014">Create Team-Room</entry>
- <entry key="1015">Cancel</entry>
<entry key="1016">Choose at least one user for the Team-Room!</entry>
<entry key="1017">Add user to team</entry>
<entry key="1018">Remove user from Team-Room</entry>
@@ -1092,7 +1075,6 @@
<entry key="1127">Do not show info box in Remote Control about Copy and Paste</entry>
<entry key="1128">Save</entry>
<entry key="1129">Remove</entry>
- <entry key="1130">Cancel</entry>
<entry key="1131">Invite user to conference room</entry>
<entry key="1132">Choose a conference room. The invited user will get a message with your name and a link to the room.</entry>
<entry key="1133">Connected since:</entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
index cf21638..3039752 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
@@ -33,7 +33,7 @@ public class InvitationDialog extends AbstractFormDialog<Invitation> {
private static final long serialVersionUID = 1L;
public final DialogButton generate = new DialogButton("generate", Application.getString("1526"));
public final DialogButton send = new DialogButton("send", Application.getString("218"));
- public final DialogButton cancel = new DialogButton("cancel", Application.getString("219"));
+ public final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
private final InvitationForm form;
public InvitationDialog(String id, final InvitationForm _form) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
index f83acee..8470e8e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
@@ -38,7 +38,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public abstract class NameDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private final DialogButton add;
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("219"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
private final Form<String> form;
protected final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final String name;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
index 60ed81d..36fbe79 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
@@ -173,7 +173,7 @@ public abstract class FileTreePanel extends Panel {
statement += "$( '#" + dialogId
+ "' ).dialog({ title: '" + escapeEcmaScript(getString("80")) + "', classes: {'ui-dialog-titlebar': 'ui-corner-all no-close'}, buttons: [";
statement += " { text: '" + escapeEcmaScript(getString("54")) + "', click: function() { $drop.append(ui.draggable); $(this).dialog('close'); " + super.getCallbackFunctionBody(parameters) + " } },";
- statement += " { text: '" + escapeEcmaScript(getString("25")) + "', click: function() { $(this).dialog('close'); } } ";
+ statement += " { text: '" + escapeEcmaScript(getString("lbl.cancel")) + "', click: function() { $(this).dialog('close'); } } ";
statement += "],";
statement += "close: function(event, ui) { $(this).dialog('destroy').remove(); }";
statement += "});";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index cc276c5..d091bc5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -65,7 +65,7 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> {
private static final Logger log = Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
private static final long serialVersionUID = 1L;
private final DialogButton send = new DialogButton("send", Application.getString("317"));
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("122"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final IValidator<String> emailValidator = RfcCompliantEmailAddressValidator.getInstance();
private final RequiredTextField<String> name = new RequiredTextField<>("name", Model.of((String)null));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index 8ecac22..d79ca18 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -62,7 +62,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class RegisterDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(RegisterDialog.class, webAppRootKey);
- private DialogButton cancelBtn = new DialogButton("cancel", Application.getString("122"));
+ private DialogButton cancelBtn = new DialogButton("cancel", Application.getString("lbl.cancel"));
private DialogButton registerBtn = new DialogButton("register", Application.getString("121")) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
index e65c7a0..71df077 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
@@ -39,7 +39,7 @@ public class EventDetailDialog extends AbstractDialog<Appointment> {
public EventDetailDialog(String id, final Appointment a) {
super(id, "", new CompoundPropertyModel<>(a), false);
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -52,20 +52,20 @@ public class EventDetailDialog extends AbstractDialog<Appointment> {
add(new Label("owner.firstname"));
add(new Label("owner.lastname"));
}
-
+
@Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
behavior.setOption("autoOpen", true);
behavior.setOption("position", "{my: 'right top', at: 'right bottom', of: '.room.menu' }");
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
}
@Override
protected List<DialogButton> getButtons() {
- return Arrays.asList(new DialogButton("cancel", Model.of(getString("1130"))));
+ return Arrays.asList(new DialogButton("cancel", Model.of(getString("lbl.cancel"))));
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index bd931f7..0dbb7e6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -20,7 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div id="video-settings" wicket:message="title:51, data-btn-save:144, data-btn-cancel:25" style="display:none;">
+ <div id="video-settings" wicket:message="title:51, data-btn-save:144, data-btn-cancel:lbl.cancel" style="display:none;">
<div class="title"><wicket:message key="758"/></div>
<div class="sett-container">
<div class="opt-block">
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
index badff92..ccaf8b9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
@@ -50,7 +50,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class CreatePollDialog extends AbstractFormDialog<RoomPoll> {
private static final long serialVersionUID = 1L;
private final DialogButton create = new DialogButton("create", Application.getString("22"));
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("25"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
private final Long roomId;
private final PollForm form;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index c8e01ce..fdabd91 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -75,7 +75,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private final Long roomId;
private final PollSelectForm selForm;
private final PollResultsForm dispForm;
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("25"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
private final DialogButton close = new DialogButton("close", Application.getString("1418"));
private final DialogButton delete = new DialogButton("delete", Application.getString("1420"));
private boolean moderator = false;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d7ab3a96/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
index 6b7d876..3c4a9d5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
@@ -59,7 +59,7 @@ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> {
private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added
private final PollAnswerForm form;
private final DialogButton vote = new DialogButton("vote", Application.getString("32"));
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("25"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> user = Model.of((String)null);