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 2020/05/08 11:29:11 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2303] additional de-duplication

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 79419ad  [OPENMEETINGS-2303] additional de-duplication
79419ad is described below

commit 79419ad88c6872f923a7e5088d01e8f2723188ed
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri May 8 18:28:56 2020 +0700

    [OPENMEETINGS-2303] additional de-duplication
---
 .../service/mail/template/RegisterUserTemplate.html          |  2 +-
 .../org/apache/openmeetings/web/admin/rooms/RoomsPanel.html  |  2 +-
 .../apache/openmeetings/web/app/Application.properties.xml   | 12 ++++++------
 .../openmeetings/web/app/Application_ar.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_bg.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_bn.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_ca.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_cs.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_da.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_de.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_el.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_es.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_fa.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_fi.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_fr.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_gl.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_hi.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_hu.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_in.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_it.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_iw.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_ja.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_ko.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_nl.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_pl.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_pt.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_pt_BR.properties.xml    | 12 ++++++------
 .../openmeetings/web/app/Application_ru.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_sk.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_sv.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_ta.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_th.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_tr.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_uk.properties.xml       | 12 ++++++------
 .../openmeetings/web/app/Application_zh_CN.properties.xml    | 12 ++++++------
 .../openmeetings/web/app/Application_zh_TW.properties.xml    | 12 ++++++------
 .../web/pages/install/InstallWizard$ParamsStep1.html         |  2 +-
 .../web/pages/install/InstallWizard$ParamsStep3.html         |  2 +-
 .../apache/openmeetings/web/pages/install/InstallWizard.java |  4 ++--
 .../openmeetings/web/pages/install/InstallWizardPage.java    |  2 +-
 .../openmeetings/web/user/calendar/AppointmentDialog.java    |  2 +-
 .../openmeetings/web/user/profile/MessagesContactsPanel.html |  2 +-
 .../org/apache/openmeetings/web/user/rooms/RoomsPanel.java   |  2 +-
 43 files changed, 214 insertions(+), 214 deletions(-)

diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
index 03833fa..2e54950 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
@@ -25,7 +25,7 @@
 	<br />
 	<strong><wicket:message key="507" /></strong><br />
 	<wicket:message key="108" /> <span wicket:id="username"></span><br />
-	<wicket:message key="510" /> <span wicket:id="email"></span><br />
+	<wicket:message key="lbl.email" /> <span wicket:id="email"></span><br />
 	<br />
 	<div wicket:id="verification">
 		<wicket:message key="667" /> <br />
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index 8669574..249cb23 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -256,7 +256,7 @@
 									<th class="col-1 overflow-hidden" wicket:message="title:817"><wicket:message key="817" /></th>
 									<th class="col-1"><wicket:message key="188" /></th>
 									<th class="col-4"><wicket:message key="165" /></th>
-									<th class="col-5"><wicket:message key="510" /></th>
+									<th class="col-5"><wicket:message key="lbl.email" /></th>
 									<th class="col-1"><wicket:message key="275" /></th>
 								</tr>
 							</thead>
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 69372e8..5e4b1fe 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Users]]></entry>
 	<entry key="126"><![CDATA[Groups]]></entry>
-	<entry key="131"><![CDATA[Enter]]></entry>
+	<entry key="lbl.enter"><![CDATA[Enter]]></entry>
 	<entry key="135"><![CDATA[Title/first name]]></entry>
 	<entry key="136"><![CDATA[Last name]]></entry>
 	<entry key="138"><![CDATA[Birthday]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[If you have problems with the link, please copy and paste this to your browser:]]></entry>
 	<entry key="506"><![CDATA[{0} Account Details]]></entry>
 	<entry key="507"><![CDATA[Your account details]]></entry>
-	<entry key="510"><![CDATA[Email]]></entry>
+	<entry key="lbl.email"><![CDATA[Email]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[Your {0} account details]]></entry>
 	<entry key="513"><![CDATA[{0} - Reset Password]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nick name]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 c9decd3..e20b39b 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[البيت]]></entry>
 	<entry key="125"><![CDATA[المستعملون]]></entry>
 	<entry key="126"><![CDATA[المجموعات]]></entry>
-	<entry key="131"><![CDATA[أدخل]]></entry>
+	<entry key="lbl.enter"><![CDATA[أدخل]]></entry>
 	<entry key="135"><![CDATA[Firstname]]></entry>
 	<entry key="136"><![CDATA[Lastname]]></entry>
 	<entry key="138"><![CDATA[عيد الميلاد]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[إذا واجهتك مشاكل مع الرابط، الرجاء نسخه و من ثم لصقه في المتصفح:]]></entry>
 	<entry key="506"><![CDATA[تسجيل {0}]]></entry>
 	<entry key="507"><![CDATA[بياناتك:]]></entry>
-	<entry key="510"><![CDATA[البريد الإلكتروني:]]></entry>
+	<entry key="lbl.email"><![CDATA[البريد الإلكتروني:]]></entry>
 	<entry key="511"><![CDATA[فريق - OpenMeeting]]></entry>
 	<entry key="512"><![CDATA[إنشاء حساب OpenMeeting]]></entry>
 	<entry key="513"><![CDATA[إعادة ضبط كلمة مرور - OpenMeeting]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 8921853..ec498d7 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Начало]]></entry>
 	<entry key="125"><![CDATA[Потребители]]></entry>
 	<entry key="126"><![CDATA[Групи]]></entry>
-	<entry key="131"><![CDATA[Вход]]></entry>
+	<entry key="lbl.enter"><![CDATA[Вход]]></entry>
 	<entry key="135"><![CDATA[Име]]></entry>
 	<entry key="136"><![CDATA[Фамилия]]></entry>
 	<entry key="138"><![CDATA[Рожденна дата]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Ако имате проблеми с линка, копирайте го и го вмъкнете в браузъра:]]></entry>
 	<entry key="506"><![CDATA[Регистрация в {0}]]></entry>
 	<entry key="507"><![CDATA[Потребителски данни:]]></entry>
-	<entry key="510"><![CDATA[E-mail:]]></entry>
+	<entry key="lbl.email"><![CDATA[E-mail:]]></entry>
 	<entry key="511"><![CDATA[Екип на {0}]]></entry>
 	<entry key="512"><![CDATA[Регистрация в {0}]]></entry>
 	<entry key="513"><![CDATA[Нова парола за {0}]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index d84bdee..165249b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[হোম]]></entry>
 	<entry key="125"><![CDATA[ইউজারসমূহ]]></entry>
 	<entry key="126"><![CDATA[গ্রুপসমূহ]]></entry>
-	<entry key="131"><![CDATA[প্রবেশ করুন]]></entry>
+	<entry key="lbl.enter"><![CDATA[প্রবেশ করুন]]></entry>
 	<entry key="135"><![CDATA[উপাধি / নামের প্রথমাংশ]]></entry>
 	<entry key="136"><![CDATA[নামের শেষাংশ]]></entry>
 	<entry key="138"><![CDATA[জন্মদিন]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[যদি আপনার লিঙ্কে সমস্যা থাকে, তাহলে দয়া করে আপনার ব্রাউজারে কপি এবং পেস্ট করুন:]]></entry>
 	<entry key="506"><![CDATA[{0} অ্যাকাউন্ট বিবরণ]]></entry>
 	<entry key="507"><![CDATA[আপনার অ্যাকাউন্ট বিবরণ]]></entry>
-	<entry key="510"><![CDATA[ইমেইল]]></entry>
+	<entry key="lbl.email"><![CDATA[ইমেইল]]></entry>
 	<entry key="511"><![CDATA[{0} - দল]]></entry>
 	<entry key="512"><![CDATA[আপনার {0} অ্যাকাউন্টের বিবরণ]]></entry>
 	<entry key="513"><![CDATA[{0} - পাসওয়ার্ড পুনরায় সেট করুন]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nick name]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 de08d52..3cbfdbf 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Inici]]></entry>
 	<entry key="125"><![CDATA[Usuaris]]></entry>
 	<entry key="126"><![CDATA[Grups]]></entry>
