no jira: more generic error message should be displayed on unsuccessful login
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/c9204ee8 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/c9204ee8 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/c9204ee8 Branch: refs/heads/3.3.x Commit: c9204ee8648eef120efd93bbd608ec0b7638882f Parents: 62460a2 Author: Maxim Solodovnik <[email protected]> Authored: Sat May 20 12:56:39 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat May 20 12:56:39 2017 +0700 ---------------------------------------------------------------------- .../core/ldap/LdapLoginManagement.java | 10 +- .../openmeetings/core/remote/ErrorService.java | 7 +- .../openmeetings/core/remote/MainService.java | 39 - .../core/remote/RecordingService.java | 3 +- .../db/dao/basic/ConfigurationDao.java | 3 +- .../openmeetings/db/dao/basic/ErrorDao.java | 46 +- .../openmeetings/db/dao/user/IUserManager.java | 10 +- .../openmeetings/db/dao/user/UserDao.java | 16 +- .../installation/ImportInitvalues.java | 2 +- .../service/mail/template/OmTextLabel.java | 1 + .../subject/RecordingExpiringTemplate.java | 2 +- .../openmeetings/service/user/UserManager.java | 8 +- .../apache/openmeetings/util/OmException.java | 4 +- .../openmeetings/util/crypt/CryptProvider.java | 23 +- .../web/admin/backup/BackupPanel.java | 3 +- .../web/admin/email/EmailPanel.java | 2 +- .../web/admin/oauth/OAuthPanel.java | 4 +- .../web/admin/rooms/RoomsPanel.java | 4 +- .../web/app/Application.properties.xml | 12 +- .../web/app/Application_ar.properties.xml | 6 +- .../web/app/Application_bg.properties.xml | 6 +- .../web/app/Application_ca.properties.xml | 6 +- .../web/app/Application_cs.properties.xml | 6 +- .../web/app/Application_da.properties.xml | 6 +- .../web/app/Application_de.properties.xml | 6 +- .../web/app/Application_el.properties.xml | 6 +- .../web/app/Application_es.properties.xml | 6 +- .../web/app/Application_fa.properties.xml | 6 +- .../web/app/Application_fi.properties.xml | 6 +- .../web/app/Application_fr.properties.xml | 6 +- .../web/app/Application_gl.properties.xml | 6 +- .../web/app/Application_hu.properties.xml | 6 +- .../web/app/Application_id.properties.xml | 6 +- .../web/app/Application_it.properties.xml | 6 +- .../web/app/Application_ja.properties.xml | 6 +- .../web/app/Application_ko.properties.xml | 6 +- .../web/app/Application_nl.properties.xml | 6 +- .../web/app/Application_pl.properties.xml | 6 +- .../web/app/Application_pt.properties.xml | 6 +- .../web/app/Application_pt_BR.properties.xml | 6 +- .../web/app/Application_ru.properties.xml | 8 +- .../web/app/Application_sk.properties.xml | 6 +- .../web/app/Application_sv.properties.xml | 6 +- .../web/app/Application_th.properties.xml | 6 +- .../web/app/Application_tr.properties.xml | 6 +- .../web/app/Application_uk.properties.xml | 8 +- .../web/app/Application_zh_CN.properties.xml | 6 +- .../web/app/Application_zh_TW.properties.xml | 6 +- .../apache/openmeetings/web/app/WebSession.java | 64 +- .../openmeetings/web/pages/ResetPage.java | 20 +- .../web/pages/auth/ForgetPasswordDialog.java | 43 +- .../web/pages/auth/RegisterDialog.html | 26 +- .../web/pages/auth/RegisterDialog.java | 51 +- .../web/pages/auth/SignInDialog.java | 22 +- .../openmeetings/web/pages/auth/SignInPage.java | 13 +- .../src/main/webapp/languages/errorvalues.xml | 824 +++++++++---------- .../openmeetings/test/AbstractWicketTester.java | 17 +- .../test/backup/TestOldBackups.java | 10 +- 58 files changed, 669 insertions(+), 798 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java index 9192257..c9c0671 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java @@ -212,7 +212,7 @@ public class LdapLoginManagement { } if (userDn == null) { log.error("NONE users found in LDAP"); - throw new OmException(-11L); + throw new OmException(-10L); } w.conn.bind(userDn, passwd); } @@ -232,7 +232,7 @@ public class LdapLoginManagement { log.debug("getByLogin:: authenticated ? {}, login = '{}', domain = {}, user = {}", authenticated, login, domainId, u); if (u == null && Provisionning.AUTOCREATE != w.options.prov) { log.error("User not found in OM DB and Provisionning.AUTOCREATE was not set"); - throw new OmException(-11L); + throw new OmException(-10L); } if (authenticated && entry == null) { if (w.options.useAdminForAttrs) { @@ -255,7 +255,7 @@ public class LdapLoginManagement { } } catch (LdapAuthenticationException ae) { log.error("Not authenticated.", ae); - throw new OmException(-11L); + throw new OmException(-10L); } catch (OmException e) { throw e; } catch (Exception e) { @@ -296,7 +296,7 @@ public class LdapLoginManagement { } } catch (LdapAuthenticationException ae) { log.error("Not authenticated.", ae); - throw new OmException(-11L); + throw new OmException(-10L); } catch (OmException e) { throw e; } catch (Exception e) { @@ -334,7 +334,7 @@ public class LdapLoginManagement { public User getUser(Entry entry, User u) throws LdapException, CursorException, OmException, IOException { if (entry == null) { log.error("LDAP entry is null, search or lookup by Dn failed"); - throw new OmException(-11L); + throw new OmException(-10L); } if (u == null) { u = userDao.getNewUserInstance(null); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java index 7a5f3f1..8a603f6 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ErrorService.java @@ -29,9 +29,9 @@ import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; /** - * + * * @author swagner - * + * */ public class ErrorService { private static final Logger log = Red5LoggerFactory.getLogger(ErrorService.class, webAppRootKey); @@ -45,7 +45,7 @@ public class ErrorService { * Gets an Error-Object by its id TODO: add error-code-handlers -20 * duplicate FileName -21 FileName too short (length = 0) and make the * persistent in the DataBase - * + * * @param SID * @param errorid * @return - ErrorResult object with the id given @@ -66,5 +66,4 @@ public class ErrorService { } return null; } - } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java index b16733d..93a2dc9 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java @@ -30,7 +30,6 @@ import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter; import org.apache.openmeetings.core.remote.util.SessionVariablesUtil; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; -import org.apache.openmeetings.db.dao.log.ConferenceLogDao; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.server.ISessionManager; import org.apache.openmeetings.db.dao.server.SessiondataDao; @@ -39,7 +38,6 @@ import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.basic.Configuration; import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.MeetingMember; -import org.apache.openmeetings.db.entity.log.ConferenceLog; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.RoomGroup; @@ -77,8 +75,6 @@ public class MainService implements IPendingServiceCallback { @Autowired private IUserManager userManager; @Autowired - private ConferenceLogDao conferenceLogDao; - @Autowired private UserDao userDao; @Autowired private RoomDao roomDao; @@ -207,41 +203,6 @@ public class MainService implements IPendingServiceCallback { return null; } - /** - * Function is called if the user loggs in via a secureHash and sets the - * param showNickNameDialog in the Object SOAPLogin to true the user gets - * displayed an additional dialog to enter his nickname - * - * @param firstname - * @param lastname - * @param email - * @return - 1 in case of success, -1 otherwise - */ - public Long setUserNickName(String firstname, String lastname, String email) { - try { - IConnection current = Red5.getConnectionLocal(); - String streamId = current.getClient().getId(); - Client currentClient = sessionManager.getClientByStreamId(streamId, null); - - currentClient.setFirstname(firstname); - currentClient.setLastname(lastname); - currentClient.setEmail(email); - - // Log the User - conferenceLogDao.add( - ConferenceLog.Type.nicknameEnter, currentClient.getUserId(), streamId, - null, currentClient.getUserip(), currentClient.getScope()); - - sessionManager.updateClientByStreamId(streamId, currentClient, false, null); - scopeApplicationAdapter.sendMessageToCurrentScope("nickNameSet", currentClient, true); - - return 1L; - } catch (Exception err) { - log.error("[setUserNickName] ", err); - } - return new Long(-1); - } - public List<Configuration> getGeneralOptions() { try { return configurationDao.get("exclusive.audio.keycode", CONFIG_SIP_ENABLED, CONFIG_MAX_UPLOAD_SIZE_KEY, "mute.keycode", CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java index eae5bc0..0b17639 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java @@ -307,7 +307,7 @@ public class RecordingService implements IPendingServiceCallback { } } - public Long stopRecordAndSave(IScope scope, Client client, Long storedRecordingId) { + public void stopRecordAndSave(IScope scope, Client client, Long storedRecordingId) { try { log.debug("stopRecordAndSave " + client.getUsername() + "," + client.getUserip()); WebSocketHelper.sendRoom(new TextRoomMessage(client.getRoomId(), client.getUserId(), RoomMessage.Type.recordingStoped, client.getPublicSID())); @@ -370,7 +370,6 @@ public class RecordingService implements IPendingServiceCallback { } catch (Exception err) { log.error("[-- stopRecordAndSave --]", err); } - return new Long(-1); } public Client checkLzRecording() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java index fa921ec..72cfc6e 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java @@ -49,6 +49,7 @@ import org.apache.openmeetings.db.dao.IDataProviderDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.basic.Configuration; import org.apache.openmeetings.util.DaoHelper; +import org.apache.openmeetings.util.crypt.CryptProvider; import org.apache.wicket.Application; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -238,6 +239,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> { switch (key) { case CONFIG_CRYPT_KEY: configKeyCryptClassName = value; + CryptProvider.reset(); break; case "show.whiteboard.draw.status": whiteboardDrawStatus = Boolean.valueOf("1".equals(value)); @@ -293,7 +295,6 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> { configKeyCryptClassName = cryptClass; } } - return configKeyCryptClassName; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java index 1e4e83d..a57491f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ErrorDao.java @@ -27,10 +27,12 @@ import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; +import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.db.entity.basic.ErrorValue; import org.apache.openmeetings.db.entity.basic.ErrorValue.Type; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @Transactional @@ -40,7 +42,10 @@ public class ErrorDao { @PersistenceContext private EntityManager em; - public Long addErrorValues(Long id, Type type, Long labelId) { + @Autowired + private LabelDao labelDao; + + public Long add(Long id, Type type, Long labelId) { try { ErrorValue eValue = new ErrorValue(); eValue.setId(id); @@ -56,34 +61,6 @@ public class ErrorDao { return null; } - public Long getErrorValueById(Type type, Long labelId) { - try { - ErrorValue eValue = new ErrorValue(); - eValue.setType(type); - eValue.setInserted(new Date()); - eValue.setLabelId(labelId); - eValue = em.merge(eValue); - return eValue.getId(); - } catch (Exception ex2) { - log.error("[getErrorValueById]: ", ex2); - } - return null; - } - - public Long updateErrorValues(Type type, Long labelId) { - try { - ErrorValue eValue = new ErrorValue(); - eValue.setType(type); - eValue.setInserted(new Date()); - eValue.setLabelId(labelId); - eValue = em.merge(eValue); - return eValue.getId(); - } catch (Exception ex2) { - log.error("[addErrorType]: ", ex2); - } - return null; - } - public ErrorValue get(Long id) { try { TypedQuery<ErrorValue> query = em.createNamedQuery("getErrorValueById", ErrorValue.class); @@ -99,4 +76,15 @@ public class ErrorDao { } return null; } + + public String getMessage(Long id, long langId) { + if (id == null) { + return null; + } + ErrorValue ev = get(-1 * id.longValue()); + if (ev == null) { + return null; + } + return labelDao.getString(ev.getLabelId(), langId); + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java index 6b2d748..9a6e641 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java @@ -33,13 +33,13 @@ import org.apache.openmeetings.db.entity.user.Userdata; //FIXME HACK to bypass cross project compilation public interface IUserManager { - + Long registerUser(String login, String Userpass, String lastname, String firstname, String email, Date age, String street, String additionalname, String fax, String zip, String country, String town, long languageId, String phone, boolean sendSMS, boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation); - + Long registerUserInit(Set<Right> rights, String login, String password, String lastname, String firstname, String email, Date age, String street, String additionalname, String fax, String zip, String country, @@ -54,10 +54,8 @@ public interface IUserManager { /** TODO FIXME seems to be unused **/ boolean kickUserByStreamId(String SID, Long roomId); - + boolean kickUserByPublicSID(String SID, String publicSID); - - Long logout(String SID, long userId); - + List<Userdata> getUserdataDashBoard(Long userId); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java index 52abda8..23eb445 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java @@ -416,9 +416,9 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { return u; } - public Object getUserByHash(String hash) { - if (hash.length() == 0) { - return new Long(-5); + public User getUserByHash(String hash) { + if (Strings.isEmpty(hash)) { + return null; } User us = null; try { @@ -430,11 +430,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { } catch (Exception e) { log.error("[getUserByHash]", e); } - if (us != null) { - return us; - } else { - return new Long(-5); - } + return us; } /** @@ -627,13 +623,13 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { if (users.size() == 0) { log.debug("No users was found: {}", userOrEmail); - throw new OmException(-10L); + return null; } User u = users.get(0); if (!verifyPassword(u.getId(), userpass)) { log.debug("Password does not match: {}", u); - throw new OmException(-11L); + return null; } // Check if activated if (!AuthLevelUtil.hasLoginLevel(u.getRights())) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java index 4b13cec..13b1c4c 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java @@ -197,7 +197,7 @@ public class ImportInitvalues { } } - errorDao.addErrorValues(errorvalueId, type, labelId); + errorDao.add(errorvalueId, type, labelId); } log.debug("ErrorMappings ADDED"); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java index fd2da50..7dbbff0 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java @@ -35,6 +35,7 @@ public class OmTextLabel extends Label { public OmTextLabel(String id, String label) { this(id, Model.of(label)); + setEscapeModelStrings(false); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java index 6658770..7dbba8d 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java @@ -54,7 +54,7 @@ public class RecordingExpiringTemplate extends AbstractSubjectEmailTemplate { final String app = getBean(ConfigurationDao.class).getAppName(); add(new Label("greetings", getString("template.recording.expiring.greetings", locale, u.getFirstname()))); add(new Label("body", getString("template.recording.expiring.body", locale, app, "" + remainingDays))); - add(new Label("footer", getString("template.recording.expiring.footer", locale, app))); + add(new Label("footer", getString("template.recording.expiring.footer", locale, app)).setEscapeModelStrings(false)); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java index 880f370..000dc60 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java @@ -161,12 +161,6 @@ public class UserManager implements IUserManager { } @Override - public Long logout(String SID, long userId) { - sessionDao.updateUser(SID, null); - return -12L; - } - - @Override public List<Userdata> getUserdataDashBoard(Long userId) { if (userId != null && userId.longValue() > 0) { try { @@ -404,6 +398,8 @@ public class UserManager implements IUserManager { return -17L; } } + } else { + return -13L; } return -1L; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java index 9f9528f..5db53bf 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmException.java @@ -21,11 +21,11 @@ package org.apache.openmeetings.util; public class OmException extends Exception { private static final long serialVersionUID = 1L; private Long code; - + public OmException(String msg) { super(msg); } - + public OmException(long code) { this.code = Long.valueOf(code); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java index 60dd8f9..dce6b11 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java @@ -26,15 +26,26 @@ import org.slf4j.Logger; public class CryptProvider { private static final Logger log = Red5LoggerFactory.getLogger(CryptProvider.class, webAppRootKey); + private static ICrypt crypt; public static ICrypt get() { - try { - log.debug("getInstanceOfCrypt:: configKeyCryptClassName: " + configKeyCryptClassName); + if (crypt == null) { + synchronized (CryptProvider.class) { + if (crypt == null) { + try { + log.debug("getInstanceOfCrypt:: configKeyCryptClassName: " + configKeyCryptClassName); - return configKeyCryptClassName == null ? null : (ICrypt) Class.forName(configKeyCryptClassName).newInstance(); - } catch (Exception err) { - log.error("[getInstanceOfCrypt]", err); + crypt = configKeyCryptClassName == null ? null : (ICrypt) Class.forName(configKeyCryptClassName).newInstance(); + } catch (Exception err) { + log.error("[getInstanceOfCrypt]", err); + } + } + } } - return null; + return crypt; + } + + public static synchronized void reset() { + crypt = null; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java index 758890f..9aee9b0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java @@ -63,8 +63,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; */ public class BackupPanel extends AdminPanel { private static final Logger log = Red5LoggerFactory.getLogger(BackupPanel.class, webAppRootKey); - - private static final long serialVersionUID = -1L; + private static final long serialVersionUID = 1L; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java index 7b3f98f..8f9f00f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java @@ -66,7 +66,7 @@ public class EmailPanel extends AdminPanel { }; add(list.add(dataView).setOutputMarkupId(true)); final PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) { - private static final long serialVersionUID = -1L; + private static final long serialVersionUID = 1L; @Override protected void onEvent(AjaxRequestTarget target) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java index c5a4540..abda45a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java @@ -34,7 +34,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; public class OAuthPanel extends AdminPanel { - private static final long serialVersionUID = -1L; + private static final long serialVersionUID = 1L; final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); private OAuthForm form; @@ -68,7 +68,7 @@ public class OAuthPanel extends AdminPanel { add(listContainer.add(dataView).setOutputMarkupId(true)); PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) { - private static final long serialVersionUID = -1L; + private static final long serialVersionUID = 1L; @Override protected void onEvent(AjaxRequestTarget target) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java index 761b34e..773b7bb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java @@ -38,7 +38,7 @@ import org.apache.wicket.markup.repeater.Item; @AuthorizeInstantiation({"Admin", "GroupAdmin"}) public class RoomsPanel extends AdminPanel { - private static final long serialVersionUID = -1L; + private static final long serialVersionUID = 1L; final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer"); private RoomForm form; @@ -72,7 +72,7 @@ public class RoomsPanel extends AdminPanel { add(listContainer.add(dataView).setOutputMarkupId(true)); PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) { - private static final long serialVersionUID = -1L; + private static final long serialVersionUID = 1L; @Override protected void onEvent(AjaxRequestTarget target) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 0d4e044..422a436 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 @@ -7,9 +7,9 @@ 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 @@ -120,8 +120,8 @@ <entry key="100">Ellipse</entry> <entry key="101">Close</entry> <entry key="102">input data error</entry> - <entry key="103">Password and or login is too short</entry> - <entry key="104">Password and or login is too short</entry> + <entry key="103">Password and/or login is too short</entry> + <entry key="104">Login is too short</entry> <entry key="105">The username is already used</entry> <entry key="106">The mail address is already registered</entry> <entry key="107">System error please contact the administrator</entry> @@ -336,7 +336,7 @@ <entry key="318">No such email address was found. Make sure you entered the same email address you used to create your account.</entry> <entry key="319">Please enter either an email address or a user name</entry> <entry key="320">There is no user connected to this username</entry> - <entry key="321">The email containing a special link has been sent to your email address</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">No user found</entry> <entry key="325">Reset your password</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Password set. You can now login.</entry> <entry key="333">OK</entry> <entry key="334">Unknown error. Please report this to the administrator.</entry> - <entry key="335">Username not found</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Invalid password</entry> <entry key="337">Successfully logged out</entry> <entry key="338">Registration disabled</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 8371f2c..2377125 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 @@ -121,7 +121,7 @@ <entry key="101">ÙØ«ÙÙ</entry> <entry key="102">خطأ Ù٠اÙبÙاÙات اÙ٠دخÙÙ</entry> <entry key="103">اس٠اÙ٠ستخد٠Ùجب ا٠تÙÙ٠عÙ٠اÙØ£ÙÙ 4 اØرÙ</entry> - <entry key="104">Userpass Ùجب أ٠تÙÙ٠عÙ٠اÙØ£ÙÙ 4 اØرÙ</entry> + <entry key="104">Login is too short</entry> <entry key="105">اس٠اÙ٠ستخد٠٠أخÙØ° Ù Ù ÙبÙ</entry> <entry key="106">اÙبرÙد اÙاÙÙترÙÙÙ Ù٠٠ا سب٠تسجÙÙÙ</entry> <entry key="107">خطأ Ù٠اÙÙظا٠اÙرجاء اÙاتصا٠٠ÙظÙÙ Ø© اÙ٠شرÙÙÙ</entry> @@ -336,7 +336,7 @@ <entry key="318">٠ستخد٠ÙÙ</entry> <entry key="319">إستطÙاعات</entry> <entry key="320">Ùذا اÙإس٠Ùا ÙعÙد Ø¥Ù٠أ٠٠ستخد٠</entry> - <entry key="321">ÙÙد ت٠إرسا٠برÙد Ùتض٠٠رابط خاص Ø¥Ù٠برÙد٠اÙØ¥ÙÙترÙÙÙØ Ø§Ùرجاء تÙØص صÙدÙ٠اÙبرÙد. إذا Ù٠تØص٠بعد عÙ٠برÙد Ø¥ÙÙترÙÙÙØ Ø§Ùرجاء تعدÙ٠إعدادات اÙبرÙد اÙ٠زعج Ù Ù٠بإعادة إرسا٠اÙبرÙد اÙØ¥ÙÙترÙÙ٠اÙخاص باÙتأÙÙد.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">٠زÙج غÙر صاÙØ. ÙÙس ÙÙا٠أ٠٠ستخد٠.</entry> <entry key="325">إستعادة ÙÙÙ Ø© اÙ٠رÙر</entry> <entry key="326">تسجÙ٠اÙدخÙÙ</entry> @@ -348,7 +348,7 @@ <entry key="332">ت٠تسجÙÙ ÙÙÙ Ø© اÙ٠رÙر. ÙÙ ÙÙ٠اÙآ٠تسجÙ٠اÙدخÙÙ</entry> <entry key="333">OK</entry> <entry key="334">خطأ غÙر ٠عرÙÙ. اÙرجاء إبÙاغ ÙرÙ٠اÙخد٠ة</entry> - <entry key="335">إس٠اÙ٠ستخد٠غÙر Ù ÙجÙد</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">ÙÙÙ Ø© ٠رÙر غÙر صØÙØØ©</entry> <entry key="337">ت٠تسجÙ٠اÙخرÙج بÙجاØ</entry> <entry key="338">ت٠إÙغاء اÙتسجÙ٠اÙسابÙ.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 5e1aae0..2c4551a 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 @@ -121,7 +121,7 @@ <entry key="101">заÑваÑÑне</entry> <entry key="102">гÑеÑка вÑв Ð²Ñ Ð¾Ð´Ð½Ð¸Ñе данни</entry> <entry key="103">4 или повеÑе знака; големиÑе бÑкви Ð¸Ð¼Ð°Ñ Ð·Ð½Ð°Ñение</entry> - <entry key="104">паÑолаÑа ÑÑÑбва да е поне 4 знака</entry> + <entry key="104">Login is too short</entry> <entry key="105">поÑÑебиÑелÑкоÑо име е заеÑо</entry> <entry key="106">E-mail адÑеÑÑÑ Ðµ заеÑ</entry> <entry key="107">ÐÑеÑка в ÑиÑÑемаÑа, поÑÑÑÑеÑе ÑиÑÑÐµÐ¼Ð½Ð¸Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑаÑоÑ.</entry> @@ -336,7 +336,7 @@ <entry key="318">Ðе е намеÑен ÑакÑв e-mail.</entry> <entry key="319">ÐолÑ, вÑведеÑе E-mail или поÑÑебиÑелÑко име.</entry> <entry key="320">Ðе е намеÑено Ñакова поÑÑебиÑелÑко име.</entry> - <entry key="321">ÐзпÑаÑен е e-mail, ÑÑдÑÑÐ¶Ð°Ñ Ð»Ð¸Ð½Ðº за нова паÑола.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Ðе е намеÑен ÑакÑв поÑÑебиÑел.</entry> <entry key="325">Ðова паÑола</entry> <entry key="326">ÐоÑÑебиÑелÑко име</entry> @@ -348,7 +348,7 @@ <entry key="332">ÐаÑолаÑа е наÑÑÑоена, веÑе може да влезеÑе в ÑиÑÑемаÑа.</entry> <entry key="333">ÐÐ</entry> <entry key="334">ÐÑеÑка. ÐокладвайÑе за бÑг!</entry> - <entry key="335">ÐоÑÑебиÑелÑкоÑо име не е намеÑено.</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Ðевалидна паÑола</entry> <entry key="337">УÑпеÑен Ð¸Ð·Ñ Ð¾Ð´ Ð¾Ñ ÑиÑÑемаÑа</entry> <entry key="338">ÐабÑанена е ÑегиÑÑÑаÑиÑÑа на нови поÑÑебиÑели.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 d5df80d..635858f 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 @@ -121,7 +121,7 @@ <entry key="101">tancar</entry> <entry key="102">error en la introducció de dades</entry> <entry key="103">el nom d'usuari ha de contenir almenys 4 carà cters</entry> - <entry key="104">la clau d'usuari ha de contenir almenys 4 carà cters</entry> + <entry key="104">Login is too short</entry> <entry key="105">Aquest nombre d'usuari ja existeix</entry> <entry key="106">Aquest email ja està registrat</entry> <entry key="107">Error, per favor contacti amb l'administrador del sistema</entry> @@ -336,7 +336,7 @@ <entry key="318">Usuaris</entry> <entry key="319">Enquestes</entry> <entry key="320">No hi ha ningú connectat amb aquest nom d'usuari</entry> - <entry key="321">El email conté un enllaç especial que ha estat enviat al seu correu. Si no apareix aquest correu revisi la configuració de filtres de spam del seu servidor i reenvée aquest correu novament.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">No es va trobar a l'usuari (mètode de generació de claus incorrecte).</entry> <entry key="325">Generar contrasenya</entry> <entry key="326">Entrar</entry> @@ -348,7 +348,7 @@ <entry key="332">La contrasenya ha estat canviada, ara pot iniciar sessió.</entry> <entry key="333">OK</entry> <entry key="334">Error desconegut. Enviï aquesta informació a l'administrador del sistema.</entry> - <entry key="335">No es va trobar a l'usuari</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Contrasenya incorrecta</entry> <entry key="337">Ha sortit del sistema</entry> <entry key="338">Es troba deshabilitada l'opció de registre.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 c4ee81d..8f367e0 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 @@ -121,7 +121,7 @@ <entry key="101">zavÅi</entry> <entry key="102">chyba vstupnÃch dat</entry> <entry key="103">4 nebo vÃce znaků; záležà na velkých pÃsmenkách!</entry> - <entry key="104">heslo musà mÃt minimálnÄ 4 znaky</entry> + <entry key="104">Login is too short</entry> <entry key="105">Uživatel již existuje</entry> <entry key="106">Email je již registrován</entry> <entry key="107">Systémová chyba, kontaktujte správce sÃtÄ!</entry> @@ -336,7 +336,7 @@ <entry key="318">Emailová adresa nenalezena. PoužÃjte stejnou adresu jako pÅi zakládánà uživatelského úÄtu.</entry> <entry key="319">Zadejte prosÃm mail, nebo uživatelské jméno</entry> <entry key="320">Takový uživatelský úÄet neexistuje</entry> - <entry key="321">Email obsahuje speciálnà odkaz, skontrolujte VaÅ¡i schránku. Pokud jste mail neobdrželi, skontrolujte nastavenà antispamového filtru a poÅ¡lete mail znovu.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Å patný Hash. Uživatel nenalezen.</entry> <entry key="325">Reset VaÅ¡eho hesla</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Heslo nastaveno. Můžete se pÅihlásit.</entry> <entry key="333">OK</entry> <entry key="334">Neznámá chyba. Nahlaste ji servisnÃmu týmu.</entry> - <entry key="335">Uživatelský úÄet nenalezen</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Å patné heslo</entry> <entry key="337">Byli jste vpoÅádku odhlášeni</entry> <entry key="338">Registrace uživatelů zakázána.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 3ec06f0..e518770 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 @@ -121,7 +121,7 @@ <entry key="101">Luk</entry> <entry key="102">Forkerte data angivet</entry> <entry key="103">Brugernavnet skal indeholde mindst 4 tegn</entry> - <entry key="104">Adgangskoden skal indeholde mindst 4 tegn</entry> + <entry key="104">Login is too short</entry> <entry key="105">Brugernavnet anvendes i forvejen</entry> <entry key="106">Emailadressen anvendes i forvejen</entry> <entry key="107">Systemfejl, kontakt systemadministrator</entry> @@ -336,7 +336,7 @@ <entry key="318">Brugere</entry> <entry key="319">Indsæt venligst emailadresse eller brugernavn</entry> <entry key="320">Ingen bruger er forbundet med dette brugernavn</entry> - <entry key="321">Emailen med det specielle link er blevet sendt til din emailadresse. Kontroller venligst din indbakke. Hvis du ikke har modtaget en email, bedes du kontrollere dint SPAM-filter og genfremsende emailen fra systemet.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Forkert HASH. Ingen bruger fundet.</entry> <entry key="325">Nulstil din adgangskode</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Adgangskode valgt. Du kan logge ind nu.</entry> <entry key="333">OK</entry> <entry key="334">Ukendt fejl. Rapporter venligst til dine support muligheder.</entry> - <entry key="335">Brugernavnet blev ikke fundet.</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Ugyldig adgangskode.</entry> <entry key="337">Du er nu logget ud.</entry> <entry key="338">Registrering via loginside (frontend) er inaktiveret.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 09dde5d..b2441c7 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 @@ -121,7 +121,7 @@ <entry key="101">SchlieÃen</entry> <entry key="102">Eingabefehler</entry> <entry key="103">Der Benutzername muss mindestens 4 Zeichen lang sein</entry> - <entry key="104">Das Passwort muss mindestens 4 Zeichen lang sein</entry> + <entry key="104">Login is too short</entry> <entry key="105">Der Benutzername ist bereits vergeben</entry> <entry key="106">Die E-Mail ist bereits registriert</entry> <entry key="107">Ein Fehler trat auf. Bitte kontaktieren Sie den Administrator</entry> @@ -336,7 +336,7 @@ <entry key="318">E-Mail mit Reset-Link versenden</entry> <entry key="319">Geben Sie bitte entweder eine E-Mail oder einen Login an.</entry> <entry key="320">Es gibt keinen Benutzer mit diesem Benutzernamen.</entry> - <entry key="321">Die E-Mail mit dem dazugehörigen Link wurde an Ihre E-Mail-Adresse gesandt. Bitte überprüfen Sie Ihren Posteingang. Falls Sie immer noch keine E-Mail erhalten haben, korrigieren Sie bitte Ihre Spam-Einstellungen und senden Sie die E-Mail nochmals.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Ungültiger Hash.</entry> <entry key="325">Passwort zurücksetzen</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Passwort gespeichert. Sie können sich nun damit einloggen.</entry> <entry key="333">OK</entry> <entry key="334">Unbekannter Fehler. Bitte melden Sie das dem Service-Team.</entry> - <entry key="335">Benutzername nicht gefunden</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Ungültiges Passwort</entry> <entry key="337">Erfolgreich ausgeloggt</entry> <entry key="338">Registrierung ist ausgeschaltet.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 0502970..4d66674 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 @@ -121,7 +121,7 @@ <entry key="101">ÎλείÏιμο</entry> <entry key="102">ΣÏάλμα ÎεδομÎνÏν ÎιÏÏÎ´Î¿Ï </entry> <entry key="103">4 ή ΠεÏιÏÏÏÏεÏοι ΧαÏακÏήÏεÏ: Î ÏοβλήμαÏα ÎαÏαÏÏÏηÏÎ·Ï Î¼Îµ ÎεÏαλαία ÎÏάμμαÏα!</entry> - <entry key="104">Î ÎÏδικÏÏ Î§ÏήÏÏη ÏÏÎÏει να ÏεÏιÎÏει ÏÎ¿Ï Î»Î¬ÏιÏÏον 4 ΧαÏακÏήÏεÏ!</entry> + <entry key="104">Login is too short</entry> <entry key="105">Το ÏÏ Î³ÎºÎµÎºÏιμÎνο Îνομα ΧÏήÏÏη ÎÏει εÏιλεγεί ήδη!</entry> <entry key="106">Το ÏÏ Î³ÎºÎµÎºÏιμÎνο Email ÎÏει καÏαÏÏÏηθεί ήδη!</entry> <entry key="107">ΣÏάλμα Î£Ï ÏÏήμαÏοÏ: ΠαÏακαλοÏμε εÏικοινÏνήÏÏε με ÏÎ¿Ï Ï ÎιαÏειÏιÏÏÎÏ Î£Ï ÏÏήμαÏοÏ!</entry> @@ -336,7 +336,7 @@ <entry key="318">ΠδιεÏÎ¸Ï Î½Ïη Email δεν βÏÎθηκε! ÎιÏάγεÏε Ïην ίδια διεÏÎ¸Ï Î½Ïη Email με εκείνην ÏÎ¿Ï ÏÏηÏιμοÏοιήÏαÏε για Ïη Î´Î·Î¼Î¹Î¿Ï Ïγία ÏÎ¿Ï ÎογαÏιαÏÎ¼Î¿Ï ÏαÏ.</entry> <entry key="319">ΠαÏακαλοÏμε ειÏάγεÏε ÎιεÏÎ¸Ï Î½Ïη Email ή Îνομα ΧÏήÏÏη</entry> <entry key="320">Îεν βÏÎθηκε ΧÏήÏÏÎ·Ï ÏÎ¿Ï Î½Î± ανÏιÏÏοιÏεί ÏÏο ÏÏ Î³ÎºÎµÎºÏιμÎνο Îνομα ΧÏήÏÏη!</entry> - <entry key="321">Îνα mail με ÎÎ¹Î´Î¹ÎºÏ Î£ÏνδεÏμο ÎÏει ÏÏαλεί ÏÏη διεÏÎ¸Ï Î½Ïη Email ÏαÏ. ΠαÏακαλοÏμε ελÎγξÏε Ïο ÏαÏÏ Î´Ïομείο ÏαÏ. Îν δεν ÎÏεÏε λάβει ακÏμα mail, ÏαÏακαλοÏμε ÏÏοÏαÏμÏÏÏε ÏÎ¹Ï ÏÏ Î¸Î¼Î¯ÏÎµÎ¹Ï spam ÏÎ¿Ï ÏαÏÏ Î´ÏÎ¿Î¼ÎµÎ¯Î¿Ï ÏÎ±Ï ÎºÎ±Î¹ εÏαναλάβαÏε Ïην αÏοÏÏολή ÏÎ¿Ï mail ÎÏιβεβαίÏÏηÏ.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Îη ÎÎ³ÎºÏ Ïη Τιμή Hash! Îεν βÏÎθηκαν ΧÏήÏÏεÏ.</entry> <entry key="325">ÎλλάξÏε Ïον ÎÏÎ´Î¹ÎºÏ ÏαÏ</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Î ÎÏδικÏÏ ÏÏ Î¸Î¼Î¯ÏÏηκε. ΤÏÏα μÏοÏείÏε να ÏÏ Î½Î´ÎµÎ¸ÎµÎ¯Ïε.</entry> <entry key="333">ÎνÏάξει</entry> <entry key="334">ÎγνÏÏÏο ΣÏάλμα: ΠαÏακαλοÏμε να Ïο αναÏÎÏεÏε ÏÏην Îμάδα ÎÎ¾Ï ÏηÏÎÏηÏÎ®Ï ÏαÏ.</entry> - <entry key="335">Το Îνομα ΧÏήÏÏη δεν βÏÎθηκε.</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Îη ÎÎ³ÎºÏ ÏÎ¿Ï ÎÏδικÏÏ</entry> <entry key="337">ÎÏιÏÏ ÏÎ®Ï ÎÏοÏÏνδεÏη</entry> <entry key="338">Frontend ÎγγÏαÏÎÏ ÎÏενεÏγοÏοιημÎνεÏ.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 e97b9d0..25ee1f8 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 @@ -121,7 +121,7 @@ <entry key="101">Cerrado</entry> <entry key="102">error en la introducción de datos</entry> <entry key="103">el nombre de usuario debe contener al menos 4 caracteres</entry> - <entry key="104">la clave de usuario debe contener al menos 4 caracteres</entry> + <entry key="104">Login is too short</entry> <entry key="105">Este nombre de usuario ya existe</entry> <entry key="106">Este email ya está registrado</entry> <entry key="107">Error del sistema, por favor contacte con el administrador</entry> @@ -336,7 +336,7 @@ <entry key="318">No se ha encontrado esa dirección de correo. Asegúrese de introducir la misma dirección que utilizó al crear la cuenta</entry> <entry key="319">Escriba o su correo o su nombre de usuario</entry> <entry key="320">No hay ningún usuario con ese nombre</entry> - <entry key="321">Se le ha enviado un correo con un enlace especial. Si no aparece este correo revise la configuración de filtros de spam de su servidor y reenvée este correo nuevamente.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">No se encontró al usuario (método de generación de claves incorrecto).</entry> <entry key="325">Generar contraseña</entry> <entry key="326">Inicio</entry> @@ -348,7 +348,7 @@ <entry key="332">La contraseña ha sido cambiada, ahora puede iniciar sesión.</entry> <entry key="333">Aceptar</entry> <entry key="334">Error desconocido. EnvÃe esta información al administrador del sistema.</entry> - <entry key="335">No se encontró al usuario</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Contraseña incorrecta</entry> <entry key="337">Ha salido del sistema</entry> <entry key="338">Registro desactivado.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 46b931e..0d34fad 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 @@ -121,7 +121,7 @@ <entry key="101">بستÙ</entry> <entry key="102"></entry> <entry key="103">ÙاراÙتر 4 از بÙØ´ Ùا 4</entry> - <entry key="104">باشد ÙاراÙتر 4 ØداÙ٠باÙد عبÙر ر٠ز</entry> + <entry key="104">Login is too short</entry> <entry key="105">The username is already taken</entry> <entry key="106">The email is already registered</entry> <entry key="107">سÙست٠اخطار</entry> @@ -336,7 +336,7 @@ <entry key="318">No such email address was found. Make sure you enter the same email address you used to create your account.</entry> <entry key="319">Please enter either a Mail or a Username</entry> <entry key="320">There is no User connected to this Username</entry> - <entry key="321">The email containing a special link has been sent to your email address, please check your mailbox. If you still have not received a email, please adjust your email spam settings and resend confirmation email.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Invalid Hash. No User found.</entry> <entry key="325">Reset Your Password</entry> <entry key="326">ارتباط Ùطع</entry> @@ -348,7 +348,7 @@ <entry key="332">Password set. You can login now.</entry> <entry key="333">ادا٠Ù</entry> <entry key="334">Unkown Error. Please report this to your Service-Team.</entry> - <entry key="335">Username not found</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">صØÙØ Ùا عبÙر ر٠ز</entry> <entry key="337">Successfully Logged out</entry> <entry key="338">Frontend Registration disabled.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 3a4b178..aae5d6e 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 @@ -121,7 +121,7 @@ <entry key="101">sulje</entry> <entry key="102">syötevirhe</entry> <entry key="103">vähintään 4 merkkiä; isoilla kirjaimilla on merkitystä!</entry> - <entry key="104">salasanan täytyy olla vähintään 4 merkkiä pitkä</entry> + <entry key="104">Login is too short</entry> <entry key="105">Tunnus on jo varattu</entry> <entry key="106">Sähköpostiosoite on jo rekisteröity</entry> <entry key="107">Järjestelmävirhe, ota yhteyttä ylläpitoon</entry> @@ -336,7 +336,7 @@ <entry key="318">Sähköpostiosoitetta ei löytynyt. Varmista että annoit saman osoitteen kuin mitä käytit rekisteröityessäsi.</entry> <entry key="319">Anna sähköpostiosoite tai käyttäjätunnus</entry> <entry key="320">Käyttäjätunnusta ei ole</entry> - <entry key="321">Linkin sisältävä sähköposti on lähetetty osoitteeseesi, ole hyvä ja tarkista sähköpostisi. Jos et ole vielä vastaanottanut viestiä, tarkista roskapostiasetuksesi ja yritä uudestaan.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Epäkelpo hash. Käyttäjää ei löydy.</entry> <entry key="325">Nollaa salasanasi</entry> <entry key="326">Kirjaudu</entry> @@ -348,7 +348,7 @@ <entry key="332">Salasana asetettu. Voit nyt kirjautua sisään.</entry> <entry key="333">OK</entry> <entry key="334">Tuntematon virhe. Ole hyvä ja ilmoita virheestä tukitiimillesi.</entry> - <entry key="335">Käyttäjää ei löydy</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Epäkelpo salasana</entry> <entry key="337">Uloskirjautuminen onnistui</entry> <entry key="338">Rekisteröinti on poissa käytöstä.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 7dd4376..e1b0df4 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 @@ -121,7 +121,7 @@ <entry key="101">Fermer</entry> <entry key="102">Erreur de formulaire</entry> <entry key="103">Le nom d'utilisateur doit contenir au moins 4 caractères</entry> - <entry key="104">Le mot de passe doit contenir au moins 4 caractères</entry> + <entry key="104">Login is too short</entry> <entry key="105">Le nom d'utilisateur existe déjà </entry> <entry key="106">Cette adresse de courriel est déjà utilisée</entry> <entry key="107">Erreur système, merci de contacter l'administrateur</entry> @@ -336,7 +336,7 @@ <entry key="318">Aucune adresse trouvée. Soyez sûr d'avoir entré la même adresse que durant l'inscription.</entry> <entry key="319">Entrez votre courriel ou nom d'utilisateur</entry> <entry key="320">Il n'y a pas d'utilisateur avec ce nom</entry> - <entry key="321">Un courriel contenant un lien vous a été envoyé. Si vous n'avez pas reçu de courriel, vérifiez votre antispam et redemandez une confirmation.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Hachage non valide. Pas d'utilisateur trouvé.</entry> <entry key="325">Changez votre mot de passe</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Mot de passe changé. Vous pouvez vous connecter.</entry> <entry key="333">OK</entry> <entry key="334">Erreur inconnue. Veuillez le signaler à votre équipe support.</entry> - <entry key="335">Nom d'utilisateur inconnu</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Mot de passe non valide</entry> <entry key="337">Déconnecté avec succès</entry> <entry key="338">Enregistrement depuis la page d'accueil désactivé.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 f65e62a..f22461c 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 @@ -121,7 +121,7 @@ <entry key="101">Pechado</entry> <entry key="102">erro na entrada de datos</entry> <entry key="103">o nome de usuario debe conter alo menos 4 caracteres</entry> - <entry key="104">o contrasinal de usuario debe conter alo menos 4 caracteres</entry> + <entry key="104">Login is too short</entry> <entry key="105">Este nome de usuario xa existe</entry> <entry key="106">Este correo-e xa está rexistrado</entry> <entry key="107">Erro do sistema, por favor contacte co administrador do sistema</entry> @@ -336,7 +336,7 @@ <entry key="318">Nose atopou o enderezo de correo electrónico. Asegúrese de introducir o mesmo enderezo de correo electrónico que utilizou para crear a súa conta.</entry> <entry key="319">Escriba o seu correo-e ou o nome de usuario</entry> <entry key="320">Non hai ningun usuario con este nome</entry> - <entry key="321">Enviouselle un correo-e cunha ligazón especial, revise a súa bandexa de entrada de correo. Se non atopa este correo revise a configuración de spam do seu servidor e reenvie o correo de confirmación.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Non se atopou ó usuario (hash incorrecto).</entry> <entry key="325">Xerar contrasinal</entry> <entry key="326">Inicio de sesión</entry> @@ -348,7 +348,7 @@ <entry key="332">Cambiouse o contrasinal, agora pode a iniciar sesión.</entry> <entry key="333">Aceptar</entry> <entry key="334">Erro descoñecido. Informe ao administradores.</entry> - <entry key="335">Non se atopou o nome de usuario</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Contrasinal incorrecto</entry> <entry key="337">Vostede saiu do sistema</entry> <entry key="338">A ferramenta de rexistro está desactivada.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 79c563f..6be1a15 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 @@ -121,7 +121,7 @@ <entry key="101">bezár</entry> <entry key="102">beviteli adathiba</entry> <entry key="103">4 vagy több karakter; kis/nagybetű számÃt!</entry> - <entry key="104">a felhasználói jelszónak legalább 4 karakternek kell lennie</entry> + <entry key="104">Login is too short</entry> <entry key="105">A felhasználó már létezik</entry> <entry key="106">Az e-mail cÃm már regisztrálva van</entry> <entry key="107">Rendszerhiba, keresse fel a rendszergazdát.</entry> @@ -336,7 +336,7 @@ <entry key="318">Nem található az e-mail cÃm. EllenÅrizd, hogy ugyanazt az e-mail cÃmet adtad meg amit a felhasználó létrehozásához használtál.</entry> <entry key="319">Kérlek add meg az e-mail cÃmet vagy felhasználói nevet.</entry> <entry key="320">Nincs felhasználó ehhez a névhez.</entry> - <entry key="321">A levél, amit küldtünk neked, tartalmaz egy speciális linket, ellenÅrizd a postafiókodat. Ha még nem kaptad meg a levelet, állÃtsd be a spamszűrÅdet és küldd újra a megerÅsÃtÅ e-mail-t.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Rossz Hash. A felhasználható nem található.</entry> <entry key="325">Jelszó törlése</entry> <entry key="326">BejelentkezÅ név</entry> @@ -348,7 +348,7 @@ <entry key="332">Jelszó beállÃtva. Bejelentkezhetsz.</entry> <entry key="333">Rendben</entry> <entry key="334">Ismeretlen hiba. Ãrd meg a fejlesztÅknek.</entry> - <entry key="335">Felhasználónév nem található</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Hibás jelszó</entry> <entry key="337">Sikeres kijelentkezés</entry> <entry key="338">Regisztráció letiltva.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 8f33e78..0fdcb83 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 @@ -121,7 +121,7 @@ <entry key="101">tutup</entry> <entry key="102">entri data salah</entry> <entry key="103">4 karakter atau lebih; hurup kapital semua!</entry> - <entry key="104">userpass harus lebih dari 4 karakter</entry> + <entry key="104">Login is too short</entry> <entry key="105">username sudah terpakai</entry> <entry key="106">email sudah diregistrasi</entry> <entry key="107">System error silahkan kontak Admin</entry> @@ -336,7 +336,7 @@ <entry key="318">Email tidak ditemukan. Pastikan email tersebut anda gunakan saat membuat akun.</entry> <entry key="319">Silahkan masukan alamat email yang lain atau Username</entry> <entry key="320">Tidak ada User terkoneksi dengan Username ini</entry> - <entry key="321">Email yang berisi informasi alamat baru telah dikirim ke email anda, silahkan cek email anda. Jika anda belum mendapatkan email, pastikan pada baigan seting spaming pada konfigurasi email anda dan kirimkan email lagi.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Hash tidak valid. User tidak ditemukan.</entry> <entry key="325">Isi Ulang Password Anda</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Password sudah di seting. Anda dapat login sekarang.</entry> <entry key="333">OK</entry> <entry key="334">Kesalahan belum terlacak. Silahkan laporkan ke Team Servis.</entry> - <entry key="335">Username tidak ditemukan</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Password tidak valid</entry> <entry key="337">Sukses keluar dari sistem</entry> <entry key="338">Halaman depan registrasi dimatikan.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 76ca287..5ea8ecd 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 @@ -121,7 +121,7 @@ <entry key="101">Chiudi</entry> <entry key="102">errori nei dati inseriti</entry> <entry key="103">Il nome utente o la password sono troppi corti</entry> - <entry key="104">Il nome utente o la password sono troppo corti</entry> + <entry key="104">Login is too short</entry> <entry key="105">Il nome utente è già in uso</entry> <entry key="106">L'indirizzo email è già stato usato</entry> <entry key="107">Errore di sistema, contattare l'amministratore</entry> @@ -336,7 +336,7 @@ <entry key="318">L'email specificata non è stata trovata. Verifica di aver inserito la stessa email usata per la creazione dell'account.</entry> <entry key="319">Per favore inserisci un indirizzo email o un nome utente</entry> <entry key="320">Non ci sono utenti collegati con questo Username</entry> - <entry key="321">L'email con il link di reset è stata inviata al tuo indirizzo email.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Utente non trovato.</entry> <entry key="325">Resetta la tua password</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Password impostata. Ora puoi collegarti.</entry> <entry key="333">OK</entry> <entry key="334">Errore sconosciuto. Contatta il tuo amministratore.</entry> - <entry key="335">Nome utente non trovato</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Password non valida</entry> <entry key="337">Disconnessione effettuata</entry> <entry key="338">Registrazione disattivata.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 c7d00c1..a3fec12 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 @@ -121,7 +121,7 @@ <entry key="101">éãã</entry> <entry key="102">å ¥åãã¼ã¿ã¨ã©ã¼</entry> <entry key="103">ã¦ã¼ã¶ã¼åã¯æä½4æå以ä¸å¿ è¦ã§ã</entry> - <entry key="104">ãã¹ã¯ã¼ãã¯æä½4æå以ä¸å¿ è¦ã§ã</entry> + <entry key="104">Login is too short</entry> <entry key="105">ãã®ã¦ã¼ã¶ã¼åã¯æ¢ã«ä½¿ããã¦ãã¾ã</entry> <entry key="106">ãã®ã¡ã¼ã«ã¢ãã¬ã¹ã¯æ¢ã«ç»é²ããã¦ãã¾ã</entry> <entry key="107">ã·ã¹ãã ã¨ã©ã¼ã管çè ã«é£çµ¡ãã¦ãã ããã</entry> @@ -336,7 +336,7 @@ <entry key="318">æå®ãããã¡ã¼ã«ã»ã¢ãã¬ã¹ãè¦ã¤ããã¾ãããã¢ã«ã¦ã³ãä½ææã«æå®ããã¡ã¼ã«ã»ã¢ãã¬ã¹ãæå®ãã¦ãã ããã</entry> <entry key="319">ã¡ã¼ã«ã»ã¢ãã¬ã¹ã¾ãã¯ã¦ã¼ã¶ã¼åãå ¥åãã¦ãã ããã</entry> <entry key="320">ãã®ã¦ã¼ã¶ã¼åã§æ¥ç¶ããã¦ã¼ã¶ã¼ã¯ããã¾ããã</entry> - <entry key="321">å°ç¨ãªã³ã¯ãå«ãã¡ã¼ã«ãããªãã®ã¡ã¼ã«ã»ã¢ãã¬ã¹ã«å¯¾ãã¦éä¿¡ãã¾ãããã¡ã¼ã«åä¿¡ç®±ãã確èªãã ãããããåä¿¡ã§ããªãå ´åã¯ãã¹ãã ã¨ãã¦é¤å¤ããã¦ããå¯è½æ§ãããã¾ãããã®å ´åã¯ã¹ãã è¨å®ãè¦ç´ããå度ã確èªã¡ã¼ã«ãéä¿¡ãã¦ãã ããã</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">ããã·ã¥å¤ãä¸æ£ã§ããã¦ã¼ã¶ã¼ãè¦ã¤ããã¾ããã</entry> <entry key="325">ãã¹ã¯ã¼ãã®ãªã»ãã</entry> <entry key="326">ãã°ã¤ã³</entry> @@ -348,7 +348,7 @@ <entry key="332">ãã¹ã¯ã¼ããè¨å®ããã¾ããããã°ã¤ã³å¯è½ã§ãã</entry> <entry key="333">OK</entry> <entry key="334">æªç¥ã®ã¨ã©ã¼ã§ãã管çè ã«å ±åãã¦ãã ããã</entry> - <entry key="335">ã¦ã¼ã¶ã¼åãè¦ã¤ããã¾ããã</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">ãã¹ã¯ã¼ããç¡å¹ã§ãã</entry> <entry key="337">ãã°ã¢ã¦ãå®äº</entry> <entry key="338">ããã³ãã¨ã³ãç»é²ã¯ç¡å¹ã§ãã</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 1fef58e..24a2d81 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 @@ -121,7 +121,7 @@ <entry key="101">ë«ë¤</entry> <entry key="102">ë°ì´ë¤ ì¤ë¥ ì ë ¥</entry> <entry key="103">ì ì ì´ë¦ì ìµì 4 문ìê° ë¼ì´ì¼í©ëë¤.</entry> - <entry key="104">ì ì ë¹ë°ë²í¸ë ìµì 4 문ìê° ë¼ì¬ì¼í©ëë¤.</entry> + <entry key="104">Login is too short</entry> <entry key="105">ëê°ì ì ì ì´ë¦ì´ ì¡´ì¬í©ëë¤.</entry> <entry key="106">ëê°ì ì´ë©ì¼ 주ìê° ì´ë¯¸ ë±ë¡ë¼ì´ ììµëë¤.</entry> <entry key="107">ìì¤í ì¤ë¥ê° ìê²¼ìµëë¤. ìì¤í ê´ë¦¬ìì ì°ë½ì£¼ììì.</entry> @@ -338,7 +338,7 @@ <entry key="318">Users</entry> <entry key="319">Polls</entry> <entry key="320">There is no User connected to this Username</entry> - <entry key="321">The email containing a special link has been sent to your email address, please check your mailbox. If you still have not received a email, please adjust your email spam settings and resend confirmation email.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Invalid Hash. No User found.</entry> <entry key="325">Reset Your Password</entry> <entry key="326">Login</entry> @@ -350,7 +350,7 @@ <entry key="332">Password set. You can login now.</entry> <entry key="333">OK</entry> <entry key="334">Unkown Error. Please report this to your Service-Team.</entry> - <entry key="335">Username not found</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Invalid Password</entry> <entry key="337">Successfully Logged out</entry> <entry key="338">Frontend Registration disabled.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 ebc4415..3e69b89 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 @@ -121,7 +121,7 @@ <entry key="101">Sluiten</entry> <entry key="102">input data foutmelding</entry> <entry key="103">Gebruikersnaam moet minimaal 4 karakters zijn en is hoofdletter gevoelig!</entry> - <entry key="104">Wachtwoord moet minimaal 4 karakters zijn</entry> + <entry key="104">Login is too short</entry> <entry key="105">Deze gebruikersnaam is al gebruikt</entry> <entry key="106">Dit e-mail adres is al geregistreerd</entry> <entry key="107">Systeem fout neem contact op met een Systeem beheerder</entry> @@ -336,7 +336,7 @@ <entry key="318">Dit E-mail adres is niet gevonden. Geeft E-mail adres waar ook het account mee gemaakt is.</entry> <entry key="319">Geeft inlognaam of E-mail adres</entry> <entry key="320">Er is geen gebruiker met deze inlognaam</entry> - <entry key="321">Een E-mail met een link is naar je toegestuurd, controller je Postvak-In. Als je dan nog steeds niets hebt ontvangen bekijk je E-mail spam instellingen.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Er is geen gebruiker met deze gegevens.</entry> <entry key="325">Wachtwoord opnieuw instellen</entry> <entry key="326">Inlognaam</entry> @@ -348,7 +348,7 @@ <entry key="332">Wachtwoord ingesteld. Je kunt nu inloggen.</entry> <entry key="333">OK</entry> <entry key="334">Onbekende Foutmelding. Geef dit door aan de beheerder.</entry> - <entry key="335">Inlognaam niet gevonden</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Verkeerd wachtwoord</entry> <entry key="337">U bent uitgelogd</entry> <entry key="338">Registratie is uitgezet.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 c3dd3a3..d8f1de8 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 @@ -121,7 +121,7 @@ <entry key="101">zamknij</entry> <entry key="102">bÅÄ d w danych wejÅciowych</entry> <entry key="103">4 lub wiÄcej znaków; duże i maÅe litery majÄ znaczenie!</entry> - <entry key="104">HasÅo musi skÅadaÄ siÄ przynajmniej z 4 znaków</entry> + <entry key="104">Login is too short</entry> <entry key="105">Ta nazwa użytkownika jest już zajÄta</entry> <entry key="106">Ten adres e-mail jest już zarejestrowany</entry> <entry key="107">BÅÄ d systemu. Skontaktuj siÄ z administratorem.</entry> @@ -336,7 +336,7 @@ <entry key="318">Nie znaleziono adresu. Upewnij siÄ, że wpisaÅe(a)Å ten sam adres, jaki podaÅe(a)Å przy zakÅadaniu konta.</entry> <entry key="319">ProszÄ podaÄ e-mail lub nazwÄ użytkownika.</entry> <entry key="320">Nie ma użytkownika o takiej nazwie</entry> - <entry key="321">E-mail zawierajÄ cy specjalne ÅÄ cze (link) zostaÅ wysÅany na twój adres. Sprawdź swojÄ pocztÄ. JeÅli nie otrzymaÅe(a)Å listu, sprawdź/zmieÅ ustawienia antyspamowe swojej skrzynki i ponownie wygeneruj mail potwierdzajÄ cy zmianÄ hasÅa.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Niepoprawny kod. Nie ma takiego użytkownika.</entry> <entry key="325">Ustaw nowe hasÅo.</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">HasÅo ustawione. Możesz siÄ zalogowaÄ.</entry> <entry key="333">OK</entry> <entry key="334">Nieznany bÅÄ d. ProszÄ poinformowaÄ administratora.</entry> - <entry key="335">Nie ma takiego użytkownika</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Niepoprawne hasÅo</entry> <entry key="337">Poprawnie wylogowano.</entry> <entry key="338">Samodzielna rejestracja nie jest możliwa.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 f035dcd..4c7dfb5 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 @@ -121,7 +121,7 @@ <entry key="101">fechar</entry> <entry key="102">erro na entrada de dados</entry> <entry key="103">nome do usuÃ¥rio deve ter no mÃnimo 4 letras</entry> - <entry key="104">senha deve ter no mÃnimo 4 letras</entry> + <entry key="104">Login is too short</entry> <entry key="105">Nome de usuário já existente</entry> <entry key="106">O email já foi registrado.</entry> <entry key="107">Erro no sistema, por favor, contacte os administradores.</entry> @@ -336,7 +336,7 @@ <entry key="318">Usuários</entry> <entry key="319">Conjuntos</entry> <entry key="320">Não existe usuário conectado a este nome</entry> - <entry key="321">Um email contendo um link foi enviado a seu endereço de email, por favor confira sua caixa postal. Se você ainda não tiver recebido um email, por favor ajuste as configurações de spam e remande a confirmação de email.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Hash inválido. Nenhum usuáio encontrado.</entry> <entry key="325">Reset sua senha</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Senha configurada. Você pode se logar agora.</entry> <entry key="333">OK</entry> <entry key="334">Erro desconhecido. Por favor informe isso ao Service-Team.</entry> - <entry key="335">Username não encontrado</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Senha inválida</entry> <entry key="337">Desconectado com sucesso</entry> <entry key="338">Cadastro do frontend desabilitado.</entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/c9204ee8/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 688ffb0..1482455 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 @@ -121,7 +121,7 @@ <entry key="101">fechar</entry> <entry key="102">erro na entrada de dados</entry> <entry key="103">Nome do usuário deve ter no mÃnimo 4 letras</entry> - <entry key="104">senha deve ter no mÃnimo 4 letras</entry> + <entry key="104">Login is too short</entry> <entry key="105">Nome de usuário já existente</entry> <entry key="106">O email já foi registrado.</entry> <entry key="107">Erro no sistema, por favor, contacte os administradores.</entry> @@ -336,7 +336,7 @@ <entry key="318">Nenhum endereço de e-mail foi encontrado. Verifique se você digitou o endereço de email que você usou para criar sua conta.</entry> <entry key="319">Por favor, indique um endereço de e-mail ou um nome de usuário</entry> <entry key="320">Não existe usuário conectado com este nome</entry> - <entry key="321">Um email contendo um link foi enviado a seu endereço de email, por favor confira sua caixa postal. Se você ainda não tiver recebido um email, por favor ajuste as configurações de spam e re-envie a confirmação de email.</entry> + <entry key="321">The email containing a special link has been sent to the email address, registered to the user corresponding to the data entered</entry> <entry key="324">Hash inválido. Nenhum usuário encontrado.</entry> <entry key="325">Redefina sua senha</entry> <entry key="326">Login</entry> @@ -348,7 +348,7 @@ <entry key="332">Senha configurada. Você pode acessar agora.</entry> <entry key="333">OK</entry> <entry key="334">Erro desconhecido. Por favor informe isso ao Administrador.</entry> - <entry key="335">Username não encontrado</entry> + <entry key="335">Username/email and/or password are incorrect.</entry> <entry key="336">Senha inválida</entry> <entry key="337">Desconectado com sucesso</entry> <entry key="338">Cadastro do frontend desabilitado.</entry>
