Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	composeApp/src/androidMain/res/values-de/strings.xml
#	composeApp/src/androidMain/res/values-zh-rCN/strings.xml
  • Loading branch information
fast4x committed Nov 24, 2024
2 parents a1cf62d + f1b5a96 commit 334a071
Show file tree
Hide file tree
Showing 3 changed files with 158 additions and 158 deletions.
6 changes: 3 additions & 3 deletions composeApp/src/androidMain/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@
<string name="center">Zentrieren</string>
<string name="lyricsalignment">Songtext-Ausrichtung</string>
<string name="lang_azerbaijani">Aserbaidschanisch (Azərbaycanca)</string>
<string name="translators">Übersetzer*innen</string>
<string name="translators">Übersetzer</string>
<string name="lang_tamil">Tamil (தமிழ்)</string>
<string name="player_auto_load_songs_in_queue">Titel der Warteschlange automatisch laden</string>
<string name="player_auto_load_songs_in_queue_description">Fügt Lieder hinzu, wenn sich die Warteschlange dem Ende nähert</string>
Expand Down Expand Up @@ -792,8 +792,8 @@
<string name="repeat">Wiederholen</string>
<string name="original_lyrics">Originaler Songtext</string>
<string name="translated_lyrics">Übersetzter Songtext</string>
<string name="press_once_again_to_exit">Press once again to exit</string>
<string name="random_sorting">Random sorting</string>
<string name="press_once_again_to_exit">Zum Beenden erneut drücken</string>
<string name="random_sorting">Zufällige Sortierung</string>
<string name="music_animations_bars">Bars</string>
<string name="music_animations_crazy_bars">Crazy Bars</string>
<string name="music_animations_crazy_points">Crazy Points</string>
Expand Down
Loading

0 comments on commit 334a071

Please sign in to comment.