svn commit: r1737459 [4/4] - in /openmeetings/application: branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/ branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ branches/3.1.x/openmeetings-...

Fri, 01 Apr 2016 22:05:43 -0700 

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
 Sat Apr  2 05:04:19 2016
@@ -20,14 +20,14 @@
 -->
 <html xmlns:wicket="http://wicket.apache.org";>
        <wicket:head>
-       <script type="text/javascript">
-           function omServerPanelInit() {
-               var documentHeight = $(document).height();
-               $('#adminForm').height(documentHeight-114);
-               $('#adminTable').height(documentHeight-144);
-           }
-       </script>
-    </wicket:head>
+               <script type="text/javascript">
+                       function omServerPanelInit() {
+                               var documentHeight = $(document).height();
+                               $('#adminForm').height(documentHeight-114);
+                               $('#adminTable').height(documentHeight-144);
+                       }
+               </script>
+       </wicket:head>
        <wicket:panel>
                <div class="adminPanel">
                        <div class="adminPanelColumnTable">
@@ -44,7 +44,7 @@
                                <div class="tableWrapper" id="adminTable">
                                        <table class="adminListTable">
                                                <tbody 
wicket:id="listContainer">       
-                                               <tr wicket:id="serverList">
+                                                       <tr 
wicket:id="serverList">
                                                                <td 
class="three_column_layout_column1"><div 
class="three_column_layout_divcolumn1"><span wicket:id="id"></span></div></td>
                                                                <td 
class="three_column_layout_column2"><div 
class="three_column_layout_divcolumn2"><span wicket:id="name"></span></div></td>
                                                                <td 
class="three_column_layout_column3"><div 
class="three_column_layout_divcolumn3"><span 
wicket:id="address"></span></div></td>
@@ -60,53 +60,53 @@
                                                <fieldset 
class="ui-widget-content">
                                                        <legend 
class="ui-widget-header"><wicket:message key="1502" /></legend>
                                                        <div 
class="formelement">
-                                <label><wicket:message key="1500" 
/></label><input type="text" wicket:id="name"/>
-                                           </div>
-                                           <div class="formelement">
-                                <label><wicket:message key="1525" 
/></label><input type="checkbox" class="formcheckbox" wicket:id="active" />
-                                           </div>
-                                           <div class="formelement">
-                                <label><wicket:message key="1501" 
/></label><input type="text" wicket:id="address"/>
-                                           </div>
-                                           <div class="formelement">
-                                <label><wicket:message key="1519" 
/></label><input type="text" wicket:id="port"/>
-                                           </div>
-                                           <div class="formelement">
-                                <label><wicket:message key="1520" 
/></label><input type="text" wicket:id="user"/>
-                                           </div>
-                                           <div class="formelement">
-                                <label><wicket:message key="1521" 
/></label><input type="text" wicket:id="pass"/>
-                                           </div>
-                                           <div class="formelement">
-                                <label><wicket:message key="1522" 
/></label><input type="text" wicket:id="webapp"/>
-                                           </div>
-                                           <div class="formelement">
-                                <label><wicket:message key="1523" 
/></label><input type="text" wicket:id="protocol"/>
-                                           </div>
-                                           <div class="formelement">
-                                                   <div 
class="info-text"><wicket:message key="1518" /></div>
-                                       <br/>
-                                <label><wicket:message key="1517" 
/></label><span wicket:id="lastPing"/>
-                                <!-- br/>
-                                <label><wicket:message key="1524" 
/></label><span wicket:id="pingRunning"/-->
-                                           </div>
-                            <div class="formelement">
-                                <label><wicket:message key="1110" 
/></label><span wicket:id="inserted"/>
-                                           </div>
-                            <div class="formelement">
-                                <label><wicket:message key="1111" 
/></label><span wicket:id="insertedby.login"/>
-                                           </div>
-                            <div class="formelement">
-                                <label><wicket:message key="1112" 
/></label><span wicket:id="updated"/>
-                                           </div>
-                            <div class="formelement">
-                                <label><wicket:message key="1113" 
/></label><span wicket:id="updatedby.login"/>
-                                           </div>
-                            <div class="formelement">
-                                <label><wicket:message key="270" 
/></label><textarea wicket:id="comment"/>
-                                           </div>
-                                       </fieldset>
-                                   </div>
+                                                               
<label><wicket:message key="1500" /></label><input type="text" 
wicket:id="name"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1525" /></label><input type="checkbox" 
class="formcheckbox" wicket:id="active" />
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1501" /></label><input type="text" 
wicket:id="address"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1519" /></label><input type="text" 
wicket:id="port"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1520" /></label><input type="text" 
wicket:id="user"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1521" /></label><input type="text" 
wicket:id="pass"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1522" /></label><input type="text" 
wicket:id="webapp"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1523" /></label><input type="text" 
wicket:id="protocol"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               <div 
class="info-text"><wicket:message key="1518" /></div>
+                                                                       <br/>
+                                                               
<label><wicket:message key="1517" /></label><span wicket:id="lastPing"/>
+                                                               <!-- br/>
+                                                               
<label><wicket:message key="1524" /></label><span wicket:id="pingRunning"/-->
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1110" /></label><span wicket:id="inserted"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1111" /></label><span wicket:id="insertedby.login"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1112" /></label><span wicket:id="updated"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="1113" /></label><span wicket:id="updatedby.login"/>
+                                                       </div>
+                                                       <div 
class="formelement">
+                                                               
<label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
+                                                       </div>
+                                               </fieldset>
+                                       </div>
                                </form>
                        </div>
                </div>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
 Sat Apr  2 05:04:19 2016
