mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-29 11:59:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into feat/workflow-auto-update-pr-feedback.yml

Browse source
This commit is contained in:
Andy Scherzinger 2024-05-01 11:37:20 +02:00 committed by GitHub
commit 05c8aa24ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Gemfile.lock
View file

@ -10,17 +10,17 @@ GEM
artifactory (3.0.17) artifactory (3.0.17)
atomos (0.1.3) atomos (0.1.3)
aws-eventstream (1.3.0) aws-eventstream (1.3.0)
aws-partitions (1.919.0) aws-partitions (1.920.0)
aws-sdk-core (3.192.1) aws-sdk-core (3.193.0)
aws-eventstream (~> 1, >= 1.3.0) aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0) aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8) aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1) jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.79.0) aws-sdk-kms (1.80.0)
aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-core (~> 3, >= 3.193.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.147.0) aws-sdk-s3 (1.148.0)
aws-sdk-core (~> 3, >= 3.192.0) aws-sdk-core (~> 3, >= 3.193.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8) aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0) aws-sigv4 (1.8.0)

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

@ -56,6 +56,8 @@
<string name="settings_background_sync">Atzeko planoko sinkronizazioa</string> <string name="settings_background_sync">Atzeko planoko sinkronizazioa</string>
<string name="settings_prevent_screen_capture">Eragotzi pantaila argazkia</string> <string name="settings_prevent_screen_capture">Eragotzi pantaila argazkia</string>
<string name="settings_gridview">Sareta ikuspegia</string> <string name="settings_gridview">Sareta ikuspegia</string>
<string name="settings_enable_direct_edit">Zuzeneko edizioa</string>
<string name="settings_enable_direct_edit_summary">Desgaituta dagoenean, editore aurreratua ezkutatu egingo da.</string>
<string name="settings_keep_screen_on">Mantendu pantaila piztuta</string> <string name="settings_keep_screen_on">Mantendu pantaila piztuta</string>
<string name="settings_keep_screen_on_summary">Nota bat ikusi edo editatzean</string> <string name="settings_keep_screen_on_summary">Nota bat ikusi edo editatzean</string>