Skip to content

Commit 9e00615

Browse files
Merge branch 'master' into bugfix/use-correct-download-attribute
2 parents 0ac61a2 + 51f57b8 commit 9e00615

6 files changed

Lines changed: 30 additions & 15 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
swap-size-gb: 10
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
46+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4747
with:
4848
languages: ${{ matrix.language }}
4949
- name: Set up JDK 17
@@ -57,4 +57,4 @@ jobs:
5757
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
5858
./gradlew assembleDebug
5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
60+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242

4343
# Upload the results to GitHub's code scanning dashboard.
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@39edc492dbe16b1465b0cafca41432d857bdb31a # v3.29.1
45+
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4646
with:
4747
sarif_file: results.sarif

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<string name="app_config_disable_more_external_site_title">Dış siteler kullanılmasın</string>
3939
<string name="app_config_disable_multiaccount_title">Birden fazla hesap kullanılmasın</string>
4040
<string name="app_config_disable_sharing_title">Paylaşım kullanılmasın</string>
41-
<string name="app_config_enforce_protection_title">Koruma dayatılsın</string>
41+
<string name="app_config_enforce_protection_title">Koruma zorunlu kılınsın</string>
4242
<string name="app_config_proxy_host_title">Vekil sunucu adı</string>
4343
<string name="app_config_proxy_port_title">Vekil sunucu bağlantı noktası</string>
4444
<string name="app_widget_description">Panodan bir pano bileşeni görüntüler</string>
@@ -728,7 +728,7 @@
728728
<string name="push_notifications_not_implemented">Anında bildirimler Google Play hizmetlerine olan bağımlılıklar nedeniyle kapatıldı.</string>
729729
<string name="push_notifications_old_login">Oturumunuzun süresi dolduğundan anında bildirimler gönderilemez. Lütfen hesabınızı yeniden eklemeyi düşünün.</string>
730730
<string name="push_notifications_temp_error">Anında bildirimler şu anda kullanılamıyor.</string>
731-
<string name="qr_could_not_be_read">QR kodu okunamadı!</string>
731+
<string name="qr_could_not_be_read">Kare kod okunamadı!</string>
732732
<string name="receive_external_files_activity_start_sync_folder_is_not_exists_message">Klasör bulunamadı. Eşitleme işlemi iptal edildi</string>
733733
<string name="receive_external_files_activity_unable_to_find_file_to_upload">Yüklenecek dosya bulunamadı</string>
734734
<string name="recommend_subject">%1$s uygulamasını aygıtınız üzerinde deneyin!</string>
@@ -762,7 +762,7 @@
762762
<string name="retrieving_file">Dosya alınıyor …</string>
763763
<string name="retry">Yeniden dene</string>
764764
<string name="richdocuments_failed_to_load_document">Belge yüklenemedi!</string>
765-
<string name="scanQR_description">QR kodu ile oturum aç</string>
765+
<string name="scanQR_description">Kare kod ile oturum aç</string>
766766
<string name="scan_page">Sayfayı tara</string>
767767
<string name="screenshot_01_gridView_heading">Verilerinizi korumak</string>
768768
<string name="screenshot_01_gridView_subline">kendi barındırdığınız üretkenlik</string>
@@ -786,6 +786,8 @@
786786
<string name="send">Gönder</string>
787787
<string name="send_share">Paylaşım gönder</string>
788788
<string name="sendbutton_description">Gönderme düğmesi simgesi</string>
789+
<string name="server_not_reachable">İçerik yüklenemedi</string>
790+
<string name="server_not_reachable_content">Bu aygıtın internet bağlantısı yok gibi görünüyor</string>
789791
<string name="set_as">Farklı ayarla</string>
790792
<string name="set_download_limit_failed">İndirme sınırı ayarlanamadı. Lütfen yetenekleri denetleyin.</string>
791793
<string name="set_note">Notu ayarla</string>
@@ -799,10 +801,10 @@
799801
<string name="share_copy_link">Paylaş ve bağlantıyı kopyala</string>
800802
<string name="share_create_permission">Ekleme</string>
801803
<string name="share_custom_permission">Özel izinler</string>
802-
<string name="share_delete_permission">Sil</string>
804+
<string name="share_delete_permission">Silme</string>
803805
<string name="share_dialog_title">Paylaşım</string>
804806
<string name="share_download_limit">İndirme sınırını ayarla</string>
805-
<string name="share_edit_permission">Düzenle</string>
807+
<string name="share_edit_permission">Düzenleme</string>
806808
<string name="share_expiration_date_format">%1$s</string>
807809
<string name="share_file">%1$s paylaş</string>
808810
<string name="share_group_clarification">%1$s (grup)</string>
@@ -823,7 +825,7 @@
823825
<string name="share_not_allowed_when_file_drop">Güvenli dosya bırakma sırasında yeniden paylaşım yapılamaz</string>
824826
<string name="share_option_required">İlerlemeden önce lütfen en az bir paylaşım seçeneği seçin.</string>
825827
<string name="share_permission_can_edit">Düzenleyebilir</string>
826-
<string name="share_permission_file_request">Dosya isteği</string>
828+
<string name="share_permission_file_request">Dosya isteme</string>
827829
<string name="share_permission_secure_file_drop">Güvenli dosya bırakma</string>
828830
<string name="share_permission_view_only">Yalnızca görüntüleme</string>
829831
<string name="share_permissions">Paylaşım izinleri</string>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
buildscript {
1212
ext {
13-
androidLibraryVersion ="ffc47c75fabbcbcdcd32b30e9836fde58d5c59d5"
13+
androidLibraryVersion ="8c14b444c709e91462fd503af87608a7fa40e90b"
1414
androidCommonLibraryVersion = "0.26.0"
1515
androidPluginVersion = "8.9.2"
1616
androidxMediaVersion = "1.5.1"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ media3 = "1.7.1"
77
roomVersion = "2.7.1"
88
splash-screen = "1.0.1"
99
kotlin = "2.1.21"
10-
composeBom = "2025.06.00"
10+
composeBom = "2025.06.01"
1111
spotbugsGradlePlugin = "6.2.1"
1212
detektGradlePlugin = "1.23.8"
1313
spotless = "6.25.0"

gradle/verification-metadata.xml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,6 +1207,11 @@
12071207
<sha256 value="a8b9c186caa05ec7bf27fc33db0c1b494a78b4f9a0c3ce1fa3c6f6b970ddc5ec" origin="Generated by Gradle" reason="Artifact is not signed"/>
12081208
</artifact>
12091209
</component>
1210+
<component group="androidx.compose" name="compose-bom" version="2025.06.01">
1211+
<artifact name="compose-bom-2025.06.01.pom">
1212+
<sha256 value="ef9b4ba4e0c4236e6da565bdb471b196aab00d2cd5ccfcf246b5ee8ff1e94ee9" origin="Generated by Gradle" reason="Artifact is not signed"/>
1213+
</artifact>
1214+
</component>
12101215
<component group="androidx.compose.animation" name="animation" version="1.7.5">
12111216
<artifact name="animation-1.7.5.module">
12121217
<sha256 value="7c742bb407497fb4c322bd3d4abef83741ea6107a12168f579438303433497ff" origin="Generated by Gradle"/>
@@ -12269,6 +12274,14 @@
1226912274
<sha256 value="8311ad1fd1507e6184ff6a9f019ad13dc03075ae467936e1540c43993fd18ed4" origin="Generated by Gradle" reason="Artifact is not signed"/>
1227012275
</artifact>
1227112276
</component>
12277+
<component group="com.github.nextcloud" name="android-library" version="8c14b444c709e91462fd503af87608a7fa40e90b">
12278+
<artifact name="android-library-8c14b444c709e91462fd503af87608a7fa40e90b.aar">
12279+
<sha256 value="6e5ac4ce5944b480991e459322b751614c221942cb4ae9108369a37ea61d8dec" origin="Generated by Gradle" reason="Artifact is not signed"/>
12280+
</artifact>
12281+
<artifact name="android-library-8c14b444c709e91462fd503af87608a7fa40e90b.module">
12282+
<sha256 value="366e1217b642efa6f8ee8334b265169a8860c5e5425159715891509474b30df8" origin="Generated by Gradle" reason="Artifact is not signed"/>
12283+
</artifact>
12284+
</component>
1227212285
<component group="com.github.nextcloud" name="android-library" version="8e561c7e65f208492c20b106eb25cfbe43dc7189">
1227312286
<artifact name="android-library-8e561c7e65f208492c20b106eb25cfbe43dc7189.aar">
1227412287
<sha256 value="d772821c93ced5f256dfc150f90bac38358ea037fa90ac80614cfd089c3996e6" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -12792,13 +12805,13 @@
1279212805
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.26.0">
1279312806
<artifact name="material-color-utilities-0.26.0.jar">
1279412807
<sha256 value="64c9e61afb6fd0d4ee03dd394429ab1c393f5b66429e036b618285d1bb7d8160" origin="Generated by Gradle" reason="Artifact is not signed">
12795-
<also-trust value="b8a964066ac7f1e96f130ef7adcd0558c8007f383cd0edff5404f08617bafbb1"/>
12796-
</sha256>/>
12808+
<also-trust value="b8a964066ac7f1e96f130ef7adcd0558c8007f383cd0edff5404f08617bafbb1"/>
12809+
</sha256>
1279712810
</artifact>
1279812811
<artifact name="material-color-utilities-0.26.0.module">
1279912812
<sha256 value="6e646b238fad314fcbb72e59b198e2d39183191a7fd2dff273ef3e924cf1b915" origin="Generated by Gradle" reason="Artifact is not signed">
12800-
<also-trust value="9ba64fbf5a097b859f1fd42ff167b7e83473ab03a114b6b80bdf3cbe295b9837"/>
12801-
</sha256>/>
12813+
<also-trust value="9ba64fbf5a097b859f1fd42ff167b7e83473ab03a114b6b80bdf3cbe295b9837"/>
12814+
</sha256>
1280212815
</artifact>
1280312816
</component>
1280412817
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="48ed8e86d9">

0 commit comments

Comments
 (0)