@@ -60,9 +60,9 @@ public class ServersPanel extends AdminP
                        @Override
                        protected void populateItem(final Item<Server> item) {
                                final Server server = item.getModelObject();
-                               item.add(new Label("id", "" + server.getId()));
-                               item.add(new Label("name", "" + 
server.getName()));
-                               item.add(new Label("address", "" + 
server.getAddress()));
+                               item.add(new Label("id"));
+                               item.add(new Label("name"));
+                               item.add(new Label("address"));
                                item.add(new AjaxEventBehavior("click") {
                                        private static final long 
serialVersionUID = 1L;
 
@@ -73,8 +73,7 @@ public class ServersPanel extends AdminP
                                                
target.appendJavaScript("omServerPanelInit();");
                                        }
                                });
-                               item.add(AttributeModifier.replace("class", 
"clickable ui-widget-content"
-                                               + 
(server.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : 
"")));
+                               item.add(AttributeModifier.replace("class", 
getRowClass(server.getId(), form.getModelObject().getId())));
                        }
                };
                
@@ -96,7 +95,7 @@ public class ServersPanel extends AdminP
                
                form = new ServerForm("form", listContainer, new Server());
                form.showNewRecord();
-        add(form);
+               add(form);
                
        }
 }

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
 Sat Apr  2 05:04:19 2016
@@ -48,7 +48,7 @@
                                                <tr wicket:id="userList">
                                                        <td 
class="four_column_layout_column1"><div
                                                                        
class="four_column_layout_divcolumn1">
-                                                                       <span 
wicket:id="userId"></span>
+                                                                       <span 
wicket:id="id"></span>
                                                                </div></td>
                                                        <td 
class="four_column_layout_column2"><div
                                                                        
class="four_column_layout_divcolumn2">
@@ -56,11 +56,11 @@
                                                                </div></td>
                                                        <td 
class="four_column_layout_column3"><div
                                                                        
class="four_column_layout_divcolumn3">
-                                                                       <span 
wicket:id="firstName"></span>
+                                                                       <span 
wicket:id="firstname"></span>
                                                                </div></td>
                                                        <td 
class="four_column_layout_column4"><div
                                                                        
class="four_column_layout_divcolumn4">
-                                                                       <span 
wicket:id="lastName"></span>
+                                                                       <span 
wicket:id="lastname"></span>
                                                                </div></td>
                                                </tr>
                                        </tbody>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
 Sat Apr  2 05:04:19 2016
@@ -72,10 +72,10 @@ public class UsersPanel extends AdminPan
                        protected void populateItem(Item<User> item) {
                                User u = item.getModelObject();
                                final long userId = u.getId();
-                               item.add(new Label("userId", "" + u.getId()));
-                               item.add(new Label("login", u.getLogin()));
-                               item.add(new Label("firstName", 
u.getFirstname()));
-                               item.add(new Label("lastName", 
u.getLastname()));
+                               item.add(new Label("id"));
+                               item.add(new Label("login"));
+                               item.add(new Label("firstname"));
+                               item.add(new Label("lastname"));
                                item.add(new AjaxEventBehavior("click") {
                                        private static final long 
serialVersionUID = 1L;
 
@@ -85,8 +85,7 @@ public class UsersPanel extends AdminPan
                                                form.update(target);
                                        }
                                });
