Merge branch 'RELEASE-3.6.0' into kdesktop-801-shortens-rm-all-syncs-…

…translations
Infomaniak · May 1, 2024 · ef5ccb8 · ef5ccb8
2 parents 9c02cee + af7bac6
commit ef5ccb8
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 31 deletions.
diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-de.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-de.html
@@ -26,8 +26,7 @@ <h2><b>Neue Funktionen</b></h2>
     <li>macOS - Synchronisierung von Links (Symlinks und Aliase)</li>
     <li>Linux - Synchronisierung von Links (Symlinks)</li>
     <li>Schutz hinzugef&uuml;gt, um zu verhindern, dass 2 Synchronisierungen innerhalb desselben Ordners stattfinden</li>
-    <li>Die Protokolle werden jetzt 72 Stunden statt 24 Stunden aufbewahrt.</li>
-    <li></li>
+    <li>Die protokolle werden jetzt 7 Tage statt 24 Stunden aufbewahrt.</li>
   </ul>
 <h2><b>Fehlerbehebungen</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-es.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-es.html
@@ -26,8 +26,7 @@ <h2><b>Novedades</b></h2>
     <li>macOS - Sincronizaci&oacute;n de enlaces (enlaces simb&oacute;licos y alias)</li>
     <li>Linux - Sincronizaci&oacute;n de enlaces (symlinks)</li>
     <li>Protecci&oacute;n a&ntilde;adida para evitar que se sincronicen 2 sincronizaciones dentro de la misma carpeta.</li>
-    <li>Ahora los registros se conservan durante 72 horas en lugar de 24.</li>
-    <li></li>
+    <li>Ahora los registros se conservan durante 7 d&iacute;as en lugar de 24.</li>
   </ul>
 <h2><b>Correcci&oacute;n de errores</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-fr.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-fr.html
@@ -26,8 +26,7 @@ <h2><b>Nouvelles fonctionnalit&eacute;s</b></h2>
     <li>macOS - Synchronisation des liens (symlinks et alias)</li>
     <li>Linux - Synchronisation des liens (symlinks)</li>
     <li>Ajout d'une protection pour &eacute;viter que 2 synchronisations se fassent dans le m&ecirc;me dossier</li>
-    <li>Les journaux sont d&eacute;sormais conserv&eacute;s pendant 72 heures au lieu de 24 heures.</li>
-    <li></li>
+    <li>Les journaux sont d&eacute;sormais conserv&eacute;s pendant 7 jours au lieu de 24 heures.</li>
   </ul>
 <h2><b>Correction de bugs</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-it.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-it.html
@@ -26,8 +26,7 @@ <h2><b>Nuove caratteristiche</b></h2>
     <li>macOS - Sincronizzazione dei collegamenti (link simbolici e alias)</li>
     <li>Linux - Sincronizzazione dei collegamenti (symlink)</li>
     <li>Aggiunta protezione per evitare la sincronizzazione di 2 sincronizzazioni all'interno della stessa cartella</li>
-    <li>I registri vengono ora conservati per 72 ore invece che per 24 ore.</li>
-    <li></li>
+    <li>I registri vengono ora conservati per 7 giorni invece di 24 ore.</li>
   </ul>
 <h2><b>Correzioni di bug</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux-de.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux-de.html
@@ -24,8 +24,7 @@ <h2><b>Neue Funktionen</b></h2>
   <ul>
     <li>Synchronisierung von Links (Symlinks)</li>
     <li>Schutz hinzugef&uuml;gt, um zu verhindern, dass 2 Synchronisierungen innerhalb desselben Ordners stattfinden</li>
-    <li>Die Protokolle werden jetzt 72 Stunden statt 24 Stunden aufbewahrt.</li>
-    <li></li>
+    <li>Die protokolle werden jetzt 7 Tage statt 24 Stunden aufbewahrt.</li>
   </ul>
 <h2><b>Fehlerbehebungen</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux-es.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux-es.html
@@ -24,8 +24,7 @@ <h2><b>Novedades</b></h2>
   <ul>
     <li>Sincronizaci&oacute;n de enlaces (symlinks)</li>
     <li>Protecci&oacute;n a&ntilde;adida para evitar que se sincronicen 2 sincronizaciones dentro de la misma carpeta.</li>
-    <li>Ahora los registros se conservan durante 72 horas en lugar de 24.</li>
-    <li></li>
+    <li>Ahora los registros se conservan durante 7 d&iacute;as en lugar de 24.</li>
   </ul>
 <h2><b>Correcci&oacute;n de errores</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux-fr.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux-fr.html
@@ -24,8 +24,7 @@ <h2><b>Nouvelles fonctionnalit&eacute;s</b></h2>
   <ul>
     <li>Synchronisation des liens (symlinks)</li>
     <li>Ajout d'une protection pour &eacute;viter que 2 synchronisations se fassent dans le m&ecirc;me dossier</li>
-    <li>Les journaux sont d&eacute;sormais conserv&eacute;s pendant 72 heures au lieu de 24 heures.</li>
-    <li></li>
+    <li>Les journaux sont d&eacute;sormais conserv&eacute;s pendant 7 jours au lieu de 24 heures.</li>
   </ul>
 <h2><b>Correction de bugs</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux-it.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux-it.html
