Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.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_es.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_es.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 Thu Dec  1 04:09:12 2016
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -1616,22 +1616,6 @@
        <entry key="install.wizard.welcome.panel"><![CDATA[
        <ol>
                <li><h4>
-                               <a 
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Activar Subir Imagen e 
Importar a la pizarra
-                               <a 
href="#Enabling_Image_Upload_and_import_to_whiteboard"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Instalar <strong>ImageMagick</strong> en el 
servidor, puede obtener más información en
-                               <a target="_blank" 
href="http://www.imagemagick.org"; rel="nofollow">http://www.imagemagick.org</a>
-                                       observando instalación. Las 
instrucciones para la misma puede encontrarlas aquí
-                                       <a target="_blank" 
href="http://www.imagemagick.org/script/binary-releases.php";
-                                       
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
-                                       de todos modos en la mayoría de los 
sistemas linux puede conseguirlo via su paquete favorito
-                                       de administración (apt-get it).
-                               </li>
-                       </ul>
-               </li>
-               <li><h4>
                                <a 
id="Enabling_import_of_PDFs_into_whiteboard"></a>Activando
                                importar PDFs a la pizarra<a
                                        
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1653,39 +1637,7 @@
                                        
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
                                        la versión recomendada de 
<strong>SWFTools</strong> es 0.9 porque las
                                        anteriores tienen un bug que hace 
llevar unas dimensiones erróneas al objeto
-                     en la Pizarra.
-                               </li>
-               </ul>
-               </li>
-               <li><h4>
-                               <a 
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Activando
-                               importar .doc, .docx, .ppt, .pptx, ... todos 
los Documentos de Oficina a la Pizarra
-                               <a 
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu" 
class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li><strong>OpenOffice-Service</strong> lanzado 
escucha en el
-                                       puerto 8100, vea <a target="_blank"
-                                       
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
-                                       para más detalles.</li>
-                       </ul>
-               </li>
-               <li><h4>
-                               <a 
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Activando
-                               Grabación e importación de .avi, .flv, .mov 
and .mp4 a la pizarra<a
-                                       
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Instalar <strong>FFMpeg</strong>. Puede 
conseguir FFMPEG de una copia actualizada! 
-                                   Para Windows puede descargar una Build, por 
ejemplo desde
-                                       <a target="_blank" 
href="http://ffmpeg.arrozcru.org/builds/";
-                                       
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> 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!
-                               </li>
-                               <li>Instalar <strong>SoX</strong> <a
-                                       href="http://sox.sourceforge.net/"; 
target="_blank">http://sox.sourceforge.net/</a>.
-                                       Instalar una copia de SOX actualizada! 
SOX 12.xx no funcionará!
+                                       en la Pizarra.
                                </li>
                        </ul>
                </li>
@@ -1790,37 +1742,25 @@
        <entry 
key="install.wizard.params.step3.installation">Instalación</entry>
        <entry key="install.wizard.params.step3.swfZoom">Zoom SWFTools</entry>
        <entry key="install.wizard.params.step3.swfZoom.title">Introduzca el 
dpi que swftools empleará para convertir PDF a SWF</entry>
-       <entry key="install.wizard.params.step3.swfZoom.text">Puede comprobar 
si la ruta a la instalación de swftools es la correcta
-               abriendo una shell o cmd-prompt y escribir pdf2swf  Introduzca 
la dpi
-               que swftools empleará para convertir PDF a SWF. Preconfigurada 
es
-               100 dpi</entry>
+       <entry key="install.wizard.params.step3.swfZoom.text">Puede comprobar 
si la ruta a la instalación de swftools es la correcta abriendo una shell o 
cmd-prompt y escribir pdf2swf  Introduzca la dpi que swftools empleará para 
convertir PDF a SWF. Preconfigurada es 100 dpi</entry>
        <entry key="install.wizard.params.step3.swfJpegQuality">Calidad de JPEG 
en SWFTools</entry>
        <entry 
key="install.wizard.params.step3.swfJpegQuality.title">Introduzca la calidad 
embebida de las imágenes jpeg. 0 es la menor (pesa menos), 100 es la mejor 
(pesa más). (por omisión:85)</entry>
-       <entry key="install.wizard.params.step3.swfJpegQuality.text">Puede 
comprobar si la ruta a la instalación de swftools es la correcta
-               abriendo una shell o cmd-prompt y escribir pdf2swf  Introduzca 
la calidad
-               de las imagenes jpeg embebidas. 0 es la menor (pequeña),
-               100 es la mejor (grande). (preconfigurada:85)</entry>
+       <entry key="install.wizard.params.step3.swfJpegQuality.text">Puede 
comprobar si la ruta a la instalación de swftools es la correcta abriendo una 
shell o cmd-prompt y escribir pdf2swf  Introduzca la calidad de las imagenes 
jpeg embebidas. 0 es la menor (pequeña), 100 es la mejor (grande). 
(preconfigurada:85)</entry>
        <entry key="install.wizard.params.step3.swfPath">SWFTools Path 
(Ruta)</entry>
        <entry key="install.wizard.params.step3.swfPath.title">Introduzca la 
ruta a swftools, por ejemplo C:/swftools (Windows) o déjelo en blanco si 
swftools está registrado en el path del sistema</entry>
-       <entry key="install.wizard.params.step3.swfPath.text">
-               Puede comprobar si la ruta a la instalación de swftools es la 
correcta
-               abriendo una shell o cmd-prompt y escribir pdf2swf  Si muestra
-               una lista de opciones, deje este campo en blanco, si no debe 
especificar
-               la ruta a pdf2swf en su sistema
-       </entry>
+       <entry key="install.wizard.params.step3.swfPath.text">Puede comprobar 
si la ruta a la instalación de swftools es la correcta abriendo una shell o 
cmd-prompt y escribir pdf2swf  Si muestra una lista de opciones, deje este 
campo en blanco, si no debe especificar la ruta a pdf2swf en su sistema</entry>
        <entry key="install.wizard.params.step3.imageMagicPath">ImageMagick 
Path (Ruta)</entry>
        <entry 
key="install.wizard.params.step3.imageMagicPath.title">Introduzca la ruta a 
ImageMagick, o déjelo en blanco si ImageMagick está registrado en el path del 
sistema</entry>
-       <entry key="install.wizard.params.step3.imageMagicPath.text"/>
+       <entry 
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Instalar 
ImageMagick en el servidor, puede obtener más información en 
http://www.imagemagick.org observando instalación. Las instrucciones para la 
misma puede encontrarlas aquí 
http://www.imagemagick.org/script/binary-releases.php, de todos modos en la 
mayoría de los sistemas linux puede conseguirlo via su paquete favorito de 
administración (apt-get it).]]></entry>
        <entry key="install.wizard.params.step3.ffmpegPath">FFMPEG Path 
