Author: solomax
Date: Thu Dec 1 04:09:12 2016
New Revision: 1772141
URL: http://svn.apache.org/viewvc?rev=1772141&view=rev
Log:
[OPENMEETINGS-1513] minor wizard fixes
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
Thu Dec 1 04:09:12 2016
@@ -50,6 +50,7 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.db.dao.basic.MailMessageDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
import org.apache.openmeetings.db.entity.basic.MailMessage.Status;
+import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.util.mail.MailUtil;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
@@ -69,14 +70,14 @@ public class MailHandler {
private static final Logger log =
Red5LoggerFactory.getLogger(MailHandler.class, webAppRootKey);
private static final int MAIL_SEND_TIMEOUT = 60 * 60 * 1000; // 1 hour
private static final int MAXIMUM_ERROR_COUNT = 5;
-
+
@Autowired
private ConfigurationDao cfgDao;
@Autowired
private TaskExecutor taskExecutor;
@Autowired
private MailMessageDao mailMessageDao;
-
+
private String smtpServer;
private String smtpPort;
private String from;
@@ -264,6 +265,9 @@ public class MailHandler {
public void resetSendingStatus() {
log.debug("resetSendingStatus enter ...");
+ if (!InitializationContainer.initComplete) {
+ return;
+ }
Calendar c = Calendar.getInstance();
c.add(Calendar.MILLISECOND, -MAIL_SEND_TIMEOUT);
mailMessageDao.resetSendingStatus(c);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
Thu Dec 1 04:09:12 2016
@@ -1616,25 +1616,6 @@
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
- <a
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling
- Image Upload and import to whiteboard<a
-
href="#Enabling_Image_Upload_and_import_to_whiteboard"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>ImageMagick</strong> on the
server, you can
- get more information on <a
target="_blank"
- href="http://www.imagemagick.org";
rel="nofollow">http://www.imagemagick.org</a>
- regarding installation. The
instructions for installation can be
- found there <a target="_blank"
-
href="http://www.imagemagick.org/script/binary-releases.php";
-
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
- however on most linux systems you can
get it via your favorite
- package managers (apt-get it)
- </li>
- </ul>
- </li>
- <li><h4>
<a
id="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling
import of PDFs into whiteboard<a
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1659,43 +1640,6 @@
version have a bug that does lead to
wrong object dimensions in the
Whiteboard
</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Enabling
- import of .doc, .docx, .ppt, .pptx, ... all
Office Documents into
- whitebaord<a
-
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li><strong>OpenOffice-Service</strong> started
and listening on
- port 8100, see <a target="_blank"
-
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
- for details</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling
- Recording and import of .avi, .flv, .mov and
.mp4 into whiteboard<a
-
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>FFMpeg</strong>. You should
get FFMPEG in an
- up to date copy! For Windows you can
download a Build for example
- from <a target="_blank"
href="http://ffmpeg.arrozcru.org/builds/";
-
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx
- Users should be able to use one of the
various Installation
- Instructions on the Web. You need to
enable libmp3lame!
- </li>
- <li>Install <strong>SoX</strong> <a
- href="http://sox.sourceforge.net/";
target="_BLANK">http://sox.sourceforge.net/</a>.
- You should install SoX in a up to date
copy! SoX 12.xx will NOT
- work!
- </li>
</ul>
</li>
</ol>
@@ -1801,31 +1745,22 @@
<entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
<entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
<entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85)</entry>
+ <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
<entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
<entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">
- You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf If this shows
- a list of options leave this field blank otherwise you have to
- specify the path to pdf2swf on your system
- </entry>
+ <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+ <entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath">FFMPEG Path</entry>
<entry key="install.wizard.params.step3.ffmpegPath.title">Enter the
path to FFMPEG, leave blank if FFMPEG is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">SoX Path</entry>
<entry key="install.wizard.params.step3.soxPath.title">Enter the path
to SoX, leave blank if SoX is successfully installed to system-path</entry>
- <entry key="install.wizard.params.step3.soxPath.text"></entry>
+ <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Install
SoX http://sox.sourceforge.net/ You should install SoX in a up to date copy!
SoX 12.xx will NOT work!]]></entry>
<entry
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for
jodconverter</entry>
<entry key="install.wizard.params.step3.officePath.title">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation
automatically</entry>
- <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this
- to the real path in case jodconverter is unable to find
- OpenOffice/LibreOffice installation
- </entry>
+ <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation</entry>
<entry key="install.wizard.params.step4.crypt">Crypt Type</entry>
<entry key="install.wizard.params.step4.cryptClassName">Crypt
Class</entry>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
Thu Dec 1 04:09:12 2016
@@ -1616,25 +1616,6 @@
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
- <a
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling
- Image Upload and import to whiteboard<a
-
href="#Enabling_Image_Upload_and_import_to_whiteboard"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>ImageMagick</strong> on the
server, you can
- get more information on <a
target="_blank"
- href="http://www.imagemagick.org";
rel="nofollow">http://www.imagemagick.org</a>
- regarding installation. The
instructions for installation can be
- found there <a target="_blank"
-
href="http://www.imagemagick.org/script/binary-releases.php";
-
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
- however on most linux systems you can
get it via your favorite
- package managers (apt-get it)
- </li>
- </ul>
- </li>
- <li><h4>
<a
id="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling
import of PDFs into whiteboard<a
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1659,43 +1640,6 @@
version have a bug that does lead to
wrong object dimensions in the
Whiteboard
</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Enabling
- import of .doc, .docx, .ppt, .pptx, ... all
Office Documents into
- whitebaord<a
-
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li><strong>OpenOffice-Service</strong> started
and listening on
- port 8100, see <a target="_blank"
-
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
- for details</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling
- Recording and import of .avi, .flv, .mov and
.mp4 into whiteboard<a
-
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>FFMpeg</strong>. You should
get FFMPEG in an
- up to date copy! For Windows you can
download a Build for example
- from <a target="_blank"
href="http://ffmpeg.arrozcru.org/builds/";
-
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx
- Users should be able to use one of the
various Installation
- Instructions on the Web. You need to
enable libmp3lame!
- </li>
- <li>Install <strong>SoX</strong> <a
- href="http://sox.sourceforge.net/";
target="_BLANK">http://sox.sourceforge.net/</a>.
- You should install SoX in a up to date
copy! SoX 12.xx will NOT
- work!
- </li>
</ul>
</li>
</ol>
@@ -1714,7 +1658,6 @@
target="_blank">Mailing lists</a></span>
<br />
<br />
-
<b> <span style="font-size: 1.2em">Commercial-Support:</span></b>
<br />
<br />
@@ -1802,31 +1745,22 @@
<entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
<entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
<entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85)</entry>
+ <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
<entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
<entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">
- You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf If this shows
- a list of options leave this field blank otherwise you have to
- specify the path to pdf2swf on your system
- </entry>
+ <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+ <entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath">FFMPEG Path</entry>
<entry key="install.wizard.params.step3.ffmpegPath.title">Enter the
path to FFMPEG, leave blank if FFMPEG is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">SoX Path</entry>
<entry key="install.wizard.params.step3.soxPath.title">Enter the path
to SoX, leave blank if SoX is successfully installed to system-path</entry>
- <entry key="install.wizard.params.step3.soxPath.text"></entry>
+ <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Install
SoX http://sox.sourceforge.net/ You should install SoX in a up to date copy!
SoX 12.xx will NOT work!]]></entry>
<entry
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for
jodconverter</entry>
<entry key="install.wizard.params.step3.officePath.title">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation
automatically</entry>
- <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this
- to the real path in case jodconverter is unable to find
- OpenOffice/LibreOffice installation
- </entry>
+ <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation</entry>
<entry key="install.wizard.params.step4.crypt">Crypt Type</entry>
<entry key="install.wizard.params.step4.cryptClassName">Crypt
Class</entry>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
Thu Dec 1 04:09:12 2016
@@ -1616,25 +1616,6 @@
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
- <a
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling
- Image Upload and import to whiteboard<a
-
href="#Enabling_Image_Upload_and_import_to_whiteboard"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>ImageMagick</strong> on the
server, you can
- get more information on <a
target="_blank"
- href="http://www.imagemagick.org";
rel="nofollow">http://www.imagemagick.org</a>
- regarding installation. The
instructions for installation can be
- found there <a target="_blank"
-
href="http://www.imagemagick.org/script/binary-releases.php";
-
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
- however on most linux systems you can
get it via your favorite
- package managers (apt-get it)
- </li>
- </ul>
- </li>
- <li><h4>
<a
id="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling
import of PDFs into whiteboard<a
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1659,43 +1640,6 @@
version have a bug that does lead to
wrong object dimensions in the
Whiteboard
</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Enabling
- import of .doc, .docx, .ppt, .pptx, ... all
Office Documents into
- whitebaord<a
-
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li><strong>OpenOffice-Service</strong> started
and listening on
- port 8100, see <a target="_blank"
-
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
- for details</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling
- Recording and import of .avi, .flv, .mov and
.mp4 into whiteboard<a
-
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>FFMpeg</strong>. You should
get FFMPEG in an
- up to date copy! For Windows you can
download a Build for example
- from <a target="_blank"
href="http://ffmpeg.arrozcru.org/builds/";
-
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx
- Users should be able to use one of the
various Installation
- Instructions on the Web. You need to
enable libmp3lame!
- </li>
- <li>Install <strong>SoX</strong> <a
- href="http://sox.sourceforge.net/";
target="_BLANK">http://sox.sourceforge.net/</a>.
- You should install SoX in a up to date
copy! SoX 12.xx will NOT
- work!
- </li>
</ul>
</li>
</ol>
@@ -1714,7 +1658,6 @@
target="_blank">Mailing lists</a></span>
<br />
<br />
-
<b> <span style="font-size: 1.2em">Commercial-Support:</span></b>
<br />
<br />
@@ -1802,31 +1745,22 @@
<entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
<entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
<entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85)</entry>
+ <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
<entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
<entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">
- You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf If this shows
- a list of options leave this field blank otherwise you have to
- specify the path to pdf2swf on your system
- </entry>
+ <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+ <entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath">FFMPEG Path</entry>
<entry key="install.wizard.params.step3.ffmpegPath.title">Enter the
path to FFMPEG, leave blank if FFMPEG is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">SoX Path</entry>
<entry key="install.wizard.params.step3.soxPath.title">Enter the path
to SoX, leave blank if SoX is successfully installed to system-path</entry>
- <entry key="install.wizard.params.step3.soxPath.text"></entry>
+ <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Install
SoX http://sox.sourceforge.net/ You should install SoX in a up to date copy!
SoX 12.xx will NOT work!]]></entry>
<entry
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for
jodconverter</entry>
<entry key="install.wizard.params.step3.officePath.title">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation
automatically</entry>
- <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this
- to the real path in case jodconverter is unable to find
- OpenOffice/LibreOffice installation
- </entry>
+ <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation</entry>
<entry key="install.wizard.params.step4.crypt">Crypt Type</entry>
<entry key="install.wizard.params.step4.cryptClassName">Crypt
Class</entry>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
Thu Dec 1 04:09:12 2016
@@ -1616,25 +1616,6 @@
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
- <a
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling
- Image Upload and import to whiteboard<a
-
href="#Enabling_Image_Upload_and_import_to_whiteboard"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>ImageMagick</strong> on the
server, you can
- get more information on <a
target="_blank"
- href="http://www.imagemagick.org";
rel="nofollow">http://www.imagemagick.org</a>
- regarding installation. The
instructions for installation can be
- found there <a target="_blank"
-
href="http://www.imagemagick.org/script/binary-releases.php";
-
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
- however on most linux systems you can
get it via your favorite
- package managers (apt-get it)
- </li>
- </ul>
- </li>
- <li><h4>
<a
id="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling
import of PDFs into whiteboard<a
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1659,43 +1640,6 @@
version have a bug that does lead to
wrong object dimensions in the
Whiteboard
</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Enabling
- import of .doc, .docx, .ppt, .pptx, ... all
Office Documents into
- whitebaord<a
-
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li><strong>OpenOffice-Service</strong> started
and listening on
- port 8100, see <a target="_blank"
-
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
- for details</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling
- Recording and import of .avi, .flv, .mov and
.mp4 into whiteboard<a
-
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>FFMpeg</strong>. You should
get FFMPEG in an
- up to date copy! For Windows you can
download a Build for example
- from <a target="_blank"
href="http://ffmpeg.arrozcru.org/builds/";
-
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx
- Users should be able to use one of the
various Installation
- Instructions on the Web. You need to
enable libmp3lame!
- </li>
- <li>Install <strong>SoX</strong> <a
- href="http://sox.sourceforge.net/";
target="_BLANK">http://sox.sourceforge.net/</a>.
- You should install SoX in a up to date
copy! SoX 12.xx will NOT
- work!
- </li>
</ul>
</li>
</ol>
@@ -1714,7 +1658,6 @@
target="_blank">Mailing lists</a></span>
<br />
<br />
-
<b> <span style="font-size: 1.2em">Commercial-Support:</span></b>
<br />
<br />
@@ -1802,31 +1745,22 @@
<entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
<entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
<entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85)</entry>
+ <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
<entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
<entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">
- You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf If this shows
- a list of options leave this field blank otherwise you have to
- specify the path to pdf2swf on your system
- </entry>
+ <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+ <entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath">FFMPEG Path</entry>
<entry key="install.wizard.params.step3.ffmpegPath.title">Enter the
path to FFMPEG, leave blank if FFMPEG is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">SoX Path</entry>
<entry key="install.wizard.params.step3.soxPath.title">Enter the path
to SoX, leave blank if SoX is successfully installed to system-path</entry>
- <entry key="install.wizard.params.step3.soxPath.text"></entry>
+ <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Install
SoX http://sox.sourceforge.net/ You should install SoX in a up to date copy!
SoX 12.xx will NOT work!]]></entry>
<entry
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for
jodconverter</entry>
<entry key="install.wizard.params.step3.officePath.title">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation
automatically</entry>
- <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this
- to the real path in case jodconverter is unable to find
- OpenOffice/LibreOffice installation
- </entry>
+ <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation</entry>
<entry key="install.wizard.params.step4.crypt">Crypt Type</entry>
<entry key="install.wizard.params.step4.cryptClassName">Crypt
Class</entry>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
Thu Dec 1 04:09:12 2016
@@ -1616,25 +1616,6 @@
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
- <a
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling
- Image Upload and import to whiteboard<a
-
href="#Enabling_Image_Upload_and_import_to_whiteboard"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>ImageMagick</strong> on the
server, you can
- get more information on <a
target="_blank"
- href="http://www.imagemagick.org";
rel="nofollow">http://www.imagemagick.org</a>
- regarding installation. The
instructions for installation can be
- found there <a target="_blank"
-
href="http://www.imagemagick.org/script/binary-releases.php";
-
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
- however on most linux systems you can
get it via your favorite
- package managers (apt-get it)
- </li>
- </ul>
- </li>
- <li><h4>
<a
id="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling
import of PDFs into whiteboard<a
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1659,43 +1640,6 @@
version have a bug that does lead to
wrong object dimensions in the
Whiteboard
</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Enabling
- import of .doc, .docx, .ppt, .pptx, ... all
Office Documents into
- whitebaord<a
-
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li><strong>OpenOffice-Service</strong> started
and listening on
- port 8100, see <a target="_blank"
-
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
- for details</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling
- Recording and import of .avi, .flv, .mov and
.mp4 into whiteboard<a
-
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>FFMpeg</strong>. You should
get FFMPEG in an
- up to date copy! For Windows you can
download a Build for example
- from <a target="_blank"
href="http://ffmpeg.arrozcru.org/builds/";
-
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx
- Users should be able to use one of the
various Installation
- Instructions on the Web. You need to
enable libmp3lame!
- </li>
- <li>Install <strong>SoX</strong> <a
- href="http://sox.sourceforge.net/";
target="_BLANK">http://sox.sourceforge.net/</a>.
- You should install SoX in a up to date
copy! SoX 12.xx will NOT
- work!
- </li>
</ul>
</li>
</ol>
@@ -1714,7 +1658,6 @@
target="_blank">Mailing lists</a></span>
<br />
<br />
-
<b> <span style="font-size: 1.2em">Commercial-Support:</span></b>
<br />
<br />
@@ -1802,31 +1745,22 @@
<entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
<entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
<entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85)</entry>
+ <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
<entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
<entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">
- You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf If this shows
- a list of options leave this field blank otherwise you have to
- specify the path to pdf2swf on your system
- </entry>
+ <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+ <entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath">FFMPEG Path</entry>
<entry key="install.wizard.params.step3.ffmpegPath.title">Enter the
path to FFMPEG, leave blank if FFMPEG is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">SoX Path</entry>
<entry key="install.wizard.params.step3.soxPath.title">Enter the path
to SoX, leave blank if SoX is successfully installed to system-path</entry>
- <entry key="install.wizard.params.step3.soxPath.text"></entry>
+ <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Install
SoX http://sox.sourceforge.net/ You should install SoX in a up to date copy!
SoX 12.xx will NOT work!]]></entry>
<entry
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for
jodconverter</entry>
<entry key="install.wizard.params.step3.officePath.title">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation
automatically</entry>
- <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this
- to the real path in case jodconverter is unable to find
- OpenOffice/LibreOffice installation
- </entry>
+ <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation</entry>
<entry key="install.wizard.params.step4.crypt">Crypt Type</entry>
<entry key="install.wizard.params.step4.cryptClassName">Crypt
Class</entry>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
Thu Dec 1 04:09:12 2016
@@ -1616,25 +1616,6 @@
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
- <a
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling
- Image Upload and import to whiteboard<a
-
href="#Enabling_Image_Upload_and_import_to_whiteboard"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>ImageMagick</strong> on the
server, you can
- get more information on <a
target="_blank"
- href="http://www.imagemagick.org";
rel="nofollow">http://www.imagemagick.org</a>
- regarding installation. The
instructions for installation can be
- found there <a target="_blank"
-
href="http://www.imagemagick.org/script/binary-releases.php";
-
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
- however on most linux systems you can
get it via your favorite
- package managers (apt-get it)
- </li>
- </ul>
- </li>
- <li><h4>
<a
id="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling
import of PDFs into whiteboard<a
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1659,43 +1640,6 @@
version have a bug that does lead to
wrong object dimensions in the
Whiteboard
</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Enabling
- import of .doc, .docx, .ppt, .pptx, ... all
Office Documents into
- whitebaord<a
-
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li><strong>OpenOffice-Service</strong> started
and listening on
- port 8100, see <a target="_blank"
-
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
- for details</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling
- Recording and import of .avi, .flv, .mov and
.mp4 into whiteboard<a
-
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>FFMpeg</strong>. You should
get FFMPEG in an
- up to date copy! For Windows you can
download a Build for example
- from <a target="_blank"
href="http://ffmpeg.arrozcru.org/builds/";
-
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx
- Users should be able to use one of the
various Installation
- Instructions on the Web. You need to
enable libmp3lame!
- </li>
- <li>Install <strong>SoX</strong> <a
- href="http://sox.sourceforge.net/";
target="_BLANK">http://sox.sourceforge.net/</a>.
- You should install SoX in a up to date
copy! SoX 12.xx will NOT
- work!
- </li>
</ul>
</li>
</ol>
@@ -1714,7 +1658,6 @@
target="_blank">Mailing lists</a></span>
<br />
<br />
-
<b> <span style="font-size: 1.2em">Commercial-Support:</span></b>
<br />
<br />
@@ -1769,9 +1712,9 @@
<entry key="install.wizard.params.step1.email">EMail</entry>
<entry key="install.wizard.params.step1.email.title">Enter a
EMail</entry>
<entry key="install.wizard.params.step1.tz">User Time Zone</entry>
- <entry
key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+ <entry
key="install.wizard.params.step1.groupdata">Group(Domains)</entry>
<entry key="install.wizard.params.step1.group">Name</entry>
- <entry key="install.wizard.params.step1.group.title">Enter a default
Organisation</entry>
+ <entry key="install.wizard.params.step1.group.title">Enter a default
Group</entry>
<entry
key="install.wizard.params.step2.configuration">Configuration</entry>
<entry key="install.wizard.params.step2.allowFrontendRegister">Allow
self-registering (allow_frontend_register)</entry>
@@ -1802,31 +1745,22 @@
<entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
<entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
<entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85)</entry>
+ <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
<entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
<entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">
- You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf If this shows
- a list of options leave this field blank otherwise you have to
- specify the path to pdf2swf on your system
- </entry>
+ <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+ <entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath">FFMPEG Path</entry>
<entry key="install.wizard.params.step3.ffmpegPath.title">Enter the
path to FFMPEG, leave blank if FFMPEG is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">SoX Path</entry>
<entry key="install.wizard.params.step3.soxPath.title">Enter the path
to SoX, leave blank if SoX is successfully installed to system-path</entry>
- <entry key="install.wizard.params.step3.soxPath.text"></entry>
+ <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Install
SoX http://sox.sourceforge.net/ You should install SoX in a up to date copy!
SoX 12.xx will NOT work!]]></entry>
<entry
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for
jodconverter</entry>
<entry key="install.wizard.params.step3.officePath.title">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation
automatically</entry>
- <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this
- to the real path in case jodconverter is unable to find
- OpenOffice/LibreOffice installation
- </entry>
+ <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation</entry>
<entry key="install.wizard.params.step4.crypt">Crypt Type</entry>
<entry key="install.wizard.params.step4.cryptClassName">Crypt
Class</entry>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
Thu Dec 1 04:09:12 2016
@@ -1616,24 +1616,6 @@
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
- <a
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Import von Bildern auf
- das Whiteboard ermöglichen<a
-
href="#Enabling_Image_Upload_and_import_to_whiteboard"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Installieren Sie
<strong>ImageMagick</strong> auf dem Server. Weitere
- Informationen unter <a target="_blank"
- href="http://www.imagemagick.org";
rel="nofollow">http://www.imagemagick.org</a>.
- Anleitungen für die Installation
finden Sie unter <a target="_blank"
-
href="http://www.imagemagick.org/script/binary-releases.php";
-
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>, in den
- meisten Linux-Distributionen lässt
es sich jedoch bequem per Paketmanager
- (z.B. apt-get) installieren.
- </li>
- </ul>
- </li>
- <li><h4>
<a
id="Enabling_import_of_PDFs_into_whiteboard"></a>Import von PDF-Dateien auf das
Whiteboard ermöglichen<a
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1657,41 +1639,6 @@
enthalten einen Bug, welcher zu
falschen Objektausdehnungen auf dem Whiteboard
führt.
</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Import
von
- Office-Dokumenten (.doc, .docx, .ppt,
.pptx, etc.) auf das Whiteboard ermöglichen
- <a
-
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li><strong>OpenOffice-Service</strong> muss
gestartet worden sein und auf Port 8100 lauschen,
- siehe <a target="_blank"
-
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>.</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Aufzeichnung
und
- Import von Videos (.avi, .flv, .mov und
.mp4) auf das Whiteboard ermöglichen<a
-
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Installieren Sie <strong>FFmpeg</strong>.
Sie sollten die neueste Version verwenden!
- Windows-Binaries finden Sie z.B. unter
- <a target="_blank"
href="http://ffmpeg.arrozcru.org/builds/";
-
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a>. Linux- oder OSx-Nutzer
sollten
- eine der zahlreichen
Installationsanleitungen im Web zu Rate ziehen. libmp3lame muss
- aktiviert sein!
- </li>
- <li>Installieren Sie <strong>SoX</strong> <a
- href="http://sox.sourceforge.net/";
target="_BLANK">http://sox.sourceforge.net/</a>.
- Sie sollten die neueste Version
verwenden! SoX 12.xx wird NICHT funktionieren!
- </li>
</ul>
</li>
</ol>
@@ -1717,10 +1664,10 @@
<br />
<br />
- <span style="font-size: 1.3em"><a
- href="http://openmeetings.apache.org/commercial-support.html";
-
target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
- <br />
+ <span style="font-size: 1.3em"><a
+ href="http://openmeetings.apache.org/commercial-support.html";
+
target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
+ <br />
]]></entry>
<entry key="install.wizard.db.step.note"><![CDATA[
<h4>
@@ -1822,18 +1769,16 @@
]]></entry>
<entry
key="install.wizard.params.step3.imageMagicPath">ImageMagick-Pfad</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Geben Sie
den Pfad zu ImageMagick an, falls es sich nicht im Systempfad befindet.</entry>
- <entry key="install.wizard.params.step3.imageMagicPath.text"></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>
<entry key="install.wizard.params.step3.ffmpegPath">FFMPEG-Pfad</entry>
<entry key="install.wizard.params.step3.ffmpegPath.title">Geben Sie den
Pfad zu FFMPEG an, falls es sich nicht im Systempfad befindet.</entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">SoX-Pfad</entry>
<entry key="install.wizard.params.step3.soxPath.title">Geben Sie den
Pfad zu SoX an, falls es sich nicht im Systempfad befindet.</entry>
- <entry key="install.wizard.params.step3.soxPath.text"></entry>
+ <entry
key="install.wizard.params.step3.soxPath.text"><![CDATA[Installieren Sie SoX
http://sox.sourceforge.net/. Sie sollten die neueste Version verwenden! SoX
12.xx wird NICHT funktionieren!]]></entry>
<entry
key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice-/LibreOffice-Pfad
für jodconverter]]></entry>
<entry key="install.wizard.params.step3.officePath.title">Der Pfad zu
OpenOffice/LibreOffice (optional). Bitte geben Sie den echten Pfad an, falls
jodconverter die OpenOffice-/LibreOffice-Installation nicht automatisch
findet.</entry>
- <entry key="install.wizard.params.step3.officePath.text">Der Pfad zu
OpenOffice/LibreOffice (optional). Bitte geben Sie den richtigen Pfad an, falls
- jodconverter die
OpenOffice-/LibreOffice-Installation nicht automatisch findet.
- </entry>
+ <entry key="install.wizard.params.step3.officePath.text">Der Pfad zu
OpenOffice/LibreOffice (optional). Bitte geben Sie den richtigen Pfad an, falls
jodconverter die OpenOffice-/LibreOffice-Installation nicht automatisch
findet.</entry>
<entry key="install.wizard.params.step4.crypt">Krypto-Typ</entry>
<entry
key="install.wizard.params.step4.cryptClassName">Krypto-Klasse</entry>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
Thu Dec 1 04:09:12 2016
@@ -1616,25 +1616,6 @@
<entry key="install.wizard.welcome.panel"><![CDATA[
<ol>
<li><h4>
- <a
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Enabling
- Image Upload and import to whiteboard<a
-
href="#Enabling_Image_Upload_and_import_to_whiteboard"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>ImageMagick</strong> on the
server, you can
- get more information on <a
target="_blank"
- href="http://www.imagemagick.org";
rel="nofollow">http://www.imagemagick.org</a>
- regarding installation. The
instructions for installation can be
- found there <a target="_blank"
-
href="http://www.imagemagick.org/script/binary-releases.php";
-
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
- however on most linux systems you can
get it via your favorite
- package managers (apt-get it)
- </li>
- </ul>
- </li>
- <li><h4>
<a
id="Enabling_import_of_PDFs_into_whiteboard"></a>Enabling
import of PDFs into whiteboard<a
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1659,43 +1640,6 @@
version have a bug that does lead to
wrong object dimensions in the
Whiteboard
</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Enabling
- import of .doc, .docx, .ppt, .pptx, ... all
Office Documents into
- whitebaord<a
-
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li><strong>OpenOffice-Service</strong> started
and listening on
- port 8100, see <a target="_blank"
-
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
- for details</li>
- </ul>
- </li>
- <li><h4>
- <a
-
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Enabling
- Recording and import of .avi, .flv, .mov and
.mp4 into whiteboard<a
-
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
- class="section_anchor"></a>
- </h4>
- <ul>
- <li>Install <strong>FFMpeg</strong>. You should
get FFMPEG in an
- up to date copy! For Windows you can
download a Build for example
- from <a target="_blank"
href="http://ffmpeg.arrozcru.org/builds/";
-
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> Linux or OSx
- Users should be able to use one of the
various Installation
- Instructions on the Web. You need to
enable libmp3lame!
- </li>
- <li>Install <strong>SoX</strong> <a
- href="http://sox.sourceforge.net/";
target="_BLANK">http://sox.sourceforge.net/</a>.
- You should install SoX in a up to date
copy! SoX 12.xx will NOT
- work!
- </li>
</ul>
</li>
</ol>
@@ -1714,7 +1658,6 @@
target="_blank">Mailing lists</a></span>
<br />
<br />
-
<b> <span style="font-size: 1.2em">Commercial-Support:</span></b>
<br />
<br />
@@ -1769,9 +1712,9 @@
<entry key="install.wizard.params.step1.email">EMail</entry>
<entry key="install.wizard.params.step1.email.title">Enter a
EMail</entry>
<entry key="install.wizard.params.step1.tz">User Time Zone</entry>
- <entry
key="install.wizard.params.step1.groupdata">Organisation(Domains)</entry>
+ <entry
key="install.wizard.params.step1.groupdata">Group(Domains)</entry>
<entry key="install.wizard.params.step1.group">Name</entry>
- <entry key="install.wizard.params.step1.group.title">Enter a default
Organisation</entry>
+ <entry key="install.wizard.params.step1.group.title">Enter a default
Group</entry>
<entry
key="install.wizard.params.step2.configuration">Configuration</entry>
<entry key="install.wizard.params.step2.allowFrontendRegister">Allow
self-registering (allow_frontend_register)</entry>
@@ -1802,31 +1745,22 @@
<entry key="install.wizard.params.step3.swfZoom.text">DPI that swftools
will use for PDF to SWF conversion (default is 100)</entry>
<entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG
Quality</entry>
<entry key="install.wizard.params.step3.swfJpegQuality.title">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
- <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small),
- 100 is best (big). (default:85)</entry>
+ <entry key="install.wizard.params.step3.swfJpegQuality.text">Enter the
quality of embedded jpeg pictures to quality. 0 is worst (small), 100 is best
(big). (default:85)</entry>
<entry key="install.wizard.params.step3.swfPath">SWFTools Path</entry>
<entry key="install.wizard.params.step3.swfPath.title">Enter the path
to swftools for example C:/swftools (Windows) or leave blank if swftools is a
known to your system path</entry>
- <entry key="install.wizard.params.step3.swfPath.text">
- You can test if swftools is installed into system path by
- opening a shell or cmd-prompt and type pdf2swf If this shows
- a list of options leave this field blank otherwise you have to
- specify the path to pdf2swf on your system
- </entry>
+ <entry key="install.wizard.params.step3.swfPath.text">You can test if
swftools is installed into system path by opening a shell or cmd-prompt and
type pdf2swf If this shows a list of options leave this field blank otherwise
you have to specify the path to pdf2swf on your system</entry>
<entry key="install.wizard.params.step3.imageMagicPath">ImageMagick
Path</entry>
<entry key="install.wizard.params.step3.imageMagicPath.title">Enter the
path to ImageMagick, leave blank if ImageMagick is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+ <entry
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Install
ImageMagick on the server, you can get more information on
http://www.imagemagick.org regarding installation. The instructions for
installation can be found there
http://www.imagemagick.org/script/binary-releases.php, however on most linux
systems you can get it via your favorite package managers (apt-get
it)]]></entry>
<entry key="install.wizard.params.step3.ffmpegPath">FFMPEG Path</entry>
<entry key="install.wizard.params.step3.ffmpegPath.title">Enter the
path to FFMPEG, leave blank if FFMPEG is successfully installed to
system-path</entry>
- <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">SoX Path</entry>
<entry key="install.wizard.params.step3.soxPath.title">Enter the path
to SoX, leave blank if SoX is successfully installed to system-path</entry>
- <entry key="install.wizard.params.step3.soxPath.text"></entry>
+ <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Install
SoX http://sox.sourceforge.net/ You should install SoX in a up to date copy!
SoX 12.xx will NOT work!]]></entry>
<entry
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for
jodconverter</entry>
<entry key="install.wizard.params.step3.officePath.title">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation
automatically</entry>
- <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this
- to the real path in case jodconverter is unable to find
- OpenOffice/LibreOffice installation
- </entry>
+ <entry key="install.wizard.params.step3.officePath.text">The path to
OpenOffice/LibreOffice (optional) please set this to the real path in case
jodconverter is unable to find OpenOffice/LibreOffice installation</entry>
<entry key="install.wizard.params.step4.crypt">Crypt Type</entry>
<entry key="install.wizard.params.step4.cryptClassName">Crypt
Class</entry>
@@ -1865,15 +1799,15 @@
<entry key="appointment.reminder.none">do not send notification</entry>
<entry key="appointment.reminder.email">simple email</entry>
<entry key="appointment.reminder.ical">iCal email</entry>
- <entry key="user.salutation.mr">ÎοÏ</entry>
- <entry key="user.salutation.ms">Îα</entry>
- <entry key="user.salutation.mrs">ÎιÏ.</entry>
- <entry key="user.salutation.dr">ÎÏ.</entry>
+ <entry key="user.salutation.mr">Mr</entry>
+ <entry key="user.salutation.ms">Ms</entry>
+ <entry key="user.salutation.mrs">Mrs</entry>
+ <entry key="user.salutation.dr">Dr</entry>
<entry key="user.salutation.prof">Prof</entry>
- <entry key="error.type.error">ÎήνÏ
μα</entry>
- <entry key="error.type.info">ÎήνÏ
μα</entry>
- <entry key="poll.type.yesNo">Îαι/ÎÏι</entry>
- <entry key="poll.type.numeric">ÎÏιθμÏÏ 1-10</entry>
+ <entry key="error.type.error">Error</entry>
+ <entry key="error.type.info">Message</entry>
+ <entry key="poll.type.yesNo">Yes/No</entry>
+ <entry key="poll.type.numeric">Numeric 1-10</entry>
<entry key="wizard.button.finish">Finish</entry>
<entry key="main.menu.admin.email">Email management</entry>
<entry key="main.menu.admin.email.desc">Check e-mails processing by the
system</entry>
