diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f93230561fa4..562f487ba769 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -53,4 +53,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6a3181bc2c36..954391426938 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -42,6 +42,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           sarif_file: results.sarif
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc399426ff45..095cc1bb57dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 3.30.3 (October 22, 2024)
+
+- Bugfix for two way sync: sync only on wifi
+
+## 3.30.2 (October 21, 2024)
+
+- Bugfix for two way sync. Please check listed folders in settings -> internal two way sync
+
+Minimum: NC 16 Server, Android 7.0 Nougat
+
+For a full list, please see https://github.com/nextcloud/android/milestone/99
+
 ## 3.30.1 (October 11, 2024)
 
 - Bugfixes
diff --git a/app/build.gradle b/app/build.gradle
index 76ed41c4929d..262625f33600 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ plugins {
     id "org.jetbrains.kotlin.plugin.compose" version "2.0.20"
     id "com.diffplug.spotless" version "6.25.0"
     id "org.jetbrains.kotlin.kapt" version "2.0.20"
-    id 'com.google.devtools.ksp' version '2.0.20-1.0.25' apply false
+    id 'com.google.devtools.ksp' version '2.0.21-1.0.25' apply false
 }
 
 apply plugin: 'com.android.application'
@@ -310,7 +310,7 @@ dependencies {
         exclude group: "com.android.support"
     }
     implementation 'com.caverock:androidsvg:1.4'
-    implementation 'androidx.annotation:annotation:1.8.2'
+    implementation 'androidx.annotation:annotation:1.9.0'
     implementation 'com.vanniktech:emoji-google:0.21.0'
 
     // document scanner not available on FDroid (generic) due to OpenCV binaries
