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 04:19:14 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2292] contributions are merged

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 668dd63  [OPENMEETINGS-2292] contributions are merged
668dd63 is described below

commit 668dd63d69bcaa43176a94ad4783122955d0db04
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri May 8 11:18:57 2020 +0700

    [OPENMEETINGS-2292] contributions are merged
---
 .../web/app/Application.properties.xml             |  22 +-
 .../web/app/Application_ar.properties.xml          |  22 +-
 .../web/app/Application_bg.properties.xml          |  20 +-
 .../web/app/Application_bn.properties.xml          |  22 +-
 .../web/app/Application_ca.properties.xml          |  20 +-
 .../web/app/Application_cs.properties.xml          |  22 +-
 .../web/app/Application_da.properties.xml          |  20 +-
 .../web/app/Application_de.properties.xml          | 203 +++++++--------
 .../web/app/Application_el.properties.xml          |  20 +-
 .../web/app/Application_es.properties.xml          |  59 ++---
 .../web/app/Application_fa.properties.xml          |   4 +-
 .../web/app/Application_fi.properties.xml          |  22 +-
 .../web/app/Application_fr.properties.xml          |  10 +-
 .../web/app/Application_gl.properties.xml          |  20 +-
 .../web/app/Application_hi.properties.xml          |  60 ++---
 .../web/app/Application_hu.properties.xml          |  10 +-
 .../web/app/Application_in.properties.xml          |  22 +-
 .../web/app/Application_it.properties.xml          |   8 +-
 ...roperties.xml => Application_iw.properties.xml} |   0
 .../web/app/Application_ja.properties.xml          |   4 +-
 .../web/app/Application_ko.properties.xml          |  22 +-
 .../web/app/Application_nl.properties.xml          |  20 +-
 .../web/app/Application_pl.properties.xml          |  14 +-
 .../web/app/Application_pt.properties.xml          |  22 +-
 .../web/app/Application_pt_BR.properties.xml       |  16 +-
 .../web/app/Application_ru.properties.xml          |   2 +
 .../web/app/Application_sk.properties.xml          |  20 +-
 .../web/app/Application_sv.properties.xml          | 282 ++++++++++-----------
 ...roperties.xml => Application_ta.properties.xml} |  64 ++---
 .../web/app/Application_th.properties.xml          |  22 +-
 .../web/app/Application_tr.properties.xml          |  22 +-
 .../web/app/Application_uk.properties.xml          |   8 +-
 .../web/app/Application_zh_CN.properties.xml       |   8 +-
 .../web/app/Application_zh_TW.properties.xml       |  22 +-
 .../src/main/webapp/languages/languages.xml        |   3 +-
 35 files changed, 599 insertions(+), 538 deletions(-)

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 82ad470..3141801 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to user name" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the login in the LDAP is stored including the domain name. Example: user enters "hans" domain is specified as "localhost.com", login that is verified against LDAP is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add domain to user name]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[]]></entry>
+	<entry key="1149"><![CDATA[]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget to 'Start recording', if you want have the meeting recorded.]]></entry>
 	<entry key="1316"><![CDATA[Start recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 fb77910..437c54e 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[الطريق إلى المؤتمر:]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 7385e41..383574a 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 d016d6b..75ccfa9 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to user name" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the login in the LDAP is stored including the domain name. Example: user enters "hans" domain is specified as "localhost.com", login that is verified against LDAP is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add domain to user name]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[]]></entry>
+	<entry key="1149"><![CDATA[]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget to 'Start recording', if you want have the meeting recorded.]]></entry>
 	<entry key="1316"><![CDATA[Start recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 07a48dc..85e0495 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 526a2d4..4bb98d8 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 15054d6..e0deddd 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 72d8ce8..61c0f0b 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
@@ -64,14 +64,14 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="78"><![CDATA[Kreis]]></entry>
 	<entry key="79"><![CDATA[Pfeil]]></entry>
 	<entry key="80"><![CDATA[Löschen]]></entry>
-	<entry key="82"><![CDATA[Flexible textbox]]></entry>
+	<entry key="82"><![CDATA[Flexible Textbox]]></entry>
 	<entry key="84"><![CDATA[Moderator werden]]></entry>
 	<entry key="85"><![CDATA[Schließen]]></entry>
 	<entry key="86"><![CDATA[Kursiv]]></entry>
 	<entry key="87"><![CDATA[Fett]]></entry>
 	<entry key="98"><![CDATA[Moderator:]]></entry>
 	<entry key="99"><![CDATA[Dieser Raum ist voll. Bitte versuchen Sie es zu einem späteren Zeitpunkt nochmals.]]></entry>
-	<entry key="108"><![CDATA[Login]]></entry>
+	<entry key="108"><![CDATA[Anmelden]]></entry>
 	<entry key="109"><![CDATA[Benutzer/E-Mail]]></entry>
 	<entry key="110"><![CDATA[Passwort]]></entry>
 	<entry key="112"><![CDATA[Einloggen]]></entry>
@@ -159,7 +159,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="315"><![CDATA[E-Mail]]></entry>
 	<entry key="316"><![CDATA[Benutzername]]></entry>
 	<entry key="317"><![CDATA[Dateien]]></entry>
-	<entry key="321"><![CDATA[The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered]]></entry>
+	<entry key="321"><![CDATA[Die E-Mail mit einem speziellen Link wurde an die E-Mail-Adresse gesendet, die für den registrierten Benutzer angegeben wurde.]]></entry>
 	<entry key="325"><![CDATA[Passwort zurücksetzen]]></entry>
 	<entry key="327"><![CDATA[Passwort ändern]]></entry>
 	<entry key="328"><![CDATA[Neues Passwort]]></entry>
@@ -181,7 +181,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="404"><![CDATA[Wählen Sie einen Raum aus, um Details zu erhalten.]]></entry>
 	<entry key="406"><![CDATA[Raum:]]></entry>
 	<entry key="407"><![CDATA[Benutzer in diesem Raum:]]></entry>
-	<entry key="408"><![CDATA[Seit:]]></entry>
+	<entry key="408"><![CDATA[seit:]]></entry>
 	<entry key="419"><![CDATA[Aufnahme gestartet von Benutzer:]]></entry>
 	<entry key="424"><![CDATA[Linienfarbe ändern]]></entry>
 	<entry key="426"><![CDATA[Randfarbe de/aktivieren]]></entry>
@@ -192,7 +192,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="442"><![CDATA[Chatlog löschen]]></entry>
 	<entry key="482"><![CDATA[Teilnehmerzahl]]></entry>
 	<entry key="498"><![CDATA[Es gibt momentan keinen Moderator in diesen Raum. Sie müssen warten, können aber die Moderation beantragen.]]></entry>
-	<entry key="499"><![CDATA[Feedback {0}]]></entry>
+	<entry key="499"><![CDATA[Rückmeldung {0}]]></entry>
 	<entry key="500"><![CDATA[{0} - Einladung]]></entry>
 	<entry key="501"><![CDATA[Nachricht von Benutzer:]]></entry>
 	<entry key="502"><![CDATA[Nachricht:]]></entry>
@@ -226,7 +226,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="552"><![CDATA[Höhe]]></entry>
 	<entry key="553"><![CDATA[Transparenz ändern]]></entry>
 	<entry key="556"><![CDATA[Die Verbindung zum Server ist abgebrochen. Prüfen Sie ihre Netzwerk-Verbindung und starten Sie die Anwendung neu.]]></entry>
-	<entry key="557"><![CDATA[Pointer]]></entry>
+	<entry key="557"><![CDATA[Zeiger]]></entry>
 	<entry key="565"><![CDATA[Erinnerung]]></entry>
 	<entry key="569"><![CDATA[Ort:]]></entry>
 	<entry key="570"><![CDATA[Start]]></entry>
@@ -253,14 +253,14 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="636"><![CDATA[Demoraum]]></entry>
 	<entry key="637"><![CDATA[Demo Zeit]]></entry>
 	<entry key="640"><![CDATA[Moderiert]]></entry>
-	<entry key="641"><![CDATA[Bitte warten Sie bis der Moderator den Raum betreten hat. Der Moderator kann ein Lehrer, ein Administrator oder der Ersteller dieses Raumes sein.]]></entry>
+	<entry key="641"><![CDATA[Bitte warten Sie, bis der Moderator den Raum betreten hat. Der Moderator kann ein Lehrer, ein Administrator oder der Ersteller dieses Raumes sein.]]></entry>
 	<entry key="667"><![CDATA[Um Ihre Registration abzuschließen klicken Sie bitte auf den folgenden Link. Oder kopieren Sie die URL(Link) in Ihre Browser-Adressleiste.]]></entry>
 	<entry key="668"><![CDATA[Klicken Sie um Ihre E-Mail zu bestätigen]]></entry>
 	<entry key="677"><![CDATA[Benutzer]]></entry>
 	<entry key="678"><![CDATA[Zugang zum Zeichenbrett]]></entry>
 	<entry key="679"><![CDATA[Moderator]]></entry>
 	<entry key="692"><![CDATA[Der Benutzer]]></entry>
-	<entry key="696"><![CDATA[Sie müssen warten bis der Moderator den Raum betritt.]]></entry>
+	<entry key="696"><![CDATA[Sie müssen warten, bis der Moderator den Raum betritt.]]></entry>
 	<entry key="702"><![CDATA[Datei hochladen]]></entry>
 	<entry key="703"><![CDATA[Ordner hinzufügen]]></entry>
 	<entry key="705"><![CDATA[Papierkorb (Ziehen Sie eine Datei mit der Maus hierher)]]></entry>
@@ -332,7 +332,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="872"><![CDATA[Aufnahme stoppen]]></entry>
 	<entry key="878"><![CDATA[Bildschirm teilen stoppen]]></entry>
 	<entry key="879"><![CDATA[Benutzerfragen erlauben]]></entry>
-	<entry key="880"><![CDATA[Wenn Sie diese Option aktivieren ist die Schaltfläche zum beantragen der Moderation für andere Teilnehmer nicht sichtbar und Sie werden nicht in ihrem Vortrag gestört.]]></entry>
+	<entry key="880"><![CDATA[Wenn Sie diese Option aktivieren ist die Schaltfläche zum beantragen der Moderation für andere Teilnehmer sichtbar und Sie können in ihrem Vortrag gestört werden.]]></entry>
 	<entry key="881"><![CDATA[Rechte]]></entry>
 	<entry key="887"><![CDATA[Es gab Fehler beim Verarbeiten der Aufzeichnung.]]></entry>
 	<entry key="888"><![CDATA[Die Aufzeichnung ist noch nicht zur Wiedergabe bereit. Versuchen Sie es in einigen Minuten erneut.]]></entry>
@@ -359,7 +359,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1101"><![CDATA[Einstellungen für Raumbeschränkung (zeitlich)]]></entry>
 	<entry key="1102"><![CDATA[Wenn der Raum geschlossen wird, werden die Teilnehmer zum Ausgang (URL) geleitet.]]></entry>
 	<entry key="1103"><![CDATA[LDAP]]></entry>
-	<entry key="1106"><![CDATA[Configurationsdatei]]></entry>
+	<entry key="1106"><![CDATA[Konfigurationsdatei]]></entry>
 	<entry key="1107"><![CDATA[LDAP Konfiguration]]></entry>
 	<entry key="1109"><![CDATA[Aktiviert]]></entry>
 	<entry key="1110"><![CDATA[Eingefügt]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Zeitzone]]></entry>
 	<entry key="1146"><![CDATA[Beschreibung]]></entry>
 	<entry key="1147"><![CDATA[Erstellt von]]></entry>
+	<entry key="1148"><![CDATA[Hinweis zur Zeitzone]]></entry>
+	<entry key="1149"><![CDATA["Hinweis zur Zeitzone" geben wenn Nutzer sich das nächste Mal einloggt, damit diese das Nutzerprofil aktualisieren.]]></entry>
 	<entry key="1151"><![CDATA[Neue {0} Konferenz:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Soll dieses Whiteboard wirklich entfernt werden? Die Aktion kann nicht rückgängig gemacht werden.]]></entry>
 	<entry key="1315"><![CDATA[Vergessen Sie nicht die Aufzeichnung zu starten. Ein Nutzer des Raum muß die Aufzeichnung starten, damit diese anschließend zur Verfügung steht.]]></entry>
 	<entry key="1316"><![CDATA[Aufzeichnung starten]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Wollen Sie wirklich den gesamten Inhalt der Whiteboard löschen?]]></entry>
 	<entry key="1355"><![CDATA[Aufzeichnung erlauben]]></entry>
 	<entry key="1356"><![CDATA[Warten auf Aufzeichnung]]></entry>
@@ -499,8 +501,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1466"><![CDATA[veröffentlichen]]></entry>
 	<entry key="1467"><![CDATA[nicht veröffentlichen]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
-	<entry key="1469"><![CDATA[Publish App]]></entry>
-	<entry key="1470"><![CDATA[Publish Id]]></entry>
+	<entry key="1469"><![CDATA[Veröffentlichungs App]]></entry>
+	<entry key="1470"><![CDATA[Veröffentlichungs ID]]></entry>
 	<entry key="1471"><![CDATA[Reduzieren Sie die Breite des Sharing-Screens, bevor Sie versuchen ihn nach links zu verschieben.]]></entry>
 	<entry key="1472"><![CDATA[Reduzieren Sie die Höhe des Sharing-Screens, bevor Sie versuchen ihn nach unten zu verschieben.]]></entry>
 	<entry key="1473"><![CDATA[Reduzieren Sie x des Sharing-Screens, bevor Sie versuchen ihn zu erweitern.]]></entry>
@@ -521,7 +523,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1492"><![CDATA[Fragen Sie den Moderator, um Ihr Whiteboard teilen]]></entry>
 	<entry key="1493"><![CDATA[Starte privaten Chat]]></entry>
 	<entry key="1494"><![CDATA[Alle]]></entry>
-	<entry key="1500"><![CDATA[Server Name]]></entry>
+	<entry key="1500"><![CDATA[Name des Servers]]></entry>
 	<entry key="1504"><![CDATA[Veröffentlichen. Nutzer:]]></entry>
 	<entry key="1505"><![CDATA[Um Zeit und Internet-Verkehr sparen, können Sie den Befehl admin für Backup/Wiederherstellen/Aktualisieren verwenden. <ol> <li>Gehen sie zum OM-Installationspfad (z.b. /opt/om)</li> <li>Stopen Sie OM (z.b. ./bin/shutdown.sh)</li> <li>./admin.sh -b -file ~/heute_om_backup.zip (Backup vom bestehenden OM erstellen)</li> <li>Laden Sie die neue Version OM herunter</li> <li>mv /opt/om /opt/om.bak (kopieren Sie die existierende OM-Version für den Fall :))</li> <li>En [...]
 	<entry key="1506"><![CDATA[gemeinsame Räume für alle Benutzer]]></entry>
@@ -550,7 +552,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1559"><![CDATA[Apr]]></entry>
 	<entry key="1560"><![CDATA[Mai]]></entry>
 	<entry key="1561"><![CDATA[Jun]]></entry>
-	<entry key="1562"><![CDATA[Jul]]></entry>
+	<entry key="1562"><![CDATA[Juli]]></entry>
 	<entry key="1563"><![CDATA[Aug]]></entry>
 	<entry key="1564"><![CDATA[Sep]]></entry>
 	<entry key="1565"><![CDATA[Okt]]></entry>
@@ -561,11 +563,11 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1575"><![CDATA[Icon URL]]></entry>
 	<entry key="1576"><![CDATA[client_id]]></entry>
 	<entry key="1577"><![CDATA[client_secret]]></entry>
-	<entry key="1578"><![CDATA[Request key URL]]></entry>
-	<entry key="1579"><![CDATA[Request token URL]]></entry>
-	<entry key="1580"><![CDATA[Request info URL]]></entry>
+	<entry key="1578"><![CDATA[Schlüssel URL anfragen]]></entry>
+	<entry key="1579"><![CDATA[Token URL anfragen]]></entry>
+	<entry key="1580"><![CDATA[Info URL anfragen]]></entry>
 	<entry key="1581"><![CDATA[OAuth2 config]]></entry>
-	<entry key="1586"><![CDATA[Request token attributes]]></entry>
+	<entry key="1586"><![CDATA[Token Attribute anfordern]]></entry>
 	<entry key="1587"><![CDATA[Redirect uri]]></entry>
 	<entry key="1588"><![CDATA[E-Mail Adressen können in folgende Formaten eingetragen werden: Vorname1 Nachname1 <email1> oder "Vorname2 Nachname2" <email2> oder 'Vorname3 Nachname3' <email3> oder email]]></entry>
 	<entry key="1589"><![CDATA[Bei Verbindungsabbruch benachrichtigen]]></entry>
@@ -583,14 +585,14 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="activities.autoclean"><![CDATA[Automatisch aufräumen]]></entry>
 	<entry key="activities.msg.enter"><![CDATA[betritt den Raum.]]></entry>
 	<entry key="activities.msg.exit"><![CDATA[hat den Raum verlassen.]]></entry>
-	<entry key="activities.request.right.audio"><![CDATA[Berechtigung anfragen, das Mikrofon einzuschalten]]></entry>
-	<entry key="activities.request.right.moderator"><![CDATA[Berechtigung für Moderator anfragen]]></entry>
-	<entry key="activities.request.right.muteothers"><![CDATA[Berechtigung anfragen, andere stumm zu schalten]]></entry>
+	<entry key="activities.request.right.audio"><![CDATA[Berechtigung anfragen, um das Mikrofon einzuschalten]]></entry>
+	<entry key="activities.request.right.moderator"><![CDATA[Berechtigung zur Moderation anfragen]]></entry>
+	<entry key="activities.request.right.muteothers"><![CDATA[Berechtigung anfragen, um andere stumm zu schalten]]></entry>
 	<entry key="activities.request.right.presenter"><![CDATA[Berechtigung anfragen, Präsentator zu sein.]]></entry>
-	<entry key="activities.request.right.remote"><![CDATA[requests permission to control screen during screen sharing]]></entry>
+	<entry key="activities.request.right.remote"><![CDATA[Erlaubnis anfragen, während der Bildschirm geteilt ist, diesen zu kontrollieren]]></entry>
 	<entry key="activities.request.right.share"><![CDATA[Berechtigung anfragen, den Bildschirm aufzuzeichen/zu teilen]]></entry>
-	<entry key="activities.request.right.video"><![CDATA[requests permission to turn on camera]]></entry>
-	<entry key="activities.request.right.wb"><![CDATA[requests permission to draw on the whiteboard]]></entry>
+	<entry key="activities.request.right.video"><![CDATA[Erlaubnis anfragen, um die Kamera einzuschalten]]></entry>
+	<entry key="activities.request.right.wb"><![CDATA[Erlaubnis anfragen, um auf das Zeichenbrett zeichnen zu können]]></entry>
 	<entry key="admin.email.body"><![CDATA[Nachrichtentext]]></entry>
 	<entry key="admin.email.errorCount"><![CDATA[Error Count]]></entry>
 	<entry key="admin.email.group.label"><![CDATA[E-Mail Nachricht]]></entry>
@@ -602,17 +604,17 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.email.status.NONE"><![CDATA[keine]]></entry>
 	<entry key="admin.email.status.SENDING"><![CDATA[senden]]></entry>
 	<entry key="admin.group.form.days"><![CDATA[Tage]]></entry>
-	<entry key="admin.group.form.limited"><![CDATA[Limits enabled]]></entry>
+	<entry key="admin.group.form.limited"><![CDATA[Begrenzungen aktiv]]></entry>
 	<entry key="admin.group.form.logo"><![CDATA[Logo]]></entry>
 	<entry key="admin.group.form.maxFilesSize"><![CDATA[maximale Dateigröße]]></entry>
 	<entry key="admin.group.form.maxRecordingsSize"><![CDATA[Maximale Größe einer Aufnahme]]></entry>
 	<entry key="admin.group.form.maxRooms"><![CDATA[Maximale Anzahl von Räumen]]></entry>
 	<entry key="admin.group.form.recordingTtl"><![CDATA[Aufnahmen laufen ab in]]></entry>
-	<entry key="admin.group.form.reminderDays"><![CDATA[Expire reminder sent in]]></entry>
-	<entry key="admin.group.form.tag"><![CDATA[Tag]]></entry>
-	<entry key="admin.oauth.attr.oauth"><![CDATA[OAuth User attribute]]></entry>
+	<entry key="admin.group.form.reminderDays"><![CDATA[Erinnerung des Ablaufs gesenet in]]></entry>
+	<entry key="admin.group.form.tag"><![CDATA[Markierung]]></entry>
+	<entry key="admin.oauth.attr.oauth"><![CDATA[OAuth Benutzer Attribute]]></entry>
 	<entry key="admin.oauth.attr.om"><![CDATA[OM Benutzer-Attribute]]></entry>
-	<entry key="admin.oauth.req.info.method"><![CDATA[Request info method]]></entry>
+	<entry key="admin.oauth.req.info.method"><![CDATA[Info-Methode anfragen]]></entry>
 	<entry key="admin.oauth.req.token.method"><![CDATA[Request token method]]></entry>
 	<entry key="admin.oauth.user.mapping"><![CDATA[Benutzerzuordnung]]></entry>
 	<entry key="admin.purge"><![CDATA[Bereinigen]]></entry>
@@ -620,12 +622,12 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.restore"><![CDATA[wiederherstellen]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[versteckte Raumfeatures]]></entry>
 	<entry key="admin.room.wait-moderator.info"><![CDATA[Niemand kann den Raum betreten, solange der Moderator nicht anwesend ist.]]></entry>
-	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
+	<entry key="admin.room.wait-moderator.label"><![CDATA[Warten Sie auf einen Moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[Einfache E-Mail]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal E-Mail]]></entry>
 	<entry key="appointment.reminder.NONE"><![CDATA[keine Erinnerung senden]]></entry>
-	<entry key="appointment.tab.advanced"><![CDATA[Advanced]]></entry>
-	<entry key="appointment.tab.general"><![CDATA[General]]></entry>
+	<entry key="appointment.tab.advanced"><![CDATA[Fortgeschritten]]></entry>
+	<entry key="appointment.tab.general"><![CDATA[Generell]]></entry>
 	<entry key="bad.captcha.text"><![CDATA[Sie haben ein falsches Captcha eingegeben.]]></entry>
 	<entry key="bad.password.digit"><![CDATA['Weiches' Passwort: Mindestens eine Zahl ist erforderlich.]]></entry>
 	<entry key="bad.password.lower"><![CDATA['Weiches' Passwort: mindestens 1 Kleinbuchstabe ist erforderlich]]></entry>
@@ -633,25 +635,25 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="bad.password.special"><![CDATA['Weiches Passwort: mindestens ein spezielles Zeichen '!@#$%^&*][' ist erforderlich]]></entry>
 	<entry key="bad.password.stop"><![CDATA['Weiches' Passwort: es sollte keinen Teil des Benutzernamens oder der E-Mail-Adresse beinhalten]]></entry>
 	<entry key="bad.password.upper"><![CDATA['Weiches' Passwort. Mindestens ein Großbuchstabe ist erforderlich]]></entry>
-	<entry key="button.label.share"><![CDATA[Share]]></entry>
-	<entry key="calendar.addCalendar"><![CDATA[Add External Calendar]]></entry>
+	<entry key="button.label.share"><![CDATA[Teilen:]]></entry>
+	<entry key="calendar.addCalendar"><![CDATA[Externen Kalender hinzufügen]]></entry>
 	<entry key="calendar.defaultTitle"><![CDATA[Neuer Kalender]]></entry>
 	<entry key="calendar.dialogTitle"><![CDATA[Kalenderdetails]]></entry>
-	<entry key="calendar.error"><![CDATA[Error in making connection on the URL specified.]]></entry>
-	<entry key="calendar.gcal"><![CDATA[Google Calendar]]></entry>
+	<entry key="calendar.error"><![CDATA[Fehler beim Verbinden mit der angegebenen URL.]]></entry>
+	<entry key="calendar.gcal"><![CDATA[Google Kalender]]></entry>
 	<entry key="calendar.googleID"><![CDATA[Google Calendar ID]]></entry>
-	<entry key="calendar.googleKey"><![CDATA[Google Calendar API key]]></entry>
+	<entry key="calendar.googleKey"><![CDATA[Google Kalender API Schlüssel]]></entry>
 	<entry key="calendar.sync"><![CDATA[Sync]]></entry>
 	<entry key="calendar.url"><![CDATA[Externe CalDAV Kalender URL]]></entry>
 	<entry key="camera.off"><![CDATA[Kamera ist ausgeschaltet. Klicken, um sie einzuschalten.]]></entry>
-	<entry key="camera.on"><![CDATA[Kamera ist eingeschaltet. Klicken um auszuschalten.]]></entry>
-	<entry key="captcha.text"><![CDATA[Captcha text]]></entry>
-	<entry key="close.settings.tab"><![CDATA[After saving your audio and video settings you may close this browser tab.]]></entry>
+	<entry key="camera.on"><![CDATA[Kamera ist eingeschaltet. Klicken um sie auszuschalten.]]></entry>
+	<entry key="captcha.text"><![CDATA[Captcha Text]]></entry>
+	<entry key="close.settings.tab"><![CDATA[Nachdem Sie Ihre Audio- und Videoeinstellungen gespeichert haben, können Sie diesen Browser-TAB schließen.]]></entry>
 	<entry key="convert.errors.file"><![CDATA[Bei der Abarbeitung sind Fehler aufgetreten]]></entry>
 	<entry key="convert.errors.file.missing"><![CDATA[Datei nicht gefunden]]></entry>
-	<entry key="current.password"><![CDATA[Current password]]></entry>
+	<entry key="current.password"><![CDATA[Momentanes Passwort]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.backup"><![CDATA[Backup:]]></entry>
-	<entry key="dashboard.widget.admin.cleanup.cleanup"><![CDATA[Cleanup]]></entry>
+	<entry key="dashboard.widget.admin.cleanup.cleanup"><![CDATA[Säubern]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.deleted"><![CDATA[gelöscht:]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.error"><![CDATA[Unerwarteter Fehler während dem Cleanup]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.files"><![CDATA[Dateien:]]></entry>
@@ -662,10 +664,10 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="dashboard.widget.admin.cleanup.profiles"><![CDATA[Profile:]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.show"><![CDATA[Cleanup-Bericht anzeigen]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.streams"><![CDATA[Streams-Ordner:]]></entry>
-	<entry key="dashboard.widget.admin.cleanup.title"><![CDATA[Cleanup-bericht]]></entry>
+	<entry key="dashboard.widget.admin.cleanup.title"><![CDATA[Cleanup-Bericht]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.upload"><![CDATA[Upload-Ordner:]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.warn"><![CDATA[Wollen sie wirklich alle Temporären Dateien löschen? Diese Vorgang kann nicht rückgängig gemacht werden.]]></entry>
-	<entry key="dashboard.widget.admin.desc"><![CDATA[Allgemeine Admin-Functionen]]></entry>
+	<entry key="dashboard.widget.admin.desc"><![CDATA[Allgemeine Admin-Funktionen]]></entry>
 	<entry key="dashboard.widget.admin.title"><![CDATA[Admin-Funktionen]]></entry>
 	<entry key="download.image.steps"><![CDATA[Bitte Rechtsklick auf das Bild und "Speichere Bild als" wählen]]></entry>
 	<entry key="download.pdf"><![CDATA[Download als PDF]]></entry>
@@ -692,32 +694,32 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="files.download.jpg"><![CDATA[JPG]]></entry>
 	<entry key="files.download.original"><![CDATA[Original]]></entry>
 	<entry key="files.download.pdf"><![CDATA[PDF]]></entry>
-	<entry key="files.root.group"><![CDATA[Group files]]></entry>
+	<entry key="files.root.group"><![CDATA[Gruppendateien]]></entry>
 	<entry key="find.user"><![CDATA[Benutzer finden]]></entry>
 	<entry key="goto.first"><![CDATA[Zum Ersten]]></entry>
 	<entry key="goto.last"><![CDATA[Zum Letzten]]></entry>
 	<entry key="goto.next"><![CDATA[Zum Nächsten]]></entry>
 	<entry key="goto.prev"><![CDATA[Zum Letzten]]></entry>
-	<entry key="install.room.conference.micro"><![CDATA[Conference room with microphone option set]]></entry>
+	<entry key="install.room.conference.micro"><![CDATA[Konferenzraum mit Mikrofon-Option gesetzt]]></entry>
 	<entry key="install.room.presentation.micro"><![CDATA[Präsentationsraum mit Mikrofon]]></entry>
 	<entry key="install.room.private.conference"><![CDATA[Privater Konferenz-Raum]]></entry>
 	<entry key="install.room.public.conference"><![CDATA[Öffentlicher Konferenz-Raum]]></entry>
 	<entry key="install.room.public.interview"><![CDATA[Öffentlicher Interview-Raum]]></entry>
-	<entry key="install.room.public.presentation"><![CDATA[Public Presentation Room]]></entry>
+	<entry key="install.room.public.presentation"><![CDATA[Öffentlicher Präsentationsraum]]></entry>
 	<entry key="install.room.public.video.only"><![CDATA[Öffentlicher "Nur-Video" Raum]]></entry>
 	<entry key="install.room.public.video.wb"><![CDATA[Öffentlicher Raum mit Video und Zeichenbrett]]></entry>
 	<entry key="install.wizard.congrats.commercial"><![CDATA[Einige Unternehmen bieten kommerziellen Support
 		f&uuml;r Apache OpenMeetings an:]]></entry>
 	<entry key="install.wizard.congrats.enter"><![CDATA[&Ouml;ffnen der Anwendung]]></entry>
 	<entry key="install.wizard.congrats.mail"><![CDATA[Mailingliste]]></entry>
-	<entry key="install.wizard.congrats.restart"><![CDATA[Database was changed, please restart application to avoid possible issues]]></entry>
-	<entry key="install.wizard.db.step.check"><![CDATA[Check]]></entry>
+	<entry key="install.wizard.congrats.restart"><![CDATA[Datenbank hat sich geändert. Bitte die Applikation neu starten, um mögliche Probleme zu vermeiden]]></entry>
+	<entry key="install.wizard.db.step.check"><![CDATA[Prüfen]]></entry>
 	<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
-	<entry key="install.wizard.db.step.dbname"><![CDATA[Specify the name of the database]]></entry>
+	<entry key="install.wizard.db.step.dbname"><![CDATA[Geben Sie eine Namen der Datenbank an]]></entry>
 	<entry key="install.wizard.db.step.dbtype"><![CDATA[Wählen Sie die Art der DB]]></entry>
-	<entry key="install.wizard.db.step.error.patch"><![CDATA[Unexpected error while patching persistence file: {0}]]></entry>
+	<entry key="install.wizard.db.step.error.patch"><![CDATA[Unerwarteter Fehler beim patchen der persistence Datei: {0}]]></entry>
 	<entry key="install.wizard.db.step.errorprops"><![CDATA[Kann Eigenschaften nicht bekommen.]]></entry>
-	<entry key="install.wizard.db.step.field.title"><![CDATA[DB configuration]]></entry>
+	<entry key="install.wizard.db.step.field.title"><![CDATA[DB Konfiguration]]></entry>
 	<entry key="install.wizard.db.step.h2.name"><![CDATA[H2]]></entry>
 	<entry key="install.wizard.db.step.host"><![CDATA[DB host spezifizieren]]></entry>
 	<entry key="install.wizard.db.step.instructions.db2"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/IBMDB2Config.html">IBM DB2</a>]]></entry>
@@ -728,7 +730,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.instructions.postgresql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/PostgresConfig.html">PostgreSql</a>]]></entry>
 	<entry key="install.wizard.db.step.mssql.name"><![CDATA[MSSQL]]></entry>
 	<entry key="install.wizard.db.step.mysql.name"><![CDATA[MySQL]]></entry>
-	<entry key="install.wizard.db.step.nodriver"><![CDATA[Cannot load the proper DB driver. Please download the corresponding jar file and restart the OM server. Instructions: {0}]]></entry>
+	<entry key="install.wizard.db.step.nodriver"><![CDATA[Kann den passenden DB-Treiber nicht laden. Laden Sie bitte die entsprechende jar Datei herunter und starten Sie OM danach neu! Anleitung: {0}]]></entry>
 	<entry key="install.wizard.db.step.note"><![CDATA[<h4>
 			<a id="Recommendation_for_production_environment"></a>Empfehlung
 				f&uuml;r Produktivumgebungen<a target="_blank"
@@ -745,10 +747,10 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	]]></entry>
 	<entry key="install.wizard.db.step.notvalid"><![CDATA[Datenbank-Check war nicht erfolgreich]]></entry>
 	<entry key="install.wizard.db.step.oracle.name"><![CDATA[Oracle]]></entry>
-	<entry key="install.wizard.db.step.pass"><![CDATA[Specify DB password]]></entry>
+	<entry key="install.wizard.db.step.pass"><![CDATA[Geben Sie ein DB Passwort an]]></entry>
 	<entry key="install.wizard.db.step.port"><![CDATA[DB port spezifizieren]]></entry>
 	<entry key="install.wizard.db.step.postgresql.name"><![CDATA[PostgreSql]]></entry>
-	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
+	<entry key="install.wizard.db.step.user"><![CDATA[Einen DB Benutzer angeben]]></entry>
 	<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>
@@ -774,25 +776,25 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step2.mailAuthPass"><![CDATA[SMTP-Nutzerpasswort]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthPass.title"><![CDATA[E-Mail-Passwort eingeben]]></entry>
 	<entry key="install.wizard.params.step2.mailReferer"><![CDATA[Mail-Referer]]></entry>
-	<entry key="install.wizard.params.step2.mailReferer.title"><![CDATA[Enter a Referer]]></entry>
+	<entry key="install.wizard.params.step2.mailReferer.title"><![CDATA[Geben Sie eine Internetadresse an]]></entry>
 	<entry key="install.wizard.params.step2.mailUseTls"><![CDATA[TLS zur Mailserver-Authentifizierung aktivieren]]></entry>
 	<entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Die E-Mail-Adresse des Einladenden als 'ReplyTo'-Adresse
 					in E-Mail-Einladungen verwenden]]></entry>
 	<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[E-Mail an neu registrierte Nutzer senden]]></entry>
 	<entry key="install.wizard.params.step2.sendEmailWithVerficationCode"><![CDATA[Neu registrierte Nutzer m&uuml;ssen Ihre E-Mail-Adresse verifizieren]]></entry>
 	<entry key="install.wizard.params.step2.smtpPort"><![CDATA[SMTP-Server-Port(Standard ist 25)]]></entry>
-	<entry key="install.wizard.params.step2.smtpPort.title"><![CDATA[Enter a SMTP-Server.Port normally 25]]></entry>
+	<entry key="install.wizard.params.step2.smtpPort.title"><![CDATA[Geben Sie einen SMTP-Server-Port an. Normalerweise 25]]></entry>
 	<entry key="install.wizard.params.step2.smtpServer"><![CDATA[SMTP-Server]]></entry>
 	<entry key="install.wizard.params.step2.smtpServer.title"><![CDATA[Tragen Sie einen SMTP-Server ein.]]></entry>
 	<entry key="install.wizard.params.step3.converters"><![CDATA[Konverter]]></entry>
-	<entry key="install.wizard.params.step3.docDpi"><![CDATA[Document conversion DPI]]></entry>
-	<entry key="install.wizard.params.step3.docDpi.text"><![CDATA[DPI that ImageMagic will use for PDF to image conversion (default is 150)]]></entry>
+	<entry key="install.wizard.params.step3.docDpi"><![CDATA[Konvertierung Dokument DPI]]></entry>
+	<entry key="install.wizard.params.step3.docDpi.text"><![CDATA[DPI, die ImageMagic benutzt, um PDF in ein Bild zu konvertieren (Grundeinstellung ist 150)]]></entry>
 	<entry key="install.wizard.params.step3.docDpi.title"><![CDATA[Enter the dpi that ImageMagic will use for PDF to image conversion]]></entry>
 	<entry key="install.wizard.params.step3.docQuality"><![CDATA[JPEG-Qualität der Dokumente]]></entry>
 	<entry key="install.wizard.params.step3.docQuality.text"><![CDATA[Enter the quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best (big). (default:90)]]></entry>
-	<entry key="install.wizard.params.step3.docQuality.title"><![CDATA[Enter the quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best (big). (default:90)]]></entry>
+	<entry key="install.wizard.params.step3.docQuality.title"><![CDATA[Geben Sie die Qualität für eingebettete jpeg-Bilder an. 0 ist die Schlechteste (klein), 100 die Beste (groß). (Voreinstellung: 90)]]></entry>
 	<entry key="install.wizard.params.step3.ffmpegPath"><![CDATA[FFMPEG-Pfad]]></entry>
-	<entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install fresh and up-to-date FFMpeg.]]></entry>
+	<entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Installieren Sie ein frisches und aktuell FFMpeg.]]></entry>
 	<entry key="install.wizard.params.step3.ffmpegPath.title"><![CDATA[Geben Sie den Pfad zu FFMPEG an, falls es sich nicht im Systempfad befindet.]]></entry>
 	<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>
@@ -870,8 +872,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		target="_blank">https://openmeetings.apache.org/commercial-support.html</a></span>
 	<br />
 	]]></entry>
-	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
-	<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
+	<entry key="invalid.hash"><![CDATA[Fehlerhafter Hash]]></entry>
+	<entry key="label.dock.panel"><![CDATA[Klicken, um das Panel anzudocken]]></entry>
 	<entry key="label.undock.panel"><![CDATA[Klicken, um das Panel abzudocken]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Abbrechen]]></entry>
 	<entry key="lbl.new"><![CDATA[neu]]></entry>
