diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 032bfbeca5..d24bd37feb 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -49,7 +49,7 @@ jobs:
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}
             -   name: Set up JDK 17
-                uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+                uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
                 with:
                     distribution: "temurin"
                     java-version: 17
diff --git a/.github/workflows/autoApproveSync.yml b/.github/workflows/autoApproveSync.yml
index 4beff67439..b808dd0f7f 100644
--- a/.github/workflows/autoApproveSync.yml
+++ b/.github/workflows/autoApproveSync.yml
@@ -29,6 +29,11 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ contains(github.event.pull_request.labels.*.name, 'sync') && github.actor == 'nextcloud-android-bot' }}
     steps:
+      - name: Disabled on forks
+        if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
+        run: |
+          echo 'Can not approve PRs from forks'
+          exit 1
       - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index bace496ac2..32832b4f1c 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -43,7 +43,7 @@ jobs:
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
-        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+        uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
         with:
           distribution: "temurin"
           java-version: 17
diff --git a/.github/workflows/command-rebase.yml b/.github/workflows/command-rebase.yml
deleted file mode 100644
index 6f801d45f0..0000000000
--- a/.github/workflows/command-rebase.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# This workflow is provided via the organization template repository
-#
-# https://github.com/nextcloud/.github
-# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
-
-# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
-
-name: Rebase command
-
-on:
-  issue_comment:
-    types: created
-
-permissions:
-  contents: read
-
-jobs:
-  rebase:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: none
-
-    # On pull requests and if the comment starts with `/rebase`
-    if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
-
-    steps:
-      - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "+1"
-
-      - name: Checkout the latest code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-
-      - name: Automatic Rebase
-        uses: cirrus-actions/rebase@b87d48154a87a85666003575337e27b8cd65f691 # 1.8
-        env:
-          GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
-
-      - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
-        if: failure()
-        with:
-          token: ${{ secrets.COMMAND_BOT_PAT }}
-          repository: ${{ github.event.repository.full_name }}
-          comment-id: ${{ github.event.comment.id }}
-          reaction-type: "-1"
diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml
index 2454bcc2d8..711ace96ec 100644
--- a/app/src/main/res/values-ast/strings.xml
+++ b/app/src/main/res/values-ast/strings.xml
@@ -21,6 +21,7 @@
     <string name="activity_icon">Actividá</string>
     <string name="add_another_public_share_link">Amestar otru enllaz</string>
     <string name="advanced_settings">Configuración avanzada</string>
+    <string name="app_config_base_url_title">URL base</string>
     <string name="app_config_proxy_port_title">Puertu del proxy</string>
     <string name="appbar_search_in">Buscar en: %s</string>
     <string name="assistant_screen_all_task_type">Too</string>
@@ -485,7 +486,7 @@
     <string name="share_room_clarification">%1$s (conversación)</string>
     <string name="share_send_note">Nota al destinatariu</string>
     <string name="share_settings">Configuración</string>
-    <string name="share_via_link_hide_download">Anubrir la descarga</string>
+    <string name="share_via_link_hide_download">Esconder la descarga</string>
     <string name="share_via_link_section_title">Compartir enllaz</string>
     <string name="share_via_link_send_link_label">Unviar l\'enllaz</string>
     <string name="show_images">Amosar les semeyes</string>
@@ -493,7 +494,7 @@
     <string name="signup_with_provider">Rexistrase con un fornidor</string>
     <string name="single_sign_on_request_token" formatted="true">¿Quies permitr que %1$s acceda a la cuenta de Nextcloud %2$s?</string>
     <string name="sort_by">Ordenar per</string>
-    <string name="ssl_validator_btn_details_hide">Anubrir</string>
+    <string name="ssl_validator_btn_details_hide">Esconder</string>
     <string name="ssl_validator_btn_details_see">Detalles</string>
     <string name="ssl_validator_header">Nun se pudo verificar la identidá del sirvidor</string>
     <string name="ssl_validator_label_C">País:</string>
diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index 0c383d6e25..bfab03dd2a 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -34,7 +34,7 @@
     <string name="add_to_cloud">Add to %1$s</string>
     <string name="advanced_settings">Advanced Settings</string>
     <string name="allow_resharing">Allow resharing</string>
-    <string name="app_config_base_url_title">Base Url</string>
+    <string name="app_config_base_url_title">Base URL</string>
     <string name="app_config_proxy_host_title">Proxy Host Name</string>
     <string name="app_config_proxy_port_title">Proxy Port</string>
     <string name="app_widget_description">Shows one widget from dashboard</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 29a0558d48..d203f8f2b6 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -32,6 +32,7 @@
     <string name="add_to_cloud">Добави към %1$s</string>
     <string name="advanced_settings">Допълнителни настройки</string>
     <string name="allow_resharing">Може да споделя повторно</string>
+    <string name="app_config_base_url_title">Основен URL адрес</string>
     <string name="app_config_proxy_port_title">Порт на прокси сървъра</string>
     <string name="app_widget_description">Показва един изпълним модул от таблото за управление</string>
     <string name="appbar_search_in">Търсене в %s</string>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index de79ea6fc6..9584279a92 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">Ouzhpennañ da %1$s</string>
     <string name="advanced_settings">Arventennoù araokaet</string>
     <string name="allow_resharing">Aotren rannañ pelloc\'h</string>