-                               item.add(AttributeModifier.append("class", 
"clickable ui-widget-content"
-                                               + 
(u.getId().equals(form.getModelObject().getId()) ? " ui-state-active" : "")));
+                               item.add(AttributeModifier.append("class", 
getRowClass(u.getId(), form.getModelObject().getId())));
                        }
                };
                add(listContainer.add(dataView).setOutputMarkupId(true));

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 Sat Apr  2 05:04:19 2016
@@ -365,6 +365,10 @@ public class Application extends Authent
                return getString(id, WebSession.getLanguage());
        }
 
+       public static String getString(String id) {
+               return getString(id, WebSession.getLanguage());
+       }
+
        public static Locale getLocale(final long languageId) {
                Locale loc = LabelDao.languages.get(languageId);
                if (loc == null) {
@@ -429,19 +433,19 @@ public class Application extends Authent
        
        public static WicketTester getWicketTester(long langId) {
                Application app = new Application();
-        
+               
                WicketTester tester = new WicketTester(app);
                ServletContext sc = app.getServletContext();
-        XmlWebApplicationContext xmlContext = new XmlWebApplicationContext();
-        
xmlContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
-        xmlContext.setServletContext(sc);
-        xmlContext.refresh();
-        sc.setAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, xmlContext);
-        if (langId > 0) {
-               WebSession.get().setLanguage(langId);
-        }
-        InitializationContainer.initComplete = true;
-        return tester;
+               XmlWebApplicationContext xmlContext = new 
XmlWebApplicationContext();
+               
xmlContext.setConfigLocation("classpath:openmeetings-applicationContext.xml");
+               xmlContext.setServletContext(sc);
+               xmlContext.refresh();
+               sc.setAttribute(ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, 
xmlContext);
+               if (langId > 0) {
+                       WebSession.get().setLanguage(langId);
+               }
+               InitializationContainer.initComplete = true;
+               return tester;
        }
        
        public static void destroy(WicketTester tester) {

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Yes/No</entry>
   <entry key="poll.type.numeric">Numeric 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">نعم / لا</entry>
   <entry key="poll.type.numeric">عددي 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Да/Не</entry>
   <entry key="poll.type.numeric">Числов 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Sí/No</entry>
   <entry key="poll.type.numeric">Valor numèric [1-10]</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Ano/Ne</entry>
   <entry key="poll.type.numeric">Čísla 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Ja/Nej</entry>
   <entry key="poll.type.numeric">Numerisk 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1888,4 +1888,15 @@
   <entry key="poll.type.yesNo">Ja/Nein</entry>
   <entry key="poll.type.numeric">Numerisch 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Ναι/Όχι</entry>
   <entry key="poll.type.numeric">Αριθμός 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1872,4 +1872,15 @@
   <entry key="poll.type.yesNo">Sí/No</entry>
   <entry key="poll.type.numeric">Valor numérico [1-10]</entry>
   <entry key="wizard.button.finish">Finalizar</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">خير/بله</entry>
   <entry key="poll.type.numeric">1-10 اعداد</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Kyllä/Ei</entry>
   <entry key="poll.type.numeric">Numeerinen 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1844,4 +1844,15 @@
   <entry key="poll.type.yesNo">Oui/Non</entry>
   <entry key="poll.type.numeric">Numérique 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Sí/Non</entry>
   <entry key="poll.type.numeric">Valor numérico 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1866,4 +1866,15 @@
   <entry key="poll.type.yesNo">Igen/Nem</entry>
   <entry key="poll.type.numeric">Szám 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Ya/Tidak</entry>
   <entry key="poll.type.numeric">Angka dari 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Si/No</entry>
   <entry key="poll.type.numeric">Numerico 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">はい/いいえ</entry>
   <entry key="poll.type.numeric">1～10の数字</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1880,4 +1880,15 @@
   <entry key="poll.type.yesNo">네/아니오</entry>
   <entry key="poll.type.numeric">숫자 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Ja/Nee</entry>
   <entry key="poll.type.numeric">Getal 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Tak/Nie</entry>
   <entry key="poll.type.numeric">Liczba 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Sim/Não</entry>
   <entry key="poll.type.numeric">Numérico 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Sim/Não</entry>
   <entry key="poll.type.numeric">Numérico 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1884,4 +1884,15 @@
   <entry key="poll.type.yesNo">Да/Нет</entry>
   <entry key="poll.type.numeric">Число 1 - 10</entry>
   <entry key="wizard.button.finish">Закончить</entry>
+       <entry key="main.menu.admin.email">Управление 
письмами</entry>
+       <entry key="main.menu.admin.email.desc">Проверка статуса 
отосланных писем</entry>
+       <entry key="admin.email.group.label">Почтовое 
сообщение</entry>
+       <entry key="admin.email.status.NONE">Нет</entry>
+       <entry key="admin.email.status.SENDING">Посылается</entry>
+       <entry key="admin.email.status.ERROR">Ошибка</entry>
+       <entry key="admin.email.status.DONE">Готово</entry>
+       <entry key="admin.email.recipients">Получатели</entry>
+       <entry key="admin.email.body">Текст</entry>
+       <entry key="admin.email.errorCount">Количество 
ошибок</entry>
+       <entry key="admin.email.lastError">Последняя 
ошибка</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Áno/Nie</entry>
   <entry key="poll.type.numeric">Čísla 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Ja/Nej</entry>
   <entry key="poll.type.numeric">Numerisk 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">ใช่/ไม่</entry>
   <entry key="poll.type.numeric">เลข 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Evet/Hayır</entry>
   <entry key="poll.type.numeric">Sayısal 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">Так/Ні</entry>
   <entry key="poll.type.numeric">В числовому порядку 
1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1848,4 +1848,15 @@
   <entry key="poll.type.yesNo">是/否</entry>
   <entry key="poll.type.numeric">数字 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
 Sat Apr  2 05:04:19 2016
@@ -1878,4 +1878,15 @@
   <entry key="poll.type.yesNo">是/否</entry>
   <entry key="poll.type.numeric">數字的 1-10</entry>
   <entry key="wizard.button.finish">Finish</entry>
+       <entry key="main.menu.admin.email">Email management</entry>
+       <entry key="main.menu.admin.email.desc">Check e-mails processing by the 
system</entry>
+       <entry key="admin.email.group.label">Email message</entry>
+       <entry key="admin.email.status.NONE">None</entry>
+       <entry key="admin.email.status.SENDING">Sending</entry>
+       <entry key="admin.email.status.ERROR">Error</entry>
+       <entry key="admin.email.status.DONE">Done</entry>
+       <entry key="admin.email.recipients">Recipients</entry>
+       <entry key="admin.email.body">Body</entry>
+       <entry key="admin.email.errorCount">Error Count</entry>
+       <entry key="admin.email.lastError">Last Error</entry>
 </properties>

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ProfileImagePanel.java
 Sat Apr  2 05:04:19 2016
@@ -36,7 +36,7 @@ public class ProfileImagePanel extends B
                add(profile.setOutputMarkupId(true));
                update();
        }
-               
+       
        public void update() {
                profile.addOrReplace(new WebMarkupContainer("img").add(
                                AttributeModifier.append("alt", 
Application.getString(5L))

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
 Sat Apr  2 05:04:19 2016
@@ -298,8 +298,8 @@ public class InstallWizard extends Abstr
                                emb.afterPropertiesSet();
                                dbType = getModelObject().getDbType();
                        } catch (Exception e) {
-                                       form.error(new 
StringResourceModel("install.wizard.db.step.error.patch", 
InstallWizard.this).setParameters(e.getMessage()).getObject());
-                                       log.error("error while patching", e);
+                               form.error(new 
StringResourceModel("install.wizard.db.step.error.patch", 
InstallWizard.this).setParameters(e.getMessage()).getObject());
+                               log.error("error while patching", e);
                        }
                }
        };

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
 Sat Apr  2 05:04:19 2016
@@ -31,6 +31,7 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.web.admin.backup.BackupPanel;
 import org.apache.openmeetings.web.admin.configurations.ConfigsPanel;
 import org.apache.openmeetings.web.admin.connection.ConnectionsPanel;
+import org.apache.openmeetings.web.admin.email.EmailPanel;
 import org.apache.openmeetings.web.admin.groups.GroupsPanel;
 import org.apache.openmeetings.web.admin.labels.LangPanel;
 import org.apache.openmeetings.web.admin.ldaps.LdapsPanel;
@@ -68,6 +69,7 @@ public class OmUrlFragment implements Se
        public static final String TYPE_BACKUP = "backup";
        public static final String TYPE_SERVER = "server";
        public static final String TYPE_OAUTH2 = "oauth2";
+       public static final String TYPE_EMAIL = "email";
        public static final OmUrlFragment DASHBOARD = new 
OmUrlFragment(AreaKeys.user, TYPE_DASHBOARD);
        public static final OmUrlFragment PROFILE_EDIT = new 
OmUrlFragment(AreaKeys.profile, TYPE_EDIT);
        public static final OmUrlFragment PROFILE_MESSAGES = new 
OmUrlFragment(AreaKeys.profile, TYPE_MESSAGES);
@@ -100,6 +102,7 @@ public class OmUrlFragment implements Se
                , adminModuleBackup
                , adminModuleServers
                , adminModuleOAuth
+               , adminModuleEmail
        }
        
        public enum MenuParams {
@@ -202,6 +205,11 @@ public class OmUrlFragment implements Se
                        case adminModuleOAuth:
                                setArea(AreaKeys.admin);
                                setType(TYPE_OAUTH2);
+                               break;
+                       case adminModuleEmail:
+                               setArea(AreaKeys.admin);
+                               setType(TYPE_EMAIL);
+                               break;
                }
        }
 
