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-fi/strings.xml
#	app/src/main/res/values-sv/strings.xml
#	app/src/main/res/values-tr/strings.xml
  • Loading branch information
fast4x committed Mar 8, 2024
2 parents 113800e + 38748ad commit a629380
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
<string name="smart_recommendations">ÄLYKKÄÄT SUOSITUKSET</string>
<string name="player_collapsed_disable_swiping_down">Poista pyyhkäisy alas -toiminto</string>
<string name="avoid_closing_the_player_cleaning_queue_by_swiping_down">Vältä soittimen sulkeminen ja jonon puhdistaminen pyyhkäisemällä alaspäin, kun se on pienennettynä</string>
<string name="sort_date_liked">Date Liked</string>
<string name="sort_date_liked">Tykkäyspäivämäärä</string>
<string name="export_playlist">Vie soittolista</string>
<string name="lang_afrikaans">afrikaans</string>
<string name="playlist_top">Playlist Top</string>
Expand All @@ -397,8 +397,8 @@
<string name="direction_right">Oikea</string>
<string name="copy_lyrics">Kopioi sanoitukset</string>
<string name="value_copied">Kopioitu</string>
<string name="do_you_really_want_to_delete_cache">Haluatko varmasti tyhjentää välimuistin?</string>
<string name="lang_swedish">ruotsi</string>
<string name="app_update_dialog_new">The new version %s can be downloaded!</string>
<string name="do_you_really_want_to_delete_cache">Do you really want to delete cache?</string>
<string name="lang_swedish">Swedish</string>
<string name="pinned_playlists">Pinned Playlists</string>
</resources>
10 changes: 5 additions & 5 deletions app/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,10 @@
<string name="chinese_simplified">Chinese Simplified</string>
<string name="chinese_traditional">Chinese Traditional</string>
<string name="do_you_really_want_to_download_all">Do you really want to download all?</string>
<string name="add_all_in_playlist">Add all in playlist</string>
<string name="add_in_playlist">Add in playlist</string>
<string name="import_playlist">Import playlist</string>
<string name="lang_ukrainian">Ukrainian</string>
<string name="add_all_in_playlist">Lägg till alla i spellista</string>
<string name="add_in_playlist">Lägg till i spellista</string>
<string name="import_playlist">Importera spellista</string>
<string name="lang_ukrainian">Ukrainska</string>
<string name="proxy">PROXY</string>
<string name="enable_proxy">Enable Proxy</string>
<string name="proxy_mode">Proxy Mode</string>
Expand Down Expand Up @@ -399,6 +399,6 @@
<string name="value_copied">Copied</string>
<string name="app_update_dialog_new">The new version %s can be downloaded!</string>
<string name="do_you_really_want_to_delete_cache">Do you really want to delete cache?</string>
<string name="lang_swedish">Swedish</string>
<string name="lang_swedish">Svenska</string>
<string name="pinned_playlists">Pinned Playlists</string>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,8 @@
<string name="direction_right">Sağ</string>
<string name="copy_lyrics">Şarkı sözlerini kopyala</string>
<string name="value_copied">Kopyalandı</string>
<string name="do_you_really_want_to_delete_cache">Önbelleği gerçekten silmek istiyor musunuz?</string>
<string name="app_update_dialog_new">The new version %s can be downloaded!</string>
<string name="do_you_really_want_to_delete_cache">Do you really want to delete cache?</string>
<string name="lang_swedish">Swedish</string>
<string name="pinned_playlists">Pinned Playlists</string>
</resources>

0 comments on commit a629380

Please sign in to comment.