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 2019/03/20 10:34:32 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2033] user data
can be stored outside OM from now on
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 960ee0b [OPENMEETINGS-2033] user data can be stored outside OM from now on
960ee0b is described below
commit 960ee0bd137b29a980ffc8b4384e252eb3f3daa5
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Mar 14 18:05:08 2019 +0700
[OPENMEETINGS-2033] user data can be stored outside OM from now on
---
.../openmeetings/core/converter/BaseConverter.java | 4 +-
.../openmeetings/core/ldap/LdapLoginManager.java | 22 +-------
.../org/apache/openmeetings/util/OmFileHelper.java | 62 ++++++++++++++++-----
.../web/app/Application.properties.xml | 2 +-
.../web/app/Application_ar.properties.xml | 2 +-
.../web/app/Application_bg.properties.xml | 2 +-
.../web/app/Application_bn.properties.xml | 2 +-
.../web/app/Application_ca.properties.xml | 2 +-
.../web/app/Application_cs.properties.xml | 2 +-
.../web/app/Application_da.properties.xml | 2 +-
.../web/app/Application_de.properties.xml | 2 +-
.../web/app/Application_el.properties.xml | 2 +-
.../web/app/Application_es.properties.xml | 2 +-
.../web/app/Application_fa.properties.xml | 2 +-
.../web/app/Application_fi.properties.xml | 2 +-
.../web/app/Application_fr.properties.xml | 2 +-
.../web/app/Application_gl.properties.xml | 2 +-
.../web/app/Application_he.properties.xml | 2 +-
.../web/app/Application_hu.properties.xml | 2 +-
.../web/app/Application_in.properties.xml | 2 +-
.../web/app/Application_it.properties.xml | 2 +-
.../web/app/Application_ja.properties.xml | 2 +-
.../web/app/Application_ko.properties.xml | 2 +-
.../web/app/Application_nl.properties.xml | 2 +-
.../web/app/Application_pl.properties.xml | 2 +-
.../web/app/Application_pt.properties.xml | 2 +-
.../web/app/Application_pt_BR.properties.xml | 2 +-
.../web/app/Application_ru.properties.xml | 1 +
.../web/app/Application_sk.properties.xml | 2 +-
.../web/app/Application_sv.properties.xml | 2 +-
.../web/app/Application_th.properties.xml | 2 +-
.../web/app/Application_tr.properties.xml | 2 +-
.../web/app/Application_uk.properties.xml | 2 +-
.../web/app/Application_zh_CN.properties.xml | 2 +-
.../web/app/Application_zh_TW.properties.xml | 2 +-
openmeetings-web/src/main/webapp/WEB-INF/web.xml | 16 +-----
.../src/main/webapp/{ => data}/conf/om_ldap.cfg | 0
.../{streams/hibernate => public}/one_second.wav | Bin
38 files changed, 87 insertions(+), 80 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index 5b0c90b..5cc0074 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -24,8 +24,8 @@ import static org.apache.openmeetings.core.data.record.listener.async.BaseStream
import static org.apache.openmeetings.util.CalendarHelper.formatMillis;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG;
+import static org.apache.openmeetings.util.OmFileHelper.getPublicDir;
import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
-import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsSubDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_FFMPEG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_IMAGEMAGIC;
@@ -162,7 +162,7 @@ public abstract class BaseConverter {
stripAudioFirstPass(r, logs, waveFiles, streamFolder, metaList == null ? metaDataDao.getNotScreenMetaDataByRecording(r.getId()) : metaList);
if (waveFiles.isEmpty()) {
// create default Audio to merge it. strip to content length
- String oneSecWav = new File(getStreamsHibernateDir(), "one_second.wav").getCanonicalPath();
+ String oneSecWav = new File(getPublicDir(), "one_second.wav").getCanonicalPath();
// Calculate delta at beginning
double duration = diffSeconds(r.getRecordEnd(), r.getRecordStart());
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index e5f0d68..c446cdd 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -18,22 +18,17 @@
*/
package org.apache.openmeetings.core.ldap;
-import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.db.dao.user.UserDao.getNewUserInstance;
import static org.apache.openmeetings.db.util.LocaleHelper.validateCountry;
import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
import static org.apache.openmeetings.util.OmException.BAD_CREDENTIALS;
import static org.apache.openmeetings.util.OmException.UNKNOWN;
+import static org.apache.openmeetings.util.OmFileHelper.loadLdapConf;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultGroup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
@@ -66,7 +61,6 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.util.OmException;
-import org.apache.openmeetings.util.OmFileHelper;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -321,18 +315,8 @@ public class LdapLoginManager {
public LdapWorker(Long domainId) throws Exception {
this.domainId = domainId;
ldapCfg = ldapConfigDao.get(domainId);
- try (InputStream is = new FileInputStream(new File(OmFileHelper.getConfDir(), ldapCfg.getConfigFileName()));
- Reader r = new InputStreamReader(is, UTF_8))
- {
- config.load(r);
- if (config.isEmpty()) {
- throw new RuntimeException("Error on LdapLogin : Configurationdata couldnt be retrieved!");
- }
- options = new LdapOptions(config);
- } catch (Exception e) {
- log.error("Error on LdapLogin : Configurationdata couldn't be retrieved!");
- throw e;
- }
+ loadLdapConf(ldapCfg.getConfigFileName(), config);
+ options = new LdapOptions(config);
conn = new LdapNetworkConnection(options.host, options.port, options.secure);
}
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 03709fc..0be1cc2 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -18,18 +18,32 @@
*/
package org.apache.openmeetings.util;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
+
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
import java.text.DecimalFormat;
import java.util.Locale;
+import java.util.Properties;
import org.apache.openmeetings.util.ConnectionProperties.DbType;
+import org.apache.wicket.util.string.Strings;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class OmFileHelper {
+ private static final Logger log = Red5LoggerFactory.getLogger(OmFileHelper.class, getWebAppRootKey());
/**
* This variable needs to point to the openmeetings webapp directory
*/
- private static File omHome = null;
+ private static File OM_HOME = null;
+ private static File DATA_HOME = null;
+ private static final String DATA_DIR = "data";
private static final String UPLOAD_DIR = "upload";
private static final String PUBLIC_DIR = "public";
private static final String CLIPARTS_DIR = "cliparts";
@@ -84,11 +98,17 @@ public class OmFileHelper {
private OmFileHelper() {}
public static void setOmHome(File home) {
- omHome = home;
+ OM_HOME = home;
+ final String dataDir = System.getProperty("DATA_DIR");
+ if (Strings.isEmpty(dataDir)) {
+ DATA_HOME = new File(OM_HOME, DATA_DIR);
+ } else {
+ DATA_HOME = new File(dataDir);
+ }
}
public static void setOmHome(String home) {
- omHome = new File(home);
+ setOmHome(new File(home));
}
public static File getRootDir() {
@@ -97,7 +117,7 @@ public class OmFileHelper {
}
public static File getOmHome() {
- return omHome;
+ return OM_HOME;
}
private static File getDir(File parent, String name) {
@@ -109,7 +129,7 @@ public class OmFileHelper {
}
public static File getUploadDir() {
- return new File(omHome, UPLOAD_DIR);
+ return new File(DATA_HOME, UPLOAD_DIR);
}
public static File getUploadFilesDir() {
@@ -182,7 +202,7 @@ public class OmFileHelper {
}
public static File getStreamsDir() {
- return getDir(omHome, STREAMS_DIR);
+ return getDir(DATA_HOME, STREAMS_DIR);
}
public static File getStreamsHibernateDir() {
@@ -210,11 +230,11 @@ public class OmFileHelper {
}
public static File getLanguagesDir() {
- return new File(omHome, LANGUAGES_DIR);
+ return new File(OM_HOME, LANGUAGES_DIR);
}
public static File getPublicDir() {
- return new File(omHome, PUBLIC_DIR);
+ return new File(OM_HOME, PUBLIC_DIR);
}
public static File getPublicClipartsDir() {
@@ -226,7 +246,7 @@ public class OmFileHelper {
}
public static File getWebinfDir() {
- return new File(omHome, WEB_INF_DIR);
+ return new File(OM_HOME, WEB_INF_DIR);
}
public static File getPersistence() {
@@ -241,20 +261,34 @@ public class OmFileHelper {
return new File(getWebinfDir(), dbType == null ? PERSISTENCE_NAME : String.format(DB_PERSISTENCE_NAME, dbType));
}
- public static File getConfDir() {
- return new File(omHome, CONF_DIR);
+ public static File getLdapConf(String name) {
+ return new File(new File(DATA_HOME, CONF_DIR), name);
+ }
+
+ public static void loadLdapConf(String name, Properties config) {
+ try (InputStream is = new FileInputStream(getLdapConf(name));
+ Reader r = new InputStreamReader(is, UTF_8))
+ {
+ config.load(r);
+ if (config.isEmpty()) {
+ throw new RuntimeException("Error on LdapLogin : Configurationdata couldnt be retrieved!");
+ }
+ } catch (IOException e) {
+ log.error("Error on LdapLogin : Configurationdata couldn't be retrieved!");
+ throw new RuntimeException(e);
+ }
}
public static File getScreenSharingDir() {
- return new File(omHome, SCREENSHARING_DIR);
+ return new File(OM_HOME, SCREENSHARING_DIR);
}
public static File getImagesDir() {
- return new File(omHome, IMAGES_DIR);
+ return new File(OM_HOME, IMAGES_DIR);
}
public static File getCssDir() {
- return new File(omHome, CSS_DIR);
+ return new File(OM_HOME, CSS_DIR);
}
public static File getCssImagesDir() {
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 1281005..085abfe 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 2ba23ea..74a25ea 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 342a8bd..8ee68d7 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 7bf1bf4..1970ea2 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 e135414..fc289eb 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 17db16e..46d730d 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 d9afb8b..6aa7c9a 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 4178c15..6aefb35 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG-Pfad]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Installieren Sie FFmpeg. Sie sollten die neueste Version verwenden! Windows-Binaries finden Sie z.B. unter http://ffmpeg.arrozcru.org/builds/. Linux- oder OSx-Nutzer sollten eine der zahlreichen Installationsanleitungen im Web zu Rate ziehen. libmp3lame muss aktiviert sein!]]></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[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ür die Installation finden Sie unter http://www.imagemagick.org/script/binary-releases.php, in den meisten Linux-Distributionen lässt es sich jedoch bequem per Paketmanager (z.B. apt-get) installieren.]]></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 b858491..f4eed5f 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 bc8c078..0e27b62 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
@@ -768,7 +768,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path (Ruta)]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Instalar FFMpeg. Puede conseguir FFMPEG de una copia actualizada! Para Windows puede descargar una Build, por ejemplo desde http://ffmpeg.arrozcru.org/builds/ Los usuarios de Linux o OSx pueden emplear una de las variadas Instrucciones de Instalación que hay en la Web. Es necesario activar libmp3lame!]]></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[Introduzca la ruta a FFMPEG, o déjelo en blanco si ImageMagick está registrado en el path del sistema]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path (Ruta)]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Instalar ImageMagick en el servidor, puede obtener más información en http://www.imagemagick.org observando instalación. Las instrucciones para la misma puede encontrarlas aquí http://www.imagemagick.org/script/binary-releases.php, de todos modos en la mayoría de los sistemas linux puede conseguirlo via su paquete favorito de administración (apt-get it).]]></entry>
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 c6f0ba0..521510b 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
@@ -767,7 +767,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step3.docQuality.text"><![CDATA[کیفیت عکس های jpeg را وارد کنید.0 بدترین(کوچک)، 100 بهترین(بزرگ).(پیش فرض:90)]]></entry>
<entry key="install.wizard.params.step3.docQuality.title"><![CDATA[کیفیت عکس های jpeg اضافه شده را در کیفیت وارد کنید.0 بدترین(کوچک)، 100 بهترین (بزرگ).(پیش فرض:90).]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath"><![CDATA[مسیر FFMPEG]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[FFMpeg را نصب کنید.FFMPEG را در کپی بروز شده دریافت کنید.برای ویندوز می توانید یک Build به طور مثال از http://ffmpeg.arrozcru.org/builds/Linux دریافت کنند یا کاربران OSx باید قادر باشند یکی از دستورات نصب مختلف روی وب استفاده کنند.باید limp3lame را فعال کنید.]]></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[مسیر به FFMPEG را وارد کنید،اگر FFMPEG به طور موفق در مسیر سیستم نصب شده مسیر را خالی بگذارید]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[مسیر ImageMagick]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[ImageMagick را بر روی سرور نصب کنید، شما می توانید اطلاعات بیشتر را در http://www.ImageMagick.org با توجه به نصب دریافت کنید. دستورات نصب در آدرس http://www.ImageMagick.org/Script/binary-releases.php، یافت می شود، با این حال در اکثر سیستم های لینوکس میتوانید آنرا از طریق بسته مدیریتی دلخواه دریافت کنید.]]></entry>
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 b19a088..b5d483b 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 035a2fb..ea1dda7 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[Chemin vers FFMPEG]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Installez FFmpeg. Vous devez obtenir la dernière version de FFMPEG ! Pour Windows vous pouvez la télécharger par exemple de http://ffmpeg.arrozcru.org/builds/. Pour Linux ou OSx vous devriez utiliser l'une des nombreuses instructions d'installation sur le web. Vous devez activer libmp3lame !]]></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[Indiquez le chemin vers FFMPEG dans le cas où FFMPEG ne se trouve pas dans le chemin système.]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[Chemin vers ImageMagick]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installez ImageMagick sur le serveur. Vous trouverez plus d'informations à l'adresse http://www.imagemagick.org. Les instructions d'installation peuvent être trouvées ici http://www.imagemagick.org/script/binary-releases.php. Sur la majorité des systèmes linux vous pouvez le trouver via votre gestionnaire de paquets (apt-get).]]></entry>
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 f714cfe..152e4ea 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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_he.properties.xml
index 1281005..085abfe 100644
--- 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_he.properties.xml
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 a7c55f3..3c8b1ed 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
@@ -767,7 +767,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG útvonala]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Telepítse az FFMpeg programcsomagot. Használja az FFMPEG aktuális, friss verzióját. Windows rendszerekhez kiadások itt http://ffmpeg.arrozcru.org/builds/ Linux, OSX rendszerkhez többféle lehetőség érhető el, keresse meg a megfelelőt az interneten. Szükséges a libmp3lame kóder engedélyezése/implementálása!]]></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[Adja meg az FFMPEG alérési útvonalát, hagyja üresen, ha az FFMPEG elérhető a rendszer útvonalak közt]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick útvonala]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Telepítse a ImageMagick program csomagot a szerverre. Telepítési útmutató és további információk itt http://www.imagemagick.org http://www.imagemagick.org/script/binary-releases.php, Linux operációs rendszerben használja a beépített csomagkezelőt (apt-get it).]]></entry>
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 041b753..9e9681a 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 2c661ba..5bace7b 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[Percorso FFMPEG]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Installa FFMpeg. Dovresti recuperare FFMPEG nella copia più aggiornata! Per Windows puoi scaricare una Build per esempio da http://ffmpeg.arrozcru.org/builds/ Gli utenti Linux o OSx dovrebbero poter usare una delle varie istruzioni di installazione presenti sul Web. Devi abilitare libmp3lame, libx264, libfdk_aac, libvorbis e libtheora.]]></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[Specifica il percorso di FFMPEG, lascia vuoto se FFMPEG è già presente nel percorso di sistema]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[Percorso ImageMagick]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installa ImageMagick sul server, puoi trovare informazioni su http://www.imagemagick.org per l'installazione. Le istruzioni per l'installazione possono essere recuperate qui http://www.imagemagick.org/script/binary-releases.php, comunque nella maggior parte dei sistemi linux potrai recuperarlo dal vostro gestore dei pacchetti (apt-get, yum, etc)]]></entry>
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 7443097..ea7964b 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step3.docQuality.text"><![CDATA[埋め込みJPEG画像の品質を入力してください。0=最低（小容量）, 最高=100（大容量）。（既定=90）]]></entry>
<entry key="install.wizard.params.step3.docQuality.title"><![CDATA[埋め込みJPEG画像の品質を入力してください。0=最低（小容量）, 最高=100（大容量）。（既定=90）]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath"><![CDATA[FFMPEG のパス]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[FFMpeg をインストールしてください。最新の FFMPEG が必要です。Windowsの場合、例えば http://ffmpeg.arrozcru.org/builds/ からバイナリをダウンロード可能です。Linux や OSx の場合は、ウェブの各種インストール手順を利用できます。libmp3lame を有効化しておく必要があります!]]></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[FFMPEG のパスを入力してください。システム・パスにインストールされている場合は空欄に設定してください]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick のパス]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[ImageMagick をインストールしてください。詳細は http://www.imagemagick.org を参照してください。インストール手順は http://www.imagemagick.org/script/binary-releases.php にありますが、多くのLinuxシステムではそれぞれのパッケージ・マネージャ（apt-get等）で取得可能です]]></entry>
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 430abdc..f211e6e 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 bedac98..5c980c0 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 50f429b..58fb356 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 6b5a499..9f483e8 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 523f4fb..919e745 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 2a7d15b..57db0d9 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
@@ -770,6 +770,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step3.docQuality.title"><![CDATA[Укажите качество встроенного jpeg изображения. 0 плохое (маленькое), 100 высокое (большое). (по умолчанию:90)]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath"><![CDATA[FFMPEG Путь]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Установите FFMpeg. Вы должны получить последнюю версию FFMPEG! Для Windows Вы можете скачать программу с этого сайта http://ffmpeg.arrozcru.org/builds/ Пользователи Linux или OSx могут использовать одну из различных Инструкций по установке из Сети. Вы должны установить libmp3lame!]]></entry>
+ <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Установите самую версию FFMpeg.]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath.title"><![CDATA[Укажите путь к FFMPEG, или не заполняйте данное поле если FFMPEG установлен в путях Вашей системы]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Путь]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Установите ImageMagick на Ваш сервер, более подробную информацию касающуюся установки можно посмотреть тут http://www.imagemagick.org Инструкцию по установке Вы можете найти здесь http://www.imagemagick.org/script/binary-releases.php, однако в большинстве систем Линукс Вы можете установить его через Ваш менеджер пакетов (apt-get it)]]></entry>
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 23682df..8895ab2 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 eee6587..bedac2e 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 bae2cb7..d1b19c7 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 0aa276d..dfab98a 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
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 22f50d4..3a99904 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Шлях]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Установите FFMpeg. Вы должны получить последнюю версию FFMPEG! Для Windows Вы можете скачать программу с этого сайта http://ffmpeg.arrozcru.org/builds/ Пользователи Linux или OSx могут использовать одну из различных Инструкций по установке из Сети. Вы должны установить libmp3lame!]]></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[Вкажіть шлях до FFMPEG, або не заповнюйте це поле якщо FFMPEG встановлений в шляхах Вашої системи]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Шлях]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Установите ImageMagick на Ваш сервер, более подробную информацию касающуюся установки можно посмотреть тут http://www.imagemagick.org Инструкцию по установке Вы можете найти здесь http://www.imagemagick.org/script/binary-releases.php, однако в большинстве систем Линукс Вы можете установить его через Ваш менеджер пакетов (apt-get it)]]></entry>
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 0c39307..fd5e2b0 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG 路径]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[安装 FFMpeg. 你应该获得一个最新版本的FFMPEG!针对Windows你可以下载一个示例从 http://ffmpeg.arrozcru.org/builds/ Linux和OSX用户应该能够使用网上不同的安装说明，你需要激活libmp3lame！]]></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[输入FFMPEG的路径, 如果FFMPEG成功安装到系统路径，就不用填写这个字段]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick 路径]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[安装 ImageMagick 在服务器上，你可以得到更多的信息在 http://www.imagemagick.org 关于安装. 安装的说明可以在这里找到 http://www.imagemagick.org/script/binary-releases.php, 然而，在大多数linux系统中，您可以通过您最喜爱的软件包管理器来获得它(apt-get it)]]></entry>
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 b04bb99..d2aa6a5 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
@@ -769,7 +769,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details
<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.ffmpegPath"><![CDATA[FFMPEG Path]]></entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[Install FFMpeg. You should get FFMPEG in an up to date copy! For Windows you can download a Build for example from http://ffmpeg.arrozcru.org/builds/ Linux or OSx Users should be able to use one of the various Installation Instructions on the Web. You need to enable libmp3lame!]]></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[Enter the path to FFMPEG, leave blank if FFMPEG is successfully installed to system-path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath"><![CDATA[ImageMagick Path]]></entry>
<entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install ImageMagick on the server, you can get more information on http://www.imagemagick.org regarding installation. The instructions for installation can be found there http://www.imagemagick.org/script/binary-releases.php, however on most linux systems you can get it via your favorite package managers (apt-get it)]]></entry>
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
index 49634d1..857d077 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
@@ -66,7 +66,7 @@
</init-param>
<init-param>
<param-name>ignorePaths</param-name>
- <param-value>conf,css,docs,images,js,persistence,public,screenshare,streams,upload,uploadtemp,services,DownloadHandler</param-value>
+ <param-value>css,docs,images,js,persistence,public,screenshare,data,services,DownloadHandler</param-value>
</init-param>
</filter>
<filter-mapping>
@@ -117,19 +117,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
- <url-pattern>/streams/*</url-pattern>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>Forbidden</web-resource-name>
- <url-pattern>/conf/*</url-pattern>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>Forbidden</web-resource-name>
- <url-pattern>/upload/*</url-pattern>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>Forbidden</web-resource-name>
- <url-pattern>/uploadtemp/*</url-pattern>
+ <url-pattern>/data/*</url-pattern>
</web-resource-collection>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
diff --git a/openmeetings-web/src/main/webapp/conf/om_ldap.cfg b/openmeetings-web/src/main/webapp/data/conf/om_ldap.cfg
similarity index 100%
rename from openmeetings-web/src/main/webapp/conf/om_ldap.cfg
rename to openmeetings-web/src/main/webapp/data/conf/om_ldap.cfg
diff --git a/openmeetings-web/src/main/webapp/streams/hibernate/one_second.wav b/openmeetings-web/src/main/webapp/public/one_second.wav
similarity index 100%
rename from openmeetings-web/src/main/webapp/streams/hibernate/one_second.wav
rename to openmeetings-web/src/main/webapp/public/one_second.wav