-    <string name="app_config_base_url_title">Url diazez</string>
     <string name="app_config_proxy_host_title">Anv Ostiz Proksi</string>
     <string name="app_config_proxy_port_title">Porzh Proksi</string>
     <string name="app_widget_description">Diskouez a ra ur widget dre daolenn-vourzh</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b3cc8e9b80..f731e4a62e 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -31,6 +31,7 @@
     <string name="add_to_cloud">Afegeix a %1$s</string>
     <string name="advanced_settings">Paràmetres avançats</string>
     <string name="allow_resharing">Permet compartir de nou</string>
+    <string name="app_config_base_url_title">URL base</string>
     <string name="app_config_proxy_port_title">Port del proxy</string>
     <string name="app_widget_description">Mostra un giny del tauler</string>
     <string name="appbar_search_in">Cerca a %s</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 6022f0e71d..0bc1a9affd 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -33,6 +33,7 @@
     <string name="add_to_cloud">Přidat k %1$s</string>
     <string name="advanced_settings">Pokročilá nastavení</string>
     <string name="allow_resharing">Povolit sdílet dál dalším</string>
+    <string name="app_config_base_url_title">Základní URL</string>
     <string name="app_config_proxy_port_title">Port proxy</string>
     <string name="app_widget_description">Zobrazuje jeden ovládací prvek z nástěnky</string>
     <string name="appbar_search_in">Hledat v %s</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index c4f903669a..d938df677e 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -31,6 +31,7 @@
     <string name="add_to_cloud">Προσθήκη στο %1$s</string>
     <string name="advanced_settings">Ρυθμίσεις για προχωρημένους</string>
     <string name="allow_resharing">Επιτρέπεται ο επαναδιαμοιρασμός</string>
+    <string name="app_config_base_url_title">Βασική URL</string>
     <string name="app_config_proxy_port_title">Θύρα διαμεσολαβητή</string>
     <string name="app_widget_description">Εμφάνιση ενός γραφικού στοιχείου από τον πίνακα ελέγχου</string>
     <string name="appbar_search_in">Αναζήτηση στο %s</string>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 185d87264b..bc39f0201c 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">Añadir %1$s</string>
     <string name="advanced_settings">Configuración avanzada</string>
     <string name="allow_resharing">Permitir volver a compartir</string>
-    <string name="app_config_base_url_title">URL base</string>
     <string name="app_config_proxy_host_title">Nombre del Servidor Proxy</string>
     <string name="app_config_proxy_port_title">Puerto del Proxy</string>
     <string name="app_widget_description">Muestra un widget del panel</string>
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index b59a2c85d1..dff7c104b1 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">Agregar a %1$s</string>
     <string name="advanced_settings">Configuraciones avanzadas</string>
     <string name="allow_resharing">Permitir volver a compartir</string>
-    <string name="app_config_base_url_title">URL base</string>
     <string name="app_config_proxy_host_title">Nombre del Servidor Proxy</string>
     <string name="app_config_proxy_port_title">Puerto del Proxy</string>
     <string name="app_widget_description">Muestra un widget del panel de control</string>
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index bcf38f92ef..a8569e060a 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -32,6 +32,7 @@
     <string name="add_to_cloud">Agregar a %1$s</string>
     <string name="advanced_settings">Configuración avanzada</string>
     <string name="allow_resharing">Permitir volver a compartir</string>
+    <string name="app_config_base_url_title">URL Base</string>
     <string name="app_config_proxy_port_title">Puerto del proxy</string>
     <string name="app_widget_description">Muestra un widget del panel de control</string>
     <string name="appbar_search_in">Compartir en %s</string>
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index d14e6cb317..00db7c4a03 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">Agregar a %1$s</string>
     <string name="advanced_settings">Configuraciones Avanzadas</string>
     <string name="allow_resharing">Permitir volver a compartir</string>
-    <string name="app_config_base_url_title">URL base</string>
     <string name="app_config_proxy_host_title">Nombre del huésped del proxy</string>
     <string name="app_config_proxy_port_title">Puerto del proxy</string>
     <string name="app_widget_description">Muestra un widget del panel</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index dd78d140ed..ffaae49b7b 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -34,7 +34,7 @@
     <string name="add_to_cloud">Gehitu %1$s</string>
     <string name="advanced_settings">Ezarpen aurreratuak</string>
     <string name="allow_resharing">Baimendu birpartekatzea</string>
-    <string name="app_config_base_url_title">Oinarrizko URLa</string>
+    <string name="app_config_base_url_title">Oinarri URLa</string>
     <string name="app_config_proxy_host_title">Proxy ostalariaren izena</string>
     <string name="app_config_proxy_port_title">Proxy-ataka</string>
     <string name="app_widget_description">Paneleko trepeta bat erakusten du</string>
@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Lokala bakarrik</string>
     <string name="conflict_dialog_error">Gatazkak konpontzeko elkarrizketa-koadroa ezin da sortu</string>
     <string name="conflict_file_headline">%1$sfitxategi gatazkatsua</string>
