diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot
index b055ca02ca..c25f2744f3 100644
--- a/ganttzk/src/main/resources/i18n/keys.pot
+++ b/ganttzk/src/main/resources/i18n/keys.pot
@@ -133,8 +133,8 @@ msgstr ""
msgid "Show/Hide labels"
msgstr ""
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:81
-msgid "Flatten/Unflatten tree"
+#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:88
+msgid "Generic allocation criteria"
msgstr ""
#: org/zkoss/ganttz/DependencyList.java:66
@@ -149,9 +149,8 @@ msgstr ""
msgid "Show money cost bar"
msgstr ""
-#: org/zkoss/ganttz/LeftTasksTreeRow.java:273
-#: org/zkoss/ganttz/LeftTasksTreeRow.java:280
-msgid "and no later than"
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:82
+msgid "Day"
msgstr ""
#: org/zkoss/ganttz/LeftTasksTreeRow.java:272
@@ -163,8 +162,8 @@ msgstr ""
msgid "Show critical path"
msgstr ""
-#: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:50
-msgid "Page"
+#: org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java:34
+msgid "Year"
msgstr ""
#: org/zkoss/ganttz/TaskList.java:298
@@ -199,8 +198,8 @@ msgstr ""
msgid "Hide money cost bar"
msgstr ""
-#: org/zkoss/ganttz/Planner.java:648
-msgid "Hide critical path"
+#: org/zkoss/ganttz/data/resourceload/TimeLineRole.java:57
+msgid "Worker"
msgstr ""
#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:63
@@ -227,8 +226,8 @@ msgstr ""
msgid "showing criteria"
msgstr ""
-#: org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java:86
-msgid "Resources"
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
+msgid "Show/Hide resources"
msgstr ""
#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:138
diff --git a/libreplan-business/src/main/resources/db.changelog-1.6.xml b/libreplan-business/src/main/resources/db.changelog-1.6.xml
index a35ea404a6..e99cb7db98 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.6.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.6.xml
@@ -106,4 +106,11 @@
columnDataType="BOOLEAN" />
+
+
+
+
+
+
diff --git a/libreplan-business/src/main/resources/libreplan.properties b/libreplan-business/src/main/resources/libreplan.properties
index 904f854d7d..647e167968 100644
--- a/libreplan-business/src/main/resources/libreplan.properties
+++ b/libreplan-business/src/main/resources/libreplan.properties
@@ -1,3 +1,3 @@
statsPage http://stats.libreplan.dev/
minimumYear 2009
-yearLimit 20
+yearLimit 50
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
index 8a080fda31..f3e2dcb1e9 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
@@ -1148,6 +1148,22 @@ public void setCheckNewVersionEnabled(boolean checkNewVersionEnabled) {
configurationModel.setCheckNewVersionEnabled(checkNewVersionEnabled);
}
+ /**
+ * Used in configuration.zul
+ * Should be public!
+ */
+ public boolean isAllowedToGatherUsageStatsEnabled() {
+ return configurationModel.isAllowedToGatherUsageStatsEnabled();
+ }
+
+ /**
+ * Used in configuration.zul
+ * Should be public!
+ */
+ public void setAllowedToGatherUsageStatsEnabled(boolean allowedToGatherUsageStatsEnabled) {
+ configurationModel.setAllowedToGatherUsageStatsEnabled(allowedToGatherUsageStatsEnabled);
+ }
+
/**
* Used in configuration.zul
* Should be public!
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
index 234ae3e6d6..dbc4272ccc 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationModel.java
@@ -574,6 +574,16 @@ public void setCheckNewVersionEnabled(boolean checkNewVersionEnabled) {
configuration.setCheckNewVersionEnabled(checkNewVersionEnabled);
}
+ @Override
+ public boolean isAllowedToGatherUsageStatsEnabled() {
+ return configuration.isAllowedToGatherUsageStatsEnabled();
+ }
+
+ @Override
+ public void setAllowedToGatherUsageStatsEnabled(boolean allowedToGatherUsageStatsEnabled) {
+ configuration.setAllowToGatherUsageStatsEnabled(allowedToGatherUsageStatsEnabled);
+ }
+
private static Map getAllCurrencies() {
Map currencies = new TreeMap<>();
for (Locale locale : Locale.getAvailableLocales()) {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/GatheredUsageStats.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/GatheredUsageStats.java
index 4aac8c2ca8..c02e530948 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/GatheredUsageStats.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/GatheredUsageStats.java
@@ -17,6 +17,9 @@
import org.zkoss.zk.ui.Executions;
import org.zkoss.zkplus.spring.SpringUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -41,6 +44,8 @@
public class GatheredUsageStats {
+ private static final Log LOG = LogFactory.getLog(GatheredUsageStats.class);
+
private IUserDAO userDAO;
private IOrderModel orderModel;
@@ -263,8 +268,8 @@ public void sendGatheredUsageStatsToServer(){
connection.setDoInput(true);
connection.setDoOutput(true);
- // If the connection lasts > 2 sec throw Exception
- connection.setConnectTimeout(2000);
+ // If the connection lasts > 6 sec throw Exception
+ connection.setConnectTimeout(6000);
// Send request
DataOutputStream dataOutputStream = new DataOutputStream(connection.getOutputStream());
@@ -273,9 +278,11 @@ public void sendGatheredUsageStatsToServer(){
dataOutputStream.close();
// No needed code, but it is not working without it
- connection.getInputStream();
+ int responseCode = connection.getResponseCode();
+ LOG.info("Usage stats sent to " + url + " — HTTP " + responseCode);
- } catch (IOException ignored) {
+ } catch (IOException e) {
+ LOG.warn("Failed to send usage stats: " + e.getMessage());
} finally {
if ( connection != null ) {
connection.disconnect();
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
index 86815c856f..ea7f899453 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/IConfigurationModel.java
@@ -149,6 +149,10 @@ public interface IConfigurationModel {
void setCheckNewVersionEnabled(boolean checkNewVersionEnabled);
+ boolean isAllowedToGatherUsageStatsEnabled();
+
+ void setAllowedToGatherUsageStatsEnabled(boolean allowedToGatherUsageStatsEnabled);
+
Boolean getGenerateCodeForExpenseSheets();
void setGenerateCodeForExpenseSheets(Boolean generateCodeForExpenseSheets);
diff --git a/libreplan-webapp/src/main/resources/i18n/ca.po b/libreplan-webapp/src/main/resources/i18n/ca.po
index 3a2328f052..b98c4eca00 100644
--- a/libreplan-webapp/src/main/resources/i18n/ca.po
+++ b/libreplan-webapp/src/main/resources/i18n/ca.po
@@ -5462,10 +5462,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "\"Roles\" LDAP (separats per ;)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "Permetre als desenvolupadors a recollir informació sobre quina versió de LibrePlan està en ús"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Permetre la recol·lecció d'estadístiques anònimes per ajudar-nos a millorar LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/cs.po b/libreplan-webapp/src/main/resources/i18n/cs.po
index bae1b3b9c4..d458b1c326 100644
--- a/libreplan-webapp/src/main/resources/i18n/cs.po
+++ b/libreplan-webapp/src/main/resources/i18n/cs.po
@@ -5461,10 +5461,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "Role LDAP (oddělené ;)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "Pomoci vývojářům projektu LibrePlan sběrem informací o verzi, kterou používáte"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Umožnit shromažďování anonymních statistik, abychom mohli zlepšit LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/de.po b/libreplan-webapp/src/main/resources/i18n/de.po
index 4bcf81e363..afcedc44c5 100644
--- a/libreplan-webapp/src/main/resources/i18n/de.po
+++ b/libreplan-webapp/src/main/resources/i18n/de.po
@@ -5445,12 +5445,8 @@ msgid "Inherited exception"
msgstr "Geerbte Ausnahme"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:150
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
-"Helfen Sie den Projektentwicklern, Informationen darüber zu sammeln, welche "
-"LibrePlan-Version Sie verwenden"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Anonyme Statistiken sammeln lassen, um uns bei der Verbesserung von LibrePlan zu helfen"
#: org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1179
msgid ""
diff --git a/libreplan-webapp/src/main/resources/i18n/es.po b/libreplan-webapp/src/main/resources/i18n/es.po
index e17986ba74..30dd9f7f95 100644
--- a/libreplan-webapp/src/main/resources/i18n/es.po
+++ b/libreplan-webapp/src/main/resources/i18n/es.po
@@ -5436,12 +5436,8 @@ msgid "Inherited exception"
msgstr "Excepción heredada"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:150
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
-"Ayude a los desarrolladores del proyecto a recoger información sobre que "
-"versión de LibrePlan está usando"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Permitir la recopilación de estadísticas anónimas para ayudarnos a mejorar LibrePlan"
#: org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1179
msgid ""
diff --git a/libreplan-webapp/src/main/resources/i18n/fa_IR.po b/libreplan-webapp/src/main/resources/i18n/fa_IR.po
index bef107b6cf..95c4ab9861 100644
--- a/libreplan-webapp/src/main/resources/i18n/fa_IR.po
+++ b/libreplan-webapp/src/main/resources/i18n/fa_IR.po
@@ -5462,10 +5462,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "نقش های LDAP (توسط ; جدا گردد)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "کمک به توسعه دهندگان برای جمع آوری اطلاعات درباره نسخه LibrePlan ای که استفاده می نمایید"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "اجازه جمعآوری آمار ناشناس برای کمک به ما در بهبود LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/fr.po b/libreplan-webapp/src/main/resources/i18n/fr.po
index c97d6d7367..68c211a7db 100644
--- a/libreplan-webapp/src/main/resources/i18n/fr.po
+++ b/libreplan-webapp/src/main/resources/i18n/fr.po
@@ -5468,12 +5468,8 @@ msgid "Inherited exception"
msgstr "Exception héritée"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:150
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
-"Aide les développeurs du projet pour collecter de l'information sur la "
-"version de LibrePlan que vous utilisez"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Autoriser la collecte de statistiques anonymes pour nous aider à améliorer LibrePlan"
#: org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1179
msgid ""
diff --git a/libreplan-webapp/src/main/resources/i18n/gl.po b/libreplan-webapp/src/main/resources/i18n/gl.po
index e3627083f0..ebcf76c7d9 100644
--- a/libreplan-webapp/src/main/resources/i18n/gl.po
+++ b/libreplan-webapp/src/main/resources/i18n/gl.po
@@ -5465,10 +5465,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "Roles do LDAP (separados por ;)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "Axude aos desenvolvedores do proxecto a recoller información sobre que versión de LibrePlan está usando"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Permitir a recollida de estatísticas anónimas para axudarnos a mellorar LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/it.po b/libreplan-webapp/src/main/resources/i18n/it.po
index 59612c5ca0..b8dd6beb0e 100644
--- a/libreplan-webapp/src/main/resources/i18n/it.po
+++ b/libreplan-webapp/src/main/resources/i18n/it.po
@@ -5428,12 +5428,8 @@ msgid "Inherited exception"
msgstr "Eccezione ereditata"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:150
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
-"Aiuta gli sviluppatori del progetto a collezionare informazioni circa la "
-"versione di LibrePlan che stai utilizzando"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Consenti la raccolta di statistiche anonime per aiutarci a migliorare LibrePlan"
#: org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1179
msgid ""
diff --git a/libreplan-webapp/src/main/resources/i18n/ja.po b/libreplan-webapp/src/main/resources/i18n/ja.po
index fe129e29d2..441658640f 100644
--- a/libreplan-webapp/src/main/resources/i18n/ja.po
+++ b/libreplan-webapp/src/main/resources/i18n/ja.po
@@ -5461,10 +5461,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "LDAPロール(;で区切り)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "使用中のLibrePlanバージョンの情報を収集して,プロジェクト開発者を支援する"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "LibrePlan改善のための匿名統計収集を許可する"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/keys.pot b/libreplan-webapp/src/main/resources/i18n/keys.pot
index bc3f9346aa..18f0c1a1d7 100644
--- a/libreplan-webapp/src/main/resources/i18n/keys.pot
+++ b/libreplan-webapp/src/main/resources/i18n/keys.pot
@@ -553,8 +553,9 @@ msgstr ""
msgid "Week {0}"
msgstr ""
-#: org/libreplan/web/advance/AdvanceTypeCRUDController.java:75
-msgid "Value is not valid, the precision value must not be empty"
+#: libreplan-webapp/src/main/webapp/common/layout/_customMenu.zul:83
+#: libreplan-webapp/src/main/webapp/common/layout/login.zul:66
+msgid "Help"
msgstr ""
#: org/libreplan/web/resources/worker/CriterionsMachineController.java:238
@@ -2533,8 +2534,8 @@ msgstr ""
msgid "Access to the system"
msgstr ""
-#: org/libreplan/web/planner/limiting/allocation/LimitingResourceAllocationModel.java:222
-msgid "All resources must be queue-based"
+#: org/libreplan/web/orders/TreeElementOperationsController.java:52
+msgid "Please select a task"
msgstr ""
#: libreplan-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
@@ -4647,8 +4648,10 @@ msgstr ""
msgid "Length"
msgstr ""
-#: org/libreplan/web/common/CustomMenuController.java:329
-msgid "Workers"
+#: org/libreplan/web/common/CustomMenuController.java:468
+#: libreplan-webapp/src/main/webapp/common/configuration.zul:335
+#: libreplan-webapp/src/main/webapp/resources/machine/_editMachine.zul:33
+msgid "Configuration"
msgstr ""
#: org/libreplan/web/planner/company/CompanyPlanningModel.java:388
@@ -5953,8 +5956,8 @@ msgstr ""
msgid "Task finished"
msgstr ""
-#: org/libreplan/web/logs/IssueLogCRUDController.java:410
-msgid "issuelog-number"
+#: org/libreplan/web/planner/order/OrderPlanningController.java:311
+msgid "filtering"
msgstr ""
#: org/libreplan/web/workreports/WorkReportCRUDController.java:1640
@@ -8135,9 +8138,9 @@ msgstr ""
msgid "Advanced search"
msgstr ""
-#: org/libreplan/web/calendars/BaseCalendarCRUDController.java:344
-#: org/libreplan/web/common/Util.java:687
-msgid "Remove"
+#: org/libreplan/web/orders/JiraSynchronizationController.java:175
+#: org/libreplan/web/orders/JiraSynchronizationController.java:222
+msgid "Failed: {0}"
msgstr ""
#: libreplan-webapp/src/main/webapp/common/accessForbidden.zul:20
diff --git a/libreplan-webapp/src/main/resources/i18n/nb.po b/libreplan-webapp/src/main/resources/i18n/nb.po
index e32dabe02e..14b6f99cc8 100644
--- a/libreplan-webapp/src/main/resources/i18n/nb.po
+++ b/libreplan-webapp/src/main/resources/i18n/nb.po
@@ -5460,10 +5460,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "LDAP Roller (atskilt med;)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "Hjelp prosjektutviklere å samle inn informasjon om hvilke LibrePlan versjon du bruker"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Tillat innsamling av anonym statistikk for å hjelpe oss med å forbedre LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/nl.po b/libreplan-webapp/src/main/resources/i18n/nl.po
index 8d5991d590..3add7645c8 100644
--- a/libreplan-webapp/src/main/resources/i18n/nl.po
+++ b/libreplan-webapp/src/main/resources/i18n/nl.po
@@ -5391,12 +5391,8 @@ msgid "Inherited exception"
msgstr "Georven uitzondering"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:150
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
-"Help de ontwikkelaars van LibrePlan bij het verzamelen van informatie over "
-"welke versie u gebruikt"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Sta het verzamelen van anonieme statistieken toe om ons te helpen LibrePlan te verbeteren"
#: org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1179
msgid ""
diff --git a/libreplan-webapp/src/main/resources/i18n/pl.po b/libreplan-webapp/src/main/resources/i18n/pl.po
index 4b075c37f4..1622edf21c 100644
--- a/libreplan-webapp/src/main/resources/i18n/pl.po
+++ b/libreplan-webapp/src/main/resources/i18n/pl.po
@@ -5463,10 +5463,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "Role Ldap (podzielone przez ;)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Zezwól na zbieranie anonimowych statystyk, aby pomóc nam ulepszyć LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/pt.po b/libreplan-webapp/src/main/resources/i18n/pt.po
index dd958fd59a..8e986cf289 100644
--- a/libreplan-webapp/src/main/resources/i18n/pt.po
+++ b/libreplan-webapp/src/main/resources/i18n/pt.po
@@ -5463,10 +5463,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "Funções LDAP (separadas por ;)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Permitir a recolha de estatísticas anónimas para nos ajudar a melhorar o LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/pt_BR.po b/libreplan-webapp/src/main/resources/i18n/pt_BR.po
index f3670dc33c..d6fa0b662b 100644
--- a/libreplan-webapp/src/main/resources/i18n/pt_BR.po
+++ b/libreplan-webapp/src/main/resources/i18n/pt_BR.po
@@ -5387,12 +5387,8 @@ msgid "Inherited exception"
msgstr "Exceção herdada"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:150
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
-"Ajude os desenvolvedores enviando informações sobre qual versão do LibrePlan "
-"você está usando."
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Permitir a coleta de estatísticas anônimas para nos ajudar a melhorar o LibrePlan"
#: org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1179
msgid ""
diff --git a/libreplan-webapp/src/main/resources/i18n/ru.po b/libreplan-webapp/src/main/resources/i18n/ru.po
index 0b53628664..4af4b02ffa 100644
--- a/libreplan-webapp/src/main/resources/i18n/ru.po
+++ b/libreplan-webapp/src/main/resources/i18n/ru.po
@@ -5469,10 +5469,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "LDAP Roles (разделены ;)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "Помочь разработчикам проекта собрать информацию о используемой версии LibrePlan"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Разрешить сбор анонимной статистики для помощи в улучшении LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/sv_SE.po b/libreplan-webapp/src/main/resources/i18n/sv_SE.po
index 93ede25a92..0528d46223 100644
--- a/libreplan-webapp/src/main/resources/i18n/sv_SE.po
+++ b/libreplan-webapp/src/main/resources/i18n/sv_SE.po
@@ -5461,10 +5461,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr ""
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr ""
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "Tillåt insamling av anonym statistik för att hjälpa oss att förbättra LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/resources/i18n/zh.po b/libreplan-webapp/src/main/resources/i18n/zh.po
index c33a7fefe7..45215aedb0 100644
--- a/libreplan-webapp/src/main/resources/i18n/zh.po
+++ b/libreplan-webapp/src/main/resources/i18n/zh.po
@@ -5498,10 +5498,8 @@ msgid "Delivery dates requested by customer. "
msgstr "按客户要求交货日期。"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:128
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "帮助项目开发商LibrePlan版本,你使用的是收集信息"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "允許收集匿名統計資料,幫助我們改善LibrePlan"
#: libreplan-webapp/src/main/webapp/resources/worker/worker.zul:22
msgid "LibrePlan: Workers"
diff --git a/libreplan-webapp/src/main/resources/i18n/zh_CN.po b/libreplan-webapp/src/main/resources/i18n/zh_CN.po
index 23c0a4f9e2..33e5d62e40 100644
--- a/libreplan-webapp/src/main/resources/i18n/zh_CN.po
+++ b/libreplan-webapp/src/main/resources/i18n/zh_CN.po
@@ -5469,10 +5469,8 @@ msgid "LDAP Roles (separated by ;)"
msgstr "LDAP角色(用;分隔)"
#: libreplan-webapp/src/main/webapp/common/configuration.zul:129
-msgid ""
-"Help the project developers to collect information about which LibrePlan "
-"version you are using"
-msgstr "帮助项目开发者收集有关您正在使用版本的LibrePlan信息"
+msgid "Allow collection of anonymous statistics to help us improve LibrePlan"
+msgstr "允许收集匿名统计信息,帮助我们改进LibrePlan"
#: org/libreplan/web/resources/worker/WorkerCRUDController.java:190
msgid "Not bound"
diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul
index c988e9ed0f..a7c93c77cf 100644
--- a/libreplan-webapp/src/main/webapp/common/configuration.zul
+++ b/libreplan-webapp/src/main/webapp/common/configuration.zul
@@ -147,8 +147,9 @@
tooltiptext="${i18n:_t('Enable/Disable warning about new LibrePlan versions available')}"
checked="@{configurationController.checkNewVersionEnabled}" />
+ label="${i18n:_t('Allow collection of anonymous statistics to help us improve LibrePlan')}"
+ tooltiptext="${i18n:_t('Check this option if you would like to send feedback to LibrePlan developers about program usage')}"
+ checked="@{configurationController.allowedToGatherUsageStatsEnabled}"/>