Merge branch 'media3-flat' of https://github.com/ultrasonic/ultrasonic into media3-flat

ultrasonic/src/main/kotlin/org/moire/ultrasonic/playback/PlaybackService.kt

@@ -15,9 +15,9 @@
  */
 package org.moire.ultrasonic.playback
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
+import android.os.Build
 import androidx.media3.common.AudioAttributes
 import androidx.media3.common.C
 import androidx.media3.common.C.CONTENT_TYPE_MUSIC
@@ -132,11 +132,14 @@ class PlaybackService : MediaLibraryService(), KoinComponent {
             .build()
     }
 
-    @SuppressLint("UnspecifiedImmutableFlag")
     private fun getPendingIntentForContent(): PendingIntent {
         val intent = Intent(this, NavigationActivity::class.java)
             .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        val flags = PendingIntent.FLAG_UPDATE_CURRENT
+        var flags = PendingIntent.FLAG_UPDATE_CURRENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // needed starting Android 12 (S = 31)
+            flags = flags or PendingIntent.FLAG_IMMUTABLE
+        }
         intent.putExtra(Constants.INTENT_SHOW_PLAYER, true)
         return PendingIntent.getActivity(this, 0, intent, flags)
     }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt

@@ -7,13 +7,13 @@
 
 package org.moire.ultrasonic.provider
 
-import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
 import android.appwidget.AppWidgetProvider
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Environment
 import android.view.KeyEvent
 import android.widget.RemoteViews
@@ -164,7 +164,6 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() {
         /**
          * Link up various button actions using [PendingIntent].
          */
-        @SuppressLint("UnspecifiedImmutableFlag")
         private fun linkButtons(context: Context, views: RemoteViews, playerActive: Boolean) {
             var intent = Intent(
                 context,
@@ -173,8 +172,13 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() {
             if (playerActive) intent.putExtra(Constants.INTENT_SHOW_PLAYER, true)
             intent.action = "android.intent.action.MAIN"
             intent.addCategory("android.intent.category.LAUNCHER")
+            var flags = PendingIntent.FLAG_UPDATE_CURRENT
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // needed starting Android 12 (S = 31)
+                flags = flags or PendingIntent.FLAG_IMMUTABLE
+            }
             var pendingIntent =
-                PendingIntent.getActivity(context, 10, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+                PendingIntent.getActivity(context, 10, intent, flags)
             views.setOnClickPendingIntent(R.id.appwidget_coverart, pendingIntent)
             views.setOnClickPendingIntent(R.id.appwidget_top, pendingIntent)
 
@@ -185,7 +189,12 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() {
                 Intent.EXTRA_KEY_EVENT,
                 KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)
             )
-            pendingIntent = PendingIntent.getBroadcast(context, 11, intent, 0)
+            flags = 0
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                // needed starting Android 12 (S = 31)
+                flags = flags or PendingIntent.FLAG_IMMUTABLE
+            }
+            pendingIntent = PendingIntent.getBroadcast(context, 11, intent, flags)
             views.setOnClickPendingIntent(R.id.control_play, pendingIntent)
             intent = Intent(Constants.CMD_PROCESS_KEYCODE)
             intent.component = ComponentName(context, MediaButtonIntentReceiver::class.java)
@@ -193,7 +202,7 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() {
                 Intent.EXTRA_KEY_EVENT,
                 KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT)
             )
-            pendingIntent = PendingIntent.getBroadcast(context, 12, intent, 0)
+            pendingIntent = PendingIntent.getBroadcast(context, 12, intent, flags)
             views.setOnClickPendingIntent(R.id.control_next, pendingIntent)
             intent = Intent(Constants.CMD_PROCESS_KEYCODE)
             intent.component = ComponentName(context, MediaButtonIntentReceiver::class.java)
@@ -201,7 +210,7 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() {
                 Intent.EXTRA_KEY_EVENT,
                 KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PREVIOUS)
             )
-            pendingIntent = PendingIntent.getBroadcast(context, 13, intent, 0)
+            pendingIntent = PendingIntent.getBroadcast(context, 13, intent, flags)
             views.setOnClickPendingIntent(R.id.control_previous, pendingIntent)
         }
     }

ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt

@@ -7,7 +7,6 @@
 
 package org.moire.ultrasonic.service
 