+    <string name="conflict_folder_headline">Karpeta gatazka</string>
     <string name="conflict_local_file">Fitxategi lokala</string>
     <string name="conflict_message_description">Bi bertsioak hautatzen badituzu, fitxategi lokalaren izenari zenbaki bat gehituko zaio.</string>
+    <string name="conflict_message_description_for_folder">Bi bertsioak hautatzen badituzu, fitxategi lokalaren izenari zenbaki bat gehituko zaio.</string>
     <string name="conflict_server_file">Zerbitzariko fitxategia</string>
     <string name="contact_backup_title">Kontaktuen segurtasun kopia</string>
     <string name="contact_no_permission">Kontaktuak atzitzeko baimena behar da.</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">Ezin izan da bidali oharra</string>
     <string name="note_icon_hint">Oharraren ikonoa</string>
     <string name="notification_action_failed">Huts egin du ekintza exekutatzean.</string>
+    <string name="notification_channel_background_operations_description">Erakutsi jakinarazpenak atzeko planoko eragiketen emaitzekin elkarreragiteko</string>
+    <string name="notification_channel_background_operations_name">Atzeko planoko eragiketak</string>
     <string name="notification_channel_download_description">Erakutsi deskarga egoera</string>
     <string name="notification_channel_download_name_short">Deskargak</string>
     <string name="notification_channel_file_sync_description">Fitxategien sinkronizazioaren aurrerapena eta emaitzak erakusten ditu</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">Jakinarazpen ikonoa</string>
     <string name="notifications_no_results_headline">Jakinarazpenik ez</string>
     <string name="notifications_no_results_message">Begiratu beranduago, mesedez.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Eragiketaren zain</string>
     <string name="offline_mode">Internet konexiorik ez</string>
+    <string name="offline_operations_worker_notification_conflict_text">Karpeta gatazkan: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Ezabatu lineaz kanpoko karpeta</string>
+    <string name="offline_operations_worker_notification_error_text">Lineaz kanpoko eragiketa ezin da osatu.. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Lineaz kanpoko eragiketak</string>
+    <string name="offline_operations_worker_notification_start_text">Lineaz kanpoko eragiketak hasten</string>
     <string name="oneHour">Ordu 1</string>
     <string name="online">Linean</string>
     <string name="online_status">Online egoera</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 562aaad5dd..ca72e62aef 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -34,6 +34,7 @@
     <string name="add_to_cloud">افزودن به %1$s</string>
     <string name="advanced_settings">تنظمیات پیش‌رفته</string>
     <string name="allow_resharing">مجاز به اشتراک گذاری مجدد</string>
+    <string name="app_config_base_url_title">Base URL</string>
     <string name="app_config_proxy_port_title">پورت پروکسی</string>
     <string name="app_widget_description">نمایش یک ابزارک از پیشخوان</string>
     <string name="appbar_search_in">جستجو در %s</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index 902a3ea9aa..0b7e758b11 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -34,7 +34,7 @@
     <string name="add_to_cloud">Cuir le %1$s</string>
     <string name="advanced_settings">Ardsocruithe</string>
     <string name="allow_resharing">Ceadaigh athroinnt</string>
-    <string name="app_config_base_url_title">Bun URL</string>
+    <string name="app_config_base_url_title">URL an bhunaigh</string>
     <string name="app_config_proxy_host_title">Ainm Óstach Seachfhreastalaí</string>
     <string name="app_config_proxy_port_title">Port Seachfhreastalaí</string>
     <string name="app_widget_description">Taispeáin giuirléid amháin ón deais</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index fdea5357c3..16c0a1343d 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -29,7 +29,7 @@
     <string name="activity_chooser_title">Enviar a ligazón a…</string>
     <string name="activity_icon">Actividade</string>
     <string name="add_another_public_share_link">Engadir outra ligazón</string>
-    <string name="add_new_public_share">Engadir unha nova ligazón pública</string>
+    <string name="add_new_public_share">Engadir unha nova ligazón para compartir pública</string>
     <string name="add_new_secure_file_drop">Engadir unha nova entrega segura de ficheiro</string>
     <string name="add_to_cloud">Engadir en %1$s</string>
     <string name="advanced_settings">Axustes avanzados</string>
@@ -779,17 +779,17 @@
     <string name="share_file">Compartir %1$s</string>
     <string name="share_group_clarification">%1$s (grupo)</string>
     <string name="share_internal_link">Compartir a ligazón interna</string>
-    <string name="share_internal_link_to_file_text">A ligazón de compartición interna só funciona para usuarios con acceso a este ficheiro</string>
-    <string name="share_internal_link_to_folder_text">A ligazón de compartición interna só funciona para usuarios con acceso a este cartafol</string>
+    <string name="share_internal_link_to_file_text">A ligazón para compartir interna só funciona para usuarios con acceso a este ficheiro</string>
+    <string name="share_internal_link_to_folder_text">A ligazón para compartir interna só funciona para usuarios con acceso a este cartafol</string>
     <string name="share_known_remote_on_clarification">en %1$s</string>
