mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-20 16:02:01 +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 2023-02-17 02:33:44 +01:00
commit c5d0790be3
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/scorecard.yml vendored
View file

@ -20,12 +20,12 @@ jobs:
steps: steps:
- name: "Checkout code" - name: "Checkout code"
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
with: with:
persist-credentials: false persist-credentials: false
- name: "Run analysis" - name: "Run analysis"
uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6 uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
with: with:
results_file: results.sarif results_file: results.sarif
results_format: sarif results_format: sarif
@ -33,6 +33,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard. # Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning" - name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@807578363a7869ca324a79039e6db9c843e0e100 # v2.1.27 uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
with: with:
sarif_file: results.sarif sarif_file: results.sarif

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

@ -32,6 +32,7 @@
<string name="activity_icon">Actividad</string> <string name="activity_icon">Actividad</string>
<string name="add_another_public_share_link">Añadir otro enlace</string> <string name="add_another_public_share_link">Añadir otro enlace</string>
<string name="add_new_public_share">Añadir un nuevo enlace público</string> <string name="add_new_public_share">Añadir un nuevo enlace público</string>
<string name="add_new_secure_file_drop">añadir una nueva entrega de archivos segura</string>
<string name="add_to_cloud">Añadir a %1$s</string> <string name="add_to_cloud">Añadir a %1$s</string>
<string name="advanced_settings">Configuración avanzada</string> <string name="advanced_settings">Configuración avanzada</string>
<string name="allow_resharing">Permitir que se vuelva a compartir</string> <string name="allow_resharing">Permitir que se vuelva a compartir</string>
@ -682,6 +683,7 @@
<string name="share_password_title">Protegido con contraseña</string> <string name="share_password_title">Protegido con contraseña</string>
<string name="share_permission_can_edit">Puede editar</string> <string name="share_permission_can_edit">Puede editar</string>
<string name="share_permission_file_drop">Entrega de archivos</string> <string name="share_permission_file_drop">Entrega de archivos</string>
<string name="share_permission_secure_file_drop">entrega de archivos segura</string>
<string name="share_permission_view_only">Solo lectura</string> <string name="share_permission_view_only">Solo lectura</string>
<string name="share_permissions">Permisos al compartir</string> <string name="share_permissions">Permisos al compartir</string>
<string name="share_remote_clarification">%1$s (remoto)</string> <string name="share_remote_clarification">%1$s (remoto)</string>

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

@ -32,6 +32,7 @@
<string name="activity_icon">İşlem</string> <string name="activity_icon">İşlem</string>
<string name="add_another_public_share_link">Başka bir bağlantı ekle</string> <string name="add_another_public_share_link">Başka bir bağlantı ekle</string>
<string name="add_new_public_share">Yeni herkese açık paylaşım bağlantısı ekle</string> <string name="add_new_public_share">Yeni herkese açık paylaşım bağlantısı ekle</string>
<string name="add_new_secure_file_drop">güvenli dosya bırakma ekle</string>
<string name="add_to_cloud">%1$s üzerine ekle</string> <string name="add_to_cloud">%1$s üzerine ekle</string>
<string name="advanced_settings">Gelişmiş ayarlar</string> <string name="advanced_settings">Gelişmiş ayarlar</string>
<string name="allow_resharing">Yeniden paylaşılabilsin</string> <string name="allow_resharing">Yeniden paylaşılabilsin</string>
@ -682,6 +683,7 @@
<string name="share_password_title">Parola korumalı</string> <string name="share_password_title">Parola korumalı</string>
<string name="share_permission_can_edit">Düzenleyebilir</string> <string name="share_permission_can_edit">Düzenleyebilir</string>
<string name="share_permission_file_drop">Dosya bırakma</string> <string name="share_permission_file_drop">Dosya bırakma</string>
<string name="share_permission_secure_file_drop">Güvenli dosya bırakma</string>
<string name="share_permission_view_only">Yalnızca görüntüleme</string> <string name="share_permission_view_only">Yalnızca görüntüleme</string>
<string name="share_permissions">İzinleri paylaş</string> <string name="share_permissions">İzinleri paylaş</string>
<string name="share_remote_clarification">%1$s (uzak)</string> <string name="share_remote_clarification">%1$s (uzak)</string>