mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Tobias Kaminsky 2024-02-06 02:31:29 +01:00
commit 395a42ede4
4 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -340,7 +340,7 @@ dependencies {
testImplementation 'junit:junit:4.13.2'
testImplementation "org.mockito:mockito-core:$mockitoVersion"
testImplementation "androidx.test:core:$androidxTestVersion"
testImplementation 'org.json:json:20230618'
testImplementation 'org.json:json:20231013'
testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion"
testImplementation 'androidx.arch.core:core-testing:2.2.0'
testImplementation "io.mockk:mockk:$mockkVersion"

12
app/src/main/res/values-eu/strings.xml
View file

@ -75,6 +75,7 @@
<string name="autoupload_custom_folder">Konfiguratu karpeta berria</string>
<string name="autoupload_disable_power_save_check">Desgaitu energia aurrezteko kontrola</string>
<string name="autoupload_hide_folder">Ezkutatu karpeta</string>
<string name="autoupload_worker_foreground_info">Igoera automatikoa prestatzen</string>
<string name="avatar">Abatarra</string>
<string name="away">Kanpoan</string>
<string name="backup_settings">Babeskopiaren ezarpenak</string>
@ -220,11 +221,15 @@
<string name="downloader_download_failed_credentials_error">Deskargak huts egin du, hasi saioa berriz</string>
<string name="downloader_download_failed_ticker">Deskargak huts egin du</string>
<string name="downloader_download_file_not_found">Fitxategia jadanik ez dago eskuragarri zerbitzarian</string>
<string name="downloader_download_in_progress">%1$d%% %2$s</string>
<string name="downloader_download_in_progress_content">%1$d%% Deskargatzen %2$s</string>
<string name="downloader_download_in_progress_ticker">Deskargatzen…</string>
<string name="downloader_download_succeeded_content">%1$s deskargatuta</string>
<string name="downloader_download_succeeded_ticker">Deskargatuta</string>
<string name="downloader_file_download_cancelled">Erabiltzaileak fitxategi batzuen deskarga bertan behera utzi ditu</string>
<string name="downloader_file_download_failed">Errore bat gertatu da fitxategiak deskargatzean</string>
<string name="downloader_not_downloaded_yet">Oraindik deskargatu gabe</string>
<string name="downloader_unexpected_error">Ustekabeko errorea gertatu da fitxategiak deskargatzean</string>
<string name="drawer_close">Itxi alboko barra</string>
<string name="drawer_community">Komunitatea</string>
<string name="drawer_header_background">Goiburuko kutxaren atzeko planoaren irudia</string>
@ -678,6 +683,8 @@
<string name="screenshot_06_davdroid_heading">Egutegia eta kontaktuak</string>
<string name="screenshot_06_davdroid_subline">Sinkronizatu DAVx5ekin</string>
<string name="search_error">Errorea bilaketaren emaitzak lortzean</string>
<string name="secure_share_not_set_up">Partekatze segurua ez dago konfiguratuta erabiltzaile honentzat</string>
<string name="secure_share_search">Partekatze segurua...</string>
<string name="select_all">Hautatu dena</string>
<string name="select_media_folder">Ezarri multimedia karpeta</string>
<string name="select_one_template">Hautatu txantiloi bat</string>
@ -882,7 +889,10 @@
<string name="uploader_error_message_source_file_not_found">Kargatzeko hautatutako fitxategia ez da aurkitu. Mesedez, egiaztatu fitxategia existitzen dela.</string>
<string name="uploader_error_title_file_cannot_be_uploaded">Fitxategi hau ezin da igo</string>
<string name="uploader_error_title_no_file_to_upload">Ez dago fitxategirik kargatzeko</string>
<string name="uploader_file_not_found_message">Fitxategia ez da aurkitu. Ziur al zaude fitxategi hau badagoela edo aurretik konpondu gabeko gatazka bat duela?</string>
<string name="uploader_file_not_found_on_server_message">Ezin izan dugu fitxategia zerbitzarian kokatu. Baliteke beste erabiltzaile batek fitxategia ezabatu izana</string>
<string name="uploader_info_dirname">Karpetaren izena</string>
<string name="uploader_local_files_uploaded">Saiatu berriro huts egin duten tokiko fitxategiak kargatzen</string>
<string name="uploader_top_message">Aukeratu karga-karpeta</string>
<string name="uploader_upload_failed_content_single">Ezin da %1$s igo</string>
<string name="uploader_upload_failed_credentials_error">Kargatzeak huts egin du, hasi saioa berriz</string>
@ -895,6 +905,7 @@
<string name="uploader_upload_files_behaviour_only_upload">Mantendu fitxategia jatorrizko karpetan</string>
<string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Ezabatu fitxategia jatorrizko karpetatik</string>
<string name="uploader_upload_forbidden_permissions">kargatzeko karpeta honetara</string>
<string name="uploader_upload_in_progress">%1$d%% %2$s</string>
<string name="uploader_upload_in_progress_content">%1$d%% Igotzen %2$s</string>
<string name="uploader_upload_in_progress_ticker">Kargatzen…</string>
<string name="uploader_upload_succeeded_content_single">%1$s igota</string>
@ -919,6 +930,7 @@
<string name="uploads_view_upload_status_fetching_server_version">Zerbitzariko bertsioa ekartzen...</string>
<string name="uploads_view_upload_status_service_interrupted">App-ak bukatu du</string>
<string name="uploads_view_upload_status_succeeded">Betea</string>
<string name="uploads_view_upload_status_succeeded_same_file">Fitxategi bera aurkitu da zerbitzarian, igoera saltatu da</string>
<string name="uploads_view_upload_status_unknown_fail">Errore ezezaguna</string>
<string name="uploads_view_upload_status_virus_detected">Birusa detektatuta. Igoera ezin da osatu!</string>
<string name="uploads_view_upload_status_waiting_exit_power_save_mode">Itxaron irteteko energia aurrezteko modutik</string>

2
app/src/main/res/values-sv/strings.xml
View file

@ -221,6 +221,7 @@
<string name="downloader_download_failed_credentials_error">Hämtningen misslyckades, logga in igen</string>
<string name="downloader_download_failed_ticker">Hämtning misslyckades</string>
<string name="downloader_download_file_not_found">Filen är inte längre tillgänglig på servern</string>
<string name="downloader_download_in_progress">%1$d%%%2$s</string>
<string name="downloader_download_in_progress_content">%1$d%% Hämtar %2$s</string>
<string name="downloader_download_in_progress_ticker">Hämtar…</string>
<string name="downloader_download_succeeded_content">%1$s hämtad</string>
@ -908,6 +909,7 @@
<string name="uploader_upload_files_behaviour_only_upload">Behåll fil i källmappen</string>
<string name="uploader_upload_files_behaviour_upload_and_delete_from_source">Ta bort fil från källmappen</string>
<string name="uploader_upload_forbidden_permissions">att ladda upp denna mapp</string>
<string name="uploader_upload_in_progress">%1$d%%%2$s</string>
<string name="uploader_upload_in_progress_content">%1$d%% Laddar upp %2$s</string>
<string name="uploader_upload_in_progress_ticker">Laddar upp…</string>
<string name="uploader_upload_succeeded_content_single">%1$s uppladdad</string>

7
gradle/verification-metadata.xml
View file

@ -158,10 +158,10 @@
<trusting group="androidx.core"/>
<trusting group="androidx.fragment"/>
<trusting group="androidx.lifecycle"/>
<trusting group="androidx.recyclerview" name="recyclerview" version="1.3.2"/>
<trusting group="androidx.room"/>
<trusting group="androidx.sqlite"/>
<trusting group="androidx.webkit" name="webkit" version="1.10.0"/>
<trusting group="androidx.recyclerview" name="recyclerview" version="1.3.2"/>
</trusted-key>
<trusted-key id="84789D24DF77A32433CE1F079EB80E92EB2135B1" group="org.apache" name="apache"/>
<trusted-key id="8569C95CADC508B09FE90F3002216ED811210DAA" group="io.github.detekt.sarif4k"/>
@ -267,7 +267,10 @@
<trusted-key id="FA77DCFEF2EE6EB2DEBEDD2C012579464D01C06A" group="org.apache" name="apache"/>
<trusted-key id="FA7929F83AD44C4590F6CC6815C71C0A4E0B8EDD" group="net.java.dev.jna"/>
<trusted-key id="FAABC3738B1F58DA2D776FA2EB380DC13C39F675" group="com.intellij" name="annotations" version="12.0"/>
<trusted-key id="FB35C8D02B4724DADA23DE0AFD116C1969FCCFF3" group="org.json" name="json" version="20230618"/>
<trusted-key id="FB35C8D02B4724DADA23DE0AFD116C1969FCCFF3">
<trusting group="org.json" name="json" version="20230618"/>
<trusting group="org.json" name="json" version="20231013"/>
</trusted-key>
<trusted-key id="FC411CD3CB7DCB0ABC9801058118B3BCDB1A5000" group="jakarta.xml.bind"/>
<trusted-key id="FF6E2C001948C5F2F38B0CC385911F425EC61B51">
<trusting group="junit"/>