@@ -24,8 +24,7 @@ <h2><b>Nuove caratteristiche</b></h2>
   <ul>
     <li>Sincronizzazione dei collegamenti (symlink)</li>
     <li>Aggiunta protezione per evitare la sincronizzazione di 2 sincronizzazioni all'interno della stessa cartella</li>
-    <li>I registri vengono ora conservati per 72 ore invece che per 24 ore.</li>
-    <li></li>
+    <li>I registri vengono ora conservati per 7 giorni invece di 24 ore.</li>
   </ul>
 <h2><b>Correzioni di bug</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-linux.html
@@ -24,8 +24,7 @@ <h2><b>New features</b></h2>
   <ul>
     <li>Synchronisation of links (symlinks)</li>
     <li>Added protection to avoid 2 syncs syncing inside the same folder</li>
-    <li>Logs are now kept for 72 hours instead of 24 hours</li>
-    <li></li>
+    <li>Logs are now kept for 7 days instead of 24 hours</li>
   </ul>
 <h2><b>Bug fixes</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win-de.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win-de.html
@@ -24,8 +24,7 @@ <h2><b>Neue Funktionen</b></h2>
   <ul>
     <li>Synchronisierung von Verkn&uuml;pfungen (Symlinks und Kreuzungen)</li>
     <li>Schutz hinzugef&uuml;gt, um zu verhindern, dass 2 Synchronisierungen innerhalb desselben Ordners stattfinden</li>
-    <li>Die Protokolle werden jetzt 72 Stunden statt 24 Stunden aufbewahrt.</li>
-    <li></li>
+    <li>Die protokolle werden jetzt 7 Tage statt 24 Stunden aufbewahrt.</li>
   </ul>
 <h2><b>Fehlerbehebungen</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win-es.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win-es.html
@@ -24,8 +24,7 @@ <h2><b>Novedades</b></h2>
   <ul>
     <li>Sincronizaci&oacute;n de enlaces (enlaces simb&oacute;licos y enlaces)</li>
     <li>Protecci&oacute;n a&ntilde;adida para evitar que se sincronicen 2 sincronizaciones dentro de la misma carpeta.</li>
-    <li>Ahora los registros se conservan durante 72 horas en lugar de 24.</li>
-    <li></li>
+    <li>Ahora los registros se conservan durante 7 d&iacute;as en lugar de 24.</li>
   </ul>
 <h2><b>Correcci&oacute;n de errores</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win-fr.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win-fr.html
@@ -24,8 +24,7 @@ <h2><b>Nouvelles fonctionnalit&eacute;s</b></h2>
   <ul>
     <li>Synchronisation des liens (liens symboliques et jonctions)</li>
     <li>Ajout d'une protection pour &eacute;viter que 2 synchronisations se fassent dans le m&ecirc;me dossier</li>
-    <li>Les journaux sont d&eacute;sormais conserv&eacute;s pendant 72 heures au lieu de 24 heures.</li>
-    <li></li>
+    <li>Les journaux sont d&eacute;sormais conserv&eacute;s pendant 7 jours au lieu de 24 heures.</li>
   </ul>
 <h2><b>Correction de bugs</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win-it.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win-it.html
@@ -24,8 +24,7 @@ <h2><b>Nuove caratteristiche</b></h2>
   <ul>
     <li>Sincronizzazione dei collegamenti (collegamenti simbolici e giunzioni)</li>
     <li>Aggiunta protezione per evitare la sincronizzazione di 2 sincronizzazioni all'interno della stessa cartella</li>
-    <li>I registri vengono ora conservati per 72 ore invece che per 24 ore.</li>
-    <li></li>
+    <li>I registri vengono ora conservati per 7 giorni invece di 24 ore.</li>
   </ul>
 <h2><b>Correzioni di bug</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501-win.html
@@ -24,8 +24,7 @@ <h2><b>New features</b></h2>
   <ul>
     <li>Synchronisation of links (symlinks and junctions)</li>
     <li>Added protection to avoid 2 syncs syncing inside the same folder</li>
-    <li>Logs are now kept for 72 hours instead of 24 hours</li>
-    <li></li>
+    <li>Logs are now kept for 7 days instead of 24 hours</li>
   </ul>
 <h2><b>Bug fixes</b></h2>
   <ul>

diff --git a/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501.html b/release_notes/kDrive-3.6.0.20240501/kDrive-3.6.0.20240501.html
@@ -26,8 +26,7 @@ <h2><b>New features</b></h2>
     <li>macOS - Synchronisation of links (symlinks and aliases)</li>
     <li>Linux - Synchronisation of links (symlinks)</li>
     <li>Added protection to avoid 2 syncs syncing inside the same folder</li>
-    <li>Logs are now kept for 72 hours instead of 24 hours</li>
-    <li></li>
+    <li>Logs are now kept for 7 days instead of 24 hours</li>
   </ul>
 <h2><b>Bug fixes</b></h2>
   <ul>

diff --git a/src/gui/preferenceswidget.cpp b/src/gui/preferenceswidget.cpp
@@ -398,7 +398,7 @@ PreferencesWidget::PreferencesWidget(std::shared_ptr<ClientGui> gui, QWidget *pa
 
     QVBoxLayout *versionVBox = new QVBoxLayout();
     versionVBox->setContentsMargins(0, 0, 0, 0);
-    versionVBox->setSpacing(0);
+    versionVBox->setSpacing(6);
     versionBox->addLayout(versionVBox);
     versionBox->setStretchFactor(versionVBox, 1);