-	<entry key="131"><![CDATA[Entrar]]></entry>
+	<entry key="lbl.enter"><![CDATA[Entrar]]></entry>
 	<entry key="135"><![CDATA[Nom]]></entry>
 	<entry key="136"><![CDATA[Cognoms]]></entry>
 	<entry key="138"><![CDATA[Data de neixement]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Si té problemes amb l'enllaç, li vam suggerir que copiï i pegui el següent text en el seu navegador:]]></entry>
 	<entry key="506"><![CDATA[Registre {0}]]></entry>
 	<entry key="507"><![CDATA[La seva informació d'usuari:]]></entry>
-	<entry key="510"><![CDATA[Correu:]]></entry>
+	<entry key="lbl.email"><![CDATA[Correu:]]></entry>
 	<entry key="511"><![CDATA[Equip-{0}]]></entry>
 	<entry key="512"><![CDATA[{0} - Registre]]></entry>
 	<entry key="513"><![CDATA[{0} - Resetear contrasenya]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 833d7f0..84022b3 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Domů]]></entry>
 	<entry key="125"><![CDATA[Uživatelé]]></entry>
 	<entry key="126"><![CDATA[Skupiny]]></entry>
-	<entry key="131"><![CDATA[vstup]]></entry>
+	<entry key="lbl.enter"><![CDATA[vstup]]></entry>
 	<entry key="135"><![CDATA[Jméno]]></entry>
 	<entry key="136"><![CDATA[Příjmení]]></entry>
 	<entry key="138"><![CDATA[Datum narození]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[pokud máte problém s tímto odkazem, nakopírujte jej a vložte do prohlížeče:]]></entry>
 	<entry key="506"><![CDATA[{0} Registrace]]></entry>
 	<entry key="507"><![CDATA[Vaše uživatelská data:]]></entry>
-	<entry key="510"><![CDATA[EMail:]]></entry>
+	<entry key="lbl.email"><![CDATA[EMail:]]></entry>
 	<entry key="511"><![CDATA[{0}-Tým]]></entry>
 	<entry key="512"><![CDATA[{0} Registrace]]></entry>
 	<entry key="513"><![CDATA[{0} - Reset hesla]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 c223242..a794242 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Forside]]></entry>
 	<entry key="125"><![CDATA[Brugere]]></entry>
 	<entry key="126"><![CDATA[Grupper]]></entry>
-	<entry key="131"><![CDATA[Log ind]]></entry>
+	<entry key="lbl.enter"><![CDATA[Log ind]]></entry>
 	<entry key="135"><![CDATA[Fornavn]]></entry>
 	<entry key="136"><![CDATA[Efternavn]]></entry>
 	<entry key="138"><![CDATA[Fødselsdato]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Hvis du har problemer med at åbne genvejen (link), bedes du kopiere genvejen og indsætte denne i din webbrowser:]]></entry>
 	<entry key="506"><![CDATA[{0} registrering]]></entry>
 	<entry key="507"><![CDATA[Dine brugerdata:]]></entry>
-	<entry key="510"><![CDATA[Email:]]></entry>
+	<entry key="lbl.email"><![CDATA[Email:]]></entry>
 	<entry key="511"><![CDATA[{0} - Teamet]]></entry>
 	<entry key="512"><![CDATA[{0} registrering]]></entry>
 	<entry key="513"><![CDATA[{0} - Nulstil adgangskode]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 257e624..335b0f7 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Benutzer]]></entry>
 	<entry key="126"><![CDATA[Gruppen]]></entry>
-	<entry key="131"><![CDATA[Betreten]]></entry>
+	<entry key="lbl.enter"><![CDATA[Betreten]]></entry>
 	<entry key="135"><![CDATA[Vorname]]></entry>
 	<entry key="136"><![CDATA[Nachname]]></entry>
 	<entry key="138"><![CDATA[Geburtstag]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Wenn der Link fehlerhaft dargestellt wird, kopieren Sie bitte folgenden Link in die Adresszeile ihres Browsers:]]></entry>
 	<entry key="506"><![CDATA[{0} Registrierung]]></entry>
 	<entry key="507"><![CDATA[Ihre Benutzerdaten:]]></entry>
-	<entry key="510"><![CDATA[E-Mail:]]></entry>
+	<entry key="lbl.email"><![CDATA[E-Mail:]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[{0} Registrierung]]></entry>
 	<entry key="513"><![CDATA[{0} - Passwort zurücksetzen]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Ordner löschen]]></entry>
 	<entry key="1268"><![CDATA[Der Nutzer veröffentlicht die persönlichen Kontaktdaten nicht.]]></entry>
 	<entry key="1269"><![CDATA[Der Nutzer zeigt die persönlichen Kontaktdaten nur seinen bestätigten Kontakten.]]></entry>
-	<entry key="1282"><![CDATA[Raum betreten]]></entry>
+
 	<entry key="1287"><![CDATA[Spitznamen wählen]]></entry>
 	<entry key="1296"><![CDATA[Mitglied seit]]></entry>
 	<entry key="1301"><![CDATA[Neue private Nachrichten:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Datenbank-Check war erfolgreich]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Bitte klicken Sie auf "Finish" um die Installation zu starten!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation fehlgeschlagen]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Bitte warten, Installation läuft]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[E-Mail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Geben Sie eine E-Mail-Adresse ein]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Geben Sie den Namen Ihrer Organisation ein]]></entry>
@@ -799,7 +799,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick-Pfad]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installieren Sie ImageMagick auf dem Server. Weitere Informationen unter http://www.imagemagick.org. Anleitungen f&uuml;r die Installation finden Sie unter http://www.imagemagick.org/script/binary-releases.php, in den meisten Linux-Distributionen l&auml;sst es sich jedoch bequem per Paketmanager (z.B. apt-get) installieren.]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Geben Sie den Pfad zu ImageMagick an, falls es sich nicht im Systempfad befindet.]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice-/LibreOffice-Pfad f&uuml;r jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[Der Pfad zu OpenOffice/LibreOffice (optional). Bitte geben Sie den richtigen Pfad an, falls jodconverter die OpenOffice-/LibreOffice-Installation nicht automatisch findet.]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[Der Pfad zu OpenOffice/LibreOffice (optional). Bitte geben Sie den echten Pfad an, falls jodconverter die OpenOffice-/LibreOffice-Installation nicht automatisch findet.]]></entry>
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 d7c48cd..2c3e426 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Αρχική Σελίδα]]></entry>
 	<entry key="125"><![CDATA[Χρήστες]]></entry>
 	<entry key="126"><![CDATA[Ομάδες]]></entry>
-	<entry key="131"><![CDATA[Είσοδος]]></entry>
+	<entry key="lbl.enter"><![CDATA[Είσοδος]]></entry>
 	<entry key="135"><![CDATA[Όνομα]]></entry>
 	<entry key="136"><![CDATA[Επώνυμο]]></entry>
 	<entry key="138"><![CDATA[Γενέθλια]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Αν έχετε προβλήματα με το Σύνδεσμο, παρακαλούμε αντιγράψτε και επικολλήστε αυτό στο Φυλλομετρητή σας:]]></entry>
 	<entry key="506"><![CDATA[Εγγραφή στο {0}]]></entry>
 	<entry key="507"><![CDATA[Τα Στοιχεία Σας:]]></entry>
-	<entry key="510"><![CDATA[Email:]]></entry>
+	<entry key="lbl.email"><![CDATA[Email:]]></entry>
 	<entry key="511"><![CDATA[{0} - Ομάδα]]></entry>
 	<entry key="512"><![CDATA[{0} - Εγγραφή Μέλους]]></entry>
 	<entry key="513"><![CDATA[{0} - Αλλαγή Κωδικού]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 71a1585..07f8441 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Inicio]]></entry>
 	<entry key="125"><![CDATA[Usuarios]]></entry>
 	<entry key="126"><![CDATA[Grupos]]></entry>
-	<entry key="131"><![CDATA[Entrar]]></entry>
+	<entry key="lbl.enter"><![CDATA[Entrar]]></entry>
 	<entry key="135"><![CDATA[Nombre]]></entry>
 	<entry key="136"><![CDATA[Apellidos]]></entry>
 	<entry key="138"><![CDATA[Fecha nacimiento]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Si tiene problemas con el enlace, le sugerimos que copie y pegue el siguiente texto en su navegador:]]></entry>
 	<entry key="506"><![CDATA[Registro {0}]]></entry>
 	<entry key="507"><![CDATA[Sus datos de usuario:]]></entry>
-	<entry key="510"><![CDATA[Correo:]]></entry>
+	<entry key="lbl.email"><![CDATA[Correo:]]></entry>
 	<entry key="511"><![CDATA[{0} - Equipo]]></entry>
 	<entry key="512"><![CDATA[{0} - Registro]]></entry>
 	<entry key="513"><![CDATA[{0} - Resetear contraseña]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Borrar carpeta]]></entry>
 	<entry key="1268"><![CDATA[El usuario no comparte sus datos personales de contacto.]]></entry>
 	<entry key="1269"><![CDATA[El usuario comparte sus datos personales solamente con sus contactos.]]></entry>