-import android.annotation.SuppressLint
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -154,11 +153,14 @@ class DownloadService : Service() {
         return notificationBuilder.build()
     }
 
-    @SuppressLint("UnspecifiedImmutableFlag")
     private fun getPendingIntentForContent(): PendingIntent {
         val intent = Intent(this, NavigationActivity::class.java)
             .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        val flags = PendingIntent.FLAG_UPDATE_CURRENT
+        var flags = PendingIntent.FLAG_UPDATE_CURRENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // needed starting Android 12 (S = 31)
+            flags = flags or PendingIntent.FLAG_IMMUTABLE
+        }
         intent.putExtra(Constants.INTENT_SHOW_PLAYER, true)
         return PendingIntent.getActivity(this, 0, intent, flags)
     }

ultrasonic/src/main/res/drawable/media3_notification_small_icon.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#000"
-      android:pathData="m12,3.8438c-4.9703,0 -9,4.0292 -9,9l0,5.0625c0,1.2426 1.0074,2.25 2.25,2.25 1.2426,0 2.25,-1.0074 2.25,-2.25l0,-3.375c0,-1.2426 -1.0074,-2.25 -2.25,-2.25 -0.4067,0 -0.783,0.1164 -1.1121,0.3049C4.2752,8.3573 7.7379,4.9688 12,4.9688 16.2621,4.9688 19.7242,8.3573 19.8621,12.5861 19.5336,12.3977 19.1567,12.2813 18.75,12.2813c-1.2426,0 -2.25,1.0074 -2.25,2.25l0,3.375c0,1.2426 1.0074,2.25 2.25,2.25 1.2426,0 2.25,-1.0074 2.25,-2.25L21,12.8438C21,7.8729 16.9708,3.8438 12,3.8438ZM5.25,13.4063c0.621,0 1.125,0.504 1.125,1.125l0,3.375c0,0.621 -0.504,1.125 -1.125,1.125 -0.621,0 -1.125,-0.504 -1.125,-1.125l0,-3.375c0,-0.621 0.504,-1.125 1.125,-1.125zM19.875,17.9063c0,0.621 -0.504,1.125 -1.125,1.125 -0.621,0 -1.125,-0.504 -1.125,-1.125l0,-3.375c0,-0.621 0.504,-1.125 1.125,-1.125 0.621,0 1.125,0.504 1.125,1.125z"/>
-</vector>

ultrasonic/src/main/res/values-cs/strings.xml

@@ -179,8 +179,6 @@
     <string name="settings.disc_sort">Řadit skladby podle čísla CD</string>
     <string name="settings.disc_sort_summary">Řadit seznam skladeb dle čísla CD a čísla skladby</string>
     <string name="settings.display_bitrate_summary">Připojovat jméno umělce, bitrate a příponu souboru</string>
-    <string name="settings.gapless_playback">Přehrávání bez pauz</string>
-    <string name="settings.gapless_playback_summary">Zapnout přehrávání bez pauz</string>
     <string name="settings.hide_media_summary">Skrýt hudební soubory před ostatními aplikacemi.</string>
     <string name="settings.hide_media_title">Skrýt před ostatními</string>
     <string name="settings.hide_media_toast">Nabyde účinnosti při příštím skenování hudby systému Android.</string>

ultrasonic/src/main/res/values-de/strings.xml

@@ -41,11 +41,8 @@
     <string name="common.name">Name</string>
     <string name="common.ok">OK</string>
     <string name="common.pin">Anheften</string>
-    <string name="common.pause">Pause</string>
-    <string name="common.play">Abspielen</string>
     <string name="common.play_last">Zuletzt spielen</string>
     <string name="common.play_next">Als nächstes spielen</string>
-    <string name="common.play_previous">Vorheriges abspielen</string>
     <string name="common.play_now">Jetzt spielen</string>
     <string name="common.play_shuffled">Zufällig spielen</string>
     <string name="common.public">Öffentlich</string>
@@ -135,15 +132,10 @@
     <string name="menu.deleted_playlist_error">Löschen der Wiedergabeliste %s ist fehlgeschlagen</string>
     <string name="menu.downloads">Downloads</string>
     <string name="menu.exit">Beenden</string>
