Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.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.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.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.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.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>ÐÐ»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑи - загÑÑзки и импоÑÑа изобÑажений на доÑкÑ<a - href="#Enabling_Image_Upload_and_import_to_whiteboard" - class="section_anchor"></a> - </h4> - <ul> - <li>УÑÑановиÑе <strong>ImageMagick</strong> на ÐÐ°Ñ ÑеÑвеÑ, более - подÑобнÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ ÐºÐ°ÑаÑÑÑÑÑÑ ÑÑÑановки можно поÑмоÑÑеÑÑ ÑÑÑ <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>, - однако в болÑÑинÑÑве ÑиÑÑем ÐинÑÐºÑ ÐÑ Ð¼Ð¾Ð¶ÐµÑе ÑÑÑановиÑÑ ÐµÐ³Ð¾ ÑеÑез ÐÐ°Ñ - Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿Ð°ÐºÐµÑов (apt-get it) - </li> - </ul> - </li> - <li><h4> <a id="Enabling_import_of_PDFs_into_whiteboard"></a>ÐÐ»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑи импоÑÑа PDF Ñайлов на доÑкÑ<a href="#Enabling_import_of_PDFs_into_whiteboard" @@ -1659,46 +1640,8 @@ пÑедÑдÑÑÐ°Ñ Ð²ÐµÑÑÐ¸Ñ ÑодеÑÐ¶Ð¸Ñ Ð±Ð°Ð³ коÑоÑÑй пÑиводил к оÑибке оÑобÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑазмеÑов обÑекÑа на доÑке </li> - </ul> - </li> - <li><h4> - <a - id="Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu"></a>ÐÐ»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑи - импоÑÑа Ñайлов .doc, .docx, .ppt, .pptx, ... и пÑоÑÐ¸Ñ Ð´Ð¾ÐºÑменÑов на - доÑкÑ<a - href="#Enabling_import_of_.doc,_.docx,_.ppt,_.pptx,_..._all_Office_Docu" - class="section_anchor"></a> - </h4> - <ul> - <li><strong>OpenOffice-Service</strong> запÑÑкаеÑÑÑ Ð¸ пÑоÑлÑÑÐ¸Ð²Ð°ÐµÑ - поÑÑ 8100, подÑобноÑÑи можно поÑмоÑÑеÑÑ Ð·Ð´ÐµÑÑ <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>ÐÐ»Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑи - запиÑи и импоÑÑа Ñайлов .avi, .flv, .mov и .mp4 на доÑкÑ<a - href="#Enabling_Recording_and_import_of_.avi,_.flv,_.mov_and_.mp4_into" - class="section_anchor"></a> - </h4> - <ul> - <li>УÑÑановиÑе <strong>FFMpeg</strong>. ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿Ð¾Ð»ÑÑиÑÑ Ð¿Ð¾ÑледнÑÑ Ð²ÐµÑÑÐ¸Ñ - FFMPEG! ÐÐ»Ñ Windows ÐÑ Ð¼Ð¾Ð¶ÐµÑе ÑкаÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ñ ÑÑого - ÑайÑа <a target="_blank" href="http://ffmpeg.arrozcru.org/builds/"; - rel="nofollow">http://ffmpeg.arrozcru.org/builds/</a> ÐолÑзоваÑели Linux - или OSx могÑÑ Ð¸ÑполÑзоваÑÑ Ð¾Ð´Ð½Ñ Ð¸Ð· ÑазлиÑнÑÑ - ÐнÑÑÑÑкÑий по ÑÑÑановке из СеÑи. ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑÑÑановиÑÑ libmp3lame! - </li> - <li>УÑÑановиÑе <strong>SoX</strong> <a - href="http://sox.sourceforge.net/"; target="_blank">http://sox.sourceforge.net/</a>. - ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑÑÑановиÑÑ Ð¿Ð¾ÑледнÑÑ Ð²ÐµÑÑÐ¸Ñ SoX! SoX 12.xx не бÑÐ´ÐµÑ - ÑабоÑаÑÑ! - </li> </ul> </li> - </ol> <br /> <b> <span style="font-size: 1.2em">ÐÑли Ñ ÐÐ°Ñ Ð¾ÑÑалиÑÑ @@ -1713,13 +1656,13 @@ href="http://openmeetings.apache.org/mail-lists.html"; target="_blank">СпиÑок ÑаÑÑÑлки</a></span> <br /> - <br /> <br /> - <b> <span style="font-size: 1.4em">ÐÑо компании, - коÑоÑÑе Ñакже оказÑваÑÑ ÐºÐ¾Ð¼Ð¼ÐµÑÑеÑкÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ Apache OpenMeetings:</span></b> + <br /> + <b> <span style="font-size: 1.4em">ÐÑо компании, + коÑоÑÑе Ñакже оказÑваÑÑ ÐºÐ¾Ð¼Ð¼ÐµÑÑеÑкÑÑ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶ÐºÑ Apache OpenMeetings:</span></b> + <br /> <br /> <br /> - <span style="font-size: 1.3em"><a href="http://openmeetings.apache.org/commercial-support.html"; target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span> @@ -1770,9 +1713,9 @@ <entry key="install.wizard.params.step1.email">ÐлекÑÑÐ¾Ð½Ð½Ð°Ñ Ð¿Ð¾ÑÑа</entry> <entry key="install.wizard.params.step1.email.title">ÐведиÑе адÑÐµÑ ÑлекÑÑонной поÑÑÑ</entry> <entry key="install.wizard.params.step1.tz">ЧаÑовой поÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑ</entry> - <entry key="install.wizard.params.step1.groupdata">ÐÑганизаÑиÑ(Ðомен)</entry> + <entry key="install.wizard.params.step1.groupdata">ÐÑÑппа(Ðомен)</entry> <entry key="install.wizard.params.step1.group">Ðаименование</entry> - <entry key="install.wizard.params.step1.group.title">ÐведиÑе оÑганизаÑÐ¸Ñ Ð¿Ð¾ ÑмолÑаниÑ</entry> + <entry key="install.wizard.params.step1.group.title">ÐведиÑе гÑÑÐ¿Ð¿Ñ Ð¿Ð¾ ÑмолÑаниÑ</entry> <entry key="install.wizard.params.step2.configuration">ÐонÑигÑÑаÑиÑ</entry> <entry key="install.wizard.params.step2.allowFrontendRegister">РазÑеÑиÑÑ ÑамоÑегиÑÑÑаÑÐ¸Ñ (allow_frontend_register)</entry> @@ -1800,39 +1743,25 @@ <entry key="install.wizard.params.step3.installation">УÑÑановка</entry> <entry key="install.wizard.params.step3.swfZoom">SWFTools маÑÑÑабиÑование</entry> <entry key="install.wizard.params.step3.swfZoom.title">УкажиÑе ÑазÑеÑение (dpi), коÑоÑое Ð²Ñ Ð±ÑдиÑе иÑполÑзоваÑÑ Ð´Ð»Ñ ÐºÐ¾Ð½Ð²ÐµÑÑаÑии PDF в SWF</entry> - <entry key="install.wizard.params.step3.swfZoom.text"> - DPI коÑоÑое swftools бÑÐ´ÐµÑ Ð¸ÑполÑзоваÑÑ Ð´Ð»Ñ ÐºÐ¾Ð½Ð²ÐµÑÑаÑии PDF в SWF. Ðо ÑмолÑÐ°Ð½Ð¸Ñ 100 dpi. - </entry> + <entry key="install.wizard.params.step3.swfZoom.text">DPI коÑоÑое swftools бÑÐ´ÐµÑ Ð¸ÑполÑзоваÑÑ Ð´Ð»Ñ ÐºÐ¾Ð½Ð²ÐµÑÑаÑии PDF в SWF. Ðо ÑмолÑÐ°Ð½Ð¸Ñ 100 dpi.</entry> <entry key="install.wizard.params.step3.swfJpegQuality">SWFTools JPEG ÐаÑеÑÑво</entry> <entry key="install.wizard.params.step3.swfJpegQuality.title">УкажиÑе каÑеÑÑво вÑÑÑоенного jpeg изобÑажениÑ. 0 Ð¿Ð»Ð¾Ñ Ð¾Ðµ (маленÑкое), 100 вÑÑокое (болÑÑое). (по ÑмолÑаниÑ:85)</entry> - <entry key="install.wizard.params.step3.swfJpegQuality.text"> - ÐаÑеÑÑво вÑÑÑоенного jpeg изобÑажениÑ. 0 Ð¿Ð»Ð¾Ñ Ð¾Ðµ (маленÑкое), - 100 вÑÑокое (болÑÑое). (по ÑмолÑаниÑ:85) - </entry> + <entry key="install.wizard.params.step3.swfJpegQuality.text">ÐаÑеÑÑво вÑÑÑоенного jpeg изобÑажениÑ. 0 Ð¿Ð»Ð¾Ñ Ð¾Ðµ (маленÑкое), 100 вÑÑокое (болÑÑое). (по ÑмолÑаниÑ:85)</entry> <entry key="install.wizard.params.step3.swfPath">SWFTools ÐÑÑÑ</entry> <entry key="install.wizard.params.step3.swfPath.title">УкажиÑе пÑÑÑ Ðº swftools напÑÐ¸Ð¼ÐµÑ C:/swftools (Windows) или или не заполнÑйÑе данное поле еÑли пÑÑÑ Ðº swftools задан в ÑиÑÑемнÑÑ Ð¿ÑÑÑÑ </entry> - <entry key="install.wizard.params.step3.swfPath.text"> - ÐÑ Ð¼Ð¾Ð¶ÐµÑе пÑовеÑиÑÑ, наÑÑÑоен ли запÑÑк swftools на ÐаÑей ÑиÑÑеме - Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑоки или shell или cmd-prompt набÑав ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ pdf2swf. ÐÑли бÑÐ´ÐµÑ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½ - ÑпиÑок опÑий оÑÑавÑÑе ÑÑо поле пÑÑÑÑм, в пÑоÑивном ÑлÑÑае Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ - ÑказаÑÑ Ð¿ÑÑÑ Ðº pdf2swf на ÐаÑей ÑиÑÑеме, - </entry> + <entry key="install.wizard.params.step3.swfPath.text">ÐÑ Ð¼Ð¾Ð¶ÐµÑе пÑовеÑиÑÑ, наÑÑÑоен ли запÑÑк swftools на ÐаÑей ÑиÑÑеме Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑоки или shell или cmd-prompt набÑав ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ pdf2swf. ÐÑли бÑÐ´ÐµÑ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½ ÑпиÑок опÑий оÑÑавÑÑе ÑÑо поле пÑÑÑÑм, в пÑоÑивном ÑлÑÑае Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑказаÑÑ Ð¿ÑÑÑ Ðº pdf2swf на ÐаÑей ÑиÑÑеме</entry> <entry key="install.wizard.params.step3.imageMagicPath">ImageMagick ÐÑÑÑ</entry> <entry key="install.wizard.params.step3.imageMagicPath.title">УкажиÑе пÑÑÑ Ðº ImageMagick, или не заполнÑйÑе данное поле еÑли ImageMagick ÑÑÑановлен в пÑÑÑÑ ÐаÑей ÑиÑÑемÑ</entry> - <entry key="install.wizard.params.step3.imageMagicPath.text"></entry> + <entry key="install.wizard.params.step3.imageMagicPath.text"><![CDATA[УÑÑановиÑе ImageMagick на ÐÐ°Ñ ÑеÑвеÑ, более подÑобнÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ ÐºÐ°ÑаÑÑÑÑÑÑ ÑÑÑановки можно поÑмоÑÑеÑÑ ÑÑÑ http://www.imagemagick.org ÐнÑÑÑÑкÑÐ¸Ñ Ð¿Ð¾ ÑÑÑановке ÐÑ Ð¼Ð¾Ð¶ÐµÑе найÑи здеÑÑ http://www.imagemagick.org/script/binary-releases.php, однако в болÑÑинÑÑве ÑиÑÑем ÐинÑÐºÑ ÐÑ Ð¼Ð¾Ð¶ÐµÑе ÑÑÑановиÑÑ ÐµÐ³Ð¾ ÑеÑез ÐÐ°Ñ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿Ð°ÐºÐµÑов (apt-get it)]]></en try> <entry key="install.wizard.params.step3.ffmpegPath">FFMPEG ÐÑÑÑ</entry> <entry key="install.wizard.params.step3.ffmpegPath.title">УкажиÑе пÑÑÑ Ðº FFMPEG, или не заполнÑйÑе данное поле еÑли FFMPEG ÑÑÑановлен в пÑÑÑÑ ÐаÑей ÑиÑÑемÑ</entry> - <entry key="install.wizard.params.step3.ffmpegPath.text"></entry> + <entry key="install.wizard.params.step3.ffmpegPath.text"><![CDATA[УÑÑановиÑе FFMpeg. ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿Ð¾Ð»ÑÑиÑÑ Ð¿Ð¾ÑледнÑÑ Ð²ÐµÑÑÐ¸Ñ FFMPEG! ÐÐ»Ñ Windows ÐÑ Ð¼Ð¾Ð¶ÐµÑе ÑкаÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ñ ÑÑого ÑайÑа http://ffmpeg.arrozcru.org/builds/ ÐолÑзоваÑели Linux или OSx могÑÑ Ð¸ÑполÑзоваÑÑ Ð¾Ð´Ð½Ñ Ð¸Ð· ÑазлиÑнÑÑ ÐнÑÑÑÑкÑий по ÑÑÑановке из СеÑи. ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑÑÑановиÑÑ libmp3lame!]]></entry> <entry key="install.wizard.params.step3.soxPath">SoX ÐÑÑÑ</entry> <entry key="install.wizard.params.step3.soxPath.title">УкажиÑе пÑÑÑ Ðº SoX, или не заполнÑйÑе данное поле еÑли SoX ÑÑÑановлен в пÑÑÑÑ ÐаÑей ÑиÑÑемÑ</entry> - <entry key="install.wizard.params.step3.soxPath.text"></entry> + <entry key="install.wizard.params.step3.soxPath.text"><![CDATA[УÑÑановиÑе SoX http://sox.sourceforge.net/. ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑÑÑановиÑÑ Ð¿Ð¾ÑледнÑÑ Ð²ÐµÑÑÐ¸Ñ SoX! SoX 12.xx не бÑÐ´ÐµÑ ÑабоÑаÑÑ!]]></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice ÐÑÑÑ Ð´Ð»Ñ jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">ÐÑÑÑ Ðº OpenOffice/LibreOffice (не обÑзаÑелÑнÑй) пожалÑйÑÑа ÑÑÑановиÑе ÑÑÐ¾Ñ Ð¿ÑÑÑ Ð² ÑлÑÑае когда jodconverter не в ÑоÑÑоÑнии найÑи авÑомаÑиÑеÑки пÑÑÑ Ðº ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ OpenOffice/LibreOffice</entry> - <entry key="install.wizard.params.step3.officePath.text"> - ÐÑÑÑ Ðº OpenOffice/LibreOffice (не обÑзаÑелÑнÑй) пожалÑйÑÑа ÑÑÑановиÑе ÑÑÐ¾Ñ Ð¿ÑÑÑ - в ÑлÑÑае когда jodconverter не в ÑоÑÑоÑнии найÑи - пÑÑÑ Ðº ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ OpenOffice/LibreOffice - </entry> + <entry key="install.wizard.params.step3.officePath.text">ÐÑÑÑ Ðº OpenOffice/LibreOffice (не обÑзаÑелÑнÑй) пожалÑйÑÑа ÑÑÑановиÑе ÑÑÐ¾Ñ Ð¿ÑÑÑ Ð² ÑлÑÑае когда jodconverter не в ÑоÑÑоÑнии найÑи пÑÑÑ Ðº ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ OpenOffice/LibreOffice</entry> <entry key="install.wizard.params.step4.crypt">Тип ÑиÑÑованиÑ</entry> <entry key="install.wizard.params.step4.cryptClassName">ÐлаÑÑ ÑиÑÑованиÑ</entry> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.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.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.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.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.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.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1772141&r1=1772140&r2=1772141&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.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>