@@ -413,7 +413,7 @@ dependencies {
     // upon each update first test: new registration, receive push
     gplayImplementation "com.google.firebase:firebase-messaging:24.0.2"
     gplayImplementation 'com.google.android.gms:play-services-base:18.5.0'
-    gplayImplementation 'com.google.android.play:review-ktx:2.0.1'
+    gplayImplementation 'com.google.android.play:review-ktx:2.0.2'
 
     implementation 'com.github.nextcloud.android-common:ui:0.17.0'
 
diff --git a/app/src/main/java/com/nextcloud/client/jobs/InternalTwoWaySyncWork.kt b/app/src/main/java/com/nextcloud/client/jobs/InternalTwoWaySyncWork.kt
index a84331685257..a29c9ecdfdf7 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/InternalTwoWaySyncWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/InternalTwoWaySyncWork.kt
@@ -35,7 +35,9 @@ class InternalTwoWaySyncWork(
         var result = true
 
         if (powerManagementService.isPowerSavingEnabled ||
-            !connectivityService.isConnected || connectivityService.isInternetWalled
+            !connectivityService.isConnected ||
+            connectivityService.isInternetWalled ||
+            !connectivityService.connectivity.isWifi
         ) {
             Log_OC.d(TAG, "Not starting due to constraints!")
             return Result.success()
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 420b50a70bbb..a429864261f9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -56,6 +56,7 @@
     <string name="assistant_screen_task_delete_success_message">Tâche supprimée avec succès</string>
     <string name="assistant_screen_task_list_error_state_message">Impossible de récupérer la liste des tâches, veuillez vérifier votre connexion Internet.</string>
     <string name="assistant_screen_task_more_actions_bottom_sheet_delete_action">Supprimer la tâche</string>
+    <string name="assistant_screen_task_output_empty_text">Le résultat de la tâche n\'est pas encore prêt.</string>
     <string name="assistant_screen_task_types_error_state_message">Impossible de récupérer les types des tâches, veuillez vérifier votre connexion Internet.</string>
     <string name="assistant_screen_top_bar_title">Assistant</string>
     <string name="assistant_screen_unknown_task_status_text">Inconnu</string>
@@ -281,8 +282,11 @@
     <string name="drawer_quota">%1$s utilisés sur %2$s</string>
     <string name="drawer_quota_unlimited">%1$s utilisé</string>
     <string name="drawer_synced_folders">Téléversement automatique</string>
+    <string name="e2e_counter_too_old">Le compteur est trop vieux</string>
+    <string name="e2e_hash_not_found">Hachage non trouvé</string>
     <string name="e2e_not_yet_setup">E2E pas encore configuré</string>
     <string name="e2e_offline">Impossible sans connexion internet</string>
+    <string name="e2e_signature_does_not_match">La signature ne correspond pas</string>
     <string name="ecosystem_apps_display_assistant">Assistant</string>
     <string name="ecosystem_apps_display_more">Plus</string>
     <string name="ecosystem_apps_display_notes">Notes</string>
@@ -408,8 +412,14 @@
     <string name="file_migration_updating_index">Mise à jour de l\'index…</string>
     <string name="file_migration_use_data_folder">Conserver le dossier actuel</string>
     <string name="file_migration_waiting_for_unfinished_sync">En attente de la synchronisation complète…</string>
+    <string name="file_name_validator_current_path_is_invalid">Le nom du dossier actuellement invalide, veuillez renommer le dossier. Redirection vers la page d\'accueil…</string>
+    <string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Le chemin du dossier contient des noms réservés ou des caractères non valides</string>
+    <string name="file_name_validator_error_forbidden_file_extensions">%s est une extension de fichier interdite</string>
+    <string name="file_name_validator_error_forbidden_space_character_extensions">Les noms de fichiers ne doivent pas contenir d\'espaces au début ou à la fin</string>
+    <string name="file_name_validator_error_invalid_character">Le nom contient des caractères invalides: %s</string>
     <string name="file_name_validator_error_reserved_names">%s est un nom interdit</string>
     <string name="file_name_validator_rename_before_move_or_copy">%s. Veuillez renommer le fichier avant de le déplacer ou de le copier</string>
+    <string name="file_name_validator_upload_content_error">Certains contenus ne peuvent pas être téléversé car ils contiennent des noms réservés ou des caractères invalides</string>
     <string name="file_not_found">Fichier non trouvé</string>
     <string name="file_not_synced">Le fichier ne peut pas être synchronisé. Affichage de la dernière version disponible. </string>
     <string name="file_rename">Renommer</string>
@@ -482,6 +492,7 @@
     <string name="instant_upload_path">/InstantUpload</string>
     <string name="internal_two_way_sync">Synchronisation interne bidirectionnelle</string>
     <string name="internal_two_way_sync_not_yet">Pas encore, bientôt synchronisé</string>
+    <string name="internet_connection_required_for_encrypted_folder_setup">Une connexion Internet est requise pour configurer le dossier chiffré</string>
     <string name="invalid_url">URL invalide</string>
     <string name="invisible">Invisible</string>
     <string name="label_empty">Le libellé ne peut pas être vide</string>
@@ -581,10 +592,14 @@
     <string name="notification_channel_upload_description">Afficher la progression du téléversement</string>
     <string name="notification_channel_upload_name_short">Téléversements</string>
     <string name="notification_icon">Icône de notification</string>
+    <string name="notification_icon_description">Des notifications non lues existent</string>
     <string name="notifications_no_results_headline">Aucune notification</string>
     <string name="notifications_no_results_message">Veuillez revenir plus tard.</string>
     <string name="oc_file_list_adapter_offline_operation_description_text">Opération en attente</string>
     <string name="offline_mode">Aucune connexion Internet</string>
+    <string name="offline_mode_info_description">Même sans connexion Internet, vous pouvez organiser vos dossiers, créer des fichiers. Dès que vous êtes de nouveau en ligne, vos actions en cours sont automatiquement synchronisées.</string>
+    <string name="offline_mode_info_title">Vous êtes hors ligne, mais le travail continue</string>
+    <string name="offline_operations_file_does_not_exists_yet">Le fichier n\'existe pas encore. Veuillez d\'abord téléverser le fichier.</string>
     <string name="offline_operations_worker_notification_conflict_text">Dossier en conflit : %s</string>
     <string name="offline_operations_worker_notification_delete_offline_folder">Supprimer le dossier hors ligne</string>
     <string name="offline_operations_worker_notification_error_text">L\'opération hors ligne ne peut être achevée. %s</string>
@@ -619,6 +634,7 @@
     <string name="placeholder_timestamp">18/05/2012 12:23 PM</string>
     <string name="player_stop">arrêter</string>
     <string name="player_toggle">inverser</string>
+    <string name="please_select_a_server">Veuillez sélectionner un serveur…</string>
     <string name="power_save_check_dialog_message">Désactiver l\'économie de batterie peut entraîner le téléversement de fichiers même avec un faible niveau de batterie !</string>
     <string name="pref_behaviour_entries_delete_file">supprimé</string>
     <string name="pref_behaviour_entries_keep_file">conservé dans le dossier original</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 64dcb93b32e5..008af3031c69 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -178,8 +178,10 @@
     <string name="confirmation_remove_local">Tylko lokalnie</string>
     <string name="conflict_dialog_error">Nie można utworzyć okna dialogowego rozwiązywania konfliktów</string>
     <string name="conflict_file_headline">Plik powodujący konflikt %1$s</string>
+    <string name="conflict_folder_headline">Konflikt folderów</string>
     <string name="conflict_local_file">Plik lokalny</string>
     <string name="conflict_message_description">Jeśli wybierzesz obie wersje, to do nazwy pliku lokalnego zostanie dodany numer.</string>
+    <string name="conflict_message_description_for_folder">Jeżeli wybierzesz obie wersje, to do nazwy folderu lokalnego zostanie dodany numer</string>
     <string name="conflict_server_file">Plik z serwera</string>
     <string name="contact_backup_title">Kopia zapasowa kontaktów</string>
     <string name="contact_no_permission">Wymagane jest pozwolenie na lokalizację</string>
@@ -209,6 +211,7 @@
     <string name="create_new_presentation">Nowa prezentacja</string>
     <string name="create_new_spreadsheet">Nowy arkusz kalkulacyjny</string>
     <string name="create_rich_workspace">Dodaj opis folderu</string>
+    <string name="creates_rich_workspace">Dodaj opis folderu</string>
     <string name="credentials_disabled">Poświadczenia wyłączone</string>
     <string name="daily_backup">Codzienna kopia zapasowa</string>
     <string name="data_to_back_up">Dane dla kopii zapasowej</string>
@@ -350,6 +353,7 @@
     <string name="failed_update_ui">Nie udało się zaktualizować UI</string>
     <string name="favorite">Dodaj do ulubionych</string>
     <string name="favorite_icon">Ulubiony</string>
+    <string name="file_activity_shared_file_cannot_be_updated">Udostępniony plik nie może zostać uaktualniony</string>
     <string name="file_already_exists">Nazwa pliku już istnieje</string>
     <string name="file_delete">Usuń</string>
     <string name="file_detail_activity_error">Błąd podczas pobierania aktywności dla pliku</string>
@@ -363,6 +367,7 @@
     <string name="file_list_empty_headline">Brak plików</string>
     <string name="file_list_empty_headline_search">Brak wyników w tym katalogu</string>
     <string name="file_list_empty_headline_server_search">Brak wyników</string>
+    <string name="file_list_empty_local_search">Brak plików lub folderów spełniających kryteria wyszukiwania</string>
     <string name="file_list_empty_moving">Pusto. Możesz dodać katalog.</string>
     <string name="file_list_empty_on_device">Tutaj pojawią się pobrane pliki i katalogi.</string>
     <string name="file_list_empty_recently_modified">Nie znaleziono żadnych plików modyfikowanych w ciągu ostatnich 7 dni</string>
@@ -400,6 +405,14 @@
     <string name="file_migration_updating_index">Aktualizacja indeksu…</string>
     <string name="file_migration_use_data_folder">Użyj</string>
     <string name="file_migration_waiting_for_unfinished_sync">Oczekuje na pełną synchronizację…</string>
+    <string name="file_name_validator_current_path_is_invalid">Nazwa folderu jest niewłaściwa, zmień nazwę folderu. Przekierowuję na stronę główną</string>
+    <string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Ścieżka folderu zawiera zarezerwowane nazwy albo nieprawidłowy znak</string>
+    <string name="file_name_validator_error_forbidden_file_extensions">%s jest zabronionym rozszerzeniem pliku</string>
+    <string name="file_name_validator_error_forbidden_space_character_extensions">Nazwy plików nie mogą zawierać spacji na początku i końcu nazwy</string>
+    <string name="file_name_validator_error_invalid_character">Nazwa zawiera niedozwolone znaki %s</string>
+    <string name="file_name_validator_error_reserved_names">%sjest zabronioną nazwą</string>
+    <string name="file_name_validator_rename_before_move_or_copy">%s. Zmień nazwę pliku przed przeniesieniem lub skopiowaniem</string>
+    <string name="file_name_validator_upload_content_error">Część zawartości nie może zostać uploadowana ponieważ zawiera niewłaściwe nazwy lub znaki</string>
     <string name="file_not_found">Nie znaleziono pliku</string>
     <string name="file_not_synced">Nie można zsynchronizować pliku. Pokazana jest najnowsza dostępna wersja.</string>
     <string name="file_rename">Zmień nazwę</string>
@@ -423,6 +436,7 @@
     <string name="folder_already_exists">Katalog już istnieje</string>
     <string name="folder_confirm_create">Utwórz</string>
     <string name="folder_list_empty_headline">Brak katalogów</string>
+    <string name="folder_name_empty">Nazwa folderu nie może być pusta</string>
     <string name="folder_picker_choose_button_text">Wybierz</string>
     <string name="folder_picker_choose_caption_text">Wybierz katalog docelowy</string>
     <string name="folder_picker_copy_button_text">Skopiuj</string>
@@ -468,6 +482,7 @@
     <string name="instant_upload_existing">Wyślij również istniejące pliki</string>
     <string name="instant_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
     <string name="instant_upload_path">/InstantUpload</string>
+    <string name="internet_connection_required_for_encrypted_folder_setup">Aby ustawić szyfrowany folder wymagane jest połączenie z intenetem</string>
     <string name="invalid_url">Nieprawidłowy adres URL</string>
     <string name="invisible">Niewidoczny</string>
     <string name="label_empty">Etykieta nie może być pusta</string>
@@ -506,6 +521,7 @@
     <string name="manage_space_clear_data">Wyczyść dane</string>
     <string name="manage_space_description">Ustawienia, bazy danych i certyfikaty serwera %1$s zostaną trwale usunięte.\n\nPobrane pliki pozostaną na swoich miejscach.\n\nTen proces może trochę potrwać.</string>
     <string name="manage_space_title">Zarządzaj przestrzenią</string>
+    <string name="max_file_count_warning_message">Osiągnięto maksymalny limit upload. Proszę uploadować mniej niż 500 plików w jednym czasie</string>
     <string name="media_err_invalid_progressive_playback">Plik multimedialny nie może być przesyłany strumieniowo</string>
     <string name="media_err_io">Nie można odczytać pliku</string>
     <string name="media_err_malformed">Nieprawidłowe kodowanie pliku multimedialnego</string>
@@ -551,6 +567,7 @@
     <string name="note_could_not_sent">Nie można wysłać notatki</string>
     <string name="note_icon_hint">Ikona notatki</string>
     <string name="notification_action_failed">Wykonanie akcji nie powiodło się.</string>
+    <string name="notification_channel_background_operations_name">Operacje w tle</string>
     <string name="notification_channel_download_description">Pokazuje postęp pobierania</string>
     <string name="notification_channel_download_name_short">Pobrane</string>
     <string name="notification_channel_file_sync_description">Pokazuje postęp synchronizacji plików i jej wynik</string>
@@ -564,8 +581,10 @@
     <string name="notification_channel_upload_description">Pokazuje postęp wysyłania</string>
     <string name="notification_channel_upload_name_short">Wysłane</string>
     <string name="notification_icon">Ikona powiadomień</string>
+    <string name="notification_icon_description">Nieprzeczytane powiadomienia</string>
     <string name="notifications_no_results_headline">Brak powiadomień</string>
     <string name="notifications_no_results_message">Sprawdź później.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Trwające działania</string>
     <string name="offline_mode">Brak połączenia z Internetem</string>
     <string name="oneHour">1 godzina</string>
     <string name="online">Online</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 2090b5d2f544..08f768c7e005 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -792,6 +792,7 @@
     <string name="upload_local_storage_full">Bộ nhớ máy đã đầy</string>
     <string name="upload_local_storage_not_copied">Không thể sao chép tệp vào bộ nhớ máy</string>
     <string name="upload_lock_failed">Không khóa được thư mục</string>
+    <string name="upload_manually_cancelled">Upload was cancelled by user</string>
     <string name="upload_old_android">Mã hóa chỉ khả dụng với &gt;= Android 5.0</string>
     <string name="upload_query_move_foreign_files">Không đủ dung lượng ngăn việc sao chép các tệp đã chọn vào thư mục %1$s. Bạn có muốn chuyển chúng đến đó không?</string>
     <string name="upload_scan_doc_upload">Quét tài liệu từ máy ảnh</string>
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c7d0ea7d1f40..7641c6cd674e 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -6957,6 +6957,14 @@
             <sha256 value="1940587951d8edefecfa30491d85733289f5ab52b7ab67d25f0f9735ac56fff7" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.google.android.play" name="core-common" version="2.0.4">
+         <artifact name="core-common-2.0.4.aar">
+            <sha256 value="36400824014fc61d9379b13dd1ab13f6514847fb04347c0fdfe618bace78f3ed" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="core-common-2.0.4.pom">
+            <sha256 value="8dde961cb7e10ca5fa0e55261e7babc1e340bf5972ba3538c7cf4e34d338efbe" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.android.play" name="review" version="2.0.1">
          <artifact name="review-2.0.1.aar">
             <sha256 value="269c6241658756edeee5993db4577199d806ab1252fe74e20d0241878a483603" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6965,6 +6973,14 @@
             <sha256 value="721731fd7132e776edd208f967edf038e23de6e650f0f055c42d46d9364bce74" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.google.android.play" name="review" version="2.0.2">
+         <artifact name="review-2.0.2.aar">
+            <sha256 value="1602026678231dba0f7482d1244e45ff83d9ff22fc8b6d6be8961228ac7a32dd" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="review-2.0.2.pom">
+            <sha256 value="df4f2490cddb651ffbe784c8c5b979ec69996bc687ca7cd678c7d5f65b2897e8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.android.play" name="review-ktx" version="2.0.1">
          <artifact name="review-ktx-2.0.1.aar">
             <sha256 value="10798224d2035d1f8298dde967eeac5793aecd57725391a4cbca37be5a23504d" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -6973,6 +6989,14 @@
             <sha256 value="2ed3fec6af3f3e81f2d4d06a421f2e5d6164f0640f33360a18566147f8d2a4ea" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.google.android.play" name="review-ktx" version="2.0.2">
+         <artifact name="review-ktx-2.0.2.aar">
+            <sha256 value="dc72287e3b23c1041ecd1ce2be6bd561c67afafb5b95ac9224c196643ea0faa0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="review-ktx-2.0.2.pom">
+            <sha256 value="b659701e508663ebda6b50a2697bb2c0f8c984633146b13906d7c986a99d0436" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.api.grpc" name="proto-google-common-protos" version="2.0.1">
          <artifact name="proto-google-common-protos-2.0.1.jar">
             <sha256 value="5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef" origin="Generated by Gradle"/>