You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/12/26 19:16:55 UTC
svn commit: r1553537 [1/2] - in /openmeetings/trunk/singlewebapp: ./
src/main/webapp/css/ src/main/webapp/languages/
src/web/java/org/apache/openmeetings/web/admin/backup/
src/web/java/org/apache/openmeetings/web/admin/labels/
src/web/java/org/apache/o...
Author: solomax
Date: Thu Dec 26 18:16:54 2013
New Revision: 1553537
URL: http://svn.apache.org/r1553537
Log:
[OPENMEETINGS-865] Lang upload and backup import buttons are fixed (picture upload incomplete)
Modified:
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css
openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese simplified.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese traditional.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch (studIP).xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues brazil.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml
openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/app/Application.java
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Thu Dec 26 18:16:54 2013
@@ -316,6 +316,7 @@
<dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.5" conf="openmeetings.ext->*" transitive="false"/>
<dependency org="org.apache.openjpa" name="openjpa" rev="2.2.2" conf="openmeetings.ext->*" transitive="false"/>
<dependency org="commons-lang" name="commons-lang" rev="2.6" conf="openmeetings.ext->*" transitive="false"/> <!-- required by PCEnchancer -->
+ <dependency org="de.agilecoders.wicket" name="wicket-bootstrap-extensions" rev="0.8.4" conf="openmeetings.ext->*" transitive="true"/>
<dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.14" conf="openmeetings.axis2->*" transitive="true">
<exclude name='commons-io' />
@@ -421,7 +422,8 @@
</dependency-->
<exclude org="javax.servlet" module="servlet-api" type="*" ext="*" conf="*" matcher="exact"/>
- <exclude org="cglib" module="cglib-nodep" type="*" ext="*" conf="*" matcher="exact"/>
+ <exclude org="cglib" module="cglib-nodep" type="*" ext="*" conf="*" matcher="exact"/>
+ <exclude org="pull-parser" module="pull-parser" type="*" ext="*" conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css Thu Dec 26 18:16:54 2013
@@ -251,6 +251,9 @@ table.adminListTable tr:hover {
.adminForm {
}
+.adminForm .btn {
+ width: 280px;
+}
.adminForm input {
display: block;
float: left;
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css Thu Dec 26 18:16:54 2013
@@ -320,44 +320,6 @@ div.tableWrapperSmall {
background-image: url(../public/themes/basic-theme/dashboard/wizzard_button_4.png);
margin-left: 60px;
}
-.profile {
- position: relative;
-}
-.profile .upload, .profile .uploadtext {
- display: inline-block;
- position: absolute;
- bottom: -20px;
- left: 0px;
- opacity: .7;
- width: 130px;
- padding: 5px;
- z-index: 50;
- font-size: 14px;
- font-family: Arial;
- font-weight: bold;
- color: blue;
-}
-
-.profile .uploadlang {
- text-align: center;
- font-size: 16px;
- padding: 0.4em 1em;
-}
-
-.profile .upload {
- z-index: 100;
- cursor: pointer;
-}
-.profile .uploadtext:hover {
- opacity: 1;
-}
-.profile .upload input {
- position: relative;
- height: 100%;
- opacity: 0;
- width: 100%;
- cursor: pointer;
-}
.widget {
width: 100%;
}
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/arabic.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/bulgarian.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/catalan.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese%20simplified.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese simplified.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese simplified.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese%20traditional.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/chinese traditional.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/czech.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/danish.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch%20%28studIP%29.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch (studIP).xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch (studIP).xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/deutsch.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Veröffentlichen. Nutzer:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>Um Zeit und Internet-Verkehr sparen, können Sie den Befehl admin für Backup/Wiederherstellen/Aktualisieren verwenden. (1) Gehen sie zum OM-Installationspfad (z.b. /opt/red5) (2) Stopen Sie OM (z.b. ./red5-shutdown.sh) (3) ./admin.sh -b -file ~/heute_om_backup.zip (Backup vom bestehenden OM erstellen) (4) Laden Sie die neue Version OM herunter (5) mv /opt/red5 /opt.red5.bak (kopieren Sie die existierende OM-Version für den Fall :)) (6) Entpacken Sie die heruntergeladene OM-Version nach /opt/red5 (7) ./admin.sh -i -file ~/heute_om_backup.zip (or './admin.sh -i -file ~/heute_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass', für den Fall, dass Sie eine Nicht-Standard-DB verwenden) (8) Starten Sie OM</value>
+ <value><![CDATA[Um Zeit und Internet-Verkehr sparen, können Sie den Befehl admin für Backup/Wiederherstellen/Aktualisieren verwenden.
+ <ol>
+ <li>Gehen sie zum OM-Installationspfad (z.b. /opt/red5)</li>
+ <li>Stopen Sie OM (z.b. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/heute_om_backup.zip (Backup vom bestehenden OM erstellen)</li>
+ <li>Laden Sie die neue Version OM herunter</li>
+ <li>mv /opt/red5 /opt.red5.bak (kopieren Sie die existierende OM-Version für den Fall :))</li>
+ <li>Entpacken Sie die heruntergeladene OM-Version nach /opt/red5</li>
+ <li>./admin.sh -i -file ~/heute_om_backup.zip (or './admin.sh -i -file ~/heute_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass', für den Fall, dass Sie eine Nicht-Standard-DB verwenden)</li>
+ <li>Starten Sie OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>gemeinsame Räume für alle Benutzer</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/dutch.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/english.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/finnish.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/french.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publier. Utilisateur :</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>Pour économiser du temps et de la bande passante vous pouvez utiliser la ligne de commande pour sauvegarder/restaurer/mettre à niveau votre système :<br> 1) Aller dans le répertoire d'installation d'OM (par ex. /opt/red5)<br> 2) Arrêter OM (par ex. ./red5-shutdown.sh)<br> 3) ./admin.sh -b -file ~/nom_du_backup.zip (créer la sauvegarde d'OM)<br> 4) télécharger la nouvelle version d'OM<br> 5) mv /opt/red5 /opt.red5.bak (déplacer la version d'OM qui fonctionne par sécurité.)<br> 6) extraire la nouvelle version d'OM dans /opt/red5<br> 7) ./admin.sh -i -file ~/today_om_backup.zip (ou './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' dans le cas d'une BD qui n'est pas celle par défaut )<br> 8) Démarrer OM</value>
+ <value><![CDATA[Pour économiser du temps et de la bande passante vous pouvez utiliser la ligne de commande pour sauvegarder/restaurer/mettre à niveau votre système
+ <ol>
+ <li>Aller dans le répertoire d'installation d'OM (par ex. /opt/red5)</li>
+ <li>Arrêter OM (par ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/nom_du_backup.zip (créer la sauvegarde d'OM)</li>
+ <li>télécharger la nouvelle version d'OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (déplacer la version d'OM qui fonctionne par sécurité.)</li>
+ <li>extraire la nouvelle version d'OM dans /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (ou './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' dans le cas d'une BD qui n'est pas celle par défaut )</li>
+ <li>Démarrer OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Salles pour tous les utilisateurs</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/galician.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/greek.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/hebrew.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/hungarian.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Közzététel. Felhasználó:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>IdÅt és adatforgalmat takarÃt meg ha a parancssori admint használja a mentésekhez backup/restore/upgrade:\n 1) lépjen be az OM telepÃtett könyvtárába (pl.: /opt/red5) \n 2) állÃtsa meg az OM-et (cmd: ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (backup készÃtése az aktuális OM -rÅl)\n 4) töltse le az új OM-et\n 5) mv /opt/red5 /opt.red5.bak (A működÅ OM verziót Årizze meg :))\n 6) Csomagolja ki az új OM-et /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' adja meg, ha nem az alapértelmezett DB hozzáférést használja )\n 8) OM indÃtása\n</value>
+ <value><![CDATA[IdÅt és adatforgalmat takarÃt meg ha a parancssori admint használja a mentésekhez backup/restore/upgrade:
+ <ol>
+ <li>lépjen be az OM telepÃtett könyvtárába (pl.: /opt/red5)</li>
+ <li>állÃtsa meg az OM-et (cmd: ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (backup készÃtése az aktuális OM -rÅl)</li>
+ <li>töltse le az új OM-et</li>
+ <li>mv /opt/red5 /opt.red5.bak (A működÅ OM verziót Årizze meg :))</li>
+ <li>Csomagolja ki az új OM-et /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' adja meg, ha nem az alapértelmezett DB hozzáférést használja )</li>
+ <li>OM indÃtása</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Közös termek minden felhasználó számára</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/indonesian.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/italian.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/japanese.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,19 @@ see http://openmeetings.apache.org/Langu
<value>å
¬éä¸ãã¦ã¼ã¶ã¼ï¼</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>ããã¯ã¢ããï¼ãªã¹ãã¢ï¼ã¢ããã°ã¬ã¼ããè¡ãªãéã«ã³ãã³ãã©ã¤ã³ã»ãã¼ã«ãå©ç¨ããã¨ãæéã¨ã¤ã³ã¿ã¼ãããã»ãã©ãã£ãã¯ãç¯ç´ãããã¨ãã§ãã¾ã:<br> 1) ãªã¼ãã³ãã¼ãã£ã³ã°ã¹ã®ã¤ã³ã¹ãã¼ã«ã»ãã£ã¬ã¯ããªã«ç§»åãã (ä¾ï¼/opt/red5)<br> 2) ãªã¼ãã³ã»ãã¼ãã£ã³ã°ã¹ãåæ¢ãã(ä¾ï¼ ./red5-shutdown.sh)<br> 3) ./admin.sh -b -file ~/today_om_backup.zip (ãªã¼ãã³ã»ãã¼ãã£ã³ã°ã¹ã®ç¾ç¶ããã¯ã¢ããã�
�ä½æãã)<br> 4) ãªã¼ãã³ã»ãã¼ãã£ã³ã°ã¹ã®ææ°ã¢ã¼ã«ã¤ãããã¦ã³ãã¼ããã<br> 5) mv /opt/red5 /opt.red5.bak (å¿
è¦ã«å¿ãã¦ãç¾ç°å¢ã移åãã¦ãã)<br> 6) /opt/red5 ã«ãã¦ã³ãã¼ãããã¢ã¼ã«ã¤ããå±éãã<br> 7) ./admin.sh -i -file ~/today_om_backup.zip<br>(ããã©ã«ãã®ãã¼ã¿ãã¼ã¹ã使ç¨ãã¦ããªãå ´å㯠'./admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass')<br> 8) ãªã¼ãã³ã»ãã¼ãã£ã³ã°ã¹ãèµ·åãã</value>
+ <value><![CDATA[ããã¯ã¢ããï¼ãªã¹ãã¢ï¼ã¢ããã°ã¬ã¼ããè¡ãªãéã«ã³ãã³ãã©ã¤ã³ã»ãã¼ã«ãå©ç¨ããã¨ãæéã¨ã¤ã³ã¿ã¼ãããã»ãã©ãã£ãã¯ãç¯ç´ãããã¨ãã§ãã¾ã:
+ <ol>
+ <li>ãªã¼ãã³ãã¼ãã£ã³ã°ã¹ã®ã¤ã³ã¹ãã¼ã«ã»ãã£ã¬ã¯ããªã«ç§»åãã (ä¾ï¼/opt/red5)</li>
+ <li>ãªã¼ãã³ã»ãã¼ãã£ã³ã°ã¹ãåæ¢ãã(ä¾ï¼ ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (ãªã¼ãã³ã»ãã¼ãã£ã³ã°ã¹ã®ç¾ç¶ããã¯ã¢ãããä½æãã)</li>
+ <li>ãªã¼ãã³ã»ãã¼ãã£ã³ã°ã¹ã®ææ°ã¢ã¼ã«ã¤ãããã¦ã³ãã¼ããã</li>
+ <li>mv /opt/red5 /opt.red5.bak (å¿
è¦ã«å¿ãã¦ãç¾ç°å¢ã移åãã¦ãã)</li>
+ <li>/opt/red5 ã«ãã¦ã³ãã¼ãããã¢ã¼ã«ã¤ããå±éãã</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip<br/>
+ (ããã©ã«ãã®ãã¼ã¿ãã¼ã¹ã使ç¨ãã¦ããªãå ´å㯠'./admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass')</li>
+ <li>ãªã¼ãã³ã»ãã¼ãã£ã³ã°ã¹ãèµ·åãã</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>å
¨ã¦ã¼ã¶ã¼ã«ä¾ç¨ãããä¼è°å®¤</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/korean.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/persian.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/polish.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues%20brazil.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues brazil.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues brazil.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/portugues.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/russian.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>СообÑение. ÐолÑзоваÑелÑ:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>ЧÑо Ð±Ñ ÑменÑÑиÑÑ Ð²ÑÐµÐ¼Ñ Ð¸ инÑеÑÐ½ÐµÑ ÑÑаÑÑик Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе воÑполÑзоваÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑокой admin Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸ÑованиÑ/воÑÑÑановлениÑ/обновлениÑ: 1) войдиÑе в ÑÑÑановоÑнÑÑ Ð¿Ð°Ð¿ÐºÑ OM (напÑÐ¸Ð¼ÐµÑ /opt/red5) 2) оÑÑановиÑе OM (./red5-shutdown.sh) 3) вÑполнÑем ./admin.sh -b -file ~/today_om_backup.zip (ÑÐ¾Ð·Ð´Ð°ÐµÑ ÑезеÑвнÑÑ ÐºÐ¾Ð¿Ð¸Ñ OM) 4) загÑÑзиÑе новÑй диÑÑÑибÑÑив OM 5) mv /opt/re
d5 /opt.red5.bak (пеÑемеÑаем ÑабоÑÑÑ Ð²ÐµÑÑÐ¸Ñ OM :)) 6) ÑаÑпаковÑваем диÑÑÑибÑÑив OM в Ð¿Ð°Ð¿ÐºÑ /opt/red5 7) запÑÑкаем ./admin.sh -i -file ~/today_om_backup.zip (или './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' в ÑлÑÑае когда база даннÑÑ
оÑлиÑаеÑÑÑ Ð¾Ñ Ð±Ð°Ð·Ñ Ð¿Ð¾ ÑмолÑÐ°Ð½Ð¸Ñ ) 8) запÑÑкаем OM</value>
+ <value><![CDATA[ЧÑо Ð±Ñ ÑменÑÑиÑÑ Ð²ÑÐµÐ¼Ñ Ð¸ инÑеÑÐ½ÐµÑ ÑÑаÑÑик Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе воÑполÑзоваÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹ ÑÑÑокой admin Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸ÑованиÑ/воÑÑÑановлениÑ/обновлениÑ:
+ <ol>
+ <li>войдиÑе в ÑÑÑановоÑнÑÑ Ð¿Ð°Ð¿ÐºÑ OM (напÑÐ¸Ð¼ÐµÑ /opt/red5)</li>
+ <li>оÑÑановиÑе OM (./red5-shutdown.sh)</li>
+ <li>вÑполнÑем ./admin.sh -b -file ~/today_om_backup.zip (ÑÐ¾Ð·Ð´Ð°ÐµÑ ÑезеÑвнÑÑ ÐºÐ¾Ð¿Ð¸Ñ OM)</li>
+ <li>загÑÑзиÑе новÑй диÑÑÑибÑÑив OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (пеÑемеÑаем ÑабоÑÑÑ Ð²ÐµÑÑÐ¸Ñ OM :))</li>
+ <li>ÑаÑпаковÑваем диÑÑÑибÑÑив OM в Ð¿Ð°Ð¿ÐºÑ /opt/red5</li>
+ <li>запÑÑкаем ./admin.sh -i -file ~/today_om_backup.zip (или './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' в ÑлÑÑае когда база даннÑÑ
оÑлиÑаеÑÑÑ Ð¾Ñ Ð±Ð°Ð·Ñ Ð¿Ð¾ ÑмолÑÐ°Ð½Ð¸Ñ )</li>
+ <li>запÑÑкаем OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>ÐбÑие комнаÑÑ Ð´Ð»Ñ Ð²ÑеÑ
полÑзоваÑелей</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/slovak.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/spanish.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/swedish.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/thai.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/turkish.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/languages/ukrainian.xml Thu Dec 26 18:16:54 2013
@@ -4539,7 +4539,18 @@ see http://openmeetings.apache.org/Langu
<value>Publishing. User:</value>
</string>
<string id="1505" name="cmd_line_admin">
- <value>To save time and internet traffic you can use command line admin to backup/restore/upgrade:\n 1) go to OM install dir (for ex. /opt/red5) \n 2) stop OM (for ex. ./red5-shutdown.sh)\n 3) ./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)\n 4) download archive with new OM\n 5) mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))\n 6) extract downloaded OM to the /opt/red5\n 7) ./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )\n 8) start OM\n</value>
+ <value><![CDATA[To save time and internet traffic you can use command line admin to backup/restore/upgrade:
+ <ol>
+ <li>go to OM install dir (for ex. /opt/red5)</li>
+ <li>stop OM (for ex. ./red5-shutdown.sh)</li>
+ <li>./admin.sh -b -file ~/today_om_backup.zip (create backup of current OM)</li>
+ <li>download archive with new OM</li>
+ <li>mv /opt/red5 /opt.red5.bak (move working version of OM just in case :))</li>
+ <li>extract downloaded OM to the /opt/red5</li>
+ <li>./admin.sh -i -file ~/today_om_backup.zip (or './admin.sh -i -file ~/today_om_backup.zip --db-type mysql --db-user om_user --db-pass om_user_pass' in case of you are using non-default DB )</li>
+ <li>start OM</li>
+ </ol>
+ ]]></value>
</string>
<string id="1506" name="public_room_tooltip">
<value>Rooms common to all user</value>
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html Thu Dec 26 18:16:54 2013
@@ -34,16 +34,17 @@
<label><wicket:ommessage key="1537" /></label> <input type="checkbox" wicket:id="includeFilesInBackup" />
</div>
<div class="formelement">
- <input class="uploadFileField" wicket:id="fileInput" type="file"/>
- </div>
- <div class="formelement">
<span wicket:id="progress">[[upload progressbar]]</span>
</div>
<div class="formelement">
<!-- Perform Download -->
- <input type="submit" wicket:ommessage="value:1536" wicket:id="upload" class="ui-button ui-widget ui-state-default ui-corner-all"/>
+ <div wicket:id="download" class="ui-button ui-widget ui-state-default ui-corner-all">
+ <span class="btn btn-file"><wicket:ommessage key="1066"/></span>
+ </div>
<!-- Perform Upload -->
- <input type="submit" wicket:ommessage="value:1066" wicket:id="download" class="ui-button ui-widget ui-state-default ui-corner-all"/>
+ <div class="ui-button ui-widget ui-state-default ui-corner-all fileupload fileupload-new" data-provides="fileupload" style="margin: 0;">
+ <span class="btn btn-file"><wicket:ommessage key="1536"/><input class="uploadFileField" wicket:id="fileInput" type="file"/></span>
+ </div>
</div>
<div class="formelement">
<!-- Max upload size -->
@@ -51,7 +52,7 @@
</div>
<div class="formelement">
<!-- Backup CLI import information -->
- <div class="info-text"><wicket:ommessage key="1505" /></div>
+ <div class="info-text" wicket:id="cmdLineDesc"></div>
</div>
</fieldset>
</form>
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1553537&r1=1553536&r2=1553537&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Thu Dec 26 18:16:54 2013
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.getBean;
import java.io.File;
-import java.io.IOException;
import java.text.DecimalFormat;
import java.util.Date;
@@ -32,15 +31,16 @@ import org.apache.openmeetings.db.dao.ba
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.upload.FileUpload;
-import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.lang.Bytes;
@@ -48,6 +48,8 @@ import org.apache.wicket.util.resource.F
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import de.agilecoders.wicket.extensions.javascript.jasny.FileUploadField;
+
/**
* Panel component to manage Backup Import/Export
*
@@ -69,11 +71,9 @@ public class BackupPanel extends AdminPa
*
*/
private class BackupForm extends Form<Void> {
-
private static final long serialVersionUID = 1L;
-
- FileUploadField fileUploadField;
- CheckBox includeFilesInBackup;
+ private FileUploadField fileUploadField;
+ private Model<Boolean> includeFilesInBackup = Model.of(true);
public BackupForm(String id) {
super(id);
@@ -89,11 +89,8 @@ public class BackupPanel extends AdminPa
// Add one file input field
fileUploadField = new FileUploadField("fileInput");
- add(fileUploadField);
- includeFilesInBackup = new CheckBox("includeFilesInBackup",
- Model.of(true));
- add(includeFilesInBackup);
+ add(new CheckBox("includeFilesInBackup", includeFilesInBackup));
// Set maximum size controlled by configuration
setMaxSize(Bytes.bytes(maxBytes));
@@ -103,15 +100,14 @@ public class BackupPanel extends AdminPa
add(download);
// add an download button
add(new AjaxButton("download", this) {
- private static final long serialVersionUID = 839803820502260006L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
File working_dir = OmFileHelper.getUploadBackupDir();
- String dateString = "backup_"
- + CalendarPatterns.getTimeForStreamId(new Date());
+ String dateString = "backup_" + CalendarPatterns.getTimeForStreamId(new Date());
File backup_dir = new File(working_dir, dateString);
File backupFile = new File(backup_dir, dateString + ".zip");
@@ -120,12 +116,10 @@ public class BackupPanel extends AdminPa
getBean(BackupExport.class).performExport(
backupFile,
backup_dir,
- includeFilesInBackup.getConvertedInput()
- .booleanValue());
+ includeFilesInBackup.getObject());
download.setFileName(backupFile.getName());
- download.setResourceStream(new FileResourceStream(
- backupFile));
+ download.setResourceStream(new FileResourceStream(backupFile));
download.initiate(target);
} catch (Exception e) {
log.error("Exception on panel backup download ", e);
@@ -143,39 +137,34 @@ public class BackupPanel extends AdminPa
}
});
- // add an upload button
- add(new AjaxButton("upload", this) {
- private static final long serialVersionUID = 839803820502260006L;
+ add(fileUploadField.add(new AjaxFormSubmitBehavior(this, "onchange") {
+ private static final long serialVersionUID = 1L;
@Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ protected void onSubmit(AjaxRequestTarget target) {
FileUpload upload = fileUploadField.getFileUpload();
try {
if (upload == null || upload.getInputStream() == null) {
uploadFeedback.error("File is empty");
+ target.add(uploadFeedback);
return;
}
getBean(BackupImport.class).performImport(upload.getInputStream());
- } catch (IOException e) {
- log.error("IOException on panel backup upload ", e);
- uploadFeedback.error(e);
} catch (Exception e) {
log.error("Exception on panel backup upload ", e);
uploadFeedback.error(e);
}
-
// repaint the feedback panel so that it is hidden
target.add(uploadFeedback);
-
}
@Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
+ protected void onError(AjaxRequestTarget target) {
// repaint the feedback panel so errors are shown
target.add(uploadFeedback);
}
- });
-
+ }));
+ add(new Label("cmdLineDesc", WebSession.getString(1505)).setEscapeModelStrings(false));
}
}
@@ -191,8 +180,7 @@ public class BackupPanel extends AdminPa
BackupForm backupForm = new BackupForm("backupUpload");
- backupForm.add(new UploadProgressBar("progress", backupForm,
- backupForm.fileUploadField));
+ backupForm.add(new UploadProgressBar("progress", backupForm, backupForm.fileUploadField));
add(backupForm);
}