-    <string name="share_link">Compartir ligazón</string>
+    <string name="share_link">Ligazón para compartir</string>
     <string name="share_link_empty_password">Ten que introducir un contrasinal</string>
     <string name="share_link_file_error">Produciuse un erro ao tentar compartir este ficheiro ou cartafol.</string>
     <string name="share_link_file_no_exist">Non é posíbel compartir, Comprobe que o ficheiro existe.</string>
     <string name="share_link_forbidden_permissions">para compartir este ficheiro</string>
     <string name="share_link_optional_password_title">Escriba un contrasinal opcional</string>
     <string name="share_link_password_title">Introduza un contrasinal</string>
-    <string name="share_link_with_label">Compartir ligazón (%1$s)</string>
+    <string name="share_link_with_label">Ligazón para compartir (%1$s)</string>
     <string name="share_no_expiration_date_label">Definir a data de caducidade</string>
     <string name="share_no_password_title">Definir o contrasinal</string>
     <string name="share_not_allowed_when_file_drop">Non se permite volver compartir durante a entrega segura de ficheiros</string>
@@ -806,7 +806,7 @@
     <string name="share_send_note">Nota para o destinatario</string>
     <string name="share_settings">Axustes</string>
     <string name="share_via_link_hide_download">Agochar a descarga</string>
-    <string name="share_via_link_section_title">Compartir ligazón</string>
+    <string name="share_via_link_section_title">Ligazón para compartir</string>
     <string name="share_via_link_send_link_label">Enviar ligazón</string>
     <string name="share_via_link_unset_password">Sen definir</string>
     <string name="share_with_title">Compartir con…</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index af72599eb1..3131065a97 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -31,6 +31,7 @@
     <string name="add_to_cloud">Dodaj na %1$s</string>
     <string name="advanced_settings">Napredne postavke</string>
     <string name="allow_resharing">Dopusti ponovno dijeljenje</string>
+    <string name="app_config_base_url_title">Osnovni URL</string>
     <string name="app_config_proxy_port_title">Proxy port</string>
     <string name="appbar_search_in">Traži u %s</string>
     <string name="assistant_screen_all_task_type">Sve</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 6814c19755..84931df134 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -33,6 +33,7 @@
     <string name="add_to_cloud">Hozzáadás ehhez: %1$s</string>
     <string name="advanced_settings">Speciális beállítások</string>
     <string name="allow_resharing">Újra megosztás engedélyezése</string>
+    <string name="app_config_base_url_title">Alap URL</string>
     <string name="app_config_proxy_port_title">Proxy portja</string>
     <string name="app_widget_description">Egy modult jelenít meg a irányítópultról</string>
     <string name="appbar_search_in">Keresés itt: %s</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 02ea4f1392..ea936a9282 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -34,6 +34,7 @@
     <string name="add_to_cloud">Aggiungi a %1$s</string>
     <string name="advanced_settings">Impostazioni avanzate</string>
     <string name="allow_resharing">Consenti la ri-condivisione</string>
+    <string name="app_config_base_url_title">URL di base</string>
     <string name="app_config_proxy_port_title">Porta proxy</string>
     <string name="app_widget_description">Mostra un widget dal cruscotto</string>
     <string name="appbar_search_in">Cerca in %s</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 7df8410770..310c2eead4 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -31,6 +31,7 @@
     <string name="add_to_cloud">הוספה אל %1$s</string>
     <string name="advanced_settings">הגדרות מתקדמות</string>
     <string name="allow_resharing">לאפשר שיתוף מחדש</string>
+    <string name="app_config_base_url_title">כתובת בסיס</string>
     <string name="app_config_proxy_port_title">פתחת מתווך</string>
     <string name="app_widget_description">מצג וידג׳ט אחד מלוח הבקרה</string>
     <string name="appbar_search_in">חפש ב %s</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index fcb849bbb2..e07756e555 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">%1$s に追加</string>
     <string name="advanced_settings">高度な設定</string>
     <string name="allow_resharing">再共有を許可する</string>
-    <string name="app_config_base_url_title">ベース URL</string>
     <string name="app_config_proxy_host_title">プロキシのホスト名</string>
     <string name="app_config_proxy_port_title">プロキシポート</string>
     <string name="app_widget_description">ダッシュボードから一つのウィジェットを表示</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ca6a3d1b61..14311f69e2 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -92,6 +92,7 @@
     <string name="auth_unsupported_multiaccount">%1$s에서 다중 계정을 지원하지 않습니다</string>
     <string name="auth_wrong_connection_title">연결할 수 없음</string>
     <string name="authenticator_activity_cancel_login">로그인 취소</string>
+    <string name="authenticator_activity_login_error">로그인 요청을 처리하는 동안 문제가 발생했습니다. 나중에 다시 시도해 주세요.</string>
     <string name="authenticator_activity_please_complete_login_process">브라우저에서 로그인 절차를 완료하세요.</string>
     <string name="auto_upload_file_behaviour_kept_in_folder">읽기 전용 파일이므로 기존 폴더에 유지됩니다.</string>
     <string name="auto_upload_on_wifi">Wi-Fi에서만 업로드</string>