@@ -880,94 +882,93 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="lbl.settings.whiteboard"><![CDATA[Einstellungen Zeichenbrett]]></entry>
 	<entry key="lbl.update"><![CDATA[Update]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[E-Mail Management]]></entry>
-	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
+	<entry key="main.menu.admin.email.desc"><![CDATA[E-Mail-Prozess im System überprüfen]]></entry>
 	<entry key="menu.polls"><![CDATA[Umfragen]]></entry>
 	<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></entry>
 	<entry key="menu.polls.quick.title"><![CDATA[Schnelle Abstimmung erzeugen]]></entry>
-	<entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+	<entry key="messages.btn.reply"><![CDATA[Antworten]]></entry>
 	<entry key="messages.subject.re"><![CDATA[Re:]]></entry>
 	<entry key="microphone.off"><![CDATA[Mikrofon ist ausgeschaltet. Klicken, um es einzuschalten.]]></entry>
 	<entry key="microphone.on"><![CDATA[Mikrofon ist eingeschaltet. Klicken, um es auszuschalten.]]></entry>
 	<entry key="my.room.conference"><![CDATA[Mein Konferenzraum (für 1-16 Benutzer)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[Mein Präsentationsraum (für 1-120 Benutzer)]]></entry>
 	<entry key="network.test.click.play"><![CDATA[Einen Knopf drücken, um einen Test zu starten.]]></entry>
-	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
+	<entry key="network.test.copy.log"><![CDATA[Kopieren Sie die Logdatei in den Zwischenspeicher]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download-Geschwindigkeit]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes heruntergeladen]]></entry>
 	<entry key="network.test.dwn.speed"><![CDATA[Download-Geschwindigkeit]]></entry>
-	<entry key="network.test.dwn.time"><![CDATA[Download time]]></entry>
+	<entry key="network.test.dwn.time"><![CDATA[Download Zeit]]></entry>
 	<entry key="network.test.jitter"><![CDATA[Jitter]]></entry>
 	<entry key="network.test.jitter.avg"><![CDATA[durchschnittliche Zeit]]></entry>
 	<entry key="network.test.jitter.avgAbbr"><![CDATA[mittel]]></entry>
-	<entry key="network.test.jitter.max"><![CDATA[Max time]]></entry>
-	<entry key="network.test.jitter.min"><![CDATA[Min time]]></entry>
+	<entry key="network.test.jitter.max"><![CDATA[Max. Zeit]]></entry>
+	<entry key="network.test.jitter.min"><![CDATA[Min. Zeit]]></entry>
 	<entry key="network.test.mb"><![CDATA[Mb]]></entry>
 	<entry key="network.test.ms"><![CDATA[ms]]></entry>
