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

This commit is contained in:
Tobias Kaminsky 2024-09-27 03:37:10 +02:00
commit e19d3925e0
7 changed files with 19 additions and 4 deletions

View file

@ -44,7 +44,7 @@ jobs:
echo "repo=${{ github.event.pull_request.head.repo.full_name }}" echo "repo=${{ github.event.pull_request.head.repo.full_name }}"
} >> "$GITHUB_OUTPUT" } >> "$GITHUB_OUTPUT"
fi fi
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with: with:
repository: ${{ steps.get-vars.outputs.repo }} repository: ${{ steps.get-vars.outputs.repo }}
ref: ${{ steps.get-vars.outputs.branch }} ref: ${{ steps.get-vars.outputs.branch }}

View file

@ -33,7 +33,7 @@ jobs:
language: [ 'java' ] language: [ 'java' ]
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- name: Set Swap Space - name: Set Swap Space
uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0 uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0
with: with:

View file

@ -25,5 +25,5 @@ jobs:
name: "Validation" name: "Validation"
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0 - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0

View file

@ -29,7 +29,7 @@ jobs:
steps: steps:
- name: "Checkout code" - name: "Checkout code"
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with: with:
persist-credentials: false persist-credentials: false

View file

@ -411,9 +411,14 @@
<string name="file_migration_updating_index">Aktualisiere Index…</string> <string name="file_migration_updating_index">Aktualisiere Index…</string>
<string name="file_migration_use_data_folder">Verwende bestehenden</string> <string name="file_migration_use_data_folder">Verwende bestehenden</string>
<string name="file_migration_waiting_for_unfinished_sync">Warte auf die Fertigstellung aller Synchronisierungen …</string> <string name="file_migration_waiting_for_unfinished_sync">Warte auf die Fertigstellung aller Synchronisierungen …</string>
<string name="file_name_validator_current_path_is_invalid">Der aktuelle Ordnername ist ungültig. Bitte benennen Sie den Ordner um. Weiterleitung zum Stammverzeichnis…</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Der Ordnerpfad enthält reservierte Namen oder ungültige Zeichen</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s ist eine unzulässige Dateierweiterung</string> <string name="file_name_validator_error_forbidden_file_extensions">%s ist eine unzulässige Dateierweiterung</string>
<string name="file_name_validator_error_forbidden_space_character_extensions">Dateinamen dürfen am Anfang oder Ende keine Leerzeichen enthalten</string>
<string name="file_name_validator_error_invalid_character">Der Name enthält unzulässige Zeichen: %s</string>
<string name="file_name_validator_error_reserved_names">%s ist ein unzulässiger Name</string> <string name="file_name_validator_error_reserved_names">%s ist ein unzulässiger Name</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Bitte Datei umbenennen, bevor diese verschoben oder kopiert wird</string> <string name="file_name_validator_rename_before_move_or_copy">%s. Bitte Datei umbenennen, bevor diese verschoben oder kopiert wird</string>
<string name="file_name_validator_upload_content_error">Einige Inhalte können nicht hochgeladen werden, da sie reservierte Namen oder unzulässige Zeichen enthalten</string>
<string name="file_not_found">Datei nicht gefunden</string> <string name="file_not_found">Datei nicht gefunden</string>
<string name="file_not_synced">Die gewünschte Datei konnte nicht synchronisiert werden. Die letzte verfügbare Version wird angezeigt. </string> <string name="file_not_synced">Die gewünschte Datei konnte nicht synchronisiert werden. Die letzte verfügbare Version wird angezeigt. </string>
<string name="file_rename">Umbenennen</string> <string name="file_rename">Umbenennen</string>

View file