-    <string name="menu.navigation">Navigation</string>
     <string name="menu.settings">Einstellungen</string>
     <string name="menu.refresh">Aktualisierung</string>
     <string name="music_library.label">Medienbibliothek</string>
     <string name="music_library.label_offline">Offline Medien</string>
-    <string name="music_service.retry">Netzwerkfehler. Neuer Versuch %1$d von %2$d.</string>
-    <string name="parser.artist_count">%d Künstler*innen gefunden</string>
-    <string name="parser.reading">Lese vom Server.</string>
-    <string name="parser.reading_done">Lese vom Server. Fertig!</string>
     <string name="playlist.label">Wiedergabelisten</string>
     <string name="playlist.update_info">Aktualisierungs-Informationen</string>
     <string name="playlist.updated_info">Wiedergabeliste für %s aktualisiert</string>
@@ -223,14 +215,11 @@
     <string name="settings.display_bitrate_summary">Bitrate und Dateityp hinter der Künstler*in anzeigen</string>
     <string name="settings.download_transition">Zeige Aktuelle Wiedergabe bei Play</string>
     <string name="settings.download_transition_summary">Zeige Aktuelle Wiedergabe nach dem Start der Wiedergabe in der Medienansicht</string>
-    <string name="settings.gapless_playback">Lückenlose Wiedergabe</string>
-    <string name="settings.gapless_playback_summary">Lückenlose Wiedergabe aktivieren</string>
     <string name="settings.hide_media_summary">Musikdateien vor anderen Apps verbergen</string>
     <string name="settings.hide_media_title">Vor anderen verbergen</string>
     <string name="settings.hide_media_toast">Wird beim nächsten Durchsuchen nach Musik durch Android wirksam.</string>
     <string name="settings.increment_time">Sprunglänge</string>
     <string name="settings.invalid_url">Bitte eine gültige URL angeben.</string>
-    <string name="settings.invalid_username">Bitte einen gültigen Benutzernamen eingeben (ohne führende Leerzeichen).</string>
     <string name="settings.max_albums">Max. Anzahl der Alben</string>
     <string name="settings.max_artists">Max. Anzahl der Künstler*innen</string>
     <string name="settings.max_bitrate_112">112 Kbps</string>
@@ -271,8 +260,6 @@
     <string name="settings.preload_3">3 Titel</string>
     <string name="settings.preload_5">5 Titel</string>
     <string name="settings.preload_unlimited">Unbegrenzt</string>
-    <string name="settings.playback.resume_play_on_headphones_plug.title">Fortsetzen mit Kopfhörer</string>
-    <string name="settings.playback.resume_play_on_headphones_plug.summary">Die App setzt eine pausierte Wiedergabe beim Anschließen der Kopfhörer fort.</string>
     <string name="settings.scrobble_summary">Benutzername und Passwort des Scrobble Service(s) müssen im Server gesetzt sein</string>
     <string name="settings.scrobble_title">Gespielte Musik scrobbeln</string>
     <string name="settings.search_1">1</string>
@@ -385,13 +372,6 @@
     <string name="download.menu_show_artist">Künstler*in anzeigen</string>
     <string name="albumArt">Album Cover</string>
     <string name="common_multiple_years">Mehrere Jahre</string>
-    <string name="settings.playback.resume_on_bluetooth_device">Wiedergabe fortsetzen, wenn ein Bluetooth Gerät verbunden wurde</string>
-    <string name="settings.playback.pause_on_bluetooth_device">Wiedergabe pausieren, wenn ein Bluetooth Gerät getrennt wurde</string>
-    <string name="settings.playback.bluetooth_all">Alle Bluetooth Geräte</string>
-    <string name="settings.playback.bluetooth_a2dp">Nur Audio (A2DP) Geräte</string>
-    <string name="settings.playback.bluetooth_disabled">Deaktiviert</string>
-    <string name="settings.playback.single_button_bluetooth_device">Bluetooth Gerät mit einer Play/Pause Taste</string>
-    <string name="settings.playback.single_button_bluetooth_device_summary">Dies kann bei älteren Bluetooth Geräten helfen, wenn Play/Pause nicht richtig funktioniert</string>
     <string name="settings.debug.title">Debug Optionen</string>
     <string name="settings.debug.log_to_file">Schreibe Debug Log in Datei</string>
     <string name="settings.debug.log_path">Die Log Dateien sind unter %1$s/%2$s verfügbar</string>