-	<entry key="1282"><![CDATA[Entrar a sala]]></entry>
+
 	<entry key="1287"><![CDATA[Elija su nick-nombre]]></entry>
 	<entry key="1296"><![CDATA[Miembro desde]]></entry>
 	<entry key="1301"><![CDATA[Nuevo mensaje privado:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Base de datos chequeada exitosamente]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Por favor pulse el botón "Finalizar" para comenzar la instalación.]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Instalación fallida]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Instalación]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Instalación]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Por favor aguarde, instalación en progreso...]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[Dirección de correo]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Introduzca una dirección de correo]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Nombre]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Introduzca una Organización por omisión]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path (Ruta)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Instalar ImageMagick en el servidor, puede obtener más información en http://www.imagemagick.org observando instalación. Las instrucciones para la misma puede encontrarlas aquí http://www.imagemagick.org/script/binary-releases.php, de todos modos en la mayoría de los sistemas linux puede conseguirlo via su paquete favorito de administración (apt-get it).]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Introduzca la ruta a ImageMagick, o déjelo en blanco si ImageMagick está registrado en el path del sistema]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Instalación]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path (Ruta) para jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[El path (ruta) a OpenOffice/LibreOffice (opcional) por favor configúrelo correctamente en caso de que jodconverter no pueda encontrar la instalación de OpenOffice/LibreOffice]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[Ruta a OpenOffice/LibreOffice (opcional), por favor introdúzcala en el caso que jodconverter no encuentre a OpenOffice/LibreOffice automáticamente]]></entry>
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 bbefc52..4911d8a 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[صفحه اصلی]]></entry>
 	<entry key="125"><![CDATA[كاربر]]></entry>
 	<entry key="126"><![CDATA[گروه ها]]></entry>
-	<entry key="131"><![CDATA[ورود]]></entry>
+	<entry key="lbl.enter"><![CDATA[ورود]]></entry>
 	<entry key="135"><![CDATA[نام:]]></entry>
 	<entry key="136"><![CDATA[نام خانوادگی:]]></entry>
 	<entry key="138"><![CDATA[تاریخ تولد:]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[اگر با مسیر ارتباطی مشکلی دارید لطفا لینک را کپی کرده و آنرا در مرورگر خود اجرا کنید:]]></entry>
 	<entry key="506"><![CDATA[جزییات حساب کاربری]]></entry>
 	<entry key="507"><![CDATA[جزییات حساب کاربری شما:]]></entry>
-	<entry key="510"><![CDATA[ایمیل:]]></entry>
+	<entry key="lbl.email"><![CDATA[ایمیل:]]></entry>
 	<entry key="511"><![CDATA[تیم-{0}]]></entry>
 	<entry key="512"><![CDATA[جزییات حساب کاربری شما]]></entry>
 	<entry key="513"><![CDATA[تنظیم دوباره رمز عبور-{0}]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[حذف پوشه]]></entry>
 	<entry key="1268"><![CDATA[کاربر اطلاعات شخص تماس خود را به اشتراک نمی گذارد]]></entry>
 	<entry key="1269"><![CDATA[کاربر اطلاعات شخصی تماس خود را فقط با لیست تماس خود به اشتراک می گذارد.]]></entry>
-	<entry key="1282"><![CDATA[ورود به اتاق]]></entry>
+
 	<entry key="1287"><![CDATA[انتخاب نام مستعار]]></entry>
 	<entry key="1296"><![CDATA[عضویت از]]></entry>
 	<entry key="1301"><![CDATA[پیام خصوصی جدید:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[مسیر ImageMagick]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[لطفاً دکمه پایان را کلیک را برای شروع نصب کلیک کنید!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[شکست نصب]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[نصب]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[نصب]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[منتظر بمانید،نصب در حال اجراست]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[پست الکترونیک]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[یک پست الکترونیک وارد کنید]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[نام]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[وارد کردن گروه پیش فرض]]></entry>
@@ -797,7 +797,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[مسیر ImageMagick]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[ImageMagick را بر روی سرور نصب کنید، شما می توانید اطلاعات بیشتر را در http://www.ImageMagick.org با توجه به نصب دریافت کنید. دستورات نصب در آدرس http://www.ImageMagick.org/Script/binary-releases.php، یافت می شود، با این حال در اکثر سیستم های لینوکس میتوانید آنرا از طریق بسته مدیریتی دلخواه دریافت کنید.]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[مسیر را در وارد کنید ImageMagick, اگر ImageMagick به طور موفق در مسیر سیستم نصب شده است مسیر را خالی بگذارید]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[نصب]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[در صورتیکه مبدل jod قادر نیست نصب OpenOffice  را بیابد ، لطفا آنرا در مسیر واقعی تنظیم کنید]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[درصورتیکه مبدل jod قادر به یافتن نصب OpenOffice/LibreOffice به طور خودکار نمی باشد،لطفاًآنرا در مسیر واقعی تنظیم کنید]]></entry>
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 3192bee..8726ccc 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Koti]]></entry>
 	<entry key="125"><![CDATA[Users]]></entry>
 	<entry key="126"><![CDATA[Ryhmät]]></entry>
-	<entry key="131"><![CDATA[astu sisään]]></entry>
+	<entry key="lbl.enter"><![CDATA[astu sisään]]></entry>
 	<entry key="135"><![CDATA[Etunimi]]></entry>
 	<entry key="136"><![CDATA[Sukunimi]]></entry>
 	<entry key="138"><![CDATA[Synnyinaika]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[jos linkin kanssa on ongelmia, ole hyvä ja kopioi se selaimesi osoiteriville:]]></entry>
 	<entry key="506"><![CDATA[{0} Rekisteröinti]]></entry>
 	<entry key="507"><![CDATA[Käyttäjätietosi:]]></entry>
-	<entry key="510"><![CDATA[Sähköposti:]]></entry>
+	<entry key="lbl.email"><![CDATA[Sähköposti:]]></entry>
 	<entry key="511"><![CDATA[{0}-Tiimi]]></entry>
 	<entry key="512"><![CDATA[{0} Rekisteröinti]]></entry>
 	<entry key="513"><![CDATA[{0} - Salasanan nollaus]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 04f73e9..e5e2a0e 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Accueil]]></entry>
 	<entry key="125"><![CDATA[Utilisateurs]]></entry>
 	<entry key="126"><![CDATA[Groupes]]></entry>
-	<entry key="131"><![CDATA[Entrer]]></entry>
+	<entry key="lbl.enter"><![CDATA[Entrer]]></entry>
 	<entry key="135"><![CDATA[Prénom]]></entry>
 	<entry key="136"><![CDATA[Nom]]></entry>
 	<entry key="138"><![CDATA[Date de naissance]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Si ce lien ne fonctionne pas, copier/coller-le dans votre navigateur.]]></entry>
 	<entry key="506"><![CDATA[Inscription {0}]]></entry>
 	<entry key="507"><![CDATA[Vos données utilisateur :]]></entry>
-	<entry key="510"><![CDATA[Courriel :]]></entry>
+	<entry key="lbl.email"><![CDATA[Courriel :]]></entry>
 	<entry key="511"><![CDATA[Equipe-{0}]]></entry>
 	<entry key="512"><![CDATA[Inscription {0}]]></entry>
 	<entry key="513"><![CDATA[{0} - Réinitialiser mot de passe]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Supprimer un dossier]]></entry>
 	<entry key="1268"><![CDATA[L'utilisateur ne partage pas ses données personnelles de contact.]]></entry>
 	<entry key="1269"><![CDATA[L'utilisateur ne partage ses données personnelles de contact qu'avec ses contacts.]]></entry>
-	<entry key="1282"><![CDATA[Entrer dans la salle]]></entry>
+
 	<entry key="1287"><![CDATA[Choisissez votre pseudo]]></entry>
 	<entry key="1296"><![CDATA[Date inscr.]]></entry>
 	<entry key="1301"><![CDATA[Nouveau message privé :]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[La vérification de la base de données a été réalisé avec succès]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Veuillez cliquer sur "Terminer" pour commencer l'installation !]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[L'installation a échoué]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Veuillez patienter s'il vous plaît, l'installation est en cours]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[Courriel]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Entrez une adresse de courriel]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Nom]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Entrez le nom de votre organisation]]></entry>