@ -411,9 +411,14 @@
<string name="file_migration_updating_index">Ажурирам индекс…</string> <string name="file_migration_updating_index">Ажурирам индекс…</string>
<string name="file_migration_use_data_folder">Искористи</string> <string name="file_migration_use_data_folder">Искористи</string>
<string name="file_migration_waiting_for_unfinished_sync">Чекам пуну синхронизацију…</string> <string name="file_migration_waiting_for_unfinished_sync">Чекам пуну синхронизацију…</string>
<string name="file_name_validator_current_path_is_invalid">Име текућег фолдера није исправно, молимо вас да промените име овог фолдера. Преусмеравате се на почетни фолдер…</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Путања фолдера садржи резервисана имена или неисправне карактере</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s је забрањена екстензија фајла</string> <string name="file_name_validator_error_forbidden_file_extensions">%s је забрањена екстензија фајла</string>
<string name="file_name_validator_error_forbidden_space_character_extensions">Имена фајлова не смеју да садрже белине на почетку или на крају</string>
<string name="file_name_validator_error_invalid_character">Име садржи неисправне карактере: %s</string>
<string name="file_name_validator_error_reserved_names">%s је забрањено име</string> <string name="file_name_validator_error_reserved_names">%s је забрањено име</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Молимо вас да пре премештања или копирања промените име фајла</string> <string name="file_name_validator_rename_before_move_or_copy">%s. Молимо вас да пре премештања или копирања промените име фајла</string>
<string name="file_name_validator_upload_content_error">Неки садржај не може да се отпреми јер садржи резервисана имена или неисправне карактере</string>
<string name="file_not_found">Фајл није нађен</string> <string name="file_not_found">Фајл није нађен</string>
<string name="file_not_synced">Фајл не може да се синхронизује. Приказујем последњу доступну верзију.</string> <string name="file_not_synced">Фајл не може да се синхронизује. Приказујем последњу доступну верзију.</string>
<string name="file_rename">Преименуј</string> <string name="file_rename">Преименуј</string>

View file

@ -411,9 +411,14 @@
<string name="file_migration_updating_index">Dizin güncelleniyor …</string> <string name="file_migration_updating_index">Dizin güncelleniyor …</string>
<string name="file_migration_use_data_folder">Kullanılsın</string> <string name="file_migration_use_data_folder">Kullanılsın</string>
<string name="file_migration_waiting_for_unfinished_sync">Eşitleme işleminin tamamlanması bekleniyor …</string> <string name="file_migration_waiting_for_unfinished_sync">Eşitleme işleminin tamamlanması bekleniyor …</string>
<string name="file_name_validator_current_path_is_invalid">Geçerli klasör adı geçersiz. Lütfen klasörü yeniden adlandırın. Giriş klasörüne yönlendiriliyorsunuz…</string>
<string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Klasör yolunda ayrılmış adlar veya geçersiz karakterler var</string>
<string name="file_name_validator_error_forbidden_file_extensions">%s dosya uzantısına izin verilmiyor.</string> <string name="file_name_validator_error_forbidden_file_extensions">%s dosya uzantısına izin verilmiyor.</string>
<string name="file_name_validator_error_forbidden_space_character_extensions">Dosya adlarının başında veya sonunda boşluk bulunmamalıdır</string>
<string name="file_name_validator_error_invalid_character">Ad içinde geçersiz karakterler var: %s</string>
<string name="file_name_validator_error_reserved_names">%s adına izin verilmiyor</string> <string name="file_name_validator_error_reserved_names">%s adına izin verilmiyor</string>
<string name="file_name_validator_rename_before_move_or_copy">%s. Kopyalamadan ya da taşımadan önce lütfen dosyayı yeniden adlandırın</string> <string name="file_name_validator_rename_before_move_or_copy">%s. Kopyalamadan ya da taşımadan önce lütfen dosyayı yeniden adlandırın</string>
<string name="file_name_validator_upload_content_error">Bazı içerikler, içinde ayrılmış adlar veya geçersiz karakterler bulunduğundan yüklenemedi</string>
<string name="file_not_found">Dosya bulunamadı</string> <string name="file_not_found">Dosya bulunamadı</string>
<string name="file_not_synced">Dosya eşitlenemedi. Kullanılabilen son sürüm görüntüleniyor.</string> <string name="file_not_synced">Dosya eşitlenemedi. Kullanılabilen son sürüm görüntüleniyor.</string>
<string name="file_rename">Yeniden adlandır</string> <string name="file_rename">Yeniden adlandır</string>