-	<entry key="network.test.ping"><![CDATA[Ping]]></entry>
+	<entry key="network.test.ping"><![CDATA[ping]]></entry>
 	<entry key="network.test.ping.avg"><![CDATA[Durchschnittliche Ping-Zeit]]></entry>
-	<entry key="network.test.ping.load"><![CDATA[load time]]></entry>
-	<entry key="network.test.ping.lost"><![CDATA[Packets lost]]></entry>
+	<entry key="network.test.ping.load"><![CDATA[Ladezeit]]></entry>
+	<entry key="network.test.ping.lost"><![CDATA[Pakete verloren]]></entry>
 	<entry key="network.test.ping.rcv"><![CDATA[Pakete empfangen]]></entry>
 	<entry key="network.test.port"><![CDATA[Port]]></entry>
-	<entry key="network.test.port.avail"><![CDATA[port is available]]></entry>
+	<entry key="network.test.port.avail"><![CDATA[Port ist verfügbar]]></entry>
 	<entry key="network.test.port.stopped"><![CDATA[gestoppt]]></entry>
 	<entry key="network.test.report"><![CDATA[Bericht]]></entry>
 	<entry key="network.test.report.con.err"><![CDATA[Verbindungsfehler]]></entry>
-	<entry key="network.test.report.error"><![CDATA[Fehler]]></entry>
+	<entry key="network.test.report.error"><![CDATA[Fehler!]]></entry>
 	<entry key="network.test.report.start"><![CDATA[Test starten...]]></entry>
 	<entry key="network.test.sec"><![CDATA[sec]]></entry>
 	<entry key="network.test.upl"><![CDATA[Upload-Geschwindigkeit]]></entry>
 	<entry key="network.test.upl.bytes"><![CDATA[Bytes hochgeladen]]></entry>
-	<entry key="network.test.upl.speed"><![CDATA[Upload speed]]></entry>
-	<entry key="network.test.upl.time"><![CDATA[Upload time]]></entry>
-	<entry key="poll.clone"><![CDATA[Clone]]></entry>
+	<entry key="network.test.upl.speed"><![CDATA[Upload Geschwindigkeit]]></entry>
+	<entry key="network.test.upl.time"><![CDATA[Upload Zeit]]></entry>
+	<entry key="poll.clone"><![CDATA[Clonen]]></entry>
 	<entry key="poll.type.NUMERIC"><![CDATA[Numerisch 1-10]]></entry>
 	<entry key="poll.type.YES_NO"><![CDATA[Ja/Nein]]></entry>
 	<entry key="profile.invitation"><![CDATA[Einladung]]></entry>
 	<entry key="profile.invitations"><![CDATA[Einladungen]]></entry>
 	<entry key="recordings.root.group"><![CDATA[Gruppen-Aufnahmen]]></entry>
 	<entry key="register.privacy.accept"><![CDATA[Mit Klick auf "${register}" stimmen Sie unseren ${link} zu.]]></entry>
-	<entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry>
+	<entry key="register.privacy.statement"><![CDATA[Datenschutzerklärung]]></entry>
 	<entry key="reset.whiteboard"><![CDATA[Zeichenbrett zurücksetzen]]></entry>
-	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
+	<entry key="restricted.group.files"><![CDATA[Gruppendateien sind eingeschränkt]]></entry>
 	<entry key="room.type.CONFERENCE"><![CDATA[Konferenz (1-25 User)]]></entry>
-	<entry key="room.type.CONFERENCE.desc"><![CDATA["democratic" by default, every user can directly enable audio/video without need for asking]]></entry>
+	<entry key="room.type.CONFERENCE.desc"><![CDATA["demokratisch" in der Grundeinstellung. Jeder Benutzer kann direkt Audio/Video einschalten, ohne um Erlaubnis zu fragen.]]></entry>
 	<entry key="room.type.INTERVIEW"><![CDATA[Interview (1:1 meeting with recording)]]></entry>
-	<entry key="room.type.INTERVIEW.desc"><![CDATA[only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)]]></entry>
+	<entry key="room.type.INTERVIEW.desc"><![CDATA[Nur 2 Benutzer können Audio/Video eingeschaltet haben. (mehrere Benutzer können im Raum sein und Sie können Audio/Video selbstverständlich zwischen ihnen umschalten]]></entry>
 	<entry key="room.type.PRESENTATION"><![CDATA[Präsentation (1-150 User)]]></entry>
-	<entry key="room.type.PRESENTATION.desc"><![CDATA["restricted" by default: Every regular user will need to ask if he wants to share audio/video]]></entry>
+	<entry key="room.type.PRESENTATION.desc"><![CDATA["eingeschränkt" in der Grundeinstellung. Jeder reguläre Benutzer muss anfragen, ob er Audio/Video teilen darf.]]></entry>
 	<entry key="save.success"><![CDATA[gespeichert]]></entry>
-	<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
+	<entry key="send.on.ctrl.enter"><![CDATA[Abschicken mit Strg+Eingabetaste]]></entry>
 	<entry key="send.on.enter"><![CDATA[Abschicken bei drücken der Eingabetaste]]></entry>
 	<entry key="sound.enable"><![CDATA[Ton einschalten]]></entry>
 	<entry key="sound.mute"><![CDATA[Ton ausschalten]]></entry>
-	<entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
-		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
-	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
-	{0} Support Team.]]></entry>
+	<entry key="template.recording.expiring.body"><![CDATA[Ihre momentane {0} Aufnahme wird automatisch in {1} Tagen gelöscht. Wenn Sie diese Aufnahme speichern möchten, laden Sie sie vorher herunter.]]></entry>
+	<entry key="template.recording.expiring.footer"><![CDATA[Grüße,<br/>
+       {0} Support Team.]]></entry>
 	<entry key="template.recording.expiring.greetings"><![CDATA[Liebe {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Aufnahme wird gelöscht werden]]></entry>
-	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
+	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Raum[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Diesem Benutzer erlauben, das Mikrofon zu benutzen]]></entry>
 	<entry key="ulist.right.audio.request"><![CDATA[Berechtigung anfragen, um das Mikrofon zu benutzen]]></entry>
-	<entry key="ulist.right.audio.revoke"><![CDATA[Mute user and remove the right to turn on microphone]]></entry>
+	<entry key="ulist.right.audio.revoke"><![CDATA[Benutzer stumm schalten und das Recht entziehen, das Mikrofon einzuschalten]]></entry>
 	<entry key="ulist.right.moderator.grant"><![CDATA[Diesem Benutzer erlauben, Moderator zu sein.]]></entry>
 	<entry key="ulist.right.moderator.request"><![CDATA[Moderator-Berechtigungen anfragen]]></entry>
 	<entry key="ulist.right.moderator.revoke"><![CDATA[Moderator-Berechtigungen für diesen Benutzer entfernen]]></entry>
-	<entry key="ulist.right.muteothers.grant"><![CDATA[Allow this user to mute others]]></entry>
-	<entry key="ulist.right.muteothers.request"><![CDATA[Berechtigung anfragen, andere stumm zu schalten]]></entry>
+	<entry key="ulist.right.muteothers.grant"><![CDATA[Diesem Benutzer erlauben, andere stumm zu schalten]]></entry>
+	<entry key="ulist.right.muteothers.request"><![CDATA[Berechtigung anfragen, um andere stumm zu schalten]]></entry>
 	<entry key="ulist.right.muteothers.revoke"><![CDATA[Diesem Benutzer die Erlaubnis entziehen, andere stumm zu schalten]]></entry>
 	<entry key="ulist.right.presenter.grant"><![CDATA[Diesen Benutzer als Präsentierer erlauben]]></entry>
 	<entry key="ulist.right.presenter.request"><![CDATA[Präsentator-Berechtigung anfragen]]></entry>
 	<entry key="ulist.right.presenter.revoke"><![CDATA[Berechtigung als Präsentator diesem Benutzer entziehen]]></entry>
 	<entry key="ulist.right.remote.grant"><![CDATA[Fernsteuerung erlauben (während Bildschirm geteilt ist)]]></entry>
-	<entry key="ulist.right.remote.request"><![CDATA[Request remote control permission (during screen sharing)]]></entry>
-	<entry key="ulist.right.remote.revoke"><![CDATA[Remove user's Remote Control permission (during screen sharing)]]></entry>
+	<entry key="ulist.right.remote.request"><![CDATA[Erlaubnis zur Fernsteuerung anfragen (während der Bildschirm geteilt ist)]]></entry>
+	<entry key="ulist.right.remote.revoke"><![CDATA[Die Erlaubnis der Fernsteuerung dem Benutzer entziehen (während der Bildschirm geteilt ist)]]></entry>
 	<entry key="ulist.right.share.grant"><![CDATA[Benutzer erlauben Bildschirm/Aufnahme zu teilen]]></entry>
 	<entry key="ulist.right.share.request"><![CDATA[Berechtigung anfragen, den Bildschirm zu teilen/aufzunehmen]]></entry>
 	<entry key="ulist.right.share.revoke"><![CDATA[Berechtigung des Benutzer entfernen, den Bildschirm zu teilen/aufzunehmen]]></entry>
-	<entry key="ulist.right.video.grant"><![CDATA[Benutzer erlauben Kamera zu benuzten]]></entry>
-	<entry key="ulist.right.video.request"><![CDATA[Request permission to use camera]]></entry>
+	<entry key="ulist.right.video.grant"><![CDATA[Benutzer erlauben, Kamera zu benutzen]]></entry>
+	<entry key="ulist.right.video.request"><![CDATA[Erlaubnis anfrgen, die Kamera zu benutzen]]></entry>
 	<entry key="ulist.right.video.revoke"><![CDATA[Kamera des Benutzers ausschalten und Berechtigung entziehen]]></entry>
 	<entry key="ulist.right.wb.grant"><![CDATA[Diesem Benutzer erlauben, das Zeichenbrett zu benutzen]]></entry>
 	<entry key="ulist.right.wb.request"><![CDATA[Berechtigung anfragen, um auf das Zeichenbrett zu zeichnen]]></entry>
@@ -976,8 +977,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="ulist.user.muteothers.confirm"><![CDATA[Wollen Sie wirklich alle Benutzer bis auf diesen stummschalten?]]></entry>
 	<entry key="ulist.user.speaks"><![CDATA[Benutzer spricht]]></entry>
 	<entry key="upload.dlg.choose.title"><![CDATA[Datei auswählen]]></entry>
-	<entry key="upload.dlg.convert.title"><![CDATA[Converting...]]></entry>
-	<entry key="user.label.displayName"><![CDATA[Display name]]></entry>
+	<entry key="upload.dlg.convert.title"><![CDATA[Konvertiere...]]></entry>
+	<entry key="user.label.displayName"><![CDATA[Anzeigename]]></entry>
 	<entry key="user.salutation.DR"><![CDATA[Dr.]]></entry>
 	<entry key="user.salutation.MR"><![CDATA[Herr]]></entry>
 	<entry key="user.salutation.MRS"><![CDATA[Fräulein]]></entry>
@@ -986,16 +987,16 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="video.mic.off"><![CDATA[Mikrofon ist aus]]></entry>
 	<entry key="video.mic.on"><![CDATA[Mikrofon ist an]]></entry>
 	<entry key="video.muteothers"><![CDATA[Mikrofon für andere stumm schalten]]></entry>
-	<entry key="video.permission.text"><![CDATA[Extra permission is required to play video.<br/>Press OK to allow playing.]]></entry>
+	<entry key="video.permission.text"><![CDATA[Besondere Erlaubnis ist erforderlich, Um ein Video anzuspielen.<br/>Drücken Sie OK, um das Abspielen zu erlauben.]]></entry>
 	<entry key="video.permission.title"><![CDATA[Erlaubnis ist erforderlich]]></entry>
 	<entry key="video.settings.https.required"><![CDATA[Um Kamera und Mikrofon zu benützen brauchen Sie eine gesicherte Verbindung. Probieren Sie https.]]></entry>
 	<entry key="volume.label"><![CDATA[Volumen anpassen]]></entry>
 	<entry key="wait-moderator.message"><![CDATA[Biite warten, bis der <b>Moderator</b> den Raum betreten hat!]]></entry>
 	<entry key="wait-moderator.title"><![CDATA[Gedulden Sie sich bitte ...]]></entry>
-	<entry key="warn.nogroup"><![CDATA[Benutzer hinzugefügt. Vergessen Sie nicht diesem Benutzer auch eine Organisation hinzuzufügen. Benutzer ohne Organisation können sich nicht einloggen.]]></entry>
+	<entry key="warn.nogroup"><![CDATA[Benutzer hinzugefügt. Vergessen Sie nicht, diesem Benutzer auch eine Organisation hinzuzufügen. Benutzer ohne Organisation können sich nicht einloggen.]]></entry>
 	<entry key="warn.notverified"><![CDATA[Sie haben sich erfolgreich angemeldet. Wir haben eine E-Mail mit einem Verifizierungscode an Ihre E-Mail-Adresse geschickt. Bitte überprüfen Sie Ihren Posteingang.]]></entry>
 	<entry key="wb.tool.math.formula"><![CDATA[Mathe Formeln]]></entry>
-	<entry key="wb.tool.math.guide.lbl"><![CDATA[Guide to LaTeX Syntax]]></entry>
+	<entry key="wb.tool.math.guide.lbl"><![CDATA[Anleitung zur LaTeX Syntax]]></entry>
 	<entry key="wb.tool.math.guide.url"><![CDATA[https://en.wikibooks.org/wiki/LaTeX/Mathematics]]></entry>
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[Hier finden Sie kürzlich benutzte Räume.]]></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 aa9e6ef..97dba7f 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 b44fbb4..a46d1cf 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
@@ -354,7 +354,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1092"><![CDATA[Calidad Media]]></entry>
 	<entry key="1093"><![CDATA[Calidad baja]]></entry>
 	<entry key="1098"><![CDATA[La conferencia ya está cerrada, será redirigido a otras ofertas interesantes]]></entry>
-	<entry key="1099"><![CDATA[Cerra sala]]></entry>
+	<entry key="1099"><![CDATA[Cerrar sala]]></entry>
 	<entry key="1100"><![CDATA[URL de Salida]]></entry>
 	<entry key="1101"><![CDATA[Configuración de finalización de sala]]></entry>
 	<entry key="1102"><![CDATA[Si la sala está cerrada los usuarios serán redirigidos a la URL de salida.]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Zona Horaria]]></entry>
 	<entry key="1146"><![CDATA[Descripción]]></entry>
 	<entry key="1147"><![CDATA[Hecho por]]></entry>
+	<entry key="1148"><![CDATA[Mensaje de Zona Horaria]]></entry>
+	<entry key="1149"><![CDATA[Chequear "Mensaje de Zona Horaria" para dar mensaje a los usuarios la próxima vez que accedan para que actualicen sus perfiles.]]></entry>
 	<entry key="1151"><![CDATA[Nueva {0} conferencia:]]></entry>
 	<entry key="1152"><![CDATA[Detalles:]]></entry>
 	<entry key="1153"><![CDATA[Comenzar:]]></entry>
@@ -457,14 +459,14 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Realmente quiere suprimir esta pizarra? Esta acción no puede ser deshecha!]]></entry>
 	<entry key="1315"><![CDATA[No olvide comenzar la grabación! Un usuario por sala necesita comenzarla para tener después el control de la misma.]]></entry>
 	<entry key="1316"><![CDATA[Comenzar grabación]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Realmente quiere borrar todo el contenido de la pizarra?]]></entry>
 	<entry key="1355"><![CDATA[Permitir grabación]]></entry>
 	<entry key="1356"><![CDATA[Esperando a grabación]]></entry>
 	<entry key="1359"><![CDATA[Realmente quiere borrar el contenido de la presente exposición?]]></entry>
 	<entry key="1360"><![CDATA[Aceptar y otorgar derechos al usuario]]></entry>
 	<entry key="1361"><![CDATA[Denegar]]></entry>
-	<entry key="1362"><![CDATA[I]]></entry>
+	<entry key="1362"><![CDATA[Yo]]></entry>
 	<entry key="1363"><![CDATA[Actividades y acciones]]></entry>
 	<entry key="1410"><![CDATA[Nombre Encuesta]]></entry>
 	<entry key="1411"><![CDATA[Usted]]></entry>
@@ -536,7 +538,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1536"><![CDATA[Importar sistema]]></entry>
 	<entry key="1537"><![CDATA[Incluir archivos subidos y grabaciones en el backup]]></entry>
 	<entry key="1538"><![CDATA[Permitir transporte SIP en la sala]]></entry>
-	<entry key="1546"><![CDATA[BienVenidos]]></entry>
+	<entry key="1546"><![CDATA[Bienvenidos]]></entry>
 	<entry key="1547"><![CDATA[El Widget muestra información básica del usuario y links soportados]]></entry>
 	<entry key="1548"><![CDATA[Widgets]]></entry>
 	<entry key="1549"><![CDATA[Acerca de]]></entry>
@@ -573,7 +575,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1592"><![CDATA[El final de la fecha introducida es anterior a la fecha del comienzo.]]></entry>
 	<entry key="1593"><![CDATA[Valor de salida]]></entry>
 	<entry key="1594"><![CDATA[Mensajes de conversión]]></entry>
-	<entry key="1595"><![CDATA[Recording file is not found]]></entry>
+	<entry key="1595"><![CDATA[No se encontró el fichero de la grabación.]]></entry>
 	<entry key="1598"><![CDATA[Seguridad]]></entry>
 	<entry key="1599"><![CDATA[Acceso denegado. No tienes permisos para entrar en esta sala.]]></entry>
 	<entry key="1600"><![CDATA[Re-convert]]></entry>
@@ -637,21 +639,21 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="calendar.addCalendar"><![CDATA[Añadir calendario externo]]></entry>
 	<entry key="calendar.defaultTitle"><![CDATA[Nuevo calendario]]></entry>
 	<entry key="calendar.dialogTitle"><![CDATA[Detalles del calendario]]></entry>
-	<entry key="calendar.error"><![CDATA[Error in making connection on the URL specified.]]></entry>
+	<entry key="calendar.error"><![CDATA[Error conectando con la URL especificada.]]></entry>
 	<entry key="calendar.gcal"><![CDATA[Calendario Google]]></entry>
 	<entry key="calendar.googleID"><![CDATA[Google Calendar ID]]></entry>
 	<entry key="calendar.googleKey"><![CDATA[Google Calendar API key]]></entry>
 	<entry key="calendar.sync"><![CDATA[Sync]]></entry>
 	<entry key="calendar.url"><![CDATA[External CalDAV Calendar URL]]></entry>
 	<entry key="camera.off"><![CDATA[La cámara está desactivada. Haz clic para activarla.]]></entry>