@@ -444,10 +424,6 @@
         <item quantity="one">%d Titel nach aktuellen Titel hinzugefügt</item>
         <item quantity="other">%d Titel nach aktuellen Titel hinzugefügt</item>
     </plurals>
-    <plurals name="select_album_donate_dialog_n_trial_days_left">
-        <item quantity="one">%d Tag Testphase übrig</item>
-        <item quantity="other">%d Tage Testphase übrig</item>
-    </plurals>
 
     <!-- Subsonic api errors -->
     <string name="api.subsonic.generic">Allgemeiner API Fehler: %1$s</string>

ultrasonic/src/main/res/values-es/strings.xml

@@ -41,11 +41,8 @@
     <string name="common.name">Nombre</string>
     <string name="common.ok">OK</string>
     <string name="common.pin">Anclar</string>
-    <string name="common.pause">Pausar</string>
-    <string name="common.play">Reproducir</string>
     <string name="common.play_last">Reproducir última</string>
     <string name="common.play_next">Reproducir a continuación</string>
-    <string name="common.play_previous">Reproducir anterior </string>
     <string name="common.play_now">Reproducir ahora</string>
     <string name="common.play_shuffled">Reproducción aleatoria</string>
     <string name="common.public">Public</string>
@@ -218,8 +215,6 @@
     <string name="settings.display_bitrate_summary">Añadir el nombre del artista con la tasa de bits y la extensión del archivo</string>
     <string name="settings.download_transition">Mostrar reproduciendo ahora al reproducir</string>
     <string name="settings.download_transition_summary">Cambiar a reproduciendo ahora después de iniciar la reproducción en la vista multimedia</string>
-    <string name="settings.gapless_playback">Reproducción sin pausas</string>
-    <string name="settings.gapless_playback_summary">Activa la reproducción sin pausas</string>
     <string name="settings.hide_media_summary">Oculta los archivos de música desde otras aplicaciones.</string>
     <string name="settings.hide_media_title">Ocultar desde otras</string>
     <string name="settings.hide_media_toast">Tiene efecto la próxima vez que Android escanee la música de tu dispositivo.</string>

ultrasonic/src/main/res/values-fr/strings.xml

@@ -41,11 +41,8 @@
     <string name="common.name">Nom</string>
     <string name="common.ok">OK</string>
     <string name="common.pin">Épingler</string>
-    <string name="common.pause">Pause</string>
-    <string name="common.play">Lecture</string>
     <string name="common.play_last">Jouer en dernier</string>
     <string name="common.play_next">Jouer à la suite</string>
-    <string name="common.play_previous">Lire le précédent</string>
     <string name="common.play_now">Jouer maintenant</string>
     <string name="common.play_shuffled">Jouer aléatoirement</string>
     <string name="common.public">Public</string>
@@ -107,7 +104,6 @@
     <string name="main.music">Musique</string>
     <string name="main.offline">Hors-ligne</string>
     <string name="main.setup_server">%s - Configurer le serveur</string>
-    <string name="main.shuffle">Lecture aléatoire</string>
     <string name="main.songs_random">Aléatoire</string>
     <string name="main.songs_starred">Favoris</string>
     <string name="main.songs_title">Titres</string>
@@ -201,8 +197,6 @@
     <string name="settings.disc_sort_summary">Trier la liste des titres par numéro de disques/pistes</string>
     <string name="settings.display_bitrate">Afficher le débit et l’extension de fichier</string>
     <string name="settings.display_bitrate_summary">Ajouter le nom d\'artiste, débit et suffixe du fichier</string>
-    <string name="settings.gapless_playback">Lecture sans interruption</string>
-    <string name="settings.gapless_playback_summary">Activer la lecture sans interruption</string>
     <string name="settings.hide_media_summary">Masquer les fichiers musicaux et les couvertures d\'album aux autres applis (Galerie, Musique, etc.)</string>
     <string name="settings.hide_media_title">Masquer aux autres</string>
     <string name="settings.hide_media_toast">Prendra effet la prochaine fois qu\'Android recensera les médias disponibles sur l\'appareil.</string>