(Ruta)</entry>
        <entry key="install.wizard.params.step3.ffmpegPath.title">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.ffmpegPath.text"/>
+       <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.soxPath">SoX Path (Ruta)</entry>
        <entry key="install.wizard.params.step3.soxPath.title">Introduzca la 
ruta a SOX, o déjelo en blanco si SOX está registrado en el path del 
sistema</entry>
-       <entry key="install.wizard.params.step3.soxPath.text"/>
+       <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Instalar 
SoX http://sox.sourceforge.net/. Instalar una copia de SOX actualizada! SOX 
12.xx no funcionará!]]></entry>
        <entry 
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path (Ruta) 
para jodconverter</entry>
        <entry key="install.wizard.params.step3.officePath.title">Ruta a 
OpenOffice/LibreOffice (opcional), por favor introdúzcala en el caso que 
jodconverter no encuentre a OpenOffice/LibreOffice automáticamente</entry>
-       <entry key="install.wizard.params.step3.officePath.text">El path (ruta) 
a OpenOffice/LibreOffice (opcional) por favor configúrelo correctamente en 
caso de que jodconverter no pueda encontrar la instalación de 
OpenOffice/LibreOffice
-       </entry>
+       <entry key="install.wizard.params.step3.officePath.text">El path (ruta) 
a OpenOffice/LibreOffice (opcional) por favor configúrelo correctamente en 
caso de que jodconverter no pueda encontrar la instalación de 
OpenOffice/LibreOffice</entry>
 
        <entry key="install.wizard.params.step4.crypt">Tipo de 
Encriptación</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_fa.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_fa.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_fa.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.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_fi.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_fi.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_fi.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.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_fr.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_fr.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_fr.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
 Thu Dec  1 04:09:12 2016
@@ -1616,20 +1616,6 @@
        <entry key="install.wizard.welcome.panel"><![CDATA[
        <ol>
                <li><h4>
-                               <a 
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Activer le dépot sur 
le serveur et l'import d'images vers le tableau blanc<a
-                                       
href="#Enabling_Image_Upload_and_import_to_whiteboard"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Installez <strong>ImageMagick</strong> sur 
le serveur. Vous trouverez plus d'informations à l'adresse <a target="_blank"
-                                       href="http://www.imagemagick.org"; 
rel="nofollow">http://www.imagemagick.org</a>.
-                                       Les instructions d'installation peuvent 
être trouvées ici <a target="_blank"
-                                       
href="http://www.imagemagick.org/script/binary-releases.php";
-                                       
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>. Sur 
la majorité des systèmes linux vous pouvez le trouver via votre gestionnaire 
de paquets (apt-get).
-                               </li>
-                       </ul>
-               </li>
-               <li><h4>
                                <a 
id="Enabling_import_of_PDFs_into_whiteboard"></a>Activer l'import de fichiers 
PDF sur le tableau blanc<a
                                        
href="#Enabling_import_of_PDFs_into_whiteboard"
                                        class="section_anchor"></a>
@@ -1647,32 +1633,6 @@
                                        
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>).
                                        La version recommandée de 
<strong>SWFTools</strong> est 0.9 - les versions précédentes ont un bug qui 
modifie les dimensions des objets sur le tableau blanc.
                                </li>
-               </ul>
-               </li>
-               <li><h4>
-                               <a
-                                       
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Activer
 l'import de documents Office (.doc, .docx, .ppt, .pptx, etc.) sur le tableau 
blanc<a  
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li><strong>Le service OpenOffice</strong> doit 
être démarré et en écoute sur le port 8100.  Voir <a target="_blank"
-                                       
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
 pour plus de détails.</li>
-                       </ul>
-               </li>
-               <li><h4>
-                               <a
-                                       
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Activer
 l'enregistrement et l'import de fichiers vidéo (.avi, .flv, .mov und .mp4) 
sur le tableau blanc<a
-                                       
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Installez <strong>FFmpeg</strong>. Vous 
devez obtenir la dernière version de FFMPEG ! Pour Windows vous pouvez la 
télécharger par exemple de <a target="_blank" 
href="http://ffmpeg.arrozcru.org/builds/";
-                                       
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a>. Pour Linux ou OSx vous 
devriez utiliser l'une des nombreuses instructions d'installation sur le web.  
Vous devez activer libmp3lame !
-                               </li>
-                               <li>Installez <strong>SoX</strong> <a
-                                       href="http://sox.sourceforge.net/"; 
target="_BLANK">http://sox.sourceforge.net/</a>.
-                                       Vous devez installer la dernière 
version ! SoX 12.xx ne fonctionnera PAS !
-                               </li>
                        </ul>
                </li>
        </ol>
@@ -1776,22 +1736,19 @@
        <entry key="install.wizard.params.step3.swfZoom.text">Vous pouvez 
vérifier que swftools se trouve dans votre chemin système en tapant pdf2swf 
dans une ligne de commande. Indiquez combien de dpi swtools devra utiliser pour 
les conversions PDF vers SWF. (Par défaut : 100 dpi).</entry>
        <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools 
Qualité JPEG</entry>
        <entry key="install.wizard.params.step3.swfJpegQuality.title">Entrez la 
qualité des images jpec incorporées. 0 étant la moins bonne et 100 la 
meilleure (par défaut : 85).</entry>
-       <entry key="install.wizard.params.step3.swfJpegQuality.text">Vous 
pouvez vérifier que swftools se trouve dans votre chemin système en tapant 
pdf2swf dans une ligne de commande. 
-                                               Indiquez la qualité pour les 
images jpeg. 0 est la moins bonne (taille plus petite), 100 est la meilleure 
(taille plus grande) (par défaut : 85).</entry>
+       <entry key="install.wizard.params.step3.swfJpegQuality.text">Vous 
pouvez vérifier que swftools se trouve dans votre chemin système en tapant 
pdf2swf dans une ligne de commande. Indiquez la qualité pour les images jpeg. 
0 est la moins bonne (taille plus petite), 100 est la meilleure (taille plus 
grande) (par défaut : 85).</entry>
        <entry key="install.wizard.params.step3.swfPath">Chemin vers 
SWFTools</entry>
        <entry key="install.wizard.params.step3.swfPath.title">Indiquez le 
chemin vers swftools,  par ex. C:/swftools (Windows), ou laissez vide si 
swftools se trouve déjà dans le chemin système.</entry>
-       <entry key="install.wizard.params.step3.swfPath.text">
-               Vous pouvez vérifier que swftools se trouve dans votre chemin 
système en tapant pdf2swf dans une ligne de commande. Si le résultat de cette 
commande vous montre une liste d'options, laissez ce champ vide, dans le cas 
contraire veuillez indiquer le chemin vers swftools.
-       </entry>
+       <entry key="install.wizard.params.step3.swfPath.text">Vous pouvez 
vérifier que swftools se trouve dans votre chemin système en tapant pdf2swf 
dans une ligne de commande. Si le résultat de cette commande vous montre une 
liste d'options, laissez ce champ vide, dans le cas contraire veuillez indiquer 
le chemin vers swftools.</entry>
        <entry key="install.wizard.params.step3.imageMagicPath">Chemin vers 
ImageMagick</entry>
        <entry key="install.wizard.params.step3.imageMagicPath.title">Indiquez 
le chemin vers ImageMagick dans le cas où ImageMagick ne se trouve pas dans le 
chemin système.</entry>
-       <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+       <entry 
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installez 
ImageMagick sur le serveur. Vous trouverez plus d'informations à l'adresse 
http://www.imagemagick.org. Les instructions d'installation peuvent être 
trouvées ici http://www.imagemagick.org/script/binary-releases.php. Sur la 
majorité des systèmes linux vous pouvez le trouver via votre gestionnaire de 
paquets (apt-get).]]></entry>
        <entry key="install.wizard.params.step3.ffmpegPath">Chemin vers 