-	<entry key="camera.on"><![CDATA[La cámara está activada. Haz clic parra desactivarla.]]></entry>
+	<entry key="camera.on"><![CDATA[La cámara está activada. Haz clic para desactivarla.]]></entry>
 	<entry key="captcha.text"><![CDATA[Captcha text]]></entry>
 	<entry key="close.settings.tab"><![CDATA[Después de salvar tus ajustes de audio y video, puedes cerrar esta ventana.]]></entry>
 	<entry key="convert.errors.file"><![CDATA[Ha habido errores mientras se procesaba el fichero]]></entry>
 	<entry key="convert.errors.file.missing"><![CDATA[Fichero no encontrado]]></entry>
 	<entry key="current.password"><![CDATA[Contraseña actual]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.backup"><![CDATA[respaldo]]></entry>
-	<entry key="dashboard.widget.admin.cleanup.cleanup"><![CDATA[Cleanup]]></entry>
+	<entry key="dashboard.widget.admin.cleanup.cleanup"><![CDATA[Limpieza]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.deleted"><![CDATA[borrado]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.error"><![CDATA[Error inesperado durante la ejecución de la limpieza]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.files"><![CDATA[ficheros]]></entry>
@@ -681,7 +683,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="error.hash.period"><![CDATA[Su código de invitación no es válido. El código solamente es válido durante la fecha y hora especificados:]]></entry>
 	<entry key="error.hash.used"><![CDATA[Esta invitación ya fue usada y no puede volverse a utilizar.]]></entry>
 	<entry key="error.login.inuse"><![CDATA[Este nombre de usuario ya existe]]></entry>
-	<entry key="error.nogroup"><![CDATA[User is not assigned to group.]]></entry>
+	<entry key="error.nogroup"><![CDATA[El usuario no está asignado a ningún grupo.]]></entry>
 	<entry key="error.notactivated"><![CDATA[Su cuenta no está activada. Utilice en primer lugar el enlace que hay en correo recibido al finalizar el proceso de registro.]]></entry>
 	<entry key="error.notallowed"><![CDATA[Se necesita autorización del administrador]]></entry>
 	<entry key="error.reg.disabled"><![CDATA[Registro desactivado.]]></entry>
@@ -698,12 +700,12 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="goto.last"><![CDATA[ir al final]]></entry>
 	<entry key="goto.next"><![CDATA[siguiente]]></entry>
 	<entry key="goto.prev"><![CDATA[anterior]]></entry>
-	<entry key="install.room.conference.micro"><![CDATA[Conference room with microphone option set]]></entry>
-	<entry key="install.room.presentation.micro"><![CDATA[Sala de presentación con opción de micrófono establecida]]></entry>
+	<entry key="install.room.conference.micro"><![CDATA[Sala de conferencia con micrófono activo.]]></entry>
+	<entry key="install.room.presentation.micro"><![CDATA[Sala de presentación con micrófono activado.]]></entry>
 	<entry key="install.room.private.conference"><![CDATA[Sala privada de conferencia]]></entry>
 	<entry key="install.room.public.conference"><![CDATA[Sala pública de conferencia]]></entry>
 	<entry key="install.room.public.interview"><![CDATA[Sala pública de entrevistas]]></entry>
-	<entry key="install.room.public.presentation"><![CDATA[Public Presentation Room]]></entry>
+	<entry key="install.room.public.presentation"><![CDATA[Sala pública de presentación]]></entry>
 	<entry key="install.room.public.video.only"><![CDATA[Sala pública solo video]]></entry>
 	<entry key="install.room.public.video.wb"><![CDATA[Sala pública con video y pizarra]]></entry>
 	<entry key="install.wizard.congrats.commercial"><![CDATA[Hay algunas compañias
@@ -786,7 +788,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step3.converters"><![CDATA[Convertidores]]></entry>
 	<entry key="install.wizard.params.step3.docDpi"><![CDATA[Document conversion DPI]]></entry>
 	<entry key="install.wizard.params.step3.docDpi.text"><![CDATA[DPI que usará ImageMagick para la conversión de PDF a imagen (por defecto, 150)]]></entry>
-	<entry key="install.wizard.params.step3.docDpi.title"><![CDATA[Enter the dpi that ImageMagic will use for PDF to image conversion]]></entry>
+	<entry key="install.wizard.params.step3.docDpi.title"><![CDATA[Introduce los DPI que ImageMagic usará para la conversión PDF a imagen.]]></entry>
 	<entry key="install.wizard.params.step3.docQuality"><![CDATA[Calidad de conversión del documento JPG]]></entry>
 	<entry key="install.wizard.params.step3.docQuality.text"><![CDATA[Enter the quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best (big). (default:90)]]></entry>
 	<entry key="install.wizard.params.step3.docQuality.title"><![CDATA[Enter the quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best (big). (default:90)]]></entry>
@@ -867,11 +869,11 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
 	<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
 	<entry key="lbl.cancel"><![CDATA[Cancelar]]></entry>
-	<entry key="lbl.new"><![CDATA[new]]></entry>
+	<entry key="lbl.new"><![CDATA[nuevo]]></entry>
 	<entry key="lbl.or"><![CDATA[o]]></entry>
 	<entry key="lbl.refresh"><![CDATA[actualizar]]></entry>
 	<entry key="lbl.settings.whiteboard"><![CDATA[Ajustes de la pizarra]]></entry>
-	<entry key="lbl.update"><![CDATA[Update]]></entry>
+	<entry key="lbl.update"><![CDATA[Actualizar]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Gestión de correo]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
 	<entry key="menu.polls"><![CDATA[Encuestas]]></entry>
@@ -883,7 +885,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[El micrófono está activado. Click para desactivarlo.]]></entry>
 	<entry key="my.room.conference"><![CDATA[Mi sala de conferencias (para 1-16 usuarios)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[Mi sala de presentaciones]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copiar el registro en el portapapeles]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Velocidad de descarga]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes descargados]]></entry>
@@ -891,15 +893,15 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="network.test.dwn.time"><![CDATA[Tiempo de descarga]]></entry>
 	<entry key="network.test.jitter"><![CDATA[Jitter]]></entry>
 	<entry key="network.test.jitter.avg"><![CDATA[Tiempo medio]]></entry>
-	<entry key="network.test.jitter.avgAbbr"><![CDATA[Avg.]]></entry>
-	<entry key="network.test.jitter.max"><![CDATA[Max time]]></entry>
-	<entry key="network.test.jitter.min"><![CDATA[Min time]]></entry>
+	<entry key="network.test.jitter.avgAbbr"><![CDATA[Tiempo medio]]></entry>
+	<entry key="network.test.jitter.max"><![CDATA[Tiempo máximo]]></entry>
+	<entry key="network.test.jitter.min"><![CDATA[Tiempo mínimo]]></entry>
 	<entry key="network.test.mb"><![CDATA[Mb]]></entry>
 	<entry key="network.test.ms"><![CDATA[ms]]></entry>
 	<entry key="network.test.ping"><![CDATA[Ping]]></entry>
 	<entry key="network.test.ping.avg"><![CDATA[Tiempo medio de ping]]></entry>
 	<entry key="network.test.ping.load"><![CDATA[tiempo de carga]]></entry>
-	<entry key="network.test.ping.lost"><![CDATA[Packets lost]]></entry>
+	<entry key="network.test.ping.lost"><![CDATA[Paquetes perdidos]]></entry>
 	<entry key="network.test.ping.rcv"><![CDATA[Paquetes recibidos]]></entry>
 	<entry key="network.test.port"><![CDATA[Puerto]]></entry>
 	<entry key="network.test.port.avail"><![CDATA[port is available]]></entry>
@@ -912,7 +914,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="network.test.upl"><![CDATA[Velocidad de subida]]></entry>
 	<entry key="network.test.upl.bytes"><![CDATA[Bytes subidos]]></entry>
 	<entry key="network.test.upl.speed"><![CDATA[Velocidad de subida]]></entry>
-	<entry key="network.test.upl.time"><![CDATA[Upload time]]></entry>
+	<entry key="network.test.upl.time"><![CDATA[Tiempo de subida]]></entry>
 	<entry key="poll.clone"><![CDATA[Clonar]]></entry>
 	<entry key="poll.type.NUMERIC"><![CDATA[Valor numérico [1-10]]]></entry>
 	<entry key="poll.type.YES_NO"><![CDATA[Sí/No]]></entry>
@@ -926,19 +928,18 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="room.type.CONFERENCE"><![CDATA[conferencia (1-25 usuarios)]]></entry>
 	<entry key="room.type.CONFERENCE.desc"><![CDATA["democrática" por defecto, todo usuario puede activar el audio/video sin necesidad de solicitarlo]]></entry>
 	<entry key="room.type.INTERVIEW"><![CDATA[interview (1:1 reunión con grabación)]]></entry>
-	<entry key="room.type.INTERVIEW.desc"><![CDATA[only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)]]></entry>
+	<entry key="room.type.INTERVIEW.desc"><![CDATA[Solo dos usuarios pueden tener audio/video activo (puede haber más usuarios en la sala y puedes activar audio/video de cualquiera de ellos)]]></entry>
 	<entry key="room.type.PRESENTATION"><![CDATA[presentation (1-150 usuarios)]]></entry>
 	<entry key="room.type.PRESENTATION.desc"><![CDATA[Por defecto, restringido: Todo usuario regular necesitará solicitarlo si quiere compartir audio/video]]></entry>
-	<entry key="save.success"><![CDATA[Saved successfully]]></entry>
+	<entry key="save.success"><![CDATA[Salvado con éxito]]></entry>
 	<entry key="send.on.ctrl.enter"><![CDATA[Send on Ctrl+Enter]]></entry>
 	<entry key="send.on.enter"><![CDATA[Send on Enter]]></entry>
 	<entry key="sound.enable"><![CDATA[Activar sonido]]></entry>
 	<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
-	<entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
-		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
+	<entry key="template.recording.expiring.body"><![CDATA[Tu reciente {0} grabación será borrada automáticamente en {1} días. Si quieres guardar esta grabación descárgala antes.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Saludos,<br/>
 	{0} Equipo de soporte.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hola {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[La grabación será borrada]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Permitir a este usuario usar el micrófono]]></entry>
@@ -953,7 +954,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="ulist.right.presenter.grant"><![CDATA[Permitir a este usuario ser presentador]]></entry>
 	<entry key="ulist.right.presenter.request"><![CDATA[Solicitar permisos de presentador]]></entry>
 	<entry key="ulist.right.presenter.revoke"><![CDATA[Retirar permisos de presentación a este usuario]]></entry>
-	<entry key="ulist.right.remote.grant"><![CDATA[Permitir control remoto (durante pantalla compartida]]></entry>
+	<entry key="ulist.right.remote.grant"><![CDATA[Permitir control remoto (durante pantalla compartida)]]></entry>
 	<entry key="ulist.right.remote.request"><![CDATA[Solicitar permiso para control remoto (durante pantalla compartida)]]></entry>
 	<entry key="ulist.right.remote.revoke"><![CDATA[Retirar al usuario permisos de control remoto (durante compartición de pantalla)]]></entry>
 	<entry key="ulist.right.share.grant"><![CDATA[Permitir al usuario compartir pantalla/grabar]]></entry>
@@ -980,8 +981,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="video.mic.on"><![CDATA[El micrófono está abierto!]]></entry>
 	<entry key="video.muteothers"><![CDATA[Silenciar los micrófonos de los demás]]></entry>
 	<entry key="video.permission.text"><![CDATA[Se requieren permisos extras para reproducir video. Pulsa OK para permitirlo.]]></entry>
-	<entry key="video.permission.title"><![CDATA[Permission is required]]></entry>
-	<entry key="video.settings.https.required"><![CDATA[La cámara y el micrófono no funcionarán en entorno inseguro. Trata de usar https]]></entry>
+	<entry key="video.permission.title"><![CDATA[Se requiere permiso]]></entry>
+	<entry key="video.settings.https.required"><![CDATA[La cámara y el micrófono no funcionarán en entorno inseguro. Trata de usar https.]]></entry>
 	<entry key="volume.label"><![CDATA[Ajustar volumen]]></entry>
 	<entry key="wait-moderator.message"><![CDATA[Por favor, espera hasta que un moderador entre en la sala]]></entry>
 	<entry key="wait-moderator.title"><![CDATA[Por favor, espera...]]></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 94fe0ab..12ed3d6 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[منطقه زمانی]]></entry>
 	<entry key="1146"><![CDATA[توضیح]]></entry>
 	<entry key="1147"><![CDATA[ایجاد شده توسط]]></entry>
+	<entry key="1148"><![CDATA[پیام منطقه زمانی]]></entry>
+	<entry key="1149"><![CDATA["پیام منطقه زمانی" را بررسی کنیدتا به کاربران در زمان ورود  برای بروز کردن پوشه پیغام دهد.]]></entry>
 	<entry key="1151"><![CDATA[کنفرانس جدید:]]></entry>
 	<entry key="1152"><![CDATA[جزییات:]]></entry>
 	<entry key="1153"><![CDATA[شروع:]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[موارد اتاق پنهان]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[پست الکترونیک ساده]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal پست الکترونیک]]></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 1f46620..17bcc62 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 80563c8..d00f297 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Fus. horaire]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Créé par]]></entry>
+	<entry key="1148"><![CDATA[Message du fus. hor.]]></entry>
+	<entry key="1149"><![CDATA[Vérifiez "le message du fuseau horaire" pour transmettre aux utilisateurs un message la fois prochaine qu'ils se connectent.]]></entry>
 	<entry key="1151"><![CDATA[Nouvelle conférence {0} :]]></entry>
 	<entry key="1152"><![CDATA[Détails :]]></entry>
 	<entry key="1153"><![CDATA[Début :]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Voulez-vous vraiment supprimer ce tableau blanc ? Cette action ne peut être annulée !]]></entry>
 	<entry key="1315"><![CDATA[N'oubliez pas de commencer l'enregistrement ! Un utilisateur par salle doit toujours le commencer si vous souhaitez avoir l'enregistrement par la suite.]]></entry>
 	<entry key="1316"><![CDATA[Commencer l'enregistrement]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Voulez-vous vraiment effacer le contenu entier du tableau blanc ?]]></entry>
 	<entry key="1355"><![CDATA[Autoriser l'enregistrement]]></entry>
 	<entry key="1356"><![CDATA[Attendre l'enregistrement]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[courriel simple]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[courriel iCal]]></entry>
@@ -885,7 +887,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[Ma salle de conférence (pour 1-16 utilisateurs)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -940,7 +942,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 9dbe666..07feb84 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 4707307..25e7a85 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to user name" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the login in the LDAP is stored including the domain name. Example: user enters "hans" domain is specified as "localhost.com", login that is verified against LDAP is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add domain to user name]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[]]></entry>
+	<entry key="1149"><![CDATA[]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -428,13 +430,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1222"><![CDATA[आवक मंजूषा]]></entry>
 	<entry key="1223"><![CDATA[भेजा हुआ]]></entry>
 	<entry key="1224"><![CDATA[कूड़ेदान]]></entry>
-	<entry key="1234"><![CDATA[Delete contact from list]]></entry>
-	<entry key="1235"><![CDATA[User profile]]></entry>
-	<entry key="1236"><![CDATA[Show user profile]]></entry>
-	<entry key="1239"><![CDATA[Select all]]></entry>
-	<entry key="1240"><![CDATA[Select none]]></entry>
-	<entry key="1241"><![CDATA[Select unread]]></entry>
-	<entry key="1242"><![CDATA[Select read]]></entry>
+	<entry key="1234"><![CDATA[संपर्क सूची से हटाएं]]></entry>
+	<entry key="1235"><![CDATA[प्रयोक्ता प्रालेख]]></entry>
+	<entry key="1236"><![CDATA[प्रयोक्ता-प्रालेख दिखायें]]></entry>
+	<entry key="1239"><![CDATA[सबकुछ चुनें]]></entry>
+	<entry key="1240"><![CDATA[कुछ भी न चुने]]></entry>
+	<entry key="1241"><![CDATA[न पढ़े हुए को चुनें]]></entry>
+	<entry key="1242"><![CDATA[पढ़े हुए को चुनें]]></entry>
 	<entry key="1243"><![CDATA[Move to folder ...]]></entry>
 	<entry key="1247"><![CDATA[Mark unread]]></entry>
 	<entry key="1248"><![CDATA[Mark read]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget to 'Start recording', if you want have the meeting recorded.]]></entry>
 	<entry key="1316"><![CDATA[Start recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -505,15 +507,15 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[सहभाजन पट को नीचे ले जाने के पहले उसकी ऊंचाई कम करें.]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
-	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
-	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
-	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
-	<entry key="1480"><![CDATA[Open new dialog with sharing settings]]></entry>
-	<entry key="1481"><![CDATA[An existing moderator must approve it]]></entry>
-	<entry key="1482"><![CDATA[Ask moderator to share your webcam/microphone]]></entry>
-	<entry key="1483"><![CDATA[Gather feedback by creating a poll]]></entry>
-	<entry key="1484"><![CDATA[Past and current poll results as charts]]></entry>
+	<entry key="1475"><![CDATA[अपने प्रदर्शन पटल के छवि और आँकड़ों को अन्य प्रदाताओं जैसे जस्टिन.टीवी पर प्रसारित करने के लिए इन विन्यासों को पूरित करें]]></entry>
+	<entry key="1476"><![CDATA[कृपया इसे साझा करने के लिए प्रदर्शन पटल का सहभाजन प्रारंभ करें]]></entry>
+	<entry key="1477"><![CDATA[श्रव्य-दृश्यांकन शुरू करने के लिए सभापति की अनुमति आवश्यक है]]></entry>
+	<entry key="1479"><![CDATA[नई फाइल को फाइल-अन्वेषक में दाखिल करें]]></entry>
+	<entry key="1480"><![CDATA[सहभाजन-विन्यास सहित नया संवाद शुरू करें]]></entry>
+	<entry key="1481"><![CDATA[एक मौजूदा सभापति द्वारा इसका अनुमोदन आवश्यक है]]></entry>
+	<entry key="1482"><![CDATA[अपने वेब कैमरा/ध्वनिग्राहक को साझा करने के लिए सभापति से आज्ञा लें]]></entry>
+	<entry key="1483"><![CDATA[एक मतग्राहक बनाकर प्रतिक्रिया इकट्ठा करें]]></entry>
+	<entry key="1484"><![CDATA[पूर्वकालिक एवं वर्त्तमान मतों के परिणामों के लेखाचित्र]]></entry>
 	<entry key="1485"><![CDATA[Vote if there is a poll for this conference room]]></entry>
 	<entry key="1488"><![CDATA[Call external people via VoIP/SIP]]></entry>
 	<entry key="1489"><![CDATA[Send an email with a direct link to this room]]></entry>
@@ -613,13 +615,13 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.oauth.attr.oauth"><![CDATA[OAuth User attribute]]></entry>
 	<entry key="admin.oauth.attr.om"><![CDATA[OM User attribute]]></entry>
 	<entry key="admin.oauth.req.info.method"><![CDATA[Request info method]]></entry>
-	<entry key="admin.oauth.req.token.method"><![CDATA[Request token method]]></entry>
+	<entry key="admin.oauth.req.token.method"><![CDATA[टोकन विधि का अनुरोध करें]]></entry>
 	<entry key="admin.oauth.user.mapping"><![CDATA[प्रयोक्ता निर्दिष्टीकरण]]></entry>
 	<entry key="admin.purge"><![CDATA[Purge]]></entry>
 	<entry key="admin.purge.desc"><![CDATA[क्या आप इसे पूर्णतः नष्ट करना चाहते हैं? यह क्रिया अपरिवर्तनीय है!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -642,7 +644,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="calendar.googleID"><![CDATA[Google Calendar ID]]></entry>
 	<entry key="calendar.googleKey"><![CDATA[Google Calendar API key]]></entry>
 	<entry key="calendar.sync"><![CDATA[Sync]]></entry>
-	<entry key="calendar.url"><![CDATA[External CalDAV Calendar URL]]></entry>
+	<entry key="calendar.url"><![CDATA[बाहरी कैलडेव कैलेंडर का एकीकृत संसूचना संकेतक]]></entry>
 	<entry key="camera.off"><![CDATA[Camera is off. Click to turn on.]]></entry>
 	<entry key="camera.on"><![CDATA[Camera is on. Click to turn off.]]></entry>
 	<entry key="captcha.text"><![CDATA[Captcha text]]></entry>
@@ -726,7 +728,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.instructions.oracle"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/OracleConfig.html">Oracle</a>]]></entry>
 	<entry key="install.wizard.db.step.instructions.postgresql"><![CDATA[<a target="_blank" href="https://openmeetings.apache.org/PostgresConfig.html">PostgreSql</a>]]></entry>
 	<entry key="install.wizard.db.step.mssql.name"><![CDATA[MSSQL]]></entry>
-	<entry key="install.wizard.db.step.mysql.name"><![CDATA[MySQL]]></entry>
+	<entry key="install.wizard.db.step.mysql.name"><![CDATA[माईएसक्यूएल]]></entry>
 	<entry key="install.wizard.db.step.nodriver"><![CDATA[Cannot load the proper DB driver. Please download the corresponding jar file and restart the OM server. Instructions: {0}]]></entry>
 	<entry key="install.wizard.db.step.note"><![CDATA[<h4>
 			<a id="Recommendation_for_production_environment"></a>Recommendation
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -767,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
 	<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
 	<entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
-	<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
+	<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[डिफ़ॉल्ट भाषा]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthPass"><![CDATA[SMTP-Userpass]]></entry>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -875,7 +877,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="lbl.update"><![CDATA[Update]]></entry>
 	<entry key="main.menu.admin.email"><![CDATA[Email management]]></entry>
 	<entry key="main.menu.admin.email.desc"><![CDATA[Check e-mails processing by the system]]></entry>
-	<entry key="menu.polls"><![CDATA[Polls]]></entry>
+	<entry key="menu.polls"><![CDATA[मतदान]]></entry>
 	<entry key="menu.polls.quick.descr"><![CDATA[Gather feedback without creating a poll]]></entry>
 	<entry key="menu.polls.quick.title"><![CDATA[Create Quick Poll]]></entry>
 	<entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[शुरू हो रही है]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 cbddb9e..b680e2f 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Időzóna]]></entry>
 	<entry key="1146"><![CDATA[Leírás]]></entry>
 	<entry key="1147"><![CDATA[Létrehozta]]></entry>
+	<entry key="1148"><![CDATA[Időzóna üzenet]]></entry>
+	<entry key="1149"><![CDATA[Ellenőrizze az "TimeZone Message" a profiljában, amit a felhasználók a belépéskor látni fognak.]]></entry>
 	<entry key="1151"><![CDATA[új {0} konferencia:]]></entry>
 	<entry key="1152"><![CDATA[Részletek:]]></entry>
 	<entry key="1153"><![CDATA[Kezdődik:]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[egyszerű e-mail]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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 is failed]]></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.install.started"><![CDATA[Please wait, installation in progress]]></entry>
 	<entry key="install.wizard.params.step1.email"><![CDATA[EMail]]></entry>
@@ -873,7 +875,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[Konferencia szobáim (1-16 résztvevő)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -928,7 +930,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 2e11193..4990242 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 238845a..5a7c0a5 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Fuso orario]]></entry>
 	<entry key="1146"><![CDATA[Descrizione]]></entry>
 	<entry key="1147"><![CDATA[Creato da]]></entry>
+	<entry key="1148"><![CDATA[Messaggio Fuso Orario]]></entry>
+	<entry key="1149"><![CDATA[Seleziona "Messaggio Fuso Orario" per dare un messaggio agli utenti al  prossimo accesso per aggiornare il Fuso Orario.]]></entry>
 	<entry key="1151"><![CDATA[{0} nuove conferenze:]]></entry>
 	<entry key="1152"><![CDATA[Dettagli:]]></entry>
 	<entry key="1153"><![CDATA[Inizio:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Confermi la rimozione di questa lavagna? Questa azione non potrà essere annullata!]]></entry>
 	<entry key="1315"><![CDATA[Non dimenticare di avviare la registrazione! Un utente per stanza deve sempre avviarla per avere la registrazione archiviata.]]></entry>
 	<entry key="1316"><![CDATA[Avvia Registrazione]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Vuoi cancellare veramente il contenuto completo della lavagna?]]></entry>
 	<entry key="1355"><![CDATA[Permetti registrazione]]></entry>
 	<entry key="1356"><![CDATA[Attesa per registrazione]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Vuoi veramente eliminare quest'oggetto? Non potrà essere ripristinato!]]></entry>
 	<entry key="admin.restore"><![CDATA[Ripristina]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Elementi nascosti stanza]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[In attesa del moderatore]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[email semplice]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[email con iCal]]></entry>
@@ -941,7 +943,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[La registrazione sarà eliminata]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Consenti a questo utente di utilizzare il microfono]]></entry>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_iw.properties.xml
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index fd5a100..cf137fe 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[タイムゾーン]]></entry>
 	<entry key="1146"><![CDATA[概要]]></entry>
 	<entry key="1147"><![CDATA[作成者]]></entry>
+	<entry key="1148"><![CDATA[タイムゾーン設定を推奨]]></entry>
+	<entry key="1149"><![CDATA[次回ログイン時にタイムゾーン設定を行うことを勧めるメッセージを表示する場合にチェックを入れてください。]]></entry>
 	<entry key="1151"><![CDATA[{0}会議が設定されました:]]></entry>
 	<entry key="1152"><![CDATA[詳細:]]></entry>
 	<entry key="1153"><![CDATA[開始時刻:]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[この項目を完全削除してよろしいですか?この作業は元に戻せません!]]></entry>
 	<entry key="admin.restore"><![CDATA[復元]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[非表示エレメント]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[電子メール]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal メール]]></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 14f5fbd..eb95f7d 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 4c274db..d5087e4 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 42b1d8f..7b02cb2 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Strefa czasowa]]></entry>
 	<entry key="1146"><![CDATA[Opis]]></entry>
 	<entry key="1147"><![CDATA[Utworzony przez]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Zaznacz „Wiadomość TimeZone”, aby przy następnym logowaniu dać użytkownikom wiadomość, aby zaktualizować swój profil.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[prosty e-mail]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[Mój pokój (dla 1-16 użytkowników)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[Mój pokój prezentacyjny (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></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 9c0a3fd..dab4099 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 ad7daea..799b110 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Fuso horário]]></entry>
 	<entry key="1146"><![CDATA[Descrição]]></entry>
 	<entry key="1147"><![CDATA[Criado por]]></entry>
+	<entry key="1148"><![CDATA[Mensagem Fuso Horário]]></entry>
+	<entry key="1149"><![CDATA[Marque a opção "Mensagem do Fuso Horário" para apresentar aos usuários uma mensagem na próxima vez entrarem para atualizar o perfil.]]></entry>
 	<entry key="1151"><![CDATA[Nova conferência {0}]]></entry>
 	<entry key="1152"><![CDATA[Detalhes:]]></entry>
 	<entry key="1153"><![CDATA[Inicio:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Você realmente deseja remover esta lousa? Essa ação não pode ser desfeita!]]></entry>
 	<entry key="1315"><![CDATA[Não se esqueça de "Iniciar gravação", se você quiser ter a reunião gravada.]]></entry>
 	<entry key="1316"><![CDATA[Iniciar gravação]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Você realmente deseja excluir todo o conteúdo da lousa?]]></entry>
 	<entry key="1355"><![CDATA[Permitir gravação]]></entry>
 	<entry key="1356"><![CDATA[Espere para gravação]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduzir a altura da tela compartilhada antes de tentar movê-lo para o fundo]]></entry>
 	<entry key="1473"><![CDATA[Reduzir o x da tela compartilhada antes de tentar torná-la mais ampla]]></entry>
 	<entry key="1474"><![CDATA[Reduzir o y da tela compartilhada antes de tentar torná-la maior]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Favor iniciar o compartilhamento de tela para publicar isto]]></entry>
 	<entry key="1477"><![CDATA[É necessária permissão de moderador para iniciar a gravação]]></entry>
 	<entry key="1479"><![CDATA[Carregar novo arquivo para a pasta de arquivos]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microfone ligado. Clique para desligar.]]></entry>
 	<entry key="my.room.conference"><![CDATA[Minha sala de conferência (de 1-16 usuários)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Velocidade de download]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 5cb077e..8f0ce4b 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Временная зона]]></entry>
 	<entry key="1146"><![CDATA[Описание]]></entry>
 	<entry key="1147"><![CDATA[Создано]]></entry>