@@ -179,8 +180,10 @@
     <string name="confirmation_remove_local">로컬만</string>
     <string name="conflict_dialog_error">충돌 해결 프로그램 대화 상자를 만들 수 없습니다.</string>
     <string name="conflict_file_headline">충돌하는 파일 %1$s</string>
+    <string name="conflict_folder_headline">폴더 충돌</string>
     <string name="conflict_local_file">로컬 파일</string>
     <string name="conflict_message_description">두 버전을 모두 선택하면 기존 파일 이름에 번호가 추가됩니다.</string>
+    <string name="conflict_message_description_for_folder">만약 두 버전을 모두 선택하면, 로컬 폴더 이름 뒤에 숫자가 추가됩니다.</string>
     <string name="conflict_server_file">서버 파일</string>
     <string name="contact_backup_title">연락처 백업</string>
     <string name="contact_no_permission">연락처 권한이 필요합니다.</string>
@@ -278,8 +281,11 @@
     <string name="drawer_quota">%2$s 중 %1$s 사용됨</string>
     <string name="drawer_quota_unlimited">%1$s 사용됨</string>
     <string name="drawer_synced_folders">자동 업로드</string>
+    <string name="e2e_counter_too_old">카운터가 너무 오래되었습니다</string>
+    <string name="e2e_hash_not_found">해시를 찾을 수 없습니다</string>
     <string name="e2e_not_yet_setup">E2E가 아직 설정되지 않음</string>
     <string name="e2e_offline">인터넷 연결 없이 불가능</string>
+    <string name="e2e_signature_does_not_match">서명이 일치하지 않습니다</string>
     <string name="ecosystem_apps_display_assistant">어시스턴트</string>
     <string name="ecosystem_apps_display_more">더 보기</string>
     <string name="ecosystem_apps_display_notes">메모</string>
@@ -353,6 +359,7 @@
     <string name="failed_update_ui">UI 업데이트 실패</string>
     <string name="favorite">즐겨찾기에 추가</string>
     <string name="favorite_icon">즐겨찾기</string>
+    <string name="file_activity_shared_file_cannot_be_updated">공유 파일을 업데이트할 수 없습니다</string>
     <string name="file_already_exists">파일 이름이 이미 존재함</string>
     <string name="file_delete">삭제</string>
     <string name="file_detail_activity_error">파일에 대한 작업 검색 중 오류 발생</string>
@@ -366,6 +373,7 @@
     <string name="file_list_empty_headline">파일이 없습니다</string>
     <string name="file_list_empty_headline_search">이 폴더에 검색 결과 없음</string>
     <string name="file_list_empty_headline_server_search">검색 결과 없음</string>
+    <string name="file_list_empty_local_search">검색 결과가 없습니다</string>
     <string name="file_list_empty_moving">항목이 없습니다. 폴더를 추가할 수 있습니다.</string>
     <string name="file_list_empty_on_device">다운로드 받은 파일과 폴더가 여기 나타날 것입니다.</string>
     <string name="file_list_empty_recently_modified">검색 결과 지난 7일간 수정한 파일 없음</string>
@@ -403,6 +411,11 @@
     <string name="file_migration_updating_index">색인 업데이트 중…</string>
     <string name="file_migration_use_data_folder">사용</string>
     <string name="file_migration_waiting_for_unfinished_sync">모든 동기화가 완료되기를 기다리는 중…</string>
+    <string name="file_name_validator_current_path_is_invalid">현재 폴더 이름이 유효하지 않습니다. 폴더 이름을 변경해 주세요. 루트로 리디렉션됩니다.</string>
+    <string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">폴더 경로에 예약된 이름 또는 잘못된 문자가 포함되어 있습니다</string>
+    <string name="file_name_validator_error_ends_with_space_period">이름이 공백이나 마침표로 끝납니다</string>
+    <string name="file_name_validator_error_forbidden_file_extensions">.%s은(는) 금지된 파일 확장자입니다</string>
+    <string name="file_name_validator_error_invalid_character">이름에 잘못된 문자가 포함되어 있습니다: %s</string>
     <string name="file_not_found">파일을 찾을 수 없음</string>
     <string name="file_not_synced">파일을 동기화할 수 없습니다. 마지막으로 불러온 버전을 표시합니다.</string>
     <string name="file_rename">이름 바꾸기</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 58f6f70adc..64dcb93b32 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -34,6 +34,7 @@
     <string name="add_to_cloud">Dodaj do %1$s</string>
     <string name="advanced_settings">Ustawienia zaawansowane</string>
     <string name="allow_resharing">Zezwalaj na udostępnianie dalej</string>
+    <string name="app_config_base_url_title">Podstawowy adres URL</string>
     <string name="app_config_proxy_port_title">Port proxy</string>
     <string name="app_widget_description">Pokazuje jeden widżet z pulpitu nawigacyjnego</string>
     <string name="appbar_search_in">Szukaj w %s</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index aca1319eb7..ee36d65783 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">Adaugă la 1 %1$s</string>
     <string name="advanced_settings">Setări avansate</string>
     <string name="allow_resharing">Permite repartajarea</string>