FFMPEG</entry>
        <entry key="install.wizard.params.step3.ffmpegPath.title">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.ffmpegPath.text"></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.soxPath">Chemin vers SoX</entry>
        <entry key="install.wizard.params.step3.soxPath.title">Indiquez le 
chemin vers SoX dans le cas où SoX ne se trouve pas dans le chemin 
système.</entry>
-       <entry key="install.wizard.params.step3.soxPath.text"></entry>
+       <entry 
key="install.wizard.params.step3.soxPath.text"><![CDATA[Installez SoX 
http://sox.sourceforge.net/. Vous devez installer la dernière version ! SoX 
12.xx ne fonctionnera PAS !]]></entry>
        <entry key="install.wizard.params.step3.officePath">Chemin vers 
OpenOffice-/LibreOffice pour jodconverter</entry>
        <entry key="install.wizard.params.step3.officePath.title">Chemin vers 
OpenOffice/LibreOffice (optionnel). Indiquez le chemin réel dans le cas où 
jodconverter ne pourrait pas trouver l'installation de OpenOffice-/LibreOffice 
automatiquement.</entry>
        <entry key="install.wizard.params.step3.officePath.text">Chemin vers 
OpenOffice/LibreOffice (optionnel). Indiquez le chemin réel dans le cas où 
jodconverter ne pourrait pas trouver l'installation de OpenOffice-/LibreOffice 
automatiquement.</entry>

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.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_gl.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_gl.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.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_hu.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_hu.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_hu.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
 Thu Dec  1 04:09:12 2016