+	<entry key="1148"><![CDATA[Сообщение в ТЗ]]></entry>
+	<entry key="1149"><![CDATA[Включите "Сообщение в таймзоне", чтобы попросить пользователя сменить свой профайл при след. логине.]]></entry>
 	<entry key="1151"><![CDATA[Новая конференция {0}:]]></entry>
 	<entry key="1152"><![CDATA[Детали:]]></entry>
 	<entry key="1153"><![CDATA[Старт:]]></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 2fb0675..ca96092 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 71a82e7..d11428e 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
@@ -67,7 +67,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="82"><![CDATA[Flexible textbox]]></entry>
 	<entry key="84"><![CDATA[Jag har en fråga]]></entry>
 	<entry key="85"><![CDATA[Stäng]]></entry>
-	<entry key="86"><![CDATA[italic]]></entry>
+	<entry key="86"><![CDATA[kursiv]]></entry>
 	<entry key="87"><![CDATA[fetstil]]></entry>
 	<entry key="98"><![CDATA[Moderator]]></entry>
 	<entry key="99"><![CDATA[Rummet är fullt]]></entry>
@@ -137,7 +137,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="269"><![CDATA[uppdaterat av]]></entry>
 	<entry key="271"><![CDATA[Värde]]></entry>
 	<entry key="274"><![CDATA[Radera användare från användargruppen]]></entry>
-	<entry key="275"><![CDATA[radera]]></entry>
+	<entry key="275"><![CDATA[R]]></entry>
 	<entry key="277"><![CDATA[Nyheter]]></entry>
 	<entry key="281"><![CDATA[Hjälp och support]]></entry>
 	<entry key="282"><![CDATA[https://openmeetings.apache.org/
@@ -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[Epost]]></entry>
+	<entry key="510"><![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>
@@ -246,7 +246,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="605"><![CDATA[Vill du verkligen avregistrera användaren från detta rum?]]></entry>
 	<entry key="606"><![CDATA[Din session har avslutats av en administratör eller moderator.]]></entry>
 	<entry key="607"><![CDATA[Telefon]]></entry>
-	<entry key="615"><![CDATA[Whiteboard]]></entry>
+	<entry key="615"><![CDATA[Vit tavla]]></entry>
 	<entry key="619"><![CDATA[Typ av rum]]></entry>
 	<entry key="620"><![CDATA[Tidsbokat rum]]></entry>
 	<entry key="634"><![CDATA[Är du säker på att du vill logga ut?]]></entry>
@@ -270,7 +270,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="711"><![CDATA[Edit Name]]></entry>
 	<entry key="712"><![CDATA[Ny mapp]]></entry>
 	<entry key="713"><![CDATA[Är du säker att du vill radera detta?]]></entry>
-	<entry key="714"><![CDATA[Search]]></entry>
+	<entry key="714"><![CDATA[Sök]]></entry>
 	<entry key="730"><![CDATA[Skrivbordsdelare]]></entry>
 	<entry key="731"><![CDATA[Click Start to publish your screen]]></entry>
 	<entry key="732"><![CDATA[Börja dela]]></entry>
@@ -283,7 +283,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="740"><![CDATA[Bredd:]]></entry>
 	<entry key="741"><![CDATA[Höjd:]]></entry>
 	<entry key="742"><![CDATA[Anslutningen bröts av servern]]></entry>
-	<entry key="753"><![CDATA[Reload]]></entry>
+	<entry key="753"><![CDATA[Ladda om]]></entry>
 	<entry key="758"><![CDATA[Check you Microphone and Camera setup before you enter a room by recording some seconds. You can then replay your recording to check your voice and picture.]]></entry>
 	<entry key="764"><![CDATA[SPELA]]></entry>
 	<entry key="765"><![CDATA[You may proceed without testing if you do not plan to publish your voice or picture. Participants without Audio or Video can still use the Whiteboard, share their Desktop or write Chat messages.]]></entry>
@@ -303,8 +303,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="785"><![CDATA[Apply for whiteboard access]]></entry>
 	<entry key="786"><![CDATA[Ansök om tillgång till audio/video]]></entry>
 	<entry key="788"><![CDATA[START]]></entry>
-	<entry key="792"><![CDATA[Rooms]]></entry>
-	<entry key="793"><![CDATA[Choose a room for a meeting]]></entry>
+	<entry key="792"><![CDATA[Rum]]></entry>
+	<entry key="793"><![CDATA[Välj ett rum för mötet]]></entry>
 	<entry key="797"><![CDATA[Varning]]></entry>
 	<entry key="799"><![CDATA[Dag]]></entry>
 	<entry key="800"><![CDATA[Vecka]]></entry>
@@ -366,33 +366,35 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Uppdaterad]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[Konfigurationsfilerna finns i mappen webapps/openmeetings/conf/. Du måste ladda upp filer manuellt till denna mapp. Ändringar i konfugrationsfilen kommer online omedelbart.]]></entry>
 	<entry key="1115"><![CDATA[Konfigurationsfilnamn]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
 	<entry key="1118"><![CDATA[Domän]]></entry>
 	<entry key="1121"><![CDATA[Remote clipboard text]]></entry>
-	<entry key="1131"><![CDATA[Invite user to conference room]]></entry>
-	<entry key="1132"><![CDATA[Choose a conference room. The invited user will get a message with your name and a link to the room.]]></entry>
-	<entry key="1134"><![CDATA[Enter room after sending invitation]]></entry>
-	<entry key="1135"><![CDATA[Invite]]></entry>
+	<entry key="1131"><![CDATA[Bjud in användaren till konferensrummet.]]></entry>
+	<entry key="1132"><![CDATA[Välj ett konferensrum. Den inbjudna användaren kommer att få ett meddelande med ditt namn och en länk till rummet.]]></entry>
+	<entry key="1134"><![CDATA[Gå in i rummet efter att ha skickat inbjudan]]></entry>
+	<entry key="1135"><![CDATA[Bjud in]]></entry>
 	<entry key="1137"><![CDATA[vill bjuda in dig till detta konferensrum:]]></entry>
 	<entry key="1138"><![CDATA[Inbjudningsmeddelande]]></entry>
 	<entry key="1143"><![CDATA[Tidszon]]></entry>
 	<entry key="1146"><![CDATA[Beskrivning]]></entry>
 	<entry key="1147"><![CDATA[Skapad av]]></entry>
+	<entry key="1148"><![CDATA[Tidzonsmeddelande]]></entry>
+	<entry key="1149"><![CDATA[Bocka "Tidzonsmeddelande" för att ge användarna ett meddelande nästa gång de loggar in för att uppdatera sin profil.]]></entry>
 	<entry key="1151"><![CDATA[Ny {0} konferens:]]></entry>
 	<entry key="1152"><![CDATA[Detaljer:]]></entry>
-	<entry key="1153"><![CDATA[Start:]]></entry>
-	<entry key="1154"><![CDATA[End:]]></entry>
-	<entry key="1155"><![CDATA[Changed {0} conference:]]></entry>
-	<entry key="1156"><![CDATA[Organizer:]]></entry>
-	<entry key="1157"><![CDATA[Canceled {0} conference:]]></entry>
+	<entry key="1153"><![CDATA[Början:]]></entry>
+	<entry key="1154"><![CDATA[Slut:]]></entry>
+	<entry key="1155"><![CDATA[{0}-konferensen ändrades:]]></entry>
+	<entry key="1156"><![CDATA[Organisatör:]]></entry>
+	<entry key="1157"><![CDATA[{0}-konferensen ställdes in:]]></entry>
 	<entry key="1158"><![CDATA[{0} konferenspåminnelse:]]></entry>
 	<entry key="1159"><![CDATA[Community settings]]></entry>
-	<entry key="1160"><![CDATA[Show contact data to everybody]]></entry>
-	<entry key="1162"><![CDATA[My offerings]]></entry>
-	<entry key="1163"><![CDATA[My interests]]></entry>
+	<entry key="1160"><![CDATA[Visa kontaktdata till alla]]></entry>
+	<entry key="1162"><![CDATA[Mina erbjudanden]]></entry>
+	<entry key="1163"><![CDATA[Mina intressen]]></entry>
 	<entry key="1166"><![CDATA[Intresseområden]]></entry>
 	<entry key="1167"><![CDATA[Kontaktinformation]]></entry>
 	<entry key="1168"><![CDATA[Visa kontaktuppgifterna bara till kontakter]]></entry>
@@ -400,8 +402,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1170"><![CDATA[Min profil]]></entry>
 	<entry key="1171"><![CDATA[Redigera inställningar]]></entry>
 	<entry key="1172"><![CDATA[Sök användare]]></entry>
-	<entry key="1177"><![CDATA[User offers]]></entry>
-	<entry key="1178"><![CDATA[User looks for]]></entry>
+	<entry key="1177"><![CDATA[Användaren erbjuder]]></entry>
+	<entry key="1178"><![CDATA[Användaren söker]]></entry>
 	<entry key="1179"><![CDATA[Freetext]]></entry>
 	<entry key="1182"><![CDATA[Offers]]></entry>
 	<entry key="1183"><![CDATA[Searchs]]></entry>
@@ -409,7 +411,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1186"><![CDATA[Add to contacts]]></entry>
 	<entry key="1188"><![CDATA[Contacts and Messages]]></entry>
 	<entry key="1189"><![CDATA[Pending contacts]]></entry>
-	<entry key="1190"><![CDATA[Accept]]></entry>
+	<entry key="1190"><![CDATA[Acceptera]]></entry>
 	<entry key="1191"><![CDATA[Vägra]]></entry>
 	<entry key="1192"><![CDATA[Hej,]]></entry>
 	<entry key="1193"><![CDATA[skulle vilja lägga till dig som kontakt.]]></entry>
@@ -418,7 +420,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1198"><![CDATA[confirmed you as contact!]]></entry>
 	<entry key="1202"><![CDATA[Från]]></entry>
 	<entry key="1205"><![CDATA[]]></entry>
-	<entry key="1206"><![CDATA[Messages]]></entry>
+	<entry key="1206"><![CDATA[Meddelanden]]></entry>
 	<entry key="1207"><![CDATA[New Mail]]></entry>
 	<entry key="1208"><![CDATA[Klicka för att skriva ett nytt meddelande till någon av dina kontakter]]></entry>
 	<entry key="1209"><![CDATA[Skriv nytt meddelande]]></entry>
@@ -458,14 +460,14 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Vill du verkligen ta bort vita tavlan? Detta kan inte ångras efteråt. ]]></entry>
 	<entry key="1315"><![CDATA[Glöm inte att 'Börja spela in' om du vill ha mötet inspelat.]]></entry>
 	<entry key="1316"><![CDATA[Börja spela in]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clipart]]></entry>
 	<entry key="1340"><![CDATA[Vill du verkligen radera allt innehåll från vita tavlan?]]></entry>
 	<entry key="1355"><![CDATA[Tillåt inspelning]]></entry>
 	<entry key="1356"><![CDATA[Vänta för inspelning]]></entry>
 	<entry key="1359"><![CDATA[Do you really want to delete the content on the current slide?]]></entry>
 	<entry key="1360"><![CDATA[Acceptera och bevilja rättigheten till användaren]]></entry>
 	<entry key="1361"><![CDATA[Deny]]></entry>
-	<entry key="1362"><![CDATA[I]]></entry>
+	<entry key="1362"><![CDATA[Jag]]></entry>
 	<entry key="1363"><![CDATA[Aktiviteter och handlingar]]></entry>
 	<entry key="1410"><![CDATA[Enkätens namn]]></entry>
 	<entry key="1411"><![CDATA[Du]]></entry>
@@ -478,16 +480,16 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1420"><![CDATA[Delete Poll]]></entry>
 	<entry key="1421"><![CDATA[Are you sure you want to delete this Poll? The results will be deleted as well.]]></entry>
 	<entry key="1422"><![CDATA[Language ISO Code]]></entry>
-	<entry key="1429"><![CDATA[Cam resolution]]></entry>
+	<entry key="1429"><![CDATA[Webcamresolution]]></entry>
 	<entry key="1430"><![CDATA[Changing the resolution affects bandwidth, bigger picture needs more bandwith!]]></entry>
 	<entry key="1443"><![CDATA[Layout options]]></entry>
-	<entry key="1444"><![CDATA[New Event]]></entry>
-	<entry key="1445"><![CDATA[Password protected are the links to the conference that are send to the participents when you save the calendar event, not the room! That means if you save the event multiple times but with different passwords every participent receives a new link that has a different password. But old links still work once send!]]></entry>
+	<entry key="1444"><![CDATA[Nytt evenemang]]></entry>
+	<entry key="1445"><![CDATA[Det är länkarna till konferensen som skickas till användarna när du sparar ett evenemang i kalendern, som krypteras, inte själva rummet! Detta innebär att, om du sparar flera gånger med olika lösenord, varje användare får en ny länk med ett annat lösenord, men gamla länkar som skickats tidigare fungerar fortfarnde!]]></entry>
 	<entry key="1447"><![CDATA[Show sip dialer]]></entry>