-    <string name="app_config_base_url_title">URL-ul de bază</string>
     <string name="app_config_proxy_host_title">Hostname-ul de proxy</string>
     <string name="app_config_proxy_port_title">Port proxy </string>
     <string name="app_widget_description">Arată un singur widget din panoul principal</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a3661ecfb1..618381bec0 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -34,7 +34,7 @@
     <string name="add_to_cloud">Добавить в %1$s</string>
     <string name="advanced_settings">Дополнительные настройки</string>
     <string name="allow_resharing">Разрешить повторную публикацию</string>
-    <string name="app_config_base_url_title">Базовый Url</string>
+    <string name="app_config_base_url_title">Основной URL</string>
     <string name="app_config_proxy_host_title">Имя прокси хоста</string>
     <string name="app_config_proxy_port_title">Порт прокси</string>
     <string name="app_widget_description">Показывает один виджет с главного экрана.</string>
@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">Только локально</string>
     <string name="conflict_dialog_error">Не удается создать диалоговое окно разрешения конфликтов</string>
     <string name="conflict_file_headline">Конфликт версий файла «%1$s»</string>
+    <string name="conflict_folder_headline">Конфликт папок</string>
     <string name="conflict_local_file">Локальный файл</string>
     <string name="conflict_message_description">Если вы выберете обе версии, локальный файл будет иметь номер, добавленный к его имени.</string>
+    <string name="conflict_message_description_for_folder">Если вы выберете обе версии, к названию локальной папки будет добавлен номер.</string>
     <string name="conflict_server_file">Файл с сервера</string>
     <string name="contact_backup_title">Резервная копия контактов</string>
     <string name="contact_no_permission">Требуется разрешение на контакт.</string>
@@ -279,8 +281,11 @@
     <string name="drawer_quota">использовано %1$s из %2$s </string>
     <string name="drawer_quota_unlimited">%1$s использовано</string>
     <string name="drawer_synced_folders">Автоматическая передача</string>
+    <string name="e2e_counter_too_old">Счетчик слишком старый</string>
+    <string name="e2e_hash_not_found">Хэш не найден</string>
     <string name="e2e_not_yet_setup">Сквозное шифрование не настроено</string>
     <string name="e2e_offline">Невозможно без подключения к интернету</string>
+    <string name="e2e_signature_does_not_match">Подпись не совпадает</string>
     <string name="ecosystem_apps_display_assistant">Помощник</string>
     <string name="ecosystem_apps_display_more">Больше</string>
     <string name="ecosystem_apps_display_notes">Заметки</string>
@@ -368,6 +373,7 @@
     <string name="file_list_empty_headline">Здесь нет файлов</string>
     <string name="file_list_empty_headline_search">В этом каталоге результатов не найдено</string>
     <string name="file_list_empty_headline_server_search">Результаты отсутствуют</string>
+    <string name="file_list_empty_local_search">Нет файла или папки, соответствующих вашему запросу</string>
     <string name="file_list_empty_moving">Здесь ничего нет. Вы можете создать каталог!</string>
     <string name="file_list_empty_on_device">Здесь будут показаны загруженные файлы и папки</string>
     <string name="file_list_empty_recently_modified">Изменённых за последние 7 дней файлов не найдено</string>
@@ -406,6 +412,14 @@
     <string name="file_migration_updating_index">Обновление индекса…</string>
     <string name="file_migration_use_data_folder">Использовать существующий</string>
     <string name="file_migration_waiting_for_unfinished_sync">Ожидание завершения синхронизации…</string>
+    <string name="file_name_validator_current_path_is_invalid">Текущее имя папки неверное, пожалуйста, переименуйте папку. Перенаправление в корень</string>
+    <string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Путь к папке содержит зарезервированные имена или недопустимый символ</string>
+    <string name="file_name_validator_error_ends_with_space_period">Имя заканчивается пробелом или точкой</string>
+    <string name="file_name_validator_error_forbidden_file_extensions">.%s является запрещенным расширением файла</string>
+    <string name="file_name_validator_error_invalid_character">Имя содержит недопустимый символ: %s</string>
+    <string name="file_name_validator_error_reserved_names">%s это запрещенное имя</string>
+    <string name="file_name_validator_rename_before_move_or_copy">%s. Пожалуйста, переименуйте файл перед перемещением или копированием</string>
+    <string name="file_name_validator_upload_content_error">Некоторые материалы не могут быть загружены из-за наличия зарезервированных имен или недопустимого символа</string>
     <string name="file_not_found">Файл не найден</string>
     <string name="file_not_synced">Не удалось синхронизировать этот файл, показана его последняя доступная версия.</string>
     <string name="file_rename">Переименовать</string>
@@ -429,6 +443,7 @@
     <string name="folder_already_exists">Папка уже существует</string>
     <string name="folder_confirm_create">Создать</string>
     <string name="folder_list_empty_headline">Здесь нет каталогов</string>
+    <string name="folder_name_empty">Имя папки не может быть пустым</string>
     <string name="folder_picker_choose_button_text">Выберите</string>
     <string name="folder_picker_choose_caption_text">Выбор папки назначения</string>
     <string name="folder_picker_copy_button_text">Копировать</string>