@@ -1616,21 +1616,6 @@
        <entry key="install.wizard.welcome.panel"><![CDATA[
        <ol>
                <li><h4>
-                               <a 
id="Enabling_Image_Upload_and_import_to_whiteboard"></a>Képek 
feltöltése/importálása a prezentációs területbe<a
-                                       
href="#Enabling_Image_Upload_and_import_to_whiteboard"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Telepítse a <strong>ImageMagick</strong> 
program csomagot a szerverre. Telepítési útmutató és további 
információk itt 
-                               <a target="_blank" 
href="http://www.imagemagick.org"; rel="nofollow">http://www.imagemagick.org</a>
-                               <a target="_blank"
-                                       
href="http://www.imagemagick.org/script/binary-releases.php";
-                                       
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
-                                       Linux operációs rendszerben 
használja a beépített csomagkezelőt (apt-get it).
-                               </li>
-                       </ul>
-               </li>
-               <li><h4>
                                <a 
id="Enabling_import_of_PDFs_into_whiteboard"></a>PDF fileok feltöltése a 
prezentációs területbe<a
                                        
href="#Enabling_import_of_PDFs_into_whiteboard"
                                        class="section_anchor"></a>
@@ -1647,47 +1632,6 @@
                                        
rel="nofollow">http://packages.debian.org/unstable/utils/swftools</a>),
                                        ajánlott verzió a 
<strong>SWFTools</strong> 0.9 egyéb verzió bugja miatt hibát okozhat a 
prezentációkban. 
                                </li>
-               </ul>
-               </li>
-               <li><h4>
-                               <a
-                                       
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Dokumentumok
 importálása a prezentációs területrbe
-                               .doc, .docx, .ppt, .pptx, ... stb (OpenOfice 
kompatibilis).<a
-                                       
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Telepítse az <strong>OpenOffice / 
LibreOffice</strong> program csomagot a szerverre. Telepítési útmutató és 
további információk itt  <a target="_blank"
-                                       href="http://www.openoffice.org/"; 
rel="nofollow">http://www.openoffice.org/</a>
-                                       <a target="_blank"
-                                       href="http://www.libreoffice.org/"; 
rel="nofollow">http://www.libreffice.org/</a>
-                                       LibreOffice program csomag használata 
esetén rendelje hozzá szimbólikus linkként az OpenOffice könyvtárat.
-                                       <br />
-                                       ln -s /opt/libreoffice /opt/openoffice 
-                               </li>
-                               <li><strong>OpenOffice-Service</strong> 
automatikusan indul és elérhető a
-                                       8100 porton. Bővebb információ itt 
<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>Videó 
felvétele és importálása .avi, .flv, .mov and .mp4 formátumokban a 
prezentációs területbe<a
-                                       
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Telepítse az <strong>FFMpeg</strong> 
programcsomagot. Használja az FFMPEG aktuális, friss verzióját.
-                                       Windows rendszerekhez kiadások itt <a 
target="_blank" href="http://ffmpeg.arrozcru.org/builds/";
-                                       
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> 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!
-                               </li>
-                               <li>Telepítse a <strong>SoX</strong> programot 
innen: <a
-                                       href="http://sox.sourceforge.net/"; 
target="_BLANK">http://sox.sourceforge.net/</a>.
-                                       A SoX friss verzióit használja! SoX 
12.xx nem/hibásan működik!
-                               </li>
                        </ul>
                </li>
        </ol>
@@ -1783,39 +1727,25 @@
        <entry 
key="install.wizard.params.step3.installation">Telepítés</entry>
        <entry key="install.wizard.params.step3.swfZoom">SWFTools Zoom</entry>
        <entry key="install.wizard.params.step3.swfZoom.title">Adja meg az 
SWFTools felbontását (dpi) amit a PDF2SWF konverziónál használ</entry>
-       <entry key="install.wizard.params.step3.swfZoom.text">
-               Ellenőrizze az swftools telepítését és elérését a 
rendszerútvonalon.
-               Nyisson egy parancssort és futtassa: pdf2swf. Paraméterként 
megadhatja a felbontást.
-               Alapértelmezett felbontás 100 dpi.
-       </entry>
+       <entry key="install.wizard.params.step3.swfZoom.text">Ellenőrizze az 
swftools telepítését és elérését a rendszerútvonalon. Nyisson egy 
parancssort és futtassa: pdf2swf. Paraméterként megadhatja a felbontást. 
Alapértelmezett felbontás 100 dpi.</entry>
        <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG 
Minőség</entry>
        <entry key="install.wizard.params.step3.swfJpegQuality.title">Adja meg 
a jpeg képek minőségi rátáját. 0 a gyengébb (kicsi), 100 a legjobb 
(nagy). (alapértelmezett:85)</entry>
-       <entry key="install.wizard.params.step3.swfJpegQuality.text">
-               Ellenőrizze az swftools telepítését és elérését a 
rendszerútvonalon.
-               Nyisson egy parancssort és futtassa: pdf2swf. Paraméterként 
megadhatja a 
-               a jpeg képek minőségét. 0 a gyengébb (kicsi),
-               100 a legjobb (nagy). (alapértelmezett:85).
-       </entry>
+       <entry 
key="install.wizard.params.step3.swfJpegQuality.text">Ellenőrizze az swftools 
telepítését és elérését a rendszerútvonalon. Nyisson egy parancssort 
és futtassa: pdf2swf. Paraméterként megadhatja a jpeg képek minőségét. 0 
a gyengébb (kicsi), 100 a legjobb (nagy). (alapértelmezett:85).</entry>
        <entry key="install.wizard.params.step3.swfPath">SWFTools 
útvonala</entry>
        <entry key="install.wizard.params.step3.swfPath.title">Adja meg az 
SWFTools elérési útvonalát C:/swftools (Windows) /usr/local/swftools 
(Linux) vagy hagyja üresen, ha elérhető a rendszerútvonalak közt</entry>
-       <entry key="install.wizard.params.step3.swfPath.text">
-               Ellenőrizze az swftools telepítését és elérését a 
rendszerútvonalon.
-               Nyisson egy parancssort és futtassa: pdf2swf. Hagyja üresen, 
ha nem ismeri, vagy ha elérhető a rendszerútvonalon. 
-       </entry>
+       <entry key="install.wizard.params.step3.swfPath.text">Ellenőrizze az 
swftools telepítését és elérését a rendszerútvonalon. Nyisson egy 
parancssort és futtassa: pdf2swf. Hagyja üresen, ha nem ismeri, vagy ha 
elérhető a rendszerútvonalon.</entry>
        <entry key="install.wizard.params.step3.imageMagicPath">ImageMagick 
útvonala</entry>
        <entry key="install.wizard.params.step3.imageMagicPath.title">Adja meg 
a ImageMagick elérési útvonalát, hagyja üresen, ha az ImageMagick 
elérhető a rendszer útvonalak közt</entry>
-       <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+       <entry 
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Telepítse a 
ImageMagick program csomagot a szerverre. Telepítési útmutató és további 
információk itt http://www.imagemagick.org 
http://www.imagemagick.org/script/binary-releases.php, Linux operációs 
rendszerben használja a beépített csomagkezelőt (apt-get it).]]></entry>
        <entry key="install.wizard.params.step3.ffmpegPath">FFMPEG 
