Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/src/main/res/values-cs/strings.xml
#	app/src/main/res/values-fr-rFR/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-ro/strings.xml
#	app/src/main/res/values-tr/strings.xml
  • Loading branch information
fast4x committed Dec 9, 2023
2 parents c3ea290 + 5dfde55 commit 049b41e
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 79 deletions.
33 changes: 16 additions & 17 deletions app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<string name="queue_loop">"Smyčka fronty "</string>
<string name="id">Id</string>
<string name="itag">Itag</string>
<string name="bitrate">Bitrate</string>
<string name="bitrate">Přenosová rychlost</string>
<string name="size">Velikost</string>
<string name="cached">Uloženo do mezipaměti</string>
<string name="loudness">Hlasitost</string>
Expand Down Expand Up @@ -109,13 +109,13 @@
<string name="disable_background_restrictions">Zakázat omezení na pozadí</string>
<string name="invincible_service">Nezastavitelná služba</string>
<string name="turning_off_battery_optimizations_is_not_enough">Když vypnutí optimalizace baterie nestačí</string>
<string name="player_audio"><![CDATA[Player & Audio]]></string>
<string name="player_audio"><![CDATA[Přehrávač & zvuk]]></string>
<string name="player">Přehrávač</string>
<string name="persistent_queue">Permanentní fronta</string>
<string name="save_and_restore_playing_songs">Uložit a obnovit přehrávané skladby</string>
<string name="resume_playback">Obnovit přehrávání</string>
<string name="when_device_is_connected">Když je připojeno drátové nebo bluetooth zařízení.</string>
<string name="audio">AUDIO</string>
<string name="audio">ZVUK</string>
<string name="skip_silence">Přeskočit ticho</string>
<string name="skip_silent_parts_during_playback">Přeskočení tichých částí během přehrávání</string>
<string name="loudness_normalization">Normalizace hlasitosti</string>
Expand Down Expand Up @@ -246,19 +246,18 @@
<string name="restart_app_please">Restartujte aplikaci, prosím.</string>
<string name="listen_on_piped">Poslouchat na Piped</string>
<string name="listen_on_invidious">Poslouchat na Invidious</string>
<string name="disable_horizontal_swipe">Disable horizontal swipe</string>
<string name="disable_song_switching_via_swipe">Disable song switching via swipe</string>
<string name="interface_in_use">Interface in use</string>
<string name="user_interface">User interface</string>
<string name="disable_horizontal_swipe">Zakázat vodorovné přejetí</string>
<string name="disable_song_switching_via_swipe">Zakázat přepínání skladeb přejetím</string>
<string name="interface_in_use">Použité prostředí</string>
<string name="user_interface">Uživatelské prostředí</string>
<string name="ui_tab">UI</string>
<string name="system_language">System language</string>
<string name="french_emoticons_fran_ais">French Emoticons (Français)</string>
<string name="romanian_emoticons_rom_n">Romanian Emoticons (Română)</string>
<string name="biggest">Biggest</string>
<string name="set_custom_cache">Set custom cache</string>
<string name="enter_value_in_mb">Enter value in MB</string>
<string name="value_cannot_be_empty">Value cannot be empty</string>
<string name="value_must_be_greater_than">"Value must be greater than "</string>
<string name="custom">Custom</string>
<string name="custom_cache_size">Custom cache size</string>
<string name="system_language">Systémový jazyk</string>
<string name="french_emoticons_fran_ais">Francouzské smajlíky (Français)</string>
<string name="romanian_emoticons_rom_n">Rumunské smajlíky (Română)</string>
<string name="biggest">Největší</string>
<string name="set_custom_cache">Nastavit vlastní mezipaměť</string>
<string name="enter_value_in_mb">Zadejte hodnotu v MB</string>
<string name="value_cannot_be_empty">Hodnota nemůže být prázdná</string>
<string name="value_must_be_greater_than">"Hodnota musí být vyšší než "</string>
<string name="custom">Vlastní</string>
</resources>
28 changes: 14 additions & 14 deletions app/src/main/res/values-fr-rFR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -246,19 +246,19 @@
<string name="restart_app_please">🔃 Redémarrez l\'application</string>
<string name="listen_on_piped">Écouter sur Piped</string>
<string name="listen_on_invidious">Ecouter sur Invidious</string>
<string name="disable_horizontal_swipe">Disable horizontal swipe</string>
<string name="disable_song_switching_via_swipe">Disable song switching via swipe</string>
<string name="interface_in_use">Interface in use</string>
<string name="user_interface">User interface</string>
<string name="ui_tab">UI</string>
<string name="system_language">System language</string>
<string name="french_emoticons_fran_ais">French Emoticons (Français)</string>
<string name="romanian_emoticons_rom_n">Romanian Emoticons (Română)</string>
<string name="biggest">Biggest</string>
<string name="set_custom_cache">Set custom cache</string>
<string name="enter_value_in_mb">Enter value in MB</string>
<string name="value_cannot_be_empty">Value cannot be empty</string>
<string name="value_must_be_greater_than">"Value must be greater than "</string>
<string name="custom">Custom</string>
<string name="disable_horizontal_swipe">Désactiver le glissement horizontal</string>
<string name="disable_song_switching_via_swipe">Désactiver le changement de chanson par balayage</string>
<string name="interface_in_use">Interface en cours d\'utilisation</string>
<string name="user_interface">Interface utilisateur</string>
<string name="ui_tab">IU</string>
<string name="system_language">Langue du système</string>
<string name="french_emoticons_fran_ais">Français avec Émojis (Français)</string>
<string name="romanian_emoticons_rom_n">Roumain avec Émojis (Română)</string>
<string name="biggest">Très gros</string>
<string name="set_custom_cache">Définir un cache personnalisé</string>
<string name="enter_value_in_mb">Entrez la valeur en Mo</string>
<string name="value_cannot_be_empty">🔢 La valeur ne peut pas être vide</string>
<string name="value_must_be_greater_than">"La valeur doit être supérieure à "</string>
<string name="custom">Personnalisé</string>
<string name="custom_cache_size">Custom cache size</string>
</resources>
12 changes: 6 additions & 6 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@
<string name="system_language">Langue du système</string>
<string name="french_emoticons_fran_ais">Français avec Émojis (Français)</string>
<string name="romanian_emoticons_rom_n">Roumain avec Émojis (Română)</string>
<string name="biggest">Gros</string>
<string name="set_custom_cache">Set custom cache</string>
<string name="enter_value_in_mb">Enter value in MB</string>
<string name="value_cannot_be_empty">Value cannot be empty</string>
<string name="value_must_be_greater_than">"Value must be greater than "</string>
<string name="custom">Custom</string>
<string name="biggest">Très gros</string>
<string name="set_custom_cache">Définir un cache personnalisé</string>
<string name="enter_value_in_mb">Entrez la valeur en Mo</string>
<string name="value_cannot_be_empty">La valeur ne peut pas être vide</string>
<string name="value_must_be_greater_than">"La valeur doit être supérieure à "</string>
<string name="custom">Personnalisé</string>
<string name="custom_cache_size">Custom cache size</string>
</resources>
11 changes: 5 additions & 6 deletions app/src/main/res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,9 @@
<string name="french_emoticons_fran_ais">Franceză cu Emoticoane (Français)</string>
<string name="romanian_emoticons_rom_n">Română cu Emoticoane (Română)</string>
<string name="biggest">Gigantic</string>
<string name="set_custom_cache">Set custom cache</string>
<string name="enter_value_in_mb">Enter value in MB</string>
<string name="value_cannot_be_empty">Value cannot be empty</string>
<string name="value_must_be_greater_than">"Value must be greater than "</string>
<string name="custom">Custom</string>
<string name="custom_cache_size">Custom cache size</string>
<string name="set_custom_cache">Setează cache personalizat</string>
<string name="enter_value_in_mb">Introdu valoarea în MB</string>
<string name="value_cannot_be_empty">Valoarea nu poate fi goală</string>
<string name="value_must_be_greater_than">"Valoarea trebuie să fie mai mare decât "</string>
<string name="custom">Personalizat</string>
</resources>
71 changes: 35 additions & 36 deletions app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,53 +212,52 @@
<string name="new_albums">Yeni albüm</string>
<string name="moods_and_genres">Ruh Hali ve Türler</string>
<string name="search_queries">" arama sorguları"</string>
<string name="not_find_battery_optimization_settings">Couldn\'t find battery optimization settings, please whitelist manually</string>
<string name="not_find_battery_optimization_settings">Pil optimizasyonu ayarları bulunamadı, lütfen manuel olarak beyaz listeye alın</string>
<string name="search">Ara...</string>
<string name="no">Hayır</string>
<string name="stop">Durak</string>
<string name="preferences">PREFERENCES</string>
<string name="it_seems_that_youtube_music_is_not_installed">It seems that YouTube Music is not installed!</string>
<string name="listen_on_youtube">Listen on YouTube</string>
<string name="listen_on_youtube_music">Listen on YouTube Music</string>
<string name="preferences">TERCIHLERI</string>
<string name="it_seems_that_youtube_music_is_not_installed">YouTube Music yüklü değil gibi görünüyor!</string>
<string name="listen_on_youtube">YouTube üzerinden dinleyin</string>
<string name="listen_on_youtube_music">YouTube Music üzerinden dinleyin</string>
<string name="on_device">Cihaz üzerinde</string>
<string name="open_settings">Ayarları aç</string>
<string name="permission_declined_grant_media_permissions">Permission declined, please grant media permissions in the settings of your device.</string>
<string name="wavy_timeline">Wavy timeline</string>
<string name="enable_wavy_timeline">Enable the wavy timeline</string>
<string name="play_next">Play next</string>
<string name="toggle_lyrics">Toggle lyrics</string>
<string name="by_tapping_on_the_thumbnail">By tapping on the thumbnail</string>
<string name="require_mic_permission">Visualizer effect require mic permission, grant please.</string>
<string name="permission_declined_grant_media_permissions">İzin reddedildi, lütfen cihazınızın ayarlarında medya izinleri verin.</string>
<string name="wavy_timeline">Dalgalı zaman çizelgesi</string>
<string name="enable_wavy_timeline">Dalgalı zaman çizelgesini etkinleştir</string>
<string name="play_next">Sonrakini oynat</string>
<string name="toggle_lyrics">Toggle şarkı sözleri</string>
<string name="by_tapping_on_the_thumbnail">Küçük resme dokunarak</string>
<string name="require_mic_permission">Görselleştirici etkisi mikrofon izni gerektirir, lütfen verin.</string>
<string name="vt_fancy">İkramiye</string>
<string name="vt_circular">Dairesel</string>
<string name="vt_disabled">Kapalı</string>
<string name="vt_stacked">İstiflenmiş</string>
<string name="vt_one_side">Tek taraf</string>
<string name="vt_double_side">Çift Taraflı</string>
<string name="vt_double_side_circular">Double side circular</string>
<string name="vt_double_side_circular">Çift taraflı dairesel</string>
<string name="vt_full">Tam</string>
<string name="new_albums_of_your_artists">New albums of your artists</string>
<string name="timeline">Timeline</string>
<string name="song_cache_by_player">SONG CACHE (by Player)</string>
<string name="song_cache_by_download">SONG CACHE (by Download)</string>
<string name="visualizer">Visualizer</string>
<string name="visualizer_require_mic_permission">Visualizer REQUIRE MIC PERMISSION</string>
<string name="restart_app_please">Restart app please.</string>
<string name="listen_on_piped">Listen on Piped</string>
<string name="listen_on_invidious">Listen on Invidious</string>
<string name="disable_horizontal_swipe">Disable horizontal swipe</string>
<string name="disable_song_switching_via_swipe">Disable song switching via swipe</string>
<string name="interface_in_use">Interface in use</string>
<string name="user_interface">User interface</string>
<string name="new_albums_of_your_artists">Sanatçılarınızın yeni albümleri</string>
<string name="timeline">Zaman çizelgesi</string>
<string name="song_cache_by_player">SONG CACHE (oyuncuya Göre)</string>
<string name="song_cache_by_download">SONG CACHE (indirilerek)</string>
<string name="visualizer">Görselleştirme</string>
<string name="visualizer_require_mic_permission">Görselleştirici MIC İZİNİ GEREKTİRİR</string>
<string name="restart_app_please">Uygulamayı yeniden başlatın lütfen.</string>
<string name="listen_on_piped">Piped\'i iyi dinle</string>
<string name="listen_on_invidious">Invidious Dinle beni</string>
<string name="disable_horizontal_swipe">Yatay kaydırmayı devre dışı bırak</string>
<string name="disable_song_switching_via_swipe">Kaydırma yoluyla şarkı geçişini devre dışı bırakın</string>
<string name="interface_in_use">Kullanılan arayüz</string>
<string name="user_interface">Kullanıcı arayüzü</string>
<string name="ui_tab">UI</string>
<string name="system_language">System language</string>
<string name="french_emoticons_fran_ais">French Emoticons (Français)</string>
<string name="romanian_emoticons_rom_n">Romanian Emoticons (Română)</string>
<string name="biggest">Biggest</string>
<string name="set_custom_cache">Set custom cache</string>
<string name="enter_value_in_mb">Enter value in MB</string>
<string name="value_cannot_be_empty">Value cannot be empty</string>
<string name="value_must_be_greater_than">"Value must be greater than "</string>
<string name="custom">Custom</string>
<string name="custom_cache_size">Custom cache size</string>
<string name="system_language">Sistem dili</string>
<string name="french_emoticons_fran_ais">Fransız İfadeler (Français)</string>
<string name="romanian_emoticons_rom_n">Romen İfadeleri (Rom Hâln)</string>
<string name="biggest">En büyük</string>
<string name="set_custom_cache">Özel önbellek ayarla</string>
<string name="enter_value_in_mb">Değeri MB cinsinden girin</string>
<string name="value_cannot_be_empty">Değer boş olamaz</string>
<string name="value_must_be_greater_than">"Değer daha büyük olmalıdır "</string>
<string name="custom">Özel</string>
</resources>

0 comments on commit 049b41e

Please sign in to comment.