Skip to content

Commit 5037a8c

Browse files
authored
Merge branch 'master' into feat/5609-swipe-to-close-media
2 parents 01a2acd + d2c9cf9 commit 5037a8c

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
swap-size-gb: 10
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
46+
uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
4747
with:
4848
languages: ${{ matrix.language }}
4949
- name: Set up JDK 21
@@ -57,4 +57,4 @@ jobs:
5757
echo "org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
5858
./gradlew --no-daemon assembleDebug
5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
60+
uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242

4343
# Upload the results to GitHub's code scanning dashboard.
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@19b2f06db2b6f5108140aeb04014ef02b648f789 # v4.31.11
45+
uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
4646
with:
4747
sarif_file: results.sarif

app/src/main/res/values-fr/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@
123123
<string name="nc_call_button_content_description_answer_video_call">Répondre par appel vidéo</string>
124124
<string name="nc_call_button_content_description_answer_voice_only">Répondre par appel vocal uniquement</string>
125125
<string name="nc_call_button_content_description_audio_output">Changer de sortie audio</string>
126-
<string name="nc_call_button_content_description_camera">Activer / Désactiver la caméra</string>
126+
<string name="nc_call_button_content_description_camera">Activer/Désactiver la caméra</string>
127127
<string name="nc_call_button_content_description_hangup">Raccrocher</string>
128-
<string name="nc_call_button_content_description_microphone">Activer / Désactiver le micro</string>
128+
<string name="nc_call_button_content_description_microphone">Activer/Désactiver le micro</string>
129129
<string name="nc_call_button_content_description_pip">Lancer le mode Image dans l\'Image</string>
130130
<string name="nc_call_button_content_description_switch_to_self_vide">Basculer mode selfie</string>
131131
<string name="nc_call_incoming">ENTRANT</string>
@@ -665,7 +665,7 @@
665665
<string name="take_photo_switch_camera">Retourner la caméra</string>
666666
<string name="take_photo_toggle_crop">Rogner la photo</string>
667667
<string name="take_photo_toggle_lowres">Réduire la taille de l\'image</string>
668-
<string name="take_photo_toggle_torch">Allumer / Éteindre la lampe</string>
668+
<string name="take_photo_toggle_torch">Allumer/Éteindre la lampe</string>
669669
<string name="thirtyMinutes">30 minutes</string>
670670
<string name="thisWeek">Cette semaine</string>
671671
<string name="this_is_a_test_message">Ceci est un message de test</string>

0 commit comments

Comments
 (0)