útvonala</entry>
        <entry key="install.wizard.params.step3.ffmpegPath.title">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.ffmpegPath.text"></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.soxPath">SoX útvonala</entry>
        <entry key="install.wizard.params.step3.soxPath.title">Adja meg a SoX 
elérési útvonalát, hagyja üresen, ha a SoX elérhető a rendszer 
útvonalak közt</entry>
-       <entry key="install.wizard.params.step3.soxPath.text"></entry>
+       <entry 
key="install.wizard.params.step3.soxPath.text"><![CDATA[Telepítse a SoX 
programot innen: http://sox.sourceforge.net/. A SoX friss verzióit használja! 
SoX 12.xx nem/hibásan működik!]]></entry>
        <entry 
key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice útvonala a 
jodconverterhez</entry>
        <entry key="install.wizard.params.step3.officePath.title">Adja meg az 
OpenOffice/LibreOffice (optional) valós útvonalát, a OpenOffice/LibreOffice 
nem keresi automatikusan a jodconverter</entry>
-       <entry key="install.wizard.params.step3.officePath.text">
-               Az OpenOffice/LibreOffice (optional) útvonalát a jodconverter 
nem találja autómatikusan, az abszolút elérési útvonal szükséges
-       </entry>
+       <entry key="install.wizard.params.step3.officePath.text">Az 
OpenOffice/LibreOffice (optional) útvonalát a jodconverter nem találja 
autómatikusan, az abszolút elérési útvonal szükséges</entry>
 
        <entry key="install.wizard.params.step4.crypt">Titkosítás 
típusa</entry>
        <entry key="install.wizard.params.step4.cryptClassName">Titkosító 
