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-04-04 02:33:49 +02:00
commit c3b20006f5
11 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/analysis.yml vendored
View file

@ -33,7 +33,7 @@ jobs:
repository: ${{ steps.get-vars.outputs.repo }}
ref: ${{ steps.get-vars.outputs.branch }}
- name: Set up JDK 11
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
with:
distribution: "temurin"
java-version: 11

2
.github/workflows/assembleFlavors.yml vendored
View file

@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
- name: set up JDK 11
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
with:
distribution: "temurin"
java-version: 11

2
.github/workflows/check.yml vendored
View file

@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
- name: Set up JDK 11
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
with:
distribution: "temurin"
java-version: 11

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

@ -32,11 +32,11 @@ jobs:
with:
swap-size-gb: 10
- name: Initialize CodeQL
uses: github/codeql-action/init@67a35a08586135a9573f4327e904ecbf517a882d # v2.2.8
uses: github/codeql-action/init@04df1262e6247151b5ac09cd2c303ac36ad3f62b # v2.2.9
with:
languages: ${{ matrix.language }}
- name: Set up JDK
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
with:
distribution: "temurin"
java-version: 11
@ -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@67a35a08586135a9573f4327e904ecbf517a882d # v2.2.8
uses: github/codeql-action/analyze@04df1262e6247151b5ac09cd2c303ac36ad3f62b # v2.2.9

2
.github/workflows/qa.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
if: ${{ steps.check-secrets.outputs.ok == 'true' }}
- name: set up JDK 11
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
if: ${{ steps.check-secrets.outputs.ok == 'true' }}
with:
distribution: "temurin"

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

@ -25,7 +25,7 @@ jobs:
persist-credentials: false
- name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
with:
results_file: results.sarif
results_format: sarif
@ -33,6 +33,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@67a35a08586135a9573f4327e904ecbf517a882d # v2.2.8
uses: github/codeql-action/upload-sarif@04df1262e6247151b5ac09cd2c303ac36ad3f62b # v2.2.9
with:
sarif_file: results.sarif

2
.github/workflows/screenShotTest.yml vendored
View file

@ -36,7 +36,7 @@ jobs:
~/.android/adb*
key: avd-${{ matrix.api-level }}
- uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
- uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
with:
distribution: "temurin"
java-version: 11

2
.github/workflows/unit-tests.yml vendored
View file

@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3
- name: Set up JDK 11
uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3
with:
distribution: "temurin"
java-version: 11

4
app/src/main/res/values-fr/strings.xml
View file

@ -163,8 +163,8 @@
<string name="contactlist_no_permission">Pas de permission donnée, rien n\'a été importé.</string>
<string name="contacts">Contacts</string>
<string name="contacts_backup_button">Sauvegarder maintenant</string>
<string name="contacts_preferences_backup_scheduled">La sauvegarde est planifiée et va bientôt démarrer</string>
<string name="contacts_preferences_import_scheduled">L\'import est planifié et va démarrer</string>
<string name="contacts_preferences_backup_scheduled">La sauvegarde est planifiée et démarrera bientôt</string>
<string name="contacts_preferences_import_scheduled">L\'import est planifié et démarrera bientôt</string>
<string name="contacts_preferences_no_file_found">Aucun fichier trouvé</string>
<string name="contacts_preferences_something_strange_happened">Impossible de trouver la dernière sauvegarde !</string>
<string name="copied_to_clipboard">Copié dans le presse-papier</string>

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

@ -354,7 +354,7 @@ Otomatis unggah hanya bekerja dengan baik apabila Anda mengeluarkan aplikasi ini
<string name="label_empty">Label tidak boleh kosong</string>
<string name="link">Tautan</string>
<string name="link_share_allow_upload_and_editing">Izinkan pengunggahan dan penyuntingan</string>
<string name="link_share_file_drop">Berkas jatuh (hanya unggah)</string>
<string name="link_share_file_drop">Ungga File (hanya upload)</string>
<string name="list_layout">Daftar tampilan</string>
<string name="load_more_results">Muat lebih banyak hasil</string>
<string name="local_file_list_empty">Tidak ada satupun berkas dalam folder ini.</string>

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

@ -378,8 +378,8 @@
<string name="filename_hint">Dosya adı</string>
<string name="first_run_1_text">Verilerinizi güvenli ve denetiminiz altında tutun</string>
<string name="first_run_2_text">Güvenli iş birliği ve dosya değiş tokuşu</string>
<string name="first_run_3_text">Kolay kullanılan web e-posta, takvim ve kişiler</string>
<string name="first_run_4_text">Ekran paylaşımı, çevrimiçi görüşmeler ve web toplantıları</string>
<string name="first_run_3_text">İnternet üzerinden kolayca kullanılan e-posta, takvim ve kişiler</string>
<string name="first_run_4_text">Ekran paylaşımı, çevrimiçi görüşmeler ve internet toplantıları</string>
<string name="folder_already_exists">Klasör zaten var</string>
<string name="folder_confirm_create">Ekle</string>
<string name="folder_list_empty_headline">Burada herhangi bir klasör yok</string>
@ -436,7 +436,7 @@
<string name="log_send_mail_subject">%1$s Android uygulaması günlükleri</string>
<string name="log_send_no_mail_app">Günlüklerin gönderilebileceği bir uygulama bulunamadı. Lütfen bir e-posta uygulaması kurun.</string>
<string name="login">Oturum aç</string>
<string name="login_url_helper_text">%1$s web arayüzü için web tarayıcıda açacağınız bağlantı.</string>
<string name="login_url_helper_text">%1$s site arayüzü için tarayıcıda açacağınız bağlantı.</string>
<string name="logs_menu_delete">Günlükleri sil</string>
<string name="logs_menu_refresh">Yenile</string>
<string name="logs_menu_search">Günlük arama</string>
@ -901,7 +901,7 @@
<string name="user_info_email">E-posta</string>
<string name="user_info_phone">Telefon numarası</string>
<string name="user_info_twitter">Twitter</string>
<string name="user_info_website">Web sitesi</string>
<string name="user_info_website">Site</string>
<string name="user_information_retrieval_error">Kullanıcı bilgileri alınırken sorun çıktı</string>
<string name="userinfo_no_info_headline">Herhangi bir kişisel bilgi ayarlanmamış</string>
<string name="userinfo_no_info_text">Profil sayfanızdan ad, görsel ve iletişim bilgilerinizi ekleyin.</string>