diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c250ca448..cdced1712 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -59,7 +59,7 @@ + android:label="@string/lbl_playback"> diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt index f9ec44705..341219632 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt @@ -109,14 +109,6 @@ class PlaybackFragment : Fragment() { } } - playbackModel.parent.observe(viewLifecycleOwner) { parent -> - if (parent != null) { - binding.playbackToolbar.subtitle = parent.resolvedName - } else { - binding.playbackToolbar.setSubtitle(R.string.lbl_all_songs) - } - } - playbackModel.isShuffling.observe(viewLifecycleOwner) { isShuffling -> binding.playbackShuffle.isActivated = isShuffling } diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml index af0c8be52..c4954313f 100644 --- a/app/src/main/res/layout-land/fragment_playback.xml +++ b/app/src/main/res/layout-land/fragment_playback.xml @@ -31,7 +31,7 @@ style="@style/Widget.Auxio.Toolbar.Icon.Down" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:title="@string/info_widget_name" + app:title="@string/lbl_playback" app:menu="@menu/menu_playback" /> diff --git a/app/src/main/res/layout-sw600dp/fragment_playback.xml b/app/src/main/res/layout-sw600dp/fragment_playback.xml index 115fc4ed3..9e9546fef 100644 --- a/app/src/main/res/layout-sw600dp/fragment_playback.xml +++ b/app/src/main/res/layout-sw600dp/fragment_playback.xml @@ -31,7 +31,7 @@ style="@style/Widget.Auxio.Toolbar.Icon.Down" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:title="@string/info_widget_name" + app:title="@string/lbl_playback" app:menu="@menu/menu_playback" /> "Přehrát z alba" "Přehrát od umělce" "Přehrát z žánru" - "Nyní hraje" + "Nyní hraje" "Fronta" "Přidat do fronty" "Přidáno do fronty" diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5891ac8be..31e94c4bf 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -26,7 +26,7 @@ Von Album abspielen Von Künstler abspielen Von Genre abspielen - Aktuelle Wiedergabe + Aktuelle Wiedergabe Warteschlange Zur Warteschlange hinzufügen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 865d76611..6a0f370b1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -18,7 +18,7 @@ Αναπαραγωγή Τυχαία - Παίζει τώρα + Παίζει τώρα Ουρά αναπαραγωγής Προσθήκη στην ουρά αναπ/γής diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f8078b962..6596042d7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -27,7 +27,7 @@ Reproducir por álbum Reproducir por artista Reproducir por género - Reproducción actual + Reproducción actual Cola Agregar a la cola diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b658fe0da..e8a75e347 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -19,7 +19,7 @@ Lecture Aléatoire - Lecture en cours + Lecture en cours File d\'attente Ajouter à la file d\'attente diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 86a3a8545..d72c44945 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -19,7 +19,7 @@ Lejátszás Keverés - Most Játszott + Most Játszott Lejátszási sor Lejátszás sorhoz adás diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 3e2ffa052..2f13d36e7 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -19,7 +19,7 @@ Putar Acak - Sedang Diputar + Sedang Diputar Antrean Tambahkan ke antrean diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 32b16d036..442602868 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -19,7 +19,7 @@ Riproduci Casuale - Schermata di riproduzione + Schermata di riproduzione Coda Aggiungi alla coda diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c739fe689..c1471e999 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -19,7 +19,7 @@ 재생 모든 곡 랜덤 재생 - 지금 재생 중 + 지금 재생 중 대기열 대기열에 추가 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index eef81e196..6346ed065 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -27,7 +27,7 @@ Speel af van album Speel van artiest Speel vanuit genre - Afspeelscherm + Afspeelscherm Wachtrij Toevoegen aan wachtrij diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 118e2d61a..8f162612f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -19,7 +19,7 @@ Graj Losowo - Obecnie Grane + Obecnie Grane Kolejka Dodaj do kolejki diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7e83d7ae0..3bb4e7a62 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -18,7 +18,7 @@ Reproduzir Embaralhar - Tocando agora + Tocando agora Fila Adicionar à fila diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index bac862fb3..99bdb147f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -19,7 +19,7 @@ Reproduzir Embaralhar - A reproduzir + A reproduzir Fila Adicionar à fila diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index e14fe5fef..83d8a2024 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -19,7 +19,7 @@ Redă Amestecare - Redare Acum + Redare Acum Fila de așteptare Adăugați la lista de așteptare diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 942f19440..de7d14d8b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,7 +19,7 @@ Воспроизвести Перемешать - Сейчас воспроизводится + Сейчас воспроизводится Очередь Добавить в очередь diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index fad522926..0f1e85f78 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -19,7 +19,7 @@ Başlat Karıştır - Şuan çalınan + Şuan çalınan Kuyruk Kuyruğa ekle diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d5e24a450..320dc0e94 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -18,7 +18,7 @@ Відтворити Перемішати - Відтворюється + Відтворюється Черга Додати в чергу diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 055c4ede4..becf5c8f3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -19,7 +19,7 @@ 播放 随机播放 - 正在播放界面 + 正在播放界面 播放队列 加入播放队列 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6678a6034..79b79f33d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -19,7 +19,7 @@ 播放 隨機播放 - 播放面板 + 播放面板 隊列 添加到隊列 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55cab817e..651a6cb19 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,7 +4,6 @@ A simple, rational music player for android. Music Playback - Now Playing View and control playing music @@ -28,6 +27,7 @@ Album Year + Now Playing Play Shuffle Play from all songs