@@ -799,7 +799,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[Chemin vers ImageMagick]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installez ImageMagick sur le serveur. Vous trouverez plus d'informations à l'adresse http://www.imagemagick.org. Les instructions d'installation peuvent être trouvées ici http://www.imagemagick.org/script/binary-releases.php. Sur la majorité des systèmes linux vous pouvez le trouver via votre gestionnaire de paquets (apt-get).]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Indiquez le chemin vers ImageMagick dans le cas où ImageMagick ne se trouve pas dans le chemin système.]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[Chemin vers OpenOffice-/LibreOffice pour jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[Chemin vers OpenOffice/LibreOffice (optionnel). Indiquez le chemin réel dans le cas où jodconverter ne pourrait pas trouver l'installation de OpenOffice-/LibreOffice automatiquement.]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[Chemin vers OpenOffice/LibreOffice (optionnel). Indiquez le chemin réel dans le cas où jodconverter ne pourrait pas trouver l'installation de OpenOffice-/LibreOffice automatiquement.]]></entry>
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 b5dd2f6..3416af2 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Inicio]]></entry>
 	<entry key="125"><![CDATA[Usuarios]]></entry>
 	<entry key="126"><![CDATA[Grupos]]></entry>
-	<entry key="131"><![CDATA[Entrar]]></entry>
+	<entry key="lbl.enter"><![CDATA[Entrar]]></entry>
 	<entry key="135"><![CDATA[Nome]]></entry>
 	<entry key="136"><![CDATA[Apelido(s)]]></entry>
 	<entry key="138"><![CDATA[Data de nacemento]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Se ten problemas coa ligazón, suxerímoslle que copie e pegue o seguinte texto no seu navegador:]]></entry>
 	<entry key="506"><![CDATA[{0}, rexistro]]></entry>
 	<entry key="507"><![CDATA[Os seus datos de usuario:]]></entry>
-	<entry key="510"><![CDATA[Correo-e:]]></entry>
+	<entry key="lbl.email"><![CDATA[Correo-e:]]></entry>
 	<entry key="511"><![CDATA[{0} - Equipo]]></entry>
 	<entry key="512"><![CDATA[{0}, rexistro]]></entry>
 	<entry key="513"><![CDATA[{0} - Restablecer o contrasinal]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
index f9ce33c..6a47e13 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Users]]></entry>
 	<entry key="126"><![CDATA[Groups]]></entry>
-	<entry key="131"><![CDATA[Enter]]></entry>
+	<entry key="lbl.enter"><![CDATA[Enter]]></entry>
 	<entry key="135"><![CDATA[Title/first name]]></entry>
 	<entry key="136"><![CDATA[Last name]]></entry>
 	<entry key="138"><![CDATA[Birthday]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[If you have problems with the link, please copy and paste this to your browser:]]></entry>
 	<entry key="506"><![CDATA[{0} Account Details]]></entry>
 	<entry key="507"><![CDATA[Your account details]]></entry>
-	<entry key="510"><![CDATA[Email]]></entry>
+	<entry key="lbl.email"><![CDATA[Email]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[Your {0} account details]]></entry>
 	<entry key="513"><![CDATA[{0} - Reset Password]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nick name]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 72b541a..e4e5481 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Nyitó oldal]]></entry>
 	<entry key="125"><![CDATA[Felhasználók]]></entry>
 	<entry key="126"><![CDATA[Csoportok]]></entry>
-	<entry key="131"><![CDATA[belépés]]></entry>
+	<entry key="lbl.enter"><![CDATA[belépés]]></entry>
 	<entry key="135"><![CDATA[Keresztnév]]></entry>
 	<entry key="136"><![CDATA[Családnév]]></entry>
 	<entry key="138"><![CDATA[Születésnap]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[ha problémád adódik a linkkel akkor ezt másold a böngésző címsorába:]]></entry>
 	<entry key="506"><![CDATA[{0} Regisztráció]]></entry>
 	<entry key="507"><![CDATA[Felhasználói adataid:]]></entry>
-	<entry key="510"><![CDATA[EMail:]]></entry>
+	<entry key="lbl.email"><![CDATA[EMail:]]></entry>
 	<entry key="511"><![CDATA[{0}-Csapat]]></entry>
 	<entry key="512"><![CDATA[{0} Regisztráció]]></entry>
 	<entry key="513"><![CDATA[{0} - Jelszó csere]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Könyvtár törlése]]></entry>
 	<entry key="1268"><![CDATA[A felhasználó nem osztotta meg a privát kapcsolati adatait.]]></entry>
 	<entry key="1269"><![CDATA[A felhasználó csak a kpcsolataival osztotta meg a privát kapcsolati adatait.]]></entry>
-	<entry key="1282"><![CDATA[Belépés a szobába]]></entry>
+
 	<entry key="1287"><![CDATA[Válasszon megjelenő felhasználó nevet]]></entry>
 	<entry key="1296"><![CDATA[Felhasználói]]></entry>
 	<entry key="1301"><![CDATA[Új privát üzenet:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Kattintson a "Befejezés" gombra a telepítés folytatásához]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Adja meg az e-mail címét]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Név (domain)]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Adja meg a nevet (domain)]]></entry>
@@ -797,7 +797,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick útvonala]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Telepítse a ImageMagick program csomagot a szerverre. Telepítési útmutató és további információk itt http://www.imagemagick.org http://www.imagemagick.org/script/binary-releases.php, Linux operációs rendszerben használja a beépített csomagkezelőt (apt-get it).]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Adja meg a ImageMagick elérési útvonalát, hagyja üresen, ha az ImageMagick elérhető a rendszer útvonalak közt]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Telepítés]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice útvonala a jodconverterhez]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[Az OpenOffice/LibreOffice (optional) útvonalát a jodconverter nem találja autómatikusan, az abszolút elérési útvonal szükséges]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[Adja meg az OpenOffice/LibreOffice (optional) valós útvonalát, a OpenOffice/LibreOffice nem keresi automatikusan a jodconverter]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
index 8d5245c..a16509c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Halaman Utama]]></entry>
 	<entry key="125"><![CDATA[User]]></entry>
 	<entry key="126"><![CDATA[Group]]></entry>
-	<entry key="131"><![CDATA[masuk]]></entry>
+	<entry key="lbl.enter"><![CDATA[masuk]]></entry>
 	<entry key="135"><![CDATA[Nama Depan]]></entry>
 	<entry key="136"><![CDATA[Nama Belakang]]></entry>
 	<entry key="138"><![CDATA[Ulang tahun]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Jika anda mengalami kesulitan, silahkan copy dan paste link berikut ke browser :]]></entry>
 	<entry key="506"><![CDATA[Daptar ke {0}]]></entry>
 	<entry key="507"><![CDATA[Data anda:]]></entry>
-	<entry key="510"><![CDATA[Email:]]></entry>
+	<entry key="lbl.email"><![CDATA[Email:]]></entry>
 	<entry key="511"><![CDATA[Tim - {0}]]></entry>
 	<entry key="512"><![CDATA[Daftar ke {0}]]></entry>
 	<entry key="513"><![CDATA[Seting ulang password -{0}]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 e458834..2b66395 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Utenti]]></entry>
 	<entry key="126"><![CDATA[Gruppi]]></entry>
-	<entry key="131"><![CDATA[Entra]]></entry>
+	<entry key="lbl.enter"><![CDATA[Entra]]></entry>
 	<entry key="135"><![CDATA[Nome]]></entry>
 	<entry key="136"><![CDATA[Cognome]]></entry>
 	<entry key="138"><![CDATA[Data di nascita]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Se hai problemi con il collegamento, per favore copia e incolla questo sul browser:]]></entry>
 	<entry key="506"><![CDATA[{0} SignUp]]></entry>
 	<entry key="507"><![CDATA[I tuoi dati:]]></entry>
-	<entry key="510"><![CDATA[EMail:]]></entry>
+	<entry key="lbl.email"><![CDATA[EMail:]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[{0} Accesso]]></entry>
 	<entry key="513"><![CDATA[{0} - Re-imposta password]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Cancella cartella]]></entry>
 	<entry key="1268"><![CDATA[L'utente non condivide i propri dati personali.]]></entry>
 	<entry key="1269"><![CDATA[L'utente condivide i propri dati personali solo ai propri contatti.]]></entry>
-	<entry key="1282"><![CDATA[Entra nella stanza]]></entry>
+
 	<entry key="1287"><![CDATA[Scegli il tuo nickname]]></entry>
 	<entry key="1296"><![CDATA[Membro da]]></entry>
 	<entry key="1301"><![CDATA[Nuovo messaggio privato:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Verifica del Database confermata]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Clicca il pulsante "Termina" per avviare l'installazione!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installazione è fallita]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installazione]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installazione]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Attendere prego, l'installazione è in corso]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Specifica una EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Nome]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Specifica una Organizzazione predefinita]]></entry>
@@ -799,7 +799,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[Percorso ImageMagick]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installa ImageMagick sul server, puoi trovare informazioni su http://www.imagemagick.org per l'installazione. Le istruzioni per l'installazione possono essere recuperate qui http://www.imagemagick.org/script/binary-releases.php, comunque nella maggior parte dei sistemi linux potrai recuperarlo dal vostro gestore dei pacchetti (apt-get, yum, etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Specifica il percorso di ImageMagick, lascia vuoto se ImageMagick è già presente nel percorso di sistema]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installazione]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[Percorso OpenOffice/LibreOffice per jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[Percorso di OpenOffice/LibreOffice (opzionale) impostalo al percorso reale nel caso jodconverter non riesca a trovare l'installazione di OpenOffice/LibreOffice]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[Percorsoath di OpenOffice/LibreOffice (opzionale) impostalo al percorso reale nel caso jodconverter non riesca a trovare automaticamente l'installazione  di OpenOffice/LibreOffice]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml
index b830a90..b02458a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Users]]></entry>
 	<entry key="126"><![CDATA[Groups]]></entry>
