Merge remote-tracking branch 'origin/master' into dev

.github/workflows/analysis.yml

@@ -32,7 +32,7 @@ jobs:
                         echo "pr=${{ github.event.pull_request.number }}" >> "$GITHUB_OUTPUT"
                         echo "repo=${{ github.event.pull_request.head.repo.full_name }}" >> "$GITHUB_OUTPUT"
                     fi
-            -   uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+            -   uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
                 with:
                     repository: ${{ steps.get-vars.outputs.repo }}
                     ref: ${{ steps.get-vars.outputs.branch }}

.github/workflows/assembleFlavors.yml

@@ -19,7 +19,7 @@ jobs:
             matrix:
                 flavor: [ Generic, Gplay, Huawei ]
         steps:
-            -   uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+            -   uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
             -   name: set up JDK 17
                 uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
                 with:

.github/workflows/check.yml

@@ -19,7 +19,7 @@ jobs:
             matrix:
                 task: [ detekt, spotlessKotlinCheck ]
         steps:
-            -   uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+            -   uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
             -   name: Set up JDK 17
                 uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
                 with:

.github/workflows/command-rebase.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Add reaction on start
-        uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
+        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
           repository: ${{ github.event.repository.full_name }}
@@ -31,7 +31,7 @@ jobs:
           reaction-type: "+1"
 
       - name: Checkout the latest code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
           fetch-depth: 0
           token: ${{ secrets.COMMAND_BOT_PAT }}
@@ -42,7 +42,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
 
       - name: Add reaction on failure
-        uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
+        uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
         if: failure()
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}

.github/workflows/detectSnapshot.yml

@@ -16,6 +16,6 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            -   uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+            -   uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
             -   name: Detect SNAPSHOT
                 run: scripts/analysis/detectSNAPSHOT.sh

.github/workflows/qa.yml

@@ -19,7 +19,7 @@ jobs:
             -   name: Check if secrets are available
                 run: echo "::set-output name=ok::${{ secrets.KS_PASS != '' }}"
                 id: check-secrets
-            -   uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+            -   uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
                 if: ${{ steps.check-secrets.outputs.ok == 'true' }}
             -   name: set up JDK 17
                 uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3

.github/workflows/screenShotTest.yml

@@ -22,7 +22,7 @@ jobs:
                 color: [ blue ]
                 api-level: [ 27 ]
         steps:
-            -   uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+            -   uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
 
             -   name: Gradle cache
                 uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3

.github/workflows/unit-tests.yml

@@ -18,7 +18,7 @@ jobs:
     test:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+            -   uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
             -   name: Set up JDK 17
                 uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
                 with:

app/src/main/res/values-gl/strings.xml

@@ -188,7 +188,7 @@
     <string name="creates_rich_workspace"> crear a información do cartafol </string>
     <string name="credentials_disabled">Credenciais eliminadas</string>
     <string name="daily_backup">Copia de seguridade diaria</string>
-    <string name="data_to_back_up">Datos para facer copia de seguranza</string>
+    <string name="data_to_back_up">Datos para facer a copia de seguridade</string>
     <string name="default_credentials_wrong">Credenciais incorrectas</string>
     <string name="delete_account">Eliminar conta</string>
     <string name="delete_account_warning">Retirar a conta %s e eliminar os ficheiros locais?\n\n Esta eliminación non pode desfacerse.</string>
@@ -424,10 +424,10 @@
     <string name="local_file_not_found_message">Non se atopou o ficheiro no sistema local de ficheiros</string>
     <string name="local_folder_friendly_path">%1$s/%2$s</string>
     <string name="local_folder_list_empty">Xa non hai máis cartafoles</string>
-    <string name="locate_folder">Localiza o cartafol</string>
+    <string name="locate_folder">Atopar o cartafol</string>
     <string name="lock_expiration_info">Caduca: %1$s</string>
     <string name="lock_file">Bloquear ficheiro</string>
-    <string name="locked_by">Pechado por %1$s</string>
+    <string name="locked_by">Bloqueado por %1$s</string>
     <string name="locked_by_app">Bloqueado pola aplicación %1$s</string>
     <string name="log_send_mail_subject">Atopáronse %1$s aplicacións de rexistros para Android</string>
     <string name="log_send_no_mail_app">Non se atopou ningunha aplicación para enviar rexistros. Instale un cliente de correo-e.</string>
@@ -644,7 +644,7 @@
     <string name="screenshot_06_davdroid_subline">Sincronizar con DAVx5</string>
     <string name="search_error">Produciuse un erro ao obter os resultados da busca</string>
     <string name="select_all">Seleccionar todo</string>
-    <string name="select_media_folder">Establecer o cartafol multimedia</string>
+    <string name="select_media_folder">Estabelecer o cartafol multimedia</string>
     <string name="select_one_template">Seleccione un modelo</string>
     <string name="select_template">Seleccionar o modelo</string>
     <string name="send">Enviar</string>