@@ -355,12 +349,6 @@
     <string name="download.menu_show_artist">Afficher l\'artiste</string>
     <string name="albumArt">Pochette d\'album</string>
     <string name="common_multiple_years">Années multiples</string>
-    <string name="settings.playback.resume_on_bluetooth_device">Reprendre lorsqu’un appareil Bluetooth se connecte</string>
-    <string name="settings.playback.pause_on_bluetooth_device">Mettre en pause lorsqu’un appareil Bluetooth se déconnecte</string>
-    <string name="settings.playback.bluetooth_all">Tous les appareils Bluetooth</string>
-    <string name="settings.playback.bluetooth_a2dp">Seulement les appareils audio (A2DP)</string>
-    <string name="settings.playback.bluetooth_disabled">Désactivé</string>
-    <string name="settings.playback.single_button_bluetooth_device_summary">Activer cela peut aider sur les anciens appareils Bluetooth lorsque Lecture/Pause ne fonctionne pas correctement</string>
     <string name="settings.debug.title">Paramètres de debug</string>
     <string name="settings.debug.log_to_file">Enregistrer les logs de debug dans des fichiers</string>
     <string name="settings.debug.log_path">Les fichiers de log sont disponibles dans %1$s/%2$s</string>

ultrasonic/src/main/res/values-hu/strings.xml

@@ -39,11 +39,8 @@
     <string name="common.name">Név</string>
     <string name="common.ok">OK</string>
     <string name="common.pin">Tárolás (Megőrzés az eszközön)</string>
-    <string name="common.pause">Szünet</string>
-    <string name="common.play">Lejátszás</string>
     <string name="common.play_last">Lejátszás (Utolsóként)</string>
     <string name="common.play_next">Lejátszás (Következőként)</string>
-    <string name="common.play_previous">Előző lejátszása</string>
     <string name="common.play_now">Lejátszás</string>
     <string name="common.play_shuffled">Véletlen sorrendű lejátszás</string>
     <string name="common.public">Nyilvános</string>
@@ -188,8 +185,6 @@
     <string name="settings.disc_sort">Dalok rendezése albumok szerint</string>
     <string name="settings.disc_sort_summary">Dalok rendezése albumsorszám és dalsorszám szerint.</string>
     <string name="settings.display_bitrate_summary">Bitráta és fájlkiterjesztés megjelenítése az előadónév mellett.</string>
-    <string name="settings.gapless_playback">Egybefüggő lejátszás</string>
-    <string name="settings.gapless_playback_summary">Kihagyás (dalszünet) nélküli egybefüggő lejátszás (Gapless).</string>
     <string name="settings.hide_media_summary">Zenefájlok elrejtése egyéb alkalmazások elől.</string>
     <string name="settings.hide_media_title">Elrejtés</string>
     <string name="settings.hide_media_toast">A következő alkalomtól lép életbe, amikor az Android zenefájlokat keres a telefonon.</string>

ultrasonic/src/main/res/values-it/strings.xml

@@ -175,8 +175,6 @@
     <string name="settings.disc_sort">Ordina Canzoni secondo Disco</string>
     <string name="settings.disc_sort_summary">Ordina lista canzoni secondo il numero disco e traccia</string>
     <string name="settings.display_bitrate_summary">Aggiungi nome artista con bitrare ed estensione file</string>
-    <string name="settings.gapless_playback">Riproduzione Ininterrotta</string>
-    <string name="settings.gapless_playback_summary">Abilita riproduzione ininterrotta</string>
     <string name="settings.hide_media_summary">Nascondi file musicali di altre app</string>
     <string name="settings.hide_media_title">Nascondi Da Altro</string>
     <string name="settings.hide_media_toast">Effettivo alla prossima scansione Android per file musicali sul telefono.</string>

ultrasonic/src/main/res/values-nl/strings.xml

@@ -41,11 +41,8 @@
     <string name="common.name">Naam</string>
     <string name="common.ok">Oké</string>
     <string name="common.pin">Vastmaken</string>
-    <string name="common.pause">Pauzeren</string>
-    <string name="common.play">Afspelen</string>
     <string name="common.play_last">Laatste afspelen</string>
     <string name="common.play_next">Volgende afspelen</string>
