mirror of
https://github.com/nextcloud/android.git
synced 2024-12-19 15:33:00 +03:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
10197c87de
4 changed files with 11 additions and 4 deletions
4
.github/workflows/codeql.yml
vendored
4
.github/workflows/codeql.yml
vendored
|
@ -32,7 +32,7 @@ jobs:
|
|||
with:
|
||||
swap-size-gb: 10
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3
|
||||
uses: github/codeql-action/init@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
- name: Set up JDK 17
|
||||
|
@ -46,4 +46,4 @@ jobs:
|
|||
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
|
||||
./gradlew assembleDebug
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3
|
||||
uses: github/codeql-action/analyze@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
|
||||
|
|
2
.github/workflows/scorecard.yml
vendored
2
.github/workflows/scorecard.yml
vendored
|
@ -37,6 +37,6 @@ jobs:
|
|||
|
||||
# Upload the results to GitHub's code scanning dashboard.
|
||||
- name: "Upload to code-scanning"
|
||||
uses: github/codeql-action/upload-sarif@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2.20.3
|
||||
uses: github/codeql-action/upload-sarif@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
|
||||
with:
|
||||
sarif_file: results.sarif
|
||||
|
|
|
@ -277,7 +277,7 @@
|
|||
<string name="error_file_actions">Erro ao amosar as accións do ficheiro</string>
|
||||
<string name="error_file_lock">Produciuse un erro ao cambiar o estado do bloqueo do ficheiro</string>
|
||||
<string name="error_report_issue_action">Informe</string>
|
||||
<string name="error_report_issue_text">Informar dunha incidencia no seguimento? (require dunha conta de GitHub)</string>
|
||||
<string name="error_report_issue_text">Informar dunha incidencia no seguimento? (precisa dunha conta de GitHub)</string>
|
||||
<string name="error_retrieving_file">Produciuse un erro ao recuperar o ficheiro</string>
|
||||
<string name="error_retrieving_templates">Produciuse un erro ao recuperar modelos</string>
|
||||
<string name="error_showing_encryption_dialog">Produciuse un erro ao amosar o diálogo de configuración do cifrado!</string>
|
||||
|
|
|
@ -249,6 +249,7 @@
|
|||
<string name="drawer_quota_unlimited">Wykorzystane: %1$s</string>
|
||||
<string name="drawer_synced_folders">Automatyczne wysyłanie</string>
|
||||
<string name="e2e_not_yet_setup">E2E jeszcze nie skonfigurowane</string>
|
||||
<string name="e2e_offline">Niemożliwe bez połączenia z internetem</string>
|
||||
<string name="encrypted">Ustaw jako zaszyfrowane</string>
|
||||
<string name="end_to_end_encryption_confirm_button">Włącz szyfrowanie</string>
|
||||
<string name="end_to_end_encryption_decrypting">Odszyfrowywanie…</string>
|
||||
|
@ -408,6 +409,11 @@
|
|||
<string name="icon_of_dashboard_widget">Ikona widżetu pulpitu nawigacyjnego</string>
|
||||
<string name="icon_of_widget_entry">Ikona wpisu widżetu</string>
|
||||
<string name="image_editor_file_edited_suffix">Zedytowany</string>
|
||||
<string name="image_editor_flip_horizontal">Obróć poziomo</string>
|
||||
<string name="image_editor_flip_vertical">Obróć pionowo</string>
|
||||
<string name="image_editor_rotate_ccw">Obróć w przeciwnym kierunku do ruchu zegarka</string>
|
||||
<string name="image_editor_rotate_cw">Obróć w kierunku do ruchu zegarka</string>
|
||||
<string name="image_editor_unable_to_edit_image">Nie można edytować obrazu</string>
|
||||
<string name="in_folder">w katalogu %1$s</string>
|
||||
<string name="instant_upload_existing">Wyślij również istniejące pliki</string>
|
||||
<string name="instant_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
|
||||
|
@ -525,6 +531,7 @@
|
|||
<string name="pass_code_removed">Kod PIN został usunięty</string>
|
||||
<string name="pass_code_stored">Kod PIN został zapisany</string>
|
||||
<string name="pass_code_wrong">Kod PIN nieprawidłowy</string>
|
||||
<string name="pdf_password_protected">Nie można otworzyć pliku PDF które jest chronione hasłem. Użyj zewnętrznej przeglądarki plików PDF.</string>
|
||||
<string name="pdf_zoom_tip">Dotknij strony, aby powiększyć</string>
|
||||
<string name="permission_allow">Akceptuj</string>
|
||||
<string name="permission_deny">Odrzuć</string>
|
||||
|
|
Loading…
Reference in a new issue