@@ -475,6 +490,8 @@
     <string name="instant_upload_existing">Также загрузить существующие файлы</string>
     <string name="instant_upload_on_charging">Только во время зарядки</string>
     <string name="instant_upload_path">/Автозагрузка</string>
+    <string name="internal_two_way_sync">Внутренняя двусторонняя синхронизация</string>
+    <string name="internal_two_way_sync_not_yet">Пока нет, но скоро будет синхронизирован</string>
     <string name="invalid_url">Неверный адрес</string>
     <string name="invisible">Невидимая</string>
     <string name="label_empty">Метка не может быть пустой</string>
@@ -513,6 +530,7 @@
     <string name="manage_space_clear_data">Очистить данные</string>
     <string name="manage_space_description">Настройки, сертификаты базы данных и сервера из данных %1$s будут удалены навсегда. \n\nЗагруженные файлы будут сохранены нетронутыми. \n\nЭтот процесс может занять некоторое время.</string>
     <string name="manage_space_title">Управление свободным местом</string>
+    <string name="max_file_count_warning_message">Вы достигли максимального лимита на загрузку файлов. Пожалуйста, загружайте не более 500 файлов одновременно.</string>
     <string name="media_err_invalid_progressive_playback">Невозможно организовать потоковую передачу медиафайла</string>
     <string name="media_err_io">Медиафайл не может быть прочитан</string>
     <string name="media_err_malformed">Медиафайл некорректно закодирован</string>
@@ -558,6 +576,8 @@
     <string name="note_could_not_sent">Не удалось отправить примечание</string>
     <string name="note_icon_hint">Значок примечания</string>
     <string name="notification_action_failed">Не удалось выполнить задание.</string>
+    <string name="notification_channel_background_operations_description">Показывать уведомления для взаимодействия с результатами фоновых операций</string>
+    <string name="notification_channel_background_operations_name">Фоновые операции</string>
     <string name="notification_channel_download_description">Показывает выполнение получения</string>
     <string name="notification_channel_download_name_short">Загрузки</string>
     <string name="notification_channel_file_sync_description">Показывает состояние и результаты синхронизации файлов </string>
@@ -573,7 +593,13 @@
     <string name="notification_icon">Значок уведомления</string>
     <string name="notifications_no_results_headline">Уведомлений нет</string>
     <string name="notifications_no_results_message">Проверьте позже.</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">Ожидаемая операция</string>
     <string name="offline_mode">Отсутствует подключение к Интернет</string>
+    <string name="offline_operations_worker_notification_conflict_text">Конфликтующая папка: %s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">Удалить автономную папку</string>
+    <string name="offline_operations_worker_notification_error_text">Операция в автономном режиме не может быть завершена. %s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">Автономные операции</string>
+    <string name="offline_operations_worker_notification_start_text">Запуск автономных операций</string>
     <string name="oneHour">1 час</string>
     <string name="online">На связи</string>
     <string name="online_status">Состояние на связи</string>
@@ -664,10 +690,12 @@
     <string name="prefs_synced_folders_local_path_title">Папка на устройстве</string>
     <string name="prefs_synced_folders_remote_path_title">Папка на сервере</string>
     <string name="prefs_theme_title">Оформление</string>
+    <string name="prefs_two_way_sync_summary">Управление внутренними папками для двусторонней синхронизации</string>
     <string name="prefs_value_theme_dark">Тёмное</string>
     <string name="prefs_value_theme_light">Светлое</string>
     <string name="prefs_value_theme_system">Как в системе</string>
     <string name="preview_image_description">Предпросмотр</string>
+    <string name="preview_image_downloading_image_for_edit">Загрузка изображения для запуска экрана редактирования, пожалуйста, подождите…</string>
     <string name="preview_image_error_no_local_file">Отсутствует локальный файл для создания миниатюры</string>
     <string name="preview_image_error_unknown_format">Это изображение не может быть отображено</string>
     <string name="preview_image_file_is_not_downloaded">Файл не скачан</string>
@@ -892,6 +920,9 @@
     <string name="trashbin_loading_failed">Загрузка корзины не удалась!</string>
     <string name="trashbin_not_emptied">Файлы не могут быть удалены окончательно!</string>
     <string name="unexpected_error_occurred">Произошла неожиданная ошибка</string>
+    <string name="unified_search_fragment_calendar_event_not_found">Событие не найдено, вы всегда можете синхронизировать его для обновления. Перенаправление на веб-страницу…</string>
+    <string name="unified_search_fragment_contact_not_found">Контакт не найден, вы всегда можете синхронизировать его для обновления. Перенаправление на веб-страницу…</string>
+    <string name="unified_search_fragment_permission_needed">Для открытия результата поиска требуются разрешения, в противном случае он будет перенаправлен на веб-страницу…</string>
     <string name="unlock_file">Разблокировать файл</string>
     <string name="unread_comments">Имеются непрочитанные комментарии</string>
     <string name="unset_encrypted">Расшифровать</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 5a8565f4bd..1bf58b22b0 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -31,6 +31,7 @@
     <string name="add_to_cloud">Agiunghe a %1$s</string>
     <string name="advanced_settings">Cunfiguratziones avantzadas</string>
     <string name="allow_resharing">Permite sa re-cumpartzidura</string>
