antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-01-01 01:53:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge conflicts

Browse source
This commit is contained in:
eddyizm 2025-08-02 19:30:35 -07:00
parent 5144947f77
commit e9158ee783
No known key found for this signature in database
GPG key ID: CF5F671829E8158A
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -11,7 +11,7 @@ android {
targetSdk 35 targetSdk 35
versionCode 26 versionCode 26
versionName '3.9.5' versionName '3.9.6'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

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

@ -159,6 +159,8 @@
<string name="playlist_chooser_dialog_negative_button">Annuler</string> <string name="playlist_chooser_dialog_negative_button">Annuler</string>
<string name="playlist_chooser_dialog_neutral_button">Créer</string> <string name="playlist_chooser_dialog_neutral_button">Créer</string>
<string name="playlist_chooser_dialog_title">Ajouter à une playlist</string> <string name="playlist_chooser_dialog_title">Ajouter à une playlist</string>
<string name="playlist_chooser_dialog_toast_add_success">Ajout d'une chanson à la playlist</string>
<string name="playlist_chooser_dialog_toast_add_failure">Échec de l'ajout d'une chanson à la playlist</string>
<string name="playlist_counted_tracks">%1$d titres • %2$s</string> <string name="playlist_counted_tracks">%1$d titres • %2$s</string>
<string name="playlist_duration">Durée • %1$s</string> <string name="playlist_duration">Durée • %1$s</string>
<string name="playlist_editor_dialog_hint_name">Nom de la playlist</string> <string name="playlist_editor_dialog_hint_name">Nom de la playlist</string>