-	<entry key="131"><![CDATA[Enter]]></entry>
+	<entry key="lbl.enter"><![CDATA[Enter]]></entry>
 	<entry key="135"><![CDATA[Title/first name]]></entry>
 	<entry key="136"><![CDATA[Last name]]></entry>
 	<entry key="138"><![CDATA[Birthday]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[If you have problems with the link, please copy and paste this to your browser:]]></entry>
 	<entry key="506"><![CDATA[{0} Account Details]]></entry>
 	<entry key="507"><![CDATA[Your account details]]></entry>
-	<entry key="510"><![CDATA[Email]]></entry>
+	<entry key="lbl.email"><![CDATA[Email]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[Your {0} account details]]></entry>
 	<entry key="513"><![CDATA[{0} - Reset Password]]></entry>
@@ -447,7 +447,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user does share his personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nick name]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -727,9 +727,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation is failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -772,7 +772,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 095c515..87c204e 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[ホーム]]></entry>
 	<entry key="125"><![CDATA[ユーザー管理]]></entry>
 	<entry key="126"><![CDATA[グループ]]></entry>
-	<entry key="131"><![CDATA[入室]]></entry>
+	<entry key="lbl.enter"><![CDATA[入室]]></entry>
 	<entry key="135"><![CDATA[名]]></entry>
 	<entry key="136"><![CDATA[姓]]></entry>
 	<entry key="138"><![CDATA[誕生日]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[リンクが動作しない場合、ブラウザに下記URLをコピー&ペーストしてください。:]]></entry>
 	<entry key="506"><![CDATA[{0} サインアップ]]></entry>
 	<entry key="507"><![CDATA[あなたの情報:]]></entry>
-	<entry key="510"><![CDATA[メールアドレス:]]></entry>
+	<entry key="lbl.email"><![CDATA[メールアドレス:]]></entry>
 	<entry key="511"><![CDATA[{0}-チーム]]></entry>
 	<entry key="512"><![CDATA[{0} サインアップ]]></entry>
 	<entry key="513"><![CDATA[{0} - パスワードリセット]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[フォルダを削除する]]></entry>
 	<entry key="1268"><![CDATA[ユーザーは個人コンタクト・データを共有していません。]]></entry>
 	<entry key="1269"><![CDATA[ユーザーは個人コンタクト・データをコンタクトとのみ共有しています。]]></entry>
-	<entry key="1282"><![CDATA[入室]]></entry>
+
 	<entry key="1287"><![CDATA[ニックネームを選択してください]]></entry>
 	<entry key="1296"><![CDATA[登録日]]></entry>
 	<entry key="1301"><![CDATA[新規プライベート・メッセージ:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[データベース接続試験に成功しました]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA["インストール"ボタンを押してインストールを開始してください!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[インストールに失敗しました]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[インストール]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[インストール]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[インストール中です。しばらくお待ちください]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[電子メール]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[電子メール・アドレスを入力してください]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[名前]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[既定のグループを入力してください]]></entry>
@@ -799,7 +799,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick のパス]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[ImageMagick をインストールしてください。詳細は http://www.imagemagick.org を参照してください。インストール手順は http://www.imagemagick.org/script/binary-releases.php にありますが、多くのLinuxシステムではそれぞれのパッケージ・マネージャ(apt-get等)で取得可能です]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[ImageMagick のパスを入力してください。システム・パスにインストールされている場合は空欄に設定してください]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[インストール]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[JODConverter が使用する OpenOffice/LibreOffice のパス]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[OpenOffice/LibreOffice のパスを入力してください(オプション)。JODConverter が OpenOffice/LibreOffice を自動で見つけられない場合は、パスを設定する必要があります]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[OpenOffice/LibreOffice のパスを入力してください(オプション)。JODConverter が OpenOffice/LibreOffice を自動で見つけられない場合は、パスを設定する必要があります]]></entry>
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 8be761a..d6642b6 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[집]]></entry>
 	<entry key="125"><![CDATA[유저]]></entry>
 	<entry key="126"><![CDATA[다체]]></entry>
-	<entry key="131"><![CDATA[들어가다]]></entry>
+	<entry key="lbl.enter"><![CDATA[들어가다]]></entry>
 	<entry key="135"><![CDATA[이름]]></entry>
 	<entry key="136"><![CDATA[성]]></entry>
 	<entry key="138"><![CDATA[생일]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[if you have problems with the link, please copy and paste this to your browser:]]></entry>
 	<entry key="506"><![CDATA[{0} SignUp]]></entry>
 	<entry key="507"><![CDATA[Your userdata:]]></entry>
-	<entry key="510"><![CDATA[EMail:]]></entry>
+	<entry key="lbl.email"><![CDATA[EMail:]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[{0} Sign-Up]]></entry>
 	<entry key="513"><![CDATA[{0} - Reset Password]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 1099b1d..f27ddc2 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Start]]></entry>
 	<entry key="125"><![CDATA[Gebruikers]]></entry>
 	<entry key="126"><![CDATA[Groepen]]></entry>
-	<entry key="131"><![CDATA[Deelnemen]]></entry>
+	<entry key="lbl.enter"><![CDATA[Deelnemen]]></entry>
 	<entry key="135"><![CDATA[Voornaam]]></entry>
 	<entry key="136"><![CDATA[Achternaam]]></entry>
 	<entry key="138"><![CDATA[Geboortedatum]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Als je problemen ondervindt met de link, kopieer en plak deze in een internet browser:]]></entry>
 	<entry key="506"><![CDATA[{0} registeren]]></entry>
 	<entry key="507"><![CDATA[Je gebruikersgegevens:]]></entry>
-	<entry key="510"><![CDATA[E-mail:]]></entry>
+	<entry key="lbl.email"><![CDATA[E-mail:]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[{0} Registeren]]></entry>
 	<entry key="513"><![CDATA[{0} - Wachtwoord Reset]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 a4d04d6..431dad7 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Kokpit webinariów]]></entry>
 	<entry key="125"><![CDATA[Użytkownicy]]></entry>
 	<entry key="126"><![CDATA[Grupy]]></entry>
-	<entry key="131"><![CDATA[Wejdź]]></entry>
+	<entry key="lbl.enter"><![CDATA[Wejdź]]></entry>
 	<entry key="135"><![CDATA[Imię]]></entry>
 	<entry key="136"><![CDATA[Nazwisko]]></entry>
 	<entry key="138"><![CDATA[Urodziny]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[jeśli masz kłopot z linkiem, skopiuj go i wklej do paska adresu w przeglądarce:]]></entry>
 	<entry key="506"><![CDATA[{0} Zapisy]]></entry>
 	<entry key="507"><![CDATA[Twoje dane użytkownika:]]></entry>
-	<entry key="510"><![CDATA[e-mail:]]></entry>
+	<entry key="lbl.email"><![CDATA[e-mail:]]></entry>
 	<entry key="511"><![CDATA[Zespół {0}]]></entry>
 	<entry key="512"><![CDATA[{0} Zapisy]]></entry>
 	<entry key="513"><![CDATA[{0} - zmiana hasła]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Usuń folder]]></entry>
 	<entry key="1268"><![CDATA[Użytkownik nie udostępnia swoich osobistych danych kontaktowych.]]></entry>
 	<entry key="1269"><![CDATA[Użytkownik udostępnia swoje osobiste dane kontaktowe tylko kontaktom.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Wybierz swój pseudonim]]></entry>
 	<entry key="1296"><![CDATA[Członek od]]></entry>
 	<entry key="1301"><![CDATA[Nowa prywatna wiadomość:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 3b179c9..054797a 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[home]]></entry>
 	<entry key="125"><![CDATA[Usuários]]></entry>
 	<entry key="126"><![CDATA[Grupos]]></entry>
-	<entry key="131"><![CDATA[entrar]]></entry>
+	<entry key="lbl.enter"><![CDATA[entrar]]></entry>
 	<entry key="135"><![CDATA[Primeiro nome]]></entry>
 	<entry key="136"><![CDATA[Último nome]]></entry>
 	<entry key="138"><![CDATA[Aniversário]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[se você tem problemas com o link, por favor copie e cole isso no seu browser:]]></entry>
 	<entry key="506"><![CDATA[{0} SignUp]]></entry>
 	<entry key="507"><![CDATA[Seus dados:]]></entry>
-	<entry key="510"><![CDATA[EMail:]]></entry>
+	<entry key="lbl.email"><![CDATA[EMail:]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[{0} Sign-Up]]></entry>
 	<entry key="513"><![CDATA[{0} - Reset Password]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 8661014..0f7eccf 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Início]]></entry>
 	<entry key="125"><![CDATA[Usuários]]></entry>
 	<entry key="126"><![CDATA[Grupos]]></entry>
