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 2017/09/25 06:51:33 UTC
[2/4] openmeetings git commit: no jira: trailing spaces are removed
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java
index 53e0654..875c0c7 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java
@@ -18,8 +18,13 @@
*/
package org.apache.openmeetings.service.calendar.caldav.handler;
-import net.fortuna.ical4j.model.Calendar;
-import net.fortuna.ical4j.model.Component;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.httpclient.HttpClient;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.MultiStatusResponse;
@@ -39,12 +44,8 @@ import org.osaf.caldav4j.model.response.CalendarDataProperty;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static org.apache.jackrabbit.webdav.DavServletResponse.SC_OK;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.Component;
/**
* Class used to sync a given list of hrefs and update or add new Appointments, whenever feasible.
@@ -81,7 +82,7 @@ public class MultigetHandler extends AbstractCalendarHandler {
}
}
- public MultigetHandler(List<String> hrefs, String path, OmCalendar calendar, HttpClient client,
+ public MultigetHandler(List<String> hrefs, String path, OmCalendar calendar, HttpClient client,
AppointmentDao appointmentDao, iCalUtils utils)
{
this(hrefs, false, path, calendar, client, appointmentDao, utils);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
index 1e39099..0fc17a8 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java
@@ -39,7 +39,7 @@ import org.w3c.dom.Document;
/**
* Class to work with WebDAV-Sync Method defined in RFC 6578.
- *
+ *
* @see SyncReportInfo for Request Report to be given as argument
*/
public class SyncMethod extends DavMethodBase {
@@ -61,7 +61,7 @@ public class SyncMethod extends DavMethodBase {
/**
* Used to add request header for Depth.
- *
+ *
* @param depth
* Depth of the Request
*/
@@ -71,7 +71,7 @@ public class SyncMethod extends DavMethodBase {
/**
* Set the Depth Header of the Sync Report.
- *
+ *
* @param depth
* Depth of the Request
*/
@@ -103,7 +103,7 @@ public class SyncMethod extends DavMethodBase {
/**
* Adapted from DavMethodBase to handle MultiStatus responses.
- *
+ *
* @return MultiStatus response
* @throws IOException
* @throws DavException
@@ -126,7 +126,7 @@ public class SyncMethod extends DavMethodBase {
/**
* Overridden to process the sync-token. Adapted from DavMethodBase. TODO:
* Fix this override.
- *
+ *
* @see DavMethodBase#processResponseBody(HttpState, HttpConnection)
*/
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
index 7318cfb..119a8eb 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
index 1eb9d8f..d36bc67 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.java
@@ -34,7 +34,7 @@ public class FeedbackTemplate extends AbstractTemplatePanel {
add(new Label("message", message));
add(new ExternalLink("invitation_link", ""));
}
-
+
public static String getEmail(String username, String email, String message) {
return ComponentRenderer.renderComponent(new FeedbackTemplate(username, email, message)).toString();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
index cd17487..da5b37d 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
index 14b0f29..20ec150 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html
index 481c1f6..dbfdea4 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.html
@@ -7,22 +7,21 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
<wicket:child/>
- <wicket:fragment wicket:id="subject"><span wicket:id="prefix"></span> <span wicket:id="title"></span> <span
+ <wicket:fragment wicket:id="subject"><span wicket:id="prefix"></span> <span wicket:id="title"></span> <span
wicket:id="start"></span><span wicket:id="dash"></span><span wicket:id="end"></span></wicket:fragment>
</wicket:extend>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html
index f893304..4f3b0bf 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html
index 8ac9f9d..6c771c3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html
index 8ac9f9d..6c771c3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
index d9052c7..ad612e7 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html
index 8ac9f9d..6c771c3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-util/pom.xml b/openmeetings-util/pom.xml
index 9de4ffc..5e566e8 100644
--- a/openmeetings-util/pom.xml
+++ b/openmeetings-util/pom.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
index 688bb19..598be67 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/DaoHelper.java
@@ -29,11 +29,11 @@ public class DaoHelper {
public static String getSearchQuery(String table, String alias, String search, boolean distinct, boolean filterDeleted, boolean count, String sort, String... fields) {
return getSearchQuery(table, alias, null, search, distinct, filterDeleted, count, null, sort, fields);
}
-
+
public static String getSearchQuery(String table, String alias, String join, String search, boolean filterDeleted, boolean count, String additionalWhere, String sort, String... fields) {
return getSearchQuery(table, alias, join, search, false, filterDeleted, count, additionalWhere, sort, fields);
}
-
+
public static String getSearchQuery(String table, String alias, String join, String search, boolean distinct, boolean filterDeleted, boolean count, String additionalWhere, String sort, String... fields) {
StringBuilder sb = new StringBuilder("SELECT ");
if (count) {
@@ -66,13 +66,13 @@ public class DaoHelper {
}
return sb.toString();
}
-
+
public static StringBuilder getWhereClause(String search, String alias, String... fields) {
StringBuilder sb = new StringBuilder();
getWhereClause(sb, search, alias, fields);
return sb;
}
-
+
public static void getWhereClause(StringBuilder sb, String search, String alias, String... fields) {
if (search != null) {
boolean notEmpty = false;
@@ -89,7 +89,7 @@ public class DaoHelper {
}
StringBuilder placeholder = new StringBuilder();
placeholder.append("%").append(StringUtils.lowerCase(searchItems[i])).append("%");
-
+
sb.append("(");
for (int j = 0; j < fields.length; ++j) {
if (j != 0) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
index 444b1c2..7b766c0 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
@@ -23,7 +23,7 @@ import javax.servlet.ServletContextEvent;
import org.red5.logging.ContextLoggingListener;
public class OMContextListener extends ContextLoggingListener {
-
+
@Override
public void contextDestroyed(ServletContextEvent event) {
super.contextDestroyed(event);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java
index 54b5c14..d468a5b 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/TextRoomMessage.java
@@ -26,7 +26,7 @@ public class TextRoomMessage extends RoomMessage {
super(roomId, userId, type);
this.text = text;
}
-
+
public String getText() {
return text;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java
index f165bb4..e81d34c 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResult.java
@@ -21,15 +21,15 @@ package org.apache.openmeetings.util.process;
/**
* Object created by each conversion step, each conversion step that invokes and
* external tool like ImageMagick is one single ConverterProcessMessage
- *
+ *
* if exitValue equals "-1" then there was an issue.
- *
+ *
* @author sebawagner
*
*/
public class ConverterProcessResult {
public static final Integer ZERO = new Integer(0);
-
+
private String process;
private String command;
private String exception;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java
index 116bdc8..257f31f 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/FileImportError.java
@@ -19,12 +19,11 @@
package org.apache.openmeetings.util.process;
public class FileImportError {
-
private int exitValue = 0;
private String error = "";
private String process = "";
private String command = "";
-
+
public int getExitValue() {
return exitValue;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index e48dd22..5a1634f 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
index 2f100ed..866bfed 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBaseForm.java
@@ -25,9 +25,9 @@ import org.apache.wicket.model.IModel;
/**
* provides basic functionality to insert, update, remove, refresh record in
* admin section
- *
+ *
* @author swagner
- *
+ *
* @param <T>
*/
public abstract class AdminBaseForm<T> extends Form<T> {
@@ -36,7 +36,7 @@ public abstract class AdminBaseForm<T> extends Form<T> {
public AdminBaseForm(String id, IModel<T> object) {
super(id, object);
-
+
savePanel = new AdminSavePanel<T>("buttons", this) {
private static final long serialVersionUID = 1L;
@@ -116,66 +116,66 @@ public abstract class AdminBaseForm<T> extends Form<T> {
}
/**
* invoked when user press save button
- *
+ *
* @param target
* @param form
*/
protected abstract void onSaveSubmit(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when save has error
- *
+ *
* @param target
* @param form
*/
protected abstract void onSaveError(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when new button is pressed
- *
+ *
* @param target
* @param form
*/
protected abstract void onNewSubmit(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked if new has error
- *
+ *
* @param target
* @param form
*/
protected abstract void onNewError(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when refresh button is pressed
- *
+ *
* @param target
* @param form
*/
protected abstract void onRefreshSubmit(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when refresh has error
- *
+ *
* @param target
* @param form
*/
protected abstract void onRefreshError(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when delete button is pressed
- *
+ *
* @param target
* @param form
*/
protected abstract void onDeleteSubmit(AjaxRequestTarget target, Form<?> form);
-
+
/**
* invoked when delete has error
- *
+ *
* @param target
* @param form
*/
protected abstract void onDeleteError(AjaxRequestTarget target, Form<?> form);
-
+
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
index ee12b8a..1c412e1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/SearchableDataView.java
@@ -24,20 +24,20 @@ import org.apache.wicket.markup.repeater.data.DataView;
/**
* Provides {@link SearchableDataProvider}
- *
+ *
* @author swagner
- *
+ *
* @param <T>
*/
public abstract class SearchableDataView<T extends IDataProviderEntity> extends DataView<T> {
private static final long serialVersionUID = 1L;
private SearchableDataProvider<T> dp;
-
+
public SearchableDataView(String id, SearchableDataProvider<T> dp) {
super(id, dp);
this.dp = dp;
}
-
+
@Override
public SearchableDataProvider<T> getDataProvider() {
return dp;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
index 0e1d036..a47e39b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
@@ -44,7 +44,7 @@
<div wicket:id="download" class="btn"><wicket:message key="1066"/></div>
<!-- Perform Upload -->
<div class="fileinput fileinput-new" data-provides="fileinput" style="margin: 0; display: inline-block;">
- <span class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
+ <span class="btn btn-file ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
class="ui-button-text"><wicket:message key="1536"/></span><input class="uploadFileField" wicket:id="fileInput" type="file"/></span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
index 3381830..570b111 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
index 8c3746b..01c73a8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
@@ -7,16 +7,15 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 676a52b..c7817b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 62e98bd..51d806c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 80ab81a..067e2d5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index c0b38c6..b8577e7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 02114c5..8d4766d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index c0a1852..4f95409 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index d277527..479dd95 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -765,13 +765,13 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.nodriver"><![CDATA[Unable to load proper DB driver, please download appropriate jar file, and restart the OM. Instructions: {0}]]></entry>
<entry key="install.wizard.db.step.note"><![CDATA[
<h4>
- <a id="Recommendation_for_production_environment"></a>Empfehlung
+ <a id="Recommendation_for_production_environment"></a>Empfehlung
für Produktivumgebungen<a target="_blank"
href="#Recommendation_for_production_environment"
class="section_anchor"></a>
</h4>
<blockquote>
- Standardmäßig verwendet {0} die integrierte
+ Standardmäßig verwendet {0} die integrierte
{1} Datenbank. In Produktivumgebungen wird jedoch der Einsatz von {2}, {3}, {4}, {5} or {6} empfohlen.
</blockquote>
<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
@@ -843,16 +843,16 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step4.crypt"><![CDATA[Krypto-Typ]]></entry>
<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Krypto-Klasse]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[
- Sie können den voreingestellten Krypto-Typ (welcher der
- PHP-MD5-Funktion entspricht) benutzen, oder Sie geben
+ Sie können den voreingestellten Krypto-Typ (welcher der
+ PHP-MD5-Funktion entspricht) benutzen, oder Sie geben
<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
- ein, um BSD-artige Verschlüsselung zu benutzen. Für
- weitergehende Informationen, auch zum Schreiben einer eigenen
+ ein, um BSD-artige Verschlüsselung zu benutzen. Für
+ weitergehende Informationen, auch zum Schreiben einer eigenen
Krypto-Klasse, siehe <a
href="http://openmeetings.apache.org/CustomCryptMechanism.html"
- target="_blank">Custom Crypt Mechanism</a>. Sie können diesen
- Wert später verändern, ABER vorher erstellte Nutzer und
- Sitzungen könnten anschließend unbenutzbar sein.
+ target="_blank">Custom Crypt Mechanism</a>. Sie können diesen
+ Wert später verändern, ABER vorher erstellte Nutzer und
+ Sitzungen könnten anschließend unbenutzbar sein.
]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Geben Sie den Klassennamen der Krypto-Klasse an. ÄNDERN SIE DIESEN WERT NICHT, WENN SIE SICH NICHT SICHER SIND!]]></entry>
<entry key="install.wizard.params.step4.sip"><![CDATA[red5SIP Konfiguration]]></entry>
@@ -873,7 +873,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<ul>
<li>Installieren Sie <strong>GhostScript</strong> auf dem Server. Weitere
Informationen (Installationsanleitungen etc.) finden Sie unter <a target="_blank"
- href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>.
+ href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>.
In den meisten Linux-Distributionen lässt es sich bequem per Paketmanager
(z.B. apt-get) installieren.
</li>
@@ -882,11 +882,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
</ol>
<br />
- <b> <span style="font-size: 1.2em">Falls Sie weitere Fragen haben oder Support bei Installation und Hosting
+ <b> <span style="font-size: 1.2em">Falls Sie weitere Fragen haben oder Support bei Installation und Hosting
benötigen:</span></b>
<br />
<br />
- <br />
+ <br />
<br />
<b><span style="font-size: 1.2em">Support durch die OpenMeetings-Community:</span></b>
<br />
@@ -898,7 +898,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<b> <span style="font-size: 1.4em">Einige Unternehmen bieten kommerziellen Support
- für Apache OpenMeetings an:</span></b>
+ für Apache OpenMeetings an:</span></b>
<br />
<br />
@@ -961,7 +961,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index f6a5ce6..a952ff9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 2fd860a..b445f1c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -765,7 +765,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.db.step.nodriver"><![CDATA[Incapaz cargar driver apropiado de base de datos, por favor descargue el archivo jar apropiado, y reinicie OM. Instrucciones: {0}]]></entry>
<entry key="install.wizard.db.step.note"><![CDATA[
<h4>
- <a id="Recommendation_for_production_environment"></a>Recomendación
+ <a id="Recommendation_for_production_environment"></a>Recomendación
para medios de producción<a target="_blank"
href="#Recommendation_for_production_environment"
class="section_anchor"></a>
@@ -869,7 +869,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<ul>
<li>Instale <strong>GhostScript</strong> en el servidor, puede tener
más información en <a target="_blank" href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>
- mire en instalación. Las instrucciones para la instalación se encuentran allí,
+ mire en instalación. Las instrucciones para la instalación se encuentran allí,
de todos modos en la mayoría de los sistemas linux puede conseguirlo
via su paquete favorito de administración (apt-get it)
</li>
@@ -882,7 +882,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<br />
-
<b><span style="font-size: 1.2em">Soporte-Comunidad:</span></b>
<br />
<br />
@@ -890,18 +889,17 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
href="http://openmeetings.apache.org/mail-lists.html"
target="_blank">Listas de correo</a></span>
<br />
-
<b> <span style="font-size: 1.4em">Hay algunas compañias
- que tambien ofrecen soporte comercial para Apache OpenMeetings:</span></b>
- <br />
- <br />
- <br />
- <br />
- <span style="font-size: 1.3em"><a
- href="http://openmeetings.apache.org/commercial-support.html"
- target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
- <br />
- ]]></entry>
+ que tambien ofrecen soporte comercial para Apache OpenMeetings:</span></b>
+ <br />
+ <br />
+ <br />
+ <br />
+ <span style="font-size: 1.3em"><a
+ href="http://openmeetings.apache.org/commercial-support.html"
+ target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
+ <br />
+ ]]></entry>
<entry key="invalid.hash"><![CDATA[Invalid hash]]></entry>
<entry key="lbl.cancel"><![CDATA[Cancelar]]></entry>
<entry key="lbl.refresh"><![CDATA[actualizar]]></entry>
@@ -956,7 +954,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index c289105..e444598 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 464d7da..48b9a94 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -957,7 +957,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index f291945..583a217 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -841,11 +841,11 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step4.crypt"><![CDATA[Type de chiffrement]]></entry>
<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Classe de chiffrement]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[
- Vous pouvez utiliser ce chiffrement par défaut qui est équivalent à la fonction MD5 de PHP ou le style de chiffrement BDS en utilisant :
+ Vous pouvez utiliser ce chiffrement par défaut qui est équivalent à la fonction MD5 de PHP ou le style de chiffrement BDS en utilisant :
<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
Pour plus d'information ou pour écrire votre propre chiffrement voir : <a
href="http://openmeetings.apache.org/CustomCryptMechanism.html"
- target="_blank">Custom Crypt Mechanism</a>. Vous pouvez éditer cette valeur plus tard MAIS les utilisateurs créés précédemment pourraient ne plus être utilisables.
+ target="_blank">Custom Crypt Mechanism</a>. Vous pouvez éditer cette valeur plus tard MAIS les utilisateurs créés précédemment pourraient ne plus être utilisables.
]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Indiquez le nom de la classe de chiffrement. NE MODIFIEZ PAS CECI SI VOUS N'ETES PAS SUR !]]></entry>
<entry key="install.wizard.params.step4.sip"><![CDATA[Configuration red5SIP]]></entry>
@@ -864,7 +864,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
</h4>
<ul>
<li>Installez <strong>GhostScript</strong> sur le serveur. Vous trouverez plus d'information sur <a target="_blank"
- href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>.
+ href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>.
Sur la majorité des systèmes linux vous pouvez le trouver via votre gestionnaire de paquets (apt-get).
</li>
</ul>
@@ -948,7 +948,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 84a3c3f..341e912 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index af6d68d..d467155 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -770,7 +770,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
class="section_anchor"></a>
</h4>
<blockquote>
- Az {0} alapértelmezette a beépített {1} adatbázist használja.
+ Az {0} alapértelmezette a beépített {1} adatbázist használja.
További lehetőségként használható a {2}, {3}, {4}, {5} or {6}
</blockquote>
<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
@@ -841,12 +841,12 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step4.crypt"><![CDATA[Titkosítás típusa]]></entry>
<entry key="install.wizard.params.step4.cryptClassName"><![CDATA[Titkosító osztály]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.text"><![CDATA[
- Az alapértelmezetten beállított kódolás megfelel a
+ Az alapértelmezetten beállított kódolás megfelel a
PHP-MD5 kódolónak, vagy BSD-Stílusú kódoláshoz használja a:<b>org.apache.openmeetings.utils.crypt.MD5CryptImplementation</b>
további kódolási/titkosítási eljárásokról itt olvashat bővebben: <a
href="http://openmeetings.apache.org/CustomCryptMechanism.html"
target="_blank">Egyedi titkosítási mechanizmus </a> Ha a későbbiekben módosítja ezt a beállítást,
- az előzőleg létrehozott adatok elérhetetlenné válnak, ami működési hibát okozhat a régebbi munkamenetek elérésében
+ az előzőleg létrehozott adatok elérhetetlenné válnak, ami működési hibát okozhat a régebbi munkamenetek elérésében
(pl. jelszó, hash kezelés).
]]></entry>
<entry key="install.wizard.params.step4.cryptClassName.title"><![CDATA[Adja meg a titkosító osztály nevét (class). NE VÁLTOZTASSA, HA NEM BIZTOS BENNE!]]></entry>
@@ -872,7 +872,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
</ul>
</li>
</ol>
-
+
<b><span style="font-size: 1.2em">Közösségi-támogatás:</span></b>
<br />
<br />
@@ -882,10 +882,9 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<br />
<br />
- <b> <span style="font-size: 1.4em">Néhány cég, akik üzleti támogatást nyújthatnak Apache OpenMeetings:</span></b>
+ <b> <span style="font-size: 1.4em">Néhány cég, akik üzleti támogatást nyújthatnak Apache OpenMeetings:</span></b>
<br />
<br />
-
<span style="font-size: 1.3em"><a
href="http://openmeetings.apache.org/commercial-support.html"
target="_blank">http://openmeetings.apache.org/commercial-support.html</a></span>
@@ -945,7 +944,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index fc47921..6981ca8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index c9009aa..d13507b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -740,7 +740,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.room.public.presentation"><![CDATA[Public Presentation Room]]></entry>
<entry key="install.room.public.video.only"><![CDATA[Stanza Solo Video Pubblica]]></entry>
<entry key="install.room.public.video.wb"><![CDATA[Stanza Video e Lavagna Pubblica]]></entry>
- <entry key="install.wizard.congrats.commercial"><![CDATA[Ci sono alcune aziende
+ <entry key="install.wizard.congrats.commercial"><![CDATA[Ci sono alcune aziende
che offrono anche il supporto commerciale per Apache OpenMeetings:]]></entry>
<entry key="install.wizard.congrats.enter"><![CDATA[Accedi all'applicazione]]></entry>
<entry key="install.wizard.congrats.mail"><![CDATA[Mailing list]]></entry>
@@ -811,7 +811,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step2.mailReferer"><![CDATA[EMail Sistema]]></entry>
<entry key="install.wizard.params.step2.mailReferer.title"><![CDATA[Nominativo EMail Sistema]]></entry>
<entry key="install.wizard.params.step2.mailUseTls"><![CDATA[Abilita TLS nell'autenticazione SMTP]]></entry>
- <entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Imposta email dell'invitante
+ <entry key="install.wizard.params.step2.replyToOrganizer"><![CDATA[Imposta email dell'invitante
come ReplyTo negli inviti email]]></entry>
<entry key="install.wizard.params.step2.sendEmailAtRegister"><![CDATA[Invia Email ai nuovi utenti registrati]]></entry>
<entry key="install.wizard.params.step2.sendEmailWithVerficationCode"><![CDATA[I nuovi utenti devono verificre la loro Email]]></entry>
@@ -957,7 +957,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Salvato con successo]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index f2260d3..2bef2dc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index f995589..c8b3e66 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 214505f..0c9fd1a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index b99d38a..7be1af3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index d1d02da..c68d390 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index fe6557f..c9a50b0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index a353efa..becf042 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -771,7 +771,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
class="section_anchor"></a>
</h4>
<blockquote>
- По умолчанию {0} использует интегрированную базу данных {1}. В
+ По умолчанию {0} использует интегрированную базу данных {1}. В
продакшине Вы должны задуматься об использовании таких баз, как {2}, {3}, {4}, {5} or {6}
</blockquote>
<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
@@ -872,7 +872,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
информацию Вы можете посмотреть на сайте <a target="_blank"
href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>
Инструкции по установке Вы можете
- найти здесь, однако в большинстве систем Линукс Вы можете установить его через Ваш
+ найти здесь, однако в большинстве систем Линукс Вы можете установить его через Ваш
менеджер пакетов (apt-get it).
</li>
</ul>
@@ -881,7 +881,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<b> <span style="font-size: 1.2em">Если у Вас остались
вопросы или Вам требуется поддержка по установке или хостингу:</span></b>
-
+
<br />
<br />
<b><span style="font-size: 1.2em">Поддержка сообщества:</span></b>
@@ -957,7 +957,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Успешно сохранено]]></entry>
<entry key="sound.enable"><![CDATA[Включить звук]]></entry>
<entry key="sound.mute"><![CDATA[Выключить звук]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Ваша {0} запись(и) будут автоматически удалены
+ <entry key="template.recording.expiring.body"><![CDATA[Ваша {0} запись(и) будут автоматически удалены
в течении {1} дней. Пожалуйста скачайте запись если она Вам нужна.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
С уважением,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 19922c9..2d7832d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index a72e65f..98c4e7e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 6de7546..bce4c18 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index f22a76f..e8bc2f5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -956,7 +956,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 3fef543..23a0eaa 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -771,7 +771,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
class="section_anchor"></a>
</h4>
<blockquote>
- По умолчанию {0} использует интегрированную базу данных {1}. В
+ По умолчанию {0} использует интегрированную базу данных {1}. В
продакшине Вы должны задуматься об использовании таких баз, как {2}, {3}, {4}, {5} or {6}
</blockquote>
<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px;padding: 0 .7em;">
@@ -872,7 +872,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
информацию Вы можете посмотреть на сайте <a target="_blank"
href="http://pages.cs.wisc.edu/%7Eghost/" rel="nofollow">http://pages.cs.wisc.edu/~ghost/</a>
Инструкции по установке Вы можете
- найти здесь, однако в большинстве систем Линукс Вы можете установить его через Ваш
+ найти здесь, однако в большинстве систем Линукс Вы можете установить его через Ваш
менеджер пакетов (apt-get it).
</li>
<li>Установите <strong>SWFTools</strong> на Ваш сервер, более подробную информацию
@@ -882,7 +882,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<br />
<b> <span style="font-size: 1.2em">Если у Вас остались
вопросы или Вам требуется поддержка по установке или хостингу:</span></b>
-
+
<br />
<br />
<b><span style="font-size: 1.2em">Поддержка сообщества:</span></b>
@@ -957,7 +957,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/aa8e0d58/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 3552dde..1a1dd11 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -946,7 +946,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="save.success"><![CDATA[Saved successfully]]></entry>
<entry key="sound.enable"><![CDATA[Enable sound]]></entry>
<entry key="sound.mute"><![CDATA[Mute sound]]></entry>
- <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
+ <entry key="template.recording.expiring.body"><![CDATA[Your recent {0} recording will be automatically deleted
in {1} days. If you would like to save this recording, please download it before then.]]></entry>
<entry key="template.recording.expiring.footer"><![CDATA[
Regards,<br/>