-	<entry key="1448"><![CDATA[Call]]></entry>
-	<entry key="1450"><![CDATA[Your home!]]></entry>
-	<entry key="1451"><![CDATA[Plan your meetings]]></entry>
-	<entry key="1452"><![CDATA[Se inspelning och intervjuer]]></entry>
+	<entry key="1448"><![CDATA[Ring]]></entry>
+	<entry key="1450"><![CDATA[Ditt hem!]]></entry>
+	<entry key="1451"><![CDATA[Planera dina möten]]></entry>
+	<entry key="1452"><![CDATA[Se inspelningar och intervjuer]]></entry>
 	<entry key="1454"><![CDATA[Hantera användare och rättigheter]]></entry>
 	<entry key="1455"><![CDATA[Hantera anslutningar och sparka användare]]></entry>
 	<entry key="1456"><![CDATA[Hantera användargrupper]]></entry>
@@ -498,7 +500,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Exportera/importera säkerhetskopior av systemet]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Sluta publicera]]></entry>
 	<entry key="1468"><![CDATA[Värd]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -506,21 +508,21 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Minska höjden av delningsskärmen innan du försöker flytta den till botten.]]></entry>
 	<entry key="1473"><![CDATA[Minska den delade skärmens x innan du försöker göra den bredare]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fyll i dessa inställningar för att strömma dina skärmdata till tredjepartsleverantörer som justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Vänligen starta skärmdelning för att kunna publicera det]]></entry>
 	<entry key="1477"><![CDATA[Moderatorns tillstånd behövs för att påbörja inspelning]]></entry>
 	<entry key="1479"><![CDATA[Ladda upp en ny fil till filhanteraren]]></entry>
-	<entry key="1480"><![CDATA[Open new dialog with sharing settings]]></entry>
+	<entry key="1480"><![CDATA[Öppna ny dialog med delningsinställningar]]></entry>
 	<entry key="1481"><![CDATA[En befintlig moderator måste godkänna det]]></entry>
 	<entry key="1482"><![CDATA[Be moderatorn dela din webcam/mikrofon]]></entry>
 	<entry key="1483"><![CDATA[Skaffa feedback genom att skapa en enkät]]></entry>
 	<entry key="1484"><![CDATA[Tidigare och aktuella enkäters resultat som diagram]]></entry>
 	<entry key="1485"><![CDATA[Rösta om det finns en enkät för detta konferensrum]]></entry>
-	<entry key="1488"><![CDATA[Call external people via VoIP/SIP]]></entry>
+	<entry key="1488"><![CDATA[Ring externa personer via VoIP/SIP]]></entry>
 	<entry key="1489"><![CDATA[Skicka e-post med en direktlänk till detta rum]]></entry>
 	<entry key="1491"><![CDATA[Max uppladdningsstorlek]]></entry>
 	<entry key="1492"><![CDATA[Be moderatorn dela din vita tavla]]></entry>
-	<entry key="1493"><![CDATA[Start Private Chat]]></entry>
+	<entry key="1493"><![CDATA[Börja privat chat]]></entry>
 	<entry key="1494"><![CDATA[Alla]]></entry>
 	<entry key="1500"><![CDATA[Värdnamn]]></entry>
 	<entry key="1504"><![CDATA[Publicerar. Användare:]]></entry>
@@ -529,12 +531,12 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1507"><![CDATA[Rum gemensamma till den aktuella användargruppen]]></entry>
 	<entry key="1508"><![CDATA[Den aktuella användarens rum]]></entry>
 	<entry key="1509"><![CDATA[Skapa/ändra ett mötes eget rum]]></entry>
-	<entry key="1513"><![CDATA[Is chat moderated]]></entry>
+	<entry key="1513"><![CDATA[Chatten är modererad]]></entry>
 	<entry key="1515"><![CDATA[Chat panel opened by default]]></entry>
 	<entry key="1516"><![CDATA[Files panel opened by default]]></entry>
 	<entry key="1526"><![CDATA[Skapa URL]]></entry>
 	<entry key="1527"><![CDATA[Nätverkstest]]></entry>
-	<entry key="1536"><![CDATA[System import]]></entry>
+	<entry key="1536"><![CDATA[Systemimport]]></entry>
 	<entry key="1537"><![CDATA[Inkludera uppladdade filer och inspelningar i säkerhetskopian]]></entry>
 	<entry key="1538"><![CDATA[Aktivera SIP-tranport i rummet]]></entry>
 	<entry key="1546"><![CDATA[Välkommen]]></entry>
@@ -543,8 +545,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1549"><![CDATA[Om]]></entry>
 	<entry key="1551"><![CDATA[Version]]></entry>
 	<entry key="1552"><![CDATA[Revision]]></entry>
-	<entry key="1553"><![CDATA[Build date]]></entry>
-	<entry key="1555"><![CDATA[today]]></entry>
+	<entry key="1553"><![CDATA[Kompilationsdatum]]></entry>
+	<entry key="1555"><![CDATA[idag]]></entry>
 	<entry key="1556"><![CDATA[jan]]></entry>
 	<entry key="1557"><![CDATA[feb]]></entry>
 	<entry key="1558"><![CDATA[mar]]></entry>
@@ -567,17 +569,17 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1580"><![CDATA[Request info URL]]></entry>
 	<entry key="1581"><![CDATA[OAuth2-konfiguration]]></entry>
 	<entry key="1586"><![CDATA[Request token attributes]]></entry>
-	<entry key="1587"><![CDATA[Redirect uri]]></entry>
-	<entry key="1588"><![CDATA[You can enter email address in the format: firstname1 lastname1 <email1> or "firstname2 lastname2" <email2> or 'firstname3 lastname3' <email3> or email]]></entry>
-	<entry key="1589"><![CDATA[Notify on disconnect]]></entry>
+	<entry key="1587"><![CDATA[URI för omdirigering]]></entry>
+	<entry key="1588"><![CDATA[Du kan ange e-postadresser i något av följande format: förnamn1 efternamn1 <e-postatadress1> eller "förnamn2 efternamn2 <e-postatadress2>" eller 'förnamn3 efternamn3 <e-postatadress3>' eller e-postadress4]]></entry>
+	<entry key="1589"><![CDATA[Meddela vid bortkoppling]]></entry>
 	<entry key="1590"><![CDATA[Display]]></entry>
 	<entry key="1592"><![CDATA[Slutdatumet som angivits är tidigare än startdatumet.]]></entry>
 	<entry key="1593"><![CDATA[Exit value]]></entry>
 	<entry key="1594"><![CDATA[Conversion messages]]></entry>
-	<entry key="1595"><![CDATA[Recording file is not found]]></entry>
+	<entry key="1595"><![CDATA[Inspelningsfilen hittades inte]]></entry>
 	<entry key="1598"><![CDATA[Säkerhet]]></entry>
 	<entry key="1599"><![CDATA[Tillgång nekad. Du har inte rätt att gå in i detta rum.]]></entry>
-	<entry key="1600"><![CDATA[Re-convert]]></entry>
+	<entry key="1600"><![CDATA[Konvertera om]]></entry>
 	<entry key="access.denied.header"><![CDATA[Åtkomst vägrad. Du är inte auktoriserad att utföra denna handling.]]></entry>
 	<entry key="account.created"><![CDATA[Ditt konto har skapats. Du kan nu logga in.]]></entry>
 	<entry key="activities.ask.question"><![CDATA[skulle vilja ställa en fråga]]></entry>
@@ -588,22 +590,22 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="activities.request.right.moderator"><![CDATA[ber om tillstånd att bli moderator]]></entry>
 	<entry key="activities.request.right.muteothers"><![CDATA[ber om tillstånd att tysta andra]]></entry>
 	<entry key="activities.request.right.presenter"><![CDATA[ber om tillstånd att bli presentatör]]></entry>
-	<entry key="activities.request.right.remote"><![CDATA[requests permission to control screen during screen sharing]]></entry>
+	<entry key="activities.request.right.remote"><![CDATA[ber om tillstånd att kontrollera skärmen under skärmdelningen]]></entry>
 	<entry key="activities.request.right.share"><![CDATA[ber om tillstånd att dela/spela in skärmen]]></entry>
 	<entry key="activities.request.right.video"><![CDATA[ber om tillstånd att slå på kameran]]></entry>
 	<entry key="activities.request.right.wb"><![CDATA[ber om tillstånd att rita på vita tavlan]]></entry>
-	<entry key="admin.email.body"><![CDATA[Body]]></entry>
-	<entry key="admin.email.errorCount"><![CDATA[Error Count]]></entry>
+	<entry key="admin.email.body"><![CDATA[Meddelandetext]]></entry>
+	<entry key="admin.email.errorCount"><![CDATA[Antal fel]]></entry>
 	<entry key="admin.email.group.label"><![CDATA[E-postmeddelande]]></entry>
-	<entry key="admin.email.lastError"><![CDATA[Last Error]]></entry>
+	<entry key="admin.email.lastError"><![CDATA[Sista felet]]></entry>
 	<entry key="admin.email.recipients"><![CDATA[Mottagare]]></entry>
-	<entry key="admin.email.reset.status"><![CDATA[Reset Status]]></entry>
+	<entry key="admin.email.reset.status"><![CDATA[Återställ status]]></entry>
 	<entry key="admin.email.status.DONE"><![CDATA[Gjort]]></entry>
-	<entry key="admin.email.status.ERROR"><![CDATA[Error]]></entry>
+	<entry key="admin.email.status.ERROR"><![CDATA[Fel]]></entry>
 	<entry key="admin.email.status.NONE"><![CDATA[None]]></entry>
 	<entry key="admin.email.status.SENDING"><![CDATA[Sänder]]></entry>
 	<entry key="admin.group.form.days"><![CDATA[dagar]]></entry>
-	<entry key="admin.group.form.limited"><![CDATA[Limits enabled]]></entry>
+	<entry key="admin.group.form.limited"><![CDATA[Begränsningar aktiverade]]></entry>
 	<entry key="admin.group.form.logo"><![CDATA[Logga]]></entry>
 	<entry key="admin.group.form.maxFilesSize"><![CDATA[Maximal filstorlek]]></entry>
 	<entry key="admin.group.form.maxRecordingsSize"><![CDATA[Maximal storlek för inspelningar]]></entry>
@@ -614,8 +616,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.oauth.attr.oauth"><![CDATA[OAuth-användarattibut]]></entry>
 	<entry key="admin.oauth.attr.om"><![CDATA[OM-användarattribut]]></entry>
 	<entry key="admin.oauth.req.info.method"><![CDATA[Request info method]]></entry>
-	<entry key="admin.oauth.req.token.method"><![CDATA[Request token method]]></entry>
-	<entry key="admin.oauth.user.mapping"><![CDATA[User mapping]]></entry>
+	<entry key="admin.oauth.req.token.method"><![CDATA[Begär tokenmetod]]></entry>
+	<entry key="admin.oauth.user.mapping"><![CDATA[Användarmappning]]></entry>
 	<entry key="admin.purge"><![CDATA[Purge]]></entry>
 	<entry key="admin.purge.desc"><![CDATA[Vill du verkligen ta bort detta? Det kan inte ångras efteråt!]]></entry>
 	<entry key="admin.restore"><![CDATA[Återställ]]></entry>
@@ -627,27 +629,27 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="appointment.reminder.NONE"><![CDATA[skicka inte notifikation]]></entry>
 	<entry key="appointment.tab.advanced"><![CDATA[Advanced]]></entry>
 	<entry key="appointment.tab.general"><![CDATA[Allmänt]]></entry>
-	<entry key="bad.captcha.text"><![CDATA[You have entered incorrect captcha text]]></entry>
+	<entry key="bad.captcha.text"><![CDATA[Du angav captchatexten felaktigt]]></entry>
 	<entry key="bad.password.digit"><![CDATA['Svagt' lösenord: det krävs minst en siffra]]></entry>
 	<entry key="bad.password.lower"><![CDATA['Svagt' lösenord: det krävs åtminstone en gemen]]></entry>
 	<entry key="bad.password.short"><![CDATA['Svagt' lösenord: minsta lösenordslängd är ${0}]]></entry>
 	<entry key="bad.password.special"><![CDATA['Svagt' lösenord: det krävs minst ett specialtecken '!@#$%^&*][' ]]></entry>
-	<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
+	<entry key="bad.password.stop"><![CDATA['Svagt' lösenord: det borde inte innehålla del av användarens e-postadress eller användarnamn]]></entry>
 	<entry key="bad.password.upper"><![CDATA['Svagt' lösenord: det krävs minst en versal]]></entry>
 	<entry key="button.label.share"><![CDATA[Dela]]></entry>
-	<entry key="calendar.addCalendar"><![CDATA[Add External Calendar]]></entry>
+	<entry key="calendar.addCalendar"><![CDATA[Lägg till extern kalender]]></entry>
 	<entry key="calendar.defaultTitle"><![CDATA[Ny kalender]]></entry>
 	<entry key="calendar.dialogTitle"><![CDATA[Kalenderdetaljer]]></entry>
-	<entry key="calendar.error"><![CDATA[Error in making connection on the URL specified.]]></entry>
+	<entry key="calendar.error"><![CDATA[Fel vid anslutning till den angivna URL:en.]]></entry>
 	<entry key="calendar.gcal"><![CDATA[Google Calendar]]></entry>
 	<entry key="calendar.googleID"><![CDATA[ID för Google Calendar]]></entry>
 	<entry key="calendar.googleKey"><![CDATA[Google Calendar API-nyckel]]></entry>
-	<entry key="calendar.sync"><![CDATA[Sync]]></entry>
+	<entry key="calendar.sync"><![CDATA[Synkronisera]]></entry>
 	<entry key="calendar.url"><![CDATA[URL till extern CalDAV-kalender]]></entry>
 	<entry key="camera.off"><![CDATA[Kameran är av. Klicka för att sätta den på.]]></entry>
 	<entry key="camera.on"><![CDATA[Kameran är på. Klicka för att stänga av den.]]></entry>
-	<entry key="captcha.text"><![CDATA[Captcha text]]></entry>
-	<entry key="close.settings.tab"><![CDATA[After saving your audio and video settings you may close this browser tab.]]></entry>
+	<entry key="captcha.text"><![CDATA[Captchatext]]></entry>
+	<entry key="close.settings.tab"><![CDATA[När du har sprat dina audio- och videoinställningar kan du stänga detta fönster.]]></entry>
 	<entry key="convert.errors.file"><![CDATA[Fel inträffade under behandlingen av filen]]></entry>
 	<entry key="convert.errors.file.missing"><![CDATA[Filen hittades inte]]></entry>
 	<entry key="current.password"><![CDATA[Nuvarande lösenord]]></entry>
@@ -674,9 +676,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="error.bad.credentials"><![CDATA[Felaktigt användarnamn/e-postadress och/eller lösenord.]]></entry>
 	<entry key="error.bad.password"><![CDATA[Ogiltigt Lösenord!]]></entry>
 	<entry key="error.cfg.exist"><![CDATA[En konfiguration med den angivna nyckeln finns redan, vänligen ange en annan nyckel eller redigera den befintliga konfigurationen]]></entry>
-	<entry key="error.contact.added"><![CDATA[This user is already in your contact list or has received an invitation to your contact list that is not answered yet.]]></entry>
-	<entry key="error.contact.approved"><![CDATA[The user is already approved.]]></entry>
-	<entry key="error.contact.denied"><![CDATA[The user is already denied.]]></entry>
+	<entry key="error.contact.added"><![CDATA[Denna användare är redan i din kontaktlista eller har fått en inbjudan till din kontaktlista som han ännu inte har svarat på. ]]></entry>
+	<entry key="error.contact.approved"><![CDATA[Användaren har redan godkänts]]></entry>
+	<entry key="error.contact.denied"><![CDATA[Användaren har redan nekats]]></entry>
 	<entry key="error.email.inuse"><![CDATA[Denna epostadress är redan registrerad]]></entry>
 	<entry key="error.hash.invalid"><![CDATA[Inbjudningskoden är inte giltig.]]></entry>
 	<entry key="error.hash.period"><![CDATA[Din inbjudningskod är ogiltig; koden är bara giltig för detta bestämda datum och tid:]]></entry>
@@ -700,21 +702,18 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="goto.next"><![CDATA[Gå till nästa]]></entry>
 	<entry key="goto.prev"><![CDATA[Gå till föregående]]></entry>
 	<entry key="install.room.conference.micro"><![CDATA[Conference room with microphone option set]]></entry>
-	<entry key="install.room.presentation.micro"><![CDATA[Presentation room with microphone option set]]></entry>
+	<entry key="install.room.presentation.micro"><![CDATA[Presentationsrum med mikrofonoption]]></entry>
 	<entry key="install.room.private.conference"><![CDATA[Privat konferensrum]]></entry>
-	<entry key="install.room.public.conference"><![CDATA[Public Conference Room]]></entry>
+	<entry key="install.room.public.conference"><![CDATA[Publikt konferensrum]]></entry>
 	<entry key="install.room.public.interview"><![CDATA[Public Interview Room]]></entry>
-	<entry key="install.room.public.presentation"><![CDATA[Public Presentation Room]]></entry>
-	<entry key="install.room.public.video.only"><![CDATA[Public Video Only Room]]></entry>
-	<entry key="install.room.public.video.wb"><![CDATA[Public Video And Whiteboard Room]]></entry>
-	<entry key="install.wizard.congrats.commercial"><![CDATA[Det finns ett antal företag
-			som också erbjuder kommersiell support 
-för Apache Openmeetings:
-]]></entry>
+	<entry key="install.room.public.presentation"><![CDATA[Publik presentationsrum]]></entry>
+	<entry key="install.room.public.video.only"><![CDATA[Publikt rum med endast video]]></entry>
+	<entry key="install.room.public.video.wb"><![CDATA[Publikt rum med video och vit tavla]]></entry>
+	<entry key="install.wizard.congrats.commercial"><![CDATA[Det finns ett antal företag som erbjuder kommersiell support för Apache Openmeetings:]]></entry>
 	<entry key="install.wizard.congrats.enter"><![CDATA[Enter the Application]]></entry>
 	<entry key="install.wizard.congrats.mail"><![CDATA[Mailing list]]></entry>
 	<entry key="install.wizard.congrats.restart"><![CDATA[Databasen ändrades, vänligen starta om applikationen för att undvika potentiella problem]]></entry>
-	<entry key="install.wizard.db.step.check"><![CDATA[Check]]></entry>
+	<entry key="install.wizard.db.step.check"><![CDATA[Kontrollera]]></entry>
 	<entry key="install.wizard.db.step.db2.name"><![CDATA[IBM DB2]]></entry>
 	<entry key="install.wizard.db.step.dbname"><![CDATA[Ange databasens namn]]></entry>
 	<entry key="install.wizard.db.step.dbtype"><![CDATA[Välj databastyp]]></entry>
@@ -754,20 +753,20 @@ för Apache Openmeetings:
 	<entry key="install.wizard.db.step.user"><![CDATA[Ange databasanvändare]]></entry>
 	<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 is failed]]></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.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"><![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[Name]]></entry>
-	<entry key="install.wizard.params.step1.group.title"><![CDATA[Enter a default Group]]></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>
 	<entry key="install.wizard.params.step1.groupdata"><![CDATA[Group(Domains)]]></entry>
 	<entry key="install.wizard.params.step1.password"><![CDATA[Userpass]]></entry>
 	<entry key="install.wizard.params.step1.password.title"><![CDATA[Ange ett lösenord]]></entry>
 	<entry key="install.wizard.params.step1.tz"><![CDATA[Användarens tidszon]]></entry>
 	<entry key="install.wizard.params.step1.userdata"><![CDATA[Användardata]]></entry>
 	<entry key="install.wizard.params.step1.username"><![CDATA[Användarnamn]]></entry>
-	<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
+	<entry key="install.wizard.params.step1.username.title"><![CDATA[Ange ett användarnamn]]></entry>
 	<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
 	<entry key="install.wizard.params.step2.configuration"><![CDATA[Konfiguration]]></entry>
 	<entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Standarddatabasobjekten av alla typer kommer att skapas (inklusive rum, OAuth2-servrar etc)]]></entry>