-	<entry key="131"><![CDATA[entrar]]></entry>
+	<entry key="lbl.enter"><![CDATA[entrar]]></entry>
 	<entry key="135"><![CDATA[Primeiro nome]]></entry>
 	<entry key="136"><![CDATA[Último nome]]></entry>
 	<entry key="138"><![CDATA[Aniversário]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[se você tiver problemas com o link, por favor copie e cole isso no seu browser:]]></entry>
 	<entry key="506"><![CDATA[{0} Inscrição]]></entry>
 	<entry key="507"><![CDATA[Seus dados:]]></entry>
-	<entry key="510"><![CDATA[Email:]]></entry>
+	<entry key="lbl.email"><![CDATA[Email:]]></entry>
 	<entry key="511"><![CDATA[TVQWEB - Equipe]]></entry>
 	<entry key="512"><![CDATA[TVQWEB - Inscrição]]></entry>
 	<entry key="513"><![CDATA[TVQWEB - Redefinição de Senha]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[excluir pasta]]></entry>
 	<entry key="1268"><![CDATA[O usuário não compartilha seus dados de contato pessoal.]]></entry>
 	<entry key="1269"><![CDATA[O usuário não compartilha seus dados pessoais de contacto só para contatos.]]></entry>
-	<entry key="1282"><![CDATA[Entre na sala]]></entry>
+
 	<entry key="1287"><![CDATA[Escolha seu apelido]]></entry>
 	<entry key="1296"><![CDATA[Membro desde]]></entry>
 	<entry key="1301"><![CDATA[Nova mensagem privada:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Instalação]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Instalação]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 116bcf1..f134130 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[На главную]]></entry>
 	<entry key="125"><![CDATA[Пользователи]]></entry>
 	<entry key="126"><![CDATA[Группы]]></entry>
-	<entry key="131"><![CDATA[Вход]]></entry>
+	<entry key="lbl.enter"><![CDATA[Вход]]></entry>
 	<entry key="135"><![CDATA[Имя]]></entry>
 	<entry key="136"><![CDATA[Фамилия]]></entry>
 	<entry key="138"><![CDATA[Дата рождения]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Если не удаётся перейти по ссылке, скопируйте этот URL в браузер:]]></entry>
 	<entry key="506"><![CDATA[{0} регистрация]]></entry>
 	<entry key="507"><![CDATA[Ваши пользовательские данные:]]></entry>
-	<entry key="510"><![CDATA[e-mail:]]></entry>
+	<entry key="lbl.email"><![CDATA[e-mail:]]></entry>
 	<entry key="511"><![CDATA[{0}-Команда]]></entry>
 	<entry key="512"><![CDATA[Регистрация в {0}]]></entry>
 	<entry key="513"><![CDATA[{0}: Переустановить пароль]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Удалить папку]]></entry>
 	<entry key="1268"><![CDATA[Пользователь не дал совместного доступа к его персональным данным.]]></entry>
 	<entry key="1269"><![CDATA[Пользователь разрешил доступ к своим персональным данным только контактам.]]></entry>
-	<entry key="1282"><![CDATA[Войти в комнату]]></entry>
+
 	<entry key="1287"><![CDATA[Выберите ваш ник]]></entry>
 	<entry key="1296"><![CDATA[Зарегистрирован]]></entry>
 	<entry key="1301"><![CDATA[Новое приватное сообщение:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Проверка БД прошла успешно]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Пожалуйста нажмите кнопку "Закончить" для запуска установки!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Ошибка установки]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Установка]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Установка]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Пожалуйста подождите, идёт установка]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[Электронная почта]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Введите адрес электронной почты]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Наименование]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Введите группу по умолчанию]]></entry>
@@ -799,7 +799,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Путь]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Установите ImageMagick на Ваш сервер, более подробную информацию касающуюся установки можно посмотреть тут http://www.imagemagick.org Инструкцию по установке Вы можете найти здесь http://www.imagemagick.org/script/binary-releases.php, однако в большинстве систем Линукс Вы можете установить его через Ваш менеджер пакетов (apt-get it)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Укажите путь к ImageMagick, или не заполняйте данное поле если ImageMagick установлен в путях Вашей системы]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Установка]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Путь для jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[Путь к OpenOffice/LibreOffice (не обязательный) пожалуйста установите этот путь в случае когда jodconverter не в состоянии найти путь к установленному OpenOffice/LibreOffice]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[Путь к OpenOffice/LibreOffice (не обязательный) пожалуйста установите этот путь в случае когда jodconverter не в состоянии найти автоматически путь к  установленному OpenOffice/LibreOffice]]></entry>
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 c067b14..df607e3 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Domov]]></entry>
 	<entry key="125"><![CDATA[Používatelia]]></entry>
 	<entry key="126"><![CDATA[Skupiny]]></entry>
-	<entry key="131"><![CDATA[Vstup]]></entry>
+	<entry key="lbl.enter"><![CDATA[Vstup]]></entry>
 	<entry key="135"><![CDATA[Titul/Meno]]></entry>
 	<entry key="136"><![CDATA[Priezvisko]]></entry>
 	<entry key="138"><![CDATA[Narodeniny]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Ak máte problém s odkazom, skopírujte ho do vášho prehliadača:]]></entry>
 	<entry key="506"><![CDATA[{0} prihláseniep]]></entry>
 	<entry key="507"><![CDATA[Your userdata]]></entry>
-	<entry key="510"><![CDATA[Email]]></entry>
+	<entry key="lbl.email"><![CDATA[Email]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[{0} prihlásenie]]></entry>
 	<entry key="513"><![CDATA[{0} - Reset Password]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 0eb2209..27a8b65 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Hem]]></entry>
 	<entry key="125"><![CDATA[Användare]]></entry>
 	<entry key="126"><![CDATA[Grupper]]></entry>
-	<entry key="131"><![CDATA[Anslut]]></entry>
+	<entry key="lbl.enter"><![CDATA[Anslut]]></entry>
 	<entry key="135"><![CDATA[Titel/förnamn]]></entry>
 	<entry key="136"><![CDATA[Efternamn]]></entry>
 	<entry key="138"><![CDATA[Födelsedag]]></entry>
@@ -202,7 +202,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Om du har problem med länken, var vänlig kopiera och klistra in detta i din webbläsare:]]></entry>
 	<entry key="506"><![CDATA[{0} Kontodetaljer]]></entry>
 	<entry key="507"><![CDATA[Dina kontodetaljer]]></entry>
-	<entry key="510"><![CDATA[E-postadress]]></entry>
+	<entry key="lbl.email"><![CDATA[E-postadress]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[{0} Registrering]]></entry>
 	<entry key="513"><![CDATA[{0} - Återställ Lösenord]]></entry>
@@ -450,7 +450,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Radera mapp]]></entry>
 	<entry key="1268"><![CDATA[Användaren delar inte sina personliga data.]]></entry>
 	<entry key="1269"><![CDATA[Användaren delar sina personliga data endast med sina kontakter.]]></entry>
-	<entry key="1282"><![CDATA[Gå in i rummet]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Medlem sedan]]></entry>
 	<entry key="1301"><![CDATA[Nytt privatmeddelande:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Vänligen klicka "Slutför" för att starta installationen! ]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[E-post]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Namn]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Ange en förvald grupp]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[Sökväg till ImageMagick]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installera ImageMagick på servern. Du kan få mer information på http://www.imagemagick.org beträffande installationen. Installationsinstruktioner finns på http://www.imagemagick.org/script/binary-releases.php, men på de flesta linuxsystem kan det installeras genom systemets pakethanterare (apt-get, yum, dnf etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Ange sökvägen till ImageMagick, lämna tomt om ImageMagick är korrekt installerad i systemsökvägen]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice sökväg för jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[Sökvägen till OpenOffice/LibreOffice (optionell). Vänligen sätt detta till den korrekta sökvägen ifall jodconverter inte kan hitta OpenOffice/LibreOfficeinstallationen]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[Sökvägen till OpenOffice/LibreOffice (optionell). Vänligen sätt detta till den riktiga sökvägen ifall jodconverter misslyckas hitta OpenOffice/LibreOffice-installationen automatiskt]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