osztály</entry>

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.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_id.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_id.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.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_it.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_it.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_it.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.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>Abilita
-                               caricamento immagini e importazione sulla 
lavagna<a
-                                       
href="#Enabling_Image_Upload_and_import_to_whiteboard"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Installa <strong>ImageMagick</strong> sul 
server, puoi
-                                       trovare informazioni su <a 
target="_blank"
-                                       href="http://www.imagemagick.org"; 
rel="nofollow">http://www.imagemagick.org</a>
-                                       per l'installazione. Le istruzioni per 
l'installazione possono essere
-                                       recuperate qui <a target="_blank"
-                                       
href="http://www.imagemagick.org/script/binary-releases.php";
-                                       
rel="nofollow">http://www.imagemagick.org/script/binary-releases.php</a>,
-                                       comunque nella maggior parte dei 
sistemi linux potrai recuperarlo dal vostro
-                                       gestore dei pacchetti (apt-get, yum, 
etc)
-                               </li>
-                       </ul>
-               </li>
-               <li><h4>
                                <a 
id="Enabling_import_of_PDFs_into_whiteboard"></a>Abilita
                                importazione dei PDF sulla lavagna<a
                                        
href="#Enabling_import_of_PDFs_into_whiteboard"
@@ -1659,44 +1640,6 @@
                                        le versioni precedenti hanno un bug che 
portano ad oggetti dalla dimensione errata sulla
                                        scrivania
                                </li>
-               </ul>
-               </li>
-               <li><h4>
-                               <a
-                                       
id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>Abilita
-                               importazione di .doc, .docx, .ppt, .pptx, ... 
tutti i documenti Office sulla
-                               lavagna<a
-                                       
href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li><strong>Servizio OpenOffice</strong> 
avviato e in ascolto sulla
-                                       porta 8100, vedi <a target="_blank"
-                                       
href="http://openmeetings.apache.org/OpenOfficeConverter.html";>OpenOfficeConverter</a>
-                                       per dettagli</li>
-                       </ul>
-               </li>
-               <li><h4>
-                               <a
-                                       
id="Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"></a>Abilita
-                               registrazione e importazione di .avi, .flv, 
.mov and .mp4 sulla lavagna<a
-                                       
href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into"
-                                       class="section_anchor"></a>
-                       </h4>
-                       <ul>
-                               <li>Installa <strong>FFMpeg</strong>. Dovresti 
recuperare FFMPEG nella
-                                       copia più aggiornata! Per Windows puoi 
scaricare una Build per esempio
-                                       da <a target="_blank" 
href="http://ffmpeg.arrozcru.org/builds/";
-                                       
rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> 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.
-                               </li>
-                               <li>Installa <strong>SoX</strong> <a
-                                       href="http://sox.sourceforge.net/"; 
target="_BLANK">http://sox.sourceforge.net/</a>.
-                                       Devi installare SoX da una copia 
aggiornata! SoX 12.xx NON
-                                       funziona!
-                               </li>
                        </ul>
                </li>
        </ol>
@@ -1794,6 +1737,7 @@
                                        come ReplyTo negli inviti email 
(inviter.email.as.replyto)</entry>
        <entry key="install.wizard.params.step2.defaultLangId">Lingua 
predefinita</entry>
        <entry key="install.wizard.params.step2.defaultExportFont">Font 
predefinito per le ssportazione [default_export_font]</entry>
+
        <entry key="install.wizard.params.step3.converters">Convertitore</entry>
        <entry key="install.wizard.params.step3.seeAlso"> vedi anche</entry>
        <entry 
key="install.wizard.params.step3.installation">Installazione</entry>
@@ -1802,31 +1746,22 @@
        <entry key="install.wizard.params.step3.swfZoom.text">DPI che swftools 
useranno per la conversione da PDF a SWF (predefinito è 100)</entry>
        <entry key="install.wizard.params.step3.swfJpegQuality">Qualità JPEG 
SWFTools</entry>
        <entry key="install.wizard.params.step3.swfJpegQuality.title">Specifica 