-    <string name="common.play_previous">Vorige afspelen</string>
     <string name="common.play_now">Nu afspelen</string>
     <string name="common.play_shuffled">Willekeurig afspelen</string>
     <string name="common.public">Openbaar</string>
@@ -218,8 +215,6 @@
     <string name="settings.display_bitrate_summary">Bitsnelheid en bestandsextensie toevoegen aan artiestennaam</string>
     <string name="settings.download_transition">Nu aan het afspelen tonen op afspeelscherm</string>
     <string name="settings.download_transition_summary">Toon ‘Nu aan het afspelen’ in de mediaweergave</string>
-    <string name="settings.gapless_playback">Naadloze overgang</string>
-    <string name="settings.gapless_playback_summary">Naadloze overgang tussen nummers inschakelen</string>
     <string name="settings.hide_media_summary">Muziekbestanden verbergen voor andere apps.</string>
     <string name="settings.hide_media_title">Verbergen voor andere apps</string>
     <string name="settings.hide_media_toast">Dit wordt toegepast bij de volgende keer dat Android je muziek doorzoekt.</string>

ultrasonic/src/main/res/values-pl/strings.xml

@@ -179,8 +179,6 @@
     <string name="settings.disc_sort">Sortuj utwory wg dysku</string>
     <string name="settings.disc_sort_summary">Sortuje listę utworów wg numeru dysku i numeru utworu</string>
     <string name="settings.display_bitrate_summary">Dołącza bitrate i typ pliku do nazwy artysty</string>
-    <string name="settings.gapless_playback">Odtwarzanie bez przerw</string>
-    <string name="settings.gapless_playback_summary">Włącz odtwarzanie bez przerw między utworami</string>
     <string name="settings.hide_media_summary">Ukrywa pliki muzyczne przed innymi aplikacjami.</string>
     <string name="settings.hide_media_title">Ukryj pliki</string>
     <string name="settings.hide_media_toast">Efekt widoczny będzie po następnym skanowaniu muzyki przez system Android</string>

ultrasonic/src/main/res/values-pt-rBR/strings.xml

@@ -41,11 +41,8 @@
     <string name="common.name">Nome</string>
     <string name="common.ok">OK</string>
     <string name="common.pin">Fixar</string>
-    <string name="common.pause">Pausar</string>
-    <string name="common.play">Tocar</string>
     <string name="common.play_last">Tocar por Último</string>
     <string name="common.play_next">Tocar na Próxima</string>
-    <string name="common.play_previous">Tocar a Anterior</string>
     <string name="common.play_now">Tocar Agora</string>
     <string name="common.play_shuffled">Tocar Aleatoriamente</string>
     <string name="common.public">Público</string>
@@ -195,8 +192,6 @@
     <string name="settings.disc_sort_summary">Classificar músicas pelo número do álbum e faixas</string>
     <string name="settings.display_bitrate">Mostrar Bitrate se Sufixo do Arquivo</string>
     <string name="settings.display_bitrate_summary">Adicionar o nome do artista com a taxa de bits e sufixo do arquivo</string>
-    <string name="settings.gapless_playback">Reprodução sem Interrupção</string>
-    <string name="settings.gapless_playback_summary">Ativar reprodução sem interrupção</string>
     <string name="settings.hide_media_summary">Esconder arquivos de músicas de outros aplicativos</string>
     <string name="settings.hide_media_title">Esconder de Outros</string>
     <string name="settings.hide_media_toast">Será efetivado na próxima vez que o Android procurar por músicas em seu celular.</string>

ultrasonic/src/main/res/values-pt/strings.xml

@@ -179,8 +179,6 @@
     <string name="settings.disc_sort">Classificar Músicas por Álbum</string>
     <string name="settings.disc_sort_summary">Classificar músicas pelo número do álbum e faixas.</string>
     <string name="settings.display_bitrate_summary">Adiciona o nome do artista com a taxa de bits e sufixo do ficheiro</string>
-    <string name="settings.gapless_playback">Reprodução sem Interrupção</string>
-    <string name="settings.gapless_playback_summary">Habilita reprodução sem interrupção</string>
     <string name="settings.hide_media_summary">Esconder músicas de outros aplicativos.</string>
     <string name="settings.hide_media_title">Esconder de Outros</string>
     <string name="settings.hide_media_toast">Será realizado na próxima vez que o Android procurar por músicas em seu telemóvel.</string>

