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/17 05:39:47 UTC
[01/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Repository: openmeetings
Updated Branches:
refs/heads/master e2b0dddb0 -> d2a8e4003
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
index 2cca8a5..fdf141f 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
<class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
@@ -52,7 +51,6 @@
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
- <class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
<class>org.apache.openmeetings.db.entity.file.FileItem</class>
<class>org.apache.openmeetings.db.entity.file.FileItemLog</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
index 0dd404b..b1827de 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
<class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
@@ -52,7 +51,6 @@
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
- <class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
<class>org.apache.openmeetings.db.entity.file.FileItem</class>
<class>org.apache.openmeetings.db.entity.file.FileItemLog</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
index 397016e..da5f588 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
<class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
@@ -52,7 +51,6 @@
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
- <class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
<class>org.apache.openmeetings.db.entity.file.FileItem</class>
<class>org.apache.openmeetings.db.entity.file.FileItemLog</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
index 10e4428..fc454eb 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -145,7 +145,6 @@
<bean id="invitationDao" class="org.apache.openmeetings.db.dao.room.InvitationDao" />
<bean id="groupDao" class="org.apache.openmeetings.db.dao.user.GroupDao" />
<bean id="groupUserDao" class="org.apache.openmeetings.db.dao.user.GroupUserDao" />
- <bean id="errorManagement" class="org.apache.openmeetings.db.dao.basic.ErrorDao" />
<bean id="navimanagement" class="org.apache.openmeetings.db.dao.basic.NavigationDao" />
<bean id="pollManagement" class="org.apache.openmeetings.db.dao.room.PollDao" />
<bean id="labelDao" class="org.apache.openmeetings.db.dao.label.LabelDao" />
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/languages/errorvalues.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/languages/errorvalues.xml b/openmeetings-web/src/main/webapp/languages/errorvalues.xml
deleted file mode 100644
index b152faa..0000000
--- a/openmeetings-web/src/main/webapp/languages/errorvalues.xml
+++ /dev/null
@@ -1,391 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<ROOT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="errorvalues.xsd">
- <row>
- <field name="errorvalues_id">1</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">334</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">10</field>
- <field name="starttime">2017-05-18 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">335</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">13</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">103</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">14</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">338</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">15</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">105</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">16</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">107</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">17</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">106</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">18</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">236</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">19</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">339</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">20</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">340</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">21</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">341</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">22</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">342</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">23</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">343</field>
- <field name="type">info</field>
- </row>
- <row>
- <field name="errorvalues_id">24</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">345</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">25</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">346</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">26</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">347</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">27</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">358</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">28</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">357</field>
- <field name="type">info</field>
- </row>
- <row>
- <field name="errorvalues_id">29</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">358</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">30</field>
- <field name="starttime">2007-12-06 19:01:07</field>
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">403</field>
- <field name="type">info</field>
- </row>
- <row>
- <field name="errorvalues_id">31</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">533</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">32</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">534</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">33</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">535</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">34</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">538</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">35</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">276</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">36</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">664</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">37</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">665</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">38</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">663</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">39</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">666</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">40</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">674</field>
- <field name="type">info</field>
- </row>
- <row>
- <field name="errorvalues_id">41</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">673</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">42</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">787</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">43</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">920</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">44</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1000</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">45</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1195</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">46</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1226</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">47</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1227</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">48</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1228</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">49</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1231</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">50</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1271</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">51</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1309</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">52</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1310</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">53</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1416</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">54</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1431</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">55</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1540</field>
- <field name="type">error</field>
- </row>
- <row>
- <field name="errorvalues_id">56</field>
- <field name="starttime" />
- <field name="updatetime" />
- <field name="deleted">false</field>
- <field name="fieldvalues_id">1544</field>
- <field name="type">error</field>
- </row>
-</ROOT>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/languages/errorvalues.xsd
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/languages/errorvalues.xsd b/openmeetings-web/src/main/webapp/languages/errorvalues.xsd
deleted file mode 100644
index 5acb78a..0000000
--- a/openmeetings-web/src/main/webapp/languages/errorvalues.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <xs:element name="ROOT">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="row"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="row">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="field"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="field">
- <xs:complexType mixed="true">
- <xs:attribute name="name" use="required" type="xs:NCName"/>
- </xs:complexType>
- </xs:element>
-</xs:schema>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
index 7613c77..6a90676 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/AbstractTestDefaults.java
@@ -76,8 +76,8 @@ public abstract class AbstractTestDefaults extends AbstractSpringTest {
// to diagnose the test issue
public boolean doTearDownAfterTest = false;
- public String getString(long id) {
- return LabelDao.getString(id, getLanguageId());
+ public String getString(String key) {
+ return LabelDao.getString(key, getLanguageId());
}
/**
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java
index 9da9a71..0716d81 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/TestSignUp.java
@@ -46,7 +46,7 @@ public class TestSignUp extends AbstractTestDefaults {
super.testIsInstalledAndDoInstallation();
WebElement signUpButton = SeleniumUtils.findElement(driver,
- "//button[span[contains(text(), '" + getString(123) + "')]]", true, true);
+ "//button[span[contains(text(), '" + getString("123") + "')]]", true, true);
signUpButton.click();
// ##################################
@@ -55,7 +55,7 @@ public class TestSignUp extends AbstractTestDefaults {
doSignUp("Hans","Muster", userName, "pw", "pw2", email);
//Find Error label-id 232 "Please enter two identical passwords"
- SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString(232) + "')]", true, true);
+ SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString("232") + "')]", true, true);
// ##################################
// Sign up with user and sign in
@@ -63,8 +63,7 @@ public class TestSignUp extends AbstractTestDefaults {
doSignUp("Hans","Muster", userName, pass, pass, email);
//Check for popup with success message and email to check
- //Labelid 674
- SeleniumUtils.findElement(driver, "//span[contains(text(), '" + getString(674) + "')]", true, true);
+ SeleniumUtils.findElement(driver, "//span[contains(text(), '" + getString("warn.notverified") + "')]", true, true);
//click button to close popup
WebElement signUpSucessPopUpOkButton = SeleniumUtils.findElement(driver,
@@ -77,16 +76,16 @@ public class TestSignUp extends AbstractTestDefaults {
//click labelid 112 "Sign In"
WebElement signInButton = SeleniumUtils.findElement(driver,
- "//button[span[contains(text(), '" + getString(112) + "')]]", true, true);
+ "//button[span[contains(text(), '" + getString("112") + "')]]", true, true);
signInButton.click();
// check for some text in dashbaord, labelid 281, "Help and support"
SeleniumUtils.elementExists(driver,
- "//h3[contains(text(), '" + getString(281) + "')]", true);
+ "//h3[contains(text(), '" + getString("281") + "')]", true);
//sign out
WebElement signOutLink = SeleniumUtils.findElement(driver,
- "//a[contains(text(), '" + getString(310) + "')]", true, true);
+ "//a[contains(text(), '" + getString("310") + "')]", true, true);
signOutLink.click();
Alert alert = driver.switchTo().alert();
@@ -97,16 +96,14 @@ public class TestSignUp extends AbstractTestDefaults {
// ##################################
signUpButton = SeleniumUtils.findElement(driver,
- "//button[span[contains(text(), '" + getString(123) + "')]]", true, true);
+ "//button[span[contains(text(), '" + getString("123") + "')]]", true, true);
signUpButton.click();
doSignUp("Hans","Muster", userName, pass, pass, email);
- //Find Error label-id 105, The username is already used
- SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString(105) + "')]", true, true);
+ SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString("error.login.inuse") + "')]", true, true);
- //Find Error label-id 1000, This email is already used by another user.
- SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString(1000) + "')]", true, true);
+ SeleniumUtils.findElement(driver, "//span[@class='feedbackPanelERROR'][contains(text(), '" + getString("error.email.inuse") + "')]", true, true);
} catch (Exception e) {
SeleniumUtils.makeScreenShot(this.getClass().getSimpleName(), e,
driver);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
index 6a70378..341154f 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
@@ -28,9 +28,9 @@ import org.springframework.beans.factory.annotation.Autowired;
public class TestSmokeBasic extends AbstractJUnitDefaults {
@Autowired
private UserDao userDao;
-
+
@Test
public void createErrorValueAndTest() {
- assertNotNull(userDao.get(1L));
- }
+ assertNotNull(userDao.get(1L));
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java
index a7c36b6..9a46d95 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/user/TestUserGroup.java
@@ -90,7 +90,7 @@ public class TestUserGroup extends AbstractJUnitDefaults {
checkEmptyGroup("dao.login()", userDao.login(u.getAddress().getEmail(), createPass()));
fail("User with no Group is unable to login");
} catch (OmException e) {
- assertTrue("Expected Om Exception", "No Group assigned to user".equals(e.getMessage()));
+ assertTrue("Expected Om Exception", "error.nogroup".equals(e.getKey()));
}
checkEmptyGroup("dao.getByLogin(user)", userDao.getByLogin(u.getLogin(), u.getType(), u.getDomainId()));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
index 8af988b..75839d8 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java
@@ -87,7 +87,7 @@ public class TestCalendarService extends AbstractWebServiceTest {
@Test
public void testGetByPublicRoom() throws Exception {
- actualTest(roomDao.get(5L)); //default public restricted room
+ actualTest(roomDao.get(5L)); //default public presentation room
}
private static JSONObject createAppointment() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java
index 7ace9ee..729a243 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestGroupService.java
@@ -42,7 +42,7 @@ public class TestGroupService extends AbstractWebServiceTest {
@Test
public void addRemoveTest() {
ServiceResult r = login();
- long groupId = -1;
+ Long groupId = -1L;
{
Response resp = getClient(GROUP_SERVICE_URL)
.path("/")
@@ -51,7 +51,7 @@ public class TestGroupService extends AbstractWebServiceTest {
assertEquals("Call should be successful", Response.Status.OK.getStatusCode(), resp.getStatus());
ServiceResult r1 = resp.readEntity(ServiceResult.class);
assertEquals("OM Call should be successful", r1.getType(), Type.SUCCESS.name());
- groupId = r1.getCode();
+ groupId = Long.valueOf(r1.getMessage());
}
//delete group created
{
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java
index 7d91c09..8bc95f3 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java
@@ -35,7 +35,7 @@ public class TestRoomService extends AbstractWebServiceTest {
public void testExternal() {
ServiceResult sr = login();
String extId = UUID.randomUUID().toString();
- Room.Type type = Room.Type.restricted;
+ Room.Type type = Room.Type.presentation;
String name = "Unit Test Ext Room";
String comment = "Unit Test Ext Room Comments";
long num = 666L;
@@ -51,7 +51,7 @@ public class TestRoomService extends AbstractWebServiceTest {
assertNotNull("Valid room should be returned", room);
assertNotNull("Room ID should be not empty", room.getId());
- RoomDTO room1 = getClient(ROOM_SERVICE_URL).path(String.format("/%s/%s/%s", Room.Type.restricted, UNIT_TEST_EXT_TYPE, extId)).query("sid", sr.getMessage())
+ RoomDTO room1 = getClient(ROOM_SERVICE_URL).path(String.format("/%s/%s/%s", Room.Type.presentation, UNIT_TEST_EXT_TYPE, extId)).query("sid", sr.getMessage())
.get(RoomDTO.class);
assertNotNull("Valid room should be returned", room1);
assertEquals("Same Room should be returned", room.getId(), room1.getId());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
index aca0b44..880d01a 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
+import static org.apache.openmeetings.webservice.error.ServiceException.NO_PERMISSION;
import java.util.Calendar;
import java.util.Date;
@@ -96,7 +97,7 @@ public class CalendarWebService extends BaseWebService {
if (AuthLevelUtil.hasUserLevel(getRights(sd.getUserId()))) {
return AppointmentDTO.list(getDao().getInRange(sd.getUserId(), start.getTime(), end.getTime()));
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -135,7 +136,7 @@ public class CalendarWebService extends BaseWebService {
if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) {
return AppointmentDTO.list(getDao().getInRange(userid, start.getTime(), end.getTime()));
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -162,7 +163,7 @@ public class CalendarWebService extends BaseWebService {
Appointment a = getDao().getNext(sd.getUserId(), new Date());
return a == null ? null : new AppointmentDTO(a);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -191,7 +192,7 @@ public class CalendarWebService extends BaseWebService {
Appointment a = getDao().getNext(userid, new Date());
return a == null ? null : new AppointmentDTO(a);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -221,7 +222,7 @@ public class CalendarWebService extends BaseWebService {
return new AppointmentDTO(app);
}
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -251,7 +252,7 @@ public class CalendarWebService extends BaseWebService {
if (AuthLevelUtil.hasUserLevel(getRights(sd.getUserId()))) {
return AppointmentDTO.list(getDao().searchAppointmentsByTitle(sd.getUserId(), title));
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -290,7 +291,7 @@ public class CalendarWebService extends BaseWebService {
{
//TODO maybe additional checks are required
log.error("USER/Room modification as SOAP");
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
//TODO check if objects passed with IDs are correct
if (AuthLevelUtil.hasUserLevel(u.getRights())) {
@@ -306,7 +307,7 @@ public class CalendarWebService extends BaseWebService {
return new AppointmentDTO(dao.update(a, u.getId()));
} else {
log.error("save : wrong user level");
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -354,7 +355,7 @@ public class CalendarWebService extends BaseWebService {
}
dao.delete(a, sd.getUserId());
- return new ServiceResult(id, "Deleted", Type.SUCCESS);
+ return new ServiceResult("Deleted", Type.SUCCESS);
} catch (ServiceException err) {
throw err;
} catch (Exception err) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
index 87a00db..2366082 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
@@ -33,10 +33,9 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.feature.Features;
-import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
-import org.apache.openmeetings.db.entity.basic.ErrorValue;
+import org.apache.openmeetings.db.dto.basic.ServiceResult.Type;
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -61,8 +60,8 @@ public class ErrorWebService extends BaseWebService {
* display/read the error-message. English has the Language-ID one, for
* different one see the list of languages
*
- * @param id
- * the error id (negative Value here!)
+ * @param key
+ * the error key for ex. `error.unknown`
* @param lang
* The id of the language
*
@@ -70,23 +69,11 @@ public class ErrorWebService extends BaseWebService {
*/
@WebMethod
@GET
- @Path("/{id}/{lang}")
- public ServiceResult get(@WebParam(name="id") @PathParam("id") long id, @WebParam(name="lang") @PathParam("lang") long lang) {
+ @Path("/{key}/{lang}")
+ public ServiceResult get(@WebParam(name="key") @PathParam("key") String key, @WebParam(name="lang") @PathParam("lang") long lang) {
try {
- if (id < 0) {
- ErrorValue eValues = getBean(ErrorDao.class).get(-1 * id);
- if (eValues != null) {
- log.debug("eValues.getLabelId() = " + eValues.getLabelId());
- log.debug("eValues.getErrorType() = " + eValues.getType());
- String eValue = LabelDao.getString(eValues.getLabelId(), lang);
- String tValue = LabelDao.getString("error.type." + eValues.getType().name(), lang);
- if (eValue != null) {
- return new ServiceResult(id, eValue, tValue);
- }
- }
- } else {
- return new ServiceResult(id, "Error ... please check your input", "Error");
- }
+ String eValue = LabelDao.getString(key, lang);
+ return new ServiceResult(eValue, Type.SUCCESS);
} catch (Exception err) {
log.error("[get] ", err);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
index bcadbff..4536de0 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
@@ -95,7 +95,7 @@ public class FileWebService extends BaseWebService {
FileExplorerItemDao dao = getDao();
FileExplorerItem f = dao.get(id);
if (f == null) {
- return new ServiceResult(-1L, "Bad id", Type.ERROR);
+ return new ServiceResult("Bad id", Type.ERROR);
}
Long userId = sd.getUserId();
Set<Right> rights = getRights(userId);
@@ -103,7 +103,7 @@ public class FileWebService extends BaseWebService {
|| (AuthLevelUtil.hasUserLevel(rights) && userId.equals(f.getOwnerId())))
{
dao.delete(f);
- return new ServiceResult(id, "Deleted", Type.SUCCESS);
+ return new ServiceResult("Deleted", Type.SUCCESS);
} else {
return NO_PERMISSION;
}
@@ -138,7 +138,7 @@ public class FileWebService extends BaseWebService {
FileExplorerItemDao dao = getDao();
FileExplorerItem f = dao.get(externalId, externalType);
dao.delete(f);
- return new ServiceResult(f.getId(), "Deleted", Type.SUCCESS);
+ return new ServiceResult("Deleted", Type.SUCCESS);
}
} catch (Exception err) {
log.error("[deleteFileOrFolderByExternalIdAndType]", err);
@@ -195,7 +195,7 @@ public class FileWebService extends BaseWebService {
}
return new FileExplorerItemDTO(f);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw ServiceException.NO_PERMISSION;
}
} catch (ServiceException e) {
throw e;
@@ -242,7 +242,7 @@ public class FileWebService extends BaseWebService {
return fileExplorerObject;
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw ServiceException.NO_PERMISSION;
}
} catch (ServiceException e) {
throw e;
@@ -293,7 +293,7 @@ public class FileWebService extends BaseWebService {
}
return FileExplorerItemDTO.list(list);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw ServiceException.NO_PERMISSION;
}
} catch (ServiceException e) {
throw e;
@@ -331,7 +331,7 @@ public class FileWebService extends BaseWebService {
FileExplorerItem f = getDao().rename(id, name);
return f == null ? null : new FileExplorerItemDTO(f);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw ServiceException.NO_PERMISSION;
}
} catch (ServiceException e) {
throw e;
@@ -370,7 +370,7 @@ public class FileWebService extends BaseWebService {
FileExplorerItem f = getDao().move(id, parentId, userId, roomId);
return f == null ? null : new FileExplorerItemDTO(f);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw ServiceException.NO_PERMISSION;
}
} catch (ServiceException e) {
throw e;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
index e7209a2..f54baa2 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
@@ -96,7 +96,7 @@ public class GroupWebService extends BaseWebService {
if (AuthLevelUtil.hasWebServiceLevel(getRights(userId))) {
Group o = new Group();
o.setName(name);
- return new ServiceResult(getDao().update(o, userId).getId(), "Success", Type.SUCCESS);
+ return new ServiceResult("" + getDao().update(o, userId).getId(), Type.SUCCESS);
} else {
log.error("Could not create group");
return NO_PERMISSION;
@@ -118,7 +118,7 @@ public class GroupWebService extends BaseWebService {
return getDao().get(0, Integer.MAX_VALUE);
} else {
log.error("Insufficient permissions");
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw ServiceException.NO_PERMISSION;
}
}
@@ -152,7 +152,7 @@ public class GroupWebService extends BaseWebService {
u.getGroupUsers().add(new GroupUser(getDao().get(id), u));
userDao.update(u, authUserId);
}
- return new ServiceResult(userid, "Success", Type.SUCCESS);
+ return new ServiceResult("" + userid, Type.SUCCESS);
} else {
return NO_PERMISSION;
}
@@ -197,7 +197,7 @@ public class GroupWebService extends BaseWebService {
}
userDao.update(u, authUserId);
}
- return new ServiceResult(userid, "Success", Type.SUCCESS);
+ return new ServiceResult("" + userid, Type.SUCCESS);
} else {
return NO_PERMISSION;
}
@@ -243,10 +243,10 @@ public class GroupWebService extends BaseWebService {
if (!found) {
r.getRoomGroups().add(new RoomGroup(getDao().get(id), r));
roomDao.update(r, userId);
- return new ServiceResult(1L, "Success", Type.SUCCESS);
+ return new ServiceResult("Success", Type.SUCCESS);
}
}
- return new ServiceResult(0L, "Not added", Type.SUCCESS);
+ return new ServiceResult("Not added", Type.ERROR);
} else {
return NO_PERMISSION;
}
@@ -297,7 +297,7 @@ public class GroupWebService extends BaseWebService {
}
} else {
log.error("Need Administration Account");
- result.setErrorId(-26L);
+ result.setErrorKey(NO_PERMISSION.getMessage());
}
return new UserSearchResult(result);
} catch (Exception err) {
@@ -328,7 +328,7 @@ public class GroupWebService extends BaseWebService {
GroupDao dao = getDao();
dao.delete(dao.get(id), authUserId);
- return new ServiceResult(id, "Deleted", Type.SUCCESS);
+ return new ServiceResult("Deleted", Type.SUCCESS);
} else {
return NO_PERMISSION;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
index 87c33c2..f51e473 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
@@ -78,7 +78,7 @@ public class RecordingWebService extends BaseWebService {
if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) {
RecordingDao dao = getDao();
dao.delete(dao.get(id));
- return new ServiceResult(id, "Deleted", Type.SUCCESS);
+ return new ServiceResult("Deleted", Type.SUCCESS);
} else {
throw new ServiceException("Not allowed to preform that action, Authenticate the SID first");
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index 50595c5..36a1a89 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
+import static org.apache.openmeetings.webservice.error.ServiceException.NO_PERMISSION;
import java.util.ArrayList;
import java.util.List;
@@ -97,7 +98,7 @@ public class RoomWebService extends BaseWebService {
if (AuthLevelUtil.hasUserLevel(getRights(sid))) {
return RoomDTO.list(getRoomDao().getPublicRooms(Room.Type.valueOf(type)));
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -122,7 +123,7 @@ public class RoomWebService extends BaseWebService {
if (AuthLevelUtil.hasWebServiceLevel(rights) || AuthLevelUtil.hasUserLevel(rights)) {
return new RoomDTO(getRoomDao().get(id));
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
}
@@ -174,7 +175,7 @@ public class RoomWebService extends BaseWebService {
return new RoomDTO(r);
}
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -207,7 +208,7 @@ public class RoomWebService extends BaseWebService {
r = getRoomDao().update(r, userId);
return new RoomDTO(r);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException e) {
throw e;
@@ -243,7 +244,7 @@ public class RoomWebService extends BaseWebService {
r = roomDao.update(r, userId);
return new RoomDTO(r);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -272,12 +273,12 @@ public class RoomWebService extends BaseWebService {
Room r = roomDao.get(id);
if (r != null) {
roomDao.delete(r, userId);
- return new ServiceResult(id, "Deleted", Type.SUCCESS);
+ return new ServiceResult("Deleted", Type.SUCCESS);
} else {
- return new ServiceResult(0, "Not found", Type.SUCCESS);
+ return new ServiceResult("Not found", Type.SUCCESS);
}
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
}
@@ -314,9 +315,9 @@ public class RoomWebService extends BaseWebService {
WebSocketHelper.sendRoom(new RoomMessage(room.getId(), userId, RoomMessage.Type.roomClosed));
- return new ServiceResult(1L, "Closed", Type.SUCCESS);
+ return new ServiceResult("Closed", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -357,9 +358,9 @@ public class RoomWebService extends BaseWebService {
room.setClosed(false);
roomDao.update(room, userId);
- return new ServiceResult(1L, "Opened", Type.SUCCESS);
+ return new ServiceResult("Opened", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -388,9 +389,9 @@ public class RoomWebService extends BaseWebService {
try {
if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) {
boolean result = getBean(IUserManager.class).kickUsersByRoomId(id);
- return new ServiceResult(result ? 1L : 0L, "Kicked", Type.SUCCESS);
+ return new ServiceResult(result ? "Kicked" : "Not kicked", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -428,7 +429,7 @@ public class RoomWebService extends BaseWebService {
roomBeans.add(rCountBean);
}
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
@@ -467,12 +468,12 @@ public class RoomWebService extends BaseWebService {
if (sendmail) {
getBean(InvitationManager.class).sendInvitationLink(i, MessageType.Create, invite.getSubject(), invite.getMessage(), false);
}
- return new ServiceResult(1L, i.getHash(), Type.SUCCESS);
+ return new ServiceResult(i.getHash(), Type.SUCCESS);
} else {
- return new ServiceResult(0L, "Sys - Error", Type.ERROR);
+ return new ServiceResult("error.unknown", Type.ERROR);
}
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw NO_PERMISSION;
}
} catch (ServiceException err) {
throw err;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
index 80d4813..d2b1e3e 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.db.dto.basic.ServiceResult.NO_PERMISSION;
+import static org.apache.openmeetings.db.dto.basic.ServiceResult.UNKNOWN;
import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
@@ -102,17 +103,17 @@ public class UserWebService extends BaseWebService {
log.debug("Login user");
User u = getUserDao().login(user, pass);
if (u == null) {
- return new ServiceResult(-1L, "Login failed", Type.ERROR);
+ return new ServiceResult("error.bad.credentials", Type.ERROR);
}
Sessiondata sd = getSessionDao().create(u.getId(), u.getLanguageId());
log.debug("Login user: {}", u.getId());
- return new ServiceResult(u.getId(), sd.getSessionId(), Type.SUCCESS);
+ return new ServiceResult(sd.getSessionId(), Type.SUCCESS);
} catch (OmException oe) {
- return new ServiceResult(oe.getCode() == null ? -1 : oe.getCode(), oe.getMessage(), Type.ERROR);
+ return oe.getKey() == null ? UNKNOWN : new ServiceResult(oe.getKey(), Type.ERROR);
} catch (Exception err) {
log.error("[login]", err);
- return new ServiceResult(-1L, err.getMessage(), Type.ERROR);
+ return UNKNOWN;
}
}
@@ -133,7 +134,7 @@ public class UserWebService extends BaseWebService {
if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) {
return UserDTO.list(getUserDao().getAllUsers());
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw ServiceException.NO_PERMISSION;
}
} catch (Exception err) {
log.error("addNewUser", err);
@@ -197,18 +198,18 @@ public class UserWebService extends BaseWebService {
log.debug("addNewUser::weak password '{}', msg: {}", user.getPassword(), sb);
throw new ServiceException(sb.toString());
}
- Long userId = getBean(UserManager.class).registerUser(user.getLogin(), user.getPassword(),
+ Object _user = getBean(UserManager.class).registerUser(user.getLogin(), user.getPassword(),
user.getLastname(), user.getFirstname(), user.getAddress().getEmail(), new Date(), user.getAddress().getStreet(),
user.getAddress().getAdditionalname(), user.getAddress().getFax(), user.getAddress().getZip(), user.getAddress().getCountry()
, user.getAddress().getTown(), user.getLanguageId(),
"", false, true, // generate SIP Data if the config is enabled
tz, confirm);
- if (userId == null || userId < 0) {
- throw new ServiceException("Unknown error");
+ if (_user == null || _user instanceof String) {
+ throw new ServiceException(UNKNOWN.getMessage());
}
- User u = userDao.get(userId);
+ User u = (User)_user;
u.getRights().add(Right.Room);
if (Strings.isEmpty(user.getExternalId()) && Strings.isEmpty(user.getExternalType())) {
@@ -225,7 +226,7 @@ public class UserWebService extends BaseWebService {
return new UserDTO(u);
} else {
- throw new ServiceException("Insufficient permissions"); //TODO code -26
+ throw ServiceException.NO_PERMISSION;
}
} catch (Exception err) {
log.error("addNewUser", err);
@@ -257,7 +258,7 @@ public class UserWebService extends BaseWebService {
UserDao userDao = getUserDao();
userDao.delete(userDao.get(id), sd.getUserId());
- return new ServiceResult(id, "Deleted", Type.SUCCESS);
+ return new ServiceResult("Deleted", Type.SUCCESS);
} else {
return NO_PERMISSION;
}
@@ -298,7 +299,7 @@ public class UserWebService extends BaseWebService {
// Setting user deleted
userDao.delete(user, sd.getUserId());
- return new ServiceResult(user.getId(), "Deleted", Type.SUCCESS);
+ return new ServiceResult("Deleted", Type.SUCCESS);
} else {
return NO_PERMISSION;
}
@@ -360,7 +361,7 @@ public class UserWebService extends BaseWebService {
}
sd.setXml(xmlString);
getSessionDao().update(sd);
- return new ServiceResult(0, hash, Type.SUCCESS);
+ return new ServiceResult(hash, Type.SUCCESS);
}
} else {
return NO_PERMISSION;
@@ -369,7 +370,7 @@ public class UserWebService extends BaseWebService {
log.error("getRoomHash", err);
throw new ServiceException(err.getMessage());
}
- return new ServiceResult(-1L, "Unknown error", Type.ERROR);
+ return UNKNOWN;
}
/**
@@ -388,7 +389,7 @@ public class UserWebService extends BaseWebService {
if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) {
boolean success = getBean(IUserManager.class).kickById(uid);
- return new ServiceResult(Boolean.TRUE.equals(success) ? 1L : 0L, Boolean.TRUE.equals(success) ? "deleted" : "not deleted", Type.SUCCESS);
+ return new ServiceResult(Boolean.TRUE.equals(success) ? "kicked" : "not kicked", Type.SUCCESS);
} else {
return NO_PERMISSION;
}
@@ -412,7 +413,7 @@ public class UserWebService extends BaseWebService {
public ServiceResult count(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="roomid") @PathParam("roomid") Long roomId) {
if (AuthLevelUtil.hasUserLevel(getRights(sid))) {
IApplication app = (IApplication)Application.get(OpenmeetingsVariables.wicketApplicationName);
- return new ServiceResult(app.getOmRoomClients(roomId).size(), "count", Type.SUCCESS);
+ return new ServiceResult("" + app.getOmRoomClients(roomId).size(), Type.SUCCESS);
}
return NO_PERMISSION;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java
index c8e0741..4b67a9b 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java
@@ -20,9 +20,12 @@ package org.apache.openmeetings.webservice.error;
import javax.xml.ws.WebFault;
+import org.apache.openmeetings.db.dto.basic.ServiceResult;
+
@WebFault
public class ServiceException extends Exception {
private static final long serialVersionUID = 1L;
+ public static final ServiceException NO_PERMISSION = new ServiceException(ServiceResult.NO_PERMISSION.getMessage());
public ServiceException(String msg) {
super(msg);
[02/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 98ed964..8ecac22 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,8 +62,8 @@ 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 registerBtn = new DialogButton("register", Application.getString(121)) {
+ private DialogButton cancelBtn = new DialogButton("cancel", Application.getString("122"));
+ private DialogButton registerBtn = new DialogButton("register", Application.getString("121")) {
private static final long serialVersionUID = 1L;
@Override
@@ -89,11 +89,11 @@ public class RegisterDialog extends NonClosableDialog<String> {
private boolean sendEmailAtRegister = false;
public RegisterDialog(String id) {
- super(id, Application.getString(113));
+ super(id, Application.getString("113"));
add(form = new RegisterForm("form"));
form.setOutputMarkupId(true);
- confirmRegistration = new NonClosableMessageDialog("confirmRegistration", Application.getString(235), Application.getString(674)) {
+ confirmRegistration = new NonClosableMessageDialog("confirmRegistration", Application.getString("235"), Application.getString("warn.notverified")) {
private static final long serialVersionUID = 1L;
@Override
@@ -142,13 +142,13 @@ public class RegisterDialog extends NonClosableDialog<String> {
sendEmailAtRegister = 1 == cfgDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
sendConfirmation = !Strings.isEmpty(baseURL)
&& 1 == cfgDao.getConfValue("sendEmailWithVerficationCode", Integer.class, "0");
- long messageCode = 236;
+ String messageCode = "account.created";
if (sendConfirmation && sendEmailAtRegister) {
- messageCode = 674;
+ messageCode = "warn.notverified";
} else if (sendConfirmation) {
- messageCode = 1591;
+ messageCode = "1591";
}
- confirmRegistration.setModelObject(getString("" + messageCode));
+ confirmRegistration.setModelObject(getString(messageCode));
reset(handler);
handler.add(form);
}
@@ -255,10 +255,10 @@ public class RegisterDialog extends NonClosableDialog<String> {
error(getString("232"));
}
if (!getBean(UserDao.class).checkEmail(emailField.getConvertedInput(), User.Type.user, null, null)) {
- error(getString("1000"));
+ error(getString("error.email.inuse"));
}
if (!getBean(UserDao.class).checkLogin(loginField.getConvertedInput(), User.Type.user, null, null)) {
- error(getString("105"));
+ error(getString("error.login.inuse"));
}
if (hasErrorMessage()) {
// add random timeout
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
index f5fcc28..9e8bcfe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
@@ -47,7 +47,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ResetPasswordDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
- private DialogButton resetBtn = new DialogButton("reset", Application.getString(327));
+ private DialogButton resetBtn = new DialogButton("reset", Application.getString("327"));
private Form<String> form = new ResetForm("form");
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private PasswordTextField password;
@@ -55,7 +55,7 @@ public class ResetPasswordDialog extends NonClosableDialog<String> {
MessageDialog confirmReset;
public ResetPasswordDialog(String id, final User user) {
- super(id, Application.getString(325));
+ super(id, Application.getString("325"));
this.user = user;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 3ccc2f2..1142d4a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
@@ -83,7 +82,7 @@ public class SignInDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(SignInDialog.class, webAppRootKey);
private Form<String> form;
- private DialogButton loginBtn = new DialogButton("login", Application.getString(112)) {
+ private DialogButton loginBtn = new DialogButton("login", Application.getString("112")) {
private static final long serialVersionUID = 1L;
@Override
@@ -91,7 +90,7 @@ public class SignInDialog extends NonClosableDialog<String> {
return true;
}
};
- private DialogButton registerBtn = new DialogButton("register", Application.getString(123));
+ private DialogButton registerBtn = new DialogButton("register", Application.getString("123"));
private String password;
private String login;
private boolean rememberMe = false;
@@ -101,7 +100,7 @@ public class SignInDialog extends NonClosableDialog<String> {
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
public SignInDialog(String id) {
- super(id, Application.getString(108));
+ super(id, Application.getString("108"));
add(form = new SignInForm("signin"));
add(new OmAjaxClientInfoBehavior());
}
@@ -187,7 +186,7 @@ public class SignInDialog extends NonClosableDialog<String> {
try {
signIn = ws.signIn(login, password, type, domain.getId());
} catch (OmException e) {
- error(e.getCode() == null ? e.getMessage() : getBean(ErrorDao.class).getMessage(e.getCode(), ws.getOmLanguage()));
+ error(getString(e.getKey()));
target.add(feedback);
}
if (signIn) {
@@ -199,7 +198,7 @@ public class SignInDialog extends NonClosableDialog<String> {
}
} else {
if (!hasErrorMessage()) {
- error(getString("335"));
+ error(getString("error.bad.credentials"));
target.add(feedback);
}
// add random timeout
@@ -226,9 +225,9 @@ public class SignInDialog extends NonClosableDialog<String> {
}
add(feedback.setOutputMarkupId(true));
add(loginField = new RequiredTextField<>("login", new PropertyModel<String>(SignInDialog.this, "login")));
- loginField.setLabel(Model.of(Application.getString(114)));
+ loginField.setLabel(Model.of(Application.getString("114")));
add(passField = new PasswordTextField("pass", new PropertyModel<String>(SignInDialog.this, "password")).setResetPassword(true));
- passField.setLabel(Model.of(Application.getString(115)));
+ passField.setLabel(Model.of(Application.getString("115")));
List<LdapConfig> ldaps = getBean(LdapConfigDao.class).get();
int selectedLdap = getBean(ConfigurationDao.class).getConfValue(CONFIG_DEFAULT_LDAP_ID, Integer.class, "0");
domain = ldaps.get(selectedLdap < ldaps.size() && selectedLdap > 0 ? selectedLdap : 0);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
index 6ffd628..2e51e1b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
@@ -33,7 +33,7 @@ public class ExpiredMessageDialog extends MessageDialog {
private final RoomMenuPanel menu;
public ExpiredMessageDialog(String id, String message, RoomMenuPanel menu) {
- super(id, Application.getString(204), message, DialogButtons.OK, DialogIcon.ERROR);
+ super(id, Application.getString("204"), message, DialogButtons.OK, DialogIcon.ERROR);
this.menu = menu;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
index a894026..2f6ca31 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
@@ -45,12 +45,12 @@ public class NicknameDialog extends NonClosableDialog<User> {
private static final long serialVersionUID = 1L;
private static final FastDateFormat TIME_DF = FastDateFormat.getInstance("HH:mm:ss");
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final DialogButton ok = new DialogButton("ok", Application.getString(54));
+ private final DialogButton ok = new DialogButton("ok", Application.getString("54"));
private final RoomPanel room;
private final Form<User> form;
public NicknameDialog(String id, final RoomPanel room) {
- super(id, Application.getString(1287));
+ super(id, Application.getString("1287"));
this.room = room;
User u = room.getClient().getUser();
add(form = new Form<>("form", new CompoundPropertyModel<>(u)));
@@ -60,9 +60,9 @@ public class NicknameDialog extends NonClosableDialog<User> {
protected void onInitialize() {
super.onInitialize();
form.add(feedback);
- form.add(new RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString(135))).add(minimumLength(4)));
- form.add(new RequiredTextField<String>("lastname").setLabel(Model.of(Application.getString(136))).add(minimumLength(4)));
- form.add(new RequiredTextField<String>("address.email").setLabel(Model.of(Application.getString(137))).add(RfcCompliantEmailAddressValidator.getInstance()));
+ form.add(new RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString("135"))).add(minimumLength(4)));
+ form.add(new RequiredTextField<String>("lastname").setLabel(Model.of(Application.getString("136"))).add(minimumLength(4)));
+ form.add(new RequiredTextField<String>("address.email").setLabel(Model.of(Application.getString("137"))).add(RfcCompliantEmailAddressValidator.getInstance()));
}
private static boolean isVisible(User u) {
@@ -76,7 +76,7 @@ public class NicknameDialog extends NonClosableDialog<User> {
User u = form.getModelObject();
boolean visible = isVisible(u);
if (visible) {
- u.setFirstname(Application.getString(433));
+ u.setFirstname(Application.getString("433"));
u.setLastname(String.format("%s %s", u.getFirstname(), TIME_DF.format(new Date())));
}
behavior.setOption("autoOpen", visible);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
index 76bd5c5..c318609 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
@@ -43,7 +43,7 @@ public class RedirectMessageDialog extends NonClosableMessageDialog {
private Component label;
public RedirectMessageDialog(String id, String labelId, boolean autoOpen, String url) {
- super(id, Application.getString(204), "", new ArrayList<DialogButton>(), DialogIcon.ERROR);
+ super(id, Application.getString("204"), "", new ArrayList<DialogButton>(), DialogIcon.ERROR);
this.labelId = labelId;
this.url = url;
this.autoOpen = autoOpen;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 50af2a2..9edcbff 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -140,7 +140,7 @@ public class RoomPanel extends BasePanel {
if (r.isFilesOpened()) {
sidebar.setFilesActive(target);
}
- if (Room.Type.restricted != r.getType()) {
+ if (Room.Type.presentation != r.getType()) {
List<Client> mods = Application.getRoomClients(r.getId(), c -> c.hasRight(Room.Right.moderator));
if (mods.isEmpty()) {
waitApplyModeration.open(target);
@@ -286,7 +286,7 @@ public class RoomPanel extends BasePanel {
eventDetail = new EventDetailDialog(EVENT_DETAILS_ID, a);
} else {
allowed = false;
- deniedMessage = getString("1271") + String.format(" %s - %s", getDateFormat().format(a.getStart()), getDateFormat().format(a.getEnd()));
+ deniedMessage = getString("error.hash.period") + String.format(" %s - %s", getDateFormat().format(a.getStart()), getDateFormat().format(a.getEnd()));
}
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
index be57826..38c0ac5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
@@ -83,7 +83,7 @@ public class RoomInvitationForm extends InvitationForm {
}
}));
groupContainer.add(
- groups.setLabel(Model.of(Application.getString(126))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") {
+ groups.setLabel(Model.of(Application.getString("126"))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 99927b7..222fade 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -93,7 +93,7 @@ public class RoomMenuPanel extends Panel {
}
};
private final RoomPanel room;
- private final RoomMenuItem exitMenuItem = new RoomMenuItem(Application.getString(308), Application.getString(309), "room menu exit") {
+ private final RoomMenuItem exitMenuItem = new RoomMenuItem(Application.getString("308"), Application.getString("309"), "room menu exit") {
private static final long serialVersionUID = 1L;
@Override
@@ -101,9 +101,9 @@ public class RoomMenuPanel extends Panel {
exit(target);
}
};
- private final RoomMenuItem filesMenu = new RoomMenuItem(Application.getString(245), null, false);
- private final RoomMenuItem actionsMenu = new RoomMenuItem(Application.getString(635), null, false);
- private final RoomMenuItem inviteMenuItem = new RoomMenuItem(Application.getString(213), Application.getString(1489), false) {
+ private final RoomMenuItem filesMenu = new RoomMenuItem(Application.getString("245"), null, false);
+ private final RoomMenuItem actionsMenu = new RoomMenuItem(Application.getString("635"), null, false);
+ private final RoomMenuItem inviteMenuItem = new RoomMenuItem(Application.getString("213"), Application.getString("1489"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -112,7 +112,7 @@ public class RoomMenuPanel extends Panel {
invite.open(target);
}
};
- private final RoomMenuItem shareMenuItem = new RoomMenuItem(Application.getString(239), Application.getString(1480), false) {
+ private final RoomMenuItem shareMenuItem = new RoomMenuItem(Application.getString("239"), Application.getString("1480"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -120,7 +120,7 @@ public class RoomMenuPanel extends Panel {
shareBtn.onClick(target);
}
};
- private final RoomMenuItem applyModerMenuItem = new RoomMenuItem(Application.getString(784), Application.getString(1481), false) {
+ private final RoomMenuItem applyModerMenuItem = new RoomMenuItem(Application.getString("784"), Application.getString("1481"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -128,7 +128,7 @@ public class RoomMenuPanel extends Panel {
room.requestRight(Room.Right.moderator, target);
}
};
- private final RoomMenuItem applyWbMenuItem = new RoomMenuItem(Application.getString(785), Application.getString(1492), false) {
+ private final RoomMenuItem applyWbMenuItem = new RoomMenuItem(Application.getString("785"), Application.getString("1492"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -136,7 +136,7 @@ public class RoomMenuPanel extends Panel {
room.requestRight(Room.Right.whiteBoard, target);
}
};
- private final RoomMenuItem applyAvMenuItem = new RoomMenuItem(Application.getString(786), Application.getString(1482), false) {
+ private final RoomMenuItem applyAvMenuItem = new RoomMenuItem(Application.getString("786"), Application.getString("1482"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -144,7 +144,7 @@ public class RoomMenuPanel extends Panel {
room.requestRight(Room.Right.video, target);
}
};
- private final RoomMenuItem pollCreateMenuItem = new RoomMenuItem(Application.getString(24), Application.getString(1483), false) {
+ private final RoomMenuItem pollCreateMenuItem = new RoomMenuItem(Application.getString("24"), Application.getString("1483"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -153,7 +153,7 @@ public class RoomMenuPanel extends Panel {
createPoll.open(target);
}
};
- private final RoomMenuItem pollVoteMenuItem = new RoomMenuItem(Application.getString(42), Application.getString(1485), false) {
+ private final RoomMenuItem pollVoteMenuItem = new RoomMenuItem(Application.getString("42"), Application.getString("1485"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -165,7 +165,7 @@ public class RoomMenuPanel extends Panel {
}
}
};
- private final RoomMenuItem pollResultMenuItem = new RoomMenuItem(Application.getString(37), Application.getString(1484), false) {
+ private final RoomMenuItem pollResultMenuItem = new RoomMenuItem(Application.getString("37"), Application.getString("1484"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -174,7 +174,7 @@ public class RoomMenuPanel extends Panel {
pollResults.open(target);
}
};
- private final RoomMenuItem sipDialerMenuItem = new RoomMenuItem(Application.getString(1447), Application.getString(1488), false) {
+ private final RoomMenuItem sipDialerMenuItem = new RoomMenuItem(Application.getString("1447"), Application.getString("1488"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -248,7 +248,7 @@ public class RoomMenuPanel extends Panel {
exitMenuItem.setEnabled(false);
menu.add(exitMenuItem.setTop(true));
- filesMenu.getItems().add(new RoomMenuItem(Application.getString(15), Application.getString(1479)) {
+ filesMenu.getItems().add(new RoomMenuItem(Application.getString("15"), Application.getString("1479")) {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
index 2906900..d62da64 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
@@ -40,8 +40,8 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class SipDialerDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final DialogButton call = new DialogButton("call", Application.getString(1448));
- private final DialogButton close = new DialogButton("close", Application.getString(85));
+ private final DialogButton call = new DialogButton("call", Application.getString("1448"));
+ private final DialogButton close = new DialogButton("close", Application.getString("85"));
private final Form<String> form = new Form<>("form", Model.of(""));
private final TextField<String> number = new TextField<>("number", Model.of(""));
private final RoomPanel room;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
index d5fd371..2a2a15e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
@@ -68,7 +68,7 @@ public class StartSharingButton extends OmButton {
this.uid = uid;
setOutputMarkupPlaceholderTag(true);
setVisible(false);
- add(new AttributeAppender("title", Application.getString(1480)));
+ add(new AttributeAppender("title", Application.getString("1480")));
add(download = new AjaxDownload(new ResourceStreamResource() {
private static final long serialVersionUID = 1L;
@@ -105,14 +105,14 @@ public class StartSharingButton extends OmButton {
.replace("$url", _url)
.replace("$fallback", s.getString(VideoSettings.FALLBACK))
.replace("$sid", sid)
- .replace("$labels", getLabels(730, 731, 732, 733, 734
- , 735, 737, 738, 739, 740
- , 741, 742, 844, 869, 870
- , 871, 872, 878, 1089, 1090
- , 1091, 1092, 1093, 1465, 1466
- , 1467, 1468, 1469, 1470, 1471
- , 1472, 1473, 1474, 1475, 1476
- , 1477, 1589, 1598, 1078))
+ .replace("$labels", getLabels("730", "731", "732", "733", "734"
+ , "735", "737", "738", "739", "740"
+ , "741", "742", "844", "869", "870"
+ , "871", "872", "878", "1089", "1090"
+ , "1091", "1092", "1093", "1465", "1466"
+ , "1467", "1468", "1469", "1470", "1471"
+ , "1472", "1473", "1474", "1475", "1476"
+ , "1477", "1589", "1598", "1078"))
.replace("$defaultQuality", cfgDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, ""))
.replace("$defaultFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, ""))
.replace("$showFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS_SHOW, String.class, "true"))
@@ -126,10 +126,10 @@ public class StartSharingButton extends OmButton {
}
}
- private static String getLabels(int ... ids) {
+ private static String getLabels(String ... ids) {
StringBuilder result = new StringBuilder(CDATA_BEGIN);
boolean delim = false;
- for (int id : ids) {
+ for (String id : ids) {
if (delim) {
result.append(';');
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 3881564..badff92 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
@@ -49,14 +49,14 @@ 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 create = new DialogButton("create", Application.getString("22"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("25"));
private final Long roomId;
private final PollForm form;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
public CreatePollDialog(String id, Long roomId) {
- super(id, Application.getString(18), new CompoundPropertyModel<>(new RoomPoll()));
+ super(id, Application.getString("18"), new CompoundPropertyModel<>(new RoomPoll()));
this.roomId = roomId;
add(form = new PollForm("form", getModel()));
}
@@ -104,7 +104,7 @@ public class CreatePollDialog extends AbstractFormDialog<RoomPoll> {
public PollForm(String id, IModel<RoomPoll> model) {
super(id, model);
- add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1410))));
+ add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("1410"))));
add(new TextArea<String>("question"));
add(new DropDownChoice<>("type", Arrays.asList(RoomPoll.Type.values())
, new ChoiceRenderer<RoomPoll.Type>() {
@@ -120,7 +120,7 @@ public class CreatePollDialog extends AbstractFormDialog<RoomPoll> {
return pt.name();
}
})
- .setRequired(true).setLabel(Model.of(Application.getString(21))));
+ .setRequired(true).setLabel(Model.of(Application.getString("21"))));
add(feedback);
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 3f3b210..c8e01ce 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,20 +75,20 @@ 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 close = new DialogButton("close", Application.getString(1418));
- private final DialogButton delete = new DialogButton("delete", Application.getString(1420));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("25"));
+ private final DialogButton close = new DialogButton("close", Application.getString("1418"));
+ private final DialogButton delete = new DialogButton("delete", Application.getString("1420"));
private boolean moderator = false;
private final MessageDialog closeConfirm;
private final MessageDialog deleteConfirm;
private boolean opened = false;
public PollResultsDialog(String id, Long _roomId) {
- super(id, Application.getString(37));
+ super(id, Application.getString("37"));
this.roomId = _roomId;
add(selForm = new PollSelectForm("selForm"));
add(dispForm = new PollResultsForm("dispForm"));
- add(closeConfirm = new MessageDialog("closeConfirm", Application.getString(1418), Application.getString(1419), DialogButtons.YES_NO, DialogIcon.WARN) {
+ add(closeConfirm = new MessageDialog("closeConfirm", Application.getString("1418"), Application.getString("1419"), DialogButtons.YES_NO, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
@Override
@@ -106,7 +106,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
}
}
});
- add(deleteConfirm = new MessageDialog("deleteConfirm", Application.getString(1420), Application.getString(1421), DialogButtons.YES_NO, DialogIcon.WARN) {
+ add(deleteConfirm = new MessageDialog("deleteConfirm", Application.getString("1420"), Application.getString("1421"), DialogButtons.YES_NO, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
@Override
@@ -212,7 +212,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private static String[] getTicks(RoomPoll p) {
return p != null && RoomPoll.Type.numeric == p.getType()
? new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"}
- : new String[] {Application.getString(34), Application.getString(35)};
+ : new String[] {Application.getString("34"), Application.getString("35")};
}
private static Integer[] initValues(int size) {
@@ -293,7 +293,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
@Override
public Object getDisplayValue(RoomPoll object) {
- return object == null ? "" : String.format("%s%s", object.getName(), object.isArchived() ? "" : String.format(" (%s)", Application.getString(1413)));
+ return object == null ? "" : String.format("%s%s", object.getName(), object.isArchived() ? "" : String.format(" (%s)", Application.getString("1413")));
}
@Override
@@ -328,8 +328,8 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private class PollResultsForm extends Form<RoomPoll> {
private static final long serialVersionUID = 1L;
- private final String SIMPLE_CHART = Application.getString(1414);
- private final String PIE_CHART = Application.getString(1415);
+ private final String SIMPLE_CHART = Application.getString("1414");
+ private final String PIE_CHART = Application.getString("1415");
private final IModel<String> name = Model.of((String)null);
private final IModel<String> question = Model.of((String)null);
private final IModel<Integer> count = Model.of(0);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 2f94749..6b7d876 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
@@ -58,18 +58,18 @@ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> {
private static final long serialVersionUID = 1L;
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 vote = new DialogButton("vote", Application.getString("32"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("25"));
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> user = Model.of((String)null);
public VoteDialog(String id) {
- super(id, Application.getString(18));
+ super(id, Application.getString("18"));
add(form = new PollAnswerForm("form", new CompoundPropertyModel<>(new RoomPollAnswer())));
}
static String getName(User u) {
- return u == null ? "" : (getUserId().equals(u.getId()) ? Application.getString(1411) : u.getFirstname() + " " + u.getLastname());
+ return u == null ? "" : (getUserId().equals(u.getId()) ? Application.getString("1411") : u.getFirstname() + " " + u.getLastname());
}
public void updateModel(IPartialPageRequestHandler target, RoomPoll rp) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index a78a76e..75bd986 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -101,7 +101,7 @@ public class RoomSidebar extends Panel {
item.add(new RoomClientPanel("user", item, room));
}
};
- private final NameDialog addFolder = new NameDialog("addFolder", Application.getString(712)) {
+ private final NameDialog addFolder = new NameDialog("addFolder", Application.getString("712")) {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index 47974e9..259331d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -78,11 +78,11 @@ public class UploadDialog extends AbstractFormDialog<String> {
private final RoomPanel room;
public UploadDialog(String id, RoomPanel room, RoomFilePanel roomFiles) {
- super(id, Application.getString(304));
+ super(id, Application.getString("304"));
this.roomFiles = roomFiles;
this.room = room;
add(form = new Form<>("form"));
- upload = new DialogButton("upload", Application.getString(593), false) {
+ upload = new DialogButton("upload", Application.getString("593"), false) {
private static final long serialVersionUID = 1L;
@Override
@@ -90,7 +90,7 @@ public class UploadDialog extends AbstractFormDialog<String> {
return true;
}
};
- cancel = new DialogButton("close", Application.getString(85));
+ cancel = new DialogButton("close", Application.getString("85"));
toWb.add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
index ab92bbe..7613844 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
@@ -38,7 +38,7 @@ public class AboutDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
public AboutDialog(String id) {
- super(id, Application.getString(1549));
+ super(id, Application.getString("1549"));
add(new Label("name", getBean(ConfigurationDao.class).getAppName()));
add(new Label("version", getVersion()));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
index 293dd7e..b779eb4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
@@ -40,14 +40,14 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class InviteUserMessageDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
- private final DialogButton send = new DialogButton("send", Application.getString(1139));
- private final DialogButton cancel = new DialogButton("cancel", Application.getString(219));
+ private final DialogButton send = new DialogButton("send", Application.getString("1139"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("219"));
private final Form<Void> form = new Form<>("form");
private final TextArea<String> message = new TextArea<>("message", Model.of(""));
private final CheckBox enterRoom = new CheckBox("enterRoom", Model.of(false));
public InviteUserMessageDialog(String id) {
- super(id, Application.getString(1138));
+ super(id, Application.getString("1138"));
add(form.add(message.setRequired(true), enterRoom.setOutputMarkupId(true)).setOutputMarkupId(true));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
index 20a88ee..fa49202 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
@@ -39,10 +39,10 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class InviteUserToRoomDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
- private DialogButton cancel = new DialogButton("cancel", Application.getString(219));
+ private DialogButton cancel = new DialogButton("cancel", Application.getString("219"));
private final RoomListPanel publicRooms;
private final RoomListPanel privateRooms;
- private final InviteUserMessageDialog inviteMsg = new InviteUserMessageDialog("inviteMsg");
+ private final InviteUserMessageDialog inviteMsg = new InviteUserMessageDialog("inviteMsg");
private Long userId;
private class InviteRoomListPanel extends RoomListPanel {
@@ -51,21 +51,21 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> {
public InviteRoomListPanel(String id, List<Room> rooms, final String label) {
super(id, rooms, label);
}
-
+
@Override
public void onRoomEnter(AjaxRequestTarget target, Long roomId) {
//FIXME TODO only show message if other user is online
inviteMsg.open(target, roomId, userId);
}
}
-
+
public InviteUserToRoomDialog(String id) {
- super(id, Application.getString(1131));
- add(publicRooms = new InviteRoomListPanel("publicRooms", new ArrayList<Room>(), Application.getString(1135)));
- add(privateRooms = new InviteRoomListPanel("privateRooms", new ArrayList<Room>(), Application.getString(1135)));
+ super(id, Application.getString("1131"));
+ add(publicRooms = new InviteRoomListPanel("publicRooms", new ArrayList<Room>(), Application.getString("1135")));
+ add(privateRooms = new InviteRoomListPanel("privateRooms", new ArrayList<Room>(), Application.getString("1135")));
add(inviteMsg);
}
-
+
private static List<Room> getPrivateRooms(Long userId1, Long userId2, RoomDao roomDao) {
List<Long> orgIds = new ArrayList<>();
List<Long> orgIds2 = new ArrayList<>();
@@ -83,7 +83,7 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> {
}
return result;
}
-
+
public void open(IPartialPageRequestHandler handler, Long userId) {
this.userId = userId;
RoomDao roomDao = getBean(RoomDao.class);
@@ -91,12 +91,12 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> {
privateRooms.update(handler, getPrivateRooms(getUserId(), userId, roomDao));
open(handler);
}
-
+
@Override
protected List<DialogButton> getButtons() {
return Arrays.asList(cancel);
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index 6f222bf..1af9b93 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -80,8 +80,8 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> {
private static final long serialVersionUID = 1L;
private final Form<PrivateMessage> form;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- protected DialogButton send = new DialogButton("send", Application.getString(218));
- private DialogButton cancel = new DialogButton("cancel", Application.getString(219));
+ protected DialogButton send = new DialogButton("send", Application.getString("218"));
+ private DialogButton cancel = new DialogButton("cancel", Application.getString("219"));
private final WebMarkupContainer roomParamsBlock = new WebMarkupContainer("roomParamsBlock");
private final WebMarkupContainer roomParams = new WebMarkupContainer("roomParams");
private final DateTimePicker start = new OmDateTimePicker("start", Model.of(LocalDateTime.now()));
@@ -131,7 +131,7 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> {
}
public MessageDialog(String id, CompoundPropertyModel<PrivateMessage> model) {
- super(id, Application.getString(1209), model);
+ super(id, Application.getString("1209"), model);
form = new Form<>("form", getModel());
form.add(feedback.setOutputMarkupId(true));
@@ -234,7 +234,7 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> {
msgDao.update(p, getUserId());
if (to.getAddress() != null) {
String aLinkHTML = (isPrivate && to.getType() == Type.user) ? "<br/><br/>" + "<a href='" + getContactsLink() + "'>"
- + Application.getString(1302, to.getLanguageId()) + "</a><br/>" : "";
+ + Application.getString("1302", to.getLanguageId()) + "</a><br/>" : "";
String invitation_link = "";
if (p.isBookedRoom()) {
Invitation i = getBean(IInvitationManager.class).getInvitation(to, p.getRoom(),
@@ -248,16 +248,16 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> {
invitation_link = "";
} else {
invitation_link = "<br/>" //
- + Application.getString(503, to.getLanguageId())
+ + Application.getString("503", to.getLanguageId())
+ "<br/><a href='" + invitation_link
+ "'>"
- + Application.getString(504, to.getLanguageId()) + "</a><br/>";
+ + Application.getString("504", to.getLanguageId()) + "</a><br/>";
}
}
String subj = p.getSubject() == null ? "" : p.getSubject();
getBean(MailHandler.class).send(to.getAddress().getEmail(),
- Application.getString(1301, to.getLanguageId()) + subj,
+ Application.getString("1301", to.getLanguageId()) + subj,
(p.getMessage() == null ? "" : p.getMessage().replaceAll("\\<.*?>", "")) + aLinkHTML + invitation_link);
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java
index 50f3472..4d63f11 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java
@@ -37,14 +37,14 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class UserInfoDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
private WebMarkupContainer container = new WebMarkupContainer("container");
- private DialogButton cancel = new DialogButton("cancel", Application.getString(61));
- private DialogButton message = new DialogButton("message", Application.getString(1253));
- private DialogButton contacts = new DialogButton("contacts", Application.getString(1186));
+ private DialogButton cancel = new DialogButton("cancel", Application.getString("61"));
+ private DialogButton message = new DialogButton("message", Application.getString("1253"));
+ private DialogButton contacts = new DialogButton("contacts", Application.getString("1186"));
private MessageDialog newMessage;
private long userId;
-
+
public UserInfoDialog(String id, MessageDialog newMessage) {
- super(id, Application.getString(1235));
+ super(id, Application.getString("1235"));
add(container.add(new WebMarkupContainer("body")).setOutputMarkupId(true));
this.newMessage = newMessage;
}
@@ -57,21 +57,21 @@ public class UserInfoDialog extends AbstractDialog<String> {
handler.add(container);
open(handler);
}
-
+
public WebMarkupContainer getContainer() {
return container;
}
-
+
@Override
public int getWidth() {
return 600;
}
-
+
@Override
protected List<DialogButton> getButtons() {
return Arrays.asList(contacts, message, cancel);
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
if (message.equals(button)) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index e721c0b..3811327 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -102,10 +102,10 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDialog.class, webAppRootKey);
private AppointmentForm form;
- private DialogButton save = new DialogButton("save", Application.getString(813));
- private DialogButton cancel = new DialogButton("cancel", Application.getString(1130));
- private DialogButton delete = new DialogButton("delete", Application.getString(814));
- private DialogButton enterRoom = new DialogButton("enterRoom", Application.getString(1282));
+ private DialogButton save = new DialogButton("save", Application.getString("813"));
+ private DialogButton cancel = new DialogButton("cancel", Application.getString("1130"));
+ private DialogButton delete = new DialogButton("delete", Application.getString("814"));
+ private DialogButton enterRoom = new DialogButton("enterRoom", Application.getString("1282"));
private final CalendarPanel calendarPanel;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
final MessageDialog confirmDelete;
@@ -159,7 +159,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
setOutputMarkupId(true);
form = new AppointmentForm("appForm", model);
add(form);
- confirmDelete = new MessageDialog("confirmDelete", Application.getString(814), Application.getString(833), DialogButtons.OK_CANCEL, DialogIcon.WARN){
+ confirmDelete = new MessageDialog("confirmDelete", Application.getString("814"), Application.getString("833"), DialogButtons.OK_CANCEL, DialogIcon.WARN){
private static final long serialVersionUID = 1L;
@Override
@@ -374,7 +374,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
add(feedback.setOutputMarkupId(true));
//General
- add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572))));
+ add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString("572"))));
add(ownerPanel.add(owner));
boolean showGroups = AuthLevelUtil.hasAdminLevel(getRights());
add(rdi.add(new AjaxFormChoiceComponentUpdatingBehavior() {
@@ -387,7 +387,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
}
}));
groupContainer.add(
- groups.setLabel(Model.of(Application.getString(126))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true)
+ groups.setLabel(Model.of(Application.getString("126"))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true)
, new Radio<>("group", Model.of(InviteeType.group))
);
if (showGroups) {
@@ -428,7 +428,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
}
});
add(createRoomBlock.add(roomType, new CheckBox("moderated")).setEnabled(createRoom).setOutputMarkupId(true));
- add(groom.setRequired(true).setLabel(Model.of(Application.getString(406))).setEnabled(!createRoom).setOutputMarkupId(true));
+ add(groom.setRequired(true).setLabel(Model.of(Application.getString("406"))).setEnabled(!createRoom).setOutputMarkupId(true));
add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
sipContainer.add(new Label("room.confno", "")).setVisible(false);
@@ -503,7 +503,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
@Override
protected void onValidate() {
if (null != start.getConvertedInput() && null != end.getConvertedInput() && end.getConvertedInput().isBefore(start.getConvertedInput())) {
- error(Application.getString(1592));
+ error(Application.getString("1592"));
}
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
index 75286b9..1473f61 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
@@ -70,9 +70,9 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
private CalendarPanel calendarPanel;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private DialogButton save = new DialogButton("save", Application.getString(813));
- private DialogButton cancel = new DialogButton("cancel", Application.getString(1130));
- private DialogButton delete = new DialogButton("delete", Application.getString(814));
+ private DialogButton save = new DialogButton("save", Application.getString("813"));
+ private DialogButton cancel = new DialogButton("cancel", Application.getString("1130"));
+ private DialogButton delete = new DialogButton("delete", Application.getString("814"));
private UserCalendarForm form;
private MessageDialog confirmDelete;
private List<OmCalendar> cals; //List of calendars for syncing
@@ -94,7 +94,7 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
this.calendarPanel = calendarPanel;
form = new UserCalendarForm("calform", model);
add(form);
- confirmDelete = new MessageDialog("confirmDelete", Application.getString(814), Application.getString(833), DialogButtons.OK_CANCEL, DialogIcon.WARN) {
+ confirmDelete = new MessageDialog("confirmDelete", Application.getString("814"), Application.getString("833"), DialogButtons.OK_CANCEL, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
@Override
@@ -411,8 +411,8 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
// Fields required for adding Google Calendar
Label urlLabel = new Label("urlLabel", Application.getString("calendar.url")),
- userLabel = new Label("userLabel", Application.getString(114)),
- passLabel = new Label("passLabel", Application.getString(115));
+ userLabel = new Label("userLabel", Application.getString("114")),
+ passLabel = new Label("passLabel", Application.getString("115"));
AjaxCheckBox gcal; // Checkbox for Google Calendar
UrlTextField url = new UrlTextField("url", Model.of(""), new UrlValidator() {
@@ -523,7 +523,7 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
pass.setVisible(true);
passLabel.setVisible(true);
- userLabel.setDefaultModelObject(Application.getString(114));
+ userLabel.setDefaultModelObject(Application.getString("114"));
username.setModelObject(null);
urlLabel.setDefaultModelObject(Application.getString("calendar.url"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index 19a846b..bbe0651 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -144,7 +144,7 @@ public class CalendarPanel extends UserPanel {
final Form<Date> form = new Form<>("form");
add(form);
- dialog = new AppointmentDialog("appointment", Application.getString(815)
+ dialog = new AppointmentDialog("appointment", Application.getString("815")
, this, new CompoundPropertyModel<>(getDefault()));
add(dialog);
@@ -160,24 +160,24 @@ public class CalendarPanel extends UserPanel {
options.set("timeFormat", Options.asString("H(:mm)"));
options.set("buttonText", new JSONObject()
- .put("month", Application.getString(801))
- .put("week", Application.getString(800))
- .put("day", Application.getString(799))
- .put("today", Application.getString(1555)).toString());
+ .put("month", Application.getString("801"))
+ .put("week", Application.getString("800"))
+ .put("day", Application.getString("799"))
+ .put("today", Application.getString("1555")).toString());
JSONArray monthes = new JSONArray();
JSONArray shortMonthes = new JSONArray();
JSONArray days = new JSONArray();
JSONArray shortDays = new JSONArray();
// first week day must be Sunday
- days.put(0, Application.getString(466));
- shortDays.put(0, Application.getString(459));
+ days.put(0, Application.getString("466"));
+ shortDays.put(0, Application.getString("459"));
for (int i = 0; i < 12; i++) {
- monthes.put(i, Application.getString(469 + i));
- shortMonthes.put(i, Application.getString(1556 + i));
+ monthes.put(i, Application.getString("" + (469 + i)));
+ shortMonthes.put(i, Application.getString("" + (1556 + i)));
if (i + 1 < 7) {
- days.put(i + 1, Application.getString(460 + i));
- shortDays.put(i + 1, Application.getString(453 + i));
+ days.put(i + 1, Application.getString("" + (460 + i)));
+ shortDays.put(i + 1, Application.getString("" + (453 + i)));
}
}
options.set("monthNames", monthes.toString());
@@ -407,7 +407,7 @@ public class CalendarPanel extends UserPanel {
Appointment a = new Appointment();
a.setReminder(Reminder.ical); //TODO: Make configurable
a.setOwner(getBean(UserDao.class).get(getUserId()));
- a.setTitle(Application.getString(1444));
+ a.setTitle(Application.getString("1444"));
log.debug(" -- getDefault -- Current model " + a);
return a;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index 77ad001..a78075b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -133,14 +133,14 @@ public class Chat extends Panel {
public static CharSequence getReinit() {
StringBuilder sb = new StringBuilder("Chat.reinit(");
- sb.append('\'').append(Application.getString(1494)).append('\'')
- .append(',').append('\'').append(Application.getString(406)).append('\'');
+ sb.append('\'').append(Application.getString("1494")).append('\'')
+ .append(',').append('\'').append(Application.getString("406")).append('\'');
return sb.append("); ");
}
public CharSequence addRoom(Room r) {
StringBuilder sb = new StringBuilder();
- sb.append(String.format("Chat.addTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), Application.getString(406)));
+ sb.append(String.format("Chat.addTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), Application.getString("406")));
List<ChatMessage> list = getBean(ChatDao.class).getRoom(r.getId(), 0, 30, !r.isChatModerated() || isModerator(getUserId(), r.getId()));
if (list.size() > 0) {
sb.append("Chat.addMessage(").append(getMessage(list).toString()).append(");");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
index 8f81e1a..06041ec 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
@@ -34,14 +34,14 @@ public class MyRoomsWidget extends AbstractWidget {
location = new WidgetLocation(0, 1);
init();
}
-
+
@Override
public void init() {
super.init();
- title = Application.getString(781L);
+ title = Application.getString("781");
id = WIDGET_ID_MY_ROOMS;
}
-
+
@Override
public WidgetView createView(String viewId) {
return new MyRoomsWidgetView(viewId, new Model<Widget>(this));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
index 64a1a84..cce537e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
@@ -26,7 +26,7 @@ public class MyRoomsWidgetDescriptor implements WidgetDescriptor {
@Override
public String getName() {
- return Application.getString(781L);
+ return Application.getString("781");
}
@Override
@@ -36,7 +36,7 @@ public class MyRoomsWidgetDescriptor implements WidgetDescriptor {
@Override
public String getDescription() {
- return Application.getString(782L);
+ return Application.getString("782");
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
index 674c350..052e90e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
@@ -34,14 +34,14 @@ public class RssWidget extends AbstractWidget {
location = new WidgetLocation(1, 1);
init();
}
-
+
@Override
public void init() {
super.init();
- title = Application.getString(277L);
+ title = Application.getString("277");
id = WIDGET_ID_RSS;
}
-
+
@Override
public WidgetView createView(String viewId) {
return new RssWidgetView(viewId, new Model<Widget>(this));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
index ae33186..0cbc021 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
@@ -26,7 +26,7 @@ public class RssWidgetDescriptor implements WidgetDescriptor {
@Override
public String getName() {
- return Application.getString(277L);
+ return Application.getString("277");
}
@Override
@@ -36,7 +36,7 @@ public class RssWidgetDescriptor implements WidgetDescriptor {
@Override
public String getDescription() {
- return Application.getString(277L);
+ return Application.getString("277");
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
index b0b56be..22dd4fb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
@@ -33,14 +33,14 @@ public class WelcomeWidget extends AbstractWidget {
location = new WidgetLocation(0, 0);
init();
}
-
+
@Override
public void init() {
super.init();
- title = Application.getString(1546L);
+ title = Application.getString("1546");
id = "WelcomeWidget";
}
-
+
@Override
public WidgetView createView(String viewId) {
return new WelcomeWidgetView(viewId, new Model<Widget>(this));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
index 241ba59..12aec81 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
@@ -26,7 +26,7 @@ public class WelcomeWidgetDescriptor implements WidgetDescriptor {
@Override
public String getName() {
- return Application.getString(1546L);
+ return Application.getString("1546");
}
@Override
@@ -36,7 +36,7 @@ public class WelcomeWidgetDescriptor implements WidgetDescriptor {
@Override
public String getDescription() {
- return Application.getString(1547L);
+ return Application.getString("1547");
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
index 538012e..f9a70a9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
@@ -76,7 +76,7 @@ public class ChangePasswordDialog extends AbstractFormDialog<String> {
}
String p1 = pass.getConvertedInput();
if (!Strings.isEmpty(p1) && !p1.equals(pass2.getConvertedInput())) {
- error(Application.getString(232));
+ error(Application.getString("232"));
}
super.onValidate();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index 89a8a98..13ae48f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -44,8 +44,8 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.NameDialog;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
+import org.apache.openmeetings.web.common.NameDialog;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
@@ -85,11 +85,11 @@ import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTable
public class MessagesContactsPanel extends UserPanel {
private static final long serialVersionUID = 1L;
private final static Long MOVE_CHOOSE = Long.valueOf(-1);
- private final static int SELECT_CHOOSE = 1252;
- private final static int SELECT_ALL = 1239;
- private final static int SELECT_NONE = 1240;
- private final static int SELECT_UNREAD = 1241;
- private final static int SELECT_READ = 1242;
+ private final static String SELECT_CHOOSE = "1252";
+ private final static String SELECT_ALL = "1239";
+ private final static String SELECT_NONE = "1240";
+ private final static String SELECT_UNREAD = "1241";
+ private final static String SELECT_READ = "1242";
private final WebMarkupContainer container = new WebMarkupContainer("container");
private final WebMarkupContainer folders = new WebMarkupContainer("folders");
private final Label unread = new Label("unread", Model.of(0L));
@@ -114,20 +114,20 @@ public class MessagesContactsPanel extends UserPanel {
private final Button readBtn = new Button("readBtn");
private final Button unreadBtn = new Button("unreadBtn");
private final FixedHeaderTableBehavior fixedTable = new FixedHeaderTableBehavior("#messagesTable", new Options("height", 100));
- private final DropDownChoice<Integer> selectDropDown = new DropDownChoice<>(
+ private final DropDownChoice<String> selectDropDown = new DropDownChoice<>(
"msgSelect", Model.of(SELECT_CHOOSE)
, Arrays.asList(SELECT_CHOOSE, SELECT_ALL, SELECT_NONE, SELECT_UNREAD, SELECT_READ)
- , new ChoiceRenderer<Integer>() {
+ , new ChoiceRenderer<String>() {
private static final long serialVersionUID = 1L;
@Override
- public Object getDisplayValue(Integer object) {
+ public Object getDisplayValue(String object) {
return Application.getString(object);
}
@Override
- public String getIdValue(Integer object, int index) {
- return "" + object;
+ public String getIdValue(String object, int index) {
+ return object;
}
});
private PrivateMessageFolder NOT_MOVE_FOLDER = new PrivateMessageFolder();
@@ -216,7 +216,7 @@ public class MessagesContactsPanel extends UserPanel {
emptySelection(target);
selectDropDown.setModelObject(SELECT_CHOOSE);
moveDropDown.setModelObject(NOT_MOVE_FOLDER);
- deleteBtn.add(AttributeModifier.replace("value", Application.getString(TRASH_FOLDER_ID.equals(id) ? 1256 : 1245)));
+ deleteBtn.add(AttributeModifier.replace("value", Application.getString(TRASH_FOLDER_ID.equals(id) ? "1256" : "1245")));
readBtn.setEnabled(false);
unreadBtn.setEnabled(false);
if (target != null) {
@@ -261,7 +261,7 @@ public class MessagesContactsPanel extends UserPanel {
public MessagesContactsPanel(String id) {
super(id);
NOT_MOVE_FOLDER.setId(MOVE_CHOOSE);
- NOT_MOVE_FOLDER.setFolderName(Application.getString(1243));
+ NOT_MOVE_FOLDER.setFolderName(Application.getString("1243"));
foldersModel.setObject(getBean(PrivateMessageFolderDao.class).get(0, Integer.MAX_VALUE));
updateMoveModel();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
index 68d0658..3f67c5a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
@@ -49,7 +49,7 @@ public class SettingsPanel extends UserPanel {
super(id);
List<ITab> tabs = new ArrayList<>();
- tabs.add(new AjaxTab(Model.of(Application.getString(1170))) {
+ tabs.add(new AjaxTab(Model.of(Application.getString("1170"))) {
private static final long serialVersionUID = 1L;
UserProfilePanel profilePanel = null;
@@ -71,7 +71,7 @@ public class SettingsPanel extends UserPanel {
return super.load(target);
}
});
- tabs.add(new AjaxTab(Model.of(Application.getString(1188))) {
+ tabs.add(new AjaxTab(Model.of(Application.getString("1188"))) {
private static final long serialVersionUID = 1L;
@Override
@@ -79,7 +79,7 @@ public class SettingsPanel extends UserPanel {
return new MessagesContactsPanel(panelId);
}
});
- tabs.add(new AbstractTab(Model.of(Application.getString(1171))) {
+ tabs.add(new AbstractTab(Model.of(Application.getString("1171"))) {
private static final long serialVersionUID = 1L;
@Override
@@ -87,7 +87,7 @@ public class SettingsPanel extends UserPanel {
return new ProfilePanel(panelId);
}
});
- tabs.add(new AbstractTab(Model.of(Application.getString(1172))) {
+ tabs.add(new AbstractTab(Model.of(Application.getString("1172"))) {
private static final long serialVersionUID = 1L;
@Override
@@ -95,7 +95,7 @@ public class SettingsPanel extends UserPanel {
return new UserSearchPanel(panelId);
}
});
- tabs.add(new AbstractTab(Model.of(Application.getString(1548))) {
+ tabs.add(new AbstractTab(Model.of(Application.getString("1548"))) {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
index 56713fb..7a7725e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
@@ -65,7 +65,7 @@ public class UserProfilePanel extends UserPanel {
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
- addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts() ? 1269 : 1268));
+ addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts() ? "1269" : "1268"));
}
add(address.setDefaultModel(model));
add(addressDenied);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
index 4026398..de92449 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
@@ -35,7 +35,7 @@ public class RecordingsPanel extends UserPanel {
private static final long serialVersionUID = 1L;
private final VideoPlayer video = new VideoPlayer("video");
private final VideoInfo info = new VideoInfo("info");
- private final NameDialog addFolder = new NameDialog("addFolder", Application.getString(712)) {
+ private final NameDialog addFolder = new NameDialog("addFolder", Application.getString("712")) {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
index 1bd414c..88393b5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
@@ -56,7 +56,7 @@ public class RoomsPanel extends UserPanel {
public RoomsPanel(String id, List<Room> rooms) {
super(id);
- add(new RoomListPanel("list", rooms, Application.getString(131)) {
+ add(new RoomListPanel("list", rooms, Application.getString("131")) {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
index b931e24..9bf0116 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
@@ -30,23 +30,23 @@ public class RoomsSelectorPanel extends UserPanel {
public RoomsSelectorPanel(String id, MenuParams param) {
super(id);
- long title, desc;
+ String title, desc;
RoomDao roomDao = Application.getBean(RoomDao.class);
switch (param) {
case myTabButton:
- title = 781L;
- desc = 782L;
+ title = "781";
+ desc = "782";
add(new RoomsPanel("rooms", getMyRooms()));
break;
case privateTabButton:
- title = 779L;
- desc = 780L;
- add(new RoomsTabbedPanel("rooms"));
+ title = "779";
+ desc = "780";
+ add(new RoomsTabbedPanel("rooms"));
break;
case publicTabButton:
default:
- title = 777L;
- desc = 778L;
+ title = "777";
+ desc = "778";
add(new RoomsPanel("rooms", roomDao.getPublicRooms()));
break;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
index f73a2d9..abb807e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
@@ -37,11 +37,11 @@ import org.apache.wicket.model.Model;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
public class RoomsTabbedPanel extends UserPanel {
- private static final long serialVersionUID = 3642004664480074881L;
+ private static final long serialVersionUID = 1L;
public RoomsTabbedPanel(String id) {
super(id);
-
+
User u = getBean(UserDao.class).get(getUserId());
add(new ListView<GroupUser>("orgTabs", u.getGroupUsers()) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
index cdb382c..2100a4d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
@@ -31,18 +31,18 @@ import org.apache.openmeetings.service.mail.template.RequestContactTemplate;
import org.apache.openmeetings.web.app.Application;
public class ContactsHelper {
- public static Long addUserToContactList(long userIdToAdd) {
+ public static Object addUserToContactList(long userIdToAdd) {
boolean isContact = getBean(UserContactDao.class).isContact(userIdToAdd, getUserId());
if (isContact) {
- return -45L;
+ return "error.contact.added";
}
UserContact contact = getBean(UserContactDao.class).add(userIdToAdd, getUserId(), true);
User user = contact.getOwner();
User userToAdd = contact.getContact();
- String subj = user.getFirstname() + " " + user.getLastname() + " " + Application.getString(1193);
+ String subj = user.getFirstname() + " " + user.getLastname() + " " + Application.getString("1193");
String message = RequestContactTemplate.getEmail(userToAdd, user);
getBean(PrivateMessageDao.class).addPrivateMessage(
@@ -52,19 +52,19 @@ public class ContactsHelper {
getBean(MailHandler.class).send(userToAdd.getAddress().getEmail(), subj, message);
}
- return contact.getId();
+ return contact;
}
- public static Long acceptUserContact(long userContactId) {
+ public static Object acceptUserContact(long userContactId) {
UserContactDao dao = getBean(UserContactDao.class);
UserContact contact = dao.get(userContactId);
if (contact == null) {
- return -46L;
+ return "error.contact.denied";
}
if (!contact.isPending()) {
- return -47L;
+ return "error.contact.approved";
}
dao.updateContactStatus(userContactId, false);
@@ -77,7 +77,7 @@ public class ContactsHelper {
if (user.getAddress() != null) {
String message = RequestContactConfirmTemplate.getEmail(contact);
- String subj = contact.getContact().getFirstname() + " " + contact.getContact().getLastname() + " " + Application.getString(1198);
+ String subj = contact.getContact().getFirstname() + " " + contact.getContact().getLastname() + " " + Application.getString("1198");
getBean(PrivateMessageDao.class).addPrivateMessage(
subj, message,
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
index 8134c66..6a637fa 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
<class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
@@ -52,7 +51,6 @@
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
- <class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
<class>org.apache.openmeetings.db.entity.file.FileItem</class>
<class>org.apache.openmeetings.db.entity.file.FileItemLog</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
index d147355..94ca434 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
<class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
@@ -52,7 +51,6 @@
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
- <class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
<class>org.apache.openmeetings.db.entity.file.FileItem</class>
<class>org.apache.openmeetings.db.entity.file.FileItemLog</class>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
index f97ac16..f6fde61 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
@@ -25,7 +25,6 @@
<persistence-unit name="openmeetings" transaction-type="RESOURCE_LOCAL">
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.openmeetings.db.entity.basic.Configuration</class>
- <class>org.apache.openmeetings.db.entity.basic.ErrorValue</class>
<class>org.apache.openmeetings.db.entity.server.LdapConfig</class>
<class>org.apache.openmeetings.db.entity.basic.MailMessage</class>
<class>org.apache.openmeetings.db.entity.basic.Naviglobal</class>
@@ -52,7 +51,6 @@
<class>org.apache.openmeetings.db.entity.user.PrivateMessage</class>
<class>org.apache.openmeetings.db.entity.user.PrivateMessageFolder</class>
<class>org.apache.openmeetings.db.entity.user.UserContact</class>
- <class>org.apache.openmeetings.db.entity.user.Userdata</class>
<class>org.apache.openmeetings.db.entity.user.User</class>
<class>org.apache.openmeetings.db.entity.file.FileItem</class>
<class>org.apache.openmeetings.db.entity.file.FileItemLog</class>
[11/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index a7b60a1..70447ec 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -51,20 +51,20 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
setOutputMarkupId(true);
add(new CheckBox("isEnabled"));
- add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1573))));
- add(new TextField<String>("iconUrl").setLabel(Model.of(Application.getString(1575))));
- add(new RequiredTextField<String>("clientId").setLabel(Model.of(Application.getString(1576))));
- add(new RequiredTextField<String>("clientSecret").setLabel(Model.of(Application.getString(1577))));
- add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString(1587))));
- add(new RequiredTextField<String>("requestKeyUrl").setLabel(Model.of(Application.getString(1578))));
- add(new RequiredTextField<String>("requestTokenUrl").setLabel(Model.of(Application.getString(1579))));
- add(new RequiredTextField<String>("requestTokenAttributes").setLabel(Model.of(Application.getString(1586))));
- add(new RequiredTextField<String>("requestInfoUrl").setLabel(Model.of(Application.getString(1580))));
+ add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("1573"))));
+ add(new TextField<String>("iconUrl").setLabel(Model.of(Application.getString("1575"))));
+ add(new RequiredTextField<String>("clientId").setLabel(Model.of(Application.getString("1576"))));
+ add(new RequiredTextField<String>("clientSecret").setLabel(Model.of(Application.getString("1577"))));
+ add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString("1587"))));
+ add(new RequiredTextField<String>("requestKeyUrl").setLabel(Model.of(Application.getString("1578"))));
+ add(new RequiredTextField<String>("requestTokenUrl").setLabel(Model.of(Application.getString("1579"))));
+ add(new RequiredTextField<String>("requestTokenAttributes").setLabel(Model.of(Application.getString("1586"))));
+ add(new RequiredTextField<String>("requestInfoUrl").setLabel(Model.of(Application.getString("1580"))));
add(new DropDownChoice<>("requestTokenMethod", Arrays.asList(RequestMethod.values()), new ChoiceRenderer<RequestMethod>("name", "name")));
- add(new RequiredTextField<String>("loginParamName").setLabel(Model.of(Application.getString(1582))));
- add(new RequiredTextField<String>("emailParamName").setLabel(Model.of(Application.getString(1583))));
- add(new TextField<String>("firstnameParamName").setLabel(Model.of(Application.getString(1584))));
- add(new TextField<String>("lastnameParamName").setLabel(Model.of(Application.getString(1585))));
+ add(new RequiredTextField<String>("loginParamName").setLabel(Model.of(Application.getString("1582"))));
+ add(new RequiredTextField<String>("emailParamName").setLabel(Model.of(Application.getString("1583"))));
+ add(new TextField<String>("firstnameParamName").setLabel(Model.of(Application.getString("1584"))));
+ add(new TextField<String>("lastnameParamName").setLabel(Model.of(Application.getString("1585"))));
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index 1afba1d..65f5f81 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -114,7 +114,7 @@ public class RoomForm extends AdminBaseForm<Room> {
protected void onInitialize() {
super.onInitialize();
RequiredTextField<String> name = new RequiredTextField<>("name");
- name.setLabel(new Model<>(Application.getString(193)));
+ name.setLabel(new Model<>(Application.getString("193")));
add(name);
add(new DropDownChoice<>("numberOfPartizipants", //
@@ -131,7 +131,7 @@ public class RoomForm extends AdminBaseForm<Room> {
}
}));
- add(new RoomTypeDropDown("type").setRequired(true).setLabel(Model.of(Application.getString(194))));
+ add(new RoomTypeDropDown("type").setRequired(true).setLabel(Model.of(Application.getString("194"))));
add(new TextArea<String>("comment"));
@@ -180,7 +180,7 @@ public class RoomForm extends AdminBaseForm<Room> {
add(new CheckBox("isDemoRoom"));
TextField<Integer> demoTime = new TextField<>("demoTime");
- demoTime.setLabel(new Model<>(Application.getString(637)));
+ demoTime.setLabel(new Model<>(Application.getString("637")));
add(demoTime);
add(new CheckBox("allowUserQuestions"));
add(new CheckBox("audioOnly"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 9ac496f..d02c15d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -108,7 +108,7 @@ public class UserForm extends AdminBaseForm<User> {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
add(password.setResetPassword(false).setLabel(Model.of(getString("133")))
.add(passValidator = new StrongPasswordValidator(getMinPasswdLength(cfgDao), getModelObject())));
- login.setLabel(Model.of(Application.getString(132)));
+ login.setLabel(Model.of(Application.getString("132")));
add(login.add(minimumLength(getMinLoginLength(cfgDao))));
add(new DropDownChoice<>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() {
@@ -188,10 +188,7 @@ public class UserForm extends AdminBaseForm<User> {
u = getBean(UserDao.class).update(u, password.getConvertedInput(), getUserId());
if (isNew && sendEmailAtRegister) {
String email = u.getAddress().getEmail();
- String sendMail = getBean(EmailManager.class).sendMail(login.getValue(), email, u.getActivatehash(), false, null);
- if (!sendMail.equals("success")) {
- throw new Exception("Mail for new user is not sent");
- }
+ getBean(EmailManager.class).sendMail(login.getValue(), email, u.getActivatehash(), false, null);
}
} catch (Exception e) {
// FIXME update feedback with the error details
@@ -282,7 +279,7 @@ public class UserForm extends AdminBaseForm<User> {
protected void onValidate() {
User u = getModelObject();
if(!getBean(UserDao.class).checkLogin(login.getConvertedInput(), u.getType(), u.getDomainId(), u.getId())) {
- error(getString("105"));
+ error(getString("error.login.inuse"));
}
super.onValidate();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
index ab8685d..df95464 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
@@ -48,7 +48,7 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
public class UsersPanel extends AdminPanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
- private final MessageDialog warning = new MessageDialog("warning", Application.getString(797), Application.getString(343), DialogButtons.OK, DialogIcon.WARN) {
+ private final MessageDialog warning = new MessageDialog("warning", Application.getString("797"), Application.getString("warn.nogroup"), DialogButtons.OK, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 38d1189..9641bdc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -679,10 +679,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica
return wac == null ? null : wac.getBean(clazz);
}
- public static String getString(long id) {
- return getString(id, WebSession.getLanguage());
- }
-
public static String getString(String id) {
return getString(id, WebSession.getLanguage());
}
@@ -699,14 +695,6 @@ public class Application extends AuthenticatedWebApplication implements IApplica
return getString(key, getLocale(languageId));
}
- public static String getString(long id, final long languageId) {
- return getString(id, getLocale(languageId));
- }
-
- public static String getString(long id, final Locale loc) {
- return getString("" + id, loc);
- }
-
public static String getString(String key, final Locale loc, String... params) {
if (!exists()) {
ThreadContext.setApplication(org.apache.wicket.Application.get(appName));
@@ -818,18 +806,13 @@ public class Application extends AuthenticatedWebApplication implements IApplica
}
@Override
- public String getOmString(long id) {
- return getString(id);
- }
-
- @Override
- public String getOmString(long id, long languageId) {
- return getString(id, languageId);
+ public String getOmString(String key, long languageId) {
+ return getString(key, languageId);
}
@Override
- public String getOmString(String key, long languageId) {
- return getString(key, languageId);
+ public String getOmString(String key) {
+ return getString(key);
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index e54780a..e63c6fe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Ellipse</entry>
<entry key="101">Close</entry>
<entry key="102">input data error</entry>
- <entry key="103">Password and/or login is too short</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">The username is already used</entry>
- <entry key="106">The mail address is already registered</entry>
- <entry key="107">System error please contact the administrator</entry>
<entry key="108">Login</entry>
<entry key="109">Username or mail address</entry>
<entry key="110">Password</entry>
@@ -253,7 +248,6 @@
<entry key="233">Wrong email</entry>
<entry key="234">You have entered an invalid email address</entry>
<entry key="235">Registration complete</entry>
- <entry key="236">Your account has been created. You can now login.</entry>
<entry key="237">Someone is already sharing their screen</entry>
<entry key="238">Sharing forbidden</entry>
<entry key="239">Share/record screen</entry>
@@ -291,7 +285,6 @@
<entry key="273">Users</entry>
<entry key="274">Delete user from usergroup</entry>
<entry key="275">D</entry>
- <entry key="276">This user is already a member of this usergroup</entry>
<entry key="277">News</entry>
<entry key="278">Quick links</entry>
<entry key="279">Go to conference</entry>
@@ -347,20 +340,9 @@
<entry key="331">Password and or username too short, required minimum length for user name / password are:</entry>
<entry key="332">Password set. You can now login.</entry>
<entry key="333">OK</entry>
- <entry key="334">Unknown error. Please report this to the administrator.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Invalid password</entry>
<entry key="337">Successfully logged out</entry>
- <entry key="338">Registration disabled</entry>
- <entry key="339">Invalid email address</entry>
- <entry key="340">Duplicate file name, please enter another</entry>
- <entry key="341">File name too short</entry>
- <entry key="342">Could not save the address</entry>
- <entry key="343">User added but you need to assign this user to an usergroup, otherwise they won't be able to log in</entry>
<entry key="344">New record</entry>
- <entry key="345">No field found for the ID</entry>
- <entry key="346">No label found</entry>
- <entry key="347">Admin authorization required</entry>
<entry key="348">Language editor</entry>
<entry key="349">Language</entry>
<entry key="350">Label ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Label name</entry>
<entry key="355">Label value</entry>
<entry key="356">Label ID</entry>
- <entry key="357">You have deleted the label</entry>
- <entry key="358">Invalid label ID</entry>
<entry key="359">You cannot delete this field</entry>
<entry key="360">Export</entry>
<entry key="361">You need to logout for any changes to update</entry>
@@ -381,10 +361,6 @@
<entry key="365">Name</entry>
<entry key="366">Add language</entry>
<entry key="367">Backup</entry>
- <entry key="368">goto first</entry>
- <entry key="369">goto previous</entry>
- <entry key="370">goto next</entry>
- <entry key="371">goto last</entry>
<entry key="372">user speaks (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">turn sound on/off</entry>
<entry key="374">System</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Users in this room</entry>
<entry key="402">Refresh</entry>
- <entry key="403">This room is full</entry>
<entry key="404">Click on a room to get the room details</entry>
<entry key="405">Chat with the users in this room</entry>
<entry key="406">Room</entry>
@@ -546,12 +521,8 @@
<entry key="530">Valid from</entry>
<entry key="531">Valid to</entry>
<entry key="532">Invitation to {0}</entry>
- <entry key="533">No invitation available for this invitation code</entry>
- <entry key="534">This invitation was already used</entry>
- <entry key="535">The invitation code is invalid</entry>
<entry key="536">Password</entry>
<entry key="537">Check password</entry>
- <entry key="538">Invalid password</entry>
<entry key="539">Audio/video</entry>
<entry key="540">Synchronize audio/video</entry>
<entry key="541">Login was correct, but the session is not active or stored on the server</entry>
@@ -671,18 +642,12 @@
<entry key="660">Add or delete users or rooms within your organisation</entry>
<entry key="661">Do you really want to delete this record?</entry>
<entry key="662">Do you really want to delete this user from your organisation?</entry>
- <entry key="663">You cannot delete your own user</entry>
- <entry key="664">This method needs an adminstration account to be invoked</entry>
- <entry key="665">There was no session associated with this ID</entry>
- <entry key="666">This is an administrator or moderator account. You can only edit this account through the administration panel.</entry>
<entry key="667">To complete your registration please click on the following link</entry>
<entry key="668">Click to verify your email</entry>
<entry key="669">No user was found for this hash</entry>
<entry key="670">This user is already activated</entry>
<entry key="671">You successfully activated your account</entry>
<entry key="672">Login now</entry>
- <entry key="673">Your account is not activated. Please use the link in the email you received during registration.</entry>
- <entry key="674">You have successfully signed up. An email with a verification code will be sent to your mailbox.</entry>
<entry key="675">Remove moderator role from this user</entry>
<entry key="676">Grant moderator rights to this user</entry>
<entry key="677">User</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply to be moderator</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for audio/video access</entry>
- <entry key="787">This session hash has already been used</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit?</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a meeting</entry>
<entry key="806">To setup a conference you can add a new event in the calendar</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no user selected</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started.</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP data</entry>
<entry key="921">Re-generate SIP data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder.</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th parties to access a meeting.</entry>
- <entry key="1000">This email is already used by another user.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The conference number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts.</entry>
<entry key="1198">confirmed you as contact.</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you. You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied.</entry>
- <entry key="1227">The user is already approved.</entry>
- <entry key="1228">This user contact hash is invalid.</entry>
<entry key="1229">User added to contact list.</entry>
<entry key="1230">User denied as contact and removed from pending contact list.</entry>
- <entry key="1231">There is no such contact.</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner ID</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with user level user, moderator or admin</entry>
<entry key="1311">Webservice (only access via SOAP)</entry>
<entry key="1312">Load directly to the Whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple chart</entry>
<entry key="1415">Pie chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close poll</entry>
<entry key="1419">Are you sure you want to close this poll? No one will be able to vote.</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith.</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">You have the right to give exclusive audio. Click here to make yourself exclusive audio (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Unknown error. Please report this to the administrator.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registration disabled</entry>
+ <entry key="error.login.inuse">The username is already used</entry>
+ <entry key="error.email.inuse">The mail address is already registered</entry>
+ <entry key="error.notallowed">Admin authorization required</entry>
+ <entry key="error.hash.used">This invitation was already used</entry>
+ <entry key="error.hash.invalid">The invitation code is invalid</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Invalid password</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. Please use the link in the email you received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">User added but you need to assign this user to an usergroup, otherwise they won't be able to log in</entry>
+ <entry key="warn.notverified">You have successfully signed up. An email with a verification code will be sent to your mailbox.</entry>
+ <entry key="account.created">Your account has been created. You can now login.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Mr</entry>
- <entry key="user.salutation.ms">Ms</entry>
- <entry key="user.salutation.mrs">Mrs</entry>
- <entry key="user.salutation.dr">Dr</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Error</entry>
- <entry key="error.type.info">Message</entry>
- <entry key="poll.type.yesNo">Yes/No</entry>
- <entry key="poll.type.numeric">Numeric 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Mr</entry>
+ <entry key="user.salutation.ms">Ms</entry>
+ <entry key="user.salutation.mrs">Mrs</entry>
+ <entry key="user.salutation.dr">Dr</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Error</entry>
+ <entry key="error.type.info">Message</entry>
+ <entry key="poll.type.yesNo">Yes/No</entry>
+ <entry key="poll.type.numeric">Numeric 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Download as PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">goto first</entry>
+ <entry key="goto.prev">goto previous</entry>
+ <entry key="goto.next">goto next</entry>
+ <entry key="goto.last">goto last</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 6536748..c6a039f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">بيضوي</entry>
<entry key="101">وثيق</entry>
<entry key="102">خطأ في البيانات المدخله</entry>
- <entry key="103">اسم المستخدم يجب ان تكون على الأقل 4 احرف</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">اسم المستخدم مأخوذ من قبل</entry>
- <entry key="106">البريد الالكتروني هو ما سبق تسجيله</entry>
- <entry key="107">خطأ في النظام الرجاء الاتصال منظومة المشرفون</entry>
<entry key="108">تسجيل الدخول</entry>
<entry key="109">مستخدم :</entry>
<entry key="110">المرور :</entry>
@@ -253,7 +248,6 @@
<entry key="233">البريد الخطأ</entry>
<entry key="234">لقد قمت بادخال غير صالحة للبريد - Adress</entry>
<entry key="235">التسجيل الكامل</entry>
- <entry key="236">لقد تم انشاء حسابك. يمكنك الان تسجيل الدخول.</entry>
<entry key="237">لا يمكنك حصة الشاشه في تلك اللحظة. شخص آخر بالفعل السهم دورته الشاشه.</entry>
<entry key="238">تقاسم ممنوع</entry>
<entry key="239">حصة الشاشه</entry>
@@ -291,7 +285,6 @@
<entry key="273">المستعملون</entry>
<entry key="274">حذف المستخدم من المنظمه</entry>
<entry key="275">حذف</entry>
- <entry key="276">هذا المستخدم هو بالفعل عضو في هذه المنظمه.</entry>
<entry key="277">اخبار</entry>
<entry key="278">Quicklinks</entry>
<entry key="279">جوتو المؤتمر</entry>
@@ -347,20 +340,9 @@
<entry key="331">أربع أحرف أو أكثر</entry>
<entry key="332">تم تسجيل كلمة المرور. يمكنك الآن تسجيل الدخول</entry>
<entry key="333">OK</entry>
- <entry key="334">خطأ غير معروف. الرجاء إبلاغ فريق الخدمة</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">كلمة مرور غير صحيحة</entry>
<entry key="337">تم تسجيل الخروج بنجاح</entry>
- <entry key="338">تم إلغاء التسجيل السابق.</entry>
- <entry key="339">بريد إلكتروني غير صحيح</entry>
- <entry key="340">إسم ملف مكرر. الرجاء إختيار إسماً آخراً</entry>
- <entry key="341">إسم الملف قصير</entry>
- <entry key="342">لا يمكن حفظ العنوان</entry>
- <entry key="343">تمت إضافة المستخدم لكن يجب إنساب هذا المستخدم إلى تنظيم و إلا لن يمكنه تسجيل الدخول.</entry>
<entry key="344">سجل جديد</entry>
- <entry key="345">ليس هناك أي حقل يحمل هذا Id.</entry>
- <entry key="346">ليس هناك إسم لهذه الرقعة.</entry>
- <entry key="347">المطلوب إذن المشرف</entry>
<entry key="348">محرر اللغة</entry>
<entry key="349">لغة</entry>
<entry key="350">معرف الرقعة</entry>
@@ -370,8 +352,6 @@
<entry key="354">إسم الرقعة</entry>
<entry key="355">قيمة الرقعة</entry>
<entry key="356">معرف الرقعة</entry>
- <entry key="357">لقد حذفت الرقعة ليس الحقل! لا يمكنك حذف الحقل. يمكن أن يكون له رقع في لغات أخرى.</entry>
- <entry key="358">رقعة غير صالح ةid. لا يمكن إيجاد The FieldLanguagesvalues_Id في قاعدة البيانات.</entry>
<entry key="359">لا يمكنك حذف هذا الحقل. يمكنك فقط حذف رقعات لا حلقات. ليس هناك أي رقعات محملة في هذه الأثناء، سواء لم تختر أي حقل أو ليس هناك أي رقعة معرفة لهذه اللغة لهذا الحقل.</entry>
<entry key="360">تصدير</entry>
<entry key="361">يجب أن تخرج لرؤية التغييرات.</entry>
@@ -381,10 +361,6 @@
<entry key="365">إسم</entry>
<entry key="366">إضافة لغة</entry>
<entry key="367">نسخ إحتياطي</entry>
- <entry key="368">القفز إلى الأول</entry>
- <entry key="369">القفز إلى السابق</entry>
- <entry key="370">القفز إلى التالي</entry>
- <entry key="371">القفز إلى الأخير</entry>
<entry key="372">المستخدم يتكلم</entry>
<entry key="373">تشغيل/إيقاف الصوت</entry>
<entry key="374">نظام</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">المستخدمين في هذه الغرفة:</entry>
<entry key="402">تحديث</entry>
- <entry key="403">هذه الغرفة ممتلئة. حاول بعد بضع دقائق مرة أخرى.</entry>
<entry key="404">إضغط على الغرفة للحصول على تفاصيل</entry>
<entry key="405">دردشة مع المستخدمين في هذه الغرفة:</entry>
<entry key="406">غرفة:</entry>
@@ -546,12 +521,8 @@
<entry key="530">صالح من:</entry>
<entry key="531">صالح لغاية:</entry>
<entry key="532">دعوة إلى To {0}</entry>
- <entry key="533">ليس هناك دعوة متوفرة لرمز الدعوة هذا</entry>
- <entry key="534">هذه الدعوة استخدمت من قبل. لا يمكن إعادة إستخدام هذا النوع من الدعوات.</entry>
- <entry key="535">رمز الدعوة هذا ليس صالح.</entry>
<entry key="536">كلمة المرور:</entry>
<entry key="537">إفحص كلمة المرور</entry>
- <entry key="538">كلمة مرور غير صحيحة!</entry>
<entry key="539">متصفح</entry>
<entry key="540">مزامنة الصوت/الصورة</entry>
<entry key="541">تسجيل الدخول صحيح لكن الجلسة التي إخترتها معطلة أو مخزنة في الخادوم. تحتاج أن تحصل على ID-جلسة جديد و تسجل الدخول من جديد.</entry>
@@ -671,18 +642,12 @@
<entry key="660">إضافة أو حذف مستخدمين أو غرف ضمن منظمتك</entry>
<entry key="661">هل تريد حقاً حذف هذا التسجيل؟</entry>
<entry key="662">هل تريد حقاً حذف هذا المستخدم من منظمتك؟ سوف يتم فقط حذف الإتصال بين المستخدم و منظمتك، من أجل حذف المستخدم يجب أن تدخل لوحة المسؤول.</entry>
- <entry key="663">لا يمكنك حذف مستخدمك!</entry>
- <entry key="664">لتنفيذ هذه الطريقة تحتاج لحساب مسؤول!</entry>
- <entry key="665">ليس هناك أي جلسة ترتبط ب- ID هذا.</entry>
- <entry key="666">هذا حساب مسؤول أو مدير. يمكن تحرير هذا الحساب عن طريق لوحة المسؤول.</entry>
<entry key="667">لإكمال التسجيل الرجاء النقر على الرابط التالي. أو نسخ URL إلى المتصفح.</entry>
<entry key="668">أنقر من أجل التحقق من بريدك الإلكتروني</entry>
<entry key="669">ليس هناك أي مستخدم لهذا الخليط.</entry>
<entry key="670">هذا المستخدم معطل!</entry>
<entry key="671">لقد تم تفعيل حسابك بنجاح!</entry>
<entry key="672">تسجيل الدخول الآن</entry>
- <entry key="673">حسابك ليس شغال. إستخدم أولاً الرابط في البريد الإلكتروني الذي حصلت عليه خلال التسجيل.</entry>
- <entry key="674">لقد تم فتح حسابك بنجاح. لقد تم إرسال بريد إلكتروني مع رمز تحقق إلى بريدك. الرجاء التحقق من بريدك الإلكتروني.</entry>
<entry key="675">إزالة دور الإدارة من هذا المستخدم</entry>
<entry key="676">منح هذا المستخدم حق الإدارة</entry>
<entry key="677">مستخدم</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">خطأ غير معروف. الرجاء إبلاغ فريق الخدمة</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">تم إلغاء التسجيل السابق.</entry>
+ <entry key="error.login.inuse">اسم المستخدم مأخوذ من قبل</entry>
+ <entry key="error.email.inuse">البريد الالكتروني هو ما سبق تسجيله</entry>
+ <entry key="error.notallowed">المطلوب إذن المشرف</entry>
+ <entry key="error.hash.used">هذه الدعوة استخدمت من قبل. لا يمكن إعادة إستخدام هذا النوع من الدعوات.</entry>
+ <entry key="error.hash.invalid">رمز الدعوة هذا ليس صالح.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">كلمة مرور غير صحيحة!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">حسابك ليس شغال. إستخدم أولاً الرابط في البريد الإلكتروني الذي حصلت عليه خلال التسجيل.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">تمت إضافة المستخدم لكن يجب إنساب هذا المستخدم إلى تنظيم و إلا لن يمكنه تسجيل الدخول.</entry>
+ <entry key="warn.notverified">لقد تم فتح حسابك بنجاح. لقد تم إرسال بريد إلكتروني مع رمز تحقق إلى بريدك. الرجاء التحقق من بريدك الإلكتروني.</entry>
+ <entry key="account.created">لقد تم انشاء حسابك. يمكنك الان تسجيل الدخول.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">السيد</entry>
- <entry key="user.salutation.ms">السيدة</entry>
- <entry key="user.salutation.mrs">Mrs.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">خطأ</entry>
- <entry key="error.type.info">رسالة</entry>
- <entry key="poll.type.yesNo">نعم / لا</entry>
- <entry key="poll.type.numeric">عددي 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">السيد</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>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Download as PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">القفز إلى الأول</entry>
+ <entry key="goto.prev">القفز إلى السابق</entry>
+ <entry key="goto.next">القفز إلى التالي</entry>
+ <entry key="goto.last">القفز إلى الأخير</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 977bfa8..ee3615c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Елипса</entry>
<entry key="101">затваряне</entry>
<entry key="102">грешка във входните данни</entry>
- <entry key="103">4 или повече знака; големите букви имат значение</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">потребителското име е заето</entry>
- <entry key="106">E-mail адресът е зает</entry>
- <entry key="107">Грешка в системата, потърсете системния администратор.</entry>
<entry key="108">Вход</entry>
<entry key="109">Име или e-mail:</entry>
<entry key="110">Парола:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Грешен e-mail</entry>
<entry key="234">Въвели сте грешен e-mail адрес</entry>
<entry key="235">Регистрацията е завършена</entry>
- <entry key="236">Акаунтът е създаден. Може да влезете в системата.</entry>
<entry key="237">В момента не може да споделяте екрана си. Някой друг вече споделя своя екран.</entry>
<entry key="238">Споделянето е забранено.</entry>
<entry key="239">Споделяне на екран</entry>
@@ -291,7 +285,6 @@
<entry key="273">Потребители</entry>
<entry key="274">изтриване на потребител от организация</entry>
<entry key="275">D</entry>
- <entry key="276">Потребителят вече е член на организацията.</entry>
<entry key="277">Новини</entry>
<entry key="278">Бързи връзки</entry>
<entry key="279">Към конференция</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 или повече знака; главните букви имат значение!</entry>
<entry key="332">Паролата е настроена, вече може да влезете в системата.</entry>
<entry key="333">ОК</entry>
- <entry key="334">Грешка. Докладвайте за бъг!</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Невалидна парола</entry>
<entry key="337">Успешен изход от системата</entry>
- <entry key="338">Забранена е регистрацията на нови потребители.</entry>
- <entry key="339">Невалиден e-mail</entry>
- <entry key="340">дублиране на името на файла, изберете друго име</entry>
- <entry key="341">името на файла е много кратко</entry>
- <entry key="342">Не може да се запази адреса</entry>
- <entry key="343">Потребителят е добавен, но трябва да се добави към Организация, за да може да влезе в системата.</entry>
<entry key="344">Нов запис</entry>
- <entry key="345">Не е намерено поле с такова полеID</entry>
- <entry key="346">Не е намерен етикет на това поле</entry>
- <entry key="347">Необходима е ауторизация като администратор</entry>
<entry key="348">Редактор на език</entry>
<entry key="349">Език</entry>
<entry key="350">Етикет-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Име на етикета</entry>
<entry key="355">Стойност на етикета</entry>
<entry key="356">Етикет-ID</entry>
- <entry key="357">Може да изтриете само етикета, но НЕ и полето! Не може да изтриете полето, защото то съдържа етикети на други езици.</entry>
- <entry key="358">Невалидно Етикет-ID.</entry>
<entry key="359">Не може да изтриете това поле.</entry>
<entry key="360">експорт</entry>
<entry key="361">Трябва да излезете от системата, за да видите промените.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Име</entry>
<entry key="366">добавяне на език</entry>
<entry key="367">Бекъп</entry>
- <entry key="368">първа страница</entry>
- <entry key="369">предишна страница</entry>
- <entry key="370">следваща страница</entry>
- <entry key="371">последна страница</entry>
<entry key="372">потребителят говори (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">изкл./вкл. на звука</entry>
<entry key="374">Система</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Потребители в тази стая:</entry>
<entry key="402">опресняване</entry>
- <entry key="403">Тази стая е пълна. Пробвайте отново след няколко минути.</entry>
<entry key="404">натиснете върху стая за детайли</entry>
<entry key="405">Чат с потребителите от тази стая:</entry>
<entry key="406">Стая:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Валидност от:</entry>
<entry key="531">Валидност до:</entry>
<entry key="532">Покана за {0}</entry>
- <entry key="533">Няма покана на раположение, за този код.</entry>
- <entry key="534">Поканата вече е използвана. Този тип покани не могат да се използват повторно.</entry>
- <entry key="535">Кодът за покана не е валиден.</entry>
<entry key="536">Парола</entry>
<entry key="537">Проверка на парола</entry>
- <entry key="538">Грешна парола</entry>
<entry key="539">Аудио/Видео</entry>
<entry key="540">Синхронизация на Аудио/Видео</entry>
<entry key="541">Входът в системата е коректен, но сесията Ви не е активна. Трябва да опитате повторен вход в системата.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Добавяне/премахване на потребители и стаи от организацията</entry>
<entry key="661">Наистина ли искате да изтриете този запис?</entry>
<entry key="662">Наистина ли искате да изтриете потребителя от организацията? Това само ще прекъсне връзката между потребителя и организацията, за да изтриете потребителя изцяло трябва да влезете в Администраторския панел.</entry>
- <entry key="663">Не може да изтриете своя потребител!</entry>
- <entry key="664">Тази операция изисква Администраторски акаунт!</entry>
- <entry key="665">Няма сесия свързана с това ID.</entry>
- <entry key="666">Това е Администраторски или Модераторски акаунт. Може да редактирате този акаунт само през Административния панел.</entry>
<entry key="667">За да приключите регистрацията, натиснете следния линк или копирайте адреса в браузъра си.</entry>
<entry key="668">Натиснете, за да потвърдите е-майла.</entry>
<entry key="669">Не беше намерен такъв потребител.</entry>
<entry key="670">Този потребител вече е активиран.</entry>
<entry key="671">Успешно активирахте акаунта си!</entry>
<entry key="672">Вход сега</entry>
- <entry key="673">Вашият акаунт не е активиран. Използвайте линка за потвърждение в изпратения мейл.</entry>
- <entry key="674">Успешна регистрация! Изпратен е мейл за потвърждение на регистрацията и активиране на акаунта. Моля проверете мейла си.</entry>
<entry key="675">Изтриване на Модераторска роля за този потребител</entry>
<entry key="676">Даване на Модераторски права на този потребител</entry>
<entry key="677">Потребител</entry>
@@ -794,7 +759,6 @@
<entry key="784">Искане за Модератор</entry>
<entry key="785">Искане за рисуване върху дъската</entry>
<entry key="786">Искане достъп до камера/микрофон</entry>
- <entry key="787">Сесията вече се използва - не може да я използвате повторно.</entry>
<entry key="788">СТАРТ</entry>
<entry key="789">ИЗХОД</entry>
<entry key="790">Наистина ли искате да излезете? Може би трябва да изчистите дъската, качените документи и чат историята.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Планиране среща</entry>
<entry key="806">За да планирате среща, добавете събитие към каледара. За всяко събитие в каледара ще бъде автоматично създадена стая за конференция. Вие и всички присъстващи ще получат мейл с линк към стаята&lt;br/&gt;&lt;br/&gt; Може да изберете различни типове стаи с различен тип модерация.</entry>
<entry key="807">Нужда от помощ?</entry>
- <entry key="808">Ограничен</entry>
<entry key="809">Търсене</entry>
<entry key="810">Добавяне</entry>
<entry key="811">Не е избран потребител. Моля изберете елемент от списъка и го добавете.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Грешка. Докладвайте за бъг!</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Забранена е регистрацията на нови потребители.</entry>
+ <entry key="error.login.inuse">потребителското име е заето</entry>
+ <entry key="error.email.inuse">E-mail адресът е зает</entry>
+ <entry key="error.notallowed">Необходима е ауторизация като администратор</entry>
+ <entry key="error.hash.used">Поканата вече е използвана. Този тип покани не могат да се използват повторно.</entry>
+ <entry key="error.hash.invalid">Кодът за покана не е валиден.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Грешна парола</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Вашият акаунт не е активиран. Използвайте линка за потвърждение в изпратения мейл.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Потребителят е добавен, но трябва да се добави към Организация, за да може да влезе в системата.</entry>
+ <entry key="warn.notverified">Успешна регистрация! Изпратен е мейл за потвърждение на регистрацията и активиране на акаунта. Моля проверете мейла си.</entry>
+ <entry key="account.created">Акаунтът е създаден. Може да влезете в системата.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Г-н</entry>
- <entry key="user.salutation.ms">Г-жа</entry>
- <entry key="user.salutation.mrs">Г-жа</entry>
- <entry key="user.salutation.dr">Д-р</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Грешка</entry>
- <entry key="error.type.info">Съобщение</entry>
- <entry key="poll.type.yesNo">Да/Не</entry>
- <entry key="poll.type.numeric">Числов 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Г-н</entry>
+ <entry key="user.salutation.ms">Г-жа</entry>
+ <entry key="user.salutation.mrs">Г-жа</entry>
+ <entry key="user.salutation.dr">Д-р</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Грешка</entry>
+ <entry key="error.type.info">Съобщение</entry>
+ <entry key="poll.type.yesNo">Да/Не</entry>
+ <entry key="poll.type.numeric">Числов 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Сваляне в PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">първа страница</entry>
+ <entry key="goto.prev">предишна страница</entry>
+ <entry key="goto.next">следваща страница</entry>
+ <entry key="goto.last">последна страница</entry>
</properties>
[07/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 741c671..3dcc448 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Ellipszis</entry>
<entry key="101">bezár</entry>
<entry key="102">beviteli adathiba</entry>
- <entry key="103">4 vagy több karakter; kis/nagybetű számít!</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">A felhasználó már létezik</entry>
- <entry key="106">Az e-mail cím már regisztrálva van</entry>
- <entry key="107">Rendszerhiba, keresse fel a rendszergazdát.</entry>
<entry key="108">Bejelentkezés</entry>
<entry key="109">Felhasználó:</entry>
<entry key="110">Jelszó:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Hibás e-mail</entry>
<entry key="234">Hibás e-mail címet adtál meg</entry>
<entry key="235">A regisztráció megtörtént</entry>
- <entry key="236">Az fiókod elkészült. Beléphetsz.</entry>
<entry key="237">A képernyődet nem oszthatod meg most. Valaki más már megosztotta az övét.</entry>
<entry key="238">Megosztás megtiltva</entry>
<entry key="239">Képernyőmegosztás</entry>
@@ -291,7 +285,6 @@
<entry key="273">Felhasználók</entry>
<entry key="274">felhasználó törlése a szervezetből</entry>
<entry key="275">töröl</entry>
- <entry key="276">Ez a felhasználó már tagja a szervezetnek.</entry>
<entry key="277">Hírek</entry>
<entry key="278">Gyorslinkek</entry>
<entry key="279">Konferenciára megyek</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 vagy több karakter; kis/nagybetű számít!</entry>
<entry key="332">Jelszó beállítva. Bejelentkezhetsz.</entry>
<entry key="333">Rendben</entry>
- <entry key="334">Ismeretlen hiba. Írd meg a fejlesztőknek.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Hibás jelszó</entry>
<entry key="337">Sikeres kijelentkezés</entry>
- <entry key="338">Regisztráció letiltva.</entry>
- <entry key="339">Hibás E-mail</entry>
- <entry key="340">létező fájlnév, válassz mást</entry>
- <entry key="341">a fájlnév túl rövid</entry>
- <entry key="342">Cím nem menthető</entry>
- <entry key="343">Felhasználó hozzáadva de hozzá kell rendelni Szervezethez, különben nem fog tudni bejelentkezni.</entry>
<entry key="344">Új bejegyzés</entry>
- <entry key="345">Nincs ilyen mező azonosító.</entry>
- <entry key="346">Nincs cimke ehhez a mezőhöz.</entry>
- <entry key="347">Adminisztrátori jog szükséges</entry>
<entry key="348">Nyelv-szerkesztő</entry>
<entry key="349">Nyelv</entry>
<entry key="350">Cimke-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Cimkenév</entry>
<entry key="355">Cimkeérték</entry>
<entry key="356">Cimke-ID</entry>
- <entry key="357">Csak a cimke értékét törölheted és nem a mezőt! A mezőt nem törölheted, mert más nyelvben szükséges lehet.</entry>
- <entry key="358">Hibás cimke-ID. A FieldLanguagesvalues_Id nem található az adatbázisban.</entry>
<entry key="359">Ez a mező nem törölhető. Csak a cimke értékét törölheted. Nincs betöltött cimke, vagy nincs kiválasztva vagy nincs definiálva ehhez a nyelvhez.</entry>
<entry key="360">exportálás</entry>
<entry key="361">Ki kell jelentkezned, hogy lásd a változásokat.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Név</entry>
<entry key="366">nyelv hozzáadása</entry>
<entry key="367">Mentés</entry>
- <entry key="368">ugrás az elsőre</entry>
- <entry key="369">ugrás az előzőre</entry>
- <entry key="370">ugrás a következőre</entry>
- <entry key="371">ugrás az utolsóra</entry>
<entry key="372">a felhasználó beszél (Kattints ide a mikrofonja némításhoz, bekapcsoláshoz)</entry>
<entry key="373">hang ki/bekapcsolása</entry>
<entry key="374">Rendszer</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Felhasználók ebben a szobában:</entry>
<entry key="402">frissítés</entry>
- <entry key="403">A szoba megtelt. Próbálkozz pár perc múlva.</entry>
<entry key="404">kattints a szobára az információkér</entry>
<entry key="405">Csevegés a felhasználókkal a szobában:</entry>
<entry key="406">Szoba:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Ettől érvényes:</entry>
<entry key="531">Eddig érvényes:</entry>
<entry key="532">Meghívás OpenMeetingre</entry>
- <entry key="533">Nincs meghívás ehhez a meghívó kódhoz.</entry>
- <entry key="534">A meghívás már használva volt. Ez a típusú meghívás nem használható fel többször.</entry>
- <entry key="535">A meghívó kód nem érvényes.</entry>
<entry key="536">Jelszó:</entry>
<entry key="537">Jelszó ellenőrzés</entry>
- <entry key="538">Hibás jelszó!</entry>
<entry key="539">Böngésző</entry>
<entry key="540">Hang/kép szinkronizáció</entry>
<entry key="541">A bejelentkezés helyes volt, de session vagy nem aktív vagy nincs a szerveren tárolva. Újra be kell jelentkezned.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Hozzáad/töröl felhasználót vagy konferencia szobát a szervezethez?</entry>
<entry key="661">Valóban törli ezt a felvételt?</entry>
<entry key="662">Valóban törli ezt a felhasználót a szervezetből? Csak a szervezettel való kapcsolat törlődik, a felhasználó tényleges törlését az admnisztrátori felületen tudja elvégezni.</entry>
- <entry key="663">Ön nem törölheti ezt a felhasználót!</entry>
- <entry key="664">Ehhez a tevékenységhez Adminisztrátori jog szükséges!</entry>
- <entry key="665">Nem tartozik Session ehhez az ID-hez.</entry>
- <entry key="666">Ez Adminisztrátori, Moderátori fiók. Ezt csak Adminisztrátori panelen szerkesztheti.</entry>
<entry key="667">A regisztráció aktiválásához kattintson a linkre, vagy másolja ki és illessze a böngésző címsorába.</entry>
<entry key="668">Kattintson az E-Mail megerősítéshez</entry>
<entry key="669">Nincs felhasználó ezzel a Hash azonosítóval.</entry>
<entry key="670">A felhasználó már aktiválásra került!</entry>
<entry key="671">Sikeresen aktiválta a felhasználói fiókját!</entry>
<entry key="672">Belépés most</entry>
- <entry key="673">Hozzáférése nem aktív. Először aktiválja a regisztrációkor kapott megerősítő e-mail segítségével.</entry>
- <entry key="674">Regisztráció kérését fogadtuk. Küldtünk egy megerősítést kérő linket a megadott e-mail címére, kérjük keresse fel az e-mail fiókját, a regisztrációs kérést vissza kell igazolnia!</entry>
<entry key="675">Moderációs jogok visszavétele a látogatótól</entry>
<entry key="676">Moderációs jog adása a látogatónak</entry>
<entry key="677">Látogató</entry>
@@ -794,7 +759,6 @@
<entry key="784">Moderáció megadása</entry>
<entry key="785">Tábla használat megadása</entry>
<entry key="786">Kamera/mikrofon használat megadása</entry>
- <entry key="787">Ezt a munkamenetet már használ(ja/ta). Nem használhatja többször.</entry>
<entry key="788">Indítás</entry>
<entry key="789">Kilépés</entry>
<entry key="790">Valóban kilép? Törlődni fognak a feltöltött dokumentumok, rajztábla, chat tartalma.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">A konferencia beállításához adja hozzá az eseményt a naptárhoz.</entry>
<entry key="807">Segítségre van szüksége?</entry>
- <entry key="808">Fenntartott</entry>
<entry key="809">Keresés</entry>
<entry key="810">Hozzáad</entry>
<entry key="811">Nincs felhasználó kiválasztva. Vállasszon elemet a listából és adja hozzá.</entry>
@@ -923,7 +886,6 @@
<entry key="917">Az interj felvétele sikeresen elindult!</entry>
<entry key="918">Mégsem</entry>
<entry key="919">A felvétel feldolgozása akár 5 perc is lehet 1 perces video esetén. A kiválasztott videó feldolgozása, kódolása:</entry>
- <entry key="920">Írja be a jelszavát ismét, miután az SIP adatokat megadta</entry>
<entry key="921">Újra generált SIP adatok</entry>
<entry key="922">Nem helyezheti át ezt a filet/könyvtárat ebbe az alkönyvtárba!</entry>
<entry key="923">Privát meghajtó mérete</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Számla</entry>
<entry key="998"></entry>
<entry key="999">Előfizetésének feltöltése szükséges, hogy meghívót küldhessen, vagy használja a naptárat. Az {0} alkalmazáshoz csak fizetéssel férhet hozzá akár perc alapon is. A konferenciához nincs hozzáférése 3. személynek, alakalmazásnak.</entry>
- <entry key="1000">Ezt az e-mail címet másik felhazsnáló már használja.</entry>
<entry key="1001">SIP-Beállítások</entry>
<entry key="1002">A konferencia száma és PIN kódja automatikusan létrehozva az OpenXG RPC-Átjáróval</entry>
<entry key="1003">SIP Azonosító</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hello,</entry>
<entry key="1193">szeretne kapcsolatként hozzáadni téged.</entry>
<entry key="1194">Ellenőrizze a felkérést a {0} alkalmazásban, vagy kattintson a megfelelő linkre az Elfogadáshoz/Visszautasításhoz.</entry>
- <entry key="1195">A felhasználó már a kontaktlistádon van, vagy kapott egy meghívást a kapcsolatilistádra, amire nem adott még választ.</entry>
<entry key="1196">Kapcsolataid</entry>
<entry key="1197">Kapcsolatok és üzenetek szerkesztése,<br/> függő kapcsolatok kezelése!</entry>
<entry key="1198">hagyd jóvá a kapcsolatod!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Küldött</entry>
<entry key="1224">Kuka</entry>
<entry key="1225">Ez Te vagy! Nem adhatod magad a kontakt listához.</entry>
- <entry key="1226">Ez a felhasználó tiltva van!</entry>
- <entry key="1227">Ez a felhasználó már el van fogadva!</entry>
- <entry key="1228">A felhasználó kapcsolata érvénytelen!</entry>
<entry key="1229">Felhasználó hozzáadva a kontakt listához!</entry>
<entry key="1230">A felhasználó kapcsolata tiltva van és folyamatban van a kontakt listáról levétele!</entry>
- <entry key="1231">Ezzel nincs kapcsolat!</entry>
<entry key="1232">Biztosan eltávolítja ezt a kapcsolatot?</entry>
<entry key="1233">Eltávolítás megerősítése</entry>
<entry key="1234">Kapcsolat törlése a listáról</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">A felhasználó nem osztotta meg a privát kapcsolati adatait.</entry>
<entry key="1269">A felhasználó csak a kpcsolataival osztotta meg a privát kapcsolati adatait.</entry>
<entry key="1270">Cím & Telefon</entry>
- <entry key="1271">A meghívód érvénytelen, a meghívó csak az alábbi időben érvényes:</entry>
<entry key="1272">Ez az esemény több felhasználó, több naptár bejegyzéshez is kapcsolódik. A változás mindegyiket érinti. Valóban frissíted a bejegyzést?</entry>
<entry key="1273">Frissítés megerősítése</entry>
<entry key="1274">Engedélyezem a kapcsolataimnak a naptárat (csak nézet)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Válasz</entry>
<entry key="1304">Szobák és Chat</entry>
<entry key="1305">Saját szobák</entry>
- <entry key="1306">Konferencia szobáim (1-16 résztvevő)</entry>
- <entry key="1307">Webinárium szobáim (1-120 résztvevő)</entry>
<entry key="1308">Tulajdonos Id</entry>
- <entry key="1309">Adjameg a jelszót</entry>
- <entry key="1310">Szükséges jogosultsági szint (felhasználó,vagy moderátor, vagy admnisztrátor)</entry>
<entry key="1311">Web-Service (Csak SOAP hozzáférés)</entry>
<entry key="1312">Közvetlen betöltés a táblába</entry>
<entry key="1313">Valóban eltávolítja ezt a táblát? A művelet nem fordítható vissza!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">aktív</entry>
<entry key="1414">Egyszerű diagramm</entry>
<entry key="1415">Oszlop diagramm</entry>
- <entry key="1416">Adja meg e-mail címét</entry>
<entry key="1417">Új üzenet(ek)</entry>
<entry key="1418">Szavazás lezárása</entry>
<entry key="1419">Biztosan lezárja a szavazást? Nem lehet később szavazni rá.</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Hozzászólási engedélyt kérek.</entry>
<entry key="1429">Kamera felbontás</entry>
<entry key="1430">Sávszélességének (Feltöltési irány) megfelelően válassza meg a felbontás. Nagyobb felbontás, nagyobb sávszélességet igényel!</entry>
- <entry key="1431">Nincs engedélye az egyéni Audio/Video kapcsolathoz. Kérjen engedélyt a moderátortól, vagy figyelmeztesse, hogy kapcsolja be a hozzáférését.</entry>
<entry key="1432">Egyéni audio hozzáférést kérek a hozzászóláshoz!</entry>
<entry key="1433">Egyéni audio/video kapcsolat velem (kattintson a panelen, vagy F12)</entry>
<entry key="1434">Mikrofon aktív!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Feltöltött fileok és felvételek betöltése a mentásből</entry>
<entry key="1538">SIP átvitel engedélyezése a szobában</entry>
<entry key="1539">Egyéni hangkapcsolatot kezdeményez ezzel a felhasználóval?</entry>
- <entry key="1540">Adjameg az időzónáját</entry>
- <entry key="1544">Konfigurációs beállító kulcs már létezik, válasszon másikat, vagy szerkessze a meglévőt</entry>
<entry key="1545">Tartalom mentése, kérem várjon...</entry>
<entry key="1546">Üdvözöljük</entry>
<entry key="1547">Widgeten megjelenő felhasználói adatok és linkek</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Ismeretlen hiba. Írd meg a fejlesztőknek.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Regisztráció letiltva.</entry>
+ <entry key="error.login.inuse">A felhasználó már létezik</entry>
+ <entry key="error.email.inuse">Az e-mail cím már regisztrálva van</entry>
+ <entry key="error.notallowed">Adminisztrátori jog szükséges</entry>
+ <entry key="error.hash.used">A meghívás már használva volt. Ez a típusú meghívás nem használható fel többször.</entry>
+ <entry key="error.hash.invalid">A meghívó kód nem érvényes.</entry>
+ <entry key="error.hash.period">A meghívód érvénytelen, a meghívó csak az alábbi időben érvényes:</entry>
+ <entry key="error.bad.password">Hibás jelszó!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Hozzáférése nem aktív. Először aktiválja a regisztrációkor kapott megerősítő e-mail segítségével.</entry>
+ <entry key="error.contact.added">A felhasználó már a kontaktlistádon van, vagy kapott egy meghívást a kapcsolatilistádra, amire nem adott még választ.</entry>
+ <entry key="error.contact.denied">Ez a felhasználó tiltva van!</entry>
+ <entry key="error.contact.approved">Ez a felhasználó már el van fogadva!</entry>
+ <entry key="error.cfg.exist">Konfigurációs beállító kulcs már létezik, válasszon másikat, vagy szerkessze a meglévőt</entry>
+ <entry key="warn.nogroup">Felhasználó hozzáadva de hozzá kell rendelni Szervezethez, különben nem fog tudni bejelentkezni.</entry>
+ <entry key="warn.notverified">Regisztráció kérését fogadtuk. Küldtünk egy megerősítést kérő linket a megadott e-mail címére, kérjük keresse fel az e-mail fiókját, a regisztrációs kérést vissza kell igazolnia!</entry>
+ <entry key="account.created">Az fiókod elkészült. Beléphetsz.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1762,25 +1729,25 @@
<entry key="install.wizard.congrats.config">változtassa meg a kliens szükséges konfigurációit</entry>
<entry key="install.wizard.congrats.mail">Levelező lista</entry>
<entry key="install.wizard.congrats.commercial">Néhány cég, akik üzleti támogatást nyújthatnak Apache OpenMeetings:</entry>
- <entry key="room.type.conference">csoportmunka (n:n) konferencia (1-25 látogatóval)</entry>
- <entry key="room.type.restricted">moderált (1:n) konferencia (1-150 látogatóval)</entry>
- <entry key="room.type.interview">interjú (1:1 megbeszélés felvétellel)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">ne küldjön értesítést</entry>
- <entry key="appointment.reminder.email">egyszerű e-mail</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Úr</entry>
- <entry key="user.salutation.ms">Hölgy</entry>
- <entry key="user.salutation.mrs">Mrs.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Hiba</entry>
- <entry key="error.type.info">Üzenet</entry>
- <entry key="poll.type.yesNo">Igen/Nem</entry>
- <entry key="poll.type.numeric">Szám 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">csoportmunka (n:n) konferencia (1-25 látogatóval)</entry>
+ <entry key="room.type.presentation">presentation (1-150 látogatóval)</entry>
+ <entry key="room.type.interview">interjú (1:1 megbeszélés felvétellel)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">ne küldjön értesítést</entry>
+ <entry key="appointment.reminder.email">egyszerű e-mail</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Úr</entry>
+ <entry key="user.salutation.ms">Hölgy</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Hiba</entry>
+ <entry key="error.type.info">Üzenet</entry>
+ <entry key="poll.type.yesNo">Igen/Nem</entry>
+ <entry key="poll.type.numeric">Szám 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1816,8 +1783,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1914,4 +1881,10 @@
<entry key="download.pdf">Letöltés mint PDF</entry>
<entry key="zoom.fullFit">Teljes méret</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">Konferencia szobáim (1-16 résztvevő)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">ugrás az elsőre</entry>
+ <entry key="goto.prev">ugrás az előzőre</entry>
+ <entry key="goto.next">ugrás a következőre</entry>
+ <entry key="goto.last">ugrás az utolsóra</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 522f527..8015b11 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Bentuk Lonjong</entry>
<entry key="101">tutup</entry>
<entry key="102">entri data salah</entry>
- <entry key="103">4 karakter atau lebih; hurup kapital semua!</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">username sudah terpakai</entry>
- <entry key="106">email sudah diregistrasi</entry>
- <entry key="107">System error silahkan kontak Admin</entry>
<entry key="108">Login</entry>
<entry key="109">User:</entry>
<entry key="110">Pass:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Email salah</entry>
<entry key="234">Alamat email yang anda masukan salah</entry>
<entry key="235">Registrasi Komplet</entry>
- <entry key="236">Akun anda udah dibuat, silahkan login sekarang.</entry>
<entry key="237">Anda tidak dapat melakukan sharing layar anda, seseorang sedang melakukannya.</entry>
<entry key="238">Tidak diperbolekan melakukan Sharing</entry>
<entry key="239">Sharing layar anda</entry>
@@ -291,7 +285,6 @@
<entry key="273">User</entry>
<entry key="274">hapus user dari organisasi</entry>
<entry key="275">hapus</entry>
- <entry key="276">User ini udah teregistrasi dalam organisasi ini.</entry>
<entry key="277">Berita</entry>
<entry key="278">Jalan singkat</entry>
<entry key="279">ke Konferensi</entry>
@@ -347,20 +340,10 @@
<entry key="331">4 karakter atau lebih, huruf kapital bermasalah!</entry>
<entry key="332">Password sudah di seting. Anda dapat login sekarang.</entry>
<entry key="333">OK</entry>
- <entry key="334">Kesalahan belum terlacak. Silahkan laporkan ke Team Servis.</entry>
<entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Password tidak valid</entry>
<entry key="337">Sukses keluar dari sistem</entry>
- <entry key="338">Halaman depan registrasi dimatikan.</entry>
- <entry key="339">EMail tidak valid</entry>
- <entry key="340">Duplikasi nama file, silahkan menggunakan nama lain</entry>
- <entry key="341">nama file terlalu pendek</entry>
- <entry key="342">Alamat tidak dapat disimpan</entry>
- <entry key="343">User telah ditambahkan tetapi anda harus memasukan kedalam salah satu organisasi, jika tidak akan mengakibatkan gagal login.</entry>
<entry key="344">Rekot baru</entry>
- <entry key="345">Tidak ditemukan Kolom dengan ID kolom ini.</entry>
- <entry key="346">Tidak ditemukan Label untuk kolom tersebut.</entry>
- <entry key="347">Dibutuhkan Autorisasi sebagai Admin</entry>
<entry key="348">Editor Bahasa</entry>
<entry key="349">Bahasa</entry>
<entry key="350">ID Label</entry>
@@ -370,8 +353,6 @@
<entry key="354">Nama Label</entry>
<entry key="355">Nilai Label</entry>
<entry key="356">ID Label</entry>
- <entry key="357">Anda hanya bisa hapus label bukan kolom! Anda tidak dapat menghapus kolom, mungkin ada label didalam bahasa yang lain.</entry>
- <entry key="358">ID Label tidak valid. Kolom FieldLanguagesvalues_Id tidak dapat ditemukan dalam database.</entry>
<entry key="359">Anda tidak dapat menghapus kolom ini. Anda hanya dapat menghapus label bukan kolom. Tidak ada label yang dipanggil sekarang, Mungkin belum dipiliah salah satu kolom atau tidak ada definisi label untuk kolom yang dimaksud pada pilihan bahasa ini.</entry>
<entry key="360">expor</entry>
<entry key="361">Anda harus keluar dahulu untuk melihat perubahan.</entry>
@@ -381,10 +362,6 @@
<entry key="365">Nama</entry>
<entry key="366">Tambah pilihan bahasa</entry>
<entry key="367">Buat Arsip</entry>
- <entry key="368">awal</entry>
- <entry key="369">sebelumnya</entry>
- <entry key="370">selanjutnya</entry>
- <entry key="371">akhir</entry>
<entry key="372">user yang berbicara (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">mode suara nyala/mati</entry>
<entry key="374">Sistem</entry>
@@ -416,7 +393,6 @@
<entry key="400"></entry>
<entry key="401">Users dalam ruangan ini:</entry>
<entry key="402">panggil ulang</entry>
- <entry key="403">Ruangan ini penuh, silahkan mencoba lagi dalam beberapa menit.</entry>
<entry key="404">Klik pada Judul ruangan untuk melihat detilnya</entry>
<entry key="405">Chat dengan user dalam ruangan ini:</entry>
<entry key="406">Ruangan:</entry>
@@ -546,12 +522,8 @@
<entry key="530">Valid dari :</entry>
<entry key="531">Valid sampai dengan:</entry>
<entry key="532">Undangan ke {0}</entry>
- <entry key="533">Tidak ada Undangan untu Kode undangan ini!</entry>
- <entry key="534">Undangan sudah terpakai, tidak bisa dipergunakan lagi.</entry>
- <entry key="535">Kode - Undangan tidak valid.</entry>
<entry key="536">Password:</entry>
<entry key="537">Periksa Password</entry>
- <entry key="538">Password salah!</entry>
<entry key="539">audio_video</entry>
<entry key="540">Syncronize Audio/Video</entry>
<entry key="541">Login was correct, but the Session you tried is not active or stored on the Server. You have to get a new SessionId and retry login.</entry>
@@ -671,18 +643,12 @@
<entry key="660">Add or delete Users or Rooms within your Organization</entry>
<entry key="661">Do you really want to delete this record?</entry>
<entry key="662">Do you really want to delete this user from your organization? You will only delete the connection between the user and your organization, to really delete the user itself you have to login into the Administration-Panel.</entry>
- <entry key="663">You cannot delete your own User!</entry>
- <entry key="664">This Method needs a Adminstration Account to be invoked!</entry>
- <entry key="665">There was no Session associated with this ID.</entry>
- <entry key="666">This is an Administrator or Moderator account. You can only edit this account through the Administration Panel.</entry>
<entry key="667">To complete your registration please click on the following link. Or copy the URL to your browser bar.</entry>
<entry key="668">Click to verify your E-Mail</entry>
<entry key="669">No user was found for this Hash.</entry>
<entry key="670">This user is already activated!</entry>
<entry key="671">You did successfully activate your account!</entry>
<entry key="672">Login Now</entry>
- <entry key="673">Your account is not activated. First use the link in the Email you've received during registration.</entry>
- <entry key="674">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
<entry key="675">Remove Moderation Role from this User</entry>
<entry key="676">Grant Moderation Rights to this User</entry>
<entry key="677">User</entry>
@@ -794,7 +760,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +779,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +887,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +966,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1160,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1190,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1231,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1265,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1371,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1385,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1492,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1552,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Kesalahan belum terlacak. Silahkan laporkan ke Team Servis.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Halaman depan registrasi dimatikan.</entry>
+ <entry key="error.login.inuse">username sudah terpakai</entry>
+ <entry key="error.email.inuse">email sudah diregistrasi</entry>
+ <entry key="error.notallowed">Dibutuhkan Autorisasi sebagai Admin</entry>
+ <entry key="error.hash.used">Undangan sudah terpakai, tidak bisa dipergunakan lagi.</entry>
+ <entry key="error.hash.invalid">Kode - Undangan tidak valid.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Password salah!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. First use the link in the Email you've received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">User telah ditambahkan tetapi anda harus memasukan kedalam salah satu organisasi, jika tidak akan mengakibatkan gagal login.</entry>
+ <entry key="warn.notverified">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
+ <entry key="account.created">Akun anda udah dibuat, silahkan login sekarang.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1742,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Tuan.</entry>
- <entry key="user.salutation.ms">Nyonya.</entry>
- <entry key="user.salutation.mrs">Mrs.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Salah</entry>
- <entry key="error.type.info">Pesan</entry>
- <entry key="poll.type.yesNo">Ya/Tidak</entry>
- <entry key="poll.type.numeric">Angka dari 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Tuan.</entry>
+ <entry key="user.salutation.ms">Nyonya.</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Salah</entry>
+ <entry key="error.type.info">Pesan</entry>
+ <entry key="poll.type.yesNo">Ya/Tidak</entry>
+ <entry key="poll.type.numeric">Angka dari 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1796,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1894,10 @@
<entry key="download.pdf">Download as PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">awal</entry>
+ <entry key="goto.prev">sebelumnya</entry>
+ <entry key="goto.next">selanjutnya</entry>
+ <entry key="goto.last">akhir</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index ea08929..9a69b06 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Ellisse</entry>
<entry key="101">Chiudi</entry>
<entry key="102">errori nei dati inseriti</entry>
- <entry key="103">Il nome utente o la password sono troppi corti</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Il nome utente è già in uso</entry>
- <entry key="106">L'indirizzo email è già stato usato</entry>
- <entry key="107">Errore di sistema, contattare l'amministratore</entry>
<entry key="108">Accesso</entry>
<entry key="109">Nome utente:</entry>
<entry key="110">Password:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Email errata</entry>
<entry key="234">Hai inserito un'indirizzo email non valido</entry>
<entry key="235">Registrazione completata</entry>
- <entry key="236">Il tuo profilo è stato creato. Ora puoi effettuare l'accesso.</entry>
<entry key="237">Qualcuno sta già condividenzo il suo schermo</entry>
<entry key="238">Condivisione non permessa</entry>
<entry key="239">Condivisione/Registrazione dello schermo</entry>
@@ -291,7 +285,6 @@
<entry key="273">Utenti</entry>
<entry key="274">Rimuovi l'utente dall'organizzazione</entry>
<entry key="275">Can</entry>
- <entry key="276">Questo utente è già membro di questa organizzazione.</entry>
<entry key="277">News</entry>
<entry key="278">Collegamenti veloci</entry>
<entry key="279">Vai alla conferenza</entry>
@@ -347,20 +340,9 @@
<entry key="331">La password o il nome utente sono troppo brevi. I requisiti minimi per la lunghezza di nome / password sono:</entry>
<entry key="332">Password impostata. Ora puoi collegarti.</entry>
<entry key="333">OK</entry>
- <entry key="334">Errore sconosciuto. Contatta il tuo amministratore.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Password non valida</entry>
<entry key="337">Disconnessione effettuata</entry>
- <entry key="338">Registrazione disattivata.</entry>
- <entry key="339">Email non valida</entry>
- <entry key="340">Nome del file duplicato, scegli un altro nome</entry>
- <entry key="341">Nome del file troppo corto</entry>
- <entry key="342">Salvataggio di indirizzo non possibile</entry>
- <entry key="343">Utente aggiunto, ma deve essere assegnato ad un'organizzazione, altrimenti non potrà collegarsi.</entry>
<entry key="344">Nuova registrazione</entry>
- <entry key="345">Nessun testo trovato con questo ID.</entry>
- <entry key="346">Nessun valore trovato per questo elemento.</entry>
- <entry key="347">Permessi da amministratore richiesti</entry>
<entry key="348">Editor linguaggi</entry>
<entry key="349">Linguaggi</entry>
<entry key="350">ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Nome etichetta</entry>
<entry key="355">Testo etichetta</entry>
<entry key="356">ID etichetta</entry>
- <entry key="357">Hai cancellato l'etichetta</entry>
- <entry key="358">ID etichetta non valido.</entry>
<entry key="359">Non puoi cancellare questo campo.</entry>
<entry key="360">Esporta</entry>
<entry key="361">Devi scollegarti per vedere i cambiamenti.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nome</entry>
<entry key="366">Aggiungi lingua</entry>
<entry key="367">Backup</entry>
- <entry key="368">Vai al primo</entry>
- <entry key="369">Vai al precedente</entry>
- <entry key="370">Vai al prossimo</entry>
- <entry key="371">Vai all'ultimo</entry>
<entry key="372">utente parla (Cliccando darai l'audio esclusivo / silenziando il microfono degli altri)</entry>
<entry key="373">suono on/off</entry>
<entry key="374">Sistema</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Utenti nella stanza:</entry>
<entry key="402">Aggiorna</entry>
- <entry key="403">Questa stanza è piena.</entry>
<entry key="404">Clicca su una stanza per avere dettagli</entry>
<entry key="405">Parla con gli utenti nella stanza:</entry>
<entry key="406">Stanza:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Valido da:</entry>
<entry key="531">Valido fino:</entry>
<entry key="532">Invito per {0}</entry>
- <entry key="533">Nessun invito presente per questo codice.</entry>
- <entry key="534">L'invito è già stato utilizzato.</entry>
- <entry key="535">Il codice di invito non è valido.</entry>
<entry key="536">Password:</entry>
<entry key="537">Controlla password</entry>
- <entry key="538">Password non valida!</entry>
<entry key="539">Audio/Video</entry>
<entry key="540">Sincronizzazione Audio/video</entry>
<entry key="541">Accesso corretto, ma la sessione non è attiva o presente sul server.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Aggiungi o cancella utenti o stanze della tua organizzazione</entry>
<entry key="661">Sei sicuro di cancellare questo record?</entry>
<entry key="662">Sei sicuro di rimuovere questo utente dall'organizzazione?</entry>
- <entry key="663">Non puoi rimuovere te stesso!</entry>
- <entry key="664">Questo metodo necessita di un account da amministratore per essere chiamato!</entry>
- <entry key="665">Non ci sono sessioni collegate a questo ID.</entry>
- <entry key="666">Questo utente è un amministratore o moderatore. Puoi modificare questo account solo dal pannello di amministratore.</entry>
<entry key="667">Per completare la registrazione per favore clicca sul link seguente</entry>
<entry key="668">clicca per convalidare la tua e-mail</entry>
<entry key="669">Nessun utente è stato trovato per questo codice hash.</entry>
<entry key="670">Questo utente è già stato attivato!</entry>
<entry key="671">Hai attivato correttamente il tuo utente!</entry>
<entry key="672">Collegati ora</entry>
- <entry key="673">Il tuo utente non è attivo. Per prima cosa clicca sul link presente nella mail ricevuta nel processo di registrazione</entry>
- <entry key="674">Ti sei registrato correttamente. E' stata inviata una e-mail per la verifica dell'utente. Per favore controlla la tua posta in arrivo.</entry>
<entry key="675">Rimuovi il ruolo di moderatore da questo utente.</entry>
<entry key="676">Assegna i diritti di moderatore a questo utente.</entry>
<entry key="677">Utente</entry>
@@ -794,7 +759,6 @@
<entry key="784">Assegna moderatore</entry>
<entry key="785">Assegna accesso alla lavagna</entry>
<entry key="786">Assegna accesso a video/audio</entry>
- <entry key="787">Questa hash di sessione in uso.</entry>
<entry key="788">INIZIO</entry>
<entry key="789">ESCI</entry>
<entry key="790">Sei sicuro di voler uscire?</entry>
@@ -814,7 +778,6 @@
<entry key="805">Pianifica una conferenza</entry>
<entry key="806">Per pianificare una conferenza puoi aggiungere un evento nel calendario. Per ogni evento sarà creata un apposita stanza. Tu e tutti gli invitati riceverete una mail con un link per accedere alla stanza.<br/><br/>Puoi scegliere tra diverse tipologie di stanze con differenti tipologie di layout e moderazione. Puoi anche scegliere tra diversi tipi di notifica via email che avvisano dell'evento in calendario.</entry>
<entry key="807">Serve aiuto?</entry>
- <entry key="808">Ristretto</entry>
<entry key="809">Cerca</entry>
<entry key="810">Aggiungi</entry>
<entry key="811">Non ci sono utenti selezionati.</entry>
@@ -923,7 +886,6 @@
<entry key="917">La registrazione di questa intervista è già stata avviata!</entry>
<entry key="918">Annulla</entry>
<entry key="919">La post-elaborazione di una Intervista durerà alcuni minuti in base al tempo registrato. L'avanzamento di questo processo di transcodifica è il seguente: </entry>
- <entry key="920">Devi inserire la password ancora per create automaticamente i dati SIP</entry>
<entry key="921">Ri-Genera dati SIP</entry>
<entry key="922">Non puoi spostare questo file o cartella nella sua sotto cartella!</entry>
<entry key="923">Dimensione spazio Utente</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Fattura</entry>
<entry key="998"></entry>
<entry key="999">Devi comprare una licenza a canone fisso per poter inviare gli inviti o creare conferenze tramite il calendario. Con una licenza a traffico puoi solo accedere a {0}. Non puoi permettere l'accesso ad altri soggetti.</entry>
- <entry key="1000">Questa Email è gia usata da un'altro utente.</entry>
<entry key="1001">Impostazioni SIP</entry>
<entry key="1002">Il numero della Stanza ed il PIN sono creati automaticamente tramite il gateway OpenXG RPC</entry>
<entry key="1003">Numero SIP</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Ciao,</entry>
<entry key="1193">vorrebbe aggiunterti ai suoi contatti.</entry>
<entry key="1194">Verifica le richieste di contatto in {0} o clicca in questi collegamenti per accettare o rifiutare le richieste</entry>
- <entry key="1195">Questo utente è già nella tua lista dei contatti o ha ricevuto un invito per esserci aggiunto al quale non ha ancora risposto.</entry>
<entry key="1196">LA lista dei tuoi contatti</entry>
<entry key="1197">Modifica i tuoi contatti e messaggi,<br/> gestisci le tuo richieste di contatto in sospeso!</entry>
<entry key="1198">si conferma come il contatto!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Posta inviata</entry>
<entry key="1224">Cestino</entry>
<entry key="1225">Questo sei tu! Non puoi aggiungere te stesso ai tuoi contatti.</entry>
- <entry key="1226">L'utente è già rifiutato!</entry>
- <entry key="1227">L'utente è già approvato!</entry>
- <entry key="1228">L'Hash dell'utente è invalida!</entry>
<entry key="1229">Utente aggiunto alla lista dei contatti!</entry>
<entry key="1230">Utente rifiutato come contatto e rimosso dalla lista dei contatti in sospeso!</entry>
- <entry key="1231">Non c'è un contatto così!</entry>
<entry key="1232">Vuoi relamente rimuovere questo contatto?</entry>
<entry key="1233">Conferma rimozione del contatto</entry>
<entry key="1234">Cancella il contatto dalla lista</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">L'utente non condivide i propri dati personali.</entry>
<entry key="1269">L'utente condivide i propri dati personali solo ai propri contatti.</entry>
<entry key="1270">Indirizzo & Telefono</entry>
- <entry key="1271">Il codice del tuo invito non è valido, il codice è valido solo durante questa data e ora: </entry>
<entry key="1272">Questo evento è collegato a diversi calendari di altri utenti. La tua modifica aggionerà il loro calendatio. Vuoi veramente aggiornare l'evento?</entry>
<entry key="1273">Conferma aggiornamento</entry>
<entry key="1274">Permetti ai contatti di vedere il mio calendario (Sola visualizzazione)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Rispondere</entry>
<entry key="1304">Stanze e chats</entry>
<entry key="1305">Mie stanze</entry>
- <entry key="1306">Mia stanza conferenza</entry>
- <entry key="1307">Mia stanza seminario</entry>
<entry key="1308">Id Proprietario</entry>
- <entry key="1309">Prego inserire una password</entry>
- <entry key="1310">Necessita un account di livello Utente, Moderatore o Amministratore</entry>
<entry key="1311">Web-Service (accesso solo tramite SOAP)</entry>
<entry key="1312">Carica direttamente nella lavagna</entry>
<entry key="1313">Confermi la rimozione di questa lavagna? Questa azione non potrà essere annullata!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">attivo</entry>
<entry key="1414">Grafico semplice</entry>
<entry key="1415">Grafico a torta</entry>
- <entry key="1416">Prego inserire email</entry>
<entry key="1417">Nuovi messaggi</entry>
<entry key="1418">Chiude sondaggio</entry>
<entry key="1419">Sei sicuro che vuoi chiudere il sondaggio? Nessun altro potrà votare</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Dai i permessi per l'audio esclusivo.</entry>
<entry key="1429">Risoluzione camera</entry>
<entry key="1430">Cambiando risoluzione influenzerà la banda, immagini più grandi hanno bisogno di più banda!</entry>
- <entry key="1431">Tu non hai i permessi per dare a te o agli altri l'audio esclusivo. Devi applicare i permessi come moderatore o chiedere al moderatore di darti l'audio esclusivo.</entry>
<entry key="1432">Vorrei ottenere i permessi per l'audio esclusivo</entry>
<entry key="1433">Dai l'audio esclusivo a me (In alternativa clicca nel riquadro del tuo video o premi F12)</entry>
<entry key="1434">Il microfono è attivo!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include files caricati e registrazione nel backup</entry>
<entry key="1538">Abilita connessioni SIP nella stanza</entry>
<entry key="1539">Vuoi veramente concedere all'utente l'audio esclusivo?</entry>
- <entry key="1540">Per favore specifica il tuo fuso orario</entry>
- <entry key="1544">Esiste già una configurazione con la chiave specificata, per favore specifica un'altra chiave o modifica la configurazione esistente</entry>
<entry key="1545">I contenuti stanno per essere salvati. Prego attendere.</entry>
<entry key="1546">Benvenuto</entry>
<entry key="1547">Widget per la visualizzazione delle principali informazioni dell'utente e dei collegamenti al supporto</entry>
@@ -1604,8 +1551,28 @@
<entry key="1605">Rimuovi l'audio di questo utente</entry>
<entry key="1606">Io vorrei condividere il mio audio</entry>
<entry key="1607">Ti è permesso condividere l'audio</entry>
- <entry key="install.wizard.install.header">Installazione</entry>
- <entry key="install.wizard.welcome.panel"><![CDATA[
+ <entry key="error.unknown">Errore sconosciuto. Contatta il tuo amministratore.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registrazione disattivata.</entry>
+ <entry key="error.login.inuse">Il nome utente è già in uso</entry>
+ <entry key="error.email.inuse">L'indirizzo email è già stato usato</entry>
+ <entry key="error.notallowed">Permessi da amministratore richiesti</entry>
+ <entry key="error.hash.used">L'invito è già stato utilizzato.</entry>
+ <entry key="error.hash.invalid">Il codice di invito non è valido.</entry>
+ <entry key="error.hash.period">Il codice del tuo invito non è valido, il codice è valido solo durante questa data e ora: </entry>
+ <entry key="error.bad.password">Password non valida!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Il tuo utente non è attivo. Per prima cosa clicca sul link presente nella mail ricevuta nel processo di registrazione</entry>
+ <entry key="error.contact.added">Questo utente è già nella tua lista dei contatti o ha ricevuto un invito per esserci aggiunto al quale non ha ancora risposto.</entry>
+ <entry key="error.contact.denied">L'utente è già rifiutato!</entry>
+ <entry key="error.contact.approved">L'utente è già approvato!</entry>
+ <entry key="error.cfg.exist">Esiste già una configurazione con la chiave specificata, per favore specifica un'altra chiave o modifica la configurazione esistente</entry>
+ <entry key="warn.nogroup">Utente aggiunto, ma deve essere assegnato ad un'organizzazione, altrimenti non potrà collegarsi.</entry>
+ <entry key="warn.notverified">Ti sei registrato correttamente. E' stata inviata una e-mail per la verifica dell'utente. Per favore controlla la tua posta in arrivo.</entry>
+ <entry key="account.created">Il tuo profilo è stato creato. Ora puoi effettuare l'accesso.</entry>
+ <entry key="install.wizard.install.header">Installazione</entry>
+ <entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
<a id="Enabling_import_of_PDFs_into_whiteboard"></a>Abilita
@@ -1775,25 +1742,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">Ci sono alcune aziende
che offrono anche il supporto commerciale per Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conferenza (1-25 users)</entry>
- <entry key="room.type.restricted">seminario (1-150 users)</entry>
- <entry key="room.type.interview">intervista (1:1 con registrazione)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">non inviare notifica</entry>
- <entry key="appointment.reminder.email">email semplice</entry>
- <entry key="appointment.reminder.ical">email con iCal</entry>
- <entry key="user.salutation.mr">sig.</entry>
- <entry key="user.salutation.ms">Sig.na</entry>
- <entry key="user.salutation.mrs">Sig.ra</entry>
- <entry key="user.salutation.dr">Dott.</entry>
- <entry key="user.salutation.prof">Prof.</entry>
- <entry key="error.type.error">Errore</entry>
- <entry key="error.type.info">Messaggio</entry>
- <entry key="poll.type.yesNo">Si/No</entry>
- <entry key="poll.type.numeric">Numerico 1-10</entry>
- <entry key="wizard.button.finish">Termina</entry>
+ <entry key="room.type.conference">conferenza (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">intervista (1:1 con registrazione)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">non inviare notifica</entry>
+ <entry key="appointment.reminder.email">email semplice</entry>
+ <entry key="appointment.reminder.ical">email con iCal</entry>
+ <entry key="user.salutation.mr">sig.</entry>
+ <entry key="user.salutation.ms">Sig.na</entry>
+ <entry key="user.salutation.mrs">Sig.ra</entry>
+ <entry key="user.salutation.dr">Dott.</entry>
+ <entry key="user.salutation.prof">Prof.</entry>
+ <entry key="error.type.error">Errore</entry>
+ <entry key="error.type.info">Messaggio</entry>
+ <entry key="poll.type.yesNo">Si/No</entry>
+ <entry key="poll.type.numeric">Numerico 1-10</entry>
+ <entry key="wizard.button.finish">Termina</entry>
<entry key="main.menu.admin.email">Gestione Email</entry>
<entry key="main.menu.admin.email.desc">Verifica elaborazione e-mails del sistema</entry>
<entry key="admin.email.group.label">Messaggio Email</entry>
@@ -1830,8 +1797,8 @@
<entry key="install.room.public.conference">Stanza Conferenze Pubblica</entry>
<entry key="install.room.public.video.only">Stanza Solo Video Pubblica</entry>
<entry key="install.room.public.video.wb">Stanza Video e Lavagna Pubblica</entry>
- <entry key="install.room.public.restricted">Stanza Seminario Publica</entry>
- <entry key="install.room.restricted.micro">Stanza seminario con impostazione microfono</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Stanza conferenze con impostazione microfono</entry>
<entry key="install.room.private.conference">Stanza Conferenze Privata</entry>
<entry key="appointment.tab.general">Generale</entry>
@@ -1928,4 +1895,10 @@
<entry key="download.pdf">Scarica come PDF</entry>
<entry key="zoom.fullFit">Schermo-Intero</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">Mia stanza conferenza</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">Vai al primo</entry>
+ <entry key="goto.prev">Vai al precedente</entry>
+ <entry key="goto.next">Vai al prossimo</entry>
+ <entry key="goto.last">Vai all'ultimo</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 34eb7f8..149559d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">楕円</entry>
<entry key="101">閉じる</entry>
<entry key="102">入力データエラー</entry>
- <entry key="103">ユーザー名は最低4文字以上必要です</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">そのユーザー名は既に使われています</entry>
- <entry key="106">そのメールアドレスは既に登録されています</entry>
- <entry key="107">システムエラー。管理者に連絡してください。</entry>
<entry key="108">ログイン</entry>
<entry key="109">ユーザー:</entry>
<entry key="110">パスワード:</entry>
@@ -253,7 +248,6 @@
<entry key="233">メールアドレスが間違っています</entry>
<entry key="234">メールアドレスが無効です</entry>
<entry key="235">登録完了</entry>
- <entry key="236">アカウントが作成されました。ログイン可能です。</entry>
<entry key="237">ただいまデスクトップ共有ができません。誰かが既に共有しています。</entry>
<entry key="238">共有は許可されていません。</entry>
<entry key="239">画面の共有/録画</entry>
@@ -291,7 +285,6 @@
<entry key="273">ユーザー</entry>
<entry key="274">組織からユーザーを削除</entry>
<entry key="275">削除</entry>
- <entry key="276">このユーザーは既にこの組織のメンバーです。</entry>
<entry key="277">ニュース</entry>
<entry key="278">リンク</entry>
<entry key="279">会議室リスト</entry>
@@ -347,20 +340,9 @@
<entry key="331">4文字以上必要です。大文字小文字の区別があります。</entry>
<entry key="332">パスワードが設定されました。ログイン可能です。</entry>
<entry key="333">OK</entry>
- <entry key="334">未知のエラーです。管理者に報告してください。</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">パスワードが無効です。</entry>
<entry key="337">ログアウト完了</entry>
- <entry key="338">フロントエンド登録は無効です。</entry>
- <entry key="339">無効なメールアドレスです。</entry>
- <entry key="340">ファイル名が重複しています。別の名前にしてください。</entry>
- <entry key="341">ファイル名が短すぎます。</entry>
- <entry key="342">アドレスが保存できませんでした。</entry>
- <entry key="343">ユーザーは追加されました。このユーザーは少なくとも一つの組織に所属させる必要があります。</entry>
<entry key="344">新規作成</entry>
- <entry key="345">このフィールドIDのフィールドが見つかりません。</entry>
- <entry key="346">このフィールドのラベルが見つかりません。</entry>
- <entry key="347">管理者権限が必要です。</entry>
<entry key="348">言語エディタ</entry>
<entry key="349">言語</entry>
<entry key="350">ラベルID</entry>
@@ -370,8 +352,6 @@
<entry key="354">ラベル名</entry>
<entry key="355">値</entry>
<entry key="356">ラベルID</entry>
- <entry key="357">ラベルを削除しました。</entry>
- <entry key="358">ラベルIDが無効です。</entry>
<entry key="359">このフィールドは削除不可です。</entry>
<entry key="360">エクスポート</entry>
<entry key="361">変更結果を反映するには再ログインが必要です。</entry>
@@ -381,10 +361,6 @@
<entry key="365">名前</entry>
<entry key="366">言語の追加</entry>
<entry key="367">バックアップ</entry>
- <entry key="368">最初へ</entry>
- <entry key="369">前へ</entry>
- <entry key="370">次へ</entry>
- <entry key="371">最後へ</entry>
<entry key="372">ユーザーが話し中（マイク権の与奪をするにはここをクリック）</entry>
<entry key="373">音声オン/オフ</entry>
<entry key="374">システム</entry>
@@ -416,7 +392,6 @@
<entry key="400">会議室リスト</entry>
<entry key="401">会議室内のユーザー:</entry>
<entry key="402">更新</entry>
- <entry key="403">この会議室は満員です。</entry>
<entry key="404">詳細表示</entry>
<entry key="405">会議室内のユーザーとチャット:</entry>
<entry key="406">会議室:</entry>
@@ -546,12 +521,8 @@
<entry key="530">開始:</entry>
<entry key="531">終了:</entry>
<entry key="532">{0} 会議参加依頼</entry>
- <entry key="533">この招待コードで利用可能な招待はありません。</entry>
- <entry key="534">その招待はすでに使われています。このタイプの招待は再利用ができません。</entry>
- <entry key="535">この招待コードは無効です。</entry>
<entry key="536">パスワード:</entry>
<entry key="537">パスワードチェック</entry>
- <entry key="538">パスワードが間違っています。</entry>
<entry key="539">ブラウザ</entry>
<entry key="540">音声/ビデオの同期処理</entry>
<entry key="541">ログインには成功しましたが、セッションの取得に失敗しました。新しいセッションを取得するために再度ログインしてください。</entry>
@@ -671,18 +642,12 @@
<entry key="660">所属組織内にユーザーまたは会議室を追加・削除する</entry>
<entry key="661">削除してよろしいですか？</entry>
<entry key="662">このユーザーをあなたの所属組織から除外してよろしいですか？この操作は、ユーザーを所属する組織から除外するだけです。このユーザーをシステムから削除するためには、管理者パネルにログインする必要があります。</entry>
- <entry key="663">あなた自身を削除することはできません!</entry>
- <entry key="664">管理者でなければ実行できません!</entry>
- <entry key="665">このIDに紐付くセッションがありませんでした。</entry>
- <entry key="666">このユーザーは管理者、または司会者アカウントです。このアカウントは、管理者パネル上でしか変更できません。</entry>
<entry key="667">登録を完了するためには、下記のリンクをクリックしてください。あるいは下記URLをブラウザにコピー・ペーストしてください。</entry>
<entry key="668">メールを確認するにはここをクリックしてください</entry>
<entry key="669">このハッシュは無効です</entry>
<entry key="670">ユーザーは既に有効化されています!</entry>
<entry key="671">アカウントの有効化が完了しました。</entry>
<entry key="672">ログインしてください</entry>
- <entry key="673">アカウントが有効化されていません。アカウント登録時に受信したメール中のリンクをクリックしてアカウントを有効化してください。</entry>
- <entry key="674">サインアップが完了しました。登録メールアドレスに対して確認コードを送付しましたので、メール受信箱をご確認ください。</entry>
<entry key="675">司会者権限を剥奪する</entry>
<entry key="676">司会者権限を付与する</entry>
<entry key="677">ユーザー</entry>
@@ -794,7 +759,6 @@
<entry key="784">司会者権限を許可</entry>
<entry key="785">ホワイトボードへのアクセスを許可</entry>
<entry key="786">カメラ・マイクへのアクセスを許可</entry>
- <entry key="787">このセッションは既に使用済です</entry>
<entry key="788">開始</entry>
<entry key="789">終了</entry>
<entry key="790">終了してよろしいですか? 終了しても、アップロード済みのドキュメント、ホワイトボード、チャット内容は消去されずに残ることにご注意ください。</entry>
@@ -814,7 +778,6 @@
<entry key="805">会議を予約する</entry>
<entry key="806">イベントをカレンダーに追加して会議を設定します。イベントのそれぞれについて会議室が自動生成されます。</entry>
<entry key="807">お困りですか?</entry>
- <entry key="808">大人数向け会議室</entry>
<entry key="809">検索</entry>
<entry key="810">追加</entry>
<entry key="811">ユーザーが選択されていません。一覧から選択して「追加」を押してください。</entry>
@@ -923,7 +886,6 @@
<entry key="917">インタビュー録画は既に開始されています。!</entry>
<entry key="918">キャンセル</entry>
<entry key="919">インタビュー終了時の変換処理には、インタビュー１分あたり５分を要します。現在の処理の進捗は:</entry>
- <entry key="920">SIPデータを生成するためには、パスワードを再入力してください</entry>
<entry key="921">SIPデータを再生成する</entry>
<entry key="922">このファイル/フォルダを、それ自身のサブフォルダに移動することはできません。</entry>
<entry key="923">ホーム・ドライブ使用量</entry>
@@ -1003,7 +965,6 @@
<entry key="997">納品書</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">このメール・アドレスは既に他のユーザーに使用されています。</entry>
<entry key="1001">SIP設定</entry>
<entry key="1002">会議番号、およびPINは、OpenXG RPCゲートウェイ経由で自動生成されます。</entry>
<entry key="1003">SIP番号</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">こちらは{0}です。</entry>
<entry key="1193">さんが、あたなをコンタクトに加えることを希望しています。</entry>
<entry key="1194">{0}のコンタクト要求を確認するか、承認/拒否のリンクのいずれかをクリックしてください。</entry>
- <entry key="1195">このユーザーは既にコンタクト・リストに登録済みか、未回答のコンタクト追加要請メッセージを受信済みです。</entry>
<entry key="1196">コンタクト・リスト</entry>
<entry key="1197">コンタクトとメッセージを編集したり,<br/> 承認待ちコンタクトの処理を行います</entry>
<entry key="1198">さんが、あなたをコンタクトとして承認しました!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">送信</entry>
<entry key="1224">ゴミ箱</entry>
<entry key="1225">あなた自身をコンタクトに加えることはできません。</entry>
- <entry key="1226">ユーザーは既に拒否されています!</entry>
- <entry key="1227">ユーザーは既に承認されています!</entry>
- <entry key="1228">コンタクト・ハッシュが不正です!</entry>
<entry key="1229">コンタクト・リストに追加されました!</entry>
<entry key="1230">ユーザーは拒否されました。承認待ちリストからも削除されました。</entry>
- <entry key="1231">該当するコンタクトがありません!</entry>
<entry key="1232">コンタクトを削除してよろしいですか?</entry>
<entry key="1233">コンタクト削除の確認</entry>
<entry key="1234">コンタクトを一覧から削除する</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">ユーザーは個人コンタクト・データを共有していません。</entry>
<entry key="1269">ユーザーは個人コンタクト・データをコンタクトとのみ共有しています。</entry>
<entry key="1270">住所 & 電話番号</entry>
- <entry key="1271">参加依頼コードが無効です。参加依頼コードは一定期間のみ有効です。</entry>
<entry key="1272">このイベントは他のユーザーのカレンダーにリンクしています。イベントを更新すると、他のユーザーのカレンダーにも更新が反映されます。イベントを更新してよろしいですか?</entry>
<entry key="1273">更新の確認</entry>
<entry key="1274">コンタクトに私のカレンダーを公開する (書き込みはできません)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">再生</entry>
<entry key="1304">会議室とチャット</entry>
<entry key="1305">私の会議室</entry>
- <entry key="1306">私の会議室 (ユーザー数 1-16 向け)</entry>
- <entry key="1307">ウェビナー (ユーザー数 1-120 向け)</entry>
<entry key="1308">会議室の管理者(室長)</entry>
- <entry key="1309">パスワードを入力してください</entry>
- <entry key="1310">ユーザー・レベル、司会者、または管理者権限を有するアカウントが必要です。</entry>
<entry key="1311">ウェブ・サービス (SOAPでのみ適用)</entry>
<entry key="1312">ホワイトボードに直接ロードする</entry>
<entry key="1313">ホワイトボードを削除してよろしいですか？ 注意：削除したホワイトボードは元に戻せません!!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">実施中の投票</entry>
<entry key="1414">シンプル・チャート</entry>
<entry key="1415">パイ・チャート</entry>
- <entry key="1416">メールアドレスを入力してください</entry>
<entry key="1417">新着メッセージ</entry>
<entry key="1418">投票を締め切る</entry>
<entry key="1419">投票を締め切ってよろしいですか？</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">単独話者になることを許可する。</entry>
<entry key="1429">カメラ解像度</entry>
<entry key="1430">解像度の変更はネットワーク帯域に影響します。高解像度のビデオ画像は、より多くのネットワーク帯域を必要とします。</entry>
- <entry key="1431">あなたは、あなた自身を、あるいは他の参加者を単独話者にする権限を持っていません。司会者に権限を付与してもらうか、司会者に単独話者の指定を依頼してください。</entry>
<entry key="1432">私は、単独話者になることができる権限の付与を依頼します。</entry>
<entry key="1433">あなたは、自分自身の手で単独話者になることができます。単独話者になるには、ここをクリックしてください。(または、あなたのビデオ画面でクリック、あるいはF12押下でも可能です)</entry>
<entry key="1434">マイクは有効です!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">バックアップにアップロード済みファイルと録音・録画を含める</entry>
<entry key="1538">会議室のSIPトランスポートを有効にする</entry>
<entry key="1539">このユーザーに単独話者権限を付与してよろしいですか？</entry>
- <entry key="1540">タイムゾーンを指定してください</entry>
- <entry key="1544">指定されたキーの構成は既に存在しています。別のキーを指定するか、既存の構成を編集してください。</entry>
<entry key="1545">保存中です。しばらくお待ちください。</entry>
<entry key="1546">ようこそ</entry>
<entry key="1547">ユーザー基本情報／サポート・リンク ウィジェット</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">未知のエラーです。管理者に報告してください。</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">フロントエンド登録は無効です。</entry>
+ <entry key="error.login.inuse">そのユーザー名は既に使われています</entry>
+ <entry key="error.email.inuse">そのメールアドレスは既に登録されています</entry>
+ <entry key="error.notallowed">管理者権限が必要です。</entry>
+ <entry key="error.hash.used">その招待はすでに使われています。このタイプの招待は再利用ができません。</entry>
+ <entry key="error.hash.invalid">この招待コードは無効です。</entry>
+ <entry key="error.hash.period">参加依頼コードが無効です。参加依頼コードは一定期間のみ有効です。</entry>
+ <entry key="error.bad.password">パスワードが間違っています。</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">アカウントが有効化されていません。アカウント登録時に受信したメール中のリンクをクリックしてアカウントを有効化してください。</entry>
+ <entry key="error.contact.added">このユーザーは既にコンタクト・リストに登録済みか、未回答のコンタクト追加要請メッセージを受信済みです。</entry>
+ <entry key="error.contact.denied">ユーザーは既に拒否されています!</entry>
+ <entry key="error.contact.approved">ユーザーは既に承認されています!</entry>
+ <entry key="error.cfg.exist">指定されたキーの構成は既に存在しています。別のキーを指定するか、既存の構成を編集してください。</entry>
+ <entry key="warn.nogroup">ユーザーは追加されました。このユーザーは少なくとも一つの組織に所属させる必要があります。</entry>
+ <entry key="warn.notverified">サインアップが完了しました。登録メールアドレスに対して確認コードを送付しましたので、メール受信箱をご確認ください。</entry>
+ <entry key="account.created">アカウントが作成されました。ログイン可能です。</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">会議(ユーザー数:1〜25)</entry>
- <entry key="room.type.restricted">大人数向け会議(ユーザー数:1〜150)</entry>
- <entry key="room.type.interview">インタビュー(1対1のミーティング；録画付き)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">リマインダーを送信しない</entry>
- <entry key="appointment.reminder.email">Eメール</entry>
- <entry key="appointment.reminder.ical">iCal Eメール</entry>
- <entry key="user.salutation.mr">Mr.</entry>
- <entry key="user.salutation.ms">Ms.</entry>
- <entry key="user.salutation.mrs">Mrs.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="user.salutation.prof">教授</entry>
- <entry key="error.type.error">エラー</entry>
- <entry key="error.type.info">メッセージ</entry>
- <entry key="poll.type.yesNo">はい/いいえ</entry>
- <entry key="poll.type.numeric">1～10の数字</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">会議(ユーザー数:1〜25)</entry>
+ <entry key="room.type.presentation">presentation (ユーザー数:1〜150)</entry>
+ <entry key="room.type.interview">インタビュー(1対1のミーティング；録画付き)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">リマインダーを送信しない</entry>
+ <entry key="appointment.reminder.email">Eメール</entry>
+ <entry key="appointment.reminder.ical">iCal Eメール</entry>
+ <entry key="user.salutation.mr">Mr.</entry>
+ <entry key="user.salutation.ms">Ms.</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">教授</entry>
+ <entry key="error.type.error">エラー</entry>
+ <entry key="error.type.info">メッセージ</entry>
+ <entry key="poll.type.yesNo">はい/いいえ</entry>
+ <entry key="poll.type.numeric">1～10の数字</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">PDFとしてダウンロード</entry>
<entry key="zoom.fullFit">画面サイズに合わせる</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">私の会議室 (ユーザー数 1-16 向け)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">最初へ</entry>
+ <entry key="goto.prev">前へ</entry>
+ <entry key="goto.next">次へ</entry>
+ <entry key="goto.last">最後へ</entry>
</properties>
[03/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 4823b99..7922782 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
@@ -120,11 +120,6 @@
<entry key="100">Еліпс</entry>
<entry key="101">Закрити</entry>
<entry key="102">Помилка при вводі</entry>
- <entry key="103">Password and/or login is too short</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Це ім'я користувача вже присвоєне</entry>
- <entry key="106">Введена електронна адреса вже зареєстрована</entry>
- <entry key="107">Присутня помилка, просимо зв''язатись з адміністрацією</entry>
<entry key="108">Логін</entry>
<entry key="109">Користувач:</entry>
<entry key="110">Пароль:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Невірний e-mail</entry>
<entry key="234">Ви ввели не вірний e-mail</entry>
<entry key="235">Реєстрація завершена</entry>
- <entry key="236">Ваш акаунт створено. Тепер Ви можете ввійти в систему.</entry>
<entry key="237">Ви не можете завантажити ваш знімок. Хтось вже зробив це.</entry>
<entry key="238">Завантаження заборонене</entry>
<entry key="239">Зробити знімок екрану</entry>
@@ -291,7 +285,6 @@
<entry key="273">Користувачі</entry>
<entry key="274">Стерти користувача з організації</entry>
<entry key="275">Стерти</entry>
- <entry key="276">Цей користувач є вже учасником цієї організації.</entry>
<entry key="277">Новини</entry>
<entry key="278">Посиланння</entry>
<entry key="279">В Конференції</entry>
@@ -347,20 +340,9 @@
<entry key="331">Пароль повинен містити мінімум 4 символи!</entry>
<entry key="332">Пароль встановлено. Тепер ви можете ввійти.</entry>
<entry key="333">OK</entry>
- <entry key="334">Невідома помилка. Будь-ласка зв'яжіться з адміністратором.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Невірний пароль</entry>
<entry key="337">Ви успішно вийшли з системи</entry>
- <entry key="338">Попередня реєстрація вимкнена.</entry>
- <entry key="339">Невірний e-mail</entry>
- <entry key="340">Однакові імена файлів, будь-ласка виберіть інше ім'я</entry>
- <entry key="341">Ім'я файлу надто коротке</entry>
- <entry key="342">Неможливо зберегти адресу</entry>
- <entry key="343">Користувач доданий, але Ви повинні додати користувача в організацію, бо інакше він не зможе ввійти в систему.</entry>
<entry key="344">Новий запис</entry>
- <entry key="345">Не знайдено полів з цим ID.</entry>
- <entry key="346">Не знайдено міток для цього поля.</entry>
- <entry key="347">Потрібні права адміністратора</entry>
<entry key="348">Редактор мови</entry>
<entry key="349">Мова</entry>
<entry key="350">ID змінної</entry>
@@ -370,8 +352,6 @@
<entry key="354">Назви міток</entry>
<entry key="355">Значення міток</entry>
<entry key="356">ID мітки</entry>
- <entry key="357">Ви тільки стираєте мітку, а не поле! Ви не можете стерти поле, оскільки воно маже мітки на інших мовах.</entry>
- <entry key="358">Невірний ID мітки. FieldLanguagesvalues_Id не знайдено в базі даних.</entry>
<entry key="359">Ви не можете стерти поле. Ви можете стирати лише мітки, а не поля. Немає мітки завантаженої в даний момент, або не існує мітки для даного поля.</entry>
<entry key="360">Експорт</entry>
<entry key="361">Ви повинні вийти з системи, щоб побачити внесені зміни.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Ім'я</entry>
<entry key="366">Додати мову</entry>
<entry key="367">Резервні копії</entry>
- <entry key="368">На початок</entry>
- <entry key="369">Назад</entry>
- <entry key="370">Наступне</entry>
- <entry key="371">В кінець</entry>
<entry key="372">Розмови користувача (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">вкл/викл звук</entry>
<entry key="374">Система</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Користувачів в кімнаті:</entry>
<entry key="402">Оновити</entry>
- <entry key="403">Ця кімната переповнена. Спробуйте ще через декілька хвилин.</entry>
<entry key="404">Виберіть кімнату щоб взнати деталі</entry>
<entry key="405">Чат з користувачами даної кімнати:</entry>
<entry key="406">Кімната:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Дійсни з:</entry>
<entry key="531">Дійсний до:</entry>
<entry key="532">Запрошення на {0}</entry>
- <entry key="533">Нема запрошення для цього коду</entry>
- <entry key="534">Запрошення вже використане. Даний тип запрошення не може бути використаний багаторазово</entry>
- <entry key="535">Код запрошення не дійсний.</entry>
<entry key="536">Пароль:</entry>
<entry key="537">Перевірити пароль</entry>
- <entry key="538">Невірний пароль!</entry>
<entry key="539">Бравзер</entry>
<entry key="540">Синхронізувати аудіо/відео</entry>
<entry key="541">Вхід виконано, але Ваша сесія, яку ви пробували не активна чи збережена на сервері. Ви повинні отримати новий SessionId і повторити вхід.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Додавання або видалення корис-ля/кімнати, що належать до вашейорганизации</entry>
<entry key="661">Ви дійсно хочете видалити цей запис?</entry>
<entry key="662">Ви дійсно хочете видалити цього корис-ля з вашої організації? У цьому випадку ви лише видаліть користувачем з організації, а для повного видалення користувача потрібно зайти на панель адміністрування.</entry>
- <entry key="663">Ви не можете видалити себе</entry>
- <entry key="664">Цей метод можна викликати, тільки використовуючи аккаунт адміністратора.</entry>
- <entry key="665">Не було сесії, що асоціюється з цим ID.</entry>
- <entry key="666">Це - аккаунт адміністратора або модератора. Ви можете редагувати тільки через панель адмиинистрирования.</entry>
<entry key="667">Для завершення реєстрації натисніть на цю посилання або скопіюйте URL у вікно браузера.</entry>
<entry key="668">Натисніть для перевірки вашого e-mail.</entry>
<entry key="669">Для цього Хешу не знайдено користувачів.</entry>
<entry key="670">Цей користувач активований!</entry>
<entry key="671">Ви успішно активували ваш обліковий запис</entry>
<entry key="672">Входите зараз</entry>
- <entry key="673">Ваш акаунт не активований. Спочатку перейдіть за посиланням, отриманої в листі, який ви отримали при реєстрації.</entry>
- <entry key="674">Ви успішно зареєструвалися. Вам буде надіслано листа з кодом перевірки. Перевірте вашу електронну пошту.</entry>
<entry key="675">Зняти роль модератора у цього користувача</entry>
<entry key="676">Дати користувачеві права модерації</entry>
<entry key="677">Користувач</entry>
@@ -794,7 +759,6 @@
<entry key="784">Подати заявку на модерацію</entry>
<entry key="785">Подати заявку на доступ до дошки</entry>
<entry key="786">Подати заявку на доступ до камери і мікрофону</entry>
- <entry key="787">Хеш-код цієї сесії вже використаний. Не можна використовувати двічі.</entry>
<entry key="788">СТАРТ</entry>
<entry key="789">ВИХІД</entry>
<entry key="790">Ви справді хочете вийти? Можливо, вам потрібно видалити завантажені документи, очистити дошку і історію чату.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Планування</entry>
<entry key="806">Щоб призначити конференцію, додайте нове подію в календар.</entry>
<entry key="807">Потрібна допомога?</entry>
- <entry key="808">Обмежена</entry>
<entry key="809">Пошук</entry>
<entry key="810">Додати</entry>
<entry key="811">Ні один користувач не вибрано. Виберіть його зі списку, а потім натисніть кнопку "Додати".</entry>
@@ -923,7 +886,6 @@
<entry key="917">Запис цього інтерв'ю вже розпочато!</entry>
<entry key="918">Скасувати</entry>
<entry key="919">Обробка інтерв'ю займає 5 хвилин на кожну хвилину інтерв'ю. Поточний прогрес обробки:</entry>
- <entry key="920">Введіть пароль знову, щоб автоматично створити дані SIP</entry>
<entry key="921">Авто-генерація SIP</entry>
<entry key="922">Ви не можете перемістити файл або папку в його власну папку!</entry>
<entry key="923">Розмір домашнього накопичувача</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Рахунок</entry>
<entry key="998"></entry>
<entry key="999">Для того, щоб відсилати запрошення або створювати мітинги через календар, Ви повинні платити за єдиною ставкою. Для похвилинної тарифікації можливий тільки доступп до {0}. Ви не можете дозволити стороннім учасникам доступ до мітингу.</entry>
- <entry key="1000">Цей email вже використовується іншим користувачем.</entry>
<entry key="1001">Установки SIP</entry>
<entry key="1002">конференції Номер і PIN автоматично створені через шлюз OpenXG RPC</entry>
<entry key="1003">Номер SIP</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Привіт,</entry>
<entry key="1193">бажає додати вас до свого списку контактів.</entry>
<entry key="1194">Перевірте запити вашого контакту {0} або ідіть за посиланням, щоб on прийняти або відхилити запит</entry>
- <entry key="1195">Цей користувач вже в вашому списку контактів або отримав запрошення увійти в список, але не відповів.</entry>
<entry key="1196">Ваш список контактів</entry>
<entry key="1197">Редагуйте ваші контакти та повідомлення, керуйте очікують контактами!</entry>
<entry key="1198">підтвердив вас як контакт!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Послані</entry>
<entry key="1224">Кошик</entry>
<entry key="1225">Це ви! Ви не можете додати себе в свої контакти.</entry>
- <entry key="1226">Користувач вже відхилений!</entry>
- <entry key="1227">Користувач вже підтверджений!</entry>
- <entry key="1228">Хеш контактів цього користувача невалідний!</entry>
<entry key="1229">Користувач доданий в список контактів!</entry>
<entry key="1230">Користувач відхилений як контакт і видалений зі списку чекають!</entry>
- <entry key="1231">Немає такого контакту!</entry>
<entry key="1232">Ви дійсно хочете видалити цей контакт?</entry>
<entry key="1233">Підтвердіть видалення контакту</entry>
<entry key="1234">Видалити контакт зі списку</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">Користувач не дав спільного доступу до його персональних даних.</entry>
<entry key="1269">Користувач дозволив доступ до своїх персональних даних лише контактів.</entry>
<entry key="1270">Адреса та телефон</entry>
- <entry key="1271">Код вашого запрошення невалідний, він діє тільки в певний період часу.</entry>
<entry key="1272">Ця подія пов'язана з декількома календарями інших користувачів. Ваші зміни також змінять їх календарі. Ви хочете змінити подія?</entry>
<entry key="1273">Підтвердіть зміну</entry>
<entry key="1274">Дозволити контакту бачити мій календар (тільки перегляд)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Відповісти</entry>
<entry key="1304">Кімнати і чати</entry>
<entry key="1305">Мої кімнати</entry>
- <entry key="1306">Моя кімната для конференцій(до 16 учасників)</entry>
- <entry key="1307">Моя кімната для вебінарів (до 120 учасників)</entry>
<entry key="1308">Id власника</entry>
- <entry key="1309">Введіть пароль</entry>
- <entry key="1310">Вам потрібен аккаунт рівня користувача, модератора або адміна</entry>
<entry key="1311">Web-сервіс (тільки через SOAP)</entry>
<entry key="1312">Безпосередньо завантажте на дошку</entry>
<entry key="1313">Ви дійсно бажаєте видалити цю дошку? Ця дія не може бути скасована!</entry>
@@ -1420,7 +1371,6 @@
<entry key="1413">активні</entry>
<entry key="1414">Проста діаграма</entry>
<entry key="1415">Кругова діаграма</entry>
- <entry key="1416">Введіть е-мейл</entry>
<entry key="1417">Нові повідомлення</entry>
<entry key="1418">Закритий опитування</entry>
<entry key="1419">Впевнені, що хочете закрити опитування? Більше ніхто не зможе голосувати.</entry>
@@ -1435,7 +1385,6 @@
<entry key="1428">Дозволити ексклюзивний звук.</entry>
<entry key="1429">Роздільна здатність камери</entry>
<entry key="1430">Зміна дозволу впливає на пропускну здатність мережі, збільшена картинка вимагає більше дозволу.</entry>
- <entry key="1431">У вас немає прав дозволяти собі або іншим ексклюзивне аудіо. Попросіть модератора ці права або нехай він дозволить вам ексклюзивний звук сам.</entry>
<entry key="1432">Я хотів би отримати дозвіл на ексклюзивний звук.</entry>
<entry key="1433">Дати мені ексклюзивний звук (як альтернатива, клікніть на ваш екран або натисніть F12)</entry>
<entry key="1434">Мікрофон включений!</entry>
@@ -1543,8 +1492,6 @@
<entry key="1537">Включати завантажені файли і записи в бекап</entry>
<entry key="1538">Дозволити SIP транспорт в кімнаті</entry>
<entry key="1539">Ви дійсно бажаєте дати слово цього учасника?</entry>
- <entry key="1540">Вкажіть Ваш часовий пояс</entry>
- <entry key="1544">Конфігурація з цим ключем вже існує, будь ласка виберіть інший ключ або змінити існуючий</entry>
<entry key="1545">Збереження даних, зачекайте.</entry>
<entry key="1546">Ласкаво просимо</entry>
<entry key="1547">Віджет, який містить основну інформацію про користувача і посилання на сайти підтримки</entry>
@@ -1605,6 +1552,26 @@
<entry key="1605">Видалити Аудіо цього користувача</entry>
<entry key="1606">Я хочу зробити моє Аудіо загальним</entry>
<entry key="1607">Вам дозволено зробити ваше Аудіо загальним</entry>
+ <entry key="error.unknown">Невідома помилка. Будь-ласка зв'яжіться з адміністратором.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Реєстрація вимкнена.</entry>
+ <entry key="error.login.inuse">Це ім'я користувача вже присвоєне</entry>
+ <entry key="error.email.inuse">Введена електронна адреса вже зареєстрована</entry>
+ <entry key="error.notallowed">Потрібні права адміністратора</entry>
+ <entry key="error.hash.used">Запрошення вже використане. Даний тип запрошення не може бути використаний багаторазово</entry>
+ <entry key="error.hash.invalid">Код запрошення не дійсний.</entry>
+ <entry key="error.hash.period">Код вашого запрошення невалідний, він діє тільки в певний період часу.</entry>
+ <entry key="error.bad.password">Невірний пароль!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Ваш акаунт не активований. Спочатку перейдіть за посиланням, отриманої в листі, який ви отримали при реєстрації.</entry>
+ <entry key="error.contact.added">Цей користувач вже в вашому списку контактів або отримав запрошення увійти в список, але не відповів.</entry>
+ <entry key="error.contact.denied">Користувач вже відхилений!</entry>
+ <entry key="error.contact.approved">Користувач вже підтверджений!</entry>
+ <entry key="error.cfg.exist">Конфігурація з цим ключем вже існує, будь ласка виберіть інший ключ або змінити існуючий</entry>
+ <entry key="warn.nogroup">Користувач доданий, але Ви повинні додати користувача в організацію, бо інакше він не зможе ввійти в систему.</entry>
+ <entry key="warn.notverified">Ви успішно зареєструвалися. Вам буде надіслано листа з кодом перевірки. Перевірте вашу електронну пошту.</entry>
+ <entry key="account.created">Ваш акаунт створено. Тепер Ви можете ввійти в систему.</entry>
<entry key="install.wizard.install.header">Установка</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1777,25 +1744,25 @@
<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.presentation">presentation (1-150 учасників)</entry>
<entry key="room.type.interview">інтерв'ю (1:1 зустріч із записом)</entry>
<entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
<entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
<entry key="appointment.reminder.none">не посилати повідомлення</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>
- <entry key="wizard.button.finish">Закінчити</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>
+ <entry key="wizard.button.finish">Закінчити</entry>
<entry key="main.menu.admin.email">Управління листами</entry>
<entry key="main.menu.admin.email.desc">Перевірка статусу надісланих листів</entry>
<entry key="admin.email.group.label">повідомлення</entry>
@@ -1832,8 +1799,8 @@
<entry key="install.room.public.conference">Публічна кімната для конференцій</entry>
<entry key="install.room.public.video.only">Публічна кімната тільки для відео</entry>
<entry key="install.room.public.video.wb">Публічна кімната для відео з дошкою</entry>
- <entry key="install.room.public.restricted">Публічна розширена кімната</entry>
- <entry key="install.room.restricted.micro">Розширена кімната зі статусом мікрофона</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Кімната для конференцій зі статусом мікрофона</entry>
<entry key="install.room.private.conference">Закрита кімната для конференцій</entry>
<entry key="appointment.tab.general">Загальне</entry>
@@ -1928,4 +1895,10 @@
<entry key="download.pdf">Завантажити як PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">Моя кімната для конференцій(до 16 учасників)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">На початок</entry>
+ <entry key="goto.prev">Назад</entry>
+ <entry key="goto.next">Наступне</entry>
+ <entry key="goto.last">В кінець</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_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 927bbb5..362748a 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
@@ -120,11 +120,6 @@
<entry key="100">椭圆</entry>
<entry key="101">关闭</entry>
<entry key="102">输入错误</entry>
- <entry key="103">用户名必须长于4个字符</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">用户名已存在</entry>
- <entry key="106">邮件地址已注册</entry>
- <entry key="107">系统错误，请联系管理员</entry>
<entry key="108">登录</entry>
<entry key="109">用户:</entry>
<entry key="110">密码:</entry>
@@ -253,7 +248,6 @@
<entry key="233">邮件有误</entry>
<entry key="234">非法邮件地址</entry>
<entry key="235">注册成功</entry>
- <entry key="236">用户已建立. 请登录.</entry>
<entry key="237">现在不能共享屏幕. 屏幕已使用.</entry>
<entry key="238">禁止共享</entry>
<entry key="239">共享屏幕</entry>
@@ -291,7 +285,6 @@
<entry key="273">用户</entry>
<entry key="274">从组织中删除用户</entry>
<entry key="275">删除</entry>
- <entry key="276">此组织中已存在该用户.</entry>
<entry key="277">新闻</entry>
<entry key="278">快速链接</entry>
<entry key="279">会议室导航</entry>
@@ -347,20 +340,9 @@
<entry key="331">4个或更多的字符,注意大小写!</entry>
<entry key="332">密码设置完毕,你可以登录.</entry>
<entry key="333">完成</entry>
- <entry key="334">未知错误.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">无效密码</entry>
<entry key="337">注销成功</entry>
- <entry key="338">禁止前端注册.</entry>
- <entry key="339">无效邮件地址</entry>
- <entry key="340">文件名重复, 请选择另一文件名</entry>
- <entry key="341">文件名太短</entry>
- <entry key="342">无法保存地址</entry>
- <entry key="343">用户已增加,但你必须将该用户与一个组织关联,否则他可能无法登录.</entry>
<entry key="344">新纪录</entry>
- <entry key="345">与此字段编号没有对应的字段</entry>
- <entry key="346">没有发现该标签对应的字段</entry>
- <entry key="347">需要管理员权限</entry>
<entry key="348">语言编辑器</entry>
<entry key="349">语言</entry>
<entry key="350">标识号</entry>
@@ -370,8 +352,6 @@
<entry key="354">标签名</entry>
<entry key="355">标签值</entry>
<entry key="356">标签号</entry>
- <entry key="357">您只删除了标签而没删除字段，因为字段可能被其它标签所使用。</entry>
- <entry key="358">无效的标签号，FieldLanguagesvalues_Id在数据库中缺失.</entry>
<entry key="359">您不能删除该字段。只能删除标签。当前没有载入该字段的标签，可能是对应的字段的标签缺失的缘故</entry>
<entry key="360">导出</entry>
<entry key="361">你必须注销才能看到变化.</entry>
@@ -381,10 +361,6 @@
<entry key="365">名称</entry>
<entry key="366">增加语言</entry>
<entry key="367">备份</entry>
- <entry key="368">到首页</entry>
- <entry key="369">到前一页</entry>
- <entry key="370">到下一页</entry>
- <entry key="371">到最后一页</entry>
<entry key="372">用户发言</entry>
<entry key="373">声音 开/关</entry>
<entry key="374">系统</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">此房间的用户:</entry>
<entry key="402">刷新</entry>
- <entry key="403">此房间已满. 请稍后再试.</entry>
<entry key="404">点击房间获取详细信息</entry>
<entry key="405">与此房间内的用户讨论:</entry>
<entry key="406">房间:</entry>
@@ -546,12 +521,8 @@
<entry key="530">从:</entry>
<entry key="531">到:</entry>
<entry key="532">邀请参加{0}的讨论</entry>
- <entry key="533">没有此邀请码对应的有效邀请</entry>
- <entry key="534">此邀请已被使用. 此种类型邀请不能重用.</entry>
- <entry key="535">此邀请码无效.</entry>
<entry key="536">密码:</entry>
<entry key="537">检查密码</entry>
- <entry key="538">无效密码!</entry>
<entry key="539">浏览</entry>
<entry key="540">同步 音频/视频</entry>
<entry key="541">登录有效, 但是会话没有激活或保存在服务器上. 你必须重新登录获取新的会话.</entry>
@@ -671,18 +642,12 @@
<entry key="660">在部门中添加或删除用户、会议室</entry>
<entry key="661">确定要删除此记录？</entry>
<entry key="662">确定要将此用户从部门删除？您只能删除用户与部门之间的关联，如果要删除此用户信息，请登录到管理单元进行操作</entry>
- <entry key="663">您不能删除自己！</entry>
- <entry key="664">此操作只能由管理员进行！</entry>
- <entry key="665">没有与此ID关联的会话</entry>
- <entry key="666">这是管理员或主持人帐户，您只能在管理模块中进行设置.</entry>
<entry key="667">要完成注册，请点击下面的链接，或将链接复制到地址栏中进行访问</entry>
<entry key="668">点击此处验证您的邮箱</entry>
<entry key="669">未找到此用户</entry>
<entry key="670">此用户已经激活！</entry>
<entry key="671">您已经成功激活帐户！</entry>
<entry key="672">正在登录</entry>
- <entry key="673">您的帐户没有激活，请先使用注册时发送给您的邮件中的链接进行激活。</entry>
- <entry key="674">注册成功！已经将验证码发送到您的邮箱，请查收。</entry>
<entry key="675">移除此用户的主持人角色</entry>
<entry key="676">赋予该用户主持的权限</entry>
<entry key="677">用户</entry>
@@ -794,7 +759,6 @@
<entry key="784">申请成为主持人</entry>
<entry key="785">申请使用白板权限</entry>
<entry key="786">申请使用音频视频权限</entry>
- <entry key="787">本次会话Hash已经使用，你不能同时使用两次。</entry>
<entry key="788">开始</entry>
<entry key="789">退出</entry>
<entry key="790">你真的退出会议吗？建议你清除你上载的文件、白板和讨论记录。</entry>
@@ -814,7 +778,6 @@
<entry key="805">预约会议</entry>
<entry key="806">要建立一个会议，您可以添加日历上的一个新的事件。对于每个日历事件将自动创建一个会议室。你和每一个与会者将获得一个到房间链接的电子邮件。<br/><br/>您可以选择不同的房间类型有不同的布局和适度系统。您也可以为每日历事件选择不同的电子邮件通知发送类型</entry>
<entry key="807">需要帮助吗？</entry>
- <entry key="808">受限制</entry>
<entry key="809">搜索</entry>
<entry key="810">添加</entry>
<entry key="811">没有选择用户。请从列表中选择一个项目，然后点击添加。</entry>
@@ -923,7 +886,6 @@
<entry key="917">会议视频录制已经开始d!</entry>
<entry key="918">取消</entry>
<entry key="919">录制的视频后续处理每1分钟时间需5分钟时间来处理，正在转码处理的录制视频是:</entry>
- <entry key="920">您必须重新输入密码</entry>
<entry key="921">重新产生SIP数据</entry>
<entry key="922">您不能将文件或者文件夹移入自己所在的子目录!</entry>
<entry key="923">私有记录文件大小</entry>
@@ -1003,7 +965,6 @@
<entry key="997">支付单</entry>
<entry key="998"></entry>
<entry key="999">您需要购买语音容量的费率才可以发送邀请或者通过日历创建会议。使用按分钟付费的方式就可以访问系统了，您也可以让第三方访问会议</entry>
- <entry key="1000">该邮件地址已经被其他用户使用</entry>
<entry key="1001">SIP设置</entry>
<entry key="1002">会议号是自动创建的</entry>
<entry key="1003">SIP号</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">您好,</entry>
<entry key="1193">想把您添加为联系人.</entry>
<entry key="1194">检查您的联系人请求消息，通过点击链接来接受或者拒绝请求</entry>
- <entry key="1195">该用户已经在您的联系人表中，或者该用户收到您的邀请后没有处理</entry>
<entry key="1196">联系人列表</entry>
<entry key="1197">编辑联系人及消息，处理还未处理的请求!</entry>
<entry key="1198">已经确认了您的请求!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">发送箱</entry>
<entry key="1224">回收站</entry>
<entry key="1225">您不能把自己加入为联系人</entry>
- <entry key="1226">用户已经拒绝请求!</entry>
- <entry key="1227">用户已经接受请求!</entry>
- <entry key="1228">用户请求已经失效!</entry>
<entry key="1229">用户已经加入到联系人列表!</entry>
<entry key="1230">用户已经拒绝联系人请求，并从未处理联系人中移除!</entry>
- <entry key="1231">没有这样的联系人!</entry>
<entry key="1232">您确实想移除该联系人马？</entry>
<entry key="1233">移除确认</entry>
<entry key="1234">从联系人单中删除联系人</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">用户没有共享个人信息</entry>
<entry key="1269">用户只对他的联系人共享信息</entry>
<entry key="1270">地址 & 电话</entry>
- <entry key="1271">邀请编码已经失效，该码只有一段时间的有效期</entry>
<entry key="1272">此事件与日历中的几个其他用户相关联，您的更改同时会更新其他用户的日历，您确实需要更新吗？</entry>
<entry key="1273">确认更新</entry>
<entry key="1274">允许其他用户查看日历</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">回复</entry>
<entry key="1304">会议室及讨论</entry>
<entry key="1305">会议室</entry>
- <entry key="1306">在线会议室(1-16人)</entry>
- <entry key="1307">在线研讨会(1-120人)</entry>
<entry key="1308">成员号</entry>
- <entry key="1309">请输入密码</entry>
- <entry key="1310">您需要账号</entry>
<entry key="1311">Web-Service (通过SOAP访问)</entry>
<entry key="1312">直接载入到白板</entry>
<entry key="1313">您是否真的想删除白板？此动作不可逆!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">活跃</entry>
<entry key="1414">简单图表</entry>
<entry key="1415">饼图</entry>
- <entry key="1416">请输入邮箱</entry>
<entry key="1417">新信息</entry>
<entry key="1418">关闭调查</entry>
<entry key="1419">确定要关闭此调查？其他人将无法投票。</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">允许提供独家音频</entry>
<entry key="1429">摄像头像素</entry>
<entry key="1430">更改像素会影响频宽，较大的图片需要较高频宽</entry>
- <entry key="1431">你无权给予自己或其他人独家音频。需要向主持人申请该权利或申请得到独家音频。</entry>
<entry key="1432">希望得到独家音频的权利</entry>
<entry key="1433">赋予我独家音频（或点击你的视频，或点击F12）</entry>
<entry key="1434">麦克风已打开</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">包括上传的文件和备份的记录</entry>
<entry key="1538">在聊天室启动SIP传输</entry>
<entry key="1539">你真的想为用户提供一个专用的音频?</entry>
- <entry key="1540">请指定您的时区</entry>
- <entry key="1544">给定键的配置已存在，请指定另一个键或编辑存在的配置</entry>
<entry key="1545">内容正在保存，请等待.</entry>
<entry key="1546">欢迎</entry>
<entry key="1547">小部件显示基本的用户信息和支持链接</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">删除该用户的音频</entry>
<entry key="1606">我想分享我的音频</entry>
<entry key="1607">你可以分享你的声音</entry>
+ <entry key="error.unknown">未知错误.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">禁止前端注册.</entry>
+ <entry key="error.login.inuse">用户名已存在</entry>
+ <entry key="error.email.inuse">邮件地址已注册</entry>
+ <entry key="error.notallowed">需要管理员权限</entry>
+ <entry key="error.hash.used">此邀请已被使用. 此种类型邀请不能重用.</entry>
+ <entry key="error.hash.invalid">此邀请码无效.</entry>
+ <entry key="error.hash.period">邀请编码已经失效，该码只有一段时间的有效期</entry>
+ <entry key="error.bad.password">无效密码!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">您的帐户没有激活，请先使用注册时发送给您的邮件中的链接进行激活。</entry>
+ <entry key="error.contact.added">该用户已经在您的联系人表中，或者该用户收到您的邀请后没有处理</entry>
+ <entry key="error.contact.denied">用户已经拒绝请求!</entry>
+ <entry key="error.contact.approved">用户已经接受请求!</entry>
+ <entry key="error.cfg.exist">给定键的配置已存在，请指定另一个键或编辑存在的配置</entry>
+ <entry key="warn.nogroup">用户已增加,但你必须将该用户与一个组织关联,否则他可能无法登录.</entry>
+ <entry key="warn.notverified">注册成功！已经将验证码发送到您的邮箱，请查收。</entry>
+ <entry key="account.created">用户已建立. 请登录.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1764,25 +1731,25 @@
<entry key="install.wizard.congrats.config">改变客户端的配置值</entry>
<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="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">不发送通知</entry>
- <entry key="appointment.reminder.email">简单电子邮件</entry>
- <entry key="appointment.reminder.ical">iCal电子邮件</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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">会议室 (1-25 用户)</entry>
+ <entry key="room.type.presentation">presentation (1-150 用户)</entry>
+ <entry key="room.type.interview">约见 (1:1 会见并记录)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">不发送通知</entry>
+ <entry key="appointment.reminder.email">简单电子邮件</entry>
+ <entry key="appointment.reminder.ical">iCal电子邮件</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>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1818,8 +1785,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1916,4 +1883,10 @@
<entry key="download.pdf">下载为 PDF</entry>
<entry key="zoom.fullFit">满屏</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">在线会议室(1-16人)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">到首页</entry>
+ <entry key="goto.prev">到前一页</entry>
+ <entry key="goto.next">到下一页</entry>
+ <entry key="goto.last">到最后一页</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_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 ea2c43b..ca59707 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
@@ -120,11 +120,6 @@
<entry key="100">橢圓形</entry>
<entry key="101">關閉</entry>
<entry key="102">輸入資料有誤</entry>
- <entry key="103">用戶名必須至少4個字符</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">用戶台已被姶用</entry>
- <entry key="106">這電子郵件已註冊过了</entry>
- <entry key="107">系統錯誤 ,請聯繫系統管理員</entry>
<entry key="108">登錄</entry>
<entry key="109">用戶 :</entry>
<entry key="110">密碼 :</entry>
@@ -253,7 +248,6 @@
<entry key="233">錯的郵件</entry>
<entry key="234">你輸入了一個無效的郵件地址</entry>
<entry key="235">註冊完成</entry>
- <entry key="236">你的賬戶已經建立. 你現在以可登錄</entry>
<entry key="237">己有別人在共用這电子白板, 你现在暫時無法再分享。</entry>
<entry key="238">嚴禁共享</entry>
<entry key="239">分享你的屏幕</entry>
@@ -291,7 +285,6 @@
<entry key="273">用戶</entry>
<entry key="274">刪除用戶，從組織</entry>
<entry key="275">刪除</entry>
- <entry key="276">此用戶已經是這個組織的會員</entry>
<entry key="277">新聞</entry>
<entry key="278">連結</entry>
<entry key="279">進入會議</entry>
@@ -347,20 +340,9 @@
<entry key="331">4或更多個字符;大寫有分!</entry>
<entry key="332">密碼設定。您可以立即登錄。</entry>
<entry key="333">OK</entry>
- <entry key="334">未知錯誤。請告知您的服務團隊</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">密碼無效</entry>
<entry key="337">成功登出</entry>
- <entry key="338">前端登記禁用</entry>
- <entry key="339">無效電子郵件</entry>
- <entry key="340">重複的文件名，請選擇另一個文件名</entry>
- <entry key="341">文件名太短</entry>
- <entry key="342">不能儲存地址</entry>
- <entry key="343">用戶添加，但你需要设定此用戶屬於一個組織，否則他將無法登錄。</entry>
<entry key="344">新紀錄</entry>
- <entry key="345">沒有發現這一個ID.</entry>
- <entry key="346">內容的標籤無法出现.</entry>
- <entry key="347">管理者 授權要求</entry>
<entry key="348">語言-編者</entry>
<entry key="349">語言</entry>
<entry key="350">標籤-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">標籤-名稱</entry>
<entry key="355">標籤價值</entry>
<entry key="356">標籤-ID</entry>
- <entry key="357">你只刪除標籤，而不是領域！您不能刪除領域，它可能已在標籤上的其他語言。</entry>
- <entry key="358">無效標籤id 。該fieldlanguagesvalues_id不能找到在數據庫</entry>
<entry key="359">您不能刪除這一領域。你只能刪除標籤並非領域。有無標籤裝在此時或者它是沒有選中的任何領域，或者有沒有商標，這門語言會成為這一領域的設定。</entry>
<entry key="360">出口</entry>
<entry key="361">你需要登出看到有任何變化.</entry>
@@ -381,10 +361,6 @@
<entry key="365">姓名</entry>
<entry key="366">添加新的語言</entry>
<entry key="367">備份</entry>
- <entry key="368">到第–頁</entry>
- <entry key="369">到前一頁</entry>
- <entry key="370">到下一頁</entry>
- <entry key="371">最後一頁</entry>
<entry key="372">用戶说话 (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">把聲音開/關</entry>
<entry key="374">系統</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">用戶在這個房間:</entry>
<entry key="402">刷新</entry>
- <entry key="403">這個房間己滿,在數分鐘再試一次.</entry>
<entry key="404">點擊一個房間獲得細節</entry>
<entry key="405">和這個會議室的用户聊天:</entry>
<entry key="406">房間:</entry>
@@ -546,12 +521,8 @@
<entry key="530">有效期從:</entry>
<entry key="531">有效期至:</entry>
<entry key="532">I邀請到 {0}</entry>
- <entry key="533">沒有這一邀請碼</entry>
- <entry key="534">該邀請已經使用。這種類型的邀請，不能再使用。</entry>
- <entry key="535">This Invitation-Code is not valid.</entry>
<entry key="536">密碼:</entry>
<entry key="537">核對密碼</entry>
- <entry key="538">密碼無效！</entry>
<entry key="539">Browser</entry>
<entry key="540">Syncronize Audio/Video</entry>
<entry key="541">Login was correct, but the Session you tried is not active or stored on the Server. You have to get a new SessionId and retry login.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Add or delete Users or Rooms within your Organization</entry>
<entry key="661">Do you really want to delete this record?</entry>
<entry key="662">Do you really want to delete this user from your organization? You will only delete the connection between the user and your organization, to really delete the user itself you have to login into the Administration-Panel.</entry>
- <entry key="663">You cannot delete your own User!</entry>
- <entry key="664">This Method needs a Adminstration Account to be invoked!</entry>
- <entry key="665">There was no Session associated with this ID.</entry>
- <entry key="666">This is an Administrator or Moderator account. You can only edit this account through the Administration Panel.</entry>
<entry key="667">To complete your registration please click on the following link. Or copy the URL to your browser bar.</entry>
<entry key="668">Click to verify your E-Mail</entry>
<entry key="669">No user was found for this Hash.</entry>
<entry key="670">This user is already activated!</entry>
<entry key="671">You did successfully activate your account!</entry>
<entry key="672">Login Now</entry>
- <entry key="673">Your account is not activated. First use the link in the Email you've received during registration.</entry>
- <entry key="674">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
<entry key="675">Remove Moderation Role from this User</entry>
<entry key="676">Grant Moderation Rights to this User</entry>
<entry key="677">User</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">未知錯誤。請告知您的服務團隊</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">前端登記禁用</entry>
+ <entry key="error.login.inuse">用戶台已被姶用</entry>
+ <entry key="error.email.inuse">這電子郵件已註冊过了</entry>
+ <entry key="error.notallowed">管理者 授權要求</entry>
+ <entry key="error.hash.used">該邀請已經使用。這種類型的邀請，不能再使用。</entry>
+ <entry key="error.hash.invalid">This Invitation-Code is not valid.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">密碼無效！</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. First use the link in the Email you've received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">用戶添加，但你需要设定此用戶屬於一個組織，否則他將無法登錄。</entry>
+ <entry key="warn.notverified">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
+ <entry key="account.created">你的賬戶已經建立. 你現在以可登錄</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">先生</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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">先生</entry>
+ <entry key="user.salutation.ms">女士</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">錯误</entry>
+ <entry key="error.type.info">訊息</entry>
+ <entry key="poll.type.yesNo">是/否</entry>
+ <entry key="poll.type.numeric">數字的 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Download as PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">到第–頁</entry>
+ <entry key="goto.prev">到前一頁</entry>
+ <entry key="goto.next">到下一頁</entry>
+ <entry key="goto.last">最後一頁</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java
index a1352ec..7005f09 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java
@@ -32,14 +32,13 @@ import org.apache.wicket.resource.loader.IStringResourceLoader;
*
*/
public class LabelResourceLoader implements IStringResourceLoader {
-
- private static Map<String,Long> STRING_LABEL_MAPPING = new HashMap<>();
+ private static Map<String, String> STRING_LABEL_MAPPING = new HashMap<>();
static {
- STRING_LABEL_MAPPING.put("PagingNavigator.first", 368L);
- STRING_LABEL_MAPPING.put("PagingNavigator.previous", 369L);
- STRING_LABEL_MAPPING.put("PagingNavigator.next", 370L);
- STRING_LABEL_MAPPING.put("PagingNavigator.last", 371L);
+ STRING_LABEL_MAPPING.put("PagingNavigator.first", "goto.first");
+ STRING_LABEL_MAPPING.put("PagingNavigator.previous", "goto.prev");
+ STRING_LABEL_MAPPING.put("PagingNavigator.next", "goto.next");
+ STRING_LABEL_MAPPING.put("PagingNavigator.last", "goto.last");
}
@Override
@@ -55,11 +54,10 @@ public class LabelResourceLoader implements IStringResourceLoader {
}
private static String getStringByPropertyKey(String key) {
- Long labelId = STRING_LABEL_MAPPING.get(key);
+ String labelId = STRING_LABEL_MAPPING.get(key);
if (labelId == null) {
return null;
}
return Application.getString(labelId);
}
-
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index c624e36..4522003 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -332,7 +332,7 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS
u = getBean(UserDao.class).getByLogin(login, Type.oauth, domainId);
break;
default:
- throw new OmException(-1L);
+ throw new OmException("error.unknown");
}
if (u == null) {
return false;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index ce74aba..b4c5b4f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -79,7 +79,7 @@ public class GeneralUserForm extends Form<User> {
protected void onInitialize() {
super.onInitialize();
add(email);
- email.setLabel(Model.of(Application.getString(137)));
+ email.setLabel(Model.of(Application.getString("137")));
email.add(RfcCompliantEmailAddressValidator.getInstance());
add(new DropDownChoice<>("salutation"
, Arrays.asList(Salutation.values())
@@ -174,7 +174,7 @@ public class GeneralUserForm extends Form<User> {
protected void onValidate() {
User u = getModelObject();
if(!getBean(UserDao.class).checkEmail(email.getConvertedInput(), u.getType(), u.getDomainId(), u.getId())) {
- error(Application.getString(1000));
+ error(Application.getString("error.email.inuse"));
}
super.onValidate();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 0ac7f82..cf21638 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
@@ -31,13 +31,13 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
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 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"));
private final InvitationForm form;
public InvitationDialog(String id, final InvitationForm _form) {
- super(id, Application.getString(214),_form.getModel());
+ super(id, Application.getString("214"),_form.getModel());
add(form = _form);
}
@@ -59,7 +59,7 @@ public class InvitationDialog extends AbstractFormDialog<Invitation> {
}
return super.getForm(button);
}
-
+
@Override
public InvitationForm getForm() {
return form;
@@ -74,7 +74,7 @@ public class InvitationDialog extends AbstractFormDialog<Invitation> {
protected List<DialogButton> getButtons() {
return Arrays.asList(generate, send, cancel);
}
-
+
@Override
protected void onError(AjaxRequestTarget target) {
form.onError(target);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
index 5f14f1a..18a3eba 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
@@ -86,7 +86,7 @@ public abstract class InvitationForm extends Form<Invitation> {
setOutputMarkupId(true);
add(subject, message);
- recipients.setLabel(Model.of(Application.getString(216))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") {
+ recipients.setLabel(Model.of(Application.getString("216"))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@Override
@@ -120,7 +120,7 @@ public abstract class InvitationForm extends Form<Invitation> {
, new Radio<>("endless", Model.of(Valid.Endless))));
add(passwd = new PasswordTextField("password"));
Invitation i = getModelObject();
- passwd.setLabel(Model.of(Application.getString(525))).setOutputMarkupId(true).setEnabled(i.isPasswordProtected());
+ passwd.setLabel(Model.of(Application.getString("525"))).setOutputMarkupId(true).setEnabled(i.isPasswordProtected());
add(from, to, timeZoneId);
from.setEnabled(i.getValid() == Valid.Period).setOutputMarkupId(true);
to.setEnabled(i.getValid() == Valid.Period).setOutputMarkupId(true);
@@ -146,7 +146,7 @@ public abstract class InvitationForm extends Form<Invitation> {
@Override
protected void onValidate() {
if (from.getConvertedInput() != null && to.getConvertedInput() != null && from.getConvertedInput().isAfter(to.getConvertedInput())) {
- error(Application.getString(1592));
+ error(Application.getString("1592"));
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 5a7992d..f83acee 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("219"));
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/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
index e07f27a..26c4d97 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
@@ -44,8 +44,8 @@ public abstract class UserPanel extends BasePanel {
public static List<Room> getMyRooms() {
List<Room> result = new ArrayList<>();
- result.add(getBean(RoomDao.class).getUserRoom(getUserId(), Room.Type.conference, Application.getString(1306L)));
- result.add(getBean(RoomDao.class).getUserRoom(getUserId(), Room.Type.restricted, Application.getString(1307L)));
+ result.add(getBean(RoomDao.class).getUserRoom(getUserId(), Room.Type.conference, Application.getString("my.room.conference")));
+ result.add(getBean(RoomDao.class).getUserRoom(getUserId(), Room.Type.presentation, Application.getString("my.room.presentation")));
result.addAll(getBean(RoomDao.class).getAppointedRoomsByUser(getUserId()));
return result;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
index a0a2ec0..248d301 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
@@ -73,7 +73,7 @@ public class ConvertingErrorsDialog extends AbstractDialog<FileItem> {
}
public ConvertingErrorsDialog(String id, IModel<FileItem> model) {
- super(id, Application.getString(887), model);
+ super(id, Application.getString("887"), model);
add(container.add(message.setVisible(false), logView.setVisible(false)).setOutputMarkupId(true));
}
@@ -84,7 +84,7 @@ public class ConvertingErrorsDialog extends AbstractDialog<FileItem> {
List<FileItemLog> logs = getBean(FileItemLogDao.class).get(f);
if (f.getHash() == null) {
message.setVisible(true);
- message.setDefaultModelObject(Application.getString(888));
+ message.setDefaultModelObject(Application.getString("888"));
} else if (!f.exists()) {
message.setVisible(true);
message.setDefaultModelObject(getString(f.getType() == FileItem.Type.Recording ? "1595" : "convert.errors.file.missing"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
index 4fe46e0..c5453da 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
@@ -57,7 +57,7 @@ public class OmTreeProvider implements ITreeProvider<FileItem> {
public OmTreeProvider(Long roomId) {
this.roomId = roomId;
- PUBLIC = Application.getString(861);
+ PUBLIC = Application.getString("861");
GROUP_FILE = Application.getString("files.root.group");
GROUP_REC = Application.getString("recordings.root.group");
refreshRoots(true);
@@ -67,19 +67,19 @@ public class OmTreeProvider implements ITreeProvider<FileItem> {
List<FileItem> fRoot = new ArrayList<>(), rRoot = new ArrayList<>();
if (all) {
if (roomId != null) {
- FileItem r = createRoot(Application.getString(706), FILES_MY, false);
+ FileItem r = createRoot(Application.getString("706"), FILES_MY, false);
r.setOwnerId(getUserId());
fRoot.add(r);
}
}
if (roomId != null) {
- FileItem r = createRoot(Application.getString(707), FILES_ROOM, false);
+ FileItem r = createRoot(Application.getString("707"), FILES_ROOM, false);
r.setRoomId(roomId);
fRoot.add(r);
}
if (all) {
{
- FileItem r = createRoot(Application.getString(860), RECORDINGS_MY, true);
+ FileItem r = createRoot(Application.getString("860"), RECORDINGS_MY, true);
r.setOwnerId(getUserId());
rRoot.add(r);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 188bfa2..5af9009 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -102,9 +102,9 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
if (!invitation.isEmpty()) {
Invitation i = ws.getInvitation();
if (i == null) {
- errorKey = "535";
+ errorKey = "error.hash.invalid";
} else if (!i.isAllowEntry()) {
- errorKey = Valid.OneTime == i.getValid() ? "534" : "1271";
+ errorKey = Valid.OneTime == i.getValid() ? "error.hash.used" : "error.hash.period";
} else {
Recording rec = i.getRecording();
if (rec != null) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
index 2dddfbb..55c8c60 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
@@ -45,21 +45,21 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class InvitationPasswordDialog extends NonClosableDialog<Invitation> {
private static final long serialVersionUID = 1L;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final DialogButton check = new DialogButton("check", Application.getString(537));
+ private final DialogButton check = new DialogButton("check", Application.getString("537"));
private final Form<Void> form = new Form<>("form");
private final PasswordTextField password = new PasswordTextField("password", Model.of((String)null));
private final IUpdatable comp;
public InvitationPasswordDialog(String id, IUpdatable comp) {
- super(id, Application.getString(230));
+ super(id, Application.getString("230"));
this.comp = comp;
- password.setLabel(Model.of(Application.getString(536))).add(new IValidator<String>(){
+ password.setLabel(Model.of(Application.getString("536"))).add(new IValidator<String>(){
private static final long serialVersionUID = 1L;
@Override
public void validate(IValidatable<String> validatable) {
if (!CryptProvider.get().verify(validatable.getValue(), WebSession.get().getInvitation().getPassword())) {
- validatable.error(new ValidationError(Application.getString(538L)));
+ validatable.error(new ValidationError(Application.getString("error.bad.password")));
}
}
});
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 3e0b29a..cc276c5 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
@@ -64,13 +64,13 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
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 send = new DialogButton("send", Application.getString("317"));
+ private final DialogButton cancel = new DialogButton("cancel", Application.getString("122"));
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));
private final RadioGroup<Type> rg = new RadioGroup<>("type", Model.of(Type.email));
- private final Label label = new Label("label", Model.of(Application.getString(315)));
+ private final Label label = new Label("label", Model.of(Application.getString("315")));
private final Captcha captcha = new Captcha("captcha");
private Form<String> form;
private SignInDialog s;
@@ -82,7 +82,7 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> {
}
public ForgetPasswordDialog(String id) {
- super(id, Application.getString(312));
+ super(id, Application.getString("312"));
add(form = new Form<String>("form") {
private static final long serialVersionUID = 1L;
@@ -136,7 +136,7 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> {
}
}
});
- confirmDialog = new NonClosableMessageDialog("confirmDialog", Application.getString(312), Application.getString(321)){
+ confirmDialog = new NonClosableMessageDialog("confirmDialog", Application.getString("312"), Application.getString("321")){
private static final long serialVersionUID = 1L;
@Override
@@ -148,7 +148,7 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> {
}
private void updateLabel(IPartialPageRequestHandler handler) {
- String lbl = Application.getString(rg.getModelObject() == Type.email ? 315 : 316);
+ String lbl = Application.getString(rg.getModelObject() == Type.email ? "315" : "316");
name.setLabel(Model.of(lbl));
label.setDefaultModelObject(lbl);
if (handler != null) {
@@ -257,7 +257,7 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> {
String template = ResetPasswordTemplate.getEmail(reset_link);
- getBean(MailHandler.class).send(email, Application.getString(517), template);
+ getBean(MailHandler.class).send(email, Application.getString("517"), template);
}
}
[05/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 bca5b0d..5de434a 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
@@ -120,11 +120,6 @@
<entry key="100">Elipse</entry>
<entry key="101">fechar</entry>
<entry key="102">erro na entrada de dados</entry>
- <entry key="103">Nome do usuário deve ter no mínimo 4 letras</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Nome de usuário já existente</entry>
- <entry key="106">O email já foi registrado.</entry>
- <entry key="107">Erro no sistema, por favor, contacte os administradores.</entry>
<entry key="108">Login</entry>
<entry key="109">Usuário:</entry>
<entry key="110">Senha:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Email Incorreto</entry>
<entry key="234">Voê digitou um endereço de email inválido.</entry>
<entry key="235">Usuário registrado com sucesso</entry>
- <entry key="236">Sua conta foi criada. Você pode fazer o login agora.</entry>
<entry key="237">Você não pode compartilhar sua tela agora. Alguem já compartilhou a tela.</entry>
<entry key="238">Compartilhamento perdido</entry>
<entry key="239">Compartilhe sua tela</entry>
@@ -291,7 +285,6 @@
<entry key="273">Usuários</entry>
<entry key="274">excluir usuário da Organização</entry>
<entry key="275">excluir</entry>
- <entry key="276">Este usuário já é membro desta organização.</entry>
<entry key="277">Notícias</entry>
<entry key="278">Links Rápidos</entry>
<entry key="279">Ir para conferência</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 ou mais caracteres; maiúsculas e minúsculas são diferentes!</entry>
<entry key="332">Senha configurada. Você pode acessar agora.</entry>
<entry key="333">OK</entry>
- <entry key="334">Erro desconhecido. Por favor informe isso ao Administrador.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Senha inválida</entry>
<entry key="337">Desconectado com sucesso</entry>
- <entry key="338">Cadastro do frontend desabilitado.</entry>
- <entry key="339">Email inválido</entry>
- <entry key="340">nome de arquivo duplicado, por favor escolha outro nome</entry>
- <entry key="341">nome de arquivo muito curto</entry>
- <entry key="342">Não foi possível salvar o endereço</entry>
- <entry key="343">Usuário adicionado mas você precisa associar esse usuário a uma organização, se não ele não estará apto a se associar.</entry>
<entry key="344">Novo Registro</entry>
- <entry key="345">Nenhum campo encontrado com esse id.</entry>
- <entry key="346">Nenhum valor encontrado para este campo.</entry>
- <entry key="347">Necessário perfil de administrador</entry>
<entry key="348">Editor de idiomas</entry>
<entry key="349">Idioma</entry>
<entry key="350">Campo-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Nome do campo</entry>
<entry key="355">Valor do campo</entry>
<entry key="356">ID</entry>
- <entry key="357">Você apenas deletou o campo NÂO o Field! Você não pode excluir esse Field, podem existir campo em outros idiomas.</entry>
- <entry key="358">campoid inválido. O FieldLanguagesvalues_Id não pode ser encontrado na base de dados.</entry>
<entry key="359">Você não pode excluir esse Field. Você pode apenas excluir Labels NÂO Fields. Não existe Label carregado no momento, se nenhum Field for selecionado ou não existir Label para esse idioma para esse Field definido.</entry>
<entry key="360">exportar</entry>
<entry key="361">Você precisa fazer login novamente para visualizar as mudanças.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nome</entry>
<entry key="366">adicionar idioma</entry>
<entry key="367">Backup</entry>
- <entry key="368">ir para o primeiro</entry>
- <entry key="369">ir para o anterior</entry>
- <entry key="370">ir para o próximo</entry>
- <entry key="371">ir para o último</entry>
<entry key="372">palestras do usuário</entry>
<entry key="373">desligar/ligar som</entry>
<entry key="374">Sistema</entry>
@@ -416,7 +392,6 @@
<entry key="400">Entrou:</entry>
<entry key="401">Usuários nessa sala:</entry>
<entry key="402">atualizar</entry>
- <entry key="403">Essa sala está cheia. Tente novamente em alguns instântes.</entry>
<entry key="404">clique em uma sala para ver os detalhes</entry>
<entry key="405">Chat com os usuários dessa sala:</entry>
<entry key="406">Sala:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Valido de:</entry>
<entry key="531">Valido até:</entry>
<entry key="532">Convite para reunião instantânea no TVQWEB</entry>
- <entry key="533">Nenhum convite disponível para esse código</entry>
- <entry key="534">O convite já foi utilizado. Esse tipo de convite não pode ser reutilizado.</entry>
- <entry key="535">Esse código de convite não é válido.</entry>
<entry key="536">Senha:</entry>
<entry key="537">Verificar senha</entry>
- <entry key="538">Senha Inválida!</entry>
<entry key="539">Navegador</entry>
<entry key="540">Sincronizar Audio/Video</entry>
<entry key="541">Seu login estava correto, porém sua sessão expirou ou não está ativa no servidor. Por favor faça login novamente.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Adiciona ou exlui usuários ou senhas dentro de usa organização</entry>
<entry key="661">Tem certeza que quer excluir esse registro?</entry>
<entry key="662">Tem certeza que quer excluir esse usuário da sua organização? Você irá excluir somente a conexão do usuário entre a organização. Para excluir o usuário do sistema, vá para o painel de administração.</entry>
- <entry key="663">Você não pode excluir seu próprio usuário!</entry>
- <entry key="664">Este método necessita de uma conta administrativa a ser invocada!</entry>
- <entry key="665">Não existe uma sessão associada com esse ID.</entry>
- <entry key="666">Está é uma conta de administrador ou moderador. Você pode editar esta conta no painel de administração.</entry>
<entry key="667">Para completar seu registro, clique no link ou cole a URL no seu navegador.</entry>
<entry key="668">Clique para verificar seu e-mail</entry>
<entry key="669">Nenhum usuário encontrado para esse Hash.</entry>
<entry key="670">Este usuário já está ativado!</entry>
<entry key="671">Você ativou com sucesso sua conta!</entry>
<entry key="672">Logar agora</entry>
- <entry key="673">Sua conta não está ativa. Use o link fornecido que foi enviado para seu e-mail durante o processo de registro.</entry>
- <entry key="674">Cadastro efetuado com sucesso. Enviaremos um e-mail com um código de verificação. Por favor, verifique seu e-mail.</entry>
<entry key="675">Remove regras de moderação para esse usuário</entry>
<entry key="676">Dá direitos de moderação para esse usuário</entry>
<entry key="677">Usuário</entry>
@@ -794,7 +759,6 @@
<entry key="784">Pedir moderação</entry>
<entry key="785">Pedir acesso para a lousa</entry>
<entry key="786">Pedir acesso para camera/microfone</entry>
- <entry key="787">Esse hash já foi usado. Você não pode utiliza-lo duas vezes.</entry>
<entry key="788">INICIA</entry>
<entry key="789">SAIR</entry>
<entry key="790">Tem certeza que quer sair? Você deve limpar os documentos, lousa, e histórico do chat.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Planejar Reunião</entry>
<entry key="806">Para configurar uma conferência você pode adicionar um novo evento ao calendário</entry>
<entry key="807">Precisa de ajuda?</entry>
- <entry key="808">Restrito</entry>
<entry key="809">busca</entry>
<entry key="810">Adiciona</entry>
<entry key="811">Não há nenhum usuário selecionado, Por favor selecione um item da lista, e depois clique em adicionar.</entry>
@@ -923,7 +886,6 @@
<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="920">Você tem que digitar sua senha novamente para criar automaticamente os dados SIP</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>
<entry key="923">Tamanho da unidade</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Fatura</entry>
<entry key="998">Fatura</entry>
<entry key="999">Você necessita pagar uma taxa para ser capaz de enviar convites ou criar encontros através do calendário. Com pagamento por minuto só é possível para você acessar o {0}. Você não pode permitir a terceiros o acesso a uma reunião.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Configurações</entry>
<entry key="1002">O número de conferência e PIN é criado automaticamente através do OpenXG RPC-Gateway</entry>
<entry key="1003">Número SIP</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Olá,</entry>
<entry key="1193">gostaria de adicioná-lo como contato.</entry>
<entry key="1194">Verifique os seus pedidos de contacto em {0} ou clique sobre os links para aceitar ou negar o pedido</entry>
- <entry key="1195">Este usuário já está em sua lista de contatos ou recebeu um convite para sua lista de contatos que não foi respondida ainda.</entry>
<entry key="1196">Sua lista de contatos</entry>
<entry key="1197">Edite seu contato e mensagens, <br/> gerencie seus contatos pendentes!</entry>
<entry key="1198">confirmou você como contato!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Enviado</entry>
<entry key="1224">Lixo</entry>
<entry key="1225">Este é você! Você não pode adicionar a si mesmo como contato.</entry>
- <entry key="1226">O usuário já está negado!</entry>
- <entry key="1227">O usuário já está aprovado!</entry>
- <entry key="1228">Este hash de contato do usuário é inválido!</entry>
<entry key="1229">Usuário adicionado à lista de contatos!</entry>
<entry key="1230">Usuário negado como contato e removido da lista de contatos pendentes!</entry>
- <entry key="1231">Não há esse contato!</entry>
<entry key="1232">Será que você realmente deseja remover o contato?</entry>
<entry key="1233">Confirmar remoção de contato</entry>
<entry key="1234">Deletar contato da lisa</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">O usuário não compartilha seus dados de contato pessoal.</entry>
<entry key="1269">O usuário não compartilha seus dados pessoais de contacto só para contatos.</entry>
<entry key="1270">Endereço & Telefone</entry>
- <entry key="1271">Seu código de convite não é válido, o código só é válido durante esta data e hora específicas:</entry>
<entry key="1272">Este evento está ligado a vários calendários de outros usuários. Sua alteração irá também atualizar o calendário deles. Será que você realmente gostaria de atualizar o evento?</entry>
<entry key="1273">Confirme atualização</entry>
<entry key="1274">Permitir que contato veja meu calendário (somente visualização)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Responder</entry>
<entry key="1304">Salas e bate-papo</entry>
<entry key="1305">Minhas salas</entry>
- <entry key="1306">Minha sala de conferência (de 1-16 usuários)</entry>
- <entry key="1307">Minha sala de seminário (Webinar) (de 1-120 usuários)</entry>
<entry key="1308">ID do dono</entry>
- <entry key="1309">Digite uma senha</entry>
- <entry key="1310">Você precisa de uma conta com nível de Usuário, Moderador ou Admin</entry>
<entry key="1311">Web-Service (acesso apenas através via SOAP)</entry>
<entry key="1312">Carregar diretamente na lousa</entry>
<entry key="1313">Você realmente deseja remover esta lousa? Essa ação não pode ser desfeita!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">ativo</entry>
<entry key="1414">Gráfico simples</entry>
<entry key="1415">Gráfico de pizza</entry>
- <entry key="1416">Por favor, indique e-mail</entry>
<entry key="1417">Nova(s) mensagem(s)</entry>
<entry key="1418">Encerrar enquete</entry>
<entry key="1419">Tem certeza que deseja encerrar esta enquete? Ninguém será capaz de votar após isto.</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">dar permissão para áudio exclusivo.</entry>
<entry key="1429">Resolução da camera</entry>
<entry key="1430">Alterar a resolução afeta a largura de banda, foto maior precisa de mais largura de banda!</entry>
- <entry key="1431">Você não tem permissão conceder audio exclusivo a si mesmo ou outras pessoas. Você precisa ter permissao do moderador ou pedir ao moderador para lhe dar áudio exclusivo.</entry>
<entry key="1432">Gostaria de obter o direito exclusivo para áudio</entry>
<entry key="1433">Dê áudio exclusivo para mim (em alternativa clique sobre o vídeo pod ou pressione F12)</entry>
<entry key="1434">Microfone está ligado!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Incluir arquivos armazenados e gravações no backup</entry>
<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="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>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Erro desconhecido. Por favor informe isso ao Administrador.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Cadastro do frontend desabilitado.</entry>
+ <entry key="error.login.inuse">Nome de usuário já existente</entry>
+ <entry key="error.email.inuse">O email já foi registrado.</entry>
+ <entry key="error.notallowed">Necessário perfil de administrador</entry>
+ <entry key="error.hash.used">O convite já foi utilizado. Esse tipo de convite não pode ser reutilizado.</entry>
+ <entry key="error.hash.invalid">Esse código de convite não é válido.</entry>
+ <entry key="error.hash.period">Seu código de convite não é válido, o código só é válido durante esta data e hora específicas:</entry>
+ <entry key="error.bad.password">Senha Inválida!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Sua conta não está ativa. Use o link fornecido que foi enviado para seu e-mail durante o processo de registro.</entry>
+ <entry key="error.contact.added">Este usuário já está em sua lista de contatos ou recebeu um convite para sua lista de contatos que não foi respondida ainda.</entry>
+ <entry key="error.contact.denied">O usuário já está negado!</entry>
+ <entry key="error.contact.approved">O usuário já está aprovado!</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Usuário adicionado mas você precisa associar esse usuário a uma organização, se não ele não estará apto a se associar.</entry>
+ <entry key="warn.notverified">Cadastro efetuado com sucesso. Enviaremos um e-mail com um código de verificação. Por favor, verifique seu e-mail.</entry>
+ <entry key="account.created">Sua conta foi criada. Você pode fazer o login agora.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">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>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Download como PDF</entry>
<entry key="zoom.fullFit">Ajuste</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">Minha sala de conferência (de 1-16 usuários)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">ir para o primeiro</entry>
+ <entry key="goto.prev">ir para o anterior</entry>
+ <entry key="goto.next">ir para o próximo</entry>
+ <entry key="goto.last">ir para o último</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 bc2f3aa..ba4561e 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
@@ -120,11 +120,6 @@
<entry key="100">Эллипс</entry>
<entry key="101">Закрыть</entry>
<entry key="102">Ошибка при вводе</entry>
- <entry key="103">Имя пользователя и/или пароль слишком короткие</entry>
- <entry key="104">Имя пользователя слишком короткое</entry>
- <entry key="105">Это имя пользователя уже занято</entry>
- <entry key="106">Электронный адрес уже зарегистрирован</entry>
- <entry key="107">Выдается ошибка, просьба связаться с административной группой</entry>
<entry key="108">Вход</entry>
<entry key="109">Пользователь:</entry>
<entry key="110">Пароль:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Неверный E-Mail</entry>
<entry key="234">Вы ввели неверный E-Mail</entry>
<entry key="235">Регистрация завершена</entry>
- <entry key="236">Ваш аккаунт создан. Теперь вы можете войти под своим именем.</entry>
<entry key="237">Сейчас вы не можете сделать ваш экран общим. Сейчас другой пользователь сделал свой экран общим.</entry>
<entry key="238">Запрещено делать ваш экран общим</entry>
<entry key="239">Сделать экран общим</entry>
@@ -291,7 +285,6 @@
<entry key="273">Пользователи</entry>
<entry key="274">Удалить пользователя из организации</entry>
<entry key="275">Удалить</entry>
- <entry key="276">Этот пользователь уже входит в эту организацию.</entry>
<entry key="277">Новости</entry>
<entry key="278">Быстрый переход</entry>
<entry key="279">Перейти к совещанию</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 или более знаков. Регистр имеет значение!</entry>
<entry key="332">Пароль установлен. Теперь можно логиниться.</entry>
<entry key="333">OK</entry>
- <entry key="334">Неизвестная ошибка. Пожалуйста, сообщите в вашу сервисную службу.</entry>
- <entry key="335">Имя пользователя/e-mail и/или пароль не верны.</entry>
<entry key="336">Неверный пароль</entry>
<entry key="337">Вы успешно вышли</entry>
- <entry key="338">Frontend Registration disabled.</entry>
- <entry key="339">Неверный e-mail</entry>
- <entry key="340">неуникальное имя файла, выберите другое имя файла</entry>
- <entry key="341">слишком короткое имя файла</entry>
- <entry key="342">Не могу сохранить Адрес</entry>
- <entry key="343">Пользователь добавлен, но нужно назначить этому пользователю организацию, иначе он не сможет войти.</entry>
<entry key="344">Новая запись</entry>
- <entry key="345">Поле с таким ID не найдено.</entry>
- <entry key="346">Метка для этого поля не найдена.</entry>
- <entry key="347">Требуется авторизация администратора</entry>
<entry key="348">Редактор языков</entry>
<entry key="349">Язык</entry>
<entry key="350">ID метки</entry>
@@ -370,8 +352,6 @@
<entry key="354">Имя метки</entry>
<entry key="355">Значение метки</entry>
<entry key="356">ID метки</entry>
- <entry key="357">Вы можете лишь удалить метку, но не само поле! Нельзя удалить поле, у него могут быть метки на других языках.</entry>
- <entry key="358">Неверный ID метки. Невозможно найти FieldLanguagesvalues_Id в базе данных.</entry>
<entry key="359">Нельзя удалить это поле! Можно лишь удалить метку, но не само поле Метка сейчас не загружена. Либо не выбрано ни одно поле, либо не определена метка на этом языке (для этого поля)</entry>
<entry key="360">Экспорт</entry>
<entry key="361">Вам нужно выйти, чтобы увидеть изменения.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Имя</entry>
<entry key="366">добавить язык</entry>
<entry key="367">Резервное копирование</entry>
- <entry key="368">к первому</entry>
- <entry key="369">к предыдущему</entry>
- <entry key="370">к следующему</entry>
- <entry key="371">к последнему</entry>
<entry key="372">Участник говорит (Нажимая здесь Вы предоставляете этому участнику эксклюзивный микрофон / выключая микрофоны остальных участников)</entry>
<entry key="373">Включить/выключить звук</entry>
<entry key="374">Система</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Участники в этой комнате:</entry>
<entry key="402">обновить</entry>
- <entry key="403">Эта комната полна. Попробуйте через несколько минут.</entry>
<entry key="404">Нажмите на комнату для деталей</entry>
<entry key="405">Чат с пользователями этой комнаты:</entry>
<entry key="406">Комната:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Действует от:</entry>
<entry key="531">Действует до:</entry>
<entry key="532">Приглашение в {0}</entry>
- <entry key="533">Для этого кода приглашения нет доступных приглашений</entry>
- <entry key="534">Это приглашение уже использовано. Приглашение этого типа не может быть переиспользовано.</entry>
- <entry key="535">Этот код приглашения недействителен.</entry>
<entry key="536">Пароль:</entry>
<entry key="537">Проверить пароль</entry>
- <entry key="538">Неверный пароль!</entry>
<entry key="539">Браузер</entry>
<entry key="540">Синхронизовать аудио/видео</entry>
<entry key="541">Корректный логин, но эта сессия неактивна или не записана на сервере. Вам нужно получит новый ID сессии и перелогиниться</entry>
@@ -671,18 +642,12 @@
<entry key="660">Добавление или удаление польз-ля/комнаты, относящихся к вашейорганизации</entry>
<entry key="661">Вы действительно хотите удалить эту запись?</entry>
<entry key="662">Вы действительно хотите удалить этого польз-ля из вашей организации? В этом случае вы лишь удалите пользователем из организации, а для полного удаления пользователя нужно зайти на панель администрирования.</entry>
- <entry key="663">Вы не можете удалить себя</entry>
- <entry key="664">Этот метод можно вызвать, только используя аккаунт администратора.</entry>
- <entry key="665">Не было сессии, ассоциирующийся с этим ID.</entry>
- <entry key="666">Это - аккаунт администратора или модератора. Вы можете редактировать его только через панель адмиинистрирования.</entry>
<entry key="667">Для завершения регистрации кликните на эту ссылку или скопируйте URL в окно браузера.</entry>
<entry key="668">Нажмите для проверки вашего e-mail.</entry>
<entry key="669">Для этого Хеша не найдено пользователей.</entry>
<entry key="670">Этот пользователь уже активирован!</entry>
<entry key="671">Вы успешно активировали ваш аккаунт</entry>
<entry key="672">Входите сейчас</entry>
- <entry key="673">Ваш аккаунт не активирован. Сначала перейдите по ссылке, полученной в письме, которое вы получили при регистрации.</entry>
- <entry key="674">Вы успешно зарегистрировались. Вам отправлено письмо с кодом проверки. Проверьте вашу почту.</entry>
<entry key="675">Снять роль модератора у этого пользователя</entry>
<entry key="676">Дать пользователю права модерации</entry>
<entry key="677">Пользователь</entry>
@@ -794,7 +759,6 @@
<entry key="784">Подать заявку на модерацию</entry>
<entry key="785">Подать заявку на доступ к доске</entry>
<entry key="786">Подать заявку на доступ к камере и микрофону</entry>
- <entry key="787">Хеш-код этой сессии уже использован. Нельзя использовать его дважды.</entry>
<entry key="788">СТАРТ</entry>
<entry key="789">ВЫХОД</entry>
<entry key="790">Вы на самом деле хотите выйти? Возможно, вам нужно удалить загруженные документы, очистить доску и историю чата.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Запланировать</entry>
<entry key="806">Чтобы назначить конференцию, добавьте новое событие в календарь.</entry>
<entry key="807">Нужна помощь?</entry>
- <entry key="808">Ограниченная</entry>
<entry key="809">Поиск</entry>
<entry key="810">Добавить</entry>
<entry key="811">Ни один пользователь не выбран. Выберите его из списка, а затем нажмите "Добавить".</entry>
@@ -923,7 +886,6 @@
<entry key="917">Запись этого интервью уже начата!</entry>
<entry key="918">Отменить</entry>
<entry key="919">Обработка интервью занимает 5 минут на каждую минуту интервью. Текущий прогресс обработки:</entry>
- <entry key="920">Введите пароль снова, чтобы автоматически создать данные SIP</entry>
<entry key="921">Авто-генерация SIP</entry>
<entry key="922">Вы не можете переместить этот файл или папку в его собственную подпапку!</entry>
<entry key="923">Размер домашнего накопителя</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Счёт</entry>
<entry key="998"></entry>
<entry key="999">Для того, чтобы посылать приглашения или создавать митинги через календарь, Вы должны платить по единой ставке. Для поминутной тарификации возможен только доступп к {0}. Вы не можете разрешить сторонним участникам доступ к митингу.</entry>
- <entry key="1000">Этот email уже используется другим пользователем.</entry>
<entry key="1001">Установки SIP</entry>
<entry key="1002">Номер конференции и PIN автоматически созданы через шлюз OpenXG RPC</entry>
<entry key="1003">Номер SIP</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Здравствуйте,</entry>
<entry key="1193">хочет добавить вас в список контактов.</entry>
<entry key="1194">Проверьте запросы вашего контакта в {0} или пойдите по этой ссылке, чтобы on принять или отклонить запрос</entry>
- <entry key="1195">Этот пользователь уже в вашем списке контактов или получил приглашение добавиться в список, но не ответил.</entry>
<entry key="1196">Ваш список контактов</entry>
<entry key="1197">Редактируйте ваши контакты и сообщения, управляйте ожидающими контактами!</entry>
<entry key="1198">подтвердил вас как контакт!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Посланные</entry>
<entry key="1224">Корзина</entry>
<entry key="1225">Это вы! Вы не можете добавить себя в свои контакты.</entry>
- <entry key="1226">Пользователь уже отклонён!</entry>
- <entry key="1227">Пользователь уже подтверждён!</entry>
- <entry key="1228">Хеш контактов этого пользователя невалиден!</entry>
<entry key="1229">Пользователь добавлен в список контактов!</entry>
<entry key="1230">Пользователь отклонён как контакт и удалён из списка ожидающих!</entry>
- <entry key="1231">Нет такого контакта!</entry>
<entry key="1232">Вы действительно хотите удалить этот контакт?</entry>
<entry key="1233">Подтвердите удаление контакта</entry>
<entry key="1234">Удалить контакт из списка</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">Пользователь не дал совместного доступа к его персональным данным.</entry>
<entry key="1269">Пользователь разрешил доступ к своим персональным данным только контактам.</entry>
<entry key="1270">Адрес и телефон</entry>
- <entry key="1271">Код вашего приглашения невалиден, он действует только в определённый период времени.</entry>
<entry key="1272">Это событие связано с несколькими календарями других пользователей. Ваши изменения также изменят их календари. Выхотите изменить событие?</entry>
<entry key="1273">Подтвердите изменение</entry>
<entry key="1274">Позволить контакту видеть мой календарь (только просмотр)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Ответить</entry>
<entry key="1304">Комнаты и чаты</entry>
<entry key="1305">Мои комнаты</entry>
- <entry key="1306">Моя комната для конференций(до 16 участников)</entry>
- <entry key="1307">Моя комната для вебинаров (до 120 участников)</entry>
<entry key="1308">Id владельца</entry>
- <entry key="1309">Введите пароль</entry>
- <entry key="1310">Вам нужен аккаунт уровня пользователя, модератора или админа</entry>
<entry key="1311">Web-сервис (только через SOAP)</entry>
<entry key="1312">Напрямую загрузите на доску</entry>
<entry key="1313">Вы действительно хотите удалить эту доску? Это действие не может быть отменено!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">активные</entry>
<entry key="1414">Простая диаграмма</entry>
<entry key="1415">Круговая диаграмма</entry>
- <entry key="1416">Введите е-мейл</entry>
<entry key="1417">Новые сообщения</entry>
<entry key="1418">Закрытый опрос</entry>
<entry key="1419">Уверены, что хотите закрыть опрос? Больше никто не сможет голосовать.</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Разрешить эксклюзивный звук.</entry>
<entry key="1429">Разрешение камеры</entry>
<entry key="1430">Изменение разрешения влияет на пропускную способность сети, увеличенная картинка требует больше разрешения.</entry>
- <entry key="1431">У вас нет прав разрешать себе или другим эксклюзивное аудио. Попросите у модератора эти права или пусть он разрешит вам эксклюзивный звук сам.</entry>
<entry key="1432">Я хотел бы получить разрешение на эксклюзивный звук.</entry>
<entry key="1433">Дать мне эксклюзивный звук (как альтернатива, кликните на ваш экран или нажмите F12)</entry>
<entry key="1434">Микрофон включён!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Включать загруженные файлы и записи в бэкап</entry>
<entry key="1538">Разрешить SIP транспорт в комнате</entry>
<entry key="1539">Вы действительно хотите дать слово этому участнику?</entry>
- <entry key="1540">Укажите Ваш часовой пояс</entry>
- <entry key="1544">Конфигурация с этим ключем уже существует, пожалуйста укажите другой ключ или измените существующий</entry>
<entry key="1545">Сохранение данных, подождите пожалуйста.</entry>
<entry key="1546">Добро пожаловать</entry>
<entry key="1547">Виджет, содержащий основную информацию о пользователе и ссылки на сайты поддержки</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Удалить Аудио этого пользователя</entry>
<entry key="1606">Я хочу сделать моё Аудио общим</entry>
<entry key="1607">Вам разрешено сделать ваше Аудио общим</entry>
+ <entry key="error.unknown">Неизвестная ошибка. Пожалуйста, сообщите в вашу сервисную службу.</entry>
+ <entry key="error.bad.credentials">Имя пользователя/e-mail и/или пароль не верны.</entry>
+ <entry key="error.short.login">Имя пользователя слишком короткое</entry>
+ <entry key="error.reg.disabled">Регистрация запрещена</entry>
+ <entry key="error.login.inuse">Это имя пользователя уже занято</entry>
+ <entry key="error.email.inuse">Адрес электронной почты уже зарегистрирован</entry>
+ <entry key="error.notallowed">Требуется авторизация администратора</entry>
+ <entry key="error.hash.used">Это приглашение уже использовано. Приглашение этого типа не может быть переиспользовано.</entry>
+ <entry key="error.hash.invalid">Этот код приглашения недействителен.</entry>
+ <entry key="error.hash.period">Код вашего приглашения невалиден, он действует только в определённый период времени.</entry>
+ <entry key="error.bad.password">Неверный пароль!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Ваш аккаунт не активирован. Сначала перейдите по ссылке, полученной в письме, которое вы получили при регистрации.</entry>
+ <entry key="error.contact.added">Этот пользователь уже в вашем списке контактов или получил приглашение добавиться в список, но не ответил.</entry>
+ <entry key="error.contact.denied">Пользователь уже отклонён!</entry>
+ <entry key="error.contact.approved">Пользователь уже подтверждён!</entry>
+ <entry key="error.cfg.exist">Конфигурация с этим ключем уже существует, пожалуйста укажите другой ключ или измените существующий</entry>
+ <entry key="warn.nogroup">Пользователь добавлен, но нужно назначить ему/ей группу, иначе он/она не сможет войти в систему.</entry>
+ <entry key="warn.notverified">Вы успешно зарегистрировались. Вам отправлено письмо с кодом проверки. Проверьте вашу почту.</entry>
+ <entry key="account.created">Ваш аккаунт создан. Теперь вы можете войти в систему.</entry>
<entry key="install.wizard.install.header">Установка</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1775,25 +1742,25 @@
<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="room.type.conference.desc">"Демократичная", у каждого пользователя есть права на использование камеры и микрофона. Видео "стартует" автоматически</entry>
- <entry key="room.type.restricted.desc">"С ограничениями": Каждый пользователь должен получить права на использование камеры/микрофона</entry>
- <entry key="room.type.interview.desc">только 2 пользователя могут использовать камеру/микрофон (в комнате может находиться любое количество участников, модератор может менять выступающих)</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>
- <entry key="wizard.button.finish">Закончить</entry>
+ <entry key="room.type.conference">конференц зал (1-25 участников)</entry>
+ <entry key="room.type.presentation">презентация (1-150 участников)</entry>
+ <entry key="room.type.interview">интервью (1:1 встреча с записью)</entry>
+ <entry key="room.type.conference.desc">"Демократичная", у каждого пользователя есть права на использование камеры и микрофона. Видео "стартует" автоматически</entry>
+ <entry key="room.type.presentation.desc">"С ограничениями": Каждый пользователь должен получить права на использование камеры/микрофона</entry>
+ <entry key="room.type.interview.desc">только 2 пользователя могут использовать камеру/микрофон (в комнате может находиться любое количество участников, модератор может менять выступающих)</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>
+ <entry key="wizard.button.finish">Закончить</entry>
<entry key="main.menu.admin.email">Управление письмами</entry>
<entry key="main.menu.admin.email.desc">Проверка статуса отосланных писем</entry>
<entry key="admin.email.group.label">Почтовое сообщение</entry>
@@ -1829,8 +1796,8 @@
<entry key="install.room.public.conference">Публичная комната для конференций</entry>
<entry key="install.room.public.video.only">Публичная комната только для видео</entry>
<entry key="install.room.public.video.wb">Публичная комната для видео с доской</entry>
- <entry key="install.room.public.restricted">Публичная расширенная комната</entry>
- <entry key="install.room.restricted.micro">Расширенная комната со статусом микрофона</entry>
+ <entry key="install.room.public.presentation">Публичная расширенная комната для презентаций</entry>
+ <entry key="install.room.presentation.micro">Комната для презентаций со статусом микрофона</entry>
<entry key="install.room.conference.micro">Комната для конференций со статусом микрофона</entry>
<entry key="install.room.private.conference">Закрытая комната для конференций</entry>
<entry key="appointment.tab.general">Общие</entry>
@@ -1927,4 +1894,10 @@
<entry key="download.pdf">Сохранить как PDF</entry>
<entry key="zoom.fullFit">По размеру страницы</entry>
<entry key="zoom.pageWidth">По ширине страницы</entry>
+ <entry key="my.room.conference">Моя комната для конференций(до 16 участников)</entry>
+ <entry key="my.room.presentation">Моя комната для презентаций (for 1-120 users)</entry>
+ <entry key="goto.first">к первому</entry>
+ <entry key="goto.prev">к предыдущему</entry>
+ <entry key="goto.next">к следующему</entry>
+ <entry key="goto.last">к последнему</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_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 4f3fb8d..a556b74 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
@@ -120,11 +120,6 @@
<entry key="100">Elipsa</entry>
<entry key="101">Zatvoriť</entry>
<entry key="102">chyba vstupných údajov</entry>
- <entry key="103">Rozlíšujte veľké a malé písmena a minimálne 4 znaky</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Používateľské meno už existuje</entry>
- <entry key="106">Email už je zaregistrovaný</entry>
- <entry key="107">Systémová chyba, kontaktujte administrátora</entry>
<entry key="108">Prihlásenie</entry>
<entry key="109">Meno a email</entry>
<entry key="110">Heslo</entry>
@@ -253,7 +248,6 @@
<entry key="233">Nesprávne heslo</entry>
<entry key="234">Zadali ste nesprávny email</entry>
<entry key="235">Registrácia kompletná</entry>
- <entry key="236">Vaše konto bolo vytvorené. Môžte sa prihlásiť.</entry>
<entry key="237">Niekto už zdieľa svoju plochu</entry>
<entry key="238">Zdieľanie zakázané</entry>
<entry key="239">Zdieľať/nahrávať plochu</entry>
@@ -291,7 +285,6 @@
<entry key="273">Použivatelia</entry>
<entry key="274">Zmazať používateľa zo spoločnosti</entry>
<entry key="275">D</entry>
- <entry key="276">Tento používateľ je už členom tejto spoločnosti</entry>
<entry key="277">Správy</entry>
<entry key="278">Rýchle odkazy</entry>
<entry key="279">Choď do miestnosti</entry>
@@ -347,20 +340,9 @@
<entry key="331">Rozlišujte veľké/malé písmená a viac ako 4 znaky</entry>
<entry key="332">Heslo nastavené. Môžte sa prihlásiť.</entry>
<entry key="333">OK</entry>
- <entry key="334">Chyba. Kontaktujte administrátora.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Nesprávne heslo</entry>
<entry key="337">Úspešne odhlásený</entry>
- <entry key="338">Registrácia nemožná</entry>
- <entry key="339">Chybný email</entry>
- <entry key="340">Duplikátny názov súboru, prosí, zadajte iný</entry>
- <entry key="341">Názov súboru príliš krátky</entry>
- <entry key="342">Nemožno uložiť adresu</entry>
- <entry key="343">Používateľ pridaný, ale je nutné priradiť ho k spoločnosti.</entry>
<entry key="344">Nový záznam</entry>
- <entry key="345">No field found for the ID</entry>
- <entry key="346">No label found</entry>
- <entry key="347">Autorízácia administrátorom sa vyžaduje</entry>
<entry key="348">Jazykový editor</entry>
<entry key="349">Jazyk</entry>
<entry key="350">Label ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Label name</entry>
<entry key="355">Label value</entry>
<entry key="356">Label ID</entry>
- <entry key="357">You have deleted the label</entry>
- <entry key="358">Invalid label ID</entry>
<entry key="359">Nemôžte zmazať toto pole</entry>
<entry key="360">Export</entry>
<entry key="361">Musíte sa odhlásiť pre uloženie zmien.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Name</entry>
<entry key="366">Add language</entry>
<entry key="367">Backup</entry>
- <entry key="368">prvý</entry>
- <entry key="369">predchádzajúci</entry>
- <entry key="370">ďalší</entry>
- <entry key="371">posledný</entry>
<entry key="372">používateľ hovorí (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">vypnúť/zapnúť zvuk</entry>
<entry key="374">Systém</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Používatelia v tejto miestnosti</entry>
<entry key="402">Obnoviť</entry>
- <entry key="403">Miesta sú obsadené</entry>
<entry key="404">Kliknite na miestnosť pre informácie o miestnosti</entry>
<entry key="405">Chat s používateľmi v tejto miestnosti</entry>
<entry key="406">Miestnosť</entry>
@@ -546,12 +521,8 @@
<entry key="530">Platné od</entry>
<entry key="531">Platné do</entry>
<entry key="532">Pozvanie do {0}</entry>
- <entry key="533">Žiadna pozvánka pre tento kód neexistuje</entry>
- <entry key="534">Toto pozvanie už bolo použité</entry>
- <entry key="535">Pozývací kód je neplatný</entry>
<entry key="536">Heslo</entry>
<entry key="537">Skontrolovať heslo</entry>
- <entry key="538">Neplatné heslo</entry>
<entry key="539">Audio/video</entry>
<entry key="540">Synchronizovať audio/video</entry>
<entry key="541">Prihlásenie je správne, ale stretnutie nie je aktívne</entry>
@@ -671,18 +642,12 @@
<entry key="660">Pridať alebo zmazať používateľov/miestnosti zo spoločnosti</entry>
<entry key="661">Chcete naozaj zmazať túto nahrávku?</entry>
<entry key="662">Chcete naozaj zmazať tohto používateľa z vašej spoločnosti?</entry>
- <entry key="663">Nemôžte zmazať vlastného používateľa</entry>
- <entry key="664">Táto metóda potrebuje administrátorský prístup</entry>
- <entry key="665">Nie je žiadne stretnutie spojené s týmto ID</entry>
- <entry key="666">Toto je administrátorsky/moderátorsky účet. Môžte zmeniť tento účet cez administračný panel.</entry>
<entry key="667">Pre dokončenie registrácie kliknite na nasledujúci odkaz</entry>
<entry key="668">Kliknite pre overenie vášho emailu</entry>
<entry key="669">Žiadny používateľ sa nenašiel pre tento hash</entry>
<entry key="670">Tento používateľ je už aktivovaný</entry>
<entry key="671">Úspešne ste aktivovali svoj účet</entry>
<entry key="672">Prihlásiť sa teraz</entry>
- <entry key="673">Your account is not activated. Please use the link in the email you received during registration.</entry>
- <entry key="674">You have successfully signed up. An email with a verification code will be sent to your mailbox.</entry>
<entry key="675">Odobrať moderovanie tomuto používateľovi</entry>
<entry key="676">Udeliť právo moderovať tomuto používateľovi</entry>
<entry key="677">Používateľ</entry>
@@ -794,7 +759,6 @@
<entry key="784">Požiadať o moderáciu</entry>
<entry key="785">Požiadať o prístup k tabuli</entry>
<entry key="786">Požiadať o audio/video prístup</entry>
- <entry key="787">Hash tejto miestnosti už bol použitý</entry>
<entry key="788">ŠTART</entry>
<entry key="789">VÝCHOD</entry>
<entry key="790">Chcete naozaj odísť?</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a meeting</entry>
<entry key="806">To setup a conference you can add a new event in the calendar</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no user selected</entry>
@@ -923,7 +886,6 @@
<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="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">Nemôžte premiestniť súbor do jeho podsúboru!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Chyba. Kontaktujte administrátora.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registrácia nemožná</entry>
+ <entry key="error.login.inuse">Používateľské meno už existuje</entry>
+ <entry key="error.email.inuse">Email už je zaregistrovaný</entry>
+ <entry key="error.notallowed">Autorízácia administrátorom sa vyžaduje</entry>
+ <entry key="error.hash.used">Toto pozvanie už bolo použité</entry>
+ <entry key="error.hash.invalid">Pozývací kód je neplatný</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Neplatné heslo</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. Please use the link in the email you received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Používateľ pridaný, ale je nutné priradiť ho k spoločnosti.</entry>
+ <entry key="warn.notverified">You have successfully signed up. An email with a verification code will be sent to your mailbox.</entry>
+ <entry key="account.created">Vaše konto bolo vytvorené. Môžte sa prihlásiť.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">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>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Stiahnúť ako PDF</entry>
<entry key="zoom.fullFit">Napasovanie</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">prvý</entry>
+ <entry key="goto.prev">predchádzajúci</entry>
+ <entry key="goto.next">ďalší</entry>
+ <entry key="goto.last">posledný</entry>
</properties>
[09/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index 0760444..1286983 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Έλλειψη</entry>
<entry key="101">Κλείσιμο</entry>
<entry key="102">Σφάλμα Δεδομένων Εισόδου</entry>
- <entry key="103">4 ή Περισσότεροι Χαρακτήρες: Προβλήματα Καταχώρησης με Κεφαλαία Γράμματα!</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Το συγκεκριμένο Όνομα Χρήστη έχει επιλεγεί ήδη!</entry>
- <entry key="106">Το συγκεκριμένο Email έχει καταχωρηθεί ήδη!</entry>
- <entry key="107">Σφάλμα Συστήματος: Παρακαλούμε επικοινωνήστε με τους Διαχειριστές Συστήματος!</entry>
<entry key="108">Login</entry>
<entry key="109">Χρήστης ή Email:</entry>
<entry key="110">Κωδικός:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Λάθος Email</entry>
<entry key="234">Μη Έγκυρη Διεύθυνση Email!</entry>
<entry key="235">Η Kαταχώρηση Oλοκληρώθηκε</entry>
- <entry key="236">Ο Λογαριασμός σας δημιουργήθηκε με επιτυχία. Τώρα μπορείτε να συνδεθείτε.</entry>
<entry key="237">Δεν μπορείτε να μοιραστείτε την Οθόνη σας αυτή τη στιγμή! Κάποιος άλλος μοιράζεται ήδη την δική του.</entry>
<entry key="238">Διαμοίραση Απαγορευμένη</entry>
<entry key="239">Διαμοίραση Οθόνης</entry>
@@ -291,7 +285,6 @@
<entry key="273">Χρήστες</entry>
<entry key="274">Διαγραφή Χρήστη από Οργανισμό</entry>
<entry key="275">Δ</entry>
- <entry key="276">Ο Χρήστης είναι ήδη Μέλος του συγκεκριμένου Οργανισμού!</entry>
<entry key="277">Νέα</entry>
<entry key="278">Γρήγοροι Σύνδεσμοι</entry>
<entry key="279">Συνδιάσκεψη</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 ή Περισσότεροι Χαρακτήρες: Προβλήματα Καταχώρησης με Κεφαλαία Γράμματα!</entry>
<entry key="332">Ο Κωδικός ρυθμίστηκε. Τώρα μπορείτε να συνδεθείτε.</entry>
<entry key="333">Εντάξει</entry>
- <entry key="334">Άγνωστο Σφάλμα: Παρακαλούμε να το αναφέρετε στην Ομάδα Εξυπηρέτησής σας.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Μη Έγκυρος Κωδικός</entry>
<entry key="337">Επιτυχής Αποσύνδεση</entry>
- <entry key="338">Frontend Εγγραφές Απενεργοποιημένες.</entry>
- <entry key="339">Μη Έγκυρο Email</entry>
- <entry key="340">Επανάληψη Ονόματος Αρχείου: Παρακαλούμε επιλέξτε διαφορετικό Όνομα Αρχείου!</entry>
- <entry key="341">Πολύ μικρό Όνομα Αρχείου!</entry>
- <entry key="342">Αδυναμία Αποθήκευσης Διεύθυνσης</entry>
- <entry key="343">Ο Χρήστης προστέθηκε επιτυχώς, αλλά πρέπει να τοποθετηθεί σε κάποιον Οργανισμό, αλλιώς δεν θα μπορεί να συνδεθεί!</entry>
<entry key="344">Νέα Εγγραφή</entry>
- <entry key="345">Δεν βρέθηκε Πεδίο με το συγκεκριμένο ID (Κωδικό Αριθμό) Πεδίου!</entry>
- <entry key="346">Δεν βρέθηκε Ετικέτα για το συγκεκριμένο Πεδίο!</entry>
- <entry key="347">Απαιτείται Εξουσιοδότηση από το Διαχειριστή!</entry>
<entry key="348">Σύνταξη Γλώσσας</entry>
<entry key="349">Γλώσσα</entry>
<entry key="350">ID Ετικέτας</entry>
@@ -370,8 +352,6 @@
<entry key="354">Όνομα Ετικέτας:</entry>
<entry key="355">Τιμή Ετικέτας:</entry>
<entry key="356">Αριθμός Ετικέτας:</entry>
- <entry key="357">Διαγράψατε μόνο την Ετικέτα και ΟΧΙ το Πεδίο! Δεν μπορείτε να διαγράψετε το Πεδίο, διότι ενδέχεται να περιέχει Ετικέτες σε άλλες Γλώσσες.</entry>
- <entry key="358">Μη Έγκυρο ID (Κωδικός Αριθμός) Ετικέτας! Δεν βρέθηκε καταχωρημένο στη Βάση Δεδομένων.</entry>
<entry key="359">Δεν μπορείτε να διαγράψετε το συγκεκριμένο Πεδίο! Μπορείτε να διαγράφετε Ετικέτες αλλά ΟΧΙ Πεδία. Αυτή τη στιγμή δεν έχει επιλεγεί κάποια Ετικέτα. Είτε δεν έγινε επιλογή Ετικέτας από κανένα Πεδίο, είτε δεν υπάρχει Ετικέτα για την συγκεκριμένη Γλώσσα και το συγκεκριμένο Πεδίο.</entry>
<entry key="360">Εξαγωγή</entry>
<entry key="361">Πρέπει να αποσυνδεθείτε για να δείτε τις αλλαγές!</entry>
@@ -381,10 +361,6 @@
<entry key="365">Όνομα</entry>
<entry key="366">Προσθήκη Γλώσσας</entry>
<entry key="367">Αντίγραφα Ασφαλείας</entry>
- <entry key="368">Αρχή</entry>
- <entry key="369">Προηγούμενο</entry>
- <entry key="370">Επόμενο</entry>
- <entry key="371">Τέλος</entry>
<entry key="372">Ο Χρήστης μιλάει (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">Ανοιγμα/Κλείσιμο Ήχου</entry>
<entry key="374">Σύστημα</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Χρήστες σε αυτό το Δωμάτιο:</entry>
<entry key="402">Ανανέωση</entry>
- <entry key="403">Αυτό το Δωμάτιο είναι πλήρες! Δοκιμάστε ξανά σε μερικά λεπτά.</entry>
<entry key="404">Επιλέξτε ένα Δωμάτιο για να δείτε Λεπτομέρειες.</entry>
<entry key="405">Συνομιλήστε με τους Χρήστες σε αυτό το Δωμάτιο:</entry>
<entry key="406">Δωμάτιο:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Έγκυρο Από:</entry>
<entry key="531">Έγκυρο Έως:</entry>
<entry key="532">Πρόσκληση στο {0}</entry>
- <entry key="533">Δεν υπάρχει διαθέσιμη Πρόσκληση για το συγκεκριμένο Κωδικό!</entry>
- <entry key="534">Η Πρόσκληση έχει ήδη χρησιμοποιηθεί! Αυτός ο τύπος Πρόσκλησης δεν μπορεί να χρησιμοποιηθεί ξανά.</entry>
- <entry key="535">Ο συγκεκριμένος Κωδικός Πρόσκλησης δεν είναι έγκυρος!</entry>
<entry key="536">Κωδικός:</entry>
<entry key="537">Έλεγχος Κωδικού</entry>
- <entry key="538">Μη Έγκυρος Κωδικός!</entry>
<entry key="539">Ήχος/Βίντεο</entry>
<entry key="540">Συγχρονισμός Ήχου/Βίντεο</entry>
<entry key="541">Το login ήταν σωστό, αλλά η Σύνοδος που δοκιμάσατε δεν είναι ενεργή ή δεν είναι αποθηκευμένη στον Διακομιστή. Πρέπει να αποκτήσετε νέο Αριθμό Συνόδου και να δοκιμάσετε να συνδεθείτε ξανά.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Προσθέστε ή διαγράψτε Χρήστες/Δωμάτια στον Οργανισμό σας.</entry>
<entry key="661">Θέλετε πραγματικά να διαγράψετε αυτήν την Εγγραφή;</entry>
<entry key="662">Θέλετε πραγματικά να διαγράψετε αυτόν το Χρήστη από τον Οργανισμό σας; Θα διαγραφεί μόνο η Σύνδεση μεταξύ του Χρήστη και του Οργανισμού. Για να διαγράψετε πραγματικά τον Χρήστη πρέπει να συνδεθείτε στον Πίνακα Διαχείρισης.</entry>
- <entry key="663">Δεν μπορείτε να διαγράψετε το δικό σας Χρήστη!</entry>
- <entry key="664">Αυτή η Μέθοδος χρειάζεται Λογαριασμό Διαχειριστή για να εκτελεστεί!</entry>
- <entry key="665">Δεν υπάρχει Σύνοδος που να σχετίζεται με το συγκεκριμένο Κωδικό Αριθμό (ID).</entry>
- <entry key="666">Πρόκειται για Λογαριασμό Διαχειριστή ή Συντονιστή! Η επεξεργασία τέτοιων Λογαριασμών είναι δυνατή μόνο από τον Πίνακα Διαχείρισης.</entry>
<entry key="667">Για την ολοκλήρωση της Εγγραφής σας παρακαλούμε κάντε κλικ στον παρακάτω Σύνδεσμο ή αντιγράψτε το URL στην μπάρα του Φυλλομετρητή σας.</entry>
<entry key="668">Κάντε κλικ για να επιβεβαιώσετε το Email σας.</entry>
<entry key="669">Δεν βρέθηκε Xρήστης για τη συγκεκριμένη τιμή Hash.</entry>
<entry key="670">Αυτός ο Xρήστης έχει ενεργοποιηθεί ήδη!</entry>
<entry key="671">Ο Λογαριασμός σας ενεργοποιήθηκε με επιτυχία!</entry>
<entry key="672">Συνδεθείτε Τώρα</entry>
- <entry key="673">Ο Λογαριασμός σας δεν είναι ενεργοποιημένος! Χρησιμοποιείστε πρώτα το Σύνδεσμο που βρίσκεται στο Email που λάβατε κατά την διάρκεια της Εγγραφής σας.</entry>
- <entry key="674">Εγγραφήκατε με επιτυχία. Ένα μήνυμα με Επαναληπτικό Κωδικό έχει σταλεί στο Email σας. Παρακαλούμε ελέγξτε το Ταχυδρομείο σας.</entry>
<entry key="675">Αφαίρεση Συντονιστικού Ρόλου από αυτόν το Χρήστη.</entry>
<entry key="676">Παραχώρηση Δικαιωμάτων Συντονισμού σε αυτόν το Χρήστη.</entry>
<entry key="677">Χρήστης</entry>
@@ -794,7 +759,6 @@
<entry key="784">Αίτηση Συντονισμού</entry>
<entry key="785">Αίτηση Πρόσβασης στον Πίνακα</entry>
<entry key="786">Αίτηση Πρόσβασης σε Κάμερα/Μικρόφωνο</entry>
- <entry key="787">Η συγκεκριμένη τιμή Hash Συνόδου έχει χρησιμοποιηθεί ήδη. Δεν μπορείτε να την χρησιμοποιήσετε ξανά!</entry>
<entry key="788">ΕΝΑΡΞΗ</entry>
<entry key="789">ΕΧΙΤ</entry>
<entry key="790">Θέλετε πραγματικά να εγκαταλείψετε την Συνδιάσκεψη; Καλό θα ήταν να καθαρίσετε τον Πίνακα και το Ιστορικό Συνομιλιών και να αφαιρέσετε Έγγραφα που πιθανώς έχουν φορτωθεί.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Σχέδιο Συνάντησης</entry>
<entry key="806">Για να προγραμματίσετε μια Συνδιάσκεψη μπορείτε να προσθέσετε ένα νέο Συμβάν στο Ημερολόγιο. Για κάθε Συμβάν του Ημερολογίου δημιουργείται αυτόματα ένα Δωμάτιο Συνδιασκέψεων. Εσείς, μάζι με όλους τους Συμμετέχοντες στην Συνδιάσκεψη, θα λάβετε ένα mail με σύνδεσμο στο συγκεκριμένο Δωμάτιο.<br/><br/>Μπορείτε να επιλέξετε μεταξύ διαφορετικών τύπων Δωματίων που έχουν διαφορετικές διατάξεις και διαφορετικά συστήματα Συντονισμού. Μπορείτε επίσης να επιλέξετε μεταξύ διαφορετικών τύπων Ειδοποίησης για το mail που θα σταλεί για κάθε
Συμβάν του Ημερολογίου.</entry>
<entry key="807">Χρειάζεστε Βοήθεια;</entry>
- <entry key="808">Περιορισμένη</entry>
<entry key="809">Αναζήτηση</entry>
<entry key="810">Προσθήκη</entry>
<entry key="811">Δεν έχει επιλεγεί Χρήστης! Παρακαλούμε επιλέξτε πρώτα ένα στοιχείο από τη λίστα και έπειτα πατήστε "Προσθήκη".</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Άγνωστο Σφάλμα: Παρακαλούμε να το αναφέρετε στην Ομάδα Εξυπηρέτησής σας.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Εγγραφές Απενεργοποιημένες.</entry>
+ <entry key="error.login.inuse">Το συγκεκριμένο Όνομα Χρήστη έχει επιλεγεί ήδη!</entry>
+ <entry key="error.email.inuse">Το συγκεκριμένο Email έχει καταχωρηθεί ήδη!</entry>
+ <entry key="error.notallowed">Απαιτείται Εξουσιοδότηση από το Διαχειριστή!</entry>
+ <entry key="error.hash.used">Η Πρόσκληση έχει ήδη χρησιμοποιηθεί! Αυτός ο τύπος Πρόσκλησης δεν μπορεί να χρησιμοποιηθεί ξανά.</entry>
+ <entry key="error.hash.invalid">Ο συγκεκριμένος Κωδικός Πρόσκλησης δεν είναι έγκυρος!</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Μη Έγκυρος Κωδικός!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Ο Λογαριασμός σας δεν είναι ενεργοποιημένος! Χρησιμοποιείστε πρώτα το Σύνδεσμο που βρίσκεται στο Email που λάβατε κατά την διάρκεια της Εγγραφής σας.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Ο Χρήστης προστέθηκε επιτυχώς, αλλά πρέπει να τοποθετηθεί σε κάποιον Οργανισμό, αλλιώς δεν θα μπορεί να συνδεθεί!</entry>
+ <entry key="warn.notverified">Εγγραφήκατε με επιτυχία. Ένα μήνυμα με Επαναληπτικό Κωδικό έχει σταλεί στο Email σας. Παρακαλούμε ελέγξτε το Ταχυδρομείο σας.</entry>
+ <entry key="account.created">Ο Λογαριασμός σας δημιουργήθηκε με επιτυχία. Τώρα μπορείτε να συνδεθείτε.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Κος</entry>
- <entry key="user.salutation.ms">Κα</entry>
- <entry key="user.salutation.mrs">Δις.</entry>
- <entry key="user.salutation.dr">Δρ.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Μήνυμα</entry>
- <entry key="error.type.info">Μήνυμα</entry>
- <entry key="poll.type.yesNo">Ναι/Όχι</entry>
- <entry key="poll.type.numeric">Αριθμός 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Κος</entry>
+ <entry key="user.salutation.ms">Κα</entry>
+ <entry key="user.salutation.mrs">Δις.</entry>
+ <entry key="user.salutation.dr">Δρ.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Μήνυμα</entry>
+ <entry key="error.type.info">Μήνυμα</entry>
+ <entry key="poll.type.yesNo">Ναι/Όχι</entry>
+ <entry key="poll.type.numeric">Αριθμός 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Αποθήκευση ως PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">Αρχή</entry>
+ <entry key="goto.prev">Προηγούμενο</entry>
+ <entry key="goto.next">Επόμενο</entry>
+ <entry key="goto.last">Τέλος</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index c0498cd..f7c215c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Elipse</entry>
<entry key="101">Cerrado</entry>
<entry key="102">error en la introducción de datos</entry>
- <entry key="103">el nombre de usuario debe contener al menos 4 caracteres</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Este nombre de usuario ya existe</entry>
- <entry key="106">Este email ya está registrado</entry>
- <entry key="107">Error del sistema, por favor contacte con el administrador</entry>
<entry key="108">Entrar</entry>
<entry key="109">Usuario:</entry>
<entry key="110">Contraseña:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Correo inválido</entry>
<entry key="234">Usted ha introducido una dirección no válida de correo electrónico</entry>
<entry key="235">El registro se ha completado con éxito</entry>
- <entry key="236">Su cuenta ha sido creada, puede ingresar desde este momento</entry>
<entry key="237">No puede compartir su escritorio en este momento. Alguien más ya está compartiendo su escritorio.</entry>
<entry key="238">Compartición no permitida</entry>
<entry key="239">Compartir/grabar escritorio</entry>
@@ -291,7 +285,6 @@
<entry key="273">Usuarios</entry>
<entry key="274">Eliminar usuario de la organización</entry>
<entry key="275">Eliminar</entry>
- <entry key="276">Este usuario ya es miembro de la organización</entry>
<entry key="277">Noticias</entry>
<entry key="278">Enlaces rápidos</entry>
<entry key="279">Ir a la (Vídeo)Conferencia</entry>
@@ -347,20 +340,9 @@
<entry key="331">Escriba 4 ó más caracteres. Distingue mayúsculas de minúsculas</entry>
<entry key="332">La contraseña ha sido cambiada, ahora puede iniciar sesión.</entry>
<entry key="333">Aceptar</entry>
- <entry key="334">Error desconocido. Envíe esta información al administrador del sistema.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Contraseña incorrecta</entry>
<entry key="337">Ha salido del sistema</entry>
- <entry key="338">Registro desactivado.</entry>
- <entry key="339">Correo incorrecto</entry>
- <entry key="340">nombre de archivo duplicado, por favor seleccione otro</entry>
- <entry key="341">el nombre del archivo es demasiado corto</entry>
- <entry key="342">No se pudo guardar la dirección</entry>
- <entry key="343">El usuario fue añadido, sin embargo deberá estar al menos en una organización para poder iniciar la sesión.</entry>
<entry key="344">Nueva grabación</entry>
- <entry key="345">No se encontró un campo en este FieldId.</entry>
- <entry key="346">No se encontró una etiqueta para este campo.</entry>
- <entry key="347">Se necesita autorización del administrador</entry>
<entry key="348">Editor de idioma</entry>
<entry key="349">Idioma</entry>
<entry key="350">ID de la etiqueta</entry>
@@ -370,8 +352,6 @@
<entry key="354">Nombre</entry>
<entry key="355">Valor de la etiqueta</entry>
<entry key="356">ID de la etiqueta</entry>
- <entry key="357">Ha eliminado la etiqueta pero no el campo. No se puede eliminar un campo ya que puede tener etiquetas en otros idiomas.</entry>
- <entry key="358">ID de la etiqueta incorrecto. Su FieldLanguagesvalues_Id no se encontró en la base de datos.</entry>
<entry key="359">Usted no puede eliminar este campo, sólo las etiquetas. No hay una etiqueta cargada por el momento o no se encuentra seleccionada ninguna (puede que no exista en el idioma seleccionado).</entry>
<entry key="360">exportar</entry>
<entry key="361">Necesita cerrar la sesión para ver los cambios.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nombre</entry>
<entry key="366">añadir idioma</entry>
<entry key="367">Copia de seguridad</entry>
- <entry key="368">ir al inicio</entry>
- <entry key="369">anterior</entry>
- <entry key="370">siguiente</entry>
- <entry key="371">ir al final</entry>
<entry key="372">usuario habla (Haciendo clic aquí usted podrá dar audio exclusivo o silenciar el micrófono de los demás)</entry>
<entry key="373">encender o apagar sonido</entry>
<entry key="374">Sistema</entry>
@@ -416,7 +392,6 @@
<entry key="400"/>
<entry key="401">Usuarios en la sala:</entry>
<entry key="402">actualizar</entry>
- <entry key="403">La sala esta llena. Por favor, inténtelo más tarde.</entry>
<entry key="404">Pulse sobre una sala para ver los detalles</entry>
<entry key="405">Conversar con los usuarios de esta sala:</entry>
<entry key="406">Sala:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Válido desde:</entry>
<entry key="531">Válido hasta:</entry>
<entry key="532">Invitación a {0}</entry>
- <entry key="533">No existe una invitación disponible con este código.</entry>
- <entry key="534">Esta invitación ya fue usada y no puede volverse a utilizar.</entry>
- <entry key="535">El código de invitación no es válido.</entry>
<entry key="536">Contraseña:</entry>
<entry key="537">Verificar contraseña</entry>
- <entry key="538">Contraseña incorrecta</entry>
<entry key="539">Navegador</entry>
<entry key="540">Sincronizar audio/vídeo</entry>
<entry key="541">El login es correcto, pero la sesión en la que intenta entrar no está activa o no fue guardada en el servidor. Tiene que iniciar una nueva sesión.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Añadir o borrar usuarios y/o salas en su organización</entry>
<entry key="661">¿Realmente quiere borrar este registro?</entry>
<entry key="662">¿Realmente quiere borrar a este usuario de su organización? Sólo se borrará la conexión entre el usuario y su organización. En realidad, para borrar al usuario debe ingresar al Panel de administración.</entry>
- <entry key="663">¡Vd no puede borrarse a sí mismo!</entry>
- <entry key="664">¡Para usar este método necesita de una cuenta de administrador!</entry>
- <entry key="665">No hay ninguna sesión asociada a este ID.</entry>
- <entry key="666">Esta es una cuenta de administrador o de moderador. Sólo puede editar esta cuenta utilizando el Panel de administración.</entry>
<entry key="667">Para completar su registro, haga el favor de pulsar en el siguiente enlace. Otra opción es copiar la URL en la barra de su navegador.</entry>
<entry key="668">Pulse para verificar su correo</entry>
<entry key="669">No se ha encontrado un usuario para ese algoritmo Hash.</entry>
<entry key="670">¡Este usuario ya está activado!</entry>
<entry key="671">¡Ha activado su cuenta con éxito!</entry>
<entry key="672">Ingrese ahora</entry>
- <entry key="673">Su cuenta no está activada. Utilice en primer lugar el enlace que hay en correo recibido al finalizar el proceso de registro.</entry>
- <entry key="674">Se ha registrado con éxito. Le hemos enviado un correo con un código de verificación. Por favor, revise su cuenta de correo.</entry>
<entry key="675">Quitar el rol de moderador a este usuario</entry>
<entry key="676">Dar permisos de moderación a este usuario</entry>
<entry key="677">Usuario</entry>
@@ -794,7 +759,6 @@
<entry key="784">Solicitar la moderación</entry>
<entry key="785">Solicitar acceso a la pizarra</entry>
<entry key="786">Solicitar acceso a la cámara/micrófono</entry>
- <entry key="787">La autenticación de esta sesión ya ha sido utilizada. No puede hacerse dos veces.</entry>
<entry key="788">INICIAR</entry>
<entry key="789">SALIR</entry>
<entry key="790">¿Desea realmente salir? Es conveniente que antes borre los documentos subidos, la pizarra o el historial del chat.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Progr. Encuentro</entry>
<entry key="806">Para planificar una conferencia, añada un nuevo Evento en el Calendario. Para cada Evento se creará automáticamente una sala de (vídeo)conferencia. Usted y el resto de asistentes recibirán un correo con un enlace de la sala.<br/><br/>Puede escoger entre diferentes tipos de salas con diferentes diseños y sistemas de moderación. También puede escoger entre diferentes tipos de notificación de correo que se envían en cada evento del calendario.</entry>
<entry key="807">¿Necesita ayuda?</entry>
- <entry key="808">Restringido</entry>
<entry key="809">Buscar</entry>
<entry key="810">Añadir</entry>
<entry key="811">No hay ningún usuario seleccionado. Seleccione primero un ítem de la lista y pulse en Añadir.</entry>
@@ -923,7 +886,6 @@
<entry key="917">¡Ya se ha iniciado la grabación de esta entrevista!</entry>
<entry key="918">Cancelar</entry>
<entry key="919">El post-proceso de una entrevista lleva cinco veces más tiempo que el de la propia entrevista. El progreso actual de este proceso es el siguiente:</entry>
- <entry key="920">Tiene que introducir de nuevo su contraseña para autocrear los datos SIP</entry>
<entry key="921">Regenerar datos SIP</entry>
<entry key="922">¡No puede mover este archivo o carpeta dentro de su propio subdirectorio!</entry>
<entry key="923">Tamaño del dispositivo personal</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Factura</entry>
<entry key="998"/>
<entry key="999">Necesita comprar una tarifa plana para poder enviar invitaciones o crear encuentros utilizando el calendario. Con el sistema pago por minutos sólo es posible acceder a {0}.</entry>
- <entry key="1000">Esta dirección de correo está siendo utilizada por otro usuario.</entry>
<entry key="1001">Ajustes SIP</entry>
<entry key="1002">El número de la videoconferencia y el PIN son creados automáticamente utilizando la pasarela OpenXG RPC-Gateway</entry>
<entry key="1003">Número SIP</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hola,</entry>
<entry key="1193">me gustaría añadirle como contacto.</entry>
<entry key="1194">Chequear sus peticiones de contacto {0} o hacer clic en los links para aceptar o denegar la petición</entry>
- <entry key="1195">Este usuario ya se encuentra en su lista de contactos o ha recibido una invitación a su lista de contactos que aún no ha contestado.</entry>
<entry key="1196">Su lista de contactos</entry>
<entry key="1197">Editar sus Contactos y Mensajes,<br/> administrar sus contactos pendientes!</entry>
<entry key="1198">está usted confirmado como contacto!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Enviados</entry>
<entry key="1224">Papelera</entry>
<entry key="1225">Este es usted! No puede añadirse a sí mismo como contacto.</entry>
- <entry key="1226">El usuario ya estaba denegado!</entry>
- <entry key="1227">El usuario ya estaba aprobado!</entry>
- <entry key="1228">El hash de este usuario-contacto es inválido!</entry>
<entry key="1229">Usuario añadido a lista de contactos!</entry>
<entry key="1230">Usuario denegado como contacto y eliminado de la lista de contactos pendiente!</entry>
- <entry key="1231">No está ese contacto!</entry>
<entry key="1232">Realmente quiere eliminar ese contacto?</entry>
<entry key="1233">Confirmar eliminación del contacto</entry>
<entry key="1234">Eliminar contacto de la lista</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">El usuario no comparte sus datos personales de contacto.</entry>
<entry key="1269">El usuario comparte sus datos personales solamente con sus contactos.</entry>
<entry key="1270">Dirección & Teléfono</entry>
- <entry key="1271">Su código de invitación no es válido. El código solamente es válido durante la fecha y hora especificados:</entry>
<entry key="1272">Este evento está conectado a los calendarios de otros usuarios. Los cambios que efectúe afectarán tambien a sus calendarios. Realmente quiere cambiar el evento?</entry>
<entry key="1273">Confirmar cambios</entry>
<entry key="1274">Permitir a los contactos ver mi calendario (ver solamente)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Replicar</entry>
<entry key="1304">Salas y Chats</entry>
<entry key="1305">Mis salas</entry>
- <entry key="1306">Mi sala de conferencias (para 1-16 usuarios)</entry>
- <entry key="1307">Mi sala webinar (para 1-120 usuarios)</entry>
<entry key="1308">Propietario Id</entry>
- <entry key="1309">Por favor introduzca una contraseña</entry>
- <entry key="1310">Necesita una cuenta con el Nivel de Usuario, Moderador o Admin.</entry>
<entry key="1311">Web-Service (acceso solamente via SOAP)</entry>
<entry key="1312">Cargar directamente a la pizarra</entry>
<entry key="1313">Realmente quiere suprimir esta pizarra? Esta acción no puede ser deshecha!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">activa</entry>
<entry key="1414">Cuadro Simple</entry>
<entry key="1415">Cuadro Gráfico</entry>
- <entry key="1416">Por favor, introduzca su dirección de correo</entry>
<entry key="1417">Nuevo mensaje(s)</entry>
<entry key="1418">Encuesta cerrada</entry>
<entry key="1419">Realmente quiere cerrar esta encuesta? Nadie más podrá votar.</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Dar permiso para audio exclusivo.</entry>
<entry key="1429">Resolución de cámara</entry>
<entry key="1430">Cambiando la resolución a efecto de ancho de banda, fotos grandes necesitan más ancho de banda!</entry>
- <entry key="1431">Usted no tiene los derechos para darse a sí mismo o a los demás audio exclusivo. Necesita solicitar los derechos al moderador o que éste le de audio exclusivo.</entry>
<entry key="1432">Quisiera obtener los derechos para audio exclusivo</entry>
<entry key="1433">Darme audio exclusivo a mí mismo (alternativamente hacer click en la ventana de video o pulsar F12)</entry>
<entry key="1434">El micrófono está abierto!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Incluir archivos subidos y grabaciones en el backup</entry>
<entry key="1538">Permitir transporte SIP en la sala</entry>
<entry key="1539">Realmente quiere proveer a este usuario de audio exclusivo?</entry>
- <entry key="1540">Por favor, especifique su Zona Horaria</entry>
- <entry key="1544">Ya existe la configuración con esa clave, por favor especifique otra clave o edite la configuración existente</entry>
<entry key="1545">El contenido se está guardando, Por favor espere.</entry>
<entry key="1546">BienVenidos</entry>
<entry key="1547">El Widget muestra información básica del usuario y links soportados</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Error desconocido. Envíe esta información al administrador del sistema.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registro desactivado.</entry>
+ <entry key="error.login.inuse">Este nombre de usuario ya existe</entry>
+ <entry key="error.email.inuse">Este email ya está registrado</entry>
+ <entry key="error.notallowed">Se necesita autorización del administrador</entry>
+ <entry key="error.hash.used">Esta invitación ya fue usada y no puede volverse a utilizar.</entry>
+ <entry key="error.hash.invalid">El código de invitación no es válido.</entry>
+ <entry key="error.hash.period">Su código de invitación no es válido. El código solamente es válido durante la fecha y hora especificados:</entry>
+ <entry key="error.bad.password">Contraseña incorrecta</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Su cuenta no está activada. Utilice en primer lugar el enlace que hay en correo recibido al finalizar el proceso de registro.</entry>
+ <entry key="error.contact.added">Este usuario ya se encuentra en su lista de contactos o ha recibido una invitación a su lista de contactos que aún no ha contestado.</entry>
+ <entry key="error.contact.denied">El usuario ya estaba denegado!</entry>
+ <entry key="error.contact.approved">El usuario ya estaba aprobado!</entry>
+ <entry key="error.cfg.exist">Ya existe la configuración con esa clave, por favor especifique otra clave o edite la configuración existente</entry>
+ <entry key="warn.nogroup">El usuario fue añadido, sin embargo deberá estar al menos en una organización para poder iniciar la sesión.</entry>
+ <entry key="warn.notverified">Se ha registrado con éxito. Le hemos enviado un correo con un código de verificación. Por favor, revise su cuenta de correo.</entry>
+ <entry key="account.created">Su cuenta ha sido creada, puede ingresar desde este momento</entry>
<entry key="install.wizard.install.header">Instalación</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Listas de correo</entry>
<entry key="install.wizard.congrats.commercial">Hay algunas compañias
que tambien ofrecen soporte comercial para Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conferencia (1-25 usuarios)</entry>
- <entry key="room.type.restricted">restringida (1-150 usuarios)</entry>
- <entry key="room.type.interview">interview (1:1 reunión con grabación)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">no envíe notificación</entry>
- <entry key="appointment.reminder.email">correo simple</entry>
- <entry key="appointment.reminder.ical">iCal correo</entry>
- <entry key="user.salutation.mr">Sr.</entry>
- <entry key="user.salutation.ms">Sra.</entry>
- <entry key="user.salutation.mrs">Dña.</entry>
- <entry key="user.salutation.dr">D.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Error</entry>
- <entry key="error.type.info">Mensaje</entry>
- <entry key="poll.type.yesNo">Sí/No</entry>
- <entry key="poll.type.numeric">Valor numérico [1-10]</entry>
- <entry key="wizard.button.finish">Finalizar</entry>
+ <entry key="room.type.conference">conferencia (1-25 usuarios)</entry>
+ <entry key="room.type.presentation">presentation (1-150 usuarios)</entry>
+ <entry key="room.type.interview">interview (1:1 reunión con grabación)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">no envíe notificación</entry>
+ <entry key="appointment.reminder.email">correo simple</entry>
+ <entry key="appointment.reminder.ical">iCal correo</entry>
+ <entry key="user.salutation.mr">Sr.</entry>
+ <entry key="user.salutation.ms">Sra.</entry>
+ <entry key="user.salutation.mrs">Dña.</entry>
+ <entry key="user.salutation.dr">D.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Error</entry>
+ <entry key="error.type.info">Mensaje</entry>
+ <entry key="poll.type.yesNo">Sí/No</entry>
+ <entry key="poll.type.numeric">Valor numérico [1-10]</entry>
+ <entry key="wizard.button.finish">Finalizar</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Descargar como PDF</entry>
<entry key="zoom.fullFit">Pantalla completa</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">Mi sala de conferencias (para 1-16 usuarios)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">ir al inicio</entry>
+ <entry key="goto.prev">anterior</entry>
+ <entry key="goto.next">siguiente</entry>
+ <entry key="goto.last">ir al final</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index c2c550e..992f9a1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">بيضي</entry>
<entry key="101">بستن</entry>
<entry key="102"></entry>
- <entry key="103">كاراكتر 4 از بيش يا 4</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">The username is already taken</entry>
- <entry key="106">The email is already registered</entry>
- <entry key="107">سيستم اخطار</entry>
<entry key="108">ارتباط قطع</entry>
<entry key="109">:كاربر</entry>
<entry key="110">:عبور رمز</entry>
@@ -253,7 +248,6 @@
<entry key="233">ايميل اخطار</entry>
<entry key="234">كرديد وارد صحيح نا پستي آدرس</entry>
<entry key="235">Registration Complete</entry>
- <entry key="236">است شده ايجاد شما اكانت</entry>
<entry key="237">بگذاريد اشتراك به را خود صفحه نميتوانيد شما</entry>
<entry key="238">ممنوع گذاري اشتراك به</entry>
<entry key="239">شما صفحه گذاري اشتراك</entry>
@@ -291,7 +285,6 @@
<entry key="273">كاربر</entry>
<entry key="274">سازمان از كاربر حذف</entry>
<entry key="275">حذف</entry>
- <entry key="276">This user is already member of this organisation.</entry>
<entry key="277">خبر</entry>
<entry key="278">Quicklinks</entry>
<entry key="279">كنفرانس به بازگشت</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 از بيش يا كاراكتر 4</entry>
<entry key="332">Password set. You can login now.</entry>
<entry key="333">ادامه</entry>
- <entry key="334">Unkown Error. Please report this to your Service-Team.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">صحيح نا عبور رمز</entry>
<entry key="337">Successfully Logged out</entry>
- <entry key="338">Frontend Registration disabled.</entry>
- <entry key="339">صحيح نا ايميل</entry>
- <entry key="340">كنيد وارد را ديگري فايل نام لطفا است تكراري فايل نام</entry>
- <entry key="341">است كوتاه خيلي فايل نام</entry>
- <entry key="342">كنيد ذخيره توانيد نمي را آدرس</entry>
- <entry key="343">User added but you need to assign this User to an Organisation, otherwise he won't be able to sign-in.</entry>
<entry key="344">جديد ضبط</entry>
- <entry key="345">No Field found with this FieldId.</entry>
- <entry key="346">No Label found for that Field.</entry>
- <entry key="347">Admin Authorization required</entry>
<entry key="348">Language-Editor</entry>
<entry key="349">زبان</entry>
<entry key="350">Label-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">LabelName</entry>
<entry key="355">LabelValue</entry>
<entry key="356">Label-ID</entry>
- <entry key="357">You did only delete the Label NOT the Field! You cannot delete the Field, it may has Labels in other Languages.</entry>
- <entry key="358">Invalid Labelid. The FieldLanguagesvalues_Id cannot be found in the database.</entry>
<entry key="359">You cannot delete this Field. You can only delete Labels NOT Fields. There is no Label loaded at the moment, wether it is not selected any Field or there is no Label for this Language for that Field defined.</entry>
<entry key="360">export</entry>
<entry key="361">You need to logout to see any changes.</entry>
@@ -381,10 +361,6 @@
<entry key="365">نام</entry>
<entry key="366">زبان افزودن</entry>
<entry key="367">پشتيبان</entry>
- <entry key="368">اولين به بازگشت</entry>
- <entry key="369">قبلي به بازگشت</entry>
- <entry key="370">بعدي به رفتن</entry>
- <entry key="371">آخر به رفتن</entry>
<entry key="372">كاربر گفتگوي (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">صدا كردن خاموش/روشن</entry>
<entry key="374">سيستم</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">:اطاق اين در كاربر</entry>
<entry key="402">بيني باز</entry>
- <entry key="403">This Room is Full. Try again in a few minutes.</entry>
<entry key="404">click on a room to get details</entry>
<entry key="405">Chat with the users in this Room:</entry>
<entry key="406">:اطاق</entry>
@@ -546,12 +521,8 @@
<entry key="530">:از اعتبار</entry>
<entry key="531">:تا اعتبار</entry>
<entry key="532">آنلاين كلاس به دعوت</entry>
- <entry key="533">Not Invitation availible for this Invitation-Code</entry>
- <entry key="534">The Invitation was already used. This type of Invitation cannot be re-used.</entry>
- <entry key="535">This Invitation-Code is not valid.</entry>
<entry key="536">:عبور رمز</entry>
<entry key="537">Check Password</entry>
- <entry key="538">Invalid Password!</entry>
<entry key="539">گذاشتن اجرا به</entry>
<entry key="540">بصري /سمعي بودن مطابق</entry>
<entry key="541">Login was correct, but the Session you tried is not active or stored on the Server. You have to get a new SessionId and retry login.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Add or delete Users or Rooms within your Organization</entry>
<entry key="661">Do you really want to delete this record?</entry>
<entry key="662">Do you really want to delete this user from your organization? You will only delete the connection between the user and your organization, to really delete the user itself you have to login into the Administration-Panel.</entry>
- <entry key="663">You cannot delete your own User!</entry>
- <entry key="664">This Method needs a Adminstration Account to be invoked!</entry>
- <entry key="665">There was no Session associated with this ID.</entry>
- <entry key="666">This is an Administrator or Moderator account. You can only edit this account through the Administration Panel.</entry>
<entry key="667">To complete your registration please click on the following link. Or copy the URL to your browser bar.</entry>
<entry key="668">Click to verify your E-Mail</entry>
<entry key="669">No user was found for this Hash.</entry>
<entry key="670">This user is already activated!</entry>
<entry key="671">You did successfully activate your account!</entry>
<entry key="672">Login Now</entry>
- <entry key="673">Your account is not activated. First use the link in the Email you've received during registration.</entry>
- <entry key="674">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
<entry key="675">Remove Moderation Role from this User</entry>
<entry key="676">Grant Moderation Rights to this User</entry>
<entry key="677">User</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Unknown error. Please report this to the administrator.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registration disabled</entry>
+ <entry key="error.login.inuse">The username is already used</entry>
+ <entry key="error.email.inuse">The mail address is already registered</entry>
+ <entry key="error.notallowed">Admin Authorization required</entry>
+ <entry key="error.hash.used">The Invitation was already used. This type of Invitation cannot be re-used.</entry>
+ <entry key="error.hash.invalid">This Invitation-Code is not valid.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Invalid Password!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. First use the link in the Email you've received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">User added but you need to assign this User to an Organisation, otherwise he won't be able to sign-in.</entry>
+ <entry key="warn.notverified">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
+ <entry key="account.created">است شده ايجاد شما اكانت</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Mr.</entry>
- <entry key="user.salutation.ms">Ms.</entry>
- <entry key="user.salutation.mrs">Mrs.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">خطا</entry>
- <entry key="error.type.info">پيام</entry>
- <entry key="poll.type.yesNo">خير/بله</entry>
- <entry key="poll.type.numeric">1-10 اعداد</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Mr.</entry>
+ <entry key="user.salutation.ms">Ms.</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">خطا</entry>
+ <entry key="error.type.info">پيام</entry>
+ <entry key="poll.type.yesNo">خير/بله</entry>
+ <entry key="poll.type.numeric">1-10 اعداد</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Download as PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">اولين به بازگشت</entry>
+ <entry key="goto.prev">قبلي به بازگشت</entry>
+ <entry key="goto.next">بعدي به رفتن</entry>
+ <entry key="goto.last">آخر به رفتن</entry>
</properties>
[10/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 988e239..c203590 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Elipse</entry>
<entry key="101">tancar</entry>
<entry key="102">error en la introducció de dades</entry>
- <entry key="103">el nom d'usuari ha de contenir almenys 4 caràcters</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Aquest nombre d'usuari ja existeix</entry>
- <entry key="106">Aquest email ja està registrat</entry>
- <entry key="107">Error, per favor contacti amb l'administrador del sistema</entry>
<entry key="108">Entrar</entry>
<entry key="109">Usuari:</entry>
<entry key="110">Contrasenya:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Correu invàlid</entry>
<entry key="234">Vostè ha introduït una adreça no vàlida de correu electrònic</entry>
<entry key="235">El registre s'ha completat amb èxit</entry>
- <entry key="236">El seu compte ha estat creada, pot ingressar des d'aquest moment</entry>
<entry key="237">No pot compartir el seu escriptori en aquest moment. Algú més ja està compartint el seu escriptori.</entry>
<entry key="238">Compartició prohibida</entry>
<entry key="239">Compartir escriptori</entry>
@@ -291,7 +285,6 @@
<entry key="273">Usuaris</entry>
<entry key="274">Eliminar usuari de l'organització</entry>
<entry key="275">Eliminar</entry>
- <entry key="276">Aquest usuari ja és membre de l'organització</entry>
<entry key="277">Noticies</entry>
<entry key="278">Enllaços ràpids</entry>
<entry key="279">Anar a la videoconferència</entry>
@@ -347,20 +340,9 @@
<entry key="331">Escrigui 4 o més caràcters. Distingeix majúscules de minúscules</entry>
<entry key="332">La contrasenya ha estat canviada, ara pot iniciar sessió.</entry>
<entry key="333">OK</entry>
- <entry key="334">Error desconegut. Enviï aquesta informació a l'administrador del sistema.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Contrasenya incorrecta</entry>
<entry key="337">Ha sortit del sistema</entry>
- <entry key="338">Es troba deshabilitada l'opció de registre.</entry>
- <entry key="339">Correu incorrecte</entry>
- <entry key="340">fitxer duplicat, per favor seleccioni un altre</entry>
- <entry key="341">el nom de l'arxiu és massa curt</entry>
- <entry key="342">No es va poder guardar l'adreça</entry>
- <entry key="343">L'usuari va ser afegit, no obstant això haurà d'estar almenys en una organització per a poder iniciar la sessió.</entry>
<entry key="344">Nova gravació</entry>
- <entry key="345">No es va trobar un camp en aquest FieldId.</entry>
- <entry key="346">No es va trobar una etiqueta per a aquest camp.</entry>
- <entry key="347">Es necessita autorització de l'administrador</entry>
<entry key="348">Editor d'idiomes</entry>
<entry key="349">Idioma</entry>
<entry key="350">Etiqueta-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Nom</entry>
<entry key="355">Valor de l'etiqueta</entry>
<entry key="356">ID de l'etiqueta</entry>
- <entry key="357">Ha eliminat l'etiqueta però no el camp. No es pot eliminar un camp ja que pot tenir etiquetes en altres idiomes.</entry>
- <entry key="358">Labelid incorrecte. El seu FieldLanguagesvaluesAneu no es va trobar en la base de dades.</entry>
<entry key="359">Vostè no pot eliminar aquest camp, només les etiquetes. No hi ha una etiqueta carregada de moment o no es troba seleccionada cap (pot ser que no existeixi en l'idioma seleccionat).</entry>
<entry key="360">exportar</entry>
<entry key="361">Necessita tancar la sessió per a veure els canvis.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nom</entry>
<entry key="366">afegir idioma</entry>
<entry key="367">Copia de seguretat</entry>
- <entry key="368">anar a l'inici</entry>
- <entry key="369">anterior</entry>
- <entry key="370">sigüente</entry>
- <entry key="371">anar al final</entry>
<entry key="372">l'usuari parla (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">encendre o apagar so</entry>
<entry key="374">Sistema</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Usuaris en la sala:</entry>
<entry key="402">actualitzar</entry>
- <entry key="403">La sala esta plena. Per favor, intenti'l més tard.</entry>
<entry key="404">Premi sobre una sala per a veure els detalls</entry>
<entry key="405">Escriure als usuaris d'aquesta sala:</entry>
<entry key="406">Sala:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Des de:</entry>
<entry key="531">Fins a:</entry>
<entry key="532">Invitació a {0}</entry>
- <entry key="533">No existeix una invitació disponible amb aquest codi.</entry>
- <entry key="534">Aquesta invitació ja va ser usada i no pot tornar-se a utilitzar.</entry>
- <entry key="535">El codi d'invitació no és vàlid.</entry>
<entry key="536">Contrasenya:</entry>
<entry key="537">Verificar contrasenya</entry>
- <entry key="538">Contrasenya incorrecta</entry>
<entry key="539">Navegador</entry>
<entry key="540">Sincronitzar Àudio/Vídeo</entry>
<entry key="541">El login és correcte, però la sessió en la qual intenta entrar no està activa o no va ser guardada en el servidor. Ha d'iniciar una nova sessió.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Afegir o esborrar Usuaris i/o Sales en la seva Organització</entry>
<entry key="661">Realment vol esborrar aquest registre?</entry>
<entry key="662">Realment vol esborrar a aquest usuari de la seva organització? Només s'esborrarà la connexió entre l'usuari i la seva organització. En realitat, per a esborrar a l'usuari ha d'ingressar al Panell d'Administració.</entry>
- <entry key="663">¡Vd no pot esborrar-se a si mateix!</entry>
- <entry key="664">¡Aquest mètode necessita un compte d'Administració per a poder ser utilitzat!</entry>
- <entry key="665">No hi ha cap sessió associada a aquest ID.</entry>
- <entry key="666">Aquesta és un compte d'Administrador o de Moderador. Només pot editar aquest compte utilitzant el Panell d'Administració.</entry>
<entry key="667">Per a completar el seu registre, faci el favor de prémer en el següent enllaç. Altra opció és copiar la URL en la barra del seu navegador.</entry>
<entry key="668">Premi per a verificar el seu E-Mail</entry>
<entry key="669">No s'ha trobat un usuari per a aquest algorisme Hash.</entry>
<entry key="670">¡Aquest usuari ja va ser activat!</entry>
<entry key="671">¡Ud ha activat el seu compte amb èxit!</entry>
<entry key="672">Ingressi ara</entry>
- <entry key="673">El seu compte no està activada. Utilitzi en primer lloc l'enllaç que hi ha en correu rebut al finalitzar el procés de registre.</entry>
- <entry key="674">Ud s'ha registrat amb èxit. Li hem enviat un correu amb un codi de verificació. Per favor, revisi el seu compte de correu.</entry>
<entry key="675">Llevar el rol de Moderador a aquest usuari</entry>
<entry key="676">Donar permisos de Moderació a aquest usuari</entry>
<entry key="677">Usuari</entry>
@@ -794,7 +759,6 @@
<entry key="784">Sol·licitar la moderació</entry>
<entry key="785">Sol·licitar accés a la pissarra</entry>
<entry key="786">Sol·licitar accés a la càmera/micròfon</entry>
- <entry key="787">L'autenticació d'aquesta sessió ja ha estat utilitzada. No pot fer-se dues vegades.</entry>
<entry key="788">INICIAR</entry>
<entry key="789">SORTIR</entry>
<entry key="790">¿Desitja realment sortir? És convenient que abans esborri els documents pujats, la pissarra o l'historial del xat.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Progr. Trobada</entry>
<entry key="806">Per a planificar una conferència, afegeixi un nou Esdeveniment en el Calendari. Per a cada Esdeveniment es crearà automàticament una Sala de (vídeo)conferència. Vostè i la resta d'assistents rebran un correu amb un enllaç de la sala. <br/><br/>Pot escollir entre diferents tipus de sales amb diferents dissenys i sistemes de moderació. També pot escollir entre diferents tipus de notificació de correu que s'envien en cada esdeveniment del calendari.</entry>
<entry key="807">¿Necessita ajuda?</entry>
- <entry key="808">Restringit</entry>
<entry key="809">Buscar</entry>
<entry key="810">Afegir</entry>
<entry key="811">No hi ha cap usuari seleccionat. Seleccioni primer un ítem de la llista i premi a Afegir.</entry>
@@ -923,7 +886,6 @@
<entry key="917">La gravació d'aquesta entrevista ja s'ha iniciat!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Error desconegut. Enviï aquesta informació a l'administrador del sistema.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Es troba deshabilitada l'opció de registre.</entry>
+ <entry key="error.login.inuse">Aquest nombre d'usuari ja existeix</entry>
+ <entry key="error.email.inuse">Aquest email ja està registrat</entry>
+ <entry key="error.notallowed">Es necessita autorització de l'administrador</entry>
+ <entry key="error.hash.used">Aquesta invitació ja va ser usada i no pot tornar-se a utilitzar.</entry>
+ <entry key="error.hash.invalid">El codi d'invitació no és vàlid.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Contrasenya incorrecta</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">El seu compte no està activada. Utilitzi en primer lloc l'enllaç que hi ha en correu rebut al finalitzar el procés de registre.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">L'usuari va ser afegit, no obstant això haurà d'estar almenys en una organització per a poder iniciar la sessió.</entry>
+ <entry key="warn.notverified">Ud s'ha registrat amb èxit. Li hem enviat un correu amb un codi de verificació. Per favor, revisi el seu compte de correu.</entry>
+ <entry key="account.created">El seu compte ha estat creada, pot ingressar des d'aquest moment</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Sr.</entry>
- <entry key="user.salutation.ms">Sra.</entry>
- <entry key="user.salutation.mrs">Sra.</entry>
- <entry key="user.salutation.dr">D.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Error</entry>
- <entry key="error.type.info">Missatge</entry>
- <entry key="poll.type.yesNo">Sí/No</entry>
- <entry key="poll.type.numeric">Valor numèric [1-10]</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Sr.</entry>
+ <entry key="user.salutation.ms">Sra.</entry>
+ <entry key="user.salutation.mrs">Sra.</entry>
+ <entry key="user.salutation.dr">D.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Error</entry>
+ <entry key="error.type.info">Missatge</entry>
+ <entry key="poll.type.yesNo">Sí/No</entry>
+ <entry key="poll.type.numeric">Valor numèric [1-10]</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Descarregar com PDF</entry>
<entry key="zoom.fullFit">Pantalla completa</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">anar a l'inici</entry>
+ <entry key="goto.prev">anterior</entry>
+ <entry key="goto.next">sigüente</entry>
+ <entry key="goto.last">anar al final</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 8d7428b..6459b67 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Elipsa</entry>
<entry key="101">zavři</entry>
<entry key="102">chyba vstupních dat</entry>
- <entry key="103">4 nebo více znaků; záleží na velkých písmenkách!</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Uživatel již existuje</entry>
- <entry key="106">Email je již registrován</entry>
- <entry key="107">Systémová chyba, kontaktujte správce sítě!</entry>
<entry key="108">Přihlášení</entry>
<entry key="109">Uživatel:</entry>
<entry key="110">Heslo:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Špatný mail</entry>
<entry key="234">Zadali jste špatnou emailovou adresu</entry>
<entry key="235">Registrace je kompletní</entry>
- <entry key="236">Váš uživatelský účet byl vytvořen. Můžete se přihlásit.</entry>
<entry key="237">Nyní nemůžete sdílet obrazovku. Někdo jiný již sdílí svou obrazovku.</entry>
<entry key="238">Sdílení zakázáno</entry>
<entry key="239">Sdílej svou obrazovku</entry>
@@ -291,7 +285,6 @@
<entry key="273">Uživatelé</entry>
<entry key="274">smaž uživatele z organizace</entry>
<entry key="275">smaž</entry>
- <entry key="276">Tentu uživatel již je členem organizace.</entry>
<entry key="277">Zprávy</entry>
<entry key="278">Rychlá navigace</entry>
<entry key="279">Schůzky</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 nebo více znaků; záleží na velikosti písmen!</entry>
<entry key="332">Heslo nastaveno. Můžete se přihlásit.</entry>
<entry key="333">OK</entry>
- <entry key="334">Neznámá chyba. Nahlaste ji servisnímu týmu.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Špatné heslo</entry>
<entry key="337">Byli jste vpořádku odhlášeni</entry>
- <entry key="338">Registrace uživatelů zakázána.</entry>
- <entry key="339">Špatný mail</entry>
- <entry key="340">soubor již existuje, vyberte jiný název souboru</entry>
- <entry key="341">název souboru je krátký</entry>
- <entry key="342">Nemohu uložit adresu</entry>
- <entry key="343">Uživatel přidán, ale musíte jej přiřadit k organizaci, jinak se nebude moci přihlásit.</entry>
<entry key="344">Nový záznam</entry>
- <entry key="345">Pole nenalezeno v FieldId.</entry>
- <entry key="346">Pro toto pole nexistuje název.</entry>
- <entry key="347">Vyžadovány práva administrátora</entry>
<entry key="348">Lokalizace</entry>
<entry key="349">Jazyk</entry>
<entry key="350">ID pole</entry>
@@ -370,8 +352,6 @@
<entry key="354">Název pole</entry>
<entry key="355">Hodnota pole</entry>
<entry key="356">ID pole</entry>
- <entry key="357">Smazali jste pouze název pole, ne pole! Nemůžete smazat pole, používá se v ostatních jazycích.</entry>
- <entry key="358">Špatné ID pole. ID pole nenalezeno v databázi.</entry>
<entry key="359">Nemůžete smazat toto pole. Můžete smazat pouze názvy polí. Není nahrán žádný název pole, protože jste nevybrali žádné pole, nebo není pro toto pole název definován.</entry>
<entry key="360">export</entry>
<entry key="361">Odhlaste se a pak uvidíte změny.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Název</entry>
<entry key="366">přidej jazyk</entry>
<entry key="367">Záloha</entry>
- <entry key="368">jdi na první</entry>
- <entry key="369">jdi na předchozí</entry>
- <entry key="370">jdi na další</entry>
- <entry key="371">jdi na poslední</entry>
<entry key="372">uživatel mluví (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">Vpnout/Zapnout zvuk</entry>
<entry key="374">Systém</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Uživatelé v této místnosti:</entry>
<entry key="402">aktualizuj</entry>
- <entry key="403">Místnost je plná. Zkuste to za pár minut.</entry>
<entry key="404">Pro získání detalů klikněte na místnost</entry>
<entry key="405">Pokec uživatelů v této místnosti:</entry>
<entry key="406">Mistnost:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Platí od:</entry>
<entry key="531">Platí do:</entry>
<entry key="532">Pozvánka do {0}</entry>
- <entry key="533">Pro tento kód pozvánky není žádná pozvánka dostupná</entry>
- <entry key="534">Pozvánka byla použita. Tento typ pozvánky nemůže být znovu použit.</entry>
- <entry key="535">Tento kód pozvánky je špatný.</entry>
<entry key="536">Heslo:</entry>
<entry key="537">Zkontrolujte heslo</entry>
- <entry key="538">Špatné heslo!</entry>
<entry key="539">Zvuk_Obraz</entry>
<entry key="540">Synchronizuji Zvuk/Obraz</entry>
<entry key="541">Už. účet v pořádku, ale připojení není aktivní, nebo registrované na serveru. Musíte se znovu přihlásit.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Add or delete Users or Rooms within your Organization</entry>
<entry key="661">Do you really want to delete this record?</entry>
<entry key="662">Do you really want to delete this user from your organization? You will only delete the connection between the user and your organization, to really delete the user itself you have to login into the Administration-Panel.</entry>
- <entry key="663">You cannot delete your own User!</entry>
- <entry key="664">This Method needs a Adminstration Account to be invoked!</entry>
- <entry key="665">There was no Session associated with this ID.</entry>
- <entry key="666">This is an Administrator or Moderator account. You can only edit this account through the Administration Panel.</entry>
<entry key="667">To complete your registration please click on the following link. Or copy the URL to your browser bar.</entry>
<entry key="668">Click to verify your E-Mail</entry>
<entry key="669">No user was found for this Hash.</entry>
<entry key="670">This user is already activated!</entry>
<entry key="671">You did successfully activate your account!</entry>
<entry key="672">Login Now</entry>
- <entry key="673">Your account is not activated. First use the link in the Email you've received during registration.</entry>
- <entry key="674">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
<entry key="675">Remove Moderation Role from this User</entry>
<entry key="676">Grant Moderation Rights to this User</entry>
<entry key="677">User</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Neznámá chyba. Nahlaste ji servisnímu týmu.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registrace uživatelů zakázána.</entry>
+ <entry key="error.login.inuse">Uživatel již existuje</entry>
+ <entry key="error.email.inuse">Email je již registrován</entry>
+ <entry key="error.notallowed">Vyžadovány práva administrátora</entry>
+ <entry key="error.hash.used">Pozvánka byla použita. Tento typ pozvánky nemůže být znovu použit.</entry>
+ <entry key="error.hash.invalid">Tento kód pozvánky je špatný.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Špatné heslo!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. First use the link in the Email you've received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Uživatel přidán, ale musíte jej přiřadit k organizaci, jinak se nebude moci přihlásit.</entry>
+ <entry key="warn.notverified">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
+ <entry key="account.created">Váš uživatelský účet byl vytvořen. Můžete se přihlásit.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Pan</entry>
- <entry key="user.salutation.ms">Paní/slečna</entry>
- <entry key="user.salutation.mrs">Mrs.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Chyba</entry>
- <entry key="error.type.info">Zpráva</entry>
- <entry key="poll.type.yesNo">Ano/Ne</entry>
- <entry key="poll.type.numeric">Čísla 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Pan</entry>
+ <entry key="user.salutation.ms">Paní/slečna</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Chyba</entry>
+ <entry key="error.type.info">Zpráva</entry>
+ <entry key="poll.type.yesNo">Ano/Ne</entry>
+ <entry key="poll.type.numeric">Čísla 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Načti jako PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">jdi na první</entry>
+ <entry key="goto.prev">jdi na předchozí</entry>
+ <entry key="goto.next">jdi na další</entry>
+ <entry key="goto.last">jdi na poslední</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index bf4a0d4..c19d234 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Ellipse</entry>
<entry key="101">Luk</entry>
<entry key="102">Forkerte data angivet</entry>
- <entry key="103">Brugernavnet skal indeholde mindst 4 tegn</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Brugernavnet anvendes i forvejen</entry>
- <entry key="106">Emailadressen anvendes i forvejen</entry>
- <entry key="107">Systemfejl, kontakt systemadministrator</entry>
<entry key="108">Login</entry>
<entry key="109">Brugernavn:</entry>
<entry key="110">Adgangskode:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Forkert emailadresse</entry>
<entry key="234">Du har angivet en forkert emailadresse</entry>
<entry key="235">Registrering er fuldført</entry>
- <entry key="236">Din konto er oprettet. Du kan nu logge ind.</entry>
<entry key="237">Du kan ikke dele din skærm lige nu. En anden bruger funktionen lige nu.</entry>
<entry key="238">Deling forbudt</entry>
<entry key="239">Del din skærm</entry>
@@ -291,7 +285,6 @@
<entry key="273">Brugere</entry>
<entry key="274">slet brugere fra organisationen</entry>
<entry key="275">slet</entry>
- <entry key="276">Denne bruger er allerede medlem af organisationen.</entry>
<entry key="277">Nyheder</entry>
<entry key="278">Hurtige genveje</entry>
<entry key="279">Gå til Konference</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 tegn eller mere; forskel på små og store bogstaver!</entry>
<entry key="332">Adgangskode valgt. Du kan logge ind nu.</entry>
<entry key="333">OK</entry>
- <entry key="334">Ukendt fejl. Rapporter venligst til dine support muligheder.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Ugyldig adgangskode.</entry>
<entry key="337">Du er nu logget ud.</entry>
- <entry key="338">Registrering via loginside (frontend) er inaktiveret.</entry>
- <entry key="339">Ugyldig emailadresse.</entry>
- <entry key="340">Filnavnet eksisterer i forvejen. Vælg venligst et andet filnavn.</entry>
- <entry key="341">Filnavnet er for kort.</entry>
- <entry key="342">Kunne ikke gemme adressen.</entry>
- <entry key="343">Bruger oprettet, men skal tildeles til en organisation for at kunne logge ind.</entry>
<entry key="344">Nyt felt</entry>
- <entry key="345">Der er ikke fundet et felt med dette feltID.</entry>
- <entry key="346">Der er ikke fundet en etiket til dette felt.</entry>
- <entry key="347">Admin autorisation er krævet.</entry>
<entry key="348">Sprogeditor</entry>
<entry key="349">Sprog</entry>
<entry key="350">Etiket-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">EtiketNavn</entry>
<entry key="355">EtiketVærdi</entry>
<entry key="356">Etiket-ID</entry>
- <entry key="357">Du slettede kun etiketten, IKKE Feltet! Du kan ikke slettet feltet, det indeholder måske etiketter på andre sprog.</entry>
- <entry key="358">Ugyldig Etiket-ID. FieldLanguagesvalues_Id kan ikke findes i databasen.</entry>
<entry key="359">Du kan ikke slette dette felt. Du kan kun slette etiketter, IKKE Felt. I øjeblikket er der ikke indlæst etiketter, dette kan skyldes, at ingen etiket er valgt eller defineret for dette felt og sproget.</entry>
<entry key="360">Eksporter</entry>
<entry key="361">Du skal logge ud for at kunne se ændringer.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Navn</entry>
<entry key="366">Tilføj sprog</entry>
<entry key="367">Sikkerhedskopier</entry>
- <entry key="368">Gå til første</entry>
- <entry key="369">Gå til foregående</entry>
- <entry key="370">Gå til næste</entry>
- <entry key="371">Gå til sidste</entry>
<entry key="372">Bruger taler (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">LYD til/fra</entry>
<entry key="374">System</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Brugere i dette rum:</entry>
<entry key="402">Opdater</entry>
- <entry key="403">Dette rum er optaget. Forsøg igen om nogle få minutter.</entry>
<entry key="404">Klik på et rum for at få flere detaljer</entry>
<entry key="405">Chat med brugere i dette rum:</entry>
<entry key="406">Rum:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Gyldig fra og med:</entry>
<entry key="531">Gyldig til:</entry>
<entry key="532">Invitation til {0}</entry>
- <entry key="533">Ingen invitation tilgængelig med denne invitationskode.</entry>
- <entry key="534">Invitationen anvendes allerede. Den her type invitationer kan ikke genanvendes.</entry>
- <entry key="535">Invitationskoden er ikke gyldig udenfor mødets start og slut tidspunkt. Kontroller venligst tidspunktet i den tilsendte mødeindkaldelse (email)</entry>
<entry key="536">Adgangskode:</entry>
<entry key="537">Kontroller Adgangskode</entry>
- <entry key="538">Ugyldig adgangskode!</entry>
<entry key="539">Webbrowser</entry>
<entry key="540">Synkroniser lyd/video</entry>
<entry key="541">Indlogningen var korrekt, men sessionen er ikke længere aktiv eller lagret på serveren. Prøv at logge ind igen efter du har fået et nyt SessionId.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Tilføj eller fjern brugere eller rum i din organisation</entry>
<entry key="661">Vil du virkelig fjerne denne?</entry>
<entry key="662">Vil du virkelig fjerne denne bruger fra organisationen? Du vil kun fjerne tilslutningen mellem brugeren og organisationen. For at fjerne brugeren helt, skal du logge ind i administrationspanelet.</entry>
- <entry key="663">Du kan ikke fjerne din egen bruger!</entry>
- <entry key="664">Denne funktion/metode kræver en administrationskonto for at kunne kaldes!</entry>
- <entry key="665">Der findes ingen session associeret med dette ID.</entry>
- <entry key="666">Dette er en administrations- eller moderatorkonto. Du kan kun ændre denne konto via administrationspanelet.</entry>
<entry key="667">Klik venligst på flg. link eller kopier adressen til din webbrowsers adressefelt for at fuldføre registreringen.</entry>
<entry key="668">Klik her for at verificere din emailadresse.</entry>
<entry key="669">Ingen brugere fundet med denne Hash-kode.</entry>
<entry key="670">Denne bruger er allerede aktiveret!</entry>
<entry key="671">Du har aktiveret din konto!</entry>
<entry key="672">Log ind nu</entry>
- <entry key="673">Din konto er ikke aktiveret. Anvend genvejen (link) i den email du modtog, da du registrerede dig.</entry>
- <entry key="674">Du har nu registreret dig til systemet. Du har fået tilsendt en email med din verificeringskode. Kontroller venligst din indbakke.</entry>
<entry key="675">Fjern denne bruger som moderator</entry>
<entry key="676">Tildel moderator rettigheder til denne bruger</entry>
<entry key="677">Brugere</entry>
@@ -794,7 +759,6 @@
<entry key="784">Ansøg om moderation</entry>
<entry key="785">Ansøg om whiteboard adgang</entry>
<entry key="786">Ansøg om kamera/mikrofon adgang</entry>
- <entry key="787">Denne sessions Hash-kode er allerede brugt. Du kan ikke bruge den 2 gange.</entry>
<entry key="788">START</entry>
<entry key="789">LUK</entry>
<entry key="790">Vil du virkelg lukke? Du skal måske slette indlæste dokumenter, whiteboard og chat historie først.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Planlæg et møde</entry>
<entry key="806">For at sætte en konference op, kan du tilføje en event i din kalender. For hver event der oprettes, vil der automatisk blive oprettet et konferencerum. Alle deltagere samt dig selv, vil få tilsendt en email med en genvej (link) til det pågældende konferencerum.<br/><br/>Du kan vælge mellem forskellige rumtyper med forskellig layout og funktionalitet. Du kan også vælge mellem forskellige notificeringsmuligheder (email), som sendes for hver kalender event.</entry>
<entry key="807">Behov for hjælp?</entry>
- <entry key="808">Begrænset</entry>
<entry key="809">Søg</entry>
<entry key="810">Tilføj</entry>
<entry key="811">Ingen bruger valgt. Vælg venligst et emne fra listen først og klik på tilføj efterfølgende.</entry>
@@ -923,7 +886,6 @@
<entry key="917">Optagelsen af dette interview er allerede startet!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Ukendt fejl. Rapporter venligst til dine support muligheder.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registrering via loginside (frontend) er inaktiveret.</entry>
+ <entry key="error.login.inuse">Brugernavnet anvendes i forvejen</entry>
+ <entry key="error.email.inuse">Emailadressen anvendes i forvejen</entry>
+ <entry key="error.notallowed">Admin autorisation er krævet.</entry>
+ <entry key="error.hash.used">Invitationen anvendes allerede. Den her type invitationer kan ikke genanvendes.</entry>
+ <entry key="error.hash.invalid">Invitationskoden er ikke gyldig udenfor mødets start og slut tidspunkt. Kontroller venligst tidspunktet i den tilsendte mødeindkaldelse (email)</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Ugyldig adgangskode!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Din konto er ikke aktiveret. Anvend genvejen (link) i den email du modtog, da du registrerede dig.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Bruger oprettet, men skal tildeles til en organisation for at kunne logge ind.</entry>
+ <entry key="warn.notverified">Du har nu registreret dig til systemet. Du har fået tilsendt en email med din verificeringskode. Kontroller venligst din indbakke.</entry>
+ <entry key="account.created">Din konto er oprettet. Du kan nu logge ind.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Hr.</entry>
- <entry key="user.salutation.ms">Fr.</entry>
- <entry key="user.salutation.mrs">Fr.</entry>
- <entry key="user.salutation.dr">Hr.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Fejl</entry>
- <entry key="error.type.info">Meddelelse</entry>
- <entry key="poll.type.yesNo">Ja/Nej</entry>
- <entry key="poll.type.numeric">Numerisk 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Hr.</entry>
+ <entry key="user.salutation.ms">Fr.</entry>
+ <entry key="user.salutation.mrs">Fr.</entry>
+ <entry key="user.salutation.dr">Hr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Fejl</entry>
+ <entry key="error.type.info">Meddelelse</entry>
+ <entry key="poll.type.yesNo">Ja/Nej</entry>
+ <entry key="poll.type.numeric">Numerisk 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Download som PDF</entry>
<entry key="zoom.fullFit">Fyldig</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">Gå til første</entry>
+ <entry key="goto.prev">Gå til foregående</entry>
+ <entry key="goto.next">Gå til næste</entry>
+ <entry key="goto.last">Gå til sidste</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index c6793b6..17f9140 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Kreis</entry>
<entry key="101">Schließen</entry>
<entry key="102">Eingabefehler</entry>
- <entry key="103">Der Benutzername muss mindestens 4 Zeichen lang sein</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Der Benutzername ist bereits vergeben</entry>
- <entry key="106">Die E-Mail ist bereits registriert</entry>
- <entry key="107">Ein Fehler trat auf. Bitte kontaktieren Sie den Administrator</entry>
<entry key="108">Login</entry>
<entry key="109">Benutzer/E-Mail:</entry>
<entry key="110">Passwort:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Ungültige E-Mail</entry>
<entry key="234">Die angegebene E-Mail-Adresse ist ungültig</entry>
<entry key="235">Registration abgeschlossen</entry>
- <entry key="236">Ihr Benutzer wurde angelegt. Sie können sich nun einloggen.</entry>
<entry key="237">Sie können Ihren Bildschirm im Moment nicht veröffentlichen, da dies bereits ein anderer Benutzer in diesem Konferenzraum tut.</entry>
<entry key="238">Veröffentlichung abgelehnt</entry>
<entry key="239">Desktop veröffentlichen</entry>
@@ -291,7 +285,6 @@
<entry key="273">Benutzer</entry>
<entry key="274">Benutzer aus Organisation entfernen</entry>
<entry key="275">Löschen</entry>
- <entry key="276">Dieser Benutzer ist bereits Teil dieser Organisation.</entry>
<entry key="277">Neuigkeiten</entry>
<entry key="278">Quicklinks</entry>
<entry key="279">Zu den Konferenzräumen (max. 50 Teilnehmer)</entry>
@@ -347,20 +340,9 @@
<entry key="331">Benutzername oder Passwort sind zu kurz, bitte geben Sie mindestens folgende Anzahl an Zeichen für Benutzername / Passwort ein:</entry>
<entry key="332">Passwort gespeichert. Sie können sich nun damit einloggen.</entry>
<entry key="333">OK</entry>
- <entry key="334">Unbekannter Fehler. Bitte melden Sie das dem Service-Team.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Ungültiges Passwort</entry>
<entry key="337">Erfolgreich ausgeloggt</entry>
- <entry key="338">Registrierung ist ausgeschaltet.</entry>
- <entry key="339">Ungültige E-Mail-Adresse</entry>
- <entry key="340">Dieser Dateiname wird schon verwendet. Bitte geben Sie einen anderen an.</entry>
- <entry key="341">Dateiname zu kurz</entry>
- <entry key="342">Adresse konnte nicht gespeichert werden.</entry>
- <entry key="343">Benutzer hinzugefügt. Vergessen Sie nicht diesem Benutzer auch eine Organisation hinzuzufügen. Benutzer ohne Organisation können sich nicht einloggen.</entry>
<entry key="344">Neuer Datensatz</entry>
- <entry key="345">Es konnte kein Feld zu dieser ID ermittelt werden.</entry>
- <entry key="346">Es konnte kein Label für diese ID ermittelt werden.</entry>
- <entry key="347">Sie müssen Administrator sein, um diese Aktion auszuführen.</entry>
<entry key="348">Sprach-Editor</entry>
<entry key="349">Sprache</entry>
<entry key="350">Label-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">LabelName</entry>
<entry key="355">LabelWert</entry>
<entry key="356">Label-ID</entry>
- <entry key="357">Sie haben nur das Label gelöscht nicht das Feld! Das Feld könnte noch Referenzen in anderen Sprachen beinhalten.</entry>
- <entry key="358">Ungültige Labelid. FieldLanguagesvalues_Id kann in der Datenbank nicht gefunden werden.</entry>
<entry key="359">Sie können dieses Feld nicht löschen. Sie können nur Labels, nicht aber Felder löschen. Zur Zeit ist kein Label geladen, entweder ist kein Feld ausgewählt oder es gibt kein Label in dieser Sprache für das Feld.</entry>
<entry key="360">Exportieren</entry>
<entry key="361">Sie müssen sich neu anmelden, um Änderungen zu sehen.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Name</entry>
<entry key="366">Sprache anlegen</entry>
<entry key="367">Sicherung</entry>
- <entry key="368">Zum Ersten</entry>
- <entry key="369">Zum Letzten</entry>
- <entry key="370">Zum Nächsten</entry>
- <entry key="371">Zum Letzten</entry>
<entry key="372">Benutzer spricht (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">Sound an/ausschalten</entry>
<entry key="374">Übersicht</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Benutzer in diesem Raum:</entry>
<entry key="402">Neu laden</entry>
- <entry key="403">Dieser Raum ist voll. Bitte versuchen Sie es später noch einmal.</entry>
<entry key="404">Wählen Sie einen Raum aus, um Details zu erhalten.</entry>
<entry key="405">Chatten Sie mit Benutzern in diesem Raum:</entry>
<entry key="406">Raum:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Gültig ab:</entry>
<entry key="531">Gültig bis:</entry>
<entry key="532">Einladung für diese Konferenz</entry>
- <entry key="533">Keine Einladung für diesen Code</entry>
- <entry key="534">Die Einladung ist nicht mehr gültig.</entry>
- <entry key="535">Die Einladung ist nicht mehr gültig.</entry>
<entry key="536">Passwort:</entry>
<entry key="537">Überprüfen Sie das Passwort</entry>
- <entry key="538">Falsches Passwort!</entry>
<entry key="539">Browser</entry>
<entry key="540">Ton/Video neu starten</entry>
<entry key="541">Sitzung abgelaufen oder ungültig.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Räume innerhalb der Organisation hinzufügen oder löschen</entry>
<entry key="661">Wollen Sie diese Aufnahme wirklich löschen?</entry>
<entry key="662">Wollen Sie diesen Benutzer aus Ihrer Organisation wirklich löschen? Sie werden nur die Verbindung zwischen dem Benutzer und Ihrer Organisation löschen können, um den Benutzer wirklich zu löschen brauchen Sie Administrator-Rechte.</entry>
- <entry key="663">Sie können Ihren eigenen Nutzeraccount nicht löschen!</entry>
- <entry key="664">Diese Methode benötigt ein Administrator-Account um aufgerufen zu werden.</entry>
- <entry key="665">Es ist keine Sitzung mit dieser ID verbungen.</entry>
- <entry key="666">Dies ist ein Administrator- oder Moderator-Account. Dieses Account können Sie nur mittels eines Administrator-Tableau bearbeiten.</entry>
<entry key="667">Um Ihre Registration abzuschließen klicken Sie bitte auf den folgenden Link. Oder kopieren Sie die URL(Link) in Ihre Browser-Adressleiste.</entry>
<entry key="668">Klicken Sie um Ihre E-Mail zu bestätigen</entry>
<entry key="669">Es wurde kein Benutzer für diesen Hash gefunden.</entry>
<entry key="670">Dieser Benutzer ist bereits aktiviert!</entry>
<entry key="671">Sie haben Ihr Account erfolgreich aktiviert!</entry>
<entry key="672">Jetzt einloggen</entry>
- <entry key="673">Ihr Account ist nicht aktiviert. Benutzen Sie zuerst den Link in der E-Mail die Sie während der Registrierung erhalten haben.</entry>
- <entry key="674">Sie haben sich erfolgreich angemeldet. Wir haben eine E-Mail mit einem Verifizierungscode an Ihre E-Mail-Adresse geschickt. Bitte überprüfen Sie Ihren Posteingang.</entry>
<entry key="675">Diesem Benutzer die Moderationsrechte entziehen.</entry>
<entry key="676">Diesem Benutzer Moderatoionsrechte übertragen</entry>
<entry key="677">Benutzer</entry>
@@ -794,7 +759,6 @@
<entry key="784">Moderation beantragen</entry>
<entry key="785">Zeichenbrett beantragen</entry>
<entry key="786">WebCam/Mikrofon beantragen</entry>
- <entry key="787">Dieser SessionHasgh wird bereits genutzt. Er kann nicht zweifach vergeben werden.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Wollen Sie die Konferenz wirklich verlassen? Vielleicht sollten Sie zuerst Dokumente, Zeichenbrett und Chat History leeren. Andernfalls werden die Dateien einfach in diesem Raum bis zu Ihrem nächsten Besuch bleiben.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Konferenz planen</entry>
<entry key="806">Um eine Konferenz zu planen können Sie einen Event im Kalender hinzufügen.</entry>
<entry key="807">Brauchen Sie Hilfe?</entry>
- <entry key="808">Webinar</entry>
<entry key="809">Suche</entry>
<entry key="810">Ok</entry>
<entry key="811">Es ist kein Benutzer ausgewählt. Wählen Sie zuerst einen Benutzer und drücken dann Ok.</entry>
@@ -923,7 +886,6 @@
<entry key="917">Die Aufzeichnung des Interviews wurde bereits gestartet.</entry>
<entry key="918">Abbrechen</entry>
<entry key="919">Die Nachbearbeitung eines Interview benötigt fünf Minuten für jede aufgezeichnete Minute. Die Anzeige zeigt den Fortschritt:</entry>
- <entry key="920">Sie müssen das Passwort erneut eingeben, um SIP Daten automatisch zu erzeugen.</entry>
<entry key="921">SIP Daten neu erzeugen</entry>
<entry key="922">Sie können die Datei oder Ordner nicht in einen eigenen Unterordner verschieben.</entry>
<entry key="923">Größe Homeverzeichnis</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Rechnung</entry>
<entry key="998"></entry>
<entry key="999">Zum Versand von Einladungen oder zur Erstellung von Sitzungen über den Kalender benötigen Sie eine Volumenflatrate. Mit Pay-per-minute Tarifen können Sie selber das Angebot von {0} nutzen, nicht aber Dritte zur Teilnahme an einem Meeting einladen.</entry>
- <entry key="1000">Diese E-Mail-Adresse wird bereits durch einen anderen Nutzer verwandt.</entry>
<entry key="1001">SIP-Einstellungen</entry>
<entry key="1002">Die Konferenznummer und PIN ist automatisch über das OpenXG RPC-Gateway erstellt worden.</entry>
<entry key="1003">SIP Nummer</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Guten Tag,</entry>
<entry key="1193">ich würde Sie gerne als Kontakt hinzufügen.</entry>
<entry key="1194">Prüfen Sie Ihre Kontaktanfragen in {0} oder klicken Sie auf die Links zum Akzeptieren oder Ablehnen der Anfragen.</entry>
- <entry key="1195">Der Nutzer ist bereits in Ihrer Kontaktliste oder hat von Ihnen eine Benachrichtigung erhalten, die noch nicht beantwortet wurde.</entry>
<entry key="1196">Ihre Kontaktliste</entry>
<entry key="1197">Kontakte und Nachrichten bearbeiten,<br/> wartende Kontakte bearbeiten</entry>
<entry key="1198">hat Sie als Kontakt bestätigt</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Gesendet</entry>
<entry key="1224">Gelöscht</entry>
<entry key="1225">Sie können sich nicht selbst als Kontakt einfügen.</entry>
- <entry key="1226">Der Nutzer wurde bereits abgelehnt.</entry>
- <entry key="1227">Der Nutzer wurde bereits bestätigt.</entry>
- <entry key="1228">Nutzerkontakt Hash-Wert ist ungültig</entry>
<entry key="1229">Nutzer wurde zu Kontaktliste hinzugefügt.</entry>
<entry key="1230">Kontakt für Nutzer abgelehnt und von Warteliste entfernt.</entry>
- <entry key="1231">Kein Kontakt gefunden.</entry>
<entry key="1232">Wollen Sie den Kontakt tatsächlich entfernen?</entry>
<entry key="1233">Kontakt entfernen bestätigen</entry>
<entry key="1234">Kontakt von Liste entfernen</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">Der Nutzer veröffentlicht die persönlichen Kontaktdaten nicht.</entry>
<entry key="1269">Der Nutzer zeigt die persönlichen Kontaktdaten nur seinen bestätigten Kontakten.</entry>
<entry key="1270">Adresse & Telefon</entry>
- <entry key="1271">Ihr Einladungscode ist ungültig. Er kann nur im angegebenen Zeitraum genutzt werden:</entry>
<entry key="1272">Der Termin ist in den Kalendern anderer Nutzer eingetragen. Die Änderungen werden auch dort vorgenommen. Wollen Sie den Termine wirklich aktualisieren?</entry>
<entry key="1273">Aktualisierung bestätigen</entry>
<entry key="1274">Dieser Kontakt darfen meinen Kalender einsehen (nur Ansicht)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Anworten</entry>
<entry key="1304">Räume und Chat</entry>
<entry key="1305">Meine Räume</entry>
- <entry key="1306">Mein Konferenzraum (für 1-16 Benutzer)</entry>
- <entry key="1307">Mein Webinarraum (für 1-120 Benutzer)</entry>
<entry key="1308">Eigne ID</entry>
- <entry key="1309">Bitte Passwort eingeben</entry>
- <entry key="1310">Sie benötigen einen Nutzeraccount als Teilnehmer, Moderator oder Administrator</entry>
<entry key="1311">Web-Service (nur SOAP)</entry>
<entry key="1312">Direkt auf Whiteboard ablegen</entry>
<entry key="1313">Soll dieses Whiteboard wirklich entfernt werden? Die Aktion kann nicht rückgängig gemacht werden.</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">aktiv</entry>
<entry key="1414">Einfache Grafik</entry>
<entry key="1415">Tortengrafik</entry>
- <entry key="1416">Bitte geben Sie eine E-Mail-Adresse an</entry>
<entry key="1417">Neue Nachricht(en)</entry>
<entry key="1418">Abstimmung schließen</entry>
<entry key="1419">Wollen Sie die Abstimmung wirklich schließen? Danach kann sich niemand mehr beteiligen.</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Recht für exklusives Audio geben.</entry>
<entry key="1429">Kamera-Auflösung</entry>
<entry key="1430">Die Kamera-Auflösung hat einen direkten Einfluss auf die verbrauchte Upload-Bandbreite!</entry>
- <entry key="1431">Sie verfügen nicht über das Recht sich selbst oder anderen exklusives Audiorecht zu geben. Sie können jedoch den Moderator bitten, Ihnen diese Berechtigung zuzuweisen.</entry>
<entry key="1432">Ich würde gerne das Recht auf exklusives Audio erhalten.</entry>
<entry key="1433">Mir exklusives Rederecht geben (alternativ: klick auf Video Pod oder F12)</entry>
<entry key="1434">Mikrofon ist an</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">beinhaltet hochgeladene Dateien und Aufnahmen im Backup</entry>
<entry key="1538">Aktivieren Sie SIP-Verkehr im Raum</entry>
<entry key="1539">Wollen Sie wirklich diesem Benutzer exklusive Audiorechte geben?</entry>
- <entry key="1540">Bitte Ihre Zeitzone angeben</entry>
- <entry key="1544">Eine Konfiguration mit diesem Schlüssel gibt es bereits. Bitte benutzen Sie einen neuen Schlüssel oder ändern die vorhanden Konfiguration</entry>
<entry key="1545">Inhalt wird gespeichert, bitte warten.</entry>
<entry key="1546">Wilkommen</entry>
<entry key="1547">Anzeige von Informationen und Support-Links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Audio dieses Benutzers entfernen</entry>
<entry key="1606">Ich würde gerne mein Audio übertragen</entry>
<entry key="1607">Du kannst das Audio übertragen</entry>
+ <entry key="error.unknown">Unbekannter Fehler. Bitte melden Sie das dem Service-Team.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registrierung ist ausgeschaltet.</entry>
+ <entry key="error.login.inuse">Der Benutzername ist bereits vergeben</entry>
+ <entry key="error.email.inuse">Die E-Mail ist bereits registriert</entry>
+ <entry key="error.notallowed">Sie müssen Administrator sein, um diese Aktion auszuführen.</entry>
+ <entry key="error.hash.used">Die Einladung ist nicht mehr gültig.</entry>
+ <entry key="error.hash.invalid">Die Einladung ist nicht mehr gültig.</entry>
+ <entry key="error.hash.period">Ihr Einladungscode ist ungültig. Er kann nur im angegebenen Zeitraum genutzt werden:</entry>
+ <entry key="error.bad.password">Falsches Passwort!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Ihr Account ist nicht aktiviert. Benutzen Sie zuerst den Link in der E-Mail die Sie während der Registrierung erhalten haben.</entry>
+ <entry key="error.contact.added">Der Nutzer ist bereits in Ihrer Kontaktliste oder hat von Ihnen eine Benachrichtigung erhalten, die noch nicht beantwortet wurde.</entry>
+ <entry key="error.contact.denied">Der Nutzer wurde bereits abgelehnt.</entry>
+ <entry key="error.contact.approved">Der Nutzer wurde bereits bestätigt.</entry>
+ <entry key="error.cfg.exist">Eine Konfiguration mit diesem Schlüssel gibt es bereits. Bitte benutzen Sie einen neuen Schlüssel oder ändern die vorhanden Konfiguration</entry>
+ <entry key="warn.nogroup">Benutzer hinzugefügt. Vergessen Sie nicht diesem Benutzer auch eine Organisation hinzuzufügen. Benutzer ohne Organisation können sich nicht einloggen.</entry>
+ <entry key="warn.notverified">Sie haben sich erfolgreich angemeldet. Wir haben eine E-Mail mit einem Verifizierungscode an Ihre E-Mail-Adresse geschickt. Bitte überprüfen Sie Ihren Posteingang.</entry>
+ <entry key="account.created">Ihr Benutzer wurde angelegt. Sie können sich nun einloggen.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1780,10 +1747,10 @@
<entry key="install.wizard.congrats.commercial"><![CDATA[Einige Unternehmen bieten kommerziellen Support
für Apache OpenMeetings an:]]></entry>
<entry key="room.type.conference">Konferenz (1-25 User)</entry>
- <entry key="room.type.restricted">Limitiert (1-150 User)</entry>
+ <entry key="room.type.presentation">Präsentation (1-150 User)</entry>
<entry key="room.type.interview">Interview (1:1 meeting with recording)</entry>
<entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
<entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
<entry key="appointment.reminder.none">keine Erinnerung senden</entry>
<entry key="appointment.reminder.email">Einfache E-Mail</entry>
@@ -1833,8 +1800,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1931,4 +1898,10 @@
<entry key="download.pdf">Download als PDF</entry>
<entry key="zoom.fullFit">Vollformat</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">Mein Konferenzraum (für 1-16 Benutzer)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">Zum Ersten</entry>
+ <entry key="goto.prev">Zum Letzten</entry>
+ <entry key="goto.next">Zum Nächsten</entry>
+ <entry key="goto.last">Zum Letzten</entry>
</properties>
[08/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 843ed43..bce2674 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Ellipsi</entry>
<entry key="101">sulje</entry>
<entry key="102">syötevirhe</entry>
- <entry key="103">vähintään 4 merkkiä; isoilla kirjaimilla on merkitystä!</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Tunnus on jo varattu</entry>
- <entry key="106">Sähköpostiosoite on jo rekisteröity</entry>
- <entry key="107">Järjestelmävirhe, ota yhteyttä ylläpitoon</entry>
<entry key="108">Kirjautuminen</entry>
<entry key="109">Käyttäjä:</entry>
<entry key="110">Salasana:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Epäkelpo sähköposti</entry>
<entry key="234">Annoit epäkelvon sähköpostiosoitteen</entry>
<entry key="235">Rekisteröinti onnistui</entry>
- <entry key="236">Tilisi on luotu, voit kirjautua sisään.</entry>
<entry key="237">Et voi jakaa ruutua tällä hetkellä, koska joku muu jakaa jo omaa ruutuaan.</entry>
<entry key="238">Jakaminen kielletty</entry>
<entry key="239">Jaa ruutusi</entry>
@@ -291,7 +285,6 @@
<entry key="273">Käyttäjät</entry>
<entry key="274">poista käyttäjä organisaatiosta</entry>
<entry key="275">poista</entry>
- <entry key="276">Käyttäjä on jo tämän organisaation jäsen.</entry>
<entry key="277">Uutiset</entry>
<entry key="278">Pikalinkit</entry>
<entry key="279">Mene konferenssiin</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 merkkiä tai pidempi; isoilla kirjaimilla on merkitystä!</entry>
<entry key="332">Salasana asetettu. Voit nyt kirjautua sisään.</entry>
<entry key="333">OK</entry>
- <entry key="334">Tuntematon virhe. Ole hyvä ja ilmoita virheestä tukitiimillesi.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Epäkelpo salasana</entry>
<entry key="337">Uloskirjautuminen onnistui</entry>
- <entry key="338">Rekisteröinti on poissa käytöstä.</entry>
- <entry key="339">Epäkelpo sähköposti</entry>
- <entry key="340">saman niminen tiedosto on jo olemassa, valitse toinen nimi</entry>
- <entry key="341">tiedostonimi liian lyhyt</entry>
- <entry key="342">Ei voitu tallentaa osoitetta</entry>
- <entry key="343">Käyttäjä lisätty, mutta sinun täytyy lisätä tämä käyttäjä johonkin organisaatioon jotta hän voi kirjautua sisään.</entry>
<entry key="344">Uusi tietue</entry>
- <entry key="345">Kenttää ei löytynyt kentän id:llä.</entry>
- <entry key="346">Kentälle ei löydy kuvausta.</entry>
- <entry key="347">Ylläpitäjän oikeudet tarvitaan.</entry>
<entry key="348">Kielien muokkaus</entry>
<entry key="349">Kieli</entry>
<entry key="350">Nimi-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Kuvaus</entry>
<entry key="355">Arvo</entry>
<entry key="356">Kuvaus-ID</entry>
- <entry key="357">Poistit pelkän kuvauksen etkä kenttää! Et voi poistaa kenttää, sillä voi olla kuvauksia muilla kielillä.</entry>
- <entry key="358">Epäkelpo kuvaus-ID. Kenttää FieldLanguagesvalues_Id ei löydy tietokannasta.</entry>
<entry key="359">Et voi poistaa tätä kenttää. Voit ainostaa poistaa kuvauksia, et kenttiä. Kuvausta ei ole ladattuna nyt, joko sitä ei ole valittuna mistään kentästä tai tälle kielelle ei ole määritelty kuvauksen mukaista kenttää.</entry>
<entry key="360">vie</entry>
<entry key="361">Sinun täytyy kirjaudua uudestaan nähdäksesi muutokset.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nimi</entry>
<entry key="366">lisää kieli</entry>
<entry key="367">Varmuuskopiointi</entry>
- <entry key="368">mene alkuun</entry>
- <entry key="369">edellinen</entry>
- <entry key="370">seuraava</entry>
- <entry key="371">viimeinen</entry>
<entry key="372">käyttäjä puhuu (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">ääni päälle/pois</entry>
<entry key="374">Järjestelmä</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Käyttäjiä huoneessa:</entry>
<entry key="402">päivitä</entry>
- <entry key="403">Tämä huone on täynnä. Yritä uudestaan muutaman minuutin kuluttua.</entry>
<entry key="404">klikkaa huonetta saadaksesi lisätietoja</entry>
<entry key="405">Keskustele tämän huoneen käyttäjien kanssa:</entry>
<entry key="406">Huone:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Voimassa alkaen:</entry>
<entry key="531">Voimassa kunnes:</entry>
<entry key="532">Kutsu {0}iin</entry>
- <entry key="533">Kutsua ei ole saatavilla antamallesi kutsukoodille</entry>
- <entry key="534">Kutsu on jo käytetty. Kutsua ei voi uudelleenkäyttää.</entry>
- <entry key="535">Kutsu ei ole kelvollinen.</entry>
<entry key="536">Salasana:</entry>
<entry key="537">Tarkista salasana</entry>
- <entry key="538">Väärä salasana!</entry>
<entry key="539">Ääni_Kuva</entry>
<entry key="540">Synkronisoi ääni/kuva</entry>
<entry key="541">Kirjautuminen onnistu, mutta haluamasi istunto ei ole aktiivinen tai ei ole tallennettu palvelimelle. Sinun täytyy hankkia uusi istunto-id ja yrittää kirjautumista uudelleen.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Lisää tai poista käyttäjiä tai huoneita organisaatiossasi</entry>
<entry key="661">Haluatko poistaa tämän tietueen?</entry>
<entry key="662">Haluatko todella poistaa käyttäjän organisaatiostasi? Tämä poistaa pelkästään linkin käyttäjän ja organisaation välillä, jos haluat poistaa käyttäjän niin joudut kirjautumaan ylläpitopaneeliin.</entry>
- <entry key="663">Et voi poistaa itseäsi!</entry>
- <entry key="664">Tämä toiminto vaatii ylläpitäjän oikeudet!</entry>
- <entry key="665">Tälle ID-numerolle ei ole määritelty istuntoa.</entry>
- <entry key="666">Tämä on ylläpitäjän tai moderaattorin tili. Voit muokata tiliä vain ylläpitopaneelin kautta.</entry>
<entry key="667">Klikkaa seuraavaa linkkiä viimeistelläksesi rekisteröintisi tai kopioi osoite selaimesi osoiteriville.</entry>
<entry key="668">Klikkaa varmistaaksesi sähköpostiosoitteesi</entry>
<entry key="669">Käyttäjää ei löytynyt annetulla tunnuksella</entry>
<entry key="670">Käyttäjä on jo aktivoitu!</entry>
<entry key="671">Käyttäjätunnuksesi aktivoitiin onnistuneesti!</entry>
<entry key="672">Kirjaudu nyt</entry>
- <entry key="673">Käyttäjätunnustasi ei ole aktivoitu. Muista käyttää varmistussähköpostin mukana tullutta linkkiä ennen uutta yritystä.</entry>
- <entry key="674">Olen rekisteröitynyt onnistuneesti. Lähetimme sinulle sähköpostin jossa on varmistuskoodi. Ole hyvä ja tarkista sähköpostilaatikkosi.</entry>
<entry key="675">Poista käyttäjän moderointioikeus</entry>
<entry key="676">Anna moderointioikeus tälle käyttäjälle</entry>
<entry key="677">Käyttäjä</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Tuntematon virhe. Ole hyvä ja ilmoita virheestä tukitiimillesi.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Rekisteröinti on poissa käytöstä.</entry>
+ <entry key="error.login.inuse">Tunnus on jo varattu</entry>
+ <entry key="error.email.inuse">Sähköpostiosoite on jo rekisteröity</entry>
+ <entry key="error.notallowed">Ylläpitäjän oikeudet tarvitaan.</entry>
+ <entry key="error.hash.used">Kutsu on jo käytetty. Kutsua ei voi uudelleenkäyttää.</entry>
+ <entry key="error.hash.invalid">Kutsu ei ole kelvollinen.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Väärä salasana!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Käyttäjätunnustasi ei ole aktivoitu. Muista käyttää varmistussähköpostin mukana tullutta linkkiä ennen uutta yritystä.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Käyttäjä lisätty, mutta sinun täytyy lisätä tämä käyttäjä johonkin organisaatioon jotta hän voi kirjautua sisään.</entry>
+ <entry key="warn.notverified">Olen rekisteröitynyt onnistuneesti. Lähetimme sinulle sähköpostin jossa on varmistuskoodi. Ole hyvä ja tarkista sähköpostilaatikkosi.</entry>
+ <entry key="account.created">Tilisi on luotu, voit kirjautua sisään.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Herra</entry>
- <entry key="user.salutation.ms">Rouva</entry>
- <entry key="user.salutation.mrs">Mrs.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="prof">Prof</entry>
- <entry key="error.type.error">Virhe</entry>
- <entry key="error.type.info">Viesti</entry>
- <entry key="poll.type.yesNo">Kyllä/Ei</entry>
- <entry key="poll.type.numeric">Numeerinen 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Herra</entry>
+ <entry key="user.salutation.ms">Rouva</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="prof">Prof</entry>
+ <entry key="error.type.error">Virhe</entry>
+ <entry key="error.type.info">Viesti</entry>
+ <entry key="poll.type.yesNo">Kyllä/Ei</entry>
+ <entry key="poll.type.numeric">Numeerinen 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Lataa PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">mene alkuun</entry>
+ <entry key="goto.prev">edellinen</entry>
+ <entry key="goto.next">seuraava</entry>
+ <entry key="goto.last">viimeinen</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 34cbee9..ff2afde 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Ellipse</entry>
<entry key="101">Fermer</entry>
<entry key="102">Erreur de formulaire</entry>
- <entry key="103">Le nom d'utilisateur doit contenir au moins 4 caractères</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Le nom d'utilisateur existe déjà</entry>
- <entry key="106">Cette adresse de courriel est déjà utilisée</entry>
- <entry key="107">Erreur système, merci de contacter l'administrateur</entry>
<entry key="108">Connexion</entry>
<entry key="109">Utilisateur :</entry>
<entry key="110">Mot de passe :</entry>
@@ -253,7 +248,6 @@
<entry key="233">Adresse de courriel erronée</entry>
<entry key="234">Vous avez utilisé une adresse de courriel non valide</entry>
<entry key="235">Enregistrement effectué</entry>
- <entry key="236">Votre compte a été créé. Vous pouvez maintenant vous connecter</entry>
<entry key="237">Vous ne pouvez pas partager votre écran car un autre utilisateur utilise déjà cette fonctionnalité</entry>
<entry key="238">Partage annulé</entry>
<entry key="239">Partager votre écran</entry>
@@ -291,7 +285,6 @@
<entry key="273">Utilisateurs</entry>
<entry key="274">Effacer l'organisation</entry>
<entry key="275">Effacer</entry>
- <entry key="276">Cet utilisateur est déjà membre de l'organisation</entry>
<entry key="277">Nouvelles</entry>
<entry key="278">Raccourcis</entry>
<entry key="279">Aller à la réunion</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 caractères ou plus ; la casse a de l'importance !</entry>
<entry key="332">Mot de passe changé. Vous pouvez vous connecter.</entry>
<entry key="333">OK</entry>
- <entry key="334">Erreur inconnue. Veuillez le signaler à votre équipe support.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Mot de passe non valide</entry>
<entry key="337">Déconnecté avec succès</entry>
- <entry key="338">Enregistrement depuis la page d'accueil désactivé.</entry>
- <entry key="339">Courriel non valide</entry>
- <entry key="340">Nom de fichier identique, veuillez choisir un autre nom de fichier</entry>
- <entry key="341">Nom de fichier trop court</entry>
- <entry key="342">Impossible de sauvegarder l'adresse</entry>
- <entry key="343">Utilisateur ajouté. Si vous ne l'avez pas assigné à une organisation, veuillez le faire sans quoi il ne pourra pas se connecter.</entry>
<entry key="344">Nouvel enregistrement</entry>
- <entry key="345">Pas de champ trouvé avec cet ID.</entry>
- <entry key="346">Pas d'étiquette trouvée pour ce champ.</entry>
- <entry key="347">Requière l'autorisation de l'administrateur</entry>
<entry key="348">Editeur de langue</entry>
<entry key="349">Langue</entry>
<entry key="350">Label-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Label-Nom</entry>
<entry key="355">Label-Valeur</entry>
<entry key="356">Label-ID</entry>
- <entry key="357">Vous avez effacé le label, pas le champ ! Vous ne pouvez pas effacer le champ, il peut contenir des labels pour d'autres langues.</entry>
- <entry key="358">ID du label non valide. Le FieldLanguagesvalues_Id n'est pas dans la base de données.</entry>
<entry key="359">Vous ne pouvez pas supprimer ce champ, seulement les labels. Il n'y a pas de labels pour le moment ou il n'y a pas de labels pour ce langage.</entry>
<entry key="360">Exporter</entry>
<entry key="361">Vous devez vous déconnecter pour voir les changements.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nom</entry>
<entry key="366">Ajouter un langage</entry>
<entry key="367">Sauvegarde</entry>
- <entry key="368">Retour au début</entry>
- <entry key="369">Précédent</entry>
- <entry key="370">Suivant</entry>
- <entry key="371">Aller au dernier</entry>
<entry key="372">L'utilisateur parle</entry>
<entry key="373">Son marche/arrêt</entry>
<entry key="374">Système</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Utilisateur dans la salle :</entry>
<entry key="402">Rafraichir</entry>
- <entry key="403">Cette salle est pleine. Réessayez dans quelques minutes.</entry>
<entry key="404">Infos : Cliquez sur une salle</entry>
<entry key="405">Discutez avec les utilisateurs de cette salle :</entry>
<entry key="406">Salle :</entry>
@@ -546,12 +521,8 @@
<entry key="530">Valide à partir de :</entry>
<entry key="531">Valide jusqu'à :</entry>
<entry key="532">Invitation à une conférence {0}</entry>
- <entry key="533">Pas d'invitation disponible pour ce code</entry>
- <entry key="534">L'invitation est déjà utilisé. Impossible d'accéder à la réunion/conférence.</entry>
- <entry key="535">Ce code d'invitation n'est pas valide.</entry>
<entry key="536">Mot de passe:</entry>
<entry key="537">Vérification du mot de passe</entry>
- <entry key="538">Mot de passe non valide !</entry>
<entry key="539">Navigateur</entry>
<entry key="540">Synchroniser Audio/Vidéo</entry>
<entry key="541">Votre mot de passe est correct mais la session est inactive. Vous devez récupérer une nouvelle ID de session et vous reconnecter.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Ajouter ou supprimer des utilisateurs ou des salles de votre organisation</entry>
<entry key="661">Voulez-vous réellement supprimer cet enregistrement ?</entry>
<entry key="662">Voulez-vous réellement supprimer cet utilisateur de votre organisation ? Vous supprimez seulement le lien entre cet utilisateur et votre organisation, pour supprimer réellement cet utilisateur vous devez aller dans l'onglet d'administration.</entry>
- <entry key="663">Vous ne pouvez pas vous supprimer !</entry>
- <entry key="664">Cette méthode nécessite des droits d'administration.</entry>
- <entry key="665">Il n'y a pas de session associée à cet ID.</entry>
- <entry key="666">C'est un compte d'administration ou de modérateur. Vous ne pouvez l'éditer qu'à travers l'onglet d'administration.</entry>
<entry key="667">Pour terminer votre enregistrement veuillez cliquer sur le lien suivant. Ou copier l'URL dans la barre d'adresse de votre navigateur.</entry>
<entry key="668">Cliquez pour vérifier votre courriel</entry>
<entry key="669">Aucun utilisateur pour ce hachage.</entry>
<entry key="670">Cet utilisateur est déjà activé !</entry>
<entry key="671">Vous avez activé votre compte avec succès !</entry>
<entry key="672">Se connecter maintenant</entry>
- <entry key="673">Votre compte n'est pas actif. Utilisez le lien dans le courriel que vous avez reçu pour l'enregistrement.</entry>
- <entry key="674">Vous êtes enregistré. Nous vous avons envoyé un courriel avec un code de vérification. Regardez votre boite de messagerie.</entry>
<entry key="675">Enlever le rôle de modérateur à cet utilisateur</entry>
<entry key="676">Donner les droits de modération à cet utilisateur</entry>
<entry key="677">Utilisateur</entry>
@@ -794,7 +759,6 @@
<entry key="784">Demander la modération</entry>
<entry key="785">Demander l'accès au tableau blanc</entry>
<entry key="786">Demander l'accès à caméra/micro</entry>
- <entry key="787">Ce hachage est déjà utilisé. Vous ne pouvez l'utiliser deux fois.</entry>
<entry key="788">DEBUT</entry>
<entry key="789">Sortie</entry>
<entry key="790">Voulez-vous réellement sortir ? Vous devriez peut-être préalablement nettoyer les documents chargés, le tableau blanc ou les messages instantanés.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Planifier</entry>
<entry key="806">Pour planifier une réunion vous pouvez créer un événement dans le calendrier.</entry>
<entry key="807">Besoin d'aide ?</entry>
- <entry key="808">Accès réservé</entry>
<entry key="809">Recherche</entry>
<entry key="810">Ajouter</entry>
<entry key="811">Il n'y a pas d'utilisateur sélectionné. S.V.P. choisissez un utilisateur dans la liste.</entry>
@@ -923,7 +886,6 @@
<entry key="917">L'enregistrement pour cette interview a déjà démarré !</entry>
<entry key="918">Annuler</entry>
<entry key="919">Le post traitement d'une interview dure 5 minutes par minute d'interview. L'avancement actuel du post traitement est :</entry>
- <entry key="920">Vous devez entrer votre mot de passe à nouveau pour créer automatiquement les données SIP</entry>
<entry key="921">Regénérer les données</entry>
<entry key="922">Vous ne pouvez déplacer ce fichier ou dossier dans son propre sous-dossier !</entry>
<entry key="923">Taille du disque local</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Facture</entry>
<entry key="998"></entry>
<entry key="999">Vous devez acheter un volume forfaitaire pour pouvoir envoyer des invitations ou créer des réunions via le calendrier. Avec un paiement à la minute il ne vous est possible que d'accéder à {0}. Vous ne pouvez pas permettre à des tiers de participer à une réunion.</entry>
- <entry key="1000">Cette adresse de courriel est déjà utilisée par un autre utilisateur.</entry>
<entry key="1001">Paramètres SIP</entry>
<entry key="1002">Le numéro de conférence et PIN sont créés automatiquement via la passerelle OpenXG RPC</entry>
<entry key="1003">Numéro SIP</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Bonjour,</entry>
<entry key="1193">souhaite vous ajouter à sa liste de contacts.</entry>
<entry key="1194">Vérifiez vos demandes de contact dans {0} ou cliquez sur les liens pour accepter ou refuser les demandes</entry>
- <entry key="1195">cet utilisateur est déjà dans vos contacts ou a reçu une invitation à votre liste de contact à laquelle il n'a pas encore répondu.</entry>
<entry key="1196">Votre liste de contacts</entry>
<entry key="1197">Editez vos contacts et messages,<br/> gérez vos contacts en attente !</entry>
<entry key="1198">vous a confirmé comme contact !</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Envoyé</entry>
<entry key="1224">Poubelle</entry>
<entry key="1225">C'est vous ! Vous ne pouvez pas vous ajouter vous-même à vos propres contacts.</entry>
- <entry key="1226">L'utilisateur a déjà été refusé !</entry>
- <entry key="1227">L'utilisateur a déjà été approuvé !</entry>
- <entry key="1228">Le hachage de ce contact n'est pas valide !</entry>
<entry key="1229">Utilisateur ajouté à la liste de contact !</entry>
<entry key="1230">Utilisateur refusé comme contact et supprimé de la liste des contacts en attente !</entry>
- <entry key="1231">Il n'y a pas un tel contact !</entry>
<entry key="1232">Vous voulez vraiment supprimer ce contact ?</entry>
<entry key="1233">Confirmez la suppression du contact</entry>
<entry key="1234">Supprimer le contact de la liste</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">L'utilisateur ne partage pas ses données personnelles de contact.</entry>
<entry key="1269">L'utilisateur ne partage ses données personnelles de contact qu'avec ses contacts.</entry>
<entry key="1270">Adresse & tél.</entry>
- <entry key="1271">Votre code d'invitation n'est pas valide, le code n'est valide que durant cette date et heure spécifiques :</entry>
<entry key="1272">Cet événement est connecté à plusieurs calendriers d'autres utilisateurs. Vos modifications seront également mises-à-jour dans leurs calendriers. Voulez*-vous vraiment mettre à jour l'événement ?</entry>
<entry key="1273">Confirmez la mise à jour</entry>
<entry key="1274">Permettre au contact de voir le calendrier (voir seulement)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Répondre</entry>
<entry key="1304">Salles et t'chats</entry>
<entry key="1305">Mes salles</entry>
- <entry key="1306">Ma salle de conférence (pour 1-16 utilisateurs)</entry>
- <entry key="1307">Ma salle webinar (pour 1-120 utilisateurs)</entry>
<entry key="1308">Id du propriétaire</entry>
- <entry key="1309">Veuillez entrer un mot de passe</entry>
- <entry key="1310">Vous devez avoir un compte de niveau Utilisateur, Modérateur ou Administrateur</entry>
<entry key="1311">Service-Web (accessible seulement via SOAP)</entry>
<entry key="1312">Charger directement sur le tableau blanc</entry>
<entry key="1313">Voulez-vous vraiment supprimer ce tableau blanc ? Cette action ne peut être annulée !</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">actif</entry>
<entry key="1414">Simple graphique</entry>
<entry key="1415">Graphique camembert</entry>
- <entry key="1416">Veuillez entrer un courriel</entry>
<entry key="1417">Nouveau(x) message(s)</entry>
<entry key="1418">Clôturer</entry>
<entry key="1419">Etes-vous sûr de vouloir clore ce sondage ? Plus personne ne pourra plus voter.</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Donner une permission d'audio exclusif.</entry>
<entry key="1429">Résolution caméra</entry>
<entry key="1430">Changer la résolution affecte la bande passante, une image plus grande à besoin de plus de bande passante !</entry>
- <entry key="1431">Vous n'avez pas l'autorisation de vous donner à vous ou aux autres l'audio exclusif. Vous devez demander cette autorisation au modérateur ou lui demander de le faire.</entry>
<entry key="1432">Je souhaite avoir le droit d'avoir l'audio exclusif</entry>
<entry key="1433">Me donne l'audio exclusif (alternativement cliquez sur votre fenêtre vidéo ou appuyez sur F12)</entry>
<entry key="1434">Microphone est allumé !</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Inclure les fichiers déposés sur le serveur et les enregistrements dans la sauvegarde</entry>
<entry key="1538">Activer le transport SIP dans la salle</entry>
<entry key="1539">Voulez-vous vraiment donner l'audio exclusif à cet utilisateur ?</entry>
- <entry key="1540">Veuillez spécifier votre fuseau horaire</entry>
- <entry key="1544">Une configuration avec cette clé existe déjà, veuillez spécifier une autre clé ou éditer la configuration existante</entry>
<entry key="1545">Sauvegarde, veuillez patienter.</entry>
<entry key="1546">Bienvenue</entry>
<entry key="1547">Widget affichant les infos de base des utilisateurs et les liens pour le support</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Retirer l'audio de cet utilisateur</entry>
<entry key="1606">Je voudrais partager mon audio</entry>
<entry key="1607">Vous êtes autorisé à partager votre audio</entry>
+ <entry key="error.unknown">Erreur inconnue. Veuillez le signaler à votre équipe support.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Enregistrement depuis la page d'accueil désactivé.</entry>
+ <entry key="error.login.inuse">Le nom d'utilisateur existe déjà</entry>
+ <entry key="error.email.inuse">Cette adresse de courriel est déjà utilisée</entry>
+ <entry key="error.notallowed">Requière l'autorisation de l'administrateur</entry>
+ <entry key="error.hash.used">L'invitation est déjà utilisé. Impossible d'accéder à la réunion/conférence.</entry>
+ <entry key="error.hash.invalid">Ce code d'invitation n'est pas valide.</entry>
+ <entry key="error.hash.period">Votre code d'invitation n'est pas valide, le code n'est valide que durant cette date et heure spécifiques :</entry>
+ <entry key="error.bad.password">Mot de passe non valide !</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Votre compte n'est pas actif. Utilisez le lien dans le courriel que vous avez reçu pour l'enregistrement.</entry>
+ <entry key="error.contact.added">cet utilisateur est déjà dans vos contacts ou a reçu une invitation à votre liste de contact à laquelle il n'a pas encore répondu.</entry>
+ <entry key="error.contact.denied">L'utilisateur a déjà été refusé !</entry>
+ <entry key="error.contact.approved">L'utilisateur a déjà été approuvé !</entry>
+ <entry key="error.cfg.exist">Une configuration avec cette clé existe déjà, veuillez spécifier une autre clé ou éditer la configuration existante</entry>
+ <entry key="warn.nogroup">Utilisateur ajouté. Si vous ne l'avez pas assigné à une organisation, veuillez le faire sans quoi il ne pourra pas se connecter.</entry>
+ <entry key="warn.notverified">Vous êtes enregistré. Nous vous avons envoyé un courriel avec un code de vérification. Regardez votre boite de messagerie.</entry>
+ <entry key="account.created">Votre compte a été créé. Vous pouvez maintenant vous connecter</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1766,62 +1733,62 @@
<entry key="install.wizard.congrats.mail">Liste de diffusion</entry>
<entry key="install.wizard.congrats.commercial">Il existe des sociétés
qui offrent un support commercial pour Apache OpenMeetings :</entry>
- <entry key="room.type.conference">conférence (1-25 utilisateurs)</entry>
- <entry key="room.type.restricted">restreint (1-150 utilisateurs)</entry>
- <entry key="room.type.interview">interview (1:1 réunion avec enregistrement)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">ne pas envoyer de notification</entry>
- <entry key="appointment.reminder.email">courriel simple</entry>
- <entry key="appointment.reminder.ical">courriel iCal</entry>
- <entry key="user.salutation.mr">M.</entry>
- <entry key="user.salutation.ms">Mme.</entry>
- <entry key="user.salutation.mrs">Mlle.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Quitter</entry>
- <entry key="error.type.info">Message</entry>
- <entry key="poll.type.yesNo">Oui/Non</entry>
- <entry key="poll.type.numeric">Numérique 1-10</entry>
- <entry key="wizard.button.finish">Terminer</entry>
- <entry key="main.menu.admin.email">Gestion courriels</entry>
- <entry key="main.menu.admin.email.desc">Verifier courriels traités par le système</entry>
- <entry key="admin.email.group.label">Message courriel</entry>
- <entry key="admin.email.status.NONE">Aucun</entry>
- <entry key="admin.email.status.SENDING">Envoi</entry>
- <entry key="admin.email.status.ERROR">Erreur</entry>
- <entry key="admin.email.status.DONE">Terminé</entry>
- <entry key="admin.email.recipients">Destinataires</entry>
- <entry key="admin.email.body">Corps</entry>
- <entry key="admin.email.errorCount">Compteur erreur</entry>
- <entry key="admin.email.lastError">Dernière erreur</entry>
- <entry key="admin.email.reset.status">Réinitialiser état</entry>
- <entry key="dashboard.widget.admin.title">Fonctions d'admin</entry>
- <entry key="dashboard.widget.admin.desc">Fonctions d'admin générales</entry>
- <entry key="dashboard.widget.admin.cleanup.title">Rapport de nettoyage</entry>
- <entry key="dashboard.widget.admin.cleanup.show">Montrer rapport de nettoyage</entry>
- <entry key="dashboard.widget.admin.cleanup.upload">Dosier de dépôt:</entry>
- <entry key="dashboard.widget.admin.cleanup.profiles">profils:</entry>
- <entry key="dashboard.widget.admin.cleanup.invalid">invalide:</entry>
- <entry key="dashboard.widget.admin.cleanup.deleted">supprimé:</entry>
- <entry key="dashboard.widget.admin.cleanup.missing">compteur manquant:</entry>
- <entry key="dashboard.widget.admin.cleanup.import">importer:</entry>
- <entry key="dashboard.widget.admin.cleanup.backup">sauvegarde:</entry>
- <entry key="dashboard.widget.admin.cleanup.files">fichiers:</entry>
- <entry key="dashboard.widget.admin.cleanup.streams">Dossier des flux:</entry>
- <entry key="dashboard.widget.admin.cleanup.final">final:</entry>
- <entry key="dashboard.widget.admin.cleanup.cleanup">Nettoyage</entry>
- <entry key="dashboard.widget.admin.cleanup.warn">Etes-vous sur de vouloir supprimer tous les fichiers temporaires ? Cette opération ne peut être annulée.</entry>
- <entry key="dashboard.widget.admin.cleanup.error">Erreur inattendue en effectuant le nettoyage</entry>
+ <entry key="room.type.conference">conférence (1-25 utilisateurs)</entry>
+ <entry key="room.type.presentation">presentation (1-150 utilisateurs)</entry>
+ <entry key="room.type.interview">interview (1:1 réunion avec enregistrement)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">ne pas envoyer de notification</entry>
+ <entry key="appointment.reminder.email">courriel simple</entry>
+ <entry key="appointment.reminder.ical">courriel iCal</entry>
+ <entry key="user.salutation.mr">M.</entry>
+ <entry key="user.salutation.ms">Mme.</entry>
+ <entry key="user.salutation.mrs">Mlle.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Quitter</entry>
+ <entry key="error.type.info">Message</entry>
+ <entry key="poll.type.yesNo">Oui/Non</entry>
+ <entry key="poll.type.numeric">Numérique 1-10</entry>
+ <entry key="wizard.button.finish">Terminer</entry>
+ <entry key="main.menu.admin.email">Gestion courriels</entry>
+ <entry key="main.menu.admin.email.desc">Verifier courriels traités par le système</entry>
+ <entry key="admin.email.group.label">Message courriel</entry>
+ <entry key="admin.email.status.NONE">Aucun</entry>
+ <entry key="admin.email.status.SENDING">Envoi</entry>
+ <entry key="admin.email.status.ERROR">Erreur</entry>
+ <entry key="admin.email.status.DONE">Terminé</entry>
+ <entry key="admin.email.recipients">Destinataires</entry>
+ <entry key="admin.email.body">Corps</entry>
+ <entry key="admin.email.errorCount">Compteur erreur</entry>
+ <entry key="admin.email.lastError">Dernière erreur</entry>
+ <entry key="admin.email.reset.status">Réinitialiser état</entry>
+ <entry key="dashboard.widget.admin.title">Fonctions d'admin</entry>
+ <entry key="dashboard.widget.admin.desc">Fonctions d'admin générales</entry>
+ <entry key="dashboard.widget.admin.cleanup.title">Rapport de nettoyage</entry>
+ <entry key="dashboard.widget.admin.cleanup.show">Montrer rapport de nettoyage</entry>
+ <entry key="dashboard.widget.admin.cleanup.upload">Dosier de dépôt:</entry>
+ <entry key="dashboard.widget.admin.cleanup.profiles">profils:</entry>
+ <entry key="dashboard.widget.admin.cleanup.invalid">invalide:</entry>
+ <entry key="dashboard.widget.admin.cleanup.deleted">supprimé:</entry>
+ <entry key="dashboard.widget.admin.cleanup.missing">compteur manquant:</entry>
+ <entry key="dashboard.widget.admin.cleanup.import">importer:</entry>
+ <entry key="dashboard.widget.admin.cleanup.backup">sauvegarde:</entry>
+ <entry key="dashboard.widget.admin.cleanup.files">fichiers:</entry>
+ <entry key="dashboard.widget.admin.cleanup.streams">Dossier des flux:</entry>
+ <entry key="dashboard.widget.admin.cleanup.final">final:</entry>
+ <entry key="dashboard.widget.admin.cleanup.cleanup">Nettoyage</entry>
+ <entry key="dashboard.widget.admin.cleanup.warn">Etes-vous sur de vouloir supprimer tous les fichiers temporaires ? Cette opération ne peut être annulée.</entry>
+ <entry key="dashboard.widget.admin.cleanup.error">Erreur inattendue en effectuant le nettoyage</entry>
<entry key="room.action.request.right.moderator">would like to be moderator of this room.</entry>
<entry key="admin.room.hidden.elements">Hidden room elements</entry>
<entry key="install.room.public.interview">Public Interview Room</entry>
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1918,4 +1885,10 @@
<entry key="download.pdf">Télécharger en PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">Ma salle de conférence (pour 1-16 utilisateurs)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">Retour au début</entry>
+ <entry key="goto.prev">Précédent</entry>
+ <entry key="goto.next">Suivant</entry>
+ <entry key="goto.last">Aller au dernier</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 776cd91..914010d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Elipse</entry>
<entry key="101">Pechado</entry>
<entry key="102">erro na entrada de datos</entry>
- <entry key="103">o nome de usuario debe conter alo menos 4 caracteres</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Este nome de usuario xa existe</entry>
- <entry key="106">Este correo-e xa está rexistrado</entry>
- <entry key="107">Erro do sistema, por favor contacte co administrador do sistema</entry>
<entry key="108">Inicio de sesión</entry>
<entry key="109">Usuario ou correo-e:</entry>
<entry key="110">Contrasinal:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Correo incorrecto</entry>
<entry key="234">Vostede introduciu un enderezo de correo electrónico incorrecto</entry>
<entry key="235">O rexistro completouse satisfactoriamente</entry>
- <entry key="236">A súa conta foi creada, a partires deste momento xa pode iniciar unha sesión</entry>
<entry key="237">Vostede non pode compartir o seu escritorio neste momento. Alguén está xa a compartir o seu escritorio neste momento.</entry>
<entry key="238">Compartición non permitida</entry>
<entry key="239">Compartir/gravar o seu escritorio</entry>
@@ -291,7 +285,6 @@
<entry key="273">Usuarios</entry>
<entry key="274">Eliminar un usuario da organización</entry>
<entry key="275">E</entry>
- <entry key="276">Este usuario xa é membro da organización</entry>
<entry key="277">Novas</entry>
<entry key="278">Ligazóns rápidas</entry>
<entry key="279">Ir á conferencia</entry>
@@ -347,20 +340,9 @@
<entry key="331">Escriba 4 ou máis caracteres. Diferéncianse as maiúsculas</entry>
<entry key="332">Cambiouse o contrasinal, agora pode a iniciar sesión.</entry>
<entry key="333">Aceptar</entry>
- <entry key="334">Erro descoñecido. Informe ao administradores.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Contrasinal incorrecto</entry>
<entry key="337">Vostede saiu do sistema</entry>
- <entry key="338">A ferramenta de rexistro está desactivada.</entry>
- <entry key="339">Correo-e incorrecto</entry>
- <entry key="340">nome de ficheiro duplicado, por favor elixa outro</entry>
- <entry key="341">o nome de ficheiro é moi curto</entry>
- <entry key="342">Non se puido gardar o enderezo</entry>
- <entry key="343">O usuario foi engadido, máis deberá engadilo a unha organización, ou non poderá conectarse.</entry>
<entry key="344">Nova gravación</entry>
- <entry key="345">Non se atopou un campo neste FieldId.</entry>
- <entry key="346">Non se atopou unha etiqueta para este campo.</entry>
- <entry key="347">Precisase autorización do administrador</entry>
<entry key="348">Editor de idioma.</entry>
<entry key="349">Idioma</entry>
<entry key="350">ID da etiqueta</entry>
@@ -370,8 +352,6 @@
<entry key="354">Nome da etiqueta</entry>
<entry key="355">Valor da etiqueta</entry>
<entry key="356">ID da etiqueta</entry>
- <entry key="357">Vostede só eliminou a etiqueta pero NON o campo! Non se pode eliminar un campo, é probábel que existan etiquetas noutros idiomas.</entry>
- <entry key="358">ID de etiqueta incorrecto. O seu FieldLanguagesvalues_Id non se atopou na base de datos.</entry>
<entry key="359">Vostede non pode eliminar este campo, só pode eliminar etiquetas, NON campos. Non hai unha etiqueta cargada polo momento, ou non hai ningún campo seleccionado, ou non é unha etiqueta para este idioma para o campo definido.</entry>
<entry key="360">exportar</entry>
<entry key="361">Precisa pechar a sesión para ver os cambio.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nome</entry>
<entry key="366">engadir un idioma</entry>
<entry key="367">Copia de seguranza</entry>
- <entry key="368">ir ao inicio</entry>
- <entry key="369">ir á anterior</entry>
- <entry key="370">ir á seguinte</entry>
- <entry key="371">ir ao final</entry>
<entry key="372">o usuario fala (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">acender ou apagar o son</entry>
<entry key="374">Sistema</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Usuarios na sala:</entry>
<entry key="402">actualizar</entry>
- <entry key="403">A sala está chea, por favor tenteo nuns minutos.</entry>
<entry key="404">prema nunha sala para ver os detalles</entry>
<entry key="405">Conversar cos usuarios desta sala:</entry>
<entry key="406">Sala:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Válido desde:</entry>
<entry key="531">Válido até:</entry>
<entry key="532">Convite a {0}</entry>
- <entry key="533">Non existe un convite dispoñíbel para este código.</entry>
- <entry key="534">Este convite xa foi usado e non pode utilizarse de novo.</entry>
- <entry key="535">O código do convite é incorrecto. O convite ao través de ligazón ten validez só no momento da xuntanza! vostede non pode acceder á sala antes ou despois da reunión a través desa ligazón!</entry>
<entry key="536">Contrasinal:</entry>
<entry key="537">Verificar o contrasinal</entry>
- <entry key="538">Contrasinal incorrecto!</entry>
<entry key="539">Navegador</entry>
<entry key="540">Sincronizar son/vídeo</entry>
<entry key="541">O acceso é correcto, pero a sesión non está activa ou gardada no servidor.Vostede ten que conseguir un novo identificador de sesión e volver a acceder.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Engadir ou eliminar usuarios ou salas na súa organización</entry>
<entry key="661">Desexa elmininar este rexistro?</entry>
<entry key="662">Relmente desexa eliminar este usuario da súa organización? Só eliminará a relación entre o usuario e a organización, para eliminar definitivamente ao usuario ten que entrar no menú de administración.</entry>
- <entry key="663">Non pode eliminar o seu propio usuario!</entry>
- <entry key="664">Para usar este método precisa dunha conta de administrador!</entry>
- <entry key="665">Non hai unha sesión asociada con este ID.</entry>
- <entry key="666">Esta é unha conta de administrador ou moderador. Só pode editar esta conta a través do panel de administración.</entry>
<entry key="667">Para completar o seu rexistro, por favor prema na seguinte ligazón. Ou copie o URL na barra de navegación do seu navegador.</entry>
<entry key="668">Prema para verificar o seu correo-e</entry>
<entry key="669">Non se atopou un usuario para este Hash.</entry>
<entry key="670">Este usuario xa está activado!</entry>
<entry key="671">A súa conta foi activada satisfactoriamente!</entry>
<entry key="672">Iniciar sesión agora</entry>
- <entry key="673">A súa conta non está activada. Antes use a ligazón do correo-e que recebiu durante o rexistro.</entry>
- <entry key="674">Rexistrouse correctamente. Enviamoslle un correo-e cun código de verificación. Por favor, comprobe a súa bandexa de entrada de correo.</entry>
<entry key="675">Eliminar o rol de moderador deste usuario</entry>
<entry key="676">Dar dereitos de moderador a este usuario</entry>
<entry key="677">Usuario</entry>
@@ -794,7 +759,6 @@
<entry key="784">Solicitar a moderación</entry>
<entry key="785">Solicitar acceso ao taboleiro</entry>
<entry key="786">Solicitar acceso á cámara/micrófono</entry>
- <entry key="787">A autenticación Hash desta sesión xa foi usada. Non pode facerse dúas veces.</entry>
<entry key="788">INICIAR</entry>
<entry key="789">SAÍR</entry>
<entry key="790">Ten a certeza de que desexa saír? Sería convinte que antes limpe os documentos cargados, o taboleiro e o historial de conversas.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Planificar</entry>
<entry key="806">Para planificar unha conferencia, engada un novo evento no calendario. Para cada evento crearase automaticamente unha sala. Vostede e o resto de asistentes recibirán un correo-e cunha ligazón á sala.<br/><br/>Pode escoller entre diferentes tipos de salas con diferentes deseños e sistemas de moderación. Tamén pode escoller entre diferentes tipos de notificación de correo-e que se envíen en cada evento do calendario.</entry>
<entry key="807">Necesita axuda?</entry>
- <entry key="808">Restrinxido</entry>
<entry key="809">Buscar</entry>
<entry key="810">Engadir</entry>
<entry key="811">Non hai ningún usuario seleccionado. Seleccione primero un ítem da lista e prema en Engadir.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Erro descoñecido. Informe ao administradores.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">A ferramenta de rexistro está desactivada.</entry>
+ <entry key="error.login.inuse">Este nome de usuario xa existe</entry>
+ <entry key="error.email.inuse">Este correo-e xa está rexistrado</entry>
+ <entry key="error.notallowed">Precisase autorización do administrador</entry>
+ <entry key="error.hash.used">Este convite xa foi usado e non pode utilizarse de novo.</entry>
+ <entry key="error.hash.invalid">O código do convite é incorrecto. O convite ao través de ligazón ten validez só no momento da xuntanza! vostede non pode acceder á sala antes ou despois da reunión a través desa ligazón!</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Contrasinal incorrecto!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">A súa conta non está activada. Antes use a ligazón do correo-e que recebiu durante o rexistro.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">O usuario foi engadido, máis deberá engadilo a unha organización, ou non poderá conectarse.</entry>
+ <entry key="warn.notverified">Rexistrouse correctamente. Enviamoslle un correo-e cun código de verificación. Por favor, comprobe a súa bandexa de entrada de correo.</entry>
+ <entry key="account.created">A súa conta foi creada, a partires deste momento xa pode iniciar unha sesión</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Sr.</entry>
- <entry key="user.salutation.ms">Sra.</entry>
- <entry key="user.salutation.mrs">Dna.</entry>
- <entry key="user.salutation.dr">D.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Erro</entry>
- <entry key="error.type.info">Mensaxe</entry>
- <entry key="poll.type.yesNo">Sí/Non</entry>
- <entry key="poll.type.numeric">Valor numérico 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Sr.</entry>
+ <entry key="user.salutation.ms">Sra.</entry>
+ <entry key="user.salutation.mrs">Dna.</entry>
+ <entry key="user.salutation.dr">D.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Erro</entry>
+ <entry key="error.type.info">Mensaxe</entry>
+ <entry key="poll.type.yesNo">Sí/Non</entry>
+ <entry key="poll.type.numeric">Valor numérico 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Descargar como PDF</entry>
<entry key="zoom.fullFit">Pantalla completa</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">ir ao inicio</entry>
+ <entry key="goto.prev">ir á anterior</entry>
+ <entry key="goto.next">ir á seguinte</entry>
+ <entry key="goto.last">ir ao final</entry>
</properties>
[04/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 04e561e..1ecc187 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
@@ -120,11 +120,6 @@
<entry key="100">Ellips</entry>
<entry key="101">Stäng</entry>
<entry key="102">Fel data angivet</entry>
- <entry key="103">Användarnamnet måste innehålla minst 4 tecken</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Användarnamnet är redan använt</entry>
- <entry key="106">Denna epost är redan använd</entry>
- <entry key="107">Systemfel, kontakta systemadmin</entry>
<entry key="108">Login</entry>
<entry key="109">Användare:</entry>
<entry key="110">Lösen:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Fel e-postadress</entry>
<entry key="234">Du har angett en ogiltig e-postadress</entry>
<entry key="235">Registrering klar</entry>
- <entry key="236">Ditt konto är skapat. Du kan logga in.</entry>
<entry key="237">Du kan inte dela din skärm just nu. Någon annan delar sin skärm.</entry>
<entry key="238">Delning förbjuden</entry>
<entry key="239">Dela skärm</entry>
@@ -291,7 +285,6 @@
<entry key="273">Användare</entry>
<entry key="274">radera användare från organisationen</entry>
<entry key="275">radera</entry>
- <entry key="276">Den här användaren är redan medlem av den här organisationen.</entry>
<entry key="277">Nyheter</entry>
<entry key="278">Snabblänkar</entry>
<entry key="279">Gå till Konferens</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 eller mer tecken; versalisering inverkar!</entry>
<entry key="332">Lösenord valt. Du kan logga in nu.</entry>
<entry key="333">OK</entry>
- <entry key="334">Okänt Fel. Var vänlig rapportera detta till ditt Service-Team.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Ogiltigt Lösenord.</entry>
<entry key="337">Utloggning Lyckades.</entry>
- <entry key="338">Registrering via gränssnittet är Inaktiverat.</entry>
- <entry key="339">Ogiltig Epostadress.</entry>
- <entry key="340">Duplikat filnamn, var vänlig välj ett annat filnamn.</entry>
- <entry key="341">Filnamnet är för kort.</entry>
- <entry key="342">Kunde inte spara Adressen.</entry>
- <entry key="343">Användare tillagd, men du måste tilldela honom en Organisation för att kunna logga in.</entry>
<entry key="344">Nytt Record</entry>
- <entry key="345">Inget fält med detta FältId hittades.</entry>
- <entry key="346">Ingen Etikett hittades för det Fältet.</entry>
- <entry key="347">Admin Auktorisering krävs.</entry>
<entry key="348">Språk-Editor</entry>
<entry key="349">Språk</entry>
<entry key="350">Etikett-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">EtikettNamn</entry>
<entry key="355">EtikettVärde</entry>
<entry key="356">Etikett-ID</entry>
- <entry key="357">Du raderade endast Etiketten, INTE Fältet! Du kan inte radera Fältet, det innehåller kanske Etiketter på andra Språk.</entry>
- <entry key="358">Ogiltig Etikett-ID. FieldLanguagesvalues_Id kan inte hittas i databasen.</entry>
<entry key="359">Du kan inte radera det här Fältet. Du kan endast radera Etiketter, INTE Fält. För tillfället är ingen Etikett laddad, detta kan bero på att ingen Etikett är vald eller för att inga Etiketter är definierade för det här fältet och språket.</entry>
<entry key="360">Exportera</entry>
<entry key="361">Du måste logga ut för att se ändringar.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Namn</entry>
<entry key="366">Lägg till språk</entry>
<entry key="367">Säkerhetskopia</entry>
- <entry key="368">Gå till första</entry>
- <entry key="369">Gå till föregående</entry>
- <entry key="370">Gå till nästa</entry>
- <entry key="371">Gå till sista</entry>
<entry key="372">Användare talar (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">Sätt på/av ljudet</entry>
<entry key="374">System</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Användare i det här rummet:</entry>
<entry key="402">Uppdatera</entry>
- <entry key="403">Det här rummet är fullt. Försök igenom om någon minut.</entry>
<entry key="404">Klicka på ett rum för att få mera detaljer</entry>
<entry key="405">Chatta med användarna i det här rummet:</entry>
<entry key="406">Rum:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Giltig från och med:</entry>
<entry key="531">Giltig till:</entry>
<entry key="532">Inbjudan till {0}</entry>
- <entry key="533">Ingen inbjudan tillgänglig med den här Inbjudningskoden.</entry>
- <entry key="534">Inbjudan användes redan. Den här typen av inbjudningar kan inte återanvändas.</entry>
- <entry key="535">Inbjudningskoden är inte giltig.</entry>
<entry key="536">Lösenord:</entry>
<entry key="537">Kontrollera Lösenord</entry>
- <entry key="538">Ogiltigt Lösenord!</entry>
<entry key="539">Webbläsare</entry>
<entry key="540">Synkronisera Ljud/Video</entry>
<entry key="541">Inloggningen var korrekt, men sessionen är inte längre aktiv eller lagrad på servern. Försök att logga in igen efter att du fått ett nytt SessionId.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Lägg till eller ta bort Användare eller Rum inom din Organisation</entry>
<entry key="661">Vill du verkligen ta bort det här?</entry>
<entry key="662">Vill du verkligen ta bort den här Användaren från Organisationen? Du kommer endast att ta bort kopplingen mellan Användaren och Organisationen, för att ta bort själva Användaren så måste du logga in på Administrationspanelen.</entry>
- <entry key="663">Du kan inte ta bort din egen Användare!</entry>
- <entry key="664">Den här Metoden kräver ett Administrationskonto för att kunna åberopas!</entry>
- <entry key="665">Det finns ingen Session associerad med detta ID.</entry>
- <entry key="666">Det här är ett Administratörs- eller Moderatorkonto. Du kan endast ändra det här kontot via Administratörspanelen.</entry>
<entry key="667">Var vänlig klicka på följande länk eller klistra in den i din webbläsares adressfält för att slutföra registreringen.</entry>
<entry key="668">Klicka här för att verifiera din E-postadress</entry>
<entry key="669">Ingen Användare hittades med detta Hash.</entry>
<entry key="670">Den här Användaren är redan aktiverad!</entry>
<entry key="671">Du har aktiverat ditt konto!</entry>
<entry key="672">Logga in nu</entry>
- <entry key="673">Ditt konto är inte aktiverat. Använd länken i det e-postmeddelande du fick när du registrerade dig.</entry>
- <entry key="674">Du har framgångsrikt registrerat dig. Vi har skickat ett e-postmeddelande till dig med din verifikationskod. Vänligen kolla din Inkorg.</entry>
<entry key="675">Ta bort den här användaren som Moderator</entry>
<entry key="676">Bevilja Moderator-rättigheter till den här Användaren</entry>
<entry key="677">Användare</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Okänt Fel. Var vänlig rapportera detta till ditt Service-Team.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registrering via gränssnittet är Inaktiverat.</entry>
+ <entry key="error.login.inuse">Användarnamnet är redan använt</entry>
+ <entry key="error.email.inuse">Denna epost är redan använd</entry>
+ <entry key="error.notallowed">Admin Auktorisering krävs.</entry>
+ <entry key="error.hash.used">Inbjudan användes redan. Den här typen av inbjudningar kan inte återanvändas.</entry>
+ <entry key="error.hash.invalid">Inbjudningskoden är inte giltig.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Ogiltigt Lösenord!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Ditt konto är inte aktiverat. Använd länken i det e-postmeddelande du fick när du registrerade dig.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Användare tillagd, men du måste tilldela honom en Organisation för att kunna logga in.</entry>
+ <entry key="warn.notverified">Du har framgångsrikt registrerat dig. Vi har skickat ett e-postmeddelande till dig med din verifikationskod. Vänligen kolla din Inkorg.</entry>
+ <entry key="account.created">Ditt konto är skapat. Du kan logga in.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">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>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Ladda ner som PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">Gå till första</entry>
+ <entry key="goto.prev">Gå till föregående</entry>
+ <entry key="goto.next">Gå till nästa</entry>
+ <entry key="goto.last">Gå till sista</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/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 5a12cd3..765975f 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
@@ -120,11 +120,6 @@
<entry key="100">วงรี</entry>
<entry key="101">ปิด</entry>
<entry key="102">ข้อมูลที่กรอกขัดข้อง</entry>
- <entry key="103">ตัวอักษร 4 ตัวขึ้นไป อักษรตัวใหญ่มีผลสำคัญ</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">มีผู้ใช้ชื่อนี้ไปแล้ว</entry>
- <entry key="106">อีเมล์นี้ลงทะเบียนไปแล้ว</entry>
- <entry key="107">ระบบขัดข้อง โปรดติดต่อผู้ดูแลระบบ</entry>
<entry key="108">ล็อคอิน</entry>
<entry key="109">ผู้ใช้:</entry>
<entry key="110">รหัสผ่าน:</entry>
@@ -253,7 +248,6 @@
<entry key="233">อีเมล์ผิด</entry>
<entry key="234">อีเมล์ที่คุณกรอกไม่ถูกต้อง</entry>
<entry key="235">การลงทะเบียนเสร็จสมบูรณ์</entry>
- <entry key="236">จัดทำบัญชีของคุณเสร็จเรียบร้อยแล้ว คุณสามารถล็อคอินได้แล้ว</entry>
<entry key="237">คุณไม่สามารถแชร์หน้าจอได้ในขณะนี้ มีใครบางคนแชร์หน้าจอไปแล้ว</entry>
<entry key="238">ห้ามแชร์</entry>
<entry key="239">แชร์หน้าจอ</entry>
@@ -291,7 +285,6 @@
<entry key="273">ผู้ใช้</entry>
<entry key="274">ลบผู้ใช้ออกจากองค์กร</entry>
<entry key="275">ลบ</entry>
- <entry key="276">ผู้ใช้รายนี้เป็นสมาชิกขององค์กรนี้อยู่แล้ว</entry>
<entry key="277">ข่าวสาร</entry>
<entry key="278">ควิกลิงค์</entry>
<entry key="279">ไปยังการประชุม</entry>
@@ -347,20 +340,9 @@
<entry key="331">ตัวอักษร 4 ตัวขึ้นไป อักษรตัวใหญ่มีผลสำคัญ</entry>
<entry key="332">ตั้งรหัสผ่านแล้ว คุณสามารถล็อคอินได้แล้ว</entry>
<entry key="333">ตกลง</entry>
- <entry key="334">ขัดข้องโดยไม่ทราบสาเหตุ โปรดรายงานต่อทีมบริการของคุณ</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">รหัสผ่านไม่ถูกต้อง</entry>
<entry key="337">ออกจากระบบเรียบร้อยแล้ว</entry>
- <entry key="338">การลงทะเบียนถูกยกเลิกแล้ว</entry>
- <entry key="339">อีเมล์ไม่ถูกต้อง</entry>
- <entry key="340">ชื่อไฟล์ซ้ำ โปรดเลือกชื่อไฟล์อื่น</entry>
- <entry key="341">ชื่อไฟล์สั้นเกินไป</entry>
- <entry key="342">บันทึกที่อยู่ไม่ได้</entry>
- <entry key="343">เพิ่มผู้ใช้แล้ว แต่คุณต้องมอบหมายผู้ใช้รายนี้ให้แก่องค์กรใดองค์กรหนึ่ง มิฉะนั้นเขาจะไม่สามารถลงชื่อเข้าใช้ได้</entry>
<entry key="344">บันทึกใหม่</entry>
- <entry key="345">ไม่พบฟิลด์ที่มาพร้อมกับหมายเลขฟิลด์นี้</entry>
- <entry key="346">ไม่พบป้ายชื่อสำหรับฟิลด์นั้น</entry>
- <entry key="347">ต้องใช้การอนุญาตจากผู้ดูแล</entry>
<entry key="348">โปรแกรมแก้ไขภาษา</entry>
<entry key="349">ภาษา</entry>
<entry key="350">หมายเลขประจำป้าย</entry>
@@ -370,8 +352,6 @@
<entry key="354">ป้ายชื่อ</entry>
<entry key="355">ค่าป้าย</entry>
<entry key="356">หมายเลขประจำป้าย</entry>
- <entry key="357">คุณลบแต่ป้ายเท่านั้น ไม่ได้ลบฟิลด์! คุณลบฟิลด์ไม่ได้ อาจเป็นเพราะว่าฟิลด์มีป้ายเป็นภาษาอื่น</entry>
- <entry key="358">หมายเลขประจำป้ายไม่ถูกต้อง ไม่พบหมายเลขประจำค่าภาษาของฟิลด์นั้นในฐานข้อมูล</entry>
<entry key="359">คุณลบฟิลด์นี้ไม่ได้ คุณลบได้แต่เพียงป้ายเท่านั้น ลบฟิลด์ไม่ได้ ไม่มีการโหลดป้ายในขณะนี้ อาจเป็นเพราะว่าไม่ได้เลือกฟิลด์ใดเลยหรือว่าไม่มีป้ายสำหรับภาษานี้สำหรับฟิลด์ที่กำหนด</entry>
<entry key="360">เอ็กซ์พอร์ต</entry>
<entry key="361">คุณจะต้องออกจากระบบก่อน จึงจะเห็นการเปลี่ยนแปลง</entry>
@@ -381,10 +361,6 @@
<entry key="365">ชื่อ</entry>
<entry key="366">เพิ่มภาษา</entry>
<entry key="367">สำรองข้อมูล</entry>
- <entry key="368">ไปยังหน้าแรก</entry>
- <entry key="369">ไปยังหน้าก่อนนี้</entry>
- <entry key="370">ไปยังหน้าถัดไป</entry>
- <entry key="371">ไปยังหน้าสุดท้าย</entry>
<entry key="372">ผู้ใช้พูด (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">เปิด/ปิดเสียง</entry>
<entry key="374">ระบบ</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">ผู้ใช้ในห้องนี้:</entry>
<entry key="402">รีเฟรช</entry>
- <entry key="403">ห้องนี้เต็มแล้ว อีกสักครู่โปรดลองใหม่</entry>
<entry key="404">คลิกที่ห้องเพื่อดูรายละเอียด</entry>
<entry key="405">แชทกับผู้ใช้ในห้องนี้</entry>
<entry key="406">ห้อง:</entry>
@@ -546,12 +521,8 @@
<entry key="530">ใช้งานได้ตั้งแต่:</entry>
<entry key="531">ถึง:</entry>
<entry key="532">คำเชิญเข้าสู่การประชุมแบบเปิด</entry>
- <entry key="533">ไม่มีคำเชิญสำหรับรหัสคำเชิญนี้</entry>
- <entry key="534">คำเชิญนี้ใช้ไปแล้ว คำเชิญประเภทนี้ไม่สามารถใช้ซ้ำได้</entry>
- <entry key="535">รหัสคำเชิญนี้ไม่ถูกต้อง</entry>
<entry key="536">รหัสผ่าน:</entry>
<entry key="537">ตรวจสอบรหัสผ่าน</entry>
- <entry key="538">รหัสผ่านไม่ถูกต้อง!</entry>
<entry key="539">เสียง_ภาพวีดีโอ</entry>
<entry key="540">ซิงค์โครไนซ์เสียง/ภาพวีดีโอ</entry>
<entry key="541">ล็อคอินถูกต้อง แต่หมวดที่คุณล็อกอินนั้นไม่ได้ใช้งานอยู่หรือไม่ได้จัดเก็บไว้ในเซิร์ฟเวอร์ คุณจะต้องขอหมายเลขประจำหมวดใหม่และลองล็อกอินอีกครั้ง</entry>
@@ -671,18 +642,12 @@
<entry key="660">Add or delete Users or Rooms within your Organization</entry>
<entry key="661">Do you really want to delete this record?</entry>
<entry key="662">Do you really want to delete this user from your organization? You will only delete the connection between the user and your organization, to really delete the user itself you have to login into the Administration-Panel.</entry>
- <entry key="663">You cannot delete your own User!</entry>
- <entry key="664">This Method needs a Adminstration Account to be invoked!</entry>
- <entry key="665">There was no Session associated with this ID.</entry>
- <entry key="666">This is an Administrator or Moderator account. You can only edit this account through the Administration Panel.</entry>
<entry key="667">To complete your registration please click on the following link. Or copy the URL to your browser bar.</entry>
<entry key="668">Click to verify your E-Mail</entry>
<entry key="669">No user was found for this Hash.</entry>
<entry key="670">This user is already activated!</entry>
<entry key="671">You did successfully activate your account!</entry>
<entry key="672">Login Now</entry>
- <entry key="673">Your account is not activated. First use the link in the Email you've received during registration.</entry>
- <entry key="674">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
<entry key="675">Remove Moderation Role from this User</entry>
<entry key="676">Grant Moderation Rights to this User</entry>
<entry key="677">User</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">ขัดข้องโดยไม่ทราบสาเหตุ โปรดรายงานต่อทีมบริการของคุณ</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">การลงทะเบียนถูกยกเลิกแล้ว</entry>
+ <entry key="error.login.inuse">มีผู้ใช้ชื่อนี้ไปแล้ว</entry>
+ <entry key="error.email.inuse">อีเมล์นี้ลงทะเบียนไปแล้ว</entry>
+ <entry key="error.notallowed">ต้องใช้การอนุญาตจากผู้ดูแล</entry>
+ <entry key="error.hash.used">คำเชิญนี้ใช้ไปแล้ว คำเชิญประเภทนี้ไม่สามารถใช้ซ้ำได้</entry>
+ <entry key="error.hash.invalid">รหัสคำเชิญนี้ไม่ถูกต้อง</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">รหัสผ่านไม่ถูกต้อง!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. First use the link in the Email you've received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">เพิ่มผู้ใช้แล้ว แต่คุณต้องมอบหมายผู้ใช้รายนี้ให้แก่องค์กรใดองค์กรหนึ่ง มิฉะนั้นเขาจะไม่สามารถลงชื่อเข้าใช้ได้</entry>
+ <entry key="warn.notverified">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
+ <entry key="account.created">จัดทำบัญชีของคุณเสร็จเรียบร้อยแล้ว คุณสามารถล็อคอินได้แล้ว</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">นาย</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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">นาย</entry>
+ <entry key="user.salutation.ms">นางสาว</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">ขัดข้อง</entry>
+ <entry key="error.type.info">ข้อความ</entry>
+ <entry key="poll.type.yesNo">ใช่/ไม่</entry>
+ <entry key="poll.type.numeric">เลข 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">ดาวน์โหลดเป็น PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">ไปยังหน้าแรก</entry>
+ <entry key="goto.prev">ไปยังหน้าก่อนนี้</entry>
+ <entry key="goto.next">ไปยังหน้าถัดไป</entry>
+ <entry key="goto.last">ไปยังหน้าสุดท้าย</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_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 d7f085f..22f470a 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
@@ -120,11 +120,6 @@
<entry key="100">Elips</entry>
<entry key="101">kapat</entry>
<entry key="102">veri giriş hatası</entry>
- <entry key="103">4 ya da daha fazla karakter; büyük-küçük harfe duyarlı!</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Bu kullanıcı adı alınmış</entry>
- <entry key="106">Bu e-posta adresi zaten kayıtlı</entry>
- <entry key="107">Sistem hatası. Lütfen sistem yöneticileri ile bağlantıya geçiniz.</entry>
<entry key="108">Oturum Aç</entry>
<entry key="109">Kullanıcı Adı:</entry>
<entry key="110">Şifre:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Hatalı E-posta</entry>
<entry key="234">Hatalı bir e-posta adresi girdiniz</entry>
<entry key="235">Kayıt Başarılı</entry>
- <entry key="236">Hesabınız oluşturuldu, oturum açabilirsiniz.</entry>
<entry key="237">Şu anda ekranınızı paylaşamazsınız. Başka biri hâlihazırda ekranı paylaşmış.</entry>
<entry key="238">Paylaşıma izin yok</entry>
<entry key="239">Ekranı Paylaş</entry>
@@ -291,7 +285,6 @@
<entry key="273">Kullanıcılar</entry>
<entry key="274">kullanıcıyı kurumdan sil</entry>
<entry key="275">sil</entry>
- <entry key="276">Bu kullanıcı hâlihazırda bu grubun bir üyesi.</entry>
<entry key="277">Haberler</entry>
<entry key="278">Hızlı Bağlantılar</entry>
<entry key="279">Konferansa git</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 ya da daha fazla karakter; büyük-küçük harfe duyarlı!</entry>
<entry key="332">Şİfre belirlendi. Şuan oturum açabilirsiniz.</entry>
<entry key="333">TAMAM</entry>
- <entry key="334">Bilinmeyen Hata. Lütfen bu durumu sistem sorumlusuna rapor ediniz.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Geçersiz Şifre</entry>
<entry key="337">Oturum başarıyla kapatıldı</entry>
- <entry key="338">Geriplan kayıt işlemi devre dışı.</entry>
- <entry key="339">Geçersiz E-posta</entry>
- <entry key="340">yinelenen dosya adı, lütfen farklı bir dosya adu seçiniz</entry>
- <entry key="341">dosya adı çok kısa</entry>
- <entry key="342">Adres kayıt edilemiyor</entry>
- <entry key="343">Kullanıcı eklendi fakat kullanıcıyı bir kuruma atamanız gerekmekte, aksi halde oturum açması mümkün olamayacak.</entry>
<entry key="344">Yeni Kayıt</entry>
- <entry key="345">Bu alan kodu ile bir alan bulunamadı.</entry>
- <entry key="346">Bu alan için etiket bulunamadı.</entry>
- <entry key="347">Yönetici oturumu gerekmektedir</entry>
<entry key="348">Dil Düzenleyicisi</entry>
<entry key="349">Dil</entry>
<entry key="350">Etiket-Kodu</entry>
@@ -370,8 +352,6 @@
<entry key="354">EtiketAdı</entry>
<entry key="355">EtiketDeğeri</entry>
<entry key="356">Etiket-Kodu</entry>
- <entry key="357">Sadece etiketi sildiniz, alanı değil! Alanı silemezsiniz; diğer dillerde etiketleri bulunmakta.</entry>
- <entry key="358">Geçersiz EtiketKodu. Dil alanı değer kodu (FieldLanguagesvalues_Id) veritabanında bulunamıyor.</entry>
<entry key="359">Bu alanı silemezsiniz. Sadece etiketleri silebilirsiniz, alanları değil. Şu anda yüklenmiş olan bir etiket yok, herhangi bir alan seçilmemiş ya da tanımlanmış bu alan için bu dilde etiket yok.</entry>
<entry key="360">ihraç</entry>
<entry key="361">Değişiklikleri görebilmeniz için oturumu kapatmanız gerekmektedir.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Ad</entry>
<entry key="366">dil ekle</entry>
<entry key="367">Yedekleme</entry>
- <entry key="368">ilke git</entry>
- <entry key="369">öncekine git</entry>
- <entry key="370">sonrakine git</entry>
- <entry key="371">sonuncuya git</entry>
<entry key="372">kullanıcı konuşuyor (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">sesi aç/kapa</entry>
<entry key="374">Sistem</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Bu odadaki kullanıcılar:</entry>
<entry key="402">yenile</entry>
- <entry key="403">Bu oda dolu. Bir kaç dakika içinde yeniden deneyiniz.</entry>
<entry key="404">Detaylı bilgi için bir odanın üzerine tıklayınız</entry>
<entry key="405">Bu odanın içindeki kullanıcılar ile sohbet et:</entry>
<entry key="406">Oda:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Oturum başlangıcı:</entry>
<entry key="531">Oturum sonu:</entry>
<entry key="532">{0}'e Davet</entry>
- <entry key="533">Bu davet kodu için geçerli olan bir davet yok.</entry>
- <entry key="534">Bu davet halihazırda kullanılmakta. Bu bip bir davet tekrar kullanılamaz.</entry>
- <entry key="535">Bu davet kodu geçerli değil.</entry>
<entry key="536">Şifre:</entry>
<entry key="537">Şifre Kontrol</entry>
- <entry key="538">Geçersiz Şifre!</entry>
<entry key="539">Ses-Görüntü</entry>
<entry key="540">Ses/Görüntü Senkronizasyonu</entry>
<entry key="541">Kullanıcı adı doğru, fakat girmeye çalıştığınız oturum aktif durumda değil ya da sunucuda depolanmış. Yeni bir oturum kodu almalısınız ve yeniden oturum açmalısınız.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Kullanıcıları Organizasyona ekle veya Organizasyondan sil</entry>
<entry key="661">Bu kaydı silmek istediğinize emin misiniz?</entry>
<entry key="662">Bu kullanıcıyı organizasyondan silmek istediğinize emin misiniz? Bu kullanıcıyı sadece organizasyondan silersiniz. Eğer kullanıcıyı tamamen silmek istiyorsanız Yönetici-Panelinden giriş yapmalısınız.</entry>
- <entry key="663">Kendi kullanıcınızı silemezsiniz!</entry>
- <entry key="664">Bu yöntem Yönetici hakları erişimini gerektirir!</entry>
- <entry key="665">Bu ID ile ilişkilendirilmiş Oturum bulunmamaktadır.</entry>
- <entry key="666">Bu bir Yönetici veya Düzenleyici hesabı. Bu hesabı sadece Yönetici Panelinden düzenleyebilirsiniz.</entry>
<entry key="667">Kaydınızı tamamlamak için lütfen bağlantıyı tıklayın ya da tarayıcı adres çubuğuna kopyalayıp oradan açın.</entry>
<entry key="668">E-Postanızı Onaylamak İçin Tıklayınız</entry>
<entry key="669">Bu Hash bilgisine uyan hiçbir kullanıcı bulunamadı.</entry>
<entry key="670">Bu kullanıcı zaten aktif edildi!</entry>
<entry key="671">Hesabınızı başarıyla aktifleştirdiniz!</entry>
<entry key="672">Giriş Yap</entry>
- <entry key="673">Hesabınız aktifleştirilmedi. Kayıt sırasında vermiş olduğunuz E-Postanıza gelen bağlantıyı tıklayarak aktivasyon işlemini tamamlayınız.</entry>
- <entry key="674">Kaydınız başarıyla tamamlandı. Vermiş olduğunuz e-posta adresinize hesabınızı aktifleştirmek için ileti gönderdik. İletideki bağlantıyı açarak hesabınızı aktifleştirebilirsiniz.</entry>
<entry key="675">Bu Kullanıcının Düzenleyici Yetkisini İptal Et</entry>
<entry key="676">Bu Kullanıcıya Düzenleyici Yetkileri Ver</entry>
<entry key="677">Kullanıcı</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Bilinmeyen Hata. Lütfen bu durumu sistem sorumlusuna rapor ediniz.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Geriplan kayıt işlemi devre dışı.</entry>
+ <entry key="error.login.inuse">Bu kullanıcı adı alınmış</entry>
+ <entry key="error.email.inuse">Bu e-posta adresi zaten kayıtlı</entry>
+ <entry key="error.notallowed">Yönetici oturumu gerekmektedir</entry>
+ <entry key="error.hash.used">Bu davet halihazırda kullanılmakta. Bu bip bir davet tekrar kullanılamaz.</entry>
+ <entry key="error.hash.invalid">Bu davet kodu geçerli değil.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Geçersiz Şifre!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Hesabınız aktifleştirilmedi. Kayıt sırasında vermiş olduğunuz E-Postanıza gelen bağlantıyı tıklayarak aktivasyon işlemini tamamlayınız.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Kullanıcı eklendi fakat kullanıcıyı bir kuruma atamanız gerekmekte, aksi halde oturum açması mümkün olamayacak.</entry>
+ <entry key="warn.notverified">Kaydınız başarıyla tamamlandı. Vermiş olduğunuz e-posta adresinize hesabınızı aktifleştirmek için ileti gönderdik. İletideki bağlantıyı açarak hesabınızı aktifleştirebilirsiniz.</entry>
+ <entry key="account.created">Hesabınız oluşturuldu, oturum açabilirsiniz.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">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>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">PDF Olarak Yükle</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">ilke git</entry>
+ <entry key="goto.prev">öncekine git</entry>
+ <entry key="goto.next">sonrakine git</entry>
+ <entry key="goto.last">sonuncuya git</entry>
</properties>
[12/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
[OPENMEETINGS-1682] restricted type renamed, code clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d2a8e400
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d2a8e400
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d2a8e400
Branch: refs/heads/master
Commit: d2a8e400355b89cb2476793d6329512a3b44eb22
Parents: e2b0ddd
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Aug 17 12:39:35 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Aug 17 12:39:35 2017 +0700
----------------------------------------------------------------------
.../documents/LibraryDocumentConverter.java | 71 ----
.../core/ldap/LdapLoginManagement.java | 14 +-
.../openmeetings/core/remote/MainService.java | 2 +-
.../openmeetings/core/remote/MobileService.java | 19 +-
.../org/apache/openmeetings/IApplication.java | 3 +-
.../openmeetings/db/dao/basic/ErrorDao.java | 86 ----
.../openmeetings/db/dao/label/LabelDao.java | 16 -
.../db/dao/room/IInvitationManager.java | 14 +-
.../openmeetings/db/dao/user/IUserManager.java | 10 +-
.../openmeetings/db/dao/user/UserDao.java | 4 +-
.../openmeetings/db/dto/basic/SearchResult.java | 22 +-
.../db/dto/basic/ServiceResult.java | 24 +-
.../db/dto/room/RoomSearchResult.java | 12 +-
.../db/dto/user/UserSearchResult.java | 13 +-
.../db/entity/basic/ErrorValue.java | 116 ------
.../openmeetings/db/entity/room/Room.java | 9 +-
.../openmeetings/db/entity/user/Userdata.java | 126 ------
.../installation/ImportInitvalues.java | 61 +--
openmeetings-server/pom.xml | 3 +-
.../src/site/stylesheets/errortable.xsl | 6 +-
.../src/site/stylesheets/errorvalues.xml | 86 ++++
.../src/site/stylesheets/errorvalues.xsd | 41 ++
.../src/site/xdoc/ManualTesting.xml | 15 +-
.../service/calendar/AppointmentLogic.java | 2 +-
.../openmeetings/service/mail/EmailManager.java | 11 +-
.../service/room/InvitationManager.java | 68 ----
.../openmeetings/service/user/UserManager.java | 130 +-----
.../apache/openmeetings/util/OmException.java | 22 +-
.../apache/openmeetings/util/OmFileHelper.java | 1 -
.../openmeetings/web/admin/AdminSavePanel.java | 2 +-
.../web/admin/backup/BackupPanel.java | 2 +-
.../web/admin/configurations/ConfigForm.java | 6 +-
.../web/admin/labels/AddLanguageDialog.java | 4 +-
.../openmeetings/web/admin/ldaps/LdapForm.java | 4 +-
.../openmeetings/web/admin/oauth/OAuthForm.java | 26 +-
.../openmeetings/web/admin/rooms/RoomForm.java | 6 +-
.../openmeetings/web/admin/users/UserForm.java | 9 +-
.../web/admin/users/UsersPanel.java | 2 +-
.../openmeetings/web/app/Application.java | 25 +-
.../web/app/Application.properties.xml | 121 +++---
.../web/app/Application_ar.properties.xml | 121 +++---
.../web/app/Application_bg.properties.xml | 121 +++---
.../web/app/Application_ca.properties.xml | 121 +++---
.../web/app/Application_cs.properties.xml | 121 +++---
.../web/app/Application_da.properties.xml | 121 +++---
.../web/app/Application_de.properties.xml | 87 ++---
.../web/app/Application_el.properties.xml | 121 +++---
.../web/app/Application_es.properties.xml | 121 +++---
.../web/app/Application_fa.properties.xml | 121 +++---
.../web/app/Application_fi.properties.xml | 121 +++---
.../web/app/Application_fr.properties.xml | 179 ++++-----
.../web/app/Application_gl.properties.xml | 121 +++---
.../web/app/Application_hu.properties.xml | 121 +++---
.../web/app/Application_id.properties.xml | 120 +++---
.../web/app/Application_it.properties.xml | 125 +++---
.../web/app/Application_ja.properties.xml | 121 +++---
.../web/app/Application_ko.properties.xml | 121 +++---
.../web/app/Application_nl.properties.xml | 121 +++---
.../web/app/Application_pl.properties.xml | 121 +++---
.../web/app/Application_pt.properties.xml | 121 +++---
.../web/app/Application_pt_BR.properties.xml | 121 +++---
.../web/app/Application_ru.properties.xml | 121 +++---
.../web/app/Application_sk.properties.xml | 121 +++---
.../web/app/Application_sv.properties.xml | 121 +++---
.../web/app/Application_th.properties.xml | 121 +++---
.../web/app/Application_tr.properties.xml | 121 +++---
.../web/app/Application_uk.properties.xml | 107 ++---
.../web/app/Application_zh_CN.properties.xml | 121 +++---
.../web/app/Application_zh_TW.properties.xml | 121 +++---
.../web/app/LabelResourceLoader.java | 14 +-
.../apache/openmeetings/web/app/WebSession.java | 2 +-
.../web/common/GeneralUserForm.java | 4 +-
.../web/common/InvitationDialog.java | 12 +-
.../openmeetings/web/common/InvitationForm.java | 6 +-
.../openmeetings/web/common/NameDialog.java | 2 +-
.../openmeetings/web/common/UserPanel.java | 4 +-
.../web/common/tree/ConvertingErrorsDialog.java | 4 +-
.../web/common/tree/OmTreeProvider.java | 8 +-
.../apache/openmeetings/web/pages/HashPage.java | 4 +-
.../web/pages/InvitationPasswordDialog.java | 8 +-
.../web/pages/auth/ForgetPasswordDialog.java | 14 +-
.../web/pages/auth/RegisterDialog.java | 20 +-
.../web/pages/auth/ResetPasswordDialog.java | 4 +-
.../web/pages/auth/SignInDialog.java | 15 +-
.../web/room/ExpiredMessageDialog.java | 2 +-
.../openmeetings/web/room/NicknameDialog.java | 12 +-
.../web/room/RedirectMessageDialog.java | 2 +-
.../apache/openmeetings/web/room/RoomPanel.java | 4 +-
.../web/room/menu/RoomInvitationForm.java | 2 +-
.../web/room/menu/RoomMenuPanel.java | 26 +-
.../web/room/menu/SipDialerDialog.java | 4 +-
.../web/room/menu/StartSharingButton.java | 22 +-
.../web/room/poll/CreatePollDialog.java | 10 +-
.../web/room/poll/PollResultsDialog.java | 20 +-
.../openmeetings/web/room/poll/VoteDialog.java | 8 +-
.../web/room/sidebar/RoomSidebar.java | 2 +-
.../web/room/sidebar/UploadDialog.java | 6 +-
.../openmeetings/web/user/AboutDialog.java | 2 +-
.../web/user/InviteUserMessageDialog.java | 6 +-
.../web/user/InviteUserToRoomDialog.java | 22 +-
.../openmeetings/web/user/MessageDialog.java | 14 +-
.../openmeetings/web/user/UserInfoDialog.java | 18 +-
.../web/user/calendar/AppointmentDialog.java | 18 +-
.../web/user/calendar/CalendarDialog.java | 14 +-
.../web/user/calendar/CalendarPanel.java | 24 +-
.../apache/openmeetings/web/user/chat/Chat.java | 6 +-
.../web/user/dashboard/MyRoomsWidget.java | 6 +-
.../user/dashboard/MyRoomsWidgetDescriptor.java | 4 +-
.../web/user/dashboard/RssWidget.java | 6 +-
.../web/user/dashboard/RssWidgetDescriptor.java | 4 +-
.../web/user/dashboard/WelcomeWidget.java | 6 +-
.../user/dashboard/WelcomeWidgetDescriptor.java | 4 +-
.../web/user/profile/ChangePasswordDialog.java | 2 +-
.../web/user/profile/MessagesContactsPanel.java | 26 +-
.../web/user/profile/SettingsPanel.java | 10 +-
.../web/user/profile/UserProfilePanel.java | 2 +-
.../web/user/record/RecordingsPanel.java | 2 +-
.../openmeetings/web/user/rooms/RoomsPanel.java | 2 +-
.../web/user/rooms/RoomsSelectorPanel.java | 16 +-
.../web/user/rooms/RoomsTabbedPanel.java | 4 +-
.../openmeetings/web/util/ContactsHelper.java | 16 +-
.../classes/META-INF/db2_persistence.xml | 2 -
.../classes/META-INF/derby_persistence.xml | 2 -
.../classes/META-INF/mssql_persistence.xml | 2 -
.../classes/META-INF/mysql_persistence.xml | 2 -
.../classes/META-INF/oracle_persistence.xml | 2 -
.../classes/META-INF/postgresql_persistence.xml | 2 -
.../WEB-INF/classes/applicationContext.xml | 1 -
.../src/main/webapp/languages/errorvalues.xml | 391 -------------------
.../src/main/webapp/languages/errorvalues.xsd | 41 --
.../test/selenium/AbstractTestDefaults.java | 4 +-
.../openmeetings/test/selenium/TestSignUp.java | 21 +-
.../openmeetings/test/smoke/TestSmokeBasic.java | 6 +-
.../openmeetings/test/user/TestUserGroup.java | 2 +-
.../test/webservice/TestCalendarService.java | 2 +-
.../test/webservice/TestGroupService.java | 4 +-
.../test/webservice/TestRoomService.java | 4 +-
.../webservice/CalendarWebService.java | 19 +-
.../webservice/ErrorWebService.java | 27 +-
.../openmeetings/webservice/FileWebService.java | 16 +-
.../webservice/GroupWebService.java | 16 +-
.../webservice/RecordingWebService.java | 2 +-
.../openmeetings/webservice/RoomWebService.java | 37 +-
.../openmeetings/webservice/UserWebService.java | 33 +-
.../webservice/error/ServiceException.java | 3 +
145 files changed, 2025 insertions(+), 3827 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
deleted file mode 100644
index e4af1e2..0000000
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryDocumentConverter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.core.documents;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_WML;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-
-import org.apache.openmeetings.util.OmFileHelper;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.XppDriver;
-
-public class LibraryDocumentConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(LibraryDocumentConverter.class, webAppRootKey);
-
- public static String writeToLocalFolder(String fileName, @SuppressWarnings("rawtypes")ArrayList objList) {
- try {
- log.debug("filePath: " + OmFileHelper.getUploadWmlDir().getCanonicalPath());
-
- File file = new File(OmFileHelper.getUploadWmlDir(), OmFileHelper.getName(fileName, EXTENSION_WML));
-
- if (file.exists()){
- return "-20";
- }
-
- XStream xStream = new XStream(new XppDriver());
- xStream.setMode(XStream.NO_REFERENCES);
- String xmlString = xStream.toXML(objList);
-
- log.debug("Write to " + file);
-
- try (OutputStream os = new FileOutputStream(file);
- Writer out = new OutputStreamWriter(os, UTF_8))
- {
- out.write(xmlString);
- out.flush();
- }
- return file.getCanonicalPath();
- } catch (Exception err){
- log.error("writeToLocalFolder",err);
- }
-
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
index c9c0671..5b93556 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
@@ -20,6 +20,8 @@ package org.apache.openmeetings.core.ldap;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.db.util.LocaleHelper.validateCountry;
+import static org.apache.openmeetings.util.OmException.BAD_CREDENTIALS;
+import static org.apache.openmeetings.util.OmException.UNKNOWN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -199,7 +201,7 @@ public class LdapLoginManagement {
Entry e = cursor.get();
if (userDn != null) {
log.error("more than 1 user found in LDAP");
- throw new OmException(-1L);
+ throw UNKNOWN;
}
userDn = e.getDn();
if (w.options.useAdminForAttrs) {
@@ -212,7 +214,7 @@ public class LdapLoginManagement {
}
if (userDn == null) {
log.error("NONE users found in LDAP");
- throw new OmException(-10L);
+ throw BAD_CREDENTIALS;
}
w.conn.bind(userDn, passwd);
}
@@ -232,7 +234,7 @@ public class LdapLoginManagement {
log.debug("getByLogin:: authenticated ? {}, login = '{}', domain = {}, user = {}", authenticated, login, domainId, u);
if (u == null && Provisionning.AUTOCREATE != w.options.prov) {
log.error("User not found in OM DB and Provisionning.AUTOCREATE was not set");
- throw new OmException(-10L);
+ throw BAD_CREDENTIALS;
}
if (authenticated && entry == null) {
if (w.options.useAdminForAttrs) {
@@ -255,7 +257,7 @@ public class LdapLoginManagement {
}
} catch (LdapAuthenticationException ae) {
log.error("Not authenticated.", ae);
- throw new OmException(-10L);
+ throw BAD_CREDENTIALS;
} catch (OmException e) {
throw e;
} catch (Exception e) {
@@ -296,7 +298,7 @@ public class LdapLoginManagement {
}
} catch (LdapAuthenticationException ae) {
log.error("Not authenticated.", ae);
- throw new OmException(-10L);
+ throw BAD_CREDENTIALS;
} catch (OmException e) {
throw e;
} catch (Exception e) {
@@ -334,7 +336,7 @@ public class LdapLoginManagement {
public User getUser(Entry entry, User u) throws LdapException, CursorException, OmException, IOException {
if (entry == null) {
log.error("LDAP entry is null, search or lookup by Dn failed");
- throw new OmException(-10L);
+ throw BAD_CREDENTIALS;
}
if (u == null) {
u = userDao.getNewUserInstance(null);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
index 74db960..194ccd7 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
@@ -69,7 +69,7 @@ public class MainService implements IPendingServiceCallback {
allowed = true;
} else {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); //FIXME format
- deniedMessage = Application.getString(1271) + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd()));
+ deniedMessage = Application.getString("error.hash.period") + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd()));
}
*/
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
index 6aea081..6ea3bee 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.db.util.LocaleHelper.getCountryName;
+import static org.apache.openmeetings.util.OmException.UNKNOWN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FRONTEND_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_OAUTH_REGISTER_KEY;
@@ -166,7 +167,7 @@ public class MobileService {
String baseURL = cfgDao.getBaseUrl();
boolean sendConfirmation = !Strings.isEmpty(baseURL)
&& 1 == cfgDao.getConfValue("sendEmailWithVerficationCode", Integer.class, "0");
- Long userId = userManager.registerUserInit(UserDao.getDefaultRights(), login, password, lastname
+ Object user = userManager.registerUserInit(UserDao.getDefaultRights(), login, password, lastname
, firstname, email, null /* age/birthday */, "" /* street */
, "" /* additionalname */, "" /* fax */, "" /* zip */, country
, "" /* town */, langId, true /* sendWelcomeMessage */
@@ -174,17 +175,17 @@ public class MobileService {
"" /* phone */, false, sendConfirmation, TimeZone.getTimeZone(tzId),
false /* forceTimeZoneCheck */, "" /* userOffers */, "" /* userSearchs */, false /* showContactData */,
true /* showContactDataToContacts */, hash);
- if (userId == null) {
+ if (user == null) {
//do nothing
- } else if (userId > 0) {
- User u = userDao.get(userId);
+ } else if (user instanceof User) {
+ User u = (User)user;
if (sendConfirmation) {
add(result, "status", -666L);
} else {
result = login(u, result);
}
} else {
- add(result, "status", userId);
+ add(result, "status", user);
}
}
} catch (Exception e) {
@@ -199,7 +200,7 @@ public class MobileService {
User u = userDao.login(login, password);
result = login(u, result);
} catch (OmException e) {
- result.put("status", e.getCode());
+ result.put("status", e.getKey());
} catch (Exception e) {
log.error("[loginUser]", e);
}
@@ -208,7 +209,7 @@ public class MobileService {
private static Map<String, Object> getResult() {
Map<String, Object> result = new HashMap<>();
- result.put("status", -1);
+ result.put("status", UNKNOWN.getKey());
return result;
}
@@ -310,8 +311,8 @@ public class MobileService {
User u = userDao.get(c.getUserId());
//my rooms
List<Room> myl = new ArrayList<>();
- myl.add(roomDao.getUserRoom(u.getId(), Room.Type.conference, LabelDao.getString(1306L, u.getLanguageId())));
- myl.add(roomDao.getUserRoom(u.getId(), Room.Type.restricted, LabelDao.getString(1307L, u.getLanguageId())));
+ myl.add(roomDao.getUserRoom(u.getId(), Room.Type.conference, LabelDao.getString("my.room.conference", u.getLanguageId())));
+ myl.add(roomDao.getUserRoom(u.getId(), Room.Type.presentation, LabelDao.getString("my.room.presentation", u.getLanguageId())));
myl.addAll(roomDao.getAppointedRoomsByUser(u.getId()));
for (Room r : myl) {
addRoom("my", null, false, result, r);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
index 3c5b6bc..77f2d6f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
@@ -42,8 +42,7 @@ public interface IApplication {
ServletContext getServletContext();
IRequestMapper getRootRequestMapper();
Supplier<IExceptionMapper> getExceptionMapperProvider();
- String getOmString(long id);
- String getOmString(long id, long languageId);
+ String getOmString(String key);
String getOmString(String key, long languageId);
String getOmString(String key, final Locale loc, String... params);
Client getOmClient(String uid);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
deleted file mode 100644
index c526055..0000000
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.db.dao.basic;
-
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-
-import java.util.Date;
-
-import javax.persistence.EntityManager;
-import javax.persistence.NoResultException;
-import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
-
-import org.apache.openmeetings.db.dao.label.LabelDao;
-import org.apache.openmeetings.db.entity.basic.ErrorValue;
-import org.apache.openmeetings.db.entity.basic.ErrorValue.Type;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.transaction.annotation.Transactional;
-
-@Transactional
-public class ErrorDao {
- private static final Logger log = Red5LoggerFactory.getLogger(ErrorDao.class, webAppRootKey);
-
- @PersistenceContext
- private EntityManager em;
-
- public Long add(Long id, Type type, Long labelId) {
- try {
- ErrorValue eValue = new ErrorValue();
- eValue.setId(id);
- eValue.setType(type);
- eValue.setDeleted(false);
- eValue.setInserted(new Date());
- eValue.setLabelId(labelId);
- eValue = em.merge(eValue);
- return eValue.getId();
- } catch (Exception ex2) {
- log.error("[addErrorValues]: ", ex2);
- }
- return null;
- }
-
- public ErrorValue get(Long id) {
- try {
- TypedQuery<ErrorValue> query = em.createNamedQuery("getErrorValueById", ErrorValue.class);
- query.setParameter("id", id);
- ErrorValue e = null;
- try {
- e = query.getSingleResult();
- } catch (NoResultException ex) {
- }
- return e;
- } catch (Exception ex2) {
- log.error("[get]", ex2);
- }
- return null;
- }
-
- public String getMessage(Long id, long langId) {
- if (id == null) {
- return null;
- }
- ErrorValue ev = get(-1 * id.longValue());
- if (ev == null) {
- return null;
- }
- return LabelDao.getString(ev.getLabelId(), langId);
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
index 5bb02e4..e02a11b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
@@ -28,7 +28,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.InvalidPropertiesFormatException;
import java.util.Iterator;
@@ -72,17 +71,6 @@ public class LabelDao implements IDataProviderDao<StringLabel>{
public static final Set<String> keys = new HashSet<>();
private static Class<?> APP = null;
- public List<Map<String, Object>> getStrings(Long language_id, int start, int count) {
- List<Map<String, Object>> result = new ArrayList<>();
- for (int i = 0; i < count; ++i) {
- Map<String, Object> map = new HashMap<>();
- map.put("id", start + i);
- map.put("value", getString(start + i, language_id));
- result.add(map);
- }
- return result;
- }
-
private static void storeLanguages() throws Exception {
Document d = XmlExport.createDocument();
Element r = XmlExport.createRoot(d, "language");
@@ -102,10 +90,6 @@ public class LabelDao implements IDataProviderDao<StringLabel>{
labelCache.put(l, new ArrayList<StringLabel>());
}
- public static String getString(long fieldValuesId, long langId) {
- return _ensureApplication(langId).getOmString(fieldValuesId, langId);
- }
-
public static String getString(String key, long langId) {
return _ensureApplication(langId).getOmString(key, langId);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
index 4197444..8ceaee4 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/IInvitationManager.java
@@ -30,24 +30,20 @@ import org.apache.openmeetings.db.entity.user.User;
public interface IInvitationManager {
void processInvitation(Appointment a, MeetingMember member, MessageType type);
-
+
void processInvitation(Appointment a, MeetingMember mm, MessageType type, boolean sendMail);
-
+
Invitation getInvitation(Invitation _invitation, User inveetee, Room room
, boolean isPasswordProtected, String invitationpass, Valid valid,
User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd
, Appointment appointment);
-
+
Invitation getInvitation(User inveetee, Room room
, boolean isPasswordProtected, String invitationpass, Valid valid,
User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd
, Appointment appointment);
-
+
void sendInvitationLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception ;
-
- Object checkInvitationPass(String hashCode, String pass);
-
- Object getInvitationByHashCode(String hashCode, boolean hidePass);
-
+
boolean sendInvitationReminderSMS(String phone, String subject, long languageId);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
index 2a80802..f71c885 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
@@ -29,31 +29,29 @@ import java.util.TimeZone;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
-import org.apache.openmeetings.db.entity.user.Userdata;
+import org.apache.openmeetings.util.OmException;
//FIXME HACK to bypass cross project compilation
public interface IUserManager {
- Long registerUser(String login, String Userpass, String lastname,
+ Object registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, String country,
String town, long languageId, String phone, boolean sendSMS,
boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation);
- Long registerUserInit(Set<Right> rights, String login, String password, String lastname,
+ Object registerUserInit(Set<Right> rights, String login, String password, String lastname,
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, String country,
String town, long languageId, boolean sendWelcomeMessage,
List<Long> groups, String phone, boolean sendSMS, Boolean sendConfirmation,
TimeZone timezone, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean showContactData,
- Boolean showContactDataToContacts, String activatedHash) throws Exception;
+ Boolean showContactDataToContacts, String activatedHash) throws OmException, NoSuchAlgorithmException;
Long getLanguage(Locale loc);
User loginOAuth(Map<String, String> params, long serverId) throws IOException, NoSuchAlgorithmException;
boolean kickById(String uid);
boolean kickUsersByRoomId(Long room_id);
-
- List<Userdata> getUserdataDashBoard(Long userId);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 2b6d2c3..4fe9eda 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -654,12 +654,12 @@ public class UserDao implements IGroupAdminDataProviderDao<User> {
// Check if activated
if (!AuthLevelUtil.hasLoginLevel(u.getRights())) {
log.debug("Not activated: {}", u);
- throw new OmException(-41L);
+ throw new OmException("error.notactivated");
}
log.debug("loginUser " + u.getGroupUsers());
if (u.getGroupUsers().isEmpty()) {
log.debug("No Group assigned: {}", u);
- throw new OmException("No Group assigned to user");
+ throw new OmException("error.nogroup");
}
u.setLastlogin(new Date());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java
index b9de1c3..ccc5767 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java
@@ -20,37 +20,43 @@ package org.apache.openmeetings.db.dto.basic;
import java.util.Collection;
-
public class SearchResult<T> {
private String objectName;
private Long records;
private Collection<T> result;
- private Long errorId;
-
+ private String errorKey;
+
public SearchResult() {}
-
+
public String getObjectName() {
return objectName;
}
+
public void setObjectName(String objectName) {
this.objectName = objectName;
}
+
public Long getRecords() {
return records;
}
+
public void setRecords(Long records) {
this.records = records;
}
+
public Collection<T> getResult() {
return result;
}
+
public void setResult(Collection<T> result) {
this.result = result;
}
- public Long getErrorId() {
- return errorId;
+
+ public String getErrorKey() {
+ return errorKey;
}
- public void setErrorId(Long errorId) {
- this.errorId = errorId;
+
+ public void setErrorKey(String errorKey) {
+ this.errorKey = errorKey;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
index 4393b05..eb617d1 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
@@ -25,12 +25,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.openmeetings.util.OmException;
+
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
public class ServiceResult implements Serializable {
private static final long serialVersionUID = 1L;
- public static ServiceResult NO_PERMISSION = new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
- private long code;
+ public static ServiceResult UNKNOWN = new ServiceResult(OmException.UNKNOWN.getKey(), Type.ERROR);
+ public static ServiceResult NO_PERMISSION = new ServiceResult("error.notallowed", Type.ERROR);
private String message;
private String type;
@XmlType(namespace="org.apache.openmeetings.db.dto.basic.type")
@@ -41,26 +43,14 @@ public class ServiceResult implements Serializable {
public ServiceResult() {}
- public ServiceResult(long code, String message, String type) {
+ public ServiceResult(String message, String type) {
super();
- this.code = code;
this.message = message;
this.type = type;
}
- public ServiceResult(long code, String message, Type type) {
- super();
- this.code = code;
- this.message = message;
- this.type = type.name();
- }
-
- public long getCode() {
- return code;
- }
-
- public void setCode(long code) {
- this.code = code;
+ public ServiceResult(String message, Type type) {
+ this(message, type.name());
}
public String getMessage() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
index d1a424b..9f40175 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
@@ -28,7 +28,7 @@ public class RoomSearchResult {
private String objectName;
private Long records;
private List<RoomDTO> result;
- private Long errorId;
+ private String errorKey;
public RoomSearchResult() {}
@@ -40,7 +40,7 @@ public class RoomSearchResult {
for (Room r : copy.getResult()) {
result.add(new RoomDTO(r));
}
- this.errorId = copy.getErrorId();
+ this.errorKey = copy.getErrorKey();
}
}
@@ -68,11 +68,11 @@ public class RoomSearchResult {
this.result = result;
}
- public Long getErrorId() {
- return errorId;
+ public String getErrorKey() {
+ return errorKey;
}
- public void setErrorId(Long errorId) {
- this.errorId = errorId;
+ public void setErrorKey(String errorKey) {
+ this.errorKey = errorKey;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java
index 5dd46ec..262af14 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserSearchResult.java
@@ -31,7 +31,7 @@ public class UserSearchResult {
private String objectName;
private Long records;
private List<UserDTO> result;
- private Long errorId;
+ private String errorKey;
public UserSearchResult() {}
@@ -42,7 +42,7 @@ public class UserSearchResult {
for (User u : copy.getResult()) {
result.add(new UserDTO(u));
}
- this.errorId = copy.getErrorId();
+ this.errorKey = copy.getErrorKey();
}
public String getObjectName() {
@@ -69,12 +69,11 @@ public class UserSearchResult {
this.result = result;
}
- public Long getErrorId() {
- return errorId;
+ public String getErrorKey() {
+ return errorKey;
}
- public void setErrorId(Long errorId) {
- this.errorId = errorId;
+ public void setErrorKey(String errorKey) {
+ this.errorKey = errorKey;
}
-
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
deleted file mode 100644
index 32709ea..0000000
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ErrorValue.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.db.entity.basic;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-
-import org.apache.openmeetings.db.entity.IDataProviderEntity;
-
-@Entity
-@NamedQueries({
- @NamedQuery(name = "getErrorValueById", query = "SELECT e FROM ErrorValue e WHERE e.id = :id AND e.deleted = false")
-})
-@Table(name = "errorvalue")
-public class ErrorValue implements IDataProviderEntity {
- private static final long serialVersionUID = 1L;
-
- public enum Type {
- error
- , info
- }
-
- @Id
- @Column(name = "id")
- private Long id;
-
- @Column(name = "type")
- @Enumerated(EnumType.STRING)
- private Type type;
-
- @Column(name = "label_id")
- private Long labelId;
-
- @Column(name = "inserted")
- private Date inserted;
-
- @Column(name = "updated")
- private Date updated;
-
- @Column(name = "deleted", nullable = false)
- private boolean deleted;
-
- @Override
- public Long getId() {
- return id;
- }
-
- @Override
- public void setId(Long id) {
- this.id = id;
- }
-
- public Date getInserted() {
- return inserted;
- }
-
- public void setInserted(Date inserted) {
- this.inserted = inserted;
- }
-
- public Date getUpdated() {
- return updated;
- }
-
- public void setUpdated(Date updated) {
- this.updated = updated;
- }
-
- public boolean isDeleted() {
- return deleted;
- }
-
- public void setDeleted(boolean deleted) {
- this.deleted = deleted;
- }
-
- public Long getLabelId() {
- return labelId;
- }
-
- public void setLabelId(Long labelId) {
- this.labelId = labelId;
- }
-
- public Type getType() {
- return type;
- }
-
- public void setType(Type type) {
- this.type = type;
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index 16546ef..9b7a731 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -89,7 +89,7 @@ import org.simpleframework.xml.Root;
public class Room implements IDataProviderEntity {
private static final long serialVersionUID = 1L;
public static final int CONFERENCE_TYPE_ID = 1;
- public static final int RESTRICTED_TYPE_ID = 3;
+ public static final int PRESENTATION_TYPE_ID = 3;
public static final int INTERVIEW_TYPE_ID = 4;
public enum Right {
@@ -119,8 +119,7 @@ public class Room implements IDataProviderEntity {
public enum Type {
conference(CONFERENCE_TYPE_ID)
- //, audience(2)
- , restricted(RESTRICTED_TYPE_ID)
+ , presentation(PRESENTATION_TYPE_ID)
, interview(INTERVIEW_TYPE_ID);
//, custom(5)
private int id;
@@ -145,8 +144,8 @@ public class Room implements IDataProviderEntity {
public static Type get(int type) {
Type rt = Type.conference;
switch (type) {
- case RESTRICTED_TYPE_ID:
- rt = Type.restricted;
+ case PRESENTATION_TYPE_ID:
+ rt = Type.presentation;
break;
case INTERVIEW_TYPE_ID:
rt = Type.interview;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
deleted file mode 100644
index 9fb2b13..0000000
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Userdata.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.db.entity.user;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "user_data")
-public class Userdata implements Serializable {
- private static final long serialVersionUID = 1L;
- @Id
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "id")
- private Long id;
-
- @Column(name = "user_id")
- private Long userId;
-
- @Column(name = "data_key")
- private String key;
-
- @Column(name = "data")
- private String data;
-
- @Column(name = "inserted")
- private Date inserted;
-
- @Column(name = "updated")
- private Date updated;
-
- @Lob
- @Column(name = "comment")
- private String comment;
-
- @Column(name = "deleted", nullable = false)
- private boolean deleted;
-
- public String getComment() {
- return comment;
- }
-
- public void setComment(String comment) {
- this.comment = comment;
- }
-
- public String getData() {
- return data;
- }
-
- public void setData(String data) {
- this.data = data;
- }
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Date getInserted() {
- return inserted;
- }
-
- public void setInserted(Date inserted) {
- this.inserted = inserted;
- }
-
- public Date getUpdated() {
- return updated;
- }
-
- public void setUpdated(Date updated) {
- this.updated = updated;
- }
-
- public boolean isDeleted() {
- return deleted;
- }
-
- public void setDeleted(boolean deleted) {
- this.deleted = deleted;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index c5ac7d9..92b5859 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -74,12 +74,9 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINI
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import java.io.File;
import java.util.Date;
-import java.util.Iterator;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.db.dao.basic.ErrorDao;
import org.apache.openmeetings.db.dao.basic.NavigationDao;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
@@ -87,7 +84,6 @@ import org.apache.openmeetings.db.dao.room.SipDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.basic.ErrorValue;
import org.apache.openmeetings.db.entity.basic.Naviglobal;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
@@ -99,11 +95,7 @@ import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
-import org.apache.openmeetings.util.OmFileHelper;
import org.apache.wicket.util.string.StringValue;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -118,8 +110,6 @@ public class ImportInitvalues {
@Autowired
private NavigationDao navimanagement;
@Autowired
- private ErrorDao errorDao;
- @Autowired
private SipDao sipDao;
@Autowired
private OAuth2Dao oauthDao;
@@ -173,41 +163,6 @@ public class ImportInitvalues {
log.debug("MainMenu ADDED");
}
- public void loadErrorMappingsFromXML() throws Exception {
- SAXReader reader = new SAXReader();
- Document document = reader.read(new File(OmFileHelper.getLanguagesDir(), OmFileHelper.nameOfErrorFile));
-
- Element root = document.getRootElement();
-
- for (Iterator<Element> it = root.elementIterator("row"); it.hasNext();) {
- Element row = it.next();
-
- Long errorvalueId = null;
- Long labelId = null;
- ErrorValue.Type type = null;
-
- for (Iterator<Element> itSub = row.elementIterator("field"); itSub.hasNext();) {
- Element field = itSub.next();
-
- String name = field.attributeValue("name");
- String text = field.getText();
- // System.out.println("NAME | TEXT "+name+" | "+text);
- if (name.equals("errorvalues_id")) {
- errorvalueId = Long.valueOf(text);
- }
- if (name.equals("fieldvalues_id")) {
- labelId = Long.valueOf(text);
- }
- if (name.equals("type")) {
- type = ErrorValue.Type.valueOf(text);
- }
- }
-
- errorDao.add(errorvalueId, type, labelId);
- }
- log.debug("ErrorMappings ADDED");
- }
-
public void loadConfiguration(InstallationConfig cfg) {
cfgDao.add(CONFIG_CRYPT_KEY, cfg.cryptClassName, null,
"This Class is used for Authentification-Crypting. "
@@ -422,8 +377,8 @@ public class ImportInitvalues {
r.hide(RoomElement.Whiteboard);
roomDao.update(r, null);
createRoom(LabelDao.getString("install.room.public.video.wb", langId), Type.conference, 32L, true, null);
- createRoom(LabelDao.getString("install.room.public.restricted", langId), Type.restricted, 100L, true, null);
- r = createRoom(LabelDao.getString("install.room.restricted.micro", langId), Type.restricted, 100L, true, null);
+ createRoom(LabelDao.getString("install.room.public.presentation", langId), Type.presentation, 100L, true, null);
+ r = createRoom(LabelDao.getString("install.room.presentation.micro", langId), Type.presentation, 100L, true, null);
r.getHiddenElements().clear();
roomDao.update(r, null);
@@ -528,15 +483,13 @@ public class ImportInitvalues {
log.debug("System contains users, no need to install data one more time.");
}
sipDao.delete();
- progress = 14;
+ progress = 16;
loadMainMenu();
- progress = 28;
- loadErrorMappingsFromXML();
- progress = 42;
+ progress = 32;
loadConfiguration(cfg);
- progress = 56;
+ progress = 48;
loadInitialOAuthServers();
- progress = 70;
+ progress = 64;
}
public void loadAll(InstallationConfig cfg, boolean force) throws Exception {
@@ -547,7 +500,7 @@ public class ImportInitvalues {
}
loadSystem(cfg, force);
loadInitUserAndGroup(cfg);
- progress = 84;
+ progress = 80;
loadDefaultRooms("1".equals(cfg.createDefaultRooms), StringValue.valueOf(cfg.defaultLangId).toLong(1L));
progress = 100;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-server/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 6d40ecd..73929d0 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -31,7 +31,6 @@
<description>Module for OpenMeetings server assembly</description>
<properties>
<server.dir>${project.build.directory}/red5-server</server.dir>
- <webapp.languages.dir>../openmeetings-web/src/main/webapp/languages</webapp.languages.dir>
<languages.dir>../openmeetings-web/src/main/java/org/apache/openmeetings/web/app</languages.dir>
<assembly.finalName>apache-openmeetings-${project.version}</assembly.finalName>
<assembly.descriptor>server</assembly.descriptor>
@@ -194,7 +193,7 @@
<configuration>
<transformationSets>
<transformationSet>
- <dir>${webapp.languages.dir}</dir>
+ <dir>src/site/stylesheets</dir>
<includes>
<include>errorvalues.xml</include>
</includes>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-server/src/site/stylesheets/errortable.xsl
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/stylesheets/errortable.xsl b/openmeetings-server/src/site/stylesheets/errortable.xsl
index dbf72de..980f03a 100644
--- a/openmeetings-server/src/site/stylesheets/errortable.xsl
+++ b/openmeetings-server/src/site/stylesheets/errortable.xsl
@@ -30,7 +30,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- </xsl:comment>
+</xsl:comment>
<properties>
<title>Openmeetings Errors table</title>
<author email="dev@openmeetings.apache.org">Apache OpenMeetings Documentation Robot</author>
@@ -52,14 +52,14 @@
<xsl:template match="row">
<xsl:variable name="englishPath"><xsl:value-of select="concat($languagesDir, '/Application.properties.xml')"/></xsl:variable>
+ <xsl:variable name="descId" select="field[@name='labelKey']"/>
<tr>
- <td>-<xsl:value-of select="field[@name='errorvalues_id']"/></td>
+ <td>-<xsl:value-of select="$descId"/></td>
<td>
<xsl:variable name="type" select="concat('error.type.', field[@name='type'])"/>
<xsl:value-of select="document($englishPath)/properties/entry[@key=$type]/text()" />
</td>
<td>
- <xsl:variable name="descId" select="field[@name='fieldvalues_id']"/>
<xsl:value-of select="document($englishPath)/properties/entry[@key=$descId]/text()" />
</td>
</tr>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-server/src/site/stylesheets/errorvalues.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/stylesheets/errorvalues.xml b/openmeetings-server/src/site/stylesheets/errorvalues.xml
new file mode 100644
index 0000000..237a9a0
--- /dev/null
+++ b/openmeetings-server/src/site/stylesheets/errorvalues.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<ROOT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="errorvalues.xsd">
+ <row>
+ <field name="starttime">2007-12-06 19:01:07</field>
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.unknown</field>
+ <field name="type">error</field>
+ </row>
+ <row>
+ <field name="starttime">2017-05-18 19:01:07</field>
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.bad.credentials</field>
+ <field name="type">error</field>
+ </row>
+ <row>
+ <field name="starttime">2007-12-06 19:01:07</field>
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.short.login</field>
+ <field name="type">error</field>
+ </row>
+ <row>
+ <field name="starttime">2007-12-06 19:01:07</field>
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.reg.disabled</field>
+ <field name="type">error</field>
+ </row>
+ <row>
+ <field name="starttime">2007-12-06 19:01:07</field>
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.login.inuse</field>
+ <field name="type">error</field>
+ </row>
+ <row>
+ <field name="starttime">2007-12-06 19:01:07</field>
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.email.inuse</field>
+ <field name="type">error</field>
+ </row>
+ <row>
+ <field name="starttime">2007-12-06 19:01:07</field>
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.notallowed</field>
+ <field name="type">error</field>
+ </row>
+ <row>
+ <field name="starttime"/>
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.nogroup</field>
+ <field name="type">error</field>
+ </row>
+ <row>
+ <field name="starttime" />
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="labelKey">error.notactivated</field>
+ <field name="type">error</field>
+ </row>
+</ROOT>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-server/src/site/stylesheets/errorvalues.xsd
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/stylesheets/errorvalues.xsd b/openmeetings-server/src/site/stylesheets/errorvalues.xsd
new file mode 100644
index 0000000..5acb78a
--- /dev/null
+++ b/openmeetings-server/src/site/stylesheets/errorvalues.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ <xs:element name="ROOT">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="row"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="row">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="field"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="field">
+ <xs:complexType mixed="true">
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-server/src/site/xdoc/ManualTesting.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/ManualTesting.xml b/openmeetings-server/src/site/xdoc/ManualTesting.xml
index 326c47c..e6f6390 100644
--- a/openmeetings-server/src/site/xdoc/ManualTesting.xml
+++ b/openmeetings-server/src/site/xdoc/ManualTesting.xml
@@ -143,7 +143,7 @@
</ol>
</li>
<li>
- Restricted room testing – general issues (should be tested with at least 3 attendees)
+ Presentation room testing – general issues (should be tested with at least 3 attendees)
<ol>
<li>Enter the room: different cases for the cam/micro, choosing of the cam resolution, test recording, allow/deny of video </li>
<li>User list should be shown correctly </li>
@@ -166,7 +166,7 @@
</ol>
</li>
<li>
- Restricted room testing: file uploading + documents
+ Presentation room testing: file uploading + documents
<ol>
<li>Upload a document with "Load directly to whiteboard" switch turned on </li>
<li>Upload a with "Load directly to whiteboard" switch turned on off </li>
@@ -180,7 +180,7 @@
</ol>
</li>
<li>
- Restricted room testing – whiteboard and properties panels (should be tested with at least 3 attendees)
+ Presentation room testing – whiteboard and properties panels (should be tested with at least 3 attendees)
<ol>
<li>Adding a removing a whiteboard </li>
<li>Full-fit switch </li>
@@ -201,7 +201,7 @@
</ol>
</li>
<li>
- Restricted room testing – chat (should be tested with at least 3 attendees)
+ Presentation room testing – chat (should be tested with at least 3 attendees)
<ol>
<li>Send a message </li>
<li>Start a private chat </li>
@@ -213,7 +213,7 @@
</ol>
</li>
<li>
- Restricted room testing – screen sharing and recordings (should be tested with at least 3 attendees)
+ Presentation room testing – screen sharing and recordings (should be tested with at least 3 attendees)
<ol>
<li>"Share record/screen" button in the room </li>
<li>Desktop sharer: start/stop sharing </li>
@@ -223,7 +223,7 @@
</ol>
</li>
<li>
- Restricted room testing – Actions menu
+ Presentation room testing – Actions menu
<ol>
<li>Send invitation: send English and localized message </li>
<li>Send invitation with password </li>
@@ -243,7 +243,6 @@
<li>
Conference room testing
<ol>
- <li>User list should look in another way in compare with restricted type </li>
<li>Generally, all should look OK when enter the room </li>
</ol>
</li>
@@ -348,7 +347,7 @@
</ol>
</li>
<li>
- <b>SIP integration tests</b> (should be tested with at least 3 attendees in the room; for restricted and interview rooms)
+ <b>SIP integration tests</b> (should be tested with at least 3 attendees in the room; for presentation and interview rooms)
<ol>
<li>Call from the room to the external phone number </li>
<li>Call from external phone number to the room </li>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
index b7ec0ed..91238ac 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
@@ -97,7 +97,7 @@ public class AppointmentLogic {
// Get the required labels one time for all meeting members. The
// Language of the email will be the system default language
- String smsSubject = generateSMSSubject(LabelDao.getString(1158L, langId), a);
+ String smsSubject = generateSMSSubject(LabelDao.getString("1158", langId), a);
AbstractSubjectEmailTemplate t = AppointmentReminderTemplate.get(u, a, tz);
invitationManager.sendInvitationLink(inv, MessageType.Create, t.getSubject(), t.getEmail(), false);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
index 22e5073..577f129 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
@@ -46,8 +46,8 @@ public class EmailManager {
@Autowired
private MailHandler mailHandler;
- public static String getString(long id) {
- return ((IApplication)Application.get(wicketApplicationName)).getOmString(id);
+ public static String getString(String key) {
+ return ((IApplication)Application.get(wicketApplicationName)).getOmString(key);
}
/**
@@ -60,7 +60,7 @@ public class EmailManager {
* @return
* @throws Exception
*/
- public String sendMail(String username, String email, String hash, Boolean sendEmailWithVerficationCode, Long langId) {
+ public void sendMail(String username, String email, String hash, Boolean sendEmailWithVerficationCode, Long langId) {
log.debug("sendMail:: username = {}, email = {}", username, email);
Integer sendEmailAtRegister = configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
@@ -68,14 +68,13 @@ public class EmailManager {
String link = ((IApplication)Application.get(wicketApplicationName)).urlForActivatePage(new PageParameters().add("u", hash));
if (sendEmailAtRegister == 1) {
- mailHandler.send(email, getString(512)
+ mailHandler.send(email, getString("512")
, RegisterUserTemplate.getEmail(username, email, sendEmailWithVerficationCode ? link : null));
}
- return "success";
}
//FIXME, seems to be not used
public void sendFeedback(String username, String email, String message) {
- mailHandler.send("user@openmeetings.apache.org", getString(499), FeedbackTemplate.getEmail(username, email, message));
+ mailHandler.send("user@openmeetings.apache.org", getString("499"), FeedbackTemplate.getEmail(username, email, message));
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 0b2c680..a4bf382 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -169,74 +169,6 @@ public class InvitationManager implements IInvitationManager {
}
/**
- *
- * @param hashCode
- * @param hidePass
- * @return
- */
- @Override
- public Object getInvitationByHashCode(String hashCode, boolean hidePass) {
- try {
- log.debug("Invitation was requested by hashcode: " + hashCode);
- Invitation i = invitationDao.getByHash(hashCode, hidePass, true);
-
- if (i == null) {
- // already deleted or does not exist
- return new Long(-31);
- } else {
- switch (i.getValid()) {
- case OneTime:
- // do this only if the user tries to get the Invitation, not
- // while checking the PWD
- if (!i.isAllowEntry()) {
- // Invitation is of type *only-one-time* and was
- // already used
- return new Long(-32);
- }
- break;
- case Period:
- case Endless:
- default:
- break;
- }
- return i;
- }
-
- } catch (Exception err) {
- log.error("[getInvitationByHashCode]", err);
- }
- return new Long(-1);
- }
-
- /**
- *
- * @param hashCode
- * @param pass
- * @return
- */
- @Override
- public Object checkInvitationPass(String hashCode, String pass) {
- try {
- Object obj = getInvitationByHashCode(hashCode, false);
- log.debug("checkInvitationPass - obj: " + obj);
- if (obj instanceof Invitation) {
- Invitation invitation = (Invitation) obj;
-
- if (CryptProvider.get().verify(pass, invitation.getPassword())) {
- return new Long(1);
- } else {
- return new Long(-34);
- }
- } else {
- return obj;
- }
- } catch (Exception ex2) {
- log.error("[checkInvitationPass] ", ex2);
- }
- return new Long(-1);
- }
-
- /**
* @author vasya
*
* @param member
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
index a42cbcc..2fb9bc5 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.service.user;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
+import static org.apache.openmeetings.util.OmException.UNKNOWN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
@@ -30,7 +31,6 @@ import java.security.SecureRandom;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -59,10 +59,10 @@ import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.User.Type;
-import org.apache.openmeetings.db.entity.user.Userdata;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.service.mail.EmailManager;
import org.apache.openmeetings.util.DaoHelper;
+import org.apache.openmeetings.util.OmException;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
@@ -159,96 +159,6 @@ public class UserManager implements IUserManager {
return null;
}
- @Override
- public List<Userdata> getUserdataDashBoard(Long userId) {
- if (userId != null && userId.longValue() > 0) {
- try {
- TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.userId = :userId AND c.deleted = false", Userdata.class);
- query.setParameter("userId", userId);
- List<Userdata> ll = query.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("getUserdataDashBoard", ex2);
- }
- }
- return null;
- }
-
- public Userdata getUserdataByKey(Long userId, String key) {
- Userdata userdata = new Userdata();
- if (userId != null && userId.longValue() > 0) {
- try {
- TypedQuery<Userdata> query = em.createQuery("select c from Userdata as c where c.userId = :userId AND c.key = :key AND c.deleted = false", Userdata.class);
- query.setParameter("userId", userId);
- query.setParameter("key", key);
- for (Iterator<Userdata> it2 = query.getResultList().iterator(); it2.hasNext();) {
- userdata = it2.next();
- }
- } catch (Exception ex2) {
- log.error("getUserdataByKey", ex2);
- }
- } else {
- userdata.setComment("Error: No user id given");
- }
- return userdata;
- }
-
- public String updateUserdata(int dataId, long userId, String key,
- String data, String comment) {
- String res = "Fehler beim Update";
- try {
- String hqlUpdate = "update userdata set key= :key, userId = :userId, data = :data, updated = :updated, comment = :comment where id= :id";
- int updatedEntities = em.createQuery(hqlUpdate)
- .setParameter("key", key)
- .setParameter("userId", userId)
- .setParameter("data", data)
- .setParameter("updated", -1L)
- .setParameter("comment", comment)
- .setParameter("id", dataId).executeUpdate();
- res = "Success" + updatedEntities;
- } catch (Exception ex2) {
- log.error("updateUserdata", ex2);
- }
- return res;
- }
-
- public String updateUserdataByKey(Long userId, String key, String data, String comment) {
- String res = "Fehler beim Update";
- try {
- String hqlUpdate = "UPDATE Userdata set data = :data, updated = :updated, "
- + "comment = :comment where userId= :userId AND key = :key";
- int updatedEntities = em.createQuery(hqlUpdate)
- .setParameter("data", data)
- .setParameter("updated", -1L)
- .setParameter("comment", comment)
- .setParameter("userId", userId)
- .setParameter("key", key).executeUpdate();
- res = "Success" + updatedEntities;
- } catch (Exception ex2) {
- log.error("updateUserdataByKey", ex2);
- }
- return res;
- }
-
- public String addUserdata(long userId, String key, String data, String comment) {
- String ret = "Fehler beim speichern der Userdata";
- Userdata userdata = new Userdata();
- userdata.setKey(key);
- userdata.setData(data);
- userdata.setInserted(new Date());
- userdata.setUpdated(null);
- userdata.setComment(comment);
- userdata.setUserId(userId);
- userdata.setDeleted(false);
- try {
- em.merge(userdata);
- ret = "success";
- } catch (Exception ex2) {
- log.error("addUserdata", ex2);
- }
- return ret;
- }
-
/**
* Method to register a new User, User will automatically be added to the
* default user_level(1) new users will be automatically added to the
@@ -276,7 +186,7 @@ public class UserManager implements IUserManager {
* @return
*/
@Override
- public Long registerUser(String login, String Userpass, String lastname,
+ public Object registerUser(String login, String Userpass, String lastname,
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, String country,
String town, long languageId, String phone, boolean sendSMS,
@@ -292,19 +202,19 @@ public class UserManager implements IUserManager {
}
// TODO: Read and generate SIP-Data via RPC-Interface Issue 1098
- Long userId = registerUserInit(UserDao.getDefaultRights(), login,
+ Object user = registerUserInit(UserDao.getDefaultRights(), login,
Userpass, lastname, firstname, email, age, street,
additionalname, fax, zip, country, town, languageId,
true, Arrays.asList(cfgDao.getConfValue(CONFIG_DEFAULT_GROUP_ID, Long.class, null)), phone,
sendSMS, sendConfirmation, timezoneUtil.getTimeZone(jNameTimeZone), false, "", "", false, true, null);
- if (userId > 0 && sendConfirmation) {
+ if (user instanceof User && sendConfirmation) {
return -40L;
}
- return userId;
+ return user;
} else {
- return -14L;
+ return "error.reg.disabled";
}
} catch (Exception e) {
log.error("[registerUser]", e);
@@ -340,20 +250,19 @@ public class UserManager implements IUserManager {
* @param userSearchs
* @param showContactData
* @param showContactDataToContacts
- * @return new users_id OR null if an exception, -1 if an error, -4 if mail
- * already taken, -5 if username already taken, -3 if login or pass
- * or mail is empty
+ * @return new user OR error code
+ * @throws NoSuchAlgorithmException
* @throws Exception
*/
@Override
- public Long registerUserInit(Set<Right> rights, String login, String password, String lastname,
+ public Object registerUserInit(Set<Right> rights, String login, String password, String lastname,
String firstname, String email, Date age, String street,
String additionalname, String fax, String zip, String country,
String town, long languageId, boolean sendWelcomeMessage,
List<Long> groups, String phone, boolean sendSMS, Boolean sendConfirmation,
TimeZone timezone, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean showContactData,
- Boolean showContactDataToContacts, String activatedHash) throws Exception {
+ Boolean showContactDataToContacts, String activatedHash) throws OmException, NoSuchAlgorithmException {
// TODO: make phone number persistent
// Check for required data
if (login.length() >= getMinLoginLength(cfgDao)) {
@@ -363,10 +272,7 @@ public class UserManager implements IUserManager {
if (checkName && checkEmail) {
String hash = Strings.isEmpty(activatedHash) ? UUID.randomUUID().toString() : activatedHash;
if (sendWelcomeMessage && email.length() != 0) {
- String sendMail = emailManagement.sendMail(login, email, hash, sendConfirmation, languageId);
- if (!sendMail.equals("success")) {
- return -19L;
- }
+ emailManagement.sendMail(login, email, hash, sendConfirmation, languageId);
}
Address adr = userDao.getAddress(street, zip, town, country, additionalname, fax, phone, email);
@@ -386,21 +292,21 @@ public class UserManager implements IUserManager {
log.debug("Added user-Id " + u.getId());
if (adr.getId() != null && u.getId() != null) {
- return u.getId();
+ return u;
} else {
- return -16L;
+ return UNKNOWN.getKey();
}
} else {
if (!checkName) {
- return -15L;
+ return "error.login.inuse";
} else if (!checkEmail) {
- return -17L;
+ return "error.email.inuse";
}
}
} else {
- return -13L;
+ return "error.short.login";
}
- return -1L;
+ return UNKNOWN.getKey();
}
/**
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java
index 5db53bf..642b858 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java
@@ -20,25 +20,21 @@ package org.apache.openmeetings.util;
public class OmException extends Exception {
private static final long serialVersionUID = 1L;
- private Long code;
+ public final static OmException UNKNOWN = new OmException("error.unknown");
+ public final static OmException BAD_CREDENTIALS = new OmException("error.bad.credentials");
+ private final String key;
- public OmException(String msg) {
- super(msg);
- }
-
- public OmException(long code) {
- this.code = Long.valueOf(code);
+ public OmException(String key) {
+ super();
+ this.key = key;
}
public OmException(Throwable cause) {
super(cause);
+ this.key = null;
}
- public Long getCode() {
- return code;
- }
-
- public void setCode(Long code) {
- this.code = code;
+ public String getKey() {
+ return key;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 4306393..72fb926 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -52,7 +52,6 @@ public class OmFileHelper {
public static final String DB_PERSISTENCE_NAME = "classes/META-INF/%s_persistence.xml";
public static final String profilesPrefix = "profile_";
public static final String nameOfLanguageFile = "languages.xml";
- public static final String nameOfErrorFile = "errorvalues.xml";
public static final String libraryFileName = "library.xml";
public static final String defaultProfileImageName = "profile.jpg";
public static final String profileFileName = "profile";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
index 1c01aa9..c280870 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
@@ -36,7 +36,7 @@ public abstract class AdminSavePanel<T> extends FormSaveRefreshPanel<T> {
super(id, form);
this.form = form;
- newRecord = new Label("newRecord", Model.of(Application.getString(344L)));
+ newRecord = new Label("newRecord", Model.of(Application.getString("344")));
add(newRecord.setVisible(false).setOutputMarkupId(true));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
index 09de3fd..25ba67c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
@@ -212,7 +212,7 @@ public class BackupPanel extends AdminPanel {
target.add(feedback);
}
}));
- add(new Label("cmdLineDesc", Application.getString(1505)).setEscapeModelStrings(false));
+ add(new Label("cmdLineDesc", Application.getString("1505")).setEscapeModelStrings(false));
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
index 6f11e2b..6d35a83 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
@@ -61,18 +61,18 @@ public class ConfigForm extends AdminBaseForm<Configuration> {
super(id, new CompoundPropertyModel<>(configuration));
setOutputMarkupId(true);
this.listContainer = listContainer;
- add(new RequiredTextField<String>("key").setLabel(Model.of(Application.getString(267))).add(new IValidator<String>(){
+ add(new RequiredTextField<String>("key").setLabel(Model.of(Application.getString("267"))).add(new IValidator<String>(){
private static final long serialVersionUID = 1L;
@Override
public void validate(IValidatable<String> validatable) {
Configuration c = getBean(ConfigurationDao.class).forceGet(validatable.getValue());
if (c != null && !c.isDeleted() && !c.getId().equals(ConfigForm.this.getModelObject().getId())) {
- validatable.error(new ValidationError(Application.getString(1544L)));
+ validatable.error(new ValidationError(Application.getString("error.cfg.exist")));
}
}
}));
- add(new TextField<String>("value").setLabel(Model.of(Application.getString(271))));
+ add(new TextField<String>("value").setLabel(Model.of(Application.getString("271"))));
add(forDatePattern("updated", WEB_DATE_PATTERN));
add(new Label("user.login"));
add(new TextArea<String>("comment"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
index 8fb3d30..953e6ff 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
@@ -43,13 +43,13 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class AddLanguageDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final DialogButton add = new DialogButton("add", Application.getString(366L));
+ private final DialogButton add = new DialogButton("add", Application.getString("366"));
private final Form<Void> form = new Form<>("addLangForm");
private final RequiredTextField<String> iso = new RequiredTextField<>("iso", Model.of(""));
private final LangPanel langPanel;
public AddLanguageDialog(String id, final LangPanel langPanel) {
- super(id, Application.getString(364));
+ super(id, Application.getString("364"));
this.langPanel = langPanel;
add(form.add(feedback, iso.setOutputMarkupId(true)));
iso.add(new IValidator<String>() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
index c6a189f..3717f8a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
@@ -55,13 +55,13 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
setOutputMarkupId(true);
this.listContainer = listContainer;
- add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1108))));
+ add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("1108"))));
add(new CheckBox("active"));
add(forDatePattern("inserted", WEB_DATE_PATTERN));
add(new Label("insertedby.login"));
add(forDatePattern("updated", WEB_DATE_PATTERN));
add(new Label("updatedby.login"));
- add(new RequiredTextField<String>("configFileName").setLabel(Model.of(Application.getString(1115))));
+ add(new RequiredTextField<String>("configFileName").setLabel(Model.of(Application.getString("1115"))));
add(new CheckBox("addDomainToUserName"));
add(new TextField<String>("domain"));
add(new TextArea<String>("comment"));
[06/12] openmeetings git commit: [OPENMEETINGS-1682] restricted type
renamed, code clean-up
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 18d65b2..a477032 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">타원</entry>
<entry key="101">닫다</entry>
<entry key="102">데이다 오류 입력</entry>
- <entry key="103">유저 이름은 최소 4 문자가 돼어야합니다.</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">똑같은 유저이름이 존재합니다.</entry>
- <entry key="106">똑같은 이메일 주소가 이미 등록돼어 있습니다.</entry>
- <entry key="107">시스템 오류가 생겼습니다. 시스템 관리자에 연락주십시요.</entry>
<entry key="108">로긴</entry>
<entry key="109">유저:</entry>
<entry key="110">패스:</entry>
@@ -253,7 +248,6 @@
<entry key="233">다른 메일</entry>
<entry key="234">잘못된 이멜주소를 입력하였습니다.</entry>
<entry key="235">등록이 됬습니다.</entry>
- <entry key="236">당신의 어카운트가 생겼습니다. 지금 로긴이돼어 있습니다.</entry>
<entry key="237">당신의 스크린을 지금 공유할수 없습니다. 다른사람이 이미 스크린을 공유하고 있습니다.</entry>
<entry key="238">공유금지</entry>
<entry key="239">당신의 스크린을 공유하다.</entry>
@@ -293,7 +287,6 @@
<entry key="273">Users</entry>
<entry key="274">delete user from organisation</entry>
<entry key="275">delete</entry>
- <entry key="276">This user is already member of this organisation.</entry>
<entry key="277">News</entry>
<entry key="278">Quicklinks</entry>
<entry key="279">Goto Conference</entry>
@@ -349,20 +342,9 @@
<entry key="331">4 or more characters; capitalization matters!</entry>
<entry key="332">Password set. You can login now.</entry>
<entry key="333">OK</entry>
- <entry key="334">Unkown Error. Please report this to your Service-Team.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Invalid Password</entry>
<entry key="337">Successfully Logged out</entry>
- <entry key="338">Frontend Registration disabled.</entry>
- <entry key="339">Invalid EMail</entry>
- <entry key="340">duplicate filename, please choose another filename</entry>
- <entry key="341">filename too short</entry>
- <entry key="342">Could not save Address</entry>
- <entry key="343">User added but you need to assign this User to an Organisation, otherwise he won't be able to sign-in.</entry>
<entry key="344">New Record</entry>
- <entry key="345">No Field found with this FieldId.</entry>
- <entry key="346">No Label found for that Field.</entry>
- <entry key="347">Admin Authorization required</entry>
<entry key="348">Language-Editor</entry>
<entry key="349">Language</entry>
<entry key="350">Label-ID</entry>
@@ -372,8 +354,6 @@
<entry key="354">LabelName</entry>
<entry key="355">LabelValue</entry>
<entry key="356">Label-ID</entry>
- <entry key="357">You did only delete the Label NOT the Field! You cannot delete the Field, it may has Labels in other Languages.</entry>
- <entry key="358">Invalid Labelid. The FieldLanguagesvalues_Id cannot be found in the database.</entry>
<entry key="359">You cannot delete this Field. You can only delete Labels NOT Fields. There is no Label loaded at the moment, wether it is not selected any Field or there is no Label for this Language for that Field defined.</entry>
<entry key="360">export</entry>
<entry key="361">You need to logout to see any changes.</entry>
@@ -383,10 +363,6 @@
<entry key="365">Name</entry>
<entry key="366">add language</entry>
<entry key="367">Backup</entry>
- <entry key="368">goto first</entry>
- <entry key="369">goto previous</entry>
- <entry key="370">goto next</entry>
- <entry key="371">goto last</entry>
<entry key="372">user speaks (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">turn sound on/off</entry>
<entry key="374">System</entry>
@@ -418,7 +394,6 @@
<entry key="400"></entry>
<entry key="401">Users in this Room:</entry>
<entry key="402">refresh</entry>
- <entry key="403">This Room is Full. Try again in a few minutes.</entry>
<entry key="404">click on a room to get details</entry>
<entry key="405">Chat with the users in this Room:</entry>
<entry key="406">Room:</entry>
@@ -548,12 +523,8 @@
<entry key="530">Valid From:</entry>
<entry key="531">Valid to:</entry>
<entry key="532">Invitation To {0}</entry>
- <entry key="533">Not Invitation availible for this Invitation-Code</entry>
- <entry key="534">The Invitation was already used. This type of Invitation cannot be re-used.</entry>
- <entry key="535">This Invitation-Code is not valid.</entry>
<entry key="536">Password:</entry>
<entry key="537">Check Password</entry>
- <entry key="538">Invalid Password!</entry>
<entry key="539">Browser</entry>
<entry key="540">Syncronize Audio/Video</entry>
<entry key="541">Login was correct, but the Session you tried is not active or stored on the Server. You have to get a new SessionId and retry login.</entry>
@@ -673,18 +644,12 @@
<entry key="660">Add or delete Users or Rooms within your Organization</entry>
<entry key="661">Do you really want to delete this record?</entry>
<entry key="662">Do you really want to delete this user from your organization? You will only delete the connection between the user and your organization, to really delete the user itself you have to login into the Administration-Panel.</entry>
- <entry key="663">You cannot delete your own User!</entry>
- <entry key="664">This Method needs a Adminstration Account to be invoked!</entry>
- <entry key="665">There was no Session associated with this ID.</entry>
- <entry key="666">This is an Administrator or Moderator account. You can only edit this account through the Administration Panel.</entry>
<entry key="667">To complete your registration please click on the following link. Or copy the URL to your browser bar.</entry>
<entry key="668">Click to verify your E-Mail</entry>
<entry key="669">No user was found for this Hash.</entry>
<entry key="670">This user is already activated!</entry>
<entry key="671">You did successfully activate your account!</entry>
<entry key="672">Login Now</entry>
- <entry key="673">Your account is not activated. First use the link in the Email you've received during registration.</entry>
- <entry key="674">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
<entry key="675">Remove Moderation Role from this User</entry>
<entry key="676">Grant Moderation Rights to this User</entry>
<entry key="677">User</entry>
@@ -796,7 +761,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -816,7 +780,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -925,7 +888,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1005,7 +967,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1200,7 +1161,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1231,12 +1191,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1276,7 +1232,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1311,11 +1266,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1421,7 +1372,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1436,7 +1386,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1544,8 +1493,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1606,6 +1553,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Unknown error. Please report this to the administrator.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registration disabled</entry>
+ <entry key="error.login.inuse">똑같은 유저이름이 존재합니다.</entry>
+ <entry key="error.email.inuse">똑같은 이메일 주소가 이미 등록돼어 있습니다.</entry>
+ <entry key="error.notallowed">Admin Authorization required</entry>
+ <entry key="error.hash.used">The Invitation was already used. This type of Invitation cannot be re-used.</entry>
+ <entry key="error.hash.invalid">This Invitation-Code is not valid.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Invalid Password!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. First use the link in the Email you've received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">User added but you need to assign this User to an Organisation, otherwise he won't be able to sign-in.</entry>
+ <entry key="warn.notverified">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
+ <entry key="account.created">당신의 어카운트가 생겼습니다. 지금 로긴이돼어 있습니다.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1776,25 +1743,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Mr.</entry>
- <entry key="user.salutation.ms">Ms.</entry>
- <entry key="user.salutation.mrs">Mrs.</entry>
- <entry key="user.salutation.dr">Dr.</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Error</entry>
- <entry key="error.type.info">Message</entry>
- <entry key="poll.type.yesNo">네/아니오</entry>
- <entry key="poll.type.numeric">숫자 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Mr.</entry>
+ <entry key="user.salutation.ms">Ms.</entry>
+ <entry key="user.salutation.mrs">Mrs.</entry>
+ <entry key="user.salutation.dr">Dr.</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Error</entry>
+ <entry key="error.type.info">Message</entry>
+ <entry key="poll.type.yesNo">네/아니오</entry>
+ <entry key="poll.type.numeric">숫자 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1830,8 +1797,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1928,4 +1895,10 @@
<entry key="download.pdf">Download as PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">goto first</entry>
+ <entry key="goto.prev">goto previous</entry>
+ <entry key="goto.next">goto next</entry>
+ <entry key="goto.last">goto last</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 63e9011..a2aefc8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Ellipse</entry>
<entry key="101">Sluiten</entry>
<entry key="102">input data foutmelding</entry>
- <entry key="103">Gebruikersnaam moet minimaal 4 karakters zijn en is hoofdletter gevoelig!</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Deze gebruikersnaam is al gebruikt</entry>
- <entry key="106">Dit e-mail adres is al geregistreerd</entry>
- <entry key="107">Systeem fout neem contact op met een Systeem beheerder</entry>
<entry key="108">Inloggen</entry>
<entry key="109">Inlognaam/E-mail</entry>
<entry key="110">Wachtwoord</entry>
@@ -253,7 +248,6 @@
<entry key="233">Foutmelding</entry>
<entry key="234">Dit is geen geldig E-mail adres</entry>
<entry key="235">Registratie Afgerond</entry>
- <entry key="236">Je gebruikersaccount is nu aangemaakt. Je nu kunt inloggen.</entry>
<entry key="237">Je kunt je scherm op dit moment niet delen. Iemand anders is al een scherm aan het delen.</entry>
<entry key="238">Delen is verboden</entry>
<entry key="239">Delen van scherm</entry>
@@ -291,7 +285,6 @@
<entry key="273">Gebruikers</entry>
<entry key="274">haal gebruiker uit organisatie</entry>
<entry key="275">D</entry>
- <entry key="276">Deze gebruiker zit al in deze organisatie.</entry>
<entry key="277">Nieuws</entry>
<entry key="278">Snelkoppelingen</entry>
<entry key="279">Ga naar overleg</entry>
@@ -347,20 +340,9 @@
<entry key="331">Minimaal 4 karakters en hoofdlettergevoelig!</entry>
<entry key="332">Wachtwoord ingesteld. Je kunt nu inloggen.</entry>
<entry key="333">OK</entry>
- <entry key="334">Onbekende Foutmelding. Geef dit door aan de beheerder.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Verkeerd wachtwoord</entry>
<entry key="337">U bent uitgelogd</entry>
- <entry key="338">Registratie is uitgezet.</entry>
- <entry key="339">Verkeerd E-mail adres</entry>
- <entry key="340">een bestand met deze naam is al aanwezig, kies een andere naam</entry>
- <entry key="341">bestandsnaam te kort</entry>
- <entry key="342">Kan bestand niet opslaan</entry>
- <entry key="343">Gebruiker toegevoegd. Account moet nog wel worden toegevoegd aan een organisatie.</entry>
<entry key="344">Nieuw item</entry>
- <entry key="345">Geen veld gevonden met dit veld ID.</entry>
- <entry key="346">Geen label gevonden voor dat veld.</entry>
- <entry key="347">Beheer authorisatie is vereist.</entry>
<entry key="348">Taal Bewerker</entry>
<entry key="349">Taal</entry>
<entry key="350">Label-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">Label naam</entry>
<entry key="355">Label tekst</entry>
<entry key="356">Label-ID</entry>
- <entry key="357">Je hebt alleen het label verwijderd en niet het veld! Je kunt dit veld niet verwijderen omdat het gebruikt worden in andere talen.</entry>
- <entry key="358">Onjuist Label-ID. De 'FieldLanguagesvalues_Id' kan niet worden gevonden in de database.</entry>
<entry key="359">Je kunt alleen labels verwijderen en geen velden.</entry>
<entry key="360">Exporteren</entry>
<entry key="361">Je moet opnieuw aanmelden om de veranderingen te zien.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Naam</entry>
<entry key="366">Taal toevoegen</entry>
<entry key="367">Backup</entry>
- <entry key="368">ga naar het begin</entry>
- <entry key="369">vorige</entry>
- <entry key="370">volgende</entry>
- <entry key="371">ga naar de laatste</entry>
<entry key="372">Gebruiker spreekt (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">Geluid aan/uit</entry>
<entry key="374">Systeem</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Active deelnemers:</entry>
<entry key="402">vernieuwen</entry>
- <entry key="403">Dit overleg is vol. Probeer het later nogmaals.</entry>
<entry key="404">Klik op een kamer voor meer informatie</entry>
<entry key="405">Chat met deelnemers:</entry>
<entry key="406">Overleg:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Geldig van:</entry>
<entry key="531">Geldig tot:</entry>
<entry key="532">Uitnodiging van {0}</entry>
- <entry key="533">Geen uitnodiging beschikbaar met deze code</entry>
- <entry key="534">Deze is uitnodiging is eenmalig en al eens gebruikt.</entry>
- <entry key="535">Deze uitnodigingscode is onjuist.</entry>
<entry key="536">Wachtwoord:</entry>
<entry key="537">Controleer wachtwoord</entry>
- <entry key="538">Verkeerd wachtwoord!</entry>
<entry key="539">Beeld_Geluid</entry>
<entry key="540">Synchronisatie van beeld en geluid</entry>
<entry key="541">Login was correct, but the Session you tried is not active or stored on the Server. You have to get a new SessionId and retry login.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Toevoegen of verwijderen van gebruikers of kamers in je organisatie</entry>
<entry key="661">Wil je dit item echt verwijderen?</entry>
<entry key="662">Wil je deze gebruiker echt uit je organisatie verwijderen? Het gebruikersaccount blijft wel bestaan.</entry>
- <entry key="663">Je kunt je eigen gebruikersaccount niet verwijderen!</entry>
- <entry key="664">Dit kan alleen een beheerder doen!</entry>
- <entry key="665">Er zijn geen sessie gekoppeld aan dit ID.</entry>
- <entry key="666">Dit is een beheeraccount. Je kunt dit account bewerken in het beheer Beheer/Gebruikers gedeelte.</entry>
<entry key="667">Klik op de link om de registratie af te ronden. Mocht dit niet lukken, kopieer en plak deze in een internet browser.</entry>
<entry key="668">Klik om je E-mail adres te controleren</entry>
<entry key="669">Er is geen gebruiker met deze gegevens.</entry>
<entry key="670">Deze gebruiker is al actief!</entry>
<entry key="671">Het account is succesvol geactiveerd!</entry>
<entry key="672">Nu inloggen</entry>
- <entry key="673">Het account is nog niet actief. Gebruik eerste de link in de E-mail die je hebt gekregen tijdens de registratie.</entry>
- <entry key="674">In inschrijven is nu volledig. Er is een E-mail gestuurd met een verificatie link. Controlleer je Postvak-In.</entry>
<entry key="675">Verwijder organisator rol van gebruiker</entry>
<entry key="676">Geef organisator rol aan deze gebruiker</entry>
<entry key="677">Gebruiker</entry>
@@ -794,7 +759,6 @@
<entry key="784">Toegang aanvragen</entry>
<entry key="785">Toegang aanvragen</entry>
<entry key="786">Vragen voor beeld en geluid deelname</entry>
- <entry key="787">Deze sessie is al gebruikt en kun je niet nogmaals gebruiken.</entry>
<entry key="788">BEGIN</entry>
<entry key="789">EINDE</entry>
<entry key="790">Wil je dit overleg echt verlaten? Het is raadzaam bestanden, tekenbord en chat historie op te schonen!</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan een overleg</entry>
<entry key="806">Om een overleg te plannen, dien je een evenement aan de kalender toe te voegen. Voor ieder evenement zal automatisch een kamer aangemaakt worden. Iedere deelnemer zal E-mail ontvangen met een link naar de kamer.<br/><br/>Er is keuze in verschillende soorten kamers. Tevens kan iedere kamer een eigen layout krijgen.</entry>
<entry key="807">Hulp nodig?</entry>
- <entry key="808">Beperkt</entry>
<entry key="809">Zoek</entry>
<entry key="810">Toevoegen</entry>
<entry key="811">Er is geen gebruiker geselecteerd. Kies eerst een item en klik dan op toevoegen.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Onbekende Foutmelding. Geef dit door aan de beheerder.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Registratie is uitgezet.</entry>
+ <entry key="error.login.inuse">Deze gebruikersnaam is al gebruikt</entry>
+ <entry key="error.email.inuse">Dit e-mail adres is al geregistreerd</entry>
+ <entry key="error.notallowed">Beheer authorisatie is vereist.</entry>
+ <entry key="error.hash.used">Deze is uitnodiging is eenmalig en al eens gebruikt.</entry>
+ <entry key="error.hash.invalid">Deze uitnodigingscode is onjuist.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Verkeerd wachtwoord!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Het account is nog niet actief. Gebruik eerste de link in de E-mail die je hebt gekregen tijdens de registratie.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Gebruiker toegevoegd. Account moet nog wel worden toegevoegd aan een organisatie.</entry>
+ <entry key="warn.notverified">In inschrijven is nu volledig. Er is een E-mail gestuurd met een verificatie link. Controlleer je Postvak-In.</entry>
+ <entry key="account.created">Je gebruikersaccount is nu aangemaakt. Je nu kunt inloggen.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">Dhr.</entry>
- <entry key="user.salutation.ms">Mevr.</entry>
- <entry key="user.salutation.mrs">Mevrouw</entry>
- <entry key="user.salutation.dr">Meneer</entry>
- <entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">Foutmelding</entry>
- <entry key="error.type.info">Bericht</entry>
- <entry key="poll.type.yesNo">Ja/Nee</entry>
- <entry key="poll.type.numeric">Getal 1-10</entry>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">Dhr.</entry>
+ <entry key="user.salutation.ms">Mevr.</entry>
+ <entry key="user.salutation.mrs">Mevrouw</entry>
+ <entry key="user.salutation.dr">Meneer</entry>
+ <entry key="user.salutation.prof">Prof</entry>
+ <entry key="error.type.error">Foutmelding</entry>
+ <entry key="error.type.info">Bericht</entry>
+ <entry key="poll.type.yesNo">Ja/Nee</entry>
+ <entry key="poll.type.numeric">Getal 1-10</entry>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Opslaan als PDF</entry>
<entry key="zoom.fullFit">Beeldvullend</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">ga naar het begin</entry>
+ <entry key="goto.prev">vorige</entry>
+ <entry key="goto.next">volgende</entry>
+ <entry key="goto.last">ga naar de laatste</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 4890612..06fa45f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Elipsa</entry>
<entry key="101">zamknij</entry>
<entry key="102">błąd w danych wejściowych</entry>
- <entry key="103">4 lub więcej znaków; duże i małe litery mają znaczenie!</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Ta nazwa użytkownika jest już zajęta</entry>
- <entry key="106">Ten adres e-mail jest już zarejestrowany</entry>
- <entry key="107">Błąd systemu. Skontaktuj się z administratorem.</entry>
<entry key="108">Logowanie</entry>
<entry key="109">Użytkownik:</entry>
<entry key="110">Hasło:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Niepoprawny e-mail</entry>
<entry key="234">Wprowadziłe(a)ś niepoprawny adres e-mail</entry>
<entry key="235">Rejestracja zakończona</entry>
- <entry key="236">Konto utworzone. Możesz się zalogować.</entry>
<entry key="237">Nie możesz teraz pokazać swojego ekranu. Ktoś inny pokazuje teraz swój ekran.</entry>
<entry key="238">Pokazywanie ekranu nie jest teraz dopuszczalne</entry>
<entry key="239">Pokaż swój ekran</entry>
@@ -291,7 +285,6 @@
<entry key="273">Użytkownicy</entry>
<entry key="274">usuń użytkownika z organizacji</entry>
<entry key="275">Sk.</entry>
- <entry key="276">Użytkownik już należy to tej organizacji.</entry>
<entry key="277">Wiadomości</entry>
<entry key="278">Łącza</entry>
<entry key="279">Przejdź do konferencji</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 lub więcej znaków; małe i duże litery mają znaczenie!</entry>
<entry key="332">Hasło ustawione. Możesz się zalogować.</entry>
<entry key="333">OK</entry>
- <entry key="334">Nieznany błąd. Proszę poinformować administratora.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Niepoprawne hasło</entry>
<entry key="337">Poprawnie wylogowano.</entry>
- <entry key="338">Samodzielna rejestracja nie jest możliwa.</entry>
- <entry key="339">Niepoprawny e-mail</entry>
- <entry key="340">plik o tej nazwie istnieje, proszę wybrac inną nazwę pliku</entry>
- <entry key="341">nazwa pliku za krótka</entry>
- <entry key="342">Nie mogłem zapisać adresu</entry>
- <entry key="343">Dodano użytkownika, ale należy go przypisać do organizacji, bo w innym przypadku nie będzie mógł się zalogować.</entry>
<entry key="344">Nowy wpis</entry>
- <entry key="345">Nie ma pola o takim identyfikatorze.</entry>
- <entry key="346">To pole nie ma etykiety.</entry>
- <entry key="347">Potrzebne zezwolenie administratora</entry>
<entry key="348">Edytor języka</entry>
<entry key="349">Język</entry>
<entry key="350">ID-etykiety</entry>
@@ -370,8 +352,6 @@
<entry key="354">Nazwa etykiety</entry>
<entry key="355">Wartość etykiety</entry>
<entry key="356">ID-etykiety</entry>
- <entry key="357">Skasowałeś tylko etykietę, a nie pole! Nie możesz skasować pola, może mieć etykiety w innych językach.</entry>
- <entry key="358">Niepoprawne ID etykiety. FieldLanguagesvalues_Id nie zostało znalezione w bazie.</entry>
<entry key="359">Nie można skasować tego pola. Można kasować tylko etykiety, a nie pola. Obecnie brak etykiety. Albo nie wskazano żadnego pola, albo to pole nie ma etykiety w języku, któty edytujesz.</entry>
<entry key="360">eksport</entry>
<entry key="361">Musisz się przelogować, aby zobaczyć zmiany.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nazwa</entry>
<entry key="366">dodaj język</entry>
<entry key="367">Kopia zapasowa</entry>
- <entry key="368">pierwszy</entry>
- <entry key="369">poprzedni</entry>
- <entry key="370">następny</entry>
- <entry key="371">ostatni</entry>
<entry key="372">użytkownik mówi (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">włącz/wyłącz dźwięk</entry>
<entry key="374">System</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Użytkownicy w tym pokoju:</entry>
<entry key="402">odśwież</entry>
- <entry key="403">Pokój jest pełny. Zajrzyj za parę minut.</entry>
<entry key="404">kliknij na pokój, aby zobaczyć szczegóły</entry>
<entry key="405">Czatuj z użytkownikami tego pokoju:</entry>
<entry key="406">Pokój:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Ważne od:</entry>
<entry key="531">Ważne do:</entry>
<entry key="532">Zaproszenie do {0}</entry>
- <entry key="533">Nie ma zaproszenia z takim kodem</entry>
- <entry key="534">To zaproszenie było już uzyte. Ten rodzaj zaproszenia nie może być wykorzystany powtórnie.</entry>
- <entry key="535">Ten kod zaproszenia jest nieważny.</entry>
<entry key="536">Hasło:</entry>
<entry key="537">Sprawdź hasło</entry>
- <entry key="538">Niepoprawne hasło!</entry>
<entry key="539">Audio_Wideo</entry>
<entry key="540">Synchronizuj Audio/Wideo</entry>
<entry key="541">Zalogowanie było poprawne, ale podana sesja nie jest aktywna lub przechowywana na serwerze. Musisz otrzymać nowy identyfikator sesji i potórzyć logowanie.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Dodawaj i kasuj użytkowników i pokoje w swojej organizacji</entry>
<entry key="661">Czy rzeczywiście chcesz skasować ten wpis?</entry>
<entry key="662">Czy rzeczywiście chcesz usunąć użytkownika z organizacji? Usuniesz tylko powiązanie użytkownika z tą organizacją. Aby rzeczywiście usunąć samego użytkownika, musisz zalogować się do panelu administratorskiego.</entry>
- <entry key="663">Nie możesz usunąć samego siebie!</entry>
- <entry key="664">Ta metoda wymaga użycia konta administratorskiego!</entry>
- <entry key="665">Nie ma sesji powiązanym z tym ID.</entry>
- <entry key="666">To jest konto administratora lub moderatora. Możesz etdytować to konto tylko poprzez panel administracyjny.</entry>
<entry key="667">Aby dokończyć rejestrację proszę kliknąć na link, albo skopiować URL do paska adresu w przeglądarce internetowej.</entry>
<entry key="668">Kliknij tu, aby potwierdzić e-mail</entry>
<entry key="669">Nie znaleziono użytkownika dla tego kodu.</entry>
<entry key="670">Ten użytkownik już jest zaktywowany!</entry>
<entry key="671">Poprawnie aktywowałe(a)ś swoje konto!</entry>
<entry key="672">Zaloguj się</entry>
- <entry key="673">Twoje konto nie zostało aktywowane. Najpierw musisz kliknąć na link w e-mailu, który otrzymałeś podczas rejestracji.</entry>
- <entry key="674">Poprawnie się zapisałe(a)ś. Wysłaliśmy Ci e-mail z kodem potwierdzającym. Proszę sprawdź swoją skrzynkę.</entry>
<entry key="675">Zabierz prawa moderatora temu użytkownikowi</entry>
<entry key="676">Nadaj prawa moderatora temu użytkownikowi</entry>
<entry key="677">Użytkownik</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Nieznany błąd. Proszę poinformować administratora.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Samodzielna rejestracja nie jest możliwa.</entry>
+ <entry key="error.login.inuse">Ta nazwa użytkownika jest już zajęta</entry>
+ <entry key="error.email.inuse">Ten adres e-mail jest już zarejestrowany</entry>
+ <entry key="error.notallowed">Potrzebne zezwolenie administratora</entry>
+ <entry key="error.hash.used">To zaproszenie było już uzyte. Ten rodzaj zaproszenia nie może być wykorzystany powtórnie.</entry>
+ <entry key="error.hash.invalid">Ten kod zaproszenia jest nieważny.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Niepoprawne hasło!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Twoje konto nie zostało aktywowane. Najpierw musisz kliknąć na link w e-mailu, który otrzymałeś podczas rejestracji.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Dodano użytkownika, ale należy go przypisać do organizacji, bo w innym przypadku nie będzie mógł się zalogować.</entry>
+ <entry key="warn.notverified">Poprawnie się zapisałe(a)ś. Wysłaliśmy Ci e-mail z kodem potwierdzającym. Proszę sprawdź swoją skrzynkę.</entry>
+ <entry key="account.created">Konto utworzone. Możesz się zalogować.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">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>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Pobierz jako PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">pierwszy</entry>
+ <entry key="goto.prev">poprzedni</entry>
+ <entry key="goto.next">następny</entry>
+ <entry key="goto.last">ostatni</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d2a8e400/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index 2f8a665..b6a7267 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -120,11 +120,6 @@
<entry key="100">Elipse</entry>
<entry key="101">fechar</entry>
<entry key="102">erro na entrada de dados</entry>
- <entry key="103">nome do usuårio deve ter no mínimo 4 letras</entry>
- <entry key="104">Login is too short</entry>
- <entry key="105">Nome de usuário já existente</entry>
- <entry key="106">O email já foi registrado.</entry>
- <entry key="107">Erro no sistema, por favor, contacte os administradores.</entry>
<entry key="108">Login</entry>
<entry key="109">Usuário:</entry>
<entry key="110">Senha:</entry>
@@ -253,7 +248,6 @@
<entry key="233">Email Incorreto</entry>
<entry key="234">Voê digitou um endereço de email inválido.</entry>
<entry key="235">Cadastro completo</entry>
- <entry key="236">Sua conta foi criada. Você pode fazer o login agora.</entry>
<entry key="237">Você não pode compartilhar sua tela agora. Alguem já compartilhou a tela.</entry>
<entry key="238">Compartilhamento perdido</entry>
<entry key="239">Compartilhe sua tela</entry>
@@ -291,7 +285,6 @@
<entry key="273">Usuários</entry>
<entry key="274">excluir usuário da compania</entry>
<entry key="275">excluir</entry>
- <entry key="276">Este usuário já é membro desta companhia.</entry>
<entry key="277">Notícias</entry>
<entry key="278">Links Rápidos</entry>
<entry key="279">Ir para conferência</entry>
@@ -347,20 +340,9 @@
<entry key="331">4 ou mais caracteres; maiúsculas e minúsculas são diferentes!</entry>
<entry key="332">Senha configurada. Você pode se logar agora.</entry>
<entry key="333">OK</entry>
- <entry key="334">Erro desconhecido. Por favor informe isso ao Service-Team.</entry>
- <entry key="335">Username/email and/or password are incorrect.</entry>
<entry key="336">Senha inválida</entry>
<entry key="337">Desconectado com sucesso</entry>
- <entry key="338">Cadastro do frontend desabilitado.</entry>
- <entry key="339">EMail inválido</entry>
- <entry key="340">nome de arquivo duplicado, por favor escolha outro nome</entry>
- <entry key="341">nome de arquivo muito curto</entry>
- <entry key="342">Não foi possível salvar o endereço</entry>
- <entry key="343">Usuário adicionado mas você precisa associar esse usuário a uma organização, se não ele não estará apto a se associar.</entry>
<entry key="344">Novo Registro</entry>
- <entry key="345">Nenhum campo encontrado com esse id.</entry>
- <entry key="346">Nenhum Label encontrado para este campo.</entry>
- <entry key="347">Necessário perfil de administrador</entry>
<entry key="348">Editor de idiomas</entry>
<entry key="349">Idioma</entry>
<entry key="350">Label-ID</entry>
@@ -370,8 +352,6 @@
<entry key="354">LabelName</entry>
<entry key="355">LabelValue</entry>
<entry key="356">Label-ID</entry>
- <entry key="357">Você apenas deletou o Label NÂO o Field! Você não pode deletar esse Field, podem existir Labels em outros idiomas.</entry>
- <entry key="358">Labelid inválido. O FieldLanguagesvalues_Id não pode ser encontrado na base de dados.</entry>
<entry key="359">Você não pode deletar esse Field. Você pode apenas deletar Labels NÂO Fields. Não existe Label carregado no momento, se nenhum Field for selecionado ou não existir Label para esse idioma para esse Field definido.</entry>
<entry key="360">exportar</entry>
<entry key="361">Você precisa fazer login novamente para ver as mudanças.</entry>
@@ -381,10 +361,6 @@
<entry key="365">Nome</entry>
<entry key="366">adicionar idioma</entry>
<entry key="367">Backup</entry>
- <entry key="368">ir ao primeiro</entry>
- <entry key="369">ir ao anterior</entry>
- <entry key="370">ir ao próximo</entry>
- <entry key="371">ir ao último</entry>
<entry key="372">palestras do usuário (By clicking here you can give exclusive audio / mute the microphone of others)</entry>
<entry key="373">desligar/ligar som</entry>
<entry key="374">Sistema</entry>
@@ -416,7 +392,6 @@
<entry key="400"></entry>
<entry key="401">Usuários nessa sala:</entry>
<entry key="402">atualizar</entry>
- <entry key="403">Essa sala está cheia. Tente novamente em alguns instântes.</entry>
<entry key="404">clique em uma sala para ver os detalhes</entry>
<entry key="405">Chat com os usuários dessa sala:</entry>
<entry key="406">Sala:</entry>
@@ -546,12 +521,8 @@
<entry key="530">Valido de:</entry>
<entry key="531">Valido até:</entry>
<entry key="532">Convite para o {0}</entry>
- <entry key="533">Nenhum convite disponível para esse código</entry>
- <entry key="534">O convite já foi utilizado. Esse tipo de convite não pode ser reutilizado.</entry>
- <entry key="535">Esse código de convite não é válido.</entry>
<entry key="536">Senha:</entry>
<entry key="537">Verificar senha</entry>
- <entry key="538">Senha Inválida!</entry>
<entry key="539">Browser</entry>
<entry key="540">Syncronize Audio/Video</entry>
<entry key="541">Login was correct, but the Session you tried is not active or stored on the Server. You have to get a new SessionId and retry login.</entry>
@@ -671,18 +642,12 @@
<entry key="660">Add or delete Users or Rooms within your Organization</entry>
<entry key="661">Do you really want to delete this record?</entry>
<entry key="662">Do you really want to delete this user from your organization? You will only delete the connection between the user and your organization, to really delete the user itself you have to login into the Administration-Panel.</entry>
- <entry key="663">You cannot delete your own User!</entry>
- <entry key="664">This Method needs a Adminstration Account to be invoked!</entry>
- <entry key="665">There was no Session associated with this ID.</entry>
- <entry key="666">This is an Administrator or Moderator account. You can only edit this account through the Administration Panel.</entry>
<entry key="667">To complete your registration please click on the following link. Or copy the URL to your browser bar.</entry>
<entry key="668">Click to verify your E-Mail</entry>
<entry key="669">No user was found for this Hash.</entry>
<entry key="670">This user is already activated!</entry>
<entry key="671">You did successfully activate your account!</entry>
<entry key="672">Login Now</entry>
- <entry key="673">Your account is not activated. First use the link in the Email you've received during registration.</entry>
- <entry key="674">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
<entry key="675">Remove Moderation Role from this User</entry>
<entry key="676">Grant Moderation Rights to this User</entry>
<entry key="677">User</entry>
@@ -794,7 +759,6 @@
<entry key="784">Apply for moderation</entry>
<entry key="785">Apply for whiteboard access</entry>
<entry key="786">Apply for camera/microphone access</entry>
- <entry key="787">This Session Hash was already used. You cannot use it twice.</entry>
<entry key="788">START</entry>
<entry key="789">EXIT</entry>
<entry key="790">Do you really want to exit? You might should clear uploaded documents, whiteboard and the chat history.</entry>
@@ -814,7 +778,6 @@
<entry key="805">Plan a Meeting</entry>
<entry key="806">To set up a conference you can add a new Event in the Calendar.</entry>
<entry key="807">Need help?</entry>
- <entry key="808">Restricted</entry>
<entry key="809">Search</entry>
<entry key="810">Add</entry>
<entry key="811">There is no User selected. Please select an item from the list first and then hit add.</entry>
@@ -923,7 +886,6 @@
<entry key="917">The recording for this interview is already started!</entry>
<entry key="918">Cancel</entry>
<entry key="919">The post-processing of an interview takes 5 minutes per 1 minute interview. The current progress of the interview post-processing transcoding is:</entry>
- <entry key="920">You have to enter your password again to auto create the SIP Data</entry>
<entry key="921">Re-generate SIP Data</entry>
<entry key="922">You cannot move this file or folder into its own sub folder!</entry>
<entry key="923">Home drive size</entry>
@@ -1003,7 +965,6 @@
<entry key="997">Invoice</entry>
<entry key="998"></entry>
<entry key="999">You need to buy a volume flatrate to be able to send invitations or create meetings via the calendar. With Pay-per-minute it is only possible for you to access {0}. You cannot allow 3th Parties to access a Meeting.</entry>
- <entry key="1000">This Email is already used by another User.</entry>
<entry key="1001">SIP-Settings</entry>
<entry key="1002">The Conference Number and PIN is automatically created via the OpenXG RPC-Gateway</entry>
<entry key="1003">SIP Number</entry>
@@ -1198,7 +1159,6 @@
<entry key="1192">Hi,</entry>
<entry key="1193">would like to add you as contact.</entry>
<entry key="1194">Check your contact requests in {0} or click on those links to accept or deny the request</entry>
- <entry key="1195">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
<entry key="1196">Your contact list</entry>
<entry key="1197">Edit your contact and messages,<br/> manage your pending contacts!</entry>
<entry key="1198">confirmed you as contact!</entry>
@@ -1229,12 +1189,8 @@
<entry key="1223">Sent</entry>
<entry key="1224">Trash</entry>
<entry key="1225">This is you! You cannot add yourself as your own contact.</entry>
- <entry key="1226">The user is already denied!</entry>
- <entry key="1227">The user is already approved!</entry>
- <entry key="1228">This user contact hash is invalid!</entry>
<entry key="1229">User added to contact list!</entry>
<entry key="1230">User denied as contact and removed from pending contact list!</entry>
- <entry key="1231">There is no such contact!</entry>
<entry key="1232">Would you really like to remove that contact?</entry>
<entry key="1233">Confirm contact removal</entry>
<entry key="1234">Delete contact from list</entry>
@@ -1274,7 +1230,6 @@
<entry key="1268">The user does not share his personal contact data.</entry>
<entry key="1269">The user does share his personal contact data only to contacts.</entry>
<entry key="1270">Address & Phone</entry>
- <entry key="1271">You invitation code is no valid, the code is only valid during this specific date and time:</entry>
<entry key="1272">This event is connected to several calendars of other users. Your change will also update their calendar. Would you really like to update the event?</entry>
<entry key="1273">Confirm update</entry>
<entry key="1274">Allow contact to see my calendar (view only)</entry>
@@ -1309,11 +1264,7 @@
<entry key="1303">Reply</entry>
<entry key="1304">Rooms and chats</entry>
<entry key="1305">My rooms</entry>
- <entry key="1306">My conference room (for 1-16 users)</entry>
- <entry key="1307">My webinar room (for 1-120 users)</entry>
<entry key="1308">Owner Id</entry>
- <entry key="1309">Please enter a password</entry>
- <entry key="1310">You need an account with User-Level User, Moderator or Admin</entry>
<entry key="1311">Web-Service (only access via SOAP)</entry>
<entry key="1312">Do directly load to whiteboard</entry>
<entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone!</entry>
@@ -1419,7 +1370,6 @@
<entry key="1413">active</entry>
<entry key="1414">Simple Chart</entry>
<entry key="1415">Pie Chart</entry>
- <entry key="1416">Please enter email</entry>
<entry key="1417">New message(s)</entry>
<entry key="1418">Close Poll</entry>
<entry key="1419">Are you sure you want to close this Poll? No one will be able to vote</entry>
@@ -1434,7 +1384,6 @@
<entry key="1428">Give a permission for exclusive audio.</entry>
<entry key="1429">Cam resolution</entry>
<entry key="1430">Changing the resolution affects bandwidth, bigger picture needs more bandwith!</entry>
- <entry key="1431">You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.</entry>
<entry key="1432">I would like to get the right for exclusive audio</entry>
<entry key="1433">Give exclusive audio to me (alternatively click on your video pod or press F12)</entry>
<entry key="1434">Microphone is on!</entry>
@@ -1542,8 +1491,6 @@
<entry key="1537">Include uploaded files and recordings in backup</entry>
<entry key="1538">Enable SIP transport in the room</entry>
<entry key="1539">Do you really want to provide this user an exclusive audio?</entry>
- <entry key="1540">Please specify your timezone</entry>
- <entry key="1544">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
<entry key="1545">Content is Saving, Please wait.</entry>
<entry key="1546">Welcome</entry>
<entry key="1547">Widget displaying basic user info and support links</entry>
@@ -1604,6 +1551,26 @@
<entry key="1605">Remove audio of this user</entry>
<entry key="1606">I would like to share my audio</entry>
<entry key="1607">You are allowed to share your audio</entry>
+ <entry key="error.unknown">Erro desconhecido. Por favor informe isso ao Service-Team.</entry>
+ <entry key="error.bad.credentials">Username/email and/or password are incorrect.</entry>
+ <entry key="error.short.login">Login is too short</entry>
+ <entry key="error.reg.disabled">Cadastro do frontend desabilitado.</entry>
+ <entry key="error.login.inuse">Nome de usuário já existente</entry>
+ <entry key="error.email.inuse">O email já foi registrado.</entry>
+ <entry key="error.notallowed">Necessário perfil de administrador</entry>
+ <entry key="error.hash.used">O convite já foi utilizado. Esse tipo de convite não pode ser reutilizado.</entry>
+ <entry key="error.hash.invalid">Esse código de convite não é válido.</entry>
+ <entry key="error.hash.period">You invitation code is not valid, the code is only valid during this specific date and time:</entry>
+ <entry key="error.bad.password">Senha Inválida!</entry>
+ <entry key="error.nogroup">User is not assigned to group.</entry>
+ <entry key="error.notactivated">Your account is not activated. First use the link in the Email you've received during registration.</entry>
+ <entry key="error.contact.added">This user is already in your contact list or has received an invitation to your contact list that is not answered yet.</entry>
+ <entry key="error.contact.denied">The user is already denied.</entry>
+ <entry key="error.contact.approved">The user is already approved.</entry>
+ <entry key="error.cfg.exist">Configuration with given key already exists, please specify another key or edit existent configuration</entry>
+ <entry key="warn.nogroup">Usuário adicionado mas você precisa associar esse usuário a uma organização, se não ele não estará apto a se associar.</entry>
+ <entry key="warn.notverified">You successfully signed up. We've send an EMail with a verification Code to your Mail. Please check your Inbox.</entry>
+ <entry key="account.created">Sua conta foi criada. Você pode fazer o login agora.</entry>
<entry key="install.wizard.install.header">Installation</entry>
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
@@ -1774,25 +1741,25 @@
<entry key="install.wizard.congrats.mail">Mailing list</entry>
<entry key="install.wizard.congrats.commercial">There are some companies
that also offer commercial support for Apache OpenMeetings:</entry>
- <entry key="room.type.conference">conference (1-25 users)</entry>
- <entry key="room.type.restricted">restricted (1-150 users)</entry>
- <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
- <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
- <entry key="room.type.restricted.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
- <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
- <entry key="appointment.reminder.none">do not send notification</entry>
- <entry key="appointment.reminder.email">simple email</entry>
- <entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">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>
- <entry key="wizard.button.finish">Finish</entry>
+ <entry key="room.type.conference">conference (1-25 users)</entry>
+ <entry key="room.type.presentation">presentation (1-150 users)</entry>
+ <entry key="room.type.interview">interview (1:1 meeting with recording)</entry>
+ <entry key="room.type.conference.desc">"democratic" by default, every user can directly enable audio/video without need for asking</entry>
+ <entry key="room.type.presentation.desc">"restricted" by default: Every regular user will need to ask if he wants to share audio/video</entry>
+ <entry key="room.type.interview.desc">only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)</entry>
+ <entry key="appointment.reminder.none">do not send notification</entry>
+ <entry key="appointment.reminder.email">simple email</entry>
+ <entry key="appointment.reminder.ical">iCal email</entry>
+ <entry key="user.salutation.mr">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>
+ <entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the system</entry>
<entry key="admin.email.group.label">Email message</entry>
@@ -1828,8 +1795,8 @@
<entry key="install.room.public.conference">Public Conference Room</entry>
<entry key="install.room.public.video.only">Public Video Only Room</entry>
<entry key="install.room.public.video.wb">Public Video And Whiteboard Room</entry>
- <entry key="install.room.public.restricted">Public Restricted Room</entry>
- <entry key="install.room.restricted.micro">Restricted room with microphone option set</entry>
+ <entry key="install.room.public.presentation">Public Presentation Room</entry>
+ <entry key="install.room.presentation.micro">Presentation room with microphone option set</entry>
<entry key="install.room.conference.micro">Conference room with microphone option set</entry>
<entry key="install.room.private.conference">Private Conference Room</entry>
<entry key="appointment.tab.general">General</entry>
@@ -1926,4 +1893,10 @@
<entry key="download.pdf">Download as PDF</entry>
<entry key="zoom.fullFit">Full-Fit</entry>
<entry key="zoom.pageWidth">Page Width</entry>
+ <entry key="my.room.conference">My conference room (for 1-16 users)</entry>
+ <entry key="my.room.presentation">My presentation room (for 1-120 users)</entry>
+ <entry key="goto.first">ir ao primeiro</entry>
+ <entry key="goto.prev">ir ao anterior</entry>
+ <entry key="goto.next">ir ao próximo</entry>
+ <entry key="goto.last">ir ao último</entry>
</properties>