This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new 18c5365 [OPENMEETINGS-2342] useless forse TZ message is dropped 18c5365 is described below commit 18c5365fc71379f3a85d0a99e93b89d8a1dfcd58 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Sun May 3 13:11:05 2020 +0700 [OPENMEETINGS-2342] useless forse TZ message is dropped --- .../java/org/apache/openmeetings/db/dao/user/UserDao.java | 1 - .../java/org/apache/openmeetings/db/entity/user/User.java | 13 ------------- .../java/org/apache/openmeetings/backup/BackupImport.java | 3 --- .../org/apache/openmeetings/web/admin/users/UserForm.html | 8 -------- .../org/apache/openmeetings/web/admin/users/UserForm.java | 3 --- .../apache/openmeetings/web/app/Application.properties.xml | 2 -- .../openmeetings/web/app/Application_ar.properties.xml | 2 -- .../openmeetings/web/app/Application_bg.properties.xml | 2 -- .../openmeetings/web/app/Application_bn.properties.xml | 2 -- .../openmeetings/web/app/Application_ca.properties.xml | 2 -- .../openmeetings/web/app/Application_cs.properties.xml | 2 -- .../openmeetings/web/app/Application_da.properties.xml | 2 -- .../openmeetings/web/app/Application_de.properties.xml | 2 -- .../openmeetings/web/app/Application_el.properties.xml | 2 -- .../openmeetings/web/app/Application_es.properties.xml | 2 -- .../openmeetings/web/app/Application_fa.properties.xml | 2 -- .../openmeetings/web/app/Application_fi.properties.xml | 2 -- .../openmeetings/web/app/Application_fr.properties.xml | 2 -- .../openmeetings/web/app/Application_gl.properties.xml | 2 -- .../openmeetings/web/app/Application_he.properties.xml | 2 -- .../openmeetings/web/app/Application_hi.properties.xml | 2 -- .../openmeetings/web/app/Application_hu.properties.xml | 2 -- .../openmeetings/web/app/Application_in.properties.xml | 2 -- .../openmeetings/web/app/Application_it.properties.xml | 2 -- .../openmeetings/web/app/Application_ja.properties.xml | 2 -- .../openmeetings/web/app/Application_ko.properties.xml | 2 -- .../openmeetings/web/app/Application_nl.properties.xml | 2 -- .../openmeetings/web/app/Application_pl.properties.xml | 2 -- .../openmeetings/web/app/Application_pt.properties.xml | 2 -- .../openmeetings/web/app/Application_pt_BR.properties.xml | 2 -- .../openmeetings/web/app/Application_ru.properties.xml | 2 -- .../openmeetings/web/app/Application_sk.properties.xml | 2 -- .../openmeetings/web/app/Application_sv.properties.xml | 2 -- .../openmeetings/web/app/Application_th.properties.xml | 2 -- .../openmeetings/web/app/Application_tr.properties.xml | 2 -- .../openmeetings/web/app/Application_uk.properties.xml | 2 -- .../openmeetings/web/app/Application_zh_CN.properties.xml | 2 -- .../openmeetings/web/app/Application_zh_TW.properties.xml | 2 -- 38 files changed, 94 deletions(-) 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 eb34896..e317173 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 @@ -105,7 +105,6 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { user.setRights(getDefaultRights()); user.setLanguageId(getDefaultLang()); user.setTimeZoneId(getTimeZone(currentUser).getID()); - user.setForceTimeZoneCheck(false); user.setAge(LocalDate.now()); user.setLastlogin(new Date()); Address address = new Address(); diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java index 8d838cc..a1f7c82 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java @@ -309,11 +309,6 @@ public class User extends HistoricalEntity { @XmlTransient private Sessiondata sessionData; - @Column(name = "forceTimeZoneCheck", nullable = false) - @XmlElement(name = "forceTimeZoneCheck", required = false) - @XmlJavaTypeAdapter(value = BooleanAdapter.class, type = boolean.class) - private boolean forceTimeZoneCheck; - @Column(name = "user_offers") @XmlElement(name = "userOffers", required = false) private String userOffers; @@ -592,14 +587,6 @@ public class User extends HistoricalEntity { this.timeZoneId = timeZoneId; } - public boolean getForceTimeZoneCheck() { - return forceTimeZoneCheck; - } - - public void setForceTimeZoneCheck(boolean forceTimeZoneCheck) { - this.forceTimeZoneCheck = forceTimeZoneCheck; - } - public String getUserOffers() { return userOffers; } diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java index 72ba1e9..648da89 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java @@ -686,9 +686,6 @@ public class BackupImport { String tz = u.getTimeZoneId(); if (tz == null) { u.setTimeZoneId(jNameTimeZone); - u.setForceTimeZoneCheck(true); - } else { - u.setForceTimeZoneCheck(false); } Long userId = u.getId(); 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 ef75864..da6e933 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 @@ -49,14 +49,6 @@ <label class="col-3 text-right"><wicket:message key="1112" /></label><span wicket:id="updated" class="col-8"/> </div> <div class="formelement"> - <div class="col-3 d-inline-block"></div> - <div class="col-8 d-inline-block"> - <i class="fas fa-info-circle m-1 text-info"></i><wicket:message key="1149" /> - </div> - <label wicket:for="forceTimeZoneCheck" class="col-3 text-right"><wicket:message key="1148" /></label> - <input class="formcheckbox" type="checkbox" wicket:id="forceTimeZoneCheck"/> - </div> - <div class="formelement"> <label wicket:for="rights" class="col-3 text-right"><wicket:message key="881" /></label> <div class="om-select2 p-0 d-inline-block col-8"><select class="input w-100" wicket:id="rights"></select></div> </div> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java index 8f7cb1d..83e0374 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java @@ -55,7 +55,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.OnChangeAjaxBehavior; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; @@ -136,8 +135,6 @@ public class UserForm extends AdminBaseForm<User> { mainContainer.add(new DateLabel("inserted")); mainContainer.add(new DateLabel("updated")); - mainContainer.add(new CheckBox("forceTimeZoneCheck")); - mainContainer.add(new Select2MultiChoice<>("rights", null, new RestrictiveChoiceProvider<Right>() { private static final long serialVersionUID = 1L; 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 0ba7de9..82ad470 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[Timezone message]]></entry> - <entry key="1149"><![CDATA[Check "Timezone message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 76165ad..fb77910 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 c214763..7385e41 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml index 906242b..d016d6b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[Timezone message]]></entry> - <entry key="1149"><![CDATA[Check "Timezone message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 ed9d9f8..07a48dc 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 efc36fb..526a2d4 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 a8acca8..15054d6 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 4b7ec40..72d8ce8 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Zeitzone]]></entry> <entry key="1146"><![CDATA[Beschreibung]]></entry> <entry key="1147"><![CDATA[Erstellt von]]></entry> - <entry key="1148"><![CDATA[Hinweis zur Zeitzone]]></entry> - <entry key="1149"><![CDATA["Hinweis zur Zeitzone" geben wenn Nutzer sich das nächste Mal einloggt, damit diese das Nutzerprofil aktualisieren.]]></entry> <entry key="1151"><![CDATA[Neue {0} Konferenz:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 bfe3d24..aa9e6ef 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 326b83e..b44fbb4 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Zona Horaria]]></entry> <entry key="1146"><![CDATA[Descripción]]></entry> <entry key="1147"><![CDATA[Hecho por]]></entry> - <entry key="1148"><![CDATA[Mensaje de Zona Horaria]]></entry> - <entry key="1149"><![CDATA[Chequear "Mensaje de Zona Horaria" para dar mensaje a los usuarios la próxima vez que accedan para que actualicen sus perfiles.]]></entry> <entry key="1151"><![CDATA[Nueva {0} conferencia:]]></entry> <entry key="1152"><![CDATA[Detalles:]]></entry> <entry key="1153"><![CDATA[Comenzar:]]></entry> 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 8fa929f..94fe0ab 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[منطقه زمانی]]></entry> <entry key="1146"><![CDATA[توضیح]]></entry> <entry key="1147"><![CDATA[ایجاد شده توسط]]></entry> - <entry key="1148"><![CDATA[پیام منطقه زمانی]]></entry> - <entry key="1149"><![CDATA["پیام منطقه زمانی" را بررسی کنیدتا به کاربران در زمان ورود برای بروز کردن پوشه پیغام دهد.]]></entry> <entry key="1151"><![CDATA[کنفرانس جدید:]]></entry> <entry key="1152"><![CDATA[جزییات:]]></entry> <entry key="1153"><![CDATA[شروع:]]></entry> 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 fff6631..1f46620 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 c1d5963..80563c8 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Fus. horaire]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Créé par]]></entry> - <entry key="1148"><![CDATA[Message du fus. hor.]]></entry> - <entry key="1149"><![CDATA[Vérifiez "le message du fuseau horaire" pour transmettre aux utilisateurs un message la fois prochaine qu'ils se connectent.]]></entry> <entry key="1151"><![CDATA[Nouvelle conférence {0} :]]></entry> <entry key="1152"><![CDATA[Détails :]]></entry> <entry key="1153"><![CDATA[Début :]]></entry> 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 4afa9c3..9dbe666 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml index ad57cdd..a39f5ab 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[Timezone message]]></entry> - <entry key="1149"><![CDATA[Check "Timezone message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml index 2a31085..4707307 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[Timezone message]]></entry> - <entry key="1149"><![CDATA[Check "Timezone message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 130a036..cbddb9e 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Időzóna]]></entry> <entry key="1146"><![CDATA[Leírás]]></entry> <entry key="1147"><![CDATA[Létrehozta]]></entry> - <entry key="1148"><![CDATA[Időzóna üzenet]]></entry> - <entry key="1149"><![CDATA[Ellenőrizze az "TimeZone Message" a profiljában, amit a felhasználók a belépéskor látni fognak.]]></entry> <entry key="1151"><![CDATA[új {0} konferencia:]]></entry> <entry key="1152"><![CDATA[Részletek:]]></entry> <entry key="1153"><![CDATA[Kezdődik:]]></entry> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml index 92eea65..2e11193 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_in.properties.xml @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 6198d58..238845a 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Fuso orario]]></entry> <entry key="1146"><![CDATA[Descrizione]]></entry> <entry key="1147"><![CDATA[Creato da]]></entry> - <entry key="1148"><![CDATA[Messaggio Fuso Orario]]></entry> - <entry key="1149"><![CDATA[Seleziona "Messaggio Fuso Orario" per dare un messaggio agli utenti al prossimo accesso per aggiornare il Fuso Orario.]]></entry> <entry key="1151"><![CDATA[{0} nuove conferenze:]]></entry> <entry key="1152"><![CDATA[Dettagli:]]></entry> <entry key="1153"><![CDATA[Inizio:]]></entry> 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 a7f80f4..fd5a100 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[タイムゾーン]]></entry> <entry key="1146"><![CDATA[概要]]></entry> <entry key="1147"><![CDATA[作成者]]></entry> - <entry key="1148"><![CDATA[タイムゾーン設定を推奨]]></entry> - <entry key="1149"><![CDATA[次回ログイン時にタイムゾーン設定を行うことを勧めるメッセージを表示する場合にチェックを入れてください。]]></entry> <entry key="1151"><![CDATA[{0}会議が設定されました:]]></entry> <entry key="1152"><![CDATA[詳細:]]></entry> <entry key="1153"><![CDATA[開始時刻:]]></entry> 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 661f1a7..14f5fbd 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 30b5add..4c274db 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 ed65cd7..42b1d8f 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Strefa czasowa]]></entry> <entry key="1146"><![CDATA[Opis]]></entry> <entry key="1147"><![CDATA[Utworzony przez]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Zaznacz „Wiadomość TimeZone”, aby przy następnym logowaniu dać użytkownikom wiadomość, aby zaktualizować swój profil.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 0da9a05..9c0a3fd 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 7824eb5..ad7daea 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Fuso horário]]></entry> <entry key="1146"><![CDATA[Descrição]]></entry> <entry key="1147"><![CDATA[Criado por]]></entry> - <entry key="1148"><![CDATA[Mensagem Fuso Horário]]></entry> - <entry key="1149"><![CDATA[Marque a opção "Mensagem do Fuso Horário" para apresentar aos usuários uma mensagem na próxima vez entrarem para atualizar o perfil.]]></entry> <entry key="1151"><![CDATA[Nova conferência {0}]]></entry> <entry key="1152"><![CDATA[Detalhes:]]></entry> <entry key="1153"><![CDATA[Inicio:]]></entry> 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 8f0ce4b..5cb077e 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Временная зона]]></entry> <entry key="1146"><![CDATA[Описание]]></entry> <entry key="1147"><![CDATA[Создано]]></entry> - <entry key="1148"><![CDATA[Сообщение в ТЗ]]></entry> - <entry key="1149"><![CDATA[Включите "Сообщение в таймзоне", чтобы попросить пользователя сменить свой профайл при след. логине.]]></entry> <entry key="1151"><![CDATA[Новая конференция {0}:]]></entry> <entry key="1152"><![CDATA[Детали:]]></entry> <entry key="1153"><![CDATA[Старт:]]></entry> 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 6665eb7..2fb0675 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 813dee0..71a82e7 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 @@ -381,8 +381,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Tidszon]]></entry> <entry key="1146"><![CDATA[Beskrivning]]></entry> <entry key="1147"><![CDATA[Skapad av]]></entry> - <entry key="1148"><![CDATA[Tidzonsmeddelande]]></entry> - <entry key="1149"><![CDATA[Bocka "Tidzonsmeddelande" för att ge användarna ett meddelande nästa gång de loggar in för att uppdatera sin profil.]]></entry> <entry key="1151"><![CDATA[Ny {0} konferens:]]></entry> <entry key="1152"><![CDATA[Detaljer:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 06a2ad4..2997f43 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 1dc170a..a85a86c 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry> 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 d9ad454..5415aed 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Таймзона]]></entry> <entry key="1146"><![CDATA[Опис]]></entry> <entry key="1147"><![CDATA[Створено]]></entry> - <entry key="1148"><![CDATA[Повідомлення в ТЗ]]></entry> - <entry key="1149"><![CDATA[Увімкніть "Повідомлення в таймзоне", щоб попросити користувача змінити свій профайл при слід. логін.]]></entry> <entry key="1151"><![CDATA[Нова конференція {0}:]]></entry> <entry key="1152"><![CDATA[Деталі:]]></entry> <entry key="1153"><![CDATA[Старт:]]></entry> 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 c8dad43..99861ff 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 @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[时区]]></entry> <entry key="1146"><![CDATA[详细描述]]></entry> <entry key="1147"><![CDATA[创建者]]></entry> - <entry key="1148"><![CDATA[时区信息]]></entry> - <entry key="1149"><![CDATA[勾选“时区”选项使得用户在下次登录时可以让他们更新用户资料信息]]></entry> <entry key="1151"><![CDATA[新会议:]]></entry> <entry key="1152"><![CDATA[详细情况]]></entry> <entry key="1153"><![CDATA[开始时间:]]></entry> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml index cf7477f..af5bf19 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml @@ -380,8 +380,6 @@ see https://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1143"><![CDATA[Timezone]]></entry> <entry key="1146"><![CDATA[Description]]></entry> <entry key="1147"><![CDATA[Created by]]></entry> - <entry key="1148"><![CDATA[TimeZone Message]]></entry> - <entry key="1149"><![CDATA[Check "TimeZone Message" to give users a message next time they login to update their profile.]]></entry> <entry key="1151"><![CDATA[New {0} conference:]]></entry> <entry key="1152"><![CDATA[Details:]]></entry> <entry key="1153"><![CDATA[Start:]]></entry>