index fea0d74..b3e66e3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Home]]></entry>
 	<entry key="125"><![CDATA[Users]]></entry>
 	<entry key="126"><![CDATA[Groups]]></entry>
-	<entry key="131"><![CDATA[Enter]]></entry>
+	<entry key="lbl.enter"><![CDATA[Enter]]></entry>
 	<entry key="135"><![CDATA[Title/first name]]></entry>
 	<entry key="136"><![CDATA[Last name]]></entry>
 	<entry key="138"><![CDATA[Birthday]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[If you have problems with the link, please copy and paste this to your browser:]]></entry>
 	<entry key="506"><![CDATA[{0} Account Details]]></entry>
 	<entry key="507"><![CDATA[Your account details]]></entry>
-	<entry key="510"><![CDATA[Email]]></entry>
+	<entry key="lbl.email"><![CDATA[Email]]></entry>
 	<entry key="511"><![CDATA[{0}-Team]]></entry>
 	<entry key="512"><![CDATA[Your {0} account details]]></entry>
 	<entry key="513"><![CDATA[{0} - Reset Password]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nick name]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -800,7 +800,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 e7d21da..d903b8b 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[หน้าแรก]]></entry>
 	<entry key="125"><![CDATA[ผู้ใช้]]></entry>
 	<entry key="126"><![CDATA[กลุ่ม]]></entry>
-	<entry key="131"><![CDATA[เข้าห้อง]]></entry>
+	<entry key="lbl.enter"><![CDATA[เข้าห้อง]]></entry>
 	<entry key="135"><![CDATA[ชื่อ]]></entry>
 	<entry key="136"><![CDATA[นามสกุล]]></entry>
 	<entry key="138"><![CDATA[วันเกิด]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[หากมีปัญหากับลิงค์นี้ โปรดคัดลอกลิงค์นี้แล้วนำไปวางที่เบราวเซอร์:]]></entry>
 	<entry key="506"><![CDATA[ลงทะเบียนการประชุมแบบเปิด]]></entry>
 	<entry key="507"><![CDATA[ข้อมูลผู้ใช้ของคุณ:]]></entry>
-	<entry key="510"><![CDATA[อีเมล์:]]></entry>
+	<entry key="lbl.email"><![CDATA[อีเมล์:]]></entry>
 	<entry key="511"><![CDATA[การประชุมแบบเปิด - ทีม]]></entry>
 	<entry key="512"><![CDATA[ลงทะเบียนการประชุมแบบเปิด]]></entry>
 	<entry key="513"><![CDATA[การประชุมแบบเปิด - ตั้งรหัสผ่านใหม่]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 eedfe54..84dbe7f 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[Ev]]></entry>
 	<entry key="125"><![CDATA[Kullanıcılar]]></entry>
 	<entry key="126"><![CDATA[Gruplar]]></entry>
-	<entry key="131"><![CDATA[giriş]]></entry>
+	<entry key="lbl.enter"><![CDATA[giriş]]></entry>
 	<entry key="135"><![CDATA[Ad]]></entry>
 	<entry key="136"><![CDATA[Soyad]]></entry>
 	<entry key="138"><![CDATA[Doğum günü]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Bağlantı (link) ile ilgili probleminiz varsa, lütfen bağlantıyı kopyalayarak tarayıcınızın adres çubuğuna yapıştırınız:]]></entry>
 	<entry key="506"><![CDATA[{0} Kayıt]]></entry>
 	<entry key="507"><![CDATA[Kullanıcı verileriniz:]]></entry>
-	<entry key="510"><![CDATA[E-posta:]]></entry>
+	<entry key="lbl.email"><![CDATA[E-posta:]]></entry>
 	<entry key="511"><![CDATA[{0}-Takımı]]></entry>
 	<entry key="512"><![CDATA[{0} Kayıt Ol]]></entry>
 	<entry key="513"><![CDATA[{0} - Şifre Sıfırla]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
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 22c1a40..0e4c494 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[На головну]]></entry>
 	<entry key="125"><![CDATA[Користувачі]]></entry>
 	<entry key="126"><![CDATA[Групи]]></entry>
-	<entry key="131"><![CDATA[Вхід]]></entry>
+	<entry key="lbl.enter"><![CDATA[Вхід]]></entry>
 	<entry key="135"><![CDATA[Ім'я]]></entry>
 	<entry key="136"><![CDATA[Прізвище]]></entry>
 	<entry key="138"><![CDATA[Дата народження]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[Якщо ви має проблему з даним посилання, будь-ласка скопіюйте його і вставте в свій браузер:]]></entry>
 	<entry key="506"><![CDATA[{0} SignUp]]></entry>
 	<entry key="507"><![CDATA[Ваші дані користувача:]]></entry>
-	<entry key="510"><![CDATA[E-mail:]]></entry>
+	<entry key="lbl.email"><![CDATA[E-mail:]]></entry>
 	<entry key="511"><![CDATA[Команда {0}]]></entry>
 	<entry key="512"><![CDATA[{0} Sign-Up]]></entry>
 	<entry key="513"><![CDATA[{0} - Відновити пароль]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Видалити теку]]></entry>
 	<entry key="1268"><![CDATA[Користувач не дав спільного доступу до його персональних даних.]]></entry>
 	<entry key="1269"><![CDATA[Користувач дозволив доступ до своїх персональних даних лише контактів.]]></entry>
-	<entry key="1282"><![CDATA[Увійти в кімнату]]></entry>
+
 	<entry key="1287"><![CDATA[Виберіть ваш нік]]></entry>
 	<entry key="1296"><![CDATA[Записаний з]]></entry>
 	<entry key="1301"><![CDATA[Нове приватне повідомлення:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Перевірка БД пройшла успішно]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[будь Ласка, натисніть кнопку "Готово" для інсталяції!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Помилка установки]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Установка]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Установка]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[зачекайте, йде установка]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[пошта]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Введіть адресу електронної пошти]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Назва]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Введіть організацію за замовчуванням]]></entry>
@@ -799,7 +799,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Шлях]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Установите ImageMagick на Ваш сервер, более подробную информацию касающуюся установки можно посмотреть тут http://www.imagemagick.org Инструкцию по установке Вы можете найти здесь http://www.imagemagick.org/script/binary-releases.php, однако в большинстве систем Линукс Вы можете установить его через Ваш менеджер пакетов (apt-get it)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Вкажіть шлях до ImageMagick, або не заповнюйте це поле якщо ImageMagick встановлений в шляхах Вашої системи]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Установка]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Шлях для jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[Шлях до OpenOffice/LibreOffice (не обов'язковий) будь ласка, встановіть цей шлях у разі коли jodconverter не в змозі знайти шлях до встановленого OpenOffice/LibreOffice]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[Шлях до OpenOffice/LibreOffice (не обов'язковий) будь ласка, встановіть цей шлях, у разі коли jodconverter не в змозі знайти автоматично шлях до встановленого OpenOffice/LibreOffice]]></entry>
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 08088b4..7fc1219 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[首页]]></entry>
 	<entry key="125"><![CDATA[用户管理]]></entry>
 	<entry key="126"><![CDATA[群组管理]]></entry>
-	<entry key="131"><![CDATA[进入]]></entry>
+	<entry key="lbl.enter"><![CDATA[进入]]></entry>
 	<entry key="135"><![CDATA[姓]]></entry>
 	<entry key="136"><![CDATA[名]]></entry>
 	<entry key="138"><![CDATA[生日]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[如果你在此链接遇到问题, 请拷贝并粘贴此链接到浏览器中:]]></entry>
 	<entry key="506"><![CDATA[{0}——注册]]></entry>
 	<entry key="507"><![CDATA[你的用户数据:]]></entry>
-	<entry key="510"><![CDATA[邮件:]]></entry>
+	<entry key="lbl.email"><![CDATA[邮件:]]></entry>
 	<entry key="511"><![CDATA[{0}——团队]]></entry>
 	<entry key="512"><![CDATA[{0}——注册]]></entry>
 	<entry key="513"><![CDATA[{0}——重置密码]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[删除文件夹]]></entry>
 	<entry key="1268"><![CDATA[用户没有共享个人信息]]></entry>
 	<entry key="1269"><![CDATA[用户只对他的联系人共享信息]]></entry>