+    <string name="app_config_base_url_title">URL de base</string>
     <string name="app_config_proxy_port_title">Port serbidore intermèdiu</string>
     <string name="appbar_search_in">Chirca in %s</string>
     <string name="assistant_screen_all_task_type">Totu</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 1e0e292796..99ba0ff1c2 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -33,6 +33,7 @@
     <string name="add_to_cloud">Dodaj v %1$s</string>
     <string name="advanced_settings">Napredne nastavitve</string>
     <string name="allow_resharing">Dovoli nadaljnje omogočanje souporabe</string>
+    <string name="app_config_base_url_title">Osnovni naslov URL</string>
     <string name="app_config_proxy_port_title">Vrata posredniškega strežnika</string>
     <string name="app_widget_description">Pokaži en gradnik iz nadzorne plošče</string>
     <string name="appbar_search_in">Poišči v %s</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d215527ec0..26ed4c833f 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">Lägg till %1$s</string>
     <string name="advanced_settings">Avancerade inställningar</string>
     <string name="allow_resharing">Tillåt dela vidare</string>
-    <string name="app_config_base_url_title">Bas-URL</string>
     <string name="app_config_proxy_host_title">Proxy-värdnamn</string>
     <string name="app_config_proxy_port_title">Proxyport</string>
     <string name="app_widget_description">Visa en widget från dashboard</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 3620d4f894..26fb31184f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -34,7 +34,6 @@
     <string name="add_to_cloud">Додати до хмари %1$s</string>
     <string name="advanced_settings">Розширені</string>
     <string name="allow_resharing">Дозволяти передавати у спільний доступ іншим</string>
-    <string name="app_config_base_url_title">Основний URL</string>
     <string name="app_config_proxy_host_title">Хост проксі-сервера</string>
     <string name="app_config_proxy_port_title">Порт проксі-сервера</string>
     <string name="app_widget_description">Показувати один віджет з панелі віджетів</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 1c260c1258..384d51191d 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -180,8 +180,10 @@
     <string name="confirmation_remove_local">只有近端</string>
     <string name="conflict_dialog_error">無法創建衝突解決程序對話框</string>
     <string name="conflict_file_headline">檔案 %1$s 抵觸</string>
+    <string name="conflict_folder_headline">資料夾衝突</string>
     <string name="conflict_local_file">近端檔案</string>
     <string name="conflict_message_description">若您同時選擇兩個版本，近端的檔案會在檔名後附加編號。</string>
+    <string name="conflict_message_description_for_folder">若您同時選擇兩個版本，本機的資料夾會在檔名後附加編號。</string>
     <string name="conflict_server_file">伺服器檔案</string>
     <string name="contact_backup_title">聯絡人備份</string>
     <string name="contact_no_permission">需要聯絡人權限。</string>
@@ -573,6 +575,8 @@
     <string name="note_could_not_sent">傳送留言失敗</string>
     <string name="note_icon_hint">記事本圖示</string>
     <string name="notification_action_failed">無法執行操作。</string>
+    <string name="notification_channel_background_operations_description">顯示通知以與背景操作的結果互動</string>
+    <string name="notification_channel_background_operations_name">背景操作</string>
     <string name="notification_channel_download_description">顯示下載進度</string>
     <string name="notification_channel_download_name_short">下載</string>
     <string name="notification_channel_file_sync_description">顯示檔案同步進度和結果</string>
@@ -588,7 +592,13 @@
     <string name="notification_icon">提示圖示</string>
     <string name="notifications_no_results_headline">沒有通知</string>
     <string name="notifications_no_results_message">請稍候再檢查</string>
+    <string name="oc_file_list_adapter_offline_operation_description_text">擱置中的操作</string>
     <string name="offline_mode">沒有網路連線</string>
+    <string name="offline_operations_worker_notification_conflict_text">衝突的資料夾：%s</string>
+    <string name="offline_operations_worker_notification_delete_offline_folder">刪除離線資料夾</string>
+    <string name="offline_operations_worker_notification_error_text">無法完成離線操作。%s</string>
+    <string name="offline_operations_worker_notification_manager_ticker">離線操作</string>
+    <string name="offline_operations_worker_notification_start_text">開始離線操作</string>
     <string name="oneHour">1 小時</string>
     <string name="online">上線</string>
     <string name="online_status">上線狀態</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 335f78c5c6..27a128912c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -34,7 +34,7 @@
     <string name="add_to_cloud">新增到 %1$s </string>
     <string name="advanced_settings">進階設定</string>
     <string name="allow_resharing">允許轉貼分享</string>
-    <string name="app_config_base_url_title">基礎 Url</string>
+    <string name="app_config_base_url_title">基礎 URL</string>
     <string name="app_config_proxy_host_title">代理伺服器主機名稱</string>
     <string name="app_config_proxy_port_title">proxy代理伺服器連接埠</string>
     <string name="app_widget_description">顯示儀表板中的一個小工具</string>