@@ -245,6 +253,8 @@ public class OmUrlFragment implements Se
                                        basePanel = new ServersPanel(CHILD_ID);
                                } else if (TYPE_OAUTH2.equals(type)) {
                                        basePanel = new OAuthPanel(CHILD_ID);
+                               } else if (TYPE_EMAIL.equals(type)) {
+                                       basePanel = new EmailPanel(CHILD_ID);
                                }
                                break;
                        case profile:

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css?rev=1737459&r1=1737458&r2=1737459&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css 
(original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css 
Sat Apr  2 05:04:19 2016
@@ -264,28 +264,32 @@ table.adminListTable td div.four_column_
 .adminForm .btn {
        width: 280px;
 }
-.adminForm input {
+.adminForm .input, .adminForm input, .adminForm input.formcheckbox
+ ,.adminForm textarea, .adminForm select, .adminForm label
+ {
        display: block;
        float: left;
        font-size: 14px;
        padding: 0px 0px;
+       margin: 2px 2px;
+}
+.adminForm .input {
+       border: solid 1px #aacfe4;
+       width: 280px;
+       min-height: 20px;
+}
+.adminForm input {
        border: solid 1px #aacfe4;
        width: 280px;
        height: 20px;
-       margin: 2px 2px;
 }
 .adminForm input[type=checkbox], .adminForm input[type=radio] {
        width: auto;
 }
 .adminForm input.formcheckbox {
-       display: block;
-       float: left;
-       font-size: 14px;
-       padding: 0px 0px;
        border: none;
        width: 20px;
        height: 20px;
-       margin: 2px 2px;
 }
 
 .adminForm fieldset {
@@ -301,14 +305,9 @@ table.adminListTable td div.four_column_
 }
 
 .adminForm textarea {
-       display: block;
-       float: left;
-       font-size: 14px;
-       padding: 0px 0px;
        border: solid 1px #aacfe4;
        width: 280px;
        height: 60px;
-       margin: 2px 2px;
 }
 
 .adminForm div.formelement {
@@ -318,23 +317,15 @@ table.adminListTable td div.four_column_
 }
 
 .adminForm select {
-       float: left;
        height: 20px;
-       font-size: 14px;
-       padding: 0px 0px;
        border: solid 1px #aacfe4;
        width: 282px;
-       margin: 2px 2px 2px;
 }
 
 .adminForm label {
-       display: block;
-       font-size: 14px;
        font-weight: bold;
        text-align: right;
        width: 180px;
-       float: left;
-       margin: 4px 2px 2px;
 }
 
 .adminBackupForm div.formelement {

Reply via email to