@@ -655,7 +655,7 @@
     <string name="set_note">Estabelecer a nota</string>
     <string name="set_picture_as">Usar a imaxe como</string>
     <string name="set_status">Estabelecer o estado</string>
-    <string name="set_status_message">Establecer a mensaxe de estado</string>
+    <string name="set_status_message">Estabelecer a mensaxe de estado</string>
     <string name="setup_e2e">Durante a configuración do cifrado de extremo a extremo, recibirá un mnemotécnico ao chou de 12 palabras, que necesitará para abrir os seus ficheiros noutros dispositivos. Isto só se almacenará neste dispositivo e pódese amosar de novo nesta pantalla. Anóteo nun lugar seguro!</string>
     <string name="share">Compartir</string>
     <string name="share_copy_link">Compartir &amp; copiar a ligazón</string>

app/src/main/res/values-uk/strings.xml

@@ -250,6 +250,7 @@
     <string name="drawer_quota_unlimited">%1$sвикористано</string>
     <string name="drawer_synced_folders">Автоматичне завантаження</string>
     <string name="e2e_not_yet_setup">Наскрізне шифруванння ще не налаштовано</string>
+    <string name="e2e_offline">Дія не можлива без доступу до мережі Інтернет</string>
     <string name="encrypted">Позначити як зашифроване</string>
     <string name="end_to_end_encryption_confirm_button">Налаштування шифрування</string>
     <string name="end_to_end_encryption_decrypting">Розшифровування...</string>
@@ -378,6 +379,7 @@
     <string name="filename_hint">Ім\'я файлу</string>
     <string name="first_run_1_text">Зберігайте власні дані у безпечному місці під вашим контролем</string>
     <string name="first_run_2_text">Підтримуйте співпрацю та обмінюйтеся файлами безпечно</string>
+    <string name="first_run_3_text">Прості у користуванні застосунки пошти, календаря та контактів</string>
     <string name="first_run_4_text">Демонстрація екрану, онлайнові зустрічі та вебконференції</string>
     <string name="folder_already_exists">Каталог вже існує</string>
     <string name="folder_confirm_create">Створити</string>
@@ -524,6 +526,7 @@
     <string name="pass_code_removed">Пароль вилучено</string>
     <string name="pass_code_stored">Пароль збережено</string>
     <string name="pass_code_wrong">Недійсний пароль</string>
+    <string name="pdf_password_protected">Неможливо відкрити файл PDF, який захищено паролем. Скористайтеся зовнішнім переглядачем PDF.</string>
     <string name="pdf_zoom_tip">Тапніть по сторінці для збільшення</string>
     <string name="permission_allow">Дозволити</string>
     <string name="permission_deny">Заборонити</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -249,6 +249,7 @@
     <string name="drawer_quota_unlimited">%1$s已使用</string>
     <string name="drawer_synced_folders">自動上傳</string>
     <string name="e2e_not_yet_setup">尚未設定端到端加密</string>
+    <string name="e2e_offline">沒有網際網路連線就無法使用</string>
     <string name="encrypted">設為已加密的</string>
     <string name="end_to_end_encryption_confirm_button">設定加密</string>
     <string name="end_to_end_encryption_decrypting">正在解密……</string>
@@ -377,6 +378,7 @@
     <string name="filename_hint">檔案名稱</string>
     <string name="first_run_1_text">保障您的資料安全，且由您掌控</string>
     <string name="first_run_2_text">安全地協作及交換檔案</string>
+    <string name="first_run_3_text">易於使用的網路電子郵件、行事曆與聯絡人</string>
     <string name="first_run_4_text">分享螢幕畫面，線上會議與研討會</string>
     <string name="folder_already_exists">資料夾已存在</string>
     <string name="folder_confirm_create">建立</string>

app/src/main/res/values/setup.xml

@@ -6,8 +6,6 @@
 
     <!-- App name  and other strings-->
     <string name="app_name">Nextcloud</string>
-    <string name="splashScreenBold"></string>
-    <string name="splashScreenNormal"></string>
     <string name="account_type">nextcloud</string>     <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.nextcloud</string>    <!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
@@ -118,6 +116,10 @@
     <!-- Push server url -->
     <string name="push_server_url" translatable="false"></string>
 
+    <!-- if contains values, will be used to show branding title below app icon in splash screen -->
+    <string name="splashScreenBold"></string>
+    <string name="splashScreenNormal"></string>
+
     <!-- Dev settings -->
     <string name="dev_link">https://download.nextcloud.com/android/dev/nextcloud-dev-</string>
     <string name="dev_latest">https://download.nextcloud.com/android/dev/latest</string>