la qualità delle immagini jpeg inserite. 0 è peggiore (piccola), 100 è 
migliore (grande). (predefinito:85)</entry>
-       <entry key="install.wizard.params.step3.swfJpegQuality.text">Specifica 
la qualità delle immagini jpeg inserite. 0 è peggiore (piccola),
-                               100 è migliore (grande). 
(predefinito:85)</entry>
+       <entry key="install.wizard.params.step3.swfJpegQuality.text">Specifica 
la qualità delle immagini jpeg inserite. 0 è peggiore (piccola), 100 è 
migliore (grande). (predefinito:85)</entry>
        <entry key="install.wizard.params.step3.swfPath">Percorso 
SWFTools</entry>
        <entry key="install.wizard.params.step3.swfPath.title">Specifica il 
percorso di swftools per esempio C:/swftools (Windows) o lascia vuoto se 
swftools è già compreso nel tuo percorso di sistema</entry>
-       <entry key="install.wizard.params.step3.swfPath.text">
-               Puoi verificare se swftools è presente nel percorso di sistema
-               aprendo una shell o cmd-prompt e digita pdf2swf. Se viene 
visualizzata
-               una lista di opzioni lascia questo campo vuoto altrimenti devi
-               specificare il percorso di pdf2swf sul tuo sistema
-       </entry>
+       <entry key="install.wizard.params.step3.swfPath.text">Puoi verificare 
se swftools è presente nel percorso di sistema aprendo una shell o cmd-prompt 
e digita pdf2swf. Se viene visualizzata una lista di opzioni lascia questo 
campo vuoto altrimenti devi specificare il percorso di pdf2swf sul tuo 
sistema</entry>
        <entry key="install.wizard.params.step3.imageMagicPath">Percorso 
ImageMagick</entry>
        <entry key="install.wizard.params.step3.imageMagicPath.title">Specifica 
il percorso di ImageMagick, lascia vuoto se ImageMagick è già presente nel 
percorso di sistema</entry>
-       <entry key="install.wizard.params.step3.imageMagicPath.text"></entry>
+       <entry 
key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[Installa 
ImageMagick sul server, puoi trovare informazioni su http://www.imagemagick.org 
per l'installazione. Le istruzioni per l'installazione possono essere 
recuperate qui http://www.imagemagick.org/script/binary-releases.php, comunque 
nella maggior parte dei sistemi linux potrai recuperarlo dal vostro gestore dei 
pacchetti (apt-get, yum, etc)]]></entry>
        <entry key="install.wizard.params.step3.ffmpegPath">Percorso 
FFMPEG</entry>
        <entry key="install.wizard.params.step3.ffmpegPath.title">Specifica il 
percorso di  FFMPEG, lascia vuoto se FFMPEG è già presente nel percorso di 
sistema</entry>
-       <entry key="install.wizard.params.step3.ffmpegPath.text"></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.soxPath">Percorso SoX</entry>
        <entry key="install.wizard.params.step3.soxPath.title">Specifica il 
percorso di SoX, lascia vuoto se SoX è già presente nel percorso di 
sistema</entry>
-       <entry key="install.wizard.params.step3.soxPath.text"></entry>
+       <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[Installa 
SoX http://sox.sourceforge.net/. Devi installare SoX da una copia aggiornata! 
SoX 12.xx NON funziona!]]></entry>
        <entry key="install.wizard.params.step3.officePath">Percorso 
OpenOffice/LibreOffice per jodconverter</entry>
        <entry key="install.wizard.params.step3.officePath.title">Percorsoath 
di OpenOffice/LibreOffice (opzionale) impostalo al percorso reale nel caso 
jodconverter non riesca a trovare automaticamente l'installazione  di 
OpenOffice/LibreOffice</entry>
-       <entry key="install.wizard.params.step3.officePath.text">Percorso di 
OpenOffice/LibreOffice (opzionale) impostalo 
-                       al percorso reale nel caso jodconverter non riesca a 
trovare
-                       l'installazione di OpenOffice/LibreOffice
-       </entry>
+       <entry key="install.wizard.params.step3.officePath.text">Percorso di 
OpenOffice/LibreOffice (opzionale) impostalo al percorso reale nel caso 
jodconverter non riesca a trovare l'installazione di 
OpenOffice/LibreOffice</entry>
 
        <entry key="install.wizard.params.step4.crypt">Tipo di Crypt</entry>
        <entry key="install.wizard.params.step4.cryptClassName">Classe 
Crypt</entry>

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.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_ja.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_ja.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.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>


Reply via email to