Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Tobias Kaminsky 2023-10-11 03:36:23 +02:00
commit 4d5d0b7b23
3 changed files with 5 additions and 5 deletions

View file

@ -32,7 +32,7 @@ jobs:
with:
swap-size-gb: 10
- name: Initialize CodeQL
uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
uses: github/codeql-action/init@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
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@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
uses: github/codeql-action/analyze@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1

View file

@ -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@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
uses: github/codeql-action/upload-sarif@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
with:
sarif_file: results.sarif

View file

@ -199,7 +199,7 @@
<string name="dev_version_no_information_available">Nie sú dostupné žiadne informácie.</string>
<string name="dev_version_no_new_version_available">Nová verzia nie je dostupná.</string>
<string name="dialog_close">Zatvoriť</string>
<string name="did_not_check_for_dupes">Nekontrolovať duplity</string>
<string name="did_not_check_for_dupes">Nekontrolovať duplicity</string>
<string name="digest_algorithm_not_available">Algoritmus digest nie je na vašom telefóne dostupný.</string>
<string name="direct_login_failed">Prihlásenie pomocou priameho odkazu zlyhalo!</string>
<string name="disable_new_media_folder_detection_notifications">Zakázať</string>
@ -477,7 +477,7 @@
<string name="no_actions">Žiadne akcie pre tohto užívateľa</string>
<string name="no_browser_available">Aplikácia na prácu s linkami nenájdená</string>
<string name="no_calendar_exists">Neexistuje žiadny kalendár</string>
<string name="no_email_app_available">Aplikácia pre prácu s e-mail adresami nenájdená</string>
<string name="no_email_app_available">Aplikácia pre prácu s e-mailovými adresami nenájdená</string>
<string name="no_items">Žiadne položky</string>
<string name="no_mutliple_accounts_allowed">Povolený je iba jeden účet</string>
<string name="no_pdf_app_available">Aplikácia na prácu s PDF nenájdená</string>