@@ -775,13 +774,12 @@ för Apache Openmeetings:
 	<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-användarnamn]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Ange e-postanvändarnamnet]]></entry>
 	<entry key="install.wizard.params.step2.mailAuthPass"><![CDATA[SMTP-användarens lösenord]]></entry>
-	<entry key="install.wizard.params.step2.mailAuthPass.title"><![CDATA[Enter the mail-userpass]]></entry>
+	<entry key="install.wizard.params.step2.mailAuthPass.title"><![CDATA[Ange e-postanvändarens uppgifter]]></entry>
 	<entry key="install.wizard.params.step2.mailReferer"><![CDATA[Mail-Referer]]></entry>
 	<entry key="install.wizard.params.step2.mailReferer.title"><![CDATA[Enter a Referer]]></entry>
 	<entry key="install.wizard.params.step2.mailUseTls"><![CDATA[Aktivera TLS i mailserverautentisering]]></entry>
-	<entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Set inviter's email
-					address as ReplyTo in email invitations]]></entry>
-	<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[Send Email to new registered Users]]></entry>
+	<entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Sätt inbjudarens e-postadress som Reply-to i inbjudningsmailen]]></entry>
+	<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[Skicka e-post till nyregistrerade användare]]></entry>
 	<entry key="install.wizard.params.step2.sendEmailWithVerficationCode"><![CDATA[Nya användare måste verifiera sin e-postadress]]></entry>
 	<entry key="install.wizard.params.step2.smtpPort"><![CDATA[SMTP-serverport (förvald SMTP-serverport är 25)]]></entry>
 	<entry key="install.wizard.params.step2.smtpPort.title"><![CDATA[Ange SMTP-serverns port, normallt 25]]></entry>
@@ -790,15 +788,15 @@ för Apache Openmeetings:
 	<entry key="install.wizard.params.step3.converters"><![CDATA[Konverterare]]></entry>
 	<entry key="install.wizard.params.step3.docDpi"><![CDATA[DPI för dokumentkonvertering]]></entry>
 	<entry key="install.wizard.params.step3.docDpi.text"><![CDATA[DPI för ImageMagic att använda vid konvertering av PDF till bild (förval är 150)]]></entry>
-	<entry key="install.wizard.params.step3.docDpi.title"><![CDATA[Enter the dpi that ImageMagic will use for PDF to image conversion]]></entry>
+	<entry key="install.wizard.params.step3.docDpi.title"><![CDATA[Ange DPI som ImageMagick ska använda vid omvandling av PDF till bild.]]></entry>
 	<entry key="install.wizard.params.step3.docQuality"><![CDATA[JPEG-kvalitet för dokumentomformattering]]></entry>
 	<entry key="install.wizard.params.step3.docQuality.text"><![CDATA[Ange kvaliteten för inbäddade jpeg-bilder. 0 är sämst (små), 100 är bäst (stora). (förval: 90)]]></entry>
 	<entry key="install.wizard.params.step3.docQuality.title"><![CDATA[Ange kvaliteten för inbäddade jpegbilder. 0 är sämst (små), 100 är bäst (stora). (förval: 90)]]></entry>
 	<entry key="install.wizard.params.step3.ffmpegPath"><![CDATA[Sökväg till FFMPEG]]></entry>
-	<entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install fresh and up-to-date FFMpeg.]]></entry>
-	<entry key="install.wizard.params.step3.ffmpegPath.title"><![CDATA[Ange sökvägen till FFMPEG eller lämna tom om FFMPEG är korrekt installerat i systemets sökväg]]></entry>
+	<entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Installera en aktuell och uppdaterad FFMpeg.]]></entry>
+	<entry key="install.wizard.params.step3.ffmpegPath.title"><![CDATA[Ange sökvägen till FFMPEG eller lämna tom om FFMPEG är installerat i systemets sökväg]]></entry>
 	<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 packethanterare (apt-get, yum, dnf etc)]]></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>
@@ -808,50 +806,48 @@ för Apache Openmeetings:
 	<entry key="install.wizard.params.step3.soxPath"><![CDATA[Sökväg till SoX]]></entry>
 	<entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Installera SoX, http://sox.sourceforge.net/ . Du bör installera SoX i en aktuell version! SoX 12.xx fungerar INTE!]]></entry>
 	<entry key="install.wizard.params.step3.soxPath.title"><![CDATA[Enter the path to SoX, leave blank if SoX is successfully installed to system-path]]></entry>
-	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
-	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
-	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
-		for more information or to write your own Crypt-Style see: <a
-		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
-		target="_blank">Custom Crypt Mechanism</a> You can edit this
-		value later BUT previous created Users and Sessions might be not
-		usable anymore
-	]]></entry>
-	<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Enter the Class name of the Encryption Class. DO NOT ALTER THIS IF YOU ARE NOT SURE]]></entry>
+	<entry key="install.wizard.params.step4.crypt"><![CDATA[Krypteringstyp]]></entry>
+	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Krypteringsklass]]></entry>
+	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[Dy kan använda den förvalda krypteringstypen som är samma som
+PHP-MD5-funktionen eller kryptering i BSD-stil genom att använda:
+<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+För mer information eller om du vill skriva din egen krypteringsstil, se:
+<a href="https://openmeetings.apache.org/CustomCryptMechanism.html"
+target="_blank">Custom Crypt Mechanism</a>. Du kan redigera denna 
+inställning senare, MEN användare och sessioner som har skapats fram 
+till dess kan bli oanvändbara. 
+ ]]></entry>
+	<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Ange klassnamnet för krypteringsklassen. ÄNDRA INTE DETTA OM DU INTE ÄR SÄKER]]></entry>
 	<entry key="install.wizard.params.step4.sip"><![CDATA[red5SIP-konfiguration]]></entry>
 	<entry key="install.wizard.params.step4.sipEnable"><![CDATA[Aktivera SIP]]></entry>
-	<entry key="install.wizard.params.step4.sipEnable.text"><![CDATA[Enable red5SIP integration]]></entry>
-	<entry key="install.wizard.params.step4.sipExtenContext"><![CDATA[SIP extensions context]]></entry>
-	<entry key="install.wizard.params.step4.sipExtenContext.text"><![CDATA[Context of Asterisk extensions]]></entry>
+	<entry key="install.wizard.params.step4.sipEnable.text"><![CDATA[Aktivera red5SIP-integration]]></entry>
+	<entry key="install.wizard.params.step4.sipExtenContext"><![CDATA[Kontext för SIP-anslutningar]]></entry>
+	<entry key="install.wizard.params.step4.sipExtenContext.text"><![CDATA[Kontext för Asteriskankytningar]]></entry>
 	<entry key="install.wizard.params.step4.sipRoomPrefix"><![CDATA[SIP-rumprefix]]></entry>
 	<entry key="install.wizard.params.step4.sipRoomPrefix.text"><![CDATA[Prefix for phone number of conference rooms]]></entry>
 	<entry key="install.wizard.welcome.panel"><![CDATA[<ol>
 		<li><h4>
-				<a id="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling
-				import of PDFs into whiteboard<a
+				<a id="Enabling_import_of_PDFs_into_whiteboard"></a>Aktiverar PDF-import till vita tavlan<a
 					href="#Enabling_import_of_PDFs_into_whiteboard"
 					class="section_anchor"></a>
 			</h4>
 			<ul>
-				<li>Install <strong>GhostScript</strong> on the server, you can
-					get more information on <a target="_blank"
+				<li>Installera <strong>GhostScript</strong> på servern, du kan
+					få mer information på <a target="_blank"
 					href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>
-					regarding installation. The instructions for installation can be
-					found there, however on most linux systems you can get it via your
-					favorite package managers (apt-get it).
+					beträffande installationen. Installationsinstruktioner finns där, men på de flesta linuxsystem kan du installera den med din favoritpakethanterare (apt-get o dyl).
 				</li>
 			</ul>
 		</li>
 	</ol>
 
 	<br />
-	<b> <span class="installer-important">If you have further
-			questions or need support in installation or hosting:</span></b>
+	<b> <span class="installer-important">Om du har frågor eller behöver support med installationen eller If you have further
+			questions or need support in installation eller hosting:</span></b>
 	<br />
 	<br />
 
-	<b><span class="installer-important">Community-Support:</span></b>
+	<b><span class="installer-important">Community support:</span></b>
 	<br />
 	<br />
 	<span class="installer-less-important"><a
@@ -859,7 +855,7 @@ för Apache Openmeetings:
 		target="_blank">Mailing lists</a></span>
 	<br />
 	<br />
-	<b> <span class="installer-important">Commercial-Support:</span></b>
+	<b> <span class="installer-important">Kommersiell support:</span></b>
 	<br />
 	<br />
 	<span class="installer-less-important"><a
@@ -867,7 +863,7 @@ för Apache Openmeetings:
 		target="_blank">Commercial-Support</a></span>
 
 	<br />
-	]]></entry>
+ ]]></entry>
 	<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
 	<entry key="label.dock.panel"><![CDATA[Click to dock panel]]></entry>
 	<entry key="label.undock.panel"><![CDATA[Click to undock panel]]></entry>
@@ -882,13 +878,13 @@ för Apache Openmeetings:
 	<entry key="menu.polls"><![CDATA[Enkäter]]></entry>
 	<entry key="menu.polls.quick.descr"><![CDATA[Skaffa feedback utan att skapa en enkät]]></entry>
 	<entry key="menu.polls.quick.title"><![CDATA[Skapa snabbenkät]]></entry>
-	<entry key="messages.btn.reply"><![CDATA[Reply]]></entry>
+	<entry key="messages.btn.reply"><![CDATA[Svara]]></entry>
 	<entry key="messages.subject.re"><![CDATA[Re:]]></entry>
 	<entry key="microphone.off"><![CDATA[Mikrofonen är av. Klicka för att sätta den på. ]]></entry>
 	<entry key="microphone.on"><![CDATA[Mikrofonen är på. Klicka för att stänga av.]]></entry>
 	<entry key="my.room.conference"><![CDATA[Mitt konfgerensrum (för 1-16 användare)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[Mitt presentationsrum (för 1-120 användare)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Kopiera loggen till urklipp]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Nedladdningshastighet]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Nedladdade bytes]]></entry>
@@ -897,8 +893,8 @@ för Apache Openmeetings:
 	<entry key="network.test.jitter"><![CDATA[Jitter]]></entry>
 	<entry key="network.test.jitter.avg"><![CDATA[Genomsnittlig tid]]></entry>
 	<entry key="network.test.jitter.avgAbbr"><![CDATA[Genomsnitt]]></entry>
-	<entry key="network.test.jitter.max"><![CDATA[Max time]]></entry>
-	<entry key="network.test.jitter.min"><![CDATA[Min time]]></entry>
+	<entry key="network.test.jitter.max"><![CDATA[Maxtid]]></entry>
+	<entry key="network.test.jitter.min"><![CDATA[Mintid]]></entry>
 	<entry key="network.test.mb"><![CDATA[Mb]]></entry>
 	<entry key="network.test.ms"><![CDATA[ms]]></entry>
 	<entry key="network.test.ping"><![CDATA[Ping]]></entry>
@@ -907,18 +903,18 @@ för Apache Openmeetings:
 	<entry key="network.test.ping.lost"><![CDATA[Tappade paket]]></entry>
 	<entry key="network.test.ping.rcv"><![CDATA[Mottagna paket]]></entry>
 	<entry key="network.test.port"><![CDATA[Port]]></entry>
-	<entry key="network.test.port.avail"><![CDATA[port is available]]></entry>
+	<entry key="network.test.port.avail"><![CDATA[porten är disponibel]]></entry>
 	<entry key="network.test.port.stopped"><![CDATA[stoppad]]></entry>
-	<entry key="network.test.report"><![CDATA[report]]></entry>
+	<entry key="network.test.report"><![CDATA[rapport]]></entry>
 	<entry key="network.test.report.con.err"><![CDATA[anslutningsfel]]></entry>
 	<entry key="network.test.report.error"><![CDATA[Fel]]></entry>
-	<entry key="network.test.report.start"><![CDATA[start test...]]></entry>
+	<entry key="network.test.report.start"><![CDATA[börja testen...]]></entry>
 	<entry key="network.test.sec"><![CDATA[sek]]></entry>
 	<entry key="network.test.upl"><![CDATA[Uppladdningshastighet]]></entry>
 	<entry key="network.test.upl.bytes"><![CDATA[Uppladdade bytes]]></entry>
-	<entry key="network.test.upl.speed"><![CDATA[Upload speed]]></entry>
+	<entry key="network.test.upl.speed"><![CDATA[Uppladdningshastighet]]></entry>
 	<entry key="network.test.upl.time"><![CDATA[Uppladningstid]]></entry>
-	<entry key="poll.clone"><![CDATA[Clone]]></entry>
+	<entry key="poll.clone"><![CDATA[Klona]]></entry>
 	<entry key="poll.type.NUMERIC"><![CDATA[Numerisk 1-10]]></entry>
 	<entry key="poll.type.YES_NO"><![CDATA[Ja/Nej]]></entry>
 	<entry key="profile.invitation"><![CDATA[Inbjudan]]></entry>
@@ -926,44 +922,44 @@ för Apache Openmeetings:
 	<entry key="recordings.root.group"><![CDATA[Gruppinspelningar]]></entry>
 	<entry key="register.privacy.accept"><![CDATA[Genom att klicka "${register}", accepterar du våra ${link}.]]></entry>
 	<entry key="register.privacy.statement"><![CDATA[dataskyddspolicy]]></entry>
-	<entry key="reset.whiteboard"><![CDATA[Reset Whiteboard]]></entry>
+	<entry key="reset.whiteboard"><![CDATA[Återställ vita tavlan]]></entry>
 	<entry key="restricted.group.files"><![CDATA[Group files are restricted]]></entry>
 	<entry key="room.type.CONFERENCE"><![CDATA[konferens (1-25 användare)]]></entry>
 	<entry key="room.type.CONFERENCE.desc"><![CDATA["demokratisk" enligt förval, varje användare kan aktivera audio/video direkt utan att behöva fråga]]></entry>
 	<entry key="room.type.INTERVIEW"><![CDATA[intervju (1:1-möte med inspelning)]]></entry>
-	<entry key="room.type.INTERVIEW.desc"><![CDATA[only 2 users can have audio/video enabled (more users can be in the room and you can switch the audio/video between them of course)]]></entry>
+	<entry key="room.type.INTERVIEW.desc"><![CDATA[bara två användare kan ha audio/video aktiverade (det kan naturligtvis finnas fler användare i rummet och du kan växla audio/video mellan dem)]]></entry>
 	<entry key="room.type.PRESENTATION"><![CDATA[presentation (1-150 användare)]]></entry>
-	<entry key="room.type.PRESENTATION.desc"><![CDATA["restricted" by default: Every regular user will need to ask if he wants to share audio/video]]></entry>
+	<entry key="room.type.PRESENTATION.desc"><![CDATA["skyddad" enligt förval, varje ordinarie användare måste be om tillstånd för att dela audio/video]]></entry>
 	<entry key="save.success"><![CDATA[Saved successfully]]></entry>
 	<entry key="send.on.ctrl.enter"><![CDATA[Skicka med <Ctrl>+<enter>]]></entry>
 	<entry key="send.on.enter"><![CDATA[Skicka när <enter> pressas]]></entry>
 	<entry key="sound.enable"><![CDATA[Aktivera ljud]]></entry>
-	<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
+	<entry key="sound.mute"><![CDATA[Tysta ljudet]]></entry>
 	<entry key="template.recording.expiring.body"><![CDATA[Din inspelning {0} nyligen blir automatiskt raderad 
 		efter {1} dagar. Om du vill spara inspelningen, 
 vänligen ladda ned den dessförrinnan. ]]></entry>
-	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
-	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.footer"><![CDATA[Med vänlig hälsning,<br/>
+   {0}  Supportteam]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hej {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Inspelningen kommer att raderas]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ Rum[{0}]]]></entry>
-	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
+	<entry key="ulist.right.audio.grant"><![CDATA[Tillåt denna användare att använda mikrofonen]]></entry>
 	<entry key="ulist.right.audio.request"><![CDATA[Be om tillstånd att använda mikrofonen]]></entry>
 	<entry key="ulist.right.audio.revoke"><![CDATA[Tysta användare och ta bort hans rätt att sätta på sin mikrofon]]></entry>
 	<entry key="ulist.right.moderator.grant"><![CDATA[Tillåt denna användare att vara moderator]]></entry>
 	<entry key="ulist.right.moderator.request"><![CDATA[Begär moderatorrättigheter]]></entry>
 	<entry key="ulist.right.moderator.revoke"><![CDATA[Ta bort moderatorrättigheterna från denna användare]]></entry>
-	<entry key="ulist.right.muteothers.grant"><![CDATA[Allow this user to mute others]]></entry>
+	<entry key="ulist.right.muteothers.grant"><![CDATA[Tillåt denna användare att tysta andra]]></entry>
 	<entry key="ulist.right.muteothers.request"><![CDATA[Be om tillstånd att tysta andra]]></entry>
 	<entry key="ulist.right.muteothers.revoke"><![CDATA[Ta bort denna användares rätt att tysta andra]]></entry>
-	<entry key="ulist.right.presenter.grant"><![CDATA[Allow this user to be a presenter]]></entry>
-	<entry key="ulist.right.presenter.request"><![CDATA[Request presenter permissions]]></entry>
+	<entry key="ulist.right.presenter.grant"><![CDATA[Tillåt denna användare att vara presentatör]]></entry>
+	<entry key="ulist.right.presenter.request"><![CDATA[Begär presentatörsrättigheter]]></entry>
 	<entry key="ulist.right.presenter.revoke"><![CDATA[Ta bort presentatörsrättigheterna från denna användare]]></entry>
 	<entry key="ulist.right.remote.grant"><![CDATA[Tillåt fjärrkontroll (under skärmdelning)]]></entry>
 	<entry key="ulist.right.remote.request"><![CDATA[Begär tillstånd för frjärrkontroll (medan skärmdelning pågår)]]></entry>
-	<entry key="ulist.right.remote.revoke"><![CDATA[Remove user's Remote Control permission (during screen sharing)]]></entry>
+	<entry key="ulist.right.remote.revoke"><![CDATA[Ta bort användarens rätt till fjärrkontroll]]></entry>
 	<entry key="ulist.right.share.grant"><![CDATA[Tillåt användaren att dela skärm/spela in]]></entry>
-	<entry key="ulist.right.share.request"><![CDATA[Request permission to share/record screen]]></entry>
+	<entry key="ulist.right.share.request"><![CDATA[De om tillstånd att dela/spela in skärmen]]></entry>
 	<entry key="ulist.right.share.revoke"><![CDATA[Ta bort användarens skärmdelnings- / inspelningstillstånd]]></entry>
 	<entry key="ulist.right.video.grant"><![CDATA[Tillåt användaren att använda kamera]]></entry>
 	<entry key="ulist.right.video.request"><![CDATA[Be om tillstånd att använda kamera]]></entry>
@@ -979,15 +975,15 @@ vänligen ladda ned den dessförrinnan. ]]></entry>
 	<entry key="user.label.displayName"><![CDATA[Display name]]></entry>
 	<entry key="user.salutation.DR"><![CDATA[Dr]]></entry>
 	<entry key="user.salutation.MR"><![CDATA[Herr]]></entry>
-	<entry key="user.salutation.MRS"><![CDATA[Mrs]]></entry>
+	<entry key="user.salutation.MRS"><![CDATA[Fru]]></entry>
 	<entry key="user.salutation.MS"><![CDATA[Fröken]]></entry>
 	<entry key="user.salutation.PROF"><![CDATA[Prof]]></entry>
 	<entry key="video.mic.off"><![CDATA[Mikrofonen är tystad]]></entry>
-	<entry key="video.mic.on"><![CDATA[Microphone is on!]]></entry>
-	<entry key="video.muteothers"><![CDATA[Mute microphone of others]]></entry>
+	<entry key="video.mic.on"><![CDATA[Mikrofonen är på!]]></entry>
+	<entry key="video.muteothers"><![CDATA[Tysta andras mikrofon]]></entry>
 	<entry key="video.permission.text"><![CDATA[Särskild tillåtelse behövs för att spela video.</br>Klicka OK för att tillåta spelning.]]></entry>
 	<entry key="video.permission.title"><![CDATA[Tillstånd krävs]]></entry>
