Merge branch 'main' into develop

build.gradle

@@ -42,7 +42,7 @@ allprojects {
 	ext {
 		androidApplicationId = 'org.cryptomator'
 		androidVersionCode = getVersionCode()
-		androidVersionName = '1.5.14-SNAPSHOT'
+		androidVersionName = '1.5.14'
 	}
 	repositories {
 		mavenCentral()

fastlane/metadata/android/de-DE/changelogs/default.txt

@@ -1,2 +1,4 @@
-- Möglichkeit neu erstellte Videos über den automatischen Upload hochzuladen hinzugefügt
-- Möglichkeit das Entsperren eines Tresors abzubrechen hinzugefügt
+- Native pCloud-Unterstützung hinzugefügt (großen Dank an Manu für die Implementierung)
+- App-Absturz beim Wiederherstellen von Cryptomator aus einem Backup behoben
+- Verbesserte Anzeige von langen Einstellungen
+- Verbessertes Löschen des letzten Bildes über die Vorschau. Springt jetzt zurück in die Tresor-Inhaltsliste

fastlane/metadata/android/en-US/changelogs/default.txt

@@ -1,2 +1,4 @@
-- Added possibility to upload newly created videos via automatic upload as well
-- Added possibility to cancel unlocking a vault
+- Added pCloud native support (thanks to Manu for this huge contribution)
+- Fixed app crash when restoring Cryptomator from a backup
+- Enhanced display of long settings
+- Enhanced deletion of the last image via the preview. Now jumps back to the vault contents list

fastlane/release-notes.html

@@ -1,4 +1,6 @@
 <ul>
-  <li>Added possibility to upload newly created videos via automatic upload as well</li>
-  <li>Added possibility to cancel unlocking a vault</li>
+  <li>Added pCloud native support (thanks to Manu for this huge contribution)</li>
+  <li>Fixed app crash when restoring Cryptomator from a backup</li>
+  <li>Enhanced display of long settings</li>
+  <li>Enhanced deletion of the last image via the preview. Now jumps back to the vault contents list</li>
 </ul>