Merge branch 'master' into work/prevent-reuse-default-sync-folder

owncloud · Jan 5, 2024 · 1238d4b · 1238d4b
2 parents d5ee4d4 + ec3c924
commit 1238d4b
Show file tree

Hide file tree

Showing 27 changed files with 221 additions and 307 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Table of Contents
 
 * [Changelog for unreleased](#changelog-for-owncloud-desktop-client-unreleased-unreleased)
+* [Changelog for 5.2.1](#changelog-for-owncloud-desktop-client-521-2024-01-04)
 * [Changelog for 5.2.0](#changelog-for-owncloud-desktop-client-520-2023-11-27)
 * [Changelog for 5.1.2](#changelog-for-owncloud-desktop-client-512-2023-11-10)
 * [Changelog for 5.1.1](#changelog-for-owncloud-desktop-client-511-2023-11-09)
@@ -38,11 +39,10 @@
 The following sections list the changes in ownCloud Desktop Client unreleased relevant to
 ownCloud admins and users.
 
-[unreleased]: https://github.com/owncloud/client/compare/v5.2.0...master
+[unreleased]: https://github.com/owncloud/client/compare/v5.2.1...master
 
 ## Summary
 
-* Bugfix - Client stuck in reconnecting: [#11274](https://github.com/owncloud/client/issues/11274)
 * Bugfix - Schedule syncs after an abort: [#11396](https://github.com/owncloud/client/pull/11396)
 * Change - Make messages translatable that occur early in start-up: [#11142](https://github.com/owncloud/client/issues/11142)
 * Change - Remove unused command line option --language: [#11245](https://github.com/owncloud/client/issues/11245)
@@ -53,12 +53,6 @@ ownCloud admins and users.
 
 ## Details
 
-* Bugfix - Client stuck in reconnecting: [#11274](https://github.com/owncloud/client/issues/11274)
-
-   We fixed a bug where the client got stuck while reconnecting to the server.
-
-   https://github.com/owncloud/client/issues/11274
-
 * Bugfix - Schedule syncs after an abort: [#11396](https://github.com/owncloud/client/pull/11396)
 
    We fixed a bug where the client stopped scheduling syncs after a sync was
@@ -114,6 +108,34 @@ ownCloud admins and users.
 
    https://github.com/owncloud/client/pull/11347
 
+# Changelog for ownCloud Desktop Client [5.2.1] (2024-01-04)
+
+The following sections list the changes in ownCloud Desktop Client 5.2.1 relevant to
+ownCloud admins and users.
+
+[5.2.1]: https://github.com/owncloud/client/compare/v5.2.0...v5.2.1
+
+## Summary
+
+* Bugfix - Client stuck in reconnecting: [#11274](https://github.com/owncloud/client/issues/11274)
+* Enhancement - Improved reliability for persisting settings: [#11413](https://github.com/owncloud/client/pull/11413)
+
+## Details
+
+* Bugfix - Client stuck in reconnecting: [#11274](https://github.com/owncloud/client/issues/11274)
+
+   We fixed a bug where the client got stuck while reconnecting to the server.
+
+   https://github.com/owncloud/client/issues/11274
+
+* Enhancement - Improved reliability for persisting settings: [#11413](https://github.com/owncloud/client/pull/11413)
+
+   We improved the reliability of saving accounts. This might fix an issue where
+   sync connections were lost at random.
+
+   https://github.com/owncloud/client/issues/11411
+   https://github.com/owncloud/client/pull/11413
+
 # Changelog for ownCloud Desktop Client [5.2.0] (2023-11-27)
 
 The following sections list the changes in ownCloud Desktop Client 5.2.0 relevant to

diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,7 +1,7 @@
 set( MIRALL_VERSION_MAJOR 6 )
 set( MIRALL_VERSION_MINOR 0 )
 set( MIRALL_VERSION_PATCH 0 )
-set( MIRALL_VERSION_YEAR  2023 )
+set( MIRALL_VERSION_YEAR  2024 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )

diff --git a/changelog/unreleased/11274 → changelog/5.2.1_2024-01-04/11274 b/changelog/unreleased/11274 → changelog/5.2.1_2024-01-04/11274
diff --git a/changelog/5.2.1_2024-01-04/11413 b/changelog/5.2.1_2024-01-04/11413
@@ -0,0 +1,7 @@
+Enhancement: Improved reliability for persisting settings
+
+We improved the reliability of saving accounts.
+This might fix an issue where sync connections were lost at random.
+
+https://github.com/owncloud/client/pull/11413
+https://github.com/owncloud/client/issues/11411
diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts
@@ -4020,40 +4020,35 @@ Are you sure you want to proceed?</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/common/utility.cpp" line="343"/>
+        <location filename="../src/common/utility.cpp" line="339"/>
         <source>in the future</source>
         <translation>в бъдеще</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="339"/>
+        <location filename="../src/common/utility.cpp" line="334"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>преди %n ден(а) </numerusform><numerusform>преди %n ден(а) </numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="347"/>
+        <location filename="../src/common/utility.cpp" line="344"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>преди %n час(а) </numerusform><numerusform>преди %n час(а) </numerusform></translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="352"/>
+        <location filename="../src/common/utility.cpp" line="350"/>
         <source>now</source>
         <translation>сега</translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="354"/>
-        <source>Less than a minute ago</source>
-        <translation>Преди по-малко от минута</translation>
+        <location filename="../src/common/utility.cpp" line="352"/>
+        <source>less than a minute ago</source>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="357"/>
+        <location filename="../src/common/utility.cpp" line="356"/>
         <source>%n minute(s) ago</source>
         <translation><numerusform>преди %n минута(и) </numerusform><numerusform>преди %n минута(и) </numerusform></translation>
     </message>
-    <message>
-        <location filename="../src/common/utility.cpp" line="360"/>
-        <source>Some time ago</source>
-        <translation>Преди известно време</translation>
-    </message>
     <message>
         <location filename="../src/libsync/syncresult.cpp" line="115"/>
         <source>%1: %2</source>

diff --git a/translations/client_cs.ts b/translations/client_cs.ts
@@ -4000,40 +4000,35 @@ Jste si jisti, že chcete pokračovat?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/common/utility.cpp" line="343"/>
+        <location filename="../src/common/utility.cpp" line="339"/>
         <source>in the future</source>
         <translation>v budoucnosti</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="339"/>
+        <location filename="../src/common/utility.cpp" line="334"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>před %n dnem</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="347"/>
+        <location filename="../src/common/utility.cpp" line="344"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>před %n hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="352"/>
+        <location filename="../src/common/utility.cpp" line="350"/>
         <source>now</source>
         <translation>nyní</translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="354"/>
-        <source>Less than a minute ago</source>
-        <translation>Méně než před minutou</translation>
+        <location filename="../src/common/utility.cpp" line="352"/>
+        <source>less than a minute ago</source>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="357"/>
+        <location filename="../src/common/utility.cpp" line="356"/>
         <source>%n minute(s) ago</source>
         <translation><numerusform>před %n minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation>
     </message>
-    <message>
-        <location filename="../src/common/utility.cpp" line="360"/>
-        <source>Some time ago</source>
-        <translation>Před nějakým časem</translation>
-    </message>
     <message>
         <location filename="../src/libsync/syncresult.cpp" line="115"/>
         <source>%1: %2</source>

diff --git a/translations/client_de-informal.ts b/translations/client_de-informal.ts
@@ -4014,40 +4014,35 @@ Möchtest du fortfahren?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/common/utility.cpp" line="343"/>
+        <location filename="../src/common/utility.cpp" line="339"/>
         <source>in the future</source>
         <translation>in der Zukunft</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="339"/>
+        <location filename="../src/common/utility.cpp" line="334"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>vor %n Tag(en)</numerusform><numerusform>Vor %n Tage(n)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="347"/>
+        <location filename="../src/common/utility.cpp" line="344"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>Vor %n Stunde(n)</numerusform><numerusform>Vor %n Stunde(n)</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="352"/>
+        <location filename="../src/common/utility.cpp" line="350"/>
         <source>now</source>
         <translation>jetzt</translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="354"/>
-        <source>Less than a minute ago</source>
-        <translation>vor weniger als einer Minute</translation>
+        <location filename="../src/common/utility.cpp" line="352"/>
+        <source>less than a minute ago</source>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="357"/>
+        <location filename="../src/common/utility.cpp" line="356"/>
         <source>%n minute(s) ago</source>
         <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation>
     </message>
-    <message>
-        <location filename="../src/common/utility.cpp" line="360"/>
-        <source>Some time ago</source>
-        <translation>vor einiger Zeit</translation>
-    </message>
     <message>
         <location filename="../src/libsync/syncresult.cpp" line="115"/>
         <source>%1: %2</source>

diff --git a/translations/client_de.ts b/translations/client_de.ts
@@ -4017,40 +4017,35 @@ Möchten Sie fortfahren?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/common/utility.cpp" line="343"/>
+        <location filename="../src/common/utility.cpp" line="339"/>
         <source>in the future</source>
         <translation>in der Zukunft</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="339"/>
+        <location filename="../src/common/utility.cpp" line="334"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>vor %n Tage(n)</numerusform><numerusform>vor %n Tage(n)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="347"/>
+        <location filename="../src/common/utility.cpp" line="344"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>vor %n Stunde(n)</numerusform><numerusform>vor %n Stunde(n)</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="352"/>
+        <location filename="../src/common/utility.cpp" line="350"/>
         <source>now</source>
         <translation>jetzt</translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="354"/>
-        <source>Less than a minute ago</source>
-        <translation>Vor weniger als einer Minute</translation>
+        <location filename="../src/common/utility.cpp" line="352"/>
+        <source>less than a minute ago</source>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="357"/>
+        <location filename="../src/common/utility.cpp" line="356"/>
         <source>%n minute(s) ago</source>
         <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>Vor %n Minute(n)</numerusform></translation>
     </message>
-    <message>
-        <location filename="../src/common/utility.cpp" line="360"/>
-        <source>Some time ago</source>
-        <translation>Vor einiger Zeit</translation>
-    </message>
     <message>
         <location filename="../src/libsync/syncresult.cpp" line="115"/>
         <source>%1: %2</source>

diff --git a/translations/client_de_AT.ts b/translations/client_de_AT.ts
@@ -4015,40 +4015,35 @@ Möchten Sie fortfahren?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/common/utility.cpp" line="343"/>
+        <location filename="../src/common/utility.cpp" line="339"/>
         <source>in the future</source>
         <translation>in der Zukunft</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="339"/>
+        <location filename="../src/common/utility.cpp" line="334"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>Vor %n Tage(n)</numerusform><numerusform>Vor %n Tage(n)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="347"/>
+        <location filename="../src/common/utility.cpp" line="344"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>Vor %n Stunde(n)</numerusform><numerusform>Vor %n Stunde(n)</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="352"/>
+        <location filename="../src/common/utility.cpp" line="350"/>
         <source>now</source>
         <translation>jetzt</translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="354"/>
-        <source>Less than a minute ago</source>
-        <translation>vor weniger als einer Minute</translation>
+        <location filename="../src/common/utility.cpp" line="352"/>
+        <source>less than a minute ago</source>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="357"/>
+        <location filename="../src/common/utility.cpp" line="356"/>
         <source>%n minute(s) ago</source>
         <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation>
     </message>
-    <message>
-        <location filename="../src/common/utility.cpp" line="360"/>
-        <source>Some time ago</source>
-        <translation>vor einiger Zeit</translation>
-    </message>
     <message>
         <location filename="../src/libsync/syncresult.cpp" line="115"/>
         <source>%1: %2</source>

diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts
@@ -4014,40 +4014,35 @@ Möchten Sie fortfahren?</translation>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/common/utility.cpp" line="343"/>
+        <location filename="../src/common/utility.cpp" line="339"/>
         <source>in the future</source>
         <translation>in der Zukunft</translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="339"/>
+        <location filename="../src/common/utility.cpp" line="334"/>
         <source>%n day(s) ago</source>
         <translation><numerusform>vor %n Tag(en)</numerusform><numerusform>Vor %n Tage(n)</numerusform></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="347"/>
+        <location filename="../src/common/utility.cpp" line="344"/>
         <source>%n hour(s) ago</source>
         <translation><numerusform>Vor %n Stunde(n)</numerusform><numerusform>Vor %n Stunde(n)</numerusform></translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="352"/>
+        <location filename="../src/common/utility.cpp" line="350"/>
         <source>now</source>
         <translation>jetzt</translation>
     </message>
     <message>
-        <location filename="../src/common/utility.cpp" line="354"/>
-        <source>Less than a minute ago</source>
-        <translation>vor weniger als einer Minute</translation>
+        <location filename="../src/common/utility.cpp" line="352"/>
+        <source>less than a minute ago</source>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
-        <location filename="../src/common/utility.cpp" line="357"/>
+        <location filename="../src/common/utility.cpp" line="356"/>
         <source>%n minute(s) ago</source>
         <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation>
     </message>
-    <message>
-        <location filename="../src/common/utility.cpp" line="360"/>
-        <source>Some time ago</source>
-        <translation>vor einiger Zeit</translation>
-    </message>
     <message>
         <location filename="../src/libsync/syncresult.cpp" line="115"/>
         <source>%1: %2</source>