ultrasonic/src/main/res/values-ru/strings.xml

@@ -41,11 +41,8 @@
     <string name="common.name">Имя</string>
     <string name="common.ok">Ок</string>
     <string name="common.pin">Пин</string>
-    <string name="common.pause">Пауза</string>
-    <string name="common.play">Воспроизведение</string>
     <string name="common.play_last">Воспроизвести последний</string>
     <string name="common.play_next">Воспроизвести следующий</string>
-    <string name="common.play_previous">Воспроизвести предыдущий</string>
     <string name="common.play_now">Воспроизвести сейчас</string>
     <string name="common.play_shuffled">Играть в случайном порядке</string>
     <string name="common.public">Публичный</string>
@@ -206,8 +203,6 @@
     <string name="settings.disc_sort">Время кэша каталогов</string>
     <string name="settings.disc_sort_summary">Сортировать список песен по номеру диска и треку</string>
     <string name="settings.display_bitrate_summary">Добавить имя исполнителя с битрейтом и суффиксом файла</string>
-    <string name="settings.gapless_playback">Воспроизведение без промежутка</string>
-    <string name="settings.gapless_playback_summary">Включить воспроизведение без паузы</string>
     <string name="settings.hide_media_summary">Включить воспроизведение без паузы</string>
     <string name="settings.hide_media_title">Скрыть от других</string>
     <string name="settings.hide_media_toast">Вступает в силу в следующий раз, Android сканирует ваш телефон на предмет музыки</string>

ultrasonic/src/main/res/values-zh-rCN/strings.xml

@@ -41,11 +41,8 @@
     <string name="common.name">名称</string>
     <string name="common.ok">确定</string>
     <string name="common.pin">固定</string>
-    <string name="common.pause">暂停</string>
-    <string name="common.play">播放</string>
     <string name="common.play_last">最后一首</string>
     <string name="common.play_next">下一首</string>
-    <string name="common.play_previous">上一首</string>
     <string name="common.play_now">现在播放</string>
     <string name="common.play_shuffled">随机播放</string>
     <string name="common.public">公开</string>
@@ -107,7 +104,6 @@
     <string name="main.music">音乐</string>
     <string name="main.offline">离线</string>
     <string name="main.setup_server">%s - 已设置服务器</string>
-    <string name="main.shuffle">随机播放</string>
     <string name="main.songs_random">随机</string>
     <string name="main.songs_starred">收藏夹</string>
     <string name="main.songs_title">歌曲</string>
@@ -353,12 +349,6 @@
     <string name="download.menu_show_artist">显示艺术家</string>
     <string name="albumArt">albumArt</string>
     <string name="common_multiple_years">Multiple Years</string>
-    <string name="settings.playback.resume_on_bluetooth_device">连接蓝牙设备时恢复播放</string>
-    <string name="settings.playback.pause_on_bluetooth_device">断开蓝牙设备时暂停播放</string>
-    <string name="settings.playback.bluetooth_all">所有蓝牙设备</string>
-    <string name="settings.playback.bluetooth_a2dp">仅音频 (A2DP) 设备</string>
-    <string name="settings.playback.bluetooth_disabled">已禁用</string>
-    <string name="settings.playback.single_button_bluetooth_device_summary">当播放/暂停无法正常工作时，启用此功能可能对较旧的蓝牙设备有所帮助</string>
     <string name="settings.debug.title">调试选项</string>
     <string name="settings.debug.log_to_file">将调试日志写入文件</string>
     <string name="settings.debug.log_path">日志文件可在 %1$s/%2$s 获取</string>

ultrasonic/src/main/res/values/strings.xml

@@ -41,11 +41,8 @@
     <string name="common.name">Name</string>
     <string name="common.ok">OK</string>
     <string name="common.pin">Pin</string>
-    <string name="common.pause">Pause</string>
-    <string name="common.play">Play</string>
     <string name="common.play_last">Play Last</string>
     <string name="common.play_next">Play Next</string>
-    <string name="common.play_previous">Play Previous</string>
     <string name="common.play_now">Play Now</string>
     <string name="common.play_shuffled">Play Shuffled</string>
     <string name="common.public">Public</string>