mirror of
https://github.com/nextcloud/android.git
synced 2024-12-19 07:22:06 +03:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
Tobias Kaminsky
commit
fd125c11b9
5 changed files with 85 additions and 20 deletions
49
.github/workflows/autoApproveRenovate.yml
vendored
Normal file
49
.github/workflows/autoApproveRenovate.yml
vendored
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
|
||||
# SPDX-FileCopyrightText: 2023 Álvaro Brey <alvaro@alvarobrey.com>
|
||||
# SPDX-FileCopyrightText: 2023 Andy Scherzinger <info@andy-scherzinger.de>
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
name: Auto approve renovate PRs
|
||||
|
||||
on:
|
||||
pull_request_target:
|
||||
branches:
|
||||
- main
|
||||
- master
|
||||
- stable*
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
concurrency:
|
||||
group: renovate-approve-merge-${{ github.head_ref || github.run_id }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
auto-approve-merge:
|
||||
if: github.actor == 'renovate[bot]'
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
# for hmarr/auto-approve-action to approve PRs
|
||||
pull-requests: write
|
||||
# for alexwilson/enable-github-automerge-action to approve PRs
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- uses: mdecoleman/pr-branch-name@bab4c71506bcd299fb350af63bb8e53f2940a599 # v2.0.0
|
||||
id: branchname
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# GitHub actions bot approve
|
||||
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
|
||||
if: startsWith(steps.branchname.outputs.branch, 'renovate/')
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# Enable GitHub auto merge
|
||||
- name: Auto merge
|
||||
uses: alexwilson/enable-github-automerge-action@main
|
||||
if: startsWith(steps.branchname.outputs.branch, 'renovate/')
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
|
@ -92,6 +92,7 @@
|
|||
<string name="auth_unsupported_multiaccount">%1$s(e)k ez ditu hainbat kontu onartzen</string>
|
||||
<string name="auth_wrong_connection_title">Ezin izan da konexioa ezarri</string>
|
||||
<string name="authenticator_activity_cancel_login">Utzi saioa hasiera</string>
|
||||
<string name="authenticator_activity_login_error">Arazo bat egon da zure saioa hasteko eskaera prozesatzean. Mesedez saiatu geroxeago.</string>
|
||||
<string name="authenticator_activity_please_complete_login_process">Mesedez, osatu saioa hasteko prozesua zure nabigatzailean</string>
|
||||
<string name="auto_upload_file_behaviour_kept_in_folder">Jatorrizko karpetan mantendu da, soilik irakurtzeko delako</string>
|
||||
<string name="auto_upload_on_wifi">Kargatu soilik mugarik gabeko Wi-Fi bidez</string>
|
||||
|
|
@ -321,6 +322,7 @@
|
|||
<string name="error_showing_encryption_dialog">Errore bat gertatu da enkriptatzea konfiguratzeko elkarrizketa-koadroa erakustean!</string>
|
||||
<string name="error_starting_direct_camera_upload">Errorea kamera abiaraztean</string>
|
||||
<string name="error_starting_doc_scan">Errorea dokumentuen eskaneatzea abiaraztean</string>
|
||||
<string name="error_uploading_direct_camera_upload">Harturiko multimedia fitxategia igotzeak huts egin du</string>
|
||||
<string name="etm_accounts">Kontuak</string>
|
||||
<string name="etm_background_execution_count">Denbora 48 ordutan egiten da</string>
|
||||
<string name="etm_background_job_created">Sortua</string>
|
||||
|
|
@ -352,6 +354,7 @@
|
|||
<string name="failed_update_ui">Erabiltzaile Interfazea (UI) eguneratzeak huts egin du</string>
|
||||
<string name="favorite">Gehitu gogokoetara</string>
|
||||
<string name="favorite_icon">Gogokoa</string>
|
||||
<string name="file_activity_shared_file_cannot_be_updated">Ezin da partekaturiko fitxategia eguneratu</string>
|
||||
<string name="file_already_exists">Fitxategi-izena dagoeneko existitzen da.</string>
|
||||
<string name="file_delete">Ezabatu</string>
|
||||
<string name="file_detail_activity_error">Errorea fitxategiaren jarduerak berreskuratzean</string>
|
||||
|
|
@ -443,6 +446,7 @@
|
|||
<string name="foreign_files_success">Fitxategi guztiak mugitu dira</string>
|
||||
<string name="forward">Birbidali</string>
|
||||
<string name="fourHours">4 ordu</string>
|
||||
<string name="gplay_restriction">Google-k muga jarri die APK/AAB fitxategien deskargei!</string>
|
||||
<string name="grid_file_features_live_photo_content_description">Ikono honek zuzeneko argazkiaren erabilgarritasuna adierazten du</string>
|
||||
<string name="hidden_file_name_warning">Izen honek ezkutuko fitxategi bat sortzea eragingo du</string>
|
||||
<string name="hint_name">Izena</string>
|
||||
|
|
@ -672,6 +676,7 @@
|
|||
<string name="push_notifications_old_login">Ez dago push jakinarazpenik saio zaharkituaren ondorioz. Mesedez, kontua berriz gehitu.</string>
|
||||
<string name="push_notifications_temp_error">Push jakinarazpenak ez daude eskuragarri.</string>
|
||||
<string name="qr_could_not_be_read">Ezin da QR kodea irakurri!</string>
|
||||
<string name="receive_external_files_activity_start_sync_folder_is_not_exists_message">Ezin da karpeta aurkitu, sinkronizazio lana bertan behera geratu da</string>
|
||||
<string name="recommend_subject">Probatu %1$s zure gailuan!</string>
|
||||
<string name="recommend_text">%1$s zure gailuan erabiltzera gonbidatu nahi zaitut.\n Hemendik deskargatu: %2$s</string>
|
||||
<string name="recommend_urls">%1$s edo %2$s</string>
|
||||
|
|
@ -903,6 +908,7 @@
|
|||
<string name="upload_chooser_title">Igo hemendik…</string>
|
||||
<string name="upload_content_from_other_apps">Igo edukia beste aplikazioetatik</string>
|
||||
<string name="upload_direct_camera_photo">Argazkia</string>
|
||||
<string name="upload_direct_camera_promt">Argazki edo bideorik egin nahi duzu?</string>
|
||||
<string name="upload_direct_camera_upload">Igo kameratik</string>
|
||||
<string name="upload_direct_camera_video">Bideoa</string>
|
||||
<string name="upload_file_dialog_filename">Fitxategiaren izena</string>
|
||||
|
|
@ -923,6 +929,7 @@
|
|||
<string name="upload_local_storage_not_copied">Ezin izan da fitxategia kopiatu biltegiratze lokalera</string>
|
||||
<string name="upload_lock_failed">Karpeta blokeatzeak huts egin du</string>
|
||||
<string name="upload_manually_cancelled">Igoera bertan behera utzi du erabiltzaileak</string>
|
||||
<string name="upload_notification_manager_start_text">%1$d/%2$d-%3$s</string>
|
||||
<string name="upload_old_android">Zifratzea >= Android 5.0 bertsioarekin soilik da posible</string>
|
||||
<string name="upload_query_move_foreign_files">Hautatutako fitxategiak ezin dira %1$sra kopiatu ez dagoelako toki nahikorik. Kopiatu ordez bertara mugitu nahi dituzu?</string>
|
||||
<string name="upload_quota_exceeded">Biltegiratze kuota gainditu da</string>
|
||||
|
|
|
|||
|
|
@ -289,7 +289,7 @@
|
|||
<string name="ecosystem_apps_notes">Notas de Nextcloud</string>
|
||||
<string name="ecosystem_apps_talk">Talk de Nextcloud</string>
|
||||
<string name="email_pick_failed">Produciuse un fallo ao escoller o enderezo de correo.</string>
|
||||
<string name="encrypted">Estabelecer como cifrado</string>
|
||||
<string name="encrypted">Definir como cifrado</string>
|
||||
<string name="end_to_end_encryption_confirm_button">Configurar o cifrado</string>
|
||||
<string name="end_to_end_encryption_decrypting">Descifrando…</string>
|
||||
<string name="end_to_end_encryption_dialog_close">Pechar</string>
|
||||
|
|
@ -592,7 +592,7 @@
|
|||
<string name="permission_allow">Permitir</string>
|
||||
<string name="permission_deny">Denegar</string>
|
||||
<string name="permission_storage_access">Precísanse permisos adicionais para enviar e descargar ficheiros.</string>
|
||||
<string name="picture_set_as_no_app">Non se atopou unha aplicación coa que estabelecer unha imaxe</string>
|
||||
<string name="picture_set_as_no_app">Non se atopou unha aplicación coa que definir unha imaxe</string>
|
||||
<string name="pin_home">Fixar na pantalla de Inicio</string>
|
||||
<string name="pin_shortcut_label">Aberto %1$s</string>
|
||||
<string name="placeholder_fileSize">389 KB</string>
|
||||
|
|
@ -726,17 +726,17 @@
|
|||
<string name="secure_share_not_set_up">A compartición segura non está definida para este usuario</string>
|
||||
<string name="secure_share_search">Compartición segura…</string>
|
||||
<string name="select_all">Seleccionar todo</string>
|
||||
<string name="select_media_folder">Estabelecer o cartafol multimedia</string>
|
||||
<string name="select_media_folder">Definir 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>
|
||||
<string name="send_share">Enviar o compartido</string>
|
||||
<string name="sendbutton_description">Icona do botón de envío</string>
|
||||
<string name="set_as">Estabelecer como</string>
|
||||
<string name="set_note">Estabelecer a nota</string>
|
||||
<string name="set_as">Definir como</string>
|
||||
<string name="set_note">Definir 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">Estabelecer a mensaxe de estado</string>
|
||||
<string name="set_status">Definir o estado</string>
|
||||
<string name="set_status_message">Definir 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 e copiar a ligazón</string>
|
||||
|
|
@ -757,8 +757,8 @@
|
|||
<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_no_expiration_date_label">Estabelecer a data de caducidade</string>
|
||||
<string name="share_no_password_title">Estabelecer o contrasinal</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>
|
||||
<string name="share_password_title">Protexido con contrasinal</string>
|
||||
<string name="share_permission_can_edit">Pode editar</string>
|
||||
|
|
@ -775,7 +775,7 @@
|
|||
<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_send_link_label">Enviar ligazón</string>
|
||||
<string name="share_via_link_unset_password">Sen estabelecer</string>
|
||||
<string name="share_via_link_unset_password">Sen definir</string>
|
||||
<string name="share_with_title">Compartir con…</string>
|
||||
<string name="shared_avatar_desc">Avatar de usuario compartido</string>
|
||||
<string name="shared_icon_share">compartir</string>
|
||||
|
|
@ -887,7 +887,7 @@
|
|||
<string name="trashbin_not_emptied">Non foi posíbel eliminar definitivamente o ficheiro!</string>
|
||||
<string name="unlock_file">Desbloquear ficheiro</string>
|
||||
<string name="unread_comments">Existen comentarios sen ler</string>
|
||||
<string name="unset_encrypted">Estabelecer como NON cifrado</string>
|
||||
<string name="unset_encrypted">Definir como NON cifrado</string>
|
||||
<string name="unset_favorite">Retirar dos favoritos</string>
|
||||
<string name="unshare_link_file_error">Produciuse un erro ao tentar deixar de compartir este ficheiro ou cartafol.</string>
|
||||
<string name="unshare_link_file_no_exist">Non é posíbel deixar de compartir. Comprobe que existe o ficheiro.</string>
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@
|
|||
<string name="app_widget_description">แสดงหนึ่งวิดเจ็ตจากแดชบอร์ด</string>
|
||||
<string name="appbar_search_in">ค้นหาใน %s</string>
|
||||
<string name="assistant_screen_all_task_type">ทั้งหมด</string>
|
||||
<string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">พิมพ์ข้อความของคุณ</string>
|
||||
<string name="assistant_screen_running_task_text">อยู่ระหว่างการดำเนินการ</string>
|
||||
<string name="assistant_screen_successful_task_text">เสร็จแล้ว</string>
|
||||
<string name="assistant_screen_unknown_task_status_text">ไม่ทราบ</string>
|
||||
<string name="associated_account_not_found">ไม่พบบัญชีที่เกี่ยวข้อง!</string>
|
||||
|
|
@ -171,7 +173,10 @@
|
|||
<string name="create">สร้าง</string>
|
||||
<string name="create_dir_fail_msg">ไม่สามารถสร้างโฟลเดอร์</string>
|
||||
<string name="create_new">ใหม่</string>
|
||||
<string name="create_new_document">สร้างเอกสาร odt ใหม่</string>
|
||||
<string name="create_new_folder">โฟลเดอร์ใหม่</string>
|
||||
<string name="create_new_presentation">สร้างงานนำเสนอ odp ใหม่</string>
|
||||
<string name="create_new_spreadsheet">สร้างตารางคำนวณ ods ใหม่</string>
|
||||
<string name="credentials_disabled">ข้อมูลประจำตัวถูกปิดใช้งาน</string>
|
||||
<string name="daily_backup">สำรองข้อมูลรายวัน</string>
|
||||
<string name="data_to_back_up">ข้อมูลที่จะสำรอง</string>
|
||||
|
|
@ -221,6 +226,7 @@
|
|||
<string name="drawer_item_home">หน้าหลัก</string>
|
||||
<string name="drawer_item_notifications">การแจ้งเตือน</string>
|
||||
<string name="drawer_item_on_device">บนอุปกรณ์</string>
|
||||
<string name="drawer_item_personal_files">ไฟล์ส่วนตัว</string>
|
||||
<string name="drawer_item_recently_modified">แก้ไขล่าสุด</string>
|
||||
<string name="drawer_item_shared">ถูกแชร์</string>
|
||||
<string name="drawer_item_trashbin">ไฟล์ที่ถูกลบ</string>
|
||||
|
|
@ -231,8 +237,9 @@
|
|||
<string name="drawer_quota_unlimited">ใช้ไป %1$s</string>
|
||||
<string name="drawer_synced_folders">อัปโหลดอัตโนมัติ</string>
|
||||
<string name="e2e_offline">ใช้โดยไม่มีการเชื่อมต่ออินเทอร์เน็ตไม่ได้</string>
|
||||
<string name="ecosystem_apps_display_more">มาก</string>
|
||||
<string name="ecosystem_apps_display_more">เพิ่มเติม</string>
|
||||
<string name="ecosystem_apps_display_notes">โน้ต</string>
|
||||
<string name="ecosystem_apps_more">แอพ Nextcloud เพิ่มเติม</string>
|
||||
<string name="ecosystem_apps_notes">Nextcloud โน้ต</string>
|
||||
<string name="end_to_end_encryption_decrypting">กำลังถอดรหัส…</string>
|
||||
<string name="end_to_end_encryption_dialog_close">ปิด</string>
|
||||
|
|
@ -468,12 +475,17 @@
|
|||
<string name="prefs_help">ช่วยเหลือ</string>
|
||||
<string name="prefs_imprint">ประทับ</string>
|
||||
<string name="prefs_license">สัญญาอนุญาต</string>
|
||||
<string name="prefs_lock">รหัสในการเข้าแอพ</string>
|
||||
<string name="prefs_lock_none">ไม่มี</string>
|
||||
<string name="prefs_lock_using_device_credentials">รหัสผ่านโทรศัพท์</string>
|
||||
<string name="prefs_lock_using_passcode">รหัสที่ตั้ง</string>
|
||||
<string name="prefs_manage_accounts">บริหารจัดการบัญชี</string>
|
||||
<string name="prefs_recommend">แนะนำแอพให้คนอื่น</string>
|
||||
<string name="prefs_show_hidden_files">แสดงไฟล์ที่ซ่อนอยู่</string>
|
||||
<string name="prefs_theme_title">ธีม</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="privacy">ความเป็นส่วนตัว</string>
|
||||
<string name="recommend_subject">ลอง %1$s บนอุปกรณ์ของคุณ!</string>
|
||||
|
|
@ -534,9 +546,11 @@
|
|||
<string name="storage_camera">กล้อง</string>
|
||||
<string name="storage_description_default">ค่าเริ่มต้น</string>
|
||||
<string name="storage_downloads">ดาวน์โหลด</string>
|
||||
<string name="sub_folder_rule_year">ปี</string>
|
||||
<string name="subject_shared_with_you">\"%1$s\" ได้ถูกแชร์กับคุณ</string>
|
||||
<string name="subject_user_shared_with_you">%1$s ได้แชร์ \"%2$s\" กับคุณ</string>
|
||||
<string name="sync_conflicts_in_favourites_ticker">ตรวจพบความขัดแย้ง</string>
|
||||
<string name="sync_current_folder_was_removed">โฟลเดอร์ %1$s ไม่มีอยู่อีกต่อไป </string>
|
||||
<string name="sync_fail_content">ไม่สามารถซิงค์ %1$s</string>
|
||||
<string name="sync_fail_in_favourites_ticker">ไฟล์ Kept-in-sync ล้มเหลว</string>
|
||||
<string name="sync_fail_ticker">การผสานข้อมูลล้มเหลว</string>
|
||||
|
|
@ -574,7 +588,9 @@
|
|||
<string name="upload_direct_camera_upload">อัปโหลดจากกล้อง</string>
|
||||
<string name="upload_file_dialog_filename">ชื่อไฟล์</string>
|
||||
<string name="upload_file_dialog_filetype">ประเภทไฟล์</string>
|
||||
<string name="upload_files">อัพโหลดไฟล์จากเครื่อง</string>
|
||||
<string name="upload_list_delete">ลบ</string>
|
||||
<string name="upload_scan_doc_upload">แสกนเอกสารโดยใช้กล้อง</string>
|
||||
<string name="upload_sync_conflict">เกิดข้อขัดแย้งของการซิงค์ โปรดแก้ไขด้วยตนเอง</string>
|
||||
<string name="upload_unknown_error">ข้อผิดพลาดที่ไม่รู้จัก</string>
|
||||
<string name="uploader_btn_alternative_text">เลือก</string>
|
||||
|
|
@ -628,6 +644,7 @@
|
|||
<string name="what_s_new_image">รูปภาพมีอะไรใหม่</string>
|
||||
<string name="whats_new_skip">ข้าม</string>
|
||||
<string name="whats_new_title">มีอะไรใหม่ใน %1$s</string>
|
||||
<string name="whats_your_status">สถานะของคุณ</string>
|
||||
<string name="worker_download">กำลังดาวน์โหลดไฟล์…</string>
|
||||
<string name="write_email">ส่งอีเมล</string>
|
||||
<string name="wrong_storage_path">โฟลเดอร์จัดเก็บข้อมูลไม่มีอยู่!</string>
|
||||
|
|
|
|||
|
|
@ -6061,14 +6061,6 @@
|
|||
<sha256 value="af2c66e6fa0f282bb91b53849ff2af8aba66ed301269aa9a71783af49a0e99f4" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.github.nextcloud" name="android-library" version="de55d3f849dd29fc1137149ec12b9577daef9e00">
|
||||
<artifact name="android-library-de55d3f849dd29fc1137149ec12b9577daef9e00.aar">
|
||||
<sha256 value="a275b20984272c792cf027a8c006ea409d42f7df36c139462ce656cf011d97d6" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
<artifact name="android-library-de55d3f849dd29fc1137149ec12b9577daef9e00.module">
|
||||
<sha256 value="b27927852afc2f5ce79ff5d4a0ac50f44c1c996c389855d87f6b694ac09c614d" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.github.nextcloud" name="android-library" version="e7a13d03c1e7549a301edb8b4b58d1c5dda84123">
|
||||
<artifact name="android-library-e7a13d03c1e7549a301edb8b4b58d1c5dda84123.aar">
|
||||
<sha256 value="57ab4fd7c922875a7e0b5feac20aa27ab5df0fd3b4e042f92ed727c0b6316e81" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue