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 2023-10-28 03:36:33 +02:00
commit b8f8fc610c
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/codeql.yml vendored
View file

@ -12,10 +12,6 @@ on:
permissions: permissions:
contents: read contents: read
concurrency:
group: code-ql-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs: jobs:
analyze: analyze:
name: Analyze name: Analyze

1
app/src/main/res/values-vi/strings.xml
View file

@ -660,6 +660,7 @@
<string name="share_no_password_title">Đặt mật khẩu</string> <string name="share_no_password_title">Đặt mật khẩu</string>
<string name="share_password_title">Mật khẩu được bảo vệ</string> <string name="share_password_title">Mật khẩu được bảo vệ</string>
<string name="share_permission_can_edit">Có thể chỉnh sửa</string> <string name="share_permission_can_edit">Có thể chỉnh sửa</string>
<string name="share_permission_file_drop">Thả file</string>
<string name="share_permission_view_only">Chỉ xem</string> <string name="share_permission_view_only">Chỉ xem</string>
<string name="share_permissions">Quyền kho</string> <string name="share_permissions">Quyền kho</string>
<string name="share_remote_clarification">%1$s (từ xa)</string> <string name="share_remote_clarification">%1$s (từ xa)</string>