-	<entry key="1282"><![CDATA[进入会议室]]></entry>
+
 	<entry key="1287"><![CDATA[选择您的昵称]]></entry>
 	<entry key="1296"><![CDATA[成为成员的时间]]></entry>
 	<entry key="1301"><![CDATA[新的私人消息:]]></entry>
@@ -754,9 +754,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[数据库检查成功]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[请按“完成”按钮开始安装!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[安装失败]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[请等待,安装在进行中]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[电子邮件]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[输入电子邮件]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[名称]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[输入默认组织]]></entry>
@@ -799,7 +799,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick 路径]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[安装 ImageMagick 在服务器上,你可以得到更多的信息在 http://www.imagemagick.org 关于安装. 安装的说明可以在这里找到 http://www.imagemagick.org/script/binary-releases.php, 然而,在大多数linux系统中,您可以通过您最喜爱的软件包管理器来获得它(apt-get it)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[输入ImageMagick的路径, 如果ImageMagick成功安装到系统路径,就不用填写这个字段]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[安装]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice和LibreOffice使用jodconverter的路径]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[OpenOffice和LibreOffice的路径(可选),请把它指向真实路径,以防 jodconverter不能自动找到OpenOffice/LibreOffice 安装]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[OpenOffice和LibreOffice的路径(可选),请把它指向真实路径,以防 jodconverter不能自动找到OpenOffice/LibreOffice 安装]]></entry>
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 b9d14b4..4cbd5d5 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
@@ -85,7 +85,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="124"><![CDATA[首頁]]></entry>
 	<entry key="125"><![CDATA[用戶管理]]></entry>
 	<entry key="126"><![CDATA[團體管理]]></entry>
-	<entry key="131"><![CDATA[進入]]></entry>
+	<entry key="lbl.enter"><![CDATA[進入]]></entry>
 	<entry key="135"><![CDATA[名稱]]></entry>
 	<entry key="136"><![CDATA[姓氏]]></entry>
 	<entry key="138"><![CDATA[生日]]></entry>
@@ -201,7 +201,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="505"><![CDATA[如果您有問題連接,請複製並貼到你的瀏覽器上:]]></entry>
 	<entry key="506"><![CDATA[{0} - 註冊]]></entry>
 	<entry key="507"><![CDATA[你的用戶數據:]]></entry>
-	<entry key="510"><![CDATA[郵箱:]]></entry>
+	<entry key="lbl.email"><![CDATA[郵箱:]]></entry>
 	<entry key="511"><![CDATA[{0}-團隊]]></entry>
 	<entry key="512"><![CDATA[{0} - 註冊]]></entry>
 	<entry key="513"><![CDATA[{0} - 重設密碼]]></entry>
@@ -449,7 +449,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1262"><![CDATA[Delete folder]]></entry>
 	<entry key="1268"><![CDATA[The user does not share his personal contact data.]]></entry>
 	<entry key="1269"><![CDATA[The user shares their personal contact data only to contacts.]]></entry>
-	<entry key="1282"><![CDATA[Enter room]]></entry>
+
 	<entry key="1287"><![CDATA[Choose your nickname]]></entry>
 	<entry key="1296"><![CDATA[Member since]]></entry>
 	<entry key="1301"><![CDATA[New private message:]]></entry>
@@ -753,9 +753,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.valid"><![CDATA[Database check was successfull]]></entry>
 	<entry key="install.wizard.install.desc"><![CDATA[Please click "Finish" button to start installation!]]></entry>
 	<entry key="install.wizard.install.failed"><![CDATA[Installation has failed]]></entry>
-	<entry key="install.wizard.install.header"><![CDATA[Installation]]></entry>
+	<entry key="install.wizard.installation"><![CDATA[Installation]]></entry>
 	<entry key="install.wizard.install.started"><![CDATA[Please wait, installation in progress]]></entry>
-	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
+
 	<entry key="install.wizard.params.step1.email.title"><![CDATA[Enter a EMail]]></entry>
 	<entry key="install.wizard.params.step1.group"><![CDATA[Name]]></entry>
 	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></entry>
@@ -798,7 +798,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found here http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via the system's package manager (apt-get, dnf, yum etc)]]></entry>
 	<entry key="install.wizard.params.step3.imageMagicPath.title"><![CDATA[Enter the path to ImageMagick, leave blank if ImageMagick is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step3.installation"><![CDATA[Installation]]></entry>
+
 	<entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice/LibreOffice Path for jodconverter]]></entry>
 	<entry key="install.wizard.params.step3.officePath.text"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation]]></entry>
 	<entry key="install.wizard.params.step3.officePath.title"><![CDATA[The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
index b3ab90c..7c77b98 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
@@ -32,7 +32,7 @@
 			<input wicket:id="password" wicket:message="title:install.wizard.params.step1.password.title" type="password" class="col-3"/>
 		</div>
 		<div class="formelement">
-			<label wicket:for="email" class="col-3 text-right"><wicket:message key="install.wizard.params.step1.email"/></label>
+			<label wicket:for="email" class="col-3 text-right"><wicket:message key="lbl.email"/></label>
 			<input wicket:id="email" wicket:message="title:install.wizard.params.step1.email.title" type="text" class="col-3"/>
 		</div>
 		<div class="formelement">
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
index fd0087c..a97695c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
@@ -68,7 +68,7 @@
 				<em>
 					<wicket:message key="install.wizard.params.step3.seeAlso"/> <a
 					href="https://openmeetings.apache.org/installation.html"
-					rel="noopener noreferrer" target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a>
+					rel="noopener noreferrer" target="_blank"><wicket:message key="install.wizard.installation"/></a>
 				</em>
 			</p>
 		</div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index 30af522..fdf50f9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -235,7 +235,7 @@ public class InstallWizard extends BootstrapWizard {
 		protected void onInitialize() {
 			super.onInitialize();
 			setSummaryModel(Model.of(""));
-			setTitleModel(Model.of(model.getObject().getAppName() + " - " + getString("install.wizard.install.header")));
+			setTitleModel(Model.of(model.getObject().getAppName() + " - " + getString("install.wizard.installation")));
 		}
 	}
 
@@ -489,7 +489,7 @@ public class InstallWizard extends BootstrapWizard {
 			add(new PasswordTextField("password")
 					.setResetPassword(false).setLabel(new ResourceModel("install.wizard.params.step1.password"))
 					.add(new StrongPasswordValidator(new User())));
-			add(new RequiredTextField<String>("email").setLabel(new ResourceModel("install.wizard.params.step1.email")).add(RfcCompliantEmailAddressValidator.getInstance()));
+			add(new RequiredTextField<String>("email").setLabel(new ResourceModel("lbl.email")).add(RfcCompliantEmailAddressValidator.getInstance()));
 			add(new RequiredTextField<String>("group").setLabel(new ResourceModel("install.wizard.params.step1.group")));
 		}
 
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
index 4a87fa0..4e29e63 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
@@ -37,7 +37,7 @@ public class InstallWizardPage extends BaseNotInitedPage {
 	@Override
 	protected void onInitialize() {
 		super.onInitialize();
-		final InstallWizard wizard = new InstallWizard("wizard", getString("install.wizard.install.header"));
+		final InstallWizard wizard = new InstallWizard("wizard", getString("install.wizard.installation"));
 		add(wizard.setEnabled(false));
 		// This code is required to detect time zone offset
 		add(new AjaxClientInfoBehavior() {
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 82b2341..c0bfe0e 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
@@ -214,7 +214,7 @@ public class AppointmentDialog extends Modal<Appointment> {
 				target.add(feedback);
 			}
 		});
-		addButton(enterRoom = new BootstrapAjaxLink<>("button", null, Buttons.Type.Outline_Success, new ResourceModel("1282")) {
+		addButton(enterRoom = new BootstrapAjaxLink<>("button", null, Buttons.Type.Outline_Success, new ResourceModel("lbl.enter")) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
index b066bc5..3f8cddc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
@@ -107,7 +107,7 @@
 								<tr>
 									<td>
 										<button class="btn btn-outline-primary" wicket:id="enter">
-											<wicket:message key="1282"/>
+											<wicket:message key="lbl.enter"/>
 										</button>
 									</td>
 									<td>
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 240fbcf..f110da7 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
@@ -102,7 +102,7 @@ public class RoomsPanel extends UserPanel {
 
 	@Override
 	protected void onInitialize() {
-		add(new RoomListPanel("list", rooms, getString("131")) {
+		add(new RoomListPanel("list", rooms, getString("lbl.enter")) {
 			private static final long serialVersionUID = 1L;
 
 			@Override