-	<entry key="video.settings.https.required"><![CDATA[Camera/microphone most probably will not work in insecure environment. Try using https.]]></entry>
+	<entry key="video.settings.https.required"><![CDATA[Kamera/mikrofon kommer förmodligen inte att fungera över osäkrade anslutningar. Försök använda https.]]></entry>
 	<entry key="volume.label"><![CDATA[Reglera volym]]></entry>
 	<entry key="wait-moderator.message"><![CDATA[Vänligen vänta tills en <b>moderator</b> kommer in i rummet]]></entry>
 	<entry key="wait-moderator.title"><![CDATA[Vänligen avvakta...]]></entry>
@@ -999,7 +995,7 @@ vänligen ladda ned den dessförrinnan. ]]></entry>
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[Denna sektion visar rum nyligen skapade av dig]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Senaste rum]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, din webbkonferensplattform. Du kan antingen följa 1-2-3-stegen för att gå direkt in i ett konferensrum, eller välja kalendern för att planera och sätta upp ett möte.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Skapa en konferens snabbt!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Avsluta]]></entry>
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_ta.properties.xml
similarity index 94%
copy from openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
copy to openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
index 82ad470..c7d99c4 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_ta.properties.xml
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to user name" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the login in the LDAP is stored including the domain name. Example: user enters "hans" domain is specified as "localhost.com", login that is verified against LDAP is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add domain to user name]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[]]></entry>
+	<entry key="1149"><![CDATA[]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -421,9 +423,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1207"><![CDATA[New mail]]></entry>
 	<entry key="1208"><![CDATA[Click to write a new message to any of your contacts]]></entry>
 	<entry key="1209"><![CDATA[Write new message]]></entry>
-	<entry key="1210"><![CDATA[To:]]></entry>
-	<entry key="1211"><![CDATA[Subject:]]></entry>
-	<entry key="1218"><![CDATA[Book conference room]]></entry>
+	<entry key="1210"><![CDATA[க்கு:]]></entry>
+	<entry key="1211"><![CDATA[பொருள்]]></entry>
+	<entry key="1218"><![CDATA[புத்தக மாநாட்டு அறை]]></entry>
 	<entry key="1221"><![CDATA[Add an optional request for meeting to the message and create a conference room. The event is then copied in the calendar of every participant.]]></entry>
 	<entry key="1222"><![CDATA[Inbox]]></entry>
 	<entry key="1223"><![CDATA[Sent]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget to 'Start recording', if you want have the meeting recorded.]]></entry>
 	<entry key="1316"><![CDATA[Start recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -486,26 +488,27 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1448"><![CDATA[Call]]></entry>
 	<entry key="1450"><![CDATA[Your home!]]></entry>
 	<entry key="1451"><![CDATA[Plan your meetings]]></entry>
-	<entry key="1452"><![CDATA[Watch recordings and interviews]]></entry>
-	<entry key="1454"><![CDATA[Manage users and rights]]></entry>
-	<entry key="1455"><![CDATA[Manage connections and kick users]]></entry>
-	<entry key="1456"><![CDATA[Manage usergroups]]></entry>
-	<entry key="1457"><![CDATA[Manage conference rooms]]></entry>
-	<entry key="1458"><![CDATA[Manage system settings]]></entry>
-	<entry key="1459"><![CDATA[Manage labels and wording]]></entry>
-	<entry key="1460"><![CDATA[Manage LDAP and ADS configurations]]></entry>
-	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
+	<entry key="1452"><![CDATA[பதிவுகள் மற்றும் நேர்காணல்களைப் பாருங்கள்]]></entry>
+	<entry key="1454"><![CDATA[பயனர்களையும் உரிமைகளையும் நிர்வகிக்கவும்]]></entry>
+	<entry key="1455"><![CDATA[இணைப்புகளை நிர்வகிக்கவும் மற்றும் பயனர்களை உதைக்கவும்]]></entry>
+	<entry key="1456"><![CDATA[பயனர் குழுக்களை நிர்வகிக்கவும்]]></entry>
+	<entry key="1457"><![CDATA[மாநாட்டு அறைகளை நிர்வகிக்கவும்]]></entry>
+	<entry key="1458"><![CDATA[கணினி அமைப்புகளை நிர்வகிக்கவும்]]></entry>
+	<entry key="1459"><![CDATA[லேபிள்கள் மற்றும் சொற்களை நிர்வகிக்கவும்]]></entry>
+	<entry key="1460"><![CDATA[LDAP மற்றும் ADS உள்ளமைவுகளை நிர்வகிக்கவும்
+]]></entry>
+	<entry key="1461"><![CDATA[கணினி காப்புப்பிரதிகளை ஏற்றுமதி / இறக்குமதி]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
 	<entry key="1471"><![CDATA[Reduce the width of the SharingScreen before you try to move it left]]></entry>
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
-	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
+	<entry key="1473"><![CDATA[ஷேரிங்ஸ்கிரீனின் x ஐ அகலப்படுத்த முயற்சிக்கும் முன் அதைக் குறைக்கவும்]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -592,7 +595,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="activities.request.right.video"><![CDATA[requests permission to turn on camera]]></entry>
 	<entry key="activities.request.right.wb"><![CDATA[requests permission to draw on the whiteboard]]></entry>
 	<entry key="admin.email.body"><![CDATA[Body]]></entry>
-	<entry key="admin.email.errorCount"><![CDATA[Error Count]]></entry>
+	<entry key="admin.email.errorCount"><![CDATA[பிழை எண்ணிக்கை]]></entry>
 	<entry key="admin.email.group.label"><![CDATA[Email message]]></entry>
 	<entry key="admin.email.lastError"><![CDATA[Last Error]]></entry>
 	<entry key="admin.email.recipients"><![CDATA[Recipients]]></entry>
@@ -616,10 +619,10 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.oauth.req.token.method"><![CDATA[Request token method]]></entry>
 	<entry key="admin.oauth.user.mapping"><![CDATA[User mapping]]></entry>
 	<entry key="admin.purge"><![CDATA[Purge]]></entry>
-	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
+	<entry key="admin.purge.desc"><![CDATA[இந்த உருப்படியை நீங்கள் உண்மையில் தூய்மைப்படுத்த விரும்புகிறீர்களா? இதை செயல்தவிர்க்க முடியாது!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -661,7 +664,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="dashboard.widget.admin.cleanup.missing"><![CDATA[missing count:]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.profiles"><![CDATA[profiles:]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.show"><![CDATA[Show cleanup report]]></entry>
-	<entry key="dashboard.widget.admin.cleanup.streams"><![CDATA[Streams folder:]]></entry>
+	<entry key="dashboard.widget.admin.cleanup.streams"><![CDATA[ஸ்ட்ரீம்ஸ் கோப்புறை:]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.title"><![CDATA[Cleanup report]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.upload"><![CDATA[Upload folder:]]></entry>
 	<entry key="dashboard.widget.admin.cleanup.warn"><![CDATA[Are you sure you want to delete all temporary files? This operation cannot be undone.]]></entry>
@@ -750,7 +753,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -761,7 +764,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step1.password"><![CDATA[Userpass]]></entry>
 	<entry key="install.wizard.params.step1.password.title"><![CDATA[Enter a password]]></entry>
 	<entry key="install.wizard.params.step1.tz"><![CDATA[User Time Zone]]></entry>
-	<entry key="install.wizard.params.step1.userdata"><![CDATA[User data]]></entry>
+	<entry key="install.wizard.params.step1.userdata"><![CDATA[பயனர் தரவு
+]]></entry>
 	<entry key="install.wizard.params.step1.username"><![CDATA[Username]]></entry>
 	<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
 	<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
@@ -807,7 +811,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +888,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +943,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -949,7 +953,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="ulist.right.moderator.request"><![CDATA[Request moderator permissions]]></entry>
 	<entry key="ulist.right.moderator.revoke"><![CDATA[Remove moderator permissions from this user]]></entry>
 	<entry key="ulist.right.muteothers.grant"><![CDATA[Allow this user to mute others]]></entry>
-	<entry key="ulist.right.muteothers.request"><![CDATA[Request permission to mute others]]></entry>
+	<entry key="ulist.right.muteothers.request"><![CDATA[மற்றவர்களை முடக்குவதற்கு அனுமதி கோருங்கள்]]></entry>
 	<entry key="ulist.right.muteothers.revoke"><![CDATA[Remove this user's right to mute others]]></entry>
 	<entry key="ulist.right.presenter.grant"><![CDATA[Allow this user to be a presenter]]></entry>
 	<entry key="ulist.right.presenter.request"><![CDATA[Request presenter permissions]]></entry>
@@ -960,7 +964,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="ulist.right.share.grant"><![CDATA[Allow user to share screen/record]]></entry>
 	<entry key="ulist.right.share.request"><![CDATA[Request permission to share/record screen]]></entry>
 	<entry key="ulist.right.share.revoke"><![CDATA[Remove user's screenshare/record permission]]></entry>
-	<entry key="ulist.right.video.grant"><![CDATA[Allow user to use camera]]></entry>
+	<entry key="ulist.right.video.grant"><![CDATA[கேமராவைப் பயன்படுத்த பயனரை அனுமதிக்கவும்]]></entry>
 	<entry key="ulist.right.video.request"><![CDATA[Request permission to use camera]]></entry>
 	<entry key="ulist.right.video.revoke"><![CDATA[Turn off user's camera and remove permission]]></entry>
 	<entry key="ulist.right.wb.grant"><![CDATA[Allow this user to draw on the whiteboard]]></entry>
@@ -994,9 +998,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
-	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
+	<entry key="widget.start.title"><![CDATA[தொடங்குதல்]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
 	<entry key="zoom.FULL_FIT"><![CDATA[Full-Fit]]></entry>
 	<entry key="zoom.PAGE_WIDTH"><![CDATA[Page Width]]></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 2997f43..94732df 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 a85a86c..346449a 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></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 5415aed..c9a39e5 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Таймзона]]></entry>
 	<entry key="1146"><![CDATA[Опис]]></entry>
 	<entry key="1147"><![CDATA[Створено]]></entry>
+	<entry key="1148"><![CDATA[Повідомлення в ТЗ]]></entry>
+	<entry key="1149"><![CDATA[Увімкніть "Повідомлення в таймзоне", щоб попросити користувача змінити свій профайл при слід. логін.]]></entry>
 	<entry key="1151"><![CDATA[Нова конференція {0}:]]></entry>
 	<entry key="1152"><![CDATA[Деталі:]]></entry>
 	<entry key="1153"><![CDATA[Старт:]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Ви дійсно бажаєте знищити це? Процес є незворотній!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Приховані елементи кімнати]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[звичайний e-майл]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal e-майл]]></entry>
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[Моя кімната для конференцій(до 16 учасників)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Швидкість стягування]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Стягнено байтів]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 99861ff..c4a236d 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
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[时区]]></entry>
 	<entry key="1146"><![CDATA[详细描述]]></entry>
 	<entry key="1147"><![CDATA[创建者]]></entry>
+	<entry key="1148"><![CDATA[时区信息]]></entry>
+	<entry key="1149"><![CDATA[勾选“时区”选项使得用户在下次登录时可以让他们更新用户资料信息]]></entry>
 	<entry key="1151"><![CDATA[新会议:]]></entry>
 	<entry key="1152"><![CDATA[详细情况]]></entry>
 	<entry key="1153"><![CDATA[开始时间:]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[简单电子邮件]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal电子邮件]]></entry>
@@ -885,7 +887,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[在线会议室(1-16人)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -940,7 +942,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></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 af5bf19..359910d 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
@@ -365,7 +365,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1110"><![CDATA[Inserted]]></entry>
 	<entry key="1111"><![CDATA[Inserted by]]></entry>
 	<entry key="1112"><![CDATA[Updated]]></entry>
-	<entry key="1114"><![CDATA[The config files are in the folder webapps/openmeetings/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
+	<entry key="1114"><![CDATA[The config files are in the folder ${data_folder}/conf. You need to manually upload the files to this folder. Changes to the config file are immediately online.]]></entry>
 	<entry key="1115"><![CDATA[Config file name]]></entry>
 	<entry key="1116"><![CDATA[If you enable "Add Domain to username" the value of the field "domain" is added to each login that the user enters in the login box. This is useful if the Login in the Ldap is stored including the domain name. Example: User enters "hans" domain is specified as "localhost.com", login that is verified against Ldap is: hans@localhost.com]]></entry>
 	<entry key="1117"><![CDATA[Add Domain to username]]></entry>
@@ -380,6 +380,8 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1143"><![CDATA[Timezone]]></entry>
 	<entry key="1146"><![CDATA[Description]]></entry>
 	<entry key="1147"><![CDATA[Created by]]></entry>
+	<entry key="1148"><![CDATA[TimeZone Message]]></entry>
+	<entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry>
 	<entry key="1151"><![CDATA[New {0} conference:]]></entry>
 	<entry key="1152"><![CDATA[Details:]]></entry>
 	<entry key="1153"><![CDATA[Start:]]></entry>
@@ -457,7 +459,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1313"><![CDATA[Do you really want to remove this whiteboard? This action cannot be undone.]]></entry>
 	<entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry>
 	<entry key="1316"><![CDATA[Start Recording]]></entry>
-	<entry key="1323"><![CDATA[Cliparts]]></entry>
+	<entry key="1323"><![CDATA[Clip arts]]></entry>
 	<entry key="1340"><![CDATA[Do you really want to delete the complete content on the whiteboard?]]></entry>
 	<entry key="1355"><![CDATA[Allow recording]]></entry>
 	<entry key="1356"><![CDATA[Wait for recording]]></entry>
@@ -497,7 +499,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1461"><![CDATA[Export/Import System Backups]]></entry>
 	<entry key="1465"><![CDATA[Publish]]></entry>
 	<entry key="1466"><![CDATA[Start Publish]]></entry>
-	<entry key="1467"><![CDATA[Stop Publish]]></entry>
+	<entry key="1467"><![CDATA[Stop Publishing]]></entry>
 	<entry key="1468"><![CDATA[Host]]></entry>
 	<entry key="1469"><![CDATA[Publish App]]></entry>
 	<entry key="1470"><![CDATA[Publish Id]]></entry>
@@ -505,7 +507,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="1472"><![CDATA[Reduce the height of the SharingScreen before you try to move it bottom]]></entry>
 	<entry key="1473"><![CDATA[Reduce the x of the SharingScreen before you try to make it wider]]></entry>
 	<entry key="1474"><![CDATA[Reduce the y of the SharingScreen before you try to make it higher]]></entry>
-	<entry key="1475"><![CDATA[Fill these settings stream your screen data to 3th party providers like justin.tv]]></entry>
+	<entry key="1475"><![CDATA[Fill in these settings to stream your screen data to 3th party providers like justin.tv]]></entry>
 	<entry key="1476"><![CDATA[Please start Screen sharing to be able to publish it]]></entry>
 	<entry key="1477"><![CDATA[Moderator permission required to start recording]]></entry>
 	<entry key="1479"><![CDATA[Upload new file to file explorer]]></entry>
@@ -619,7 +621,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry>
 	<entry key="admin.restore"><![CDATA[Restore]]></entry>
 	<entry key="admin.room.hidden.elements"><![CDATA[Hidden room elements]]></entry>
-	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use room until moderator has joined]]></entry>
+	<entry key="admin.room.wait-moderator.info"><![CDATA[No one can use the room until moderator has joined]]></entry>
 	<entry key="admin.room.wait-moderator.label"><![CDATA[Wait for a moderator]]></entry>
 	<entry key="appointment.reminder.EMAIL"><![CDATA[simple email]]></entry>
 	<entry key="appointment.reminder.ICAL"><![CDATA[iCal email]]></entry>
@@ -750,7 +752,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.db.step.user"><![CDATA[Specify DB user]]></entry>
 	<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.failed"><![CDATA[Installation has failed]]></entry>
 	<entry key="install.wizard.install.header"><![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>
@@ -807,7 +809,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="install.wizard.params.step4.crypt"><![CDATA[Crypt Type]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Crypt Class]]></entry>
 	<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[You can use this default crypt type which is equal to
-		PHP-MD5 function or BSD-Style encryption by using:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
+	RFC 7914 - The scrypt Password-Based Key Derivation Function:<b>org.apache.openmeetings.util.crypt.SCryptImplementation</b>
 		for more information or to write your own Crypt-Style see: <a
 		href="https://openmeetings.apache.org/CustomCryptMechanism.html"
 		target="_blank">Custom Crypt Mechanism</a> You can edit this
@@ -884,7 +886,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="microphone.on"><![CDATA[Microphone is on. Click to turn off.]]></entry>
 	<entry key="my.room.conference"><![CDATA[My conference room (for 1-16 users)]]></entry>
 	<entry key="my.room.presentation"><![CDATA[My presentation room (for 1-120 users)]]></entry>
-	<entry key="network.test.click.play"><![CDATA[Click a play button to run a test]]></entry>
+	<entry key="network.test.click.play"><![CDATA[Click the play button to run a test]]></entry>
 	<entry key="network.test.copy.log"><![CDATA[Copy the log to the clipboard]]></entry>
 	<entry key="network.test.dwn"><![CDATA[Download speed]]></entry>
 	<entry key="network.test.dwn.bytes"><![CDATA[Bytes downloaded]]></entry>
@@ -939,7 +941,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 		in {1} days. If you would like to save this recording, please download it before then.]]></entry>
 	<entry key="template.recording.expiring.footer"><![CDATA[Regards,<br/>
 	{0} Support Team.]]></entry>
-	<entry key="template.recording.expiring.greetings"><![CDATA[Dear {0}]]></entry>
+	<entry key="template.recording.expiring.greetings"><![CDATA[Hello {0}]]></entry>
 	<entry key="template.recording.expiring.subj.prefix"><![CDATA[Recording will be deleted]]></entry>
 	<entry key="template.recording.expiring.subj.room"><![CDATA[ -- Room[{0}]]]></entry>
 	<entry key="ulist.right.audio.grant"><![CDATA[Allow this user to use microphone]]></entry>
@@ -994,7 +996,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
 	<entry key="wb.tool.white-out"><![CDATA[White-Out]]></entry>
 	<entry key="widget.recent.desc"><![CDATA[This sections displays rooms recently opened by you]]></entry>
 	<entry key="widget.recent.title"><![CDATA[Recent Rooms]]></entry>
-	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly or you choose the Calendar to set up and plan a meeting.]]></entry>
+	<entry key="widget.start.desc"><![CDATA[{0}, your web conferencing platform. You can either follow the 1-2-3 steps to enter a conference room directly, or choose the Calendar to set up and plan a meeting.]]></entry>
 	<entry key="widget.start.header"><![CDATA[Create a conference, quickly!]]></entry>
 	<entry key="widget.start.title"><![CDATA[Getting Started]]></entry>
 	<entry key="wizard.button.finish"><![CDATA[Finish]]></entry>
diff --git a/openmeetings-web/src/main/webapp/languages/languages.xml b/openmeetings-web/src/main/webapp/languages/languages.xml
index fe4462e..35d5e8d 100644
--- a/openmeetings-web/src/main/webapp/languages/languages.xml
+++ b/openmeetings-web/src/main/webapp/languages/languages.xml
@@ -46,11 +46,12 @@
 	<lang id="25" code="pl">polish</lang>
 	<lang id="26" code="el">greek</lang>
 	<lang id="27" code="nl">dutch</lang>
-	<lang id="28" code="he">hebrew</lang>
+	<lang id="28" code="iw">hebrew</lang>
 	<lang id="29" code="ca">catalan</lang>
 	<lang id="30" code="bg">bulgarian</lang>
 	<lang id="31" code="da">danish</lang>
 	<lang id="32" code="sk">slovak</lang>
 	<lang id="33" code="bn">bengali</lang>
 	<lang id="34" code="hi">hindi</lang>
+	<lang id="35" code="ta">tamil</lang>
 </language>