Merge remote-tracking branch 'origin/master'

2015-06-15 15:49:51 +02:00 · 2015-06-15 15:49:51 +02:00 · 7fcb4a314e
commit 7fcb4a314e
parent 010e8f9664 589f81d1c3
16 changed files with 144 additions and 47 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -15,7 +15,6 @@ apply plugin: 'com.jakewharton.hugo'

 repositories {
    maven { url 'https://maven.fabric.io/public' }
-    maven { url 'https://dl.bintray.com/drummer-aidan/maven' }
 }


@ -27,8 +26,8 @@ android {
        applicationId "com.kabouzeid.gramophone"
        minSdkVersion 16
        targetSdkVersion 22
-        versionCode 36
-        versionName "0.9.20b dev-1"
+        versionCode 38
+        versionName "0.9.22b dev-1"
    }

    buildTypes {
@ -66,6 +65,6 @@ dependencies {
    compile 'de.hdodenhof:circleimageview:1.3.0'
    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'

-    compile 'com.afollestad:material-dialogs:0.7.5.5'
+    compile 'com.afollestad:material-dialogs:0.7.6.0'
    compile 'com.afollestad:material-cab:0.1.4'
 }
--- a/app/src/main/java/com/kabouzeid/gramophone/App.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/App.java
@ -29,7 +29,7 @@ public class App extends Application {
    @Override
    public void onCreate() {
        super.onCreate();
-        Fabric.with(this, new Crashlytics.Builder().disabled(BuildConfig.DEBUG).build());
+        if (!BuildConfig.DEBUG) Fabric.with(this, new Crashlytics());
        MusicPlayerRemote.init(this);
        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
        ImageLoader.getInstance().init(config);
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@ -111,6 +111,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
        public void onReceive(Context context, Intent intent) {
            if (intent.getAction().compareTo(AudioManager.ACTION_AUDIO_BECOMING_NOISY) == 0) {
                pausePlaying(true);
+                pausePlaying(false);
            }
        }
    };
@ -311,7 +312,14 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
    }

    public boolean isPlaying() {
-        return player != null && isPlayerPrepared && !fadingDown && player.isPlaying();
+        return isPlaying(false);
+    }
+
+    private boolean isPlaying(boolean alsoIfIsFadingDown) {
+        if (!alsoIfIsFadingDown)
+            return player != null && isPlayerPrepared && player.isPlaying() && !fadingDown;
+        else
+            return player != null && isPlayerPrepared && player.isPlaying();
    }

    public void saveQueues() {
@ -707,8 +715,8 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
    }

    private void pause() {
-        fadingDown = false;
-        if (isPlaying()) {
+        playerHandler.removeMessages(FADEUPANDRESUME);
+        if (isPlaying(true)) {
            player.pause();
            notifyChange(PLAYSTATE_CHANGED);
        }
@ -720,14 +728,14 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
            playerHandler.removeMessages(FADEDOWNANDPAUSE);
            playerHandler.sendEmptyMessage(FADEUPANDRESUME);
        } else {
-            player.setVolume(1f, 1f);
+            if (player != null) player.setVolume(1f, 1f);
            resume();
        }
    }

    private void resume() {
-        fadingDown = false;
-        if (!isPlaying()) {
+        playerHandler.removeMessages(FADEDOWNANDPAUSE);
+        if (!isPlaying(true)) {
            if (requestFocus()) {
                if (isPlayerPrepared()) {
                    player.start();
@ -934,7 +942,8 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
                    } else {
                        currentDuckVolume = .2f;
                    }
-                    service.player.setVolume(currentDuckVolume, currentDuckVolume);
+                    if (service.player != null)
+                        service.player.setVolume(currentDuckVolume, currentDuckVolume);
                    break;

                case UNDUCK:
@ -944,7 +953,8 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
                    } else {
                        currentDuckVolume = 1.0f;
                    }
-                    service.player.setVolume(currentDuckVolume, currentDuckVolume);
+                    if (service.player != null)
+                        service.player.setVolume(currentDuckVolume, currentDuckVolume);
                    break;

                case FADEDOWNANDPAUSE:
@ -952,7 +962,6 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
                        service.fadingDown = true;
                        service.notifyChange(PLAYSTATE_CHANGED);
                    }
-                    service.fadingDown = true;
                    currentPlayPauseFadeVolume -= .1f;
                    if (currentPlayPauseFadeVolume > 0f) {
                        sendEmptyMessageDelayed(FADEDOWNANDPAUSE, 10);
@ -961,10 +970,15 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
                        service.fadingDown = false;
                        service.pausePlaying(true);
                    }
-                    service.player.setVolume(currentPlayPauseFadeVolume, currentPlayPauseFadeVolume);
+                    if (service.player != null)
+                        service.player.setVolume(currentPlayPauseFadeVolume, currentPlayPauseFadeVolume);
                    break;

                case FADEUPANDRESUME:
+                    if (service.fadingDown) {
+                        service.fadingDown = false;
+                        service.notifyChange(PLAYSTATE_CHANGED);
+                    }
                    service.resume();
                    currentPlayPauseFadeVolume += .1f;
                    if (currentPlayPauseFadeVolume < 1.0f) {
@ -972,7 +986,8 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
                    } else {
                        currentPlayPauseFadeVolume = 1.0f;
                    }
-                    service.player.setVolume(currentPlayPauseFadeVolume, currentPlayPauseFadeVolume);
+                    if (service.player != null)
+                        service.player.setVolume(currentPlayPauseFadeVolume, currentPlayPauseFadeVolume);
                    break;

                case FOCUSCHANGE:
@ -1003,9 +1018,6 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
                        case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
                            // Lost focus for a short time, but it's ok to keep playing
                            // at an attenuated level
-                            if (!service.isPlayerPrepared()) {
-                                service.setUpMediaPlayerIfNeeded();
-                            }
                            removeMessages(UNDUCK);
                            sendEmptyMessage(DUCK);
                            break;
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MusicControllerActivity.java
@ -79,18 +79,21 @@ public class MusicControllerActivity extends AbsFabActivity {
    private int lastTextColor = -2;
    private Thread progressViewsUpdateThread;

-    private final boolean opaqueStatusBar = PreferenceUtils.getInstance(this).opaqueStatusbarNowPlaying();
-    private final boolean opaqueToolBar = opaqueStatusBar && PreferenceUtils.getInstance(this).opaqueToolbarNowPlaying();
-    private final boolean forceSquareAlbumArt = PreferenceUtils.getInstance(this).forceAlbumArtSquared();
-    private final boolean largerTitleBox = PreferenceUtils.getInstance(this).largerTitleBoxNowPlaying();
-    private final boolean alternativeProgressSlider = PreferenceUtils.getInstance(this).alternativeProgressSliderNowPlaying();
-    private final boolean showPlaybackControllerCard = PreferenceUtils.getInstance(this).playbackControllerCardNowPlaying();
+    private boolean opaqueStatusBar;
+    private boolean opaqueToolBar;
+    private boolean forceSquareAlbumArt;
+    private boolean largerTitleBox;
+    private boolean alternativeProgressSlider;
+    private boolean showPlaybackControllerCard;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        setStatusBarTransparent();
+
        super.onCreate(savedInstanceState);

+        initAppeareanceVars();
+
        setContentView(alternativeProgressSlider ? R.layout.activity_music_controller_alternative_progress_slider : R.layout.activity_music_controller);

        initViews();
@ -140,6 +143,15 @@ public class MusicControllerActivity extends AbsFabActivity {
        }
    }

+    private void initAppeareanceVars() {
+        opaqueStatusBar = PreferenceUtils.getInstance(this).opaqueStatusbarNowPlaying();
+        opaqueToolBar = opaqueStatusBar && PreferenceUtils.getInstance(this).opaqueToolbarNowPlaying();
+        forceSquareAlbumArt = PreferenceUtils.getInstance(this).forceAlbumArtSquared();
+        largerTitleBox = PreferenceUtils.getInstance(this).largerTitleBoxNowPlaying();
+        alternativeProgressSlider = PreferenceUtils.getInstance(this).alternativeProgressSliderNowPlaying();
+        showPlaybackControllerCard = PreferenceUtils.getInstance(this).playbackControllerCardNowPlaying();
+    }
+
    @Override
    protected void onPostCreate(Bundle savedInstanceState) {
        super.onPostCreate(savedInstanceState);
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsBaseActivity.java
@ -4,6 +4,7 @@ import android.os.Bundle;

 import com.crashlytics.android.Crashlytics;
 import com.kabouzeid.gramophone.App;
+import com.kabouzeid.gramophone.BuildConfig;
 import com.kabouzeid.gramophone.interfaces.KabViewsDisableAble;
 import com.kabouzeid.gramophone.misc.AppKeys;
 import com.kabouzeid.gramophone.model.UIPreferenceChangedEvent;
@ -25,7 +26,7 @@ public abstract class AbsBaseActivity extends AbsThemeActivity implements KabVie

    @Override
    protected void onCreate(Bundle savedInstanceState) {
-        Crashlytics.setString(AppKeys.CL_CURRENT_ACTIVITY, getTag());
+        if (!BuildConfig.DEBUG) Crashlytics.setString(AppKeys.CL_CURRENT_ACTIVITY, getTag());
        super.onCreate(savedInstanceState);
        try {
            App.bus.register(uiPreferenceChangeListener);
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
@ -87,7 +87,8 @@ public abstract class AbsThemeActivity extends AppCompatActivity implements KabV
    protected final void setStatusBarColor(int color) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
            getWindow().setStatusBarColor(Util.shiftColorDown(color));
-        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        // also do this on Lollipop in case the user modified the statusbar height
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
            final View statusBar = getWindow().getDecorView().getRootView().findViewById(R.id.status_bar);
            if (statusBar != null) statusBar.setBackgroundColor(color);
        }
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -15,14 +15,14 @@
    <string name="action_play_next">Als nächstes spielen</string>
    <string name="action_add_to_playing_queue">Zur Wiedergabeliste</string>
    <string name="action_remove_from_playing_queue">Von Wiedergabeliste entfernen</string>
-    <string name="action_add_to_playlist">Zu Playlist hinzufügen...</string>
+    <string name="action_add_to_playlist">Zur Wiedergabeliste hinzufügen...</string>
    <string name="action_tag_editor">Tags ändern...</string>
    <string name="action_delete_from_disk">Löschen</string>
    <string name="action_details">Details</string>
    <string name="albums">Alben</string>
    <string name="artists">Interpreten</string>
    <string name="songs">Titel</string>
-    <string name="playlists">Playlists</string>
+    <string name="playlists">Wiedergabelisten</string>
    <string name="nothing_playing">Keine Wiedergabe</string>
    <string name="unplayable_file">Sorry - der Song kann nicht abgespielt werden.</string>
    <string name="biography_unavailable">Sorry, es konnte keine passende Biografie für diesen Interpreten gefunden werden.</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="what_do_you_want_to_share">¿Qué quieres compartir?</string>
-    <string name="currently_listening_to_x_by_x">Escuchando %1$s de %2$s</string>
+    <string name="currently_listening_to_x_by_x">Reproduciendo %1$s de %2$s</string>
    <string name="the_audio_file">El archivo de audio</string>
-    <string name="do_you_want_to_set_x_as_ringtone">Quiere establecer %1$s como tono de llamada?</string>
+    <string name="do_you_want_to_set_x_as_ringtone">¿Quieres establecer %1$s como tono de llamada?</string>
    <string name="x_has_been_set_as_ringtone">%1$s ha sido establecido como tono de llamada</string>
    <string name="action_set_as_ringtone">Establecer como tono de llamada</string>
    <string name="action_share">Compartir</string>
@ -24,11 +24,11 @@
    <string name="songs">Canciones</string>
    <string name="playlists">Listas de reproducción</string>
    <string name="nothing_playing">Nada se está reproduciendo</string>
-    <string name="unplayable_file">Disculpe, ha ocurrido un error intentando reproducir esta canción.</string>
+    <string name="unplayable_file">Lo sentimos - Ha ocurrido un error al reproducir esta canción</string>
    <string name="biography_unavailable">Lo sentimos, no encontramos una biografía correspondiente a éste artista</string>
    <string name="biography">Biografía</string>
    <string name="audio_focus_denied">No podemos encontrar el foco de audio</string>
-    <string name="title_activity_tag_editor">Editor de etiquetas activo</string>
+    <string name="title_activity_tag_editor">Editor de etiquetas</string>
    <string name="tag_editor">Editor de etiquetas</string>
    <string name="album">Álbum</string>
    <string name="artist">Artista</string>
@ -37,7 +37,7 @@
    <string name="year">Año</string>
    <string name="track">Canción</string>
    <string name="track_hint">"Pista (2 para pista 2 ó 3004 para CD3 pista 4)"</string>
-    <string name="album_or_artist_empty">El campo título del álbum o el artista del álbum está vacío</string>
+    <string name="album_or_artist_empty">El título del álbum o el campo de artista del álbum está vacío.</string>
    <string name="writing_file_number">Escribiendo archivo</string>
    <string name="saving_changes">Guardando cambios...</string>
    <string name="title_activity_album_tag_editor">Editor de etiquetas del album</string>
@ -66,7 +66,7 @@
    <string name="new_playlist_action">Nueva lista de reproducción...</string>
    <string name="action_grid_columns">Columnas de la cuadrícula</string>
    <string name="action_grid_columns_land">Columnas de la cuadrícula (apaisado)</string>
-    <string name="inserted_x_songs_into_playlist">Insertar %1$d canciones a la lista de reproducción</string>
+    <string name="inserted_x_songs_into_playlist">%1$d canciones añadidas a la lista de reproducción</string>
    <string name="created_playlist_x">Lista de reproducción %1$s creada</string>
    <string name="deleted_playlist_x">Lista de reproducción %1$s borrada</string>
    <string name="couldnot_create_playlist_x">No se puede crear la lista de reproducción %1$s</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -108,7 +108,9 @@
    <string name="pref_title_colored_album_footers">Bas d\'album coloré</string>
    <string name="pref_title_force_square_album_art">Vignette carrée</string>
    <string name="pref_title_opaque_toolbar_now_playing">Barre d\'outil opaque</string>
-    <string name="pref_title_opaque_statusbar_now_playing">Barre de statut opaque</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Barre d\'état opaque</string>
+    <string name="pref_title_larger_title_box_now_playing">Boîte de titre plus large</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Barre de progression alternative</string>
    <string name="pref_title_playback_controller_card_now_playing">Afficher le rectangle sous les boutons de lecture</string>
    <string name="no_equalizer">Aucun égaliseur trouvé</string>
    <string name="no_audio_ID">"Aucun ID audio, jouez quelque chose et réessayez."</string>
@ -137,8 +139,8 @@
    <string name="pref_only_lollipop">"Uniquement disponible sur Lollipop."</string>
    <string name="pref_summary_colored_album_footers">"Les bas d\'album dans la grille sont colorés avec la palette de la vignette."</string>
    <string name="pref_summary_force_square_album_art">La vignette de l\'album dans l\'écran de lecture en cours est forcée à rester carrée.</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">La barre d\'outil dans l\'écran de lecture en cours est opaque et recouvre maintenant l\'album.</string>
-    <string name="pref_summary_opaque_statusbar_now_playing">La barre de statut est opaque et recouvre la vignette.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">La barre d\'outil est opaque et ne recouvre pas la vignette de l\'album.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">La barre d\'état est opaque et ne recouvre pas la vignette de l\'album.</string>
    <string name="failed_download_albumart">"Impossible de télécharger la vignette pour cet album."</string>
    <string name="search_hint">Rechercher votre bibliothèque...</string>
    <string name="rescanning_media">Réanalyse des médias…</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -62,6 +62,7 @@
    <string name="added_title_to_playing_queue">"Un brano aggiunto alla coda."</string>
    <string name="added_x_titles_to_playing_queue">%1$d titoli aggiunti alla coda.</string>
    <string name="title_activity_playlist_detail">Attività playlist</string>
+    <string name="action_remove_from_playlist">Rimuovi dalla playlist</string>
    <string name="new_playlist_action">Nuova playlist...</string>
    <string name="action_grid_columns">Colonne griglia</string>
    <string name="action_grid_columns_land">Colonne griglia (schermo orizzontale)</string>
@ -75,8 +76,12 @@
    ]]></string>
    <string name="delete_song_x"><![CDATA[        Vuoi eliminare il brano <b>%1$s</b>? ]]></string>
    <string name="delete_x_songs"><![CDATA[        Vuoi eliminare <b>%1$d</b> brani? ]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Vuoi rimuovere il brano <b>%1$s</b> dalla playlist?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Vuoi rimuovere <b>%1$d</b> brani dalla playlist?]]></string>
    <string name="delete_song_title">Elimina brano</string>
    <string name="delete_songs_title">Elimina brani</string>
+    <string name="remove_song_from_playlist_title">Rimuovi brano dalla playlist</string>
+    <string name="remove_songs_from_playlist_title">Rimuovi brani dalla playlist</string>
    <string name="rename_playlist_title">Rinomina playlist</string>
    <string name="delete_playlist_title">Elimina playlist</string>
    <string name="delete_playlists_title">Elimina playlist</string>
@ -88,6 +93,8 @@
    <string name="light_theme_name">Chiaro</string>
    <string name="dark_theme_name">Scuro</string>
    <string name="equalizer">Equalizzatore</string>
+    <string name="pref_header_colors">Colori</string>
+    <string name="pref_header_now_playing_screen">Schermata In riproduzione</string>
    <string name="pref_title_general_theme">Tema</string>
    <string name="pref_header_audio">Audio</string>
    <string name="pref_header_general">Generali</string>
@ -104,13 +111,19 @@
    <string name="pref_title_colored_album_footers">Riquadri album colorati</string>
    <string name="pref_title_force_square_album_art">Copertina in proporzioni quadrate</string>
    <string name="pref_title_opaque_toolbar_now_playing">Toolbar di riproduzione opaca</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Status bar opaca</string>
+    <string name="pref_title_larger_title_box_now_playing">Riquadro titolo più grande</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Cursore di scorrimento alternativo</string>
+    <string name="pref_title_playback_controller_card_now_playing">Mostra card dietro ai controlli di riproduzione</string>
    <string name="no_equalizer">Nessun equalizzatore trovato</string>
    <string name="no_audio_ID">"Nessun ID audio, riproduci qualcosa e prova di nuovo."</string>
    <string name="navigation_drawer_open">Apri il pannello di navigazione</string>
    <string name="navigation_drawer_close">"Chiudi il pannello di navigazione"</string>
    <string name="delete_action">Elimina</string>
+    <string name="remove_action">Rimuovi</string>
    <string name="rename_action">Rinomina</string>
    <string name="create_action">Crea</string>
+    <string name="x_selected">%1$d selezionati</string>
    <string name="select">Seleziona</string>
    <string name="default_str">Predefinito</string>
    <string name="primary_color">Colore principale</string>
@ -120,12 +133,20 @@
    <string name="update_image">Aggiorna immagine</string>
    <string name="playlist_empty_text">La playlist è vuota</string>
    <string name="no_playlists">Nessuna playlist</string>
+    <string name="no_albums">Nessun album</string>
+    <string name="no_songs">Nessun brano</string>
+    <string name="no_artists">Nessun artista</string>
+    <string name="empty">Vuoto</string>
    <string name="playlist_name">Nome playlist</string>
    <string name="song">Brano</string>
    <string name="pref_only_lollipop">"Disponibile solo su Lollipop."</string>
    <string name="pref_summary_colored_album_footers">"I riquadri degli album nella griglia sono colorati secondo la gamma colori della copertina."</string>
    <string name="pref_summary_force_square_album_art">La copertina nella schermata In riproduzione è sempre visualizzata con proporzioni quadrate.</string>
    <string name="pref_summary_opaque_toolbar_now_playing">La toolbar nella schermata In riproduzione è opaca e non copre la copertina.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">La status bar è opaca e non copre la copertina.</string>
+    <string name="pref_summary_larger_title_box_now_playing">Il riquadro al di sotto della copertina in cui sono visualizzati il titolo del brano e l\'artista è più grande in altezza.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Usa una barra di scorrimento che non copre la copertina invece del normale cursore.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Visualizza un contorno in stile card dietro i controlli di riproduzione (play, pausa ecc.).</string>
    <string name="failed_download_albumart">"Impossibile scaricare la copertina per quest\'album."</string>
    <string name="search_hint">Cerca nella tua libreria...</string>
    <string name="rescanning_media">Nuova scannerizzazione media in corso...</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -90,6 +90,8 @@
    <string name="light_theme_name">밝은 테마</string>
    <string name="dark_theme_name">어두운 테마</string>
    <string name="equalizer">이퀄라이저</string>
+    <string name="pref_header_colors">색상</string>
+    <string name="pref_header_now_playing_screen">지금 재생 중 화면</string>
    <string name="pref_title_general_theme">전체적인 테마</string>
    <string name="pref_header_audio">오디오</string>
    <string name="pref_header_general">일반</string>
@ -106,6 +108,10 @@
    <string name="pref_title_colored_album_footers">색칠된 앨범 카드</string>
    <string name="pref_title_force_square_album_art">강제로 정사각형 앨범아트 적용</string>
    <string name="pref_title_opaque_toolbar_now_playing">불투명한 지금 재생 중 툴바</string>
+    <string name="pref_title_opaque_statusbar_now_playing">불투명한 상단바</string>
+    <string name="pref_title_larger_title_box_now_playing">더 큰 제목 바</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">대체 음악 조절 슬라이더</string>
+    <string name="pref_title_playback_controller_card_now_playing">컨트롤 부분을 키드로 표시</string>
    <string name="no_equalizer">설치된 이퀄라이저가 없습니다.</string>
    <string name="no_audio_ID">"오디오 ID가 없습니다.
 아무 것이나 재생하시고 다시 시도해 주십시오."</string>
@ -134,7 +140,11 @@
    <string name="pref_only_lollipop">"안드로이드 롤리팝에서만 가능합니다."</string>
    <string name="pref_summary_colored_album_footers">"앨범 커버의 색상에 맞추어 앨범 카드가 색칠됩니다."</string>
    <string name="pref_summary_force_square_album_art">지금 재생 중 화면의 앨범 아트 이미지가 강제로 정사각형으로 보이게 합니다.</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">지금 재생 중 화면의 툴바를 투명하게 해 앨범 아트를 가리지 않게 합니다.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">지금 재생 중 화면 상단의 툴바를 불투명하게 하고, 앨범 아트를 가리지 않게 합니다.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">상단바를 불투명하게 하고 앨범 아트를 가리지 않게 합니다.</string>
+    <string name="pref_summary_larger_title_box_now_playing">앨범 아트 밑에 있는 제목 바의 높이를 커지게 합니다.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">보통의 조절 슬라이더 대신 앨범 아트를 가리지 않는 대체 조절 슬라이더를 사용합니다.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">지금 재생 중 화면에서 컨트롤 부분(재생, 일시정지 등의 버튼이 있는 곳)을 카드로 표시합니다.</string>
    <string name="failed_download_albumart">"이 앨범의 앨범 커버를 다운로드할 수 없습니다."</string>
    <string name="search_hint">저장소 검색...</string>
    <string name="rescanning_media">미디어 재스캐닝 중...</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -91,6 +91,8 @@
    <string name="light_theme_name">Licht</string>
    <string name="dark_theme_name">Donker</string>
    <string name="equalizer">Equalizer</string>
+    <string name="pref_header_colors">Kleuren</string>
+    <string name="pref_header_now_playing_screen">Afspeelscherm</string>
    <string name="pref_title_general_theme">Algemeen thema</string>
    <string name="pref_header_audio">Audio</string>
    <string name="pref_header_general">Algemeen</string>
@ -106,7 +108,11 @@
    <string name="pref_title_colored_navigation_bar_other_screens">Overal elders</string>
    <string name="pref_title_colored_album_footers">Gekleurde album footers</string>
    <string name="pref_title_force_square_album_art">Forceer vierkante albumhoes</string>
-    <string name="pref_title_opaque_toolbar_now_playing">Ondoorzichtige werkbalk in afspeelscherm</string>
+    <string name="pref_title_opaque_toolbar_now_playing">Ondoorzichtige werkbalk</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Ondoorzichtige statusbalk</string>
+    <string name="pref_title_larger_title_box_now_playing">Grotere titelkader</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Alternatieve progressiebalk</string>
+    <string name="pref_title_playback_controller_card_now_playing">Toon kaart onder de afspeelknoppen</string>
    <string name="no_equalizer">Geen equalizer gevonden</string>
    <string name="no_audio_ID">"Geen audio ID, speel iets af en probeer opnieuw. "</string>
    <string name="navigation_drawer_open">Open navigatiebalk</string>
@ -134,11 +140,15 @@
    <string name="pref_only_lollipop">"Alleen beschikbaar op Lollipop. "</string>
    <string name="pref_summary_colored_album_footers">"Album footers in het raster worden gekleurd met het palet van de albumhoes. "</string>
    <string name="pref_summary_force_square_album_art">Albumhoes in het afspeelscherm is geforceerd vierkant.</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">De werkbalk in het afspeelscherm is ondoorzichtig en bedekt niet langer de albumhoes.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">De werkbalk is ondoorzichtig en bedekt de albumhoes niet.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">De statusbalk is ondoorzichtig en bedekt de albumhoes niet.</string>
+    <string name="pref_summary_larger_title_box_now_playing">De kader onder de albumhoes, waar de artiest en titel wordt getoond, is groter.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Gebruikt een progressiebalk die de albumhoes niet bedekt, in plaats van de normale progressiecirkel.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Weergeeft een kaart onder de bedieningsknoppen (afspelen/pauze etc.)</string>
    <string name="failed_download_albumart">"Het lukt niet om de albumhoes te downloaden. "</string>
    <string name="search_hint">Zoek in je bibliotheek...</string>
    <string name="rescanning_media">Media herscannen...</string>
-    <string name="other">Andere</string>
+    <string name="other">Anders</string>
    <string-array name="update_album_cover_options">
        <item>Downloaden van Last.fm</item>
        <item>Kies vanuit lokale opslag</item>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -110,6 +110,8 @@
    <string name="pref_title_force_square_album_art">Kadrowanie okładek</string>
    <string name="pref_title_opaque_toolbar_now_playing">Nieprzeźroczystość paska narzędzi</string>
    <string name="pref_title_opaque_statusbar_now_playing">Nieprzeźroczystość paska stanu</string>
+    <string name="pref_title_larger_title_box_now_playing">Większe pole tytułu</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Alternatywny pasek postępu</string>
    <string name="pref_title_playback_controller_card_now_playing">Wyświetlanie karty pod przyciskami odtwarzania</string>
    <string name="no_equalizer">Nie znaleziono korektora</string>
    <string name="no_audio_ID">"Brak ID dźwięku, puść coś i spróbuj ponownie"</string>
@ -140,6 +142,8 @@
    <string name="pref_summary_force_square_album_art">Zaznacz, a wymuszone zostanie kadrowanie okładek na ekranie \'\'Obecnie Grane\'\'</string>
    <string name="pref_summary_opaque_toolbar_now_playing">Zaznacz, a pasek narzędzi będzie nieprzeźroczysty i nie zasłoni już okładki</string>
    <string name="pref_summary_opaque_statusbar_now_playing">Zaznacz, a pasek stanu będzie nieprzeźroczysty i nie zasłoni już okładki albumu</string>
+    <string name="pref_summary_larger_title_box_now_playing">Zaznacz, a pole nazwy utworu i wykonawcy pod okładką albumu będzie większe</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Zaznacz, a w odróżnieniu od domyślnego suwaka, pasek postępu nie zasłoni okładki albumu</string>
    <string name="pref_summary_playback_controller_card_now_playing">Zaznacz, a pod przyciskami sterującymi odtwarzaczem (odtwarzanie/pauza, itp.) zostanie wyświetlona karta</string>
    <string name="failed_download_albumart">"Nie można pobrać okładki dla tego albumu"</string>
    <string name="search_hint">Szukaj w bibliotece...</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -62,6 +62,7 @@
    <string name="added_title_to_playing_queue">"1 título adicionado à lista de reprodução"</string>
    <string name="added_x_titles_to_playing_queue">%1$d faixas adicionadas à lista de reprodução.</string>
    <string name="title_activity_playlist_detail">Atividade da Lista de Reprodução</string>
+    <string name="action_remove_from_playlist">Remover da playlist</string>
    <string name="new_playlist_action">Nova playlist...</string>
    <string name="action_grid_columns">Colunas da grade</string>
    <string name="action_grid_columns_land">Colunas da grade (Horizontal)</string>
@ -75,8 +76,12 @@
    ]]></string>
    <string name="delete_song_x"><![CDATA[ Deseja excluir a faixa <b>%1$s</b>? ]]></string>
    <string name="delete_x_songs"><![CDATA[ Deseja excluir <b>%1$d</b> faixas? ]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Você deseja remover a musica <b>%1$s</b> da playlist?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Você deseja remover <b>%1$d</b> musicas da playlist?]]></string>
    <string name="delete_song_title">Excluir Faixa</string>
    <string name="delete_songs_title">Excluir Faixas</string>
+    <string name="remove_song_from_playlist_title">Remover musica da playlist</string>
+    <string name="remove_songs_from_playlist_title">Remover musicas da playlist</string>
    <string name="rename_playlist_title">Renomear Playlist</string>
    <string name="delete_playlist_title">Excluir Playlist</string>
    <string name="delete_playlists_title">Apagar Playlists</string>
@ -88,6 +93,8 @@
    <string name="light_theme_name">Claro</string>
    <string name="dark_theme_name">Escuro</string>
    <string name="equalizer">Equalizador</string>
+    <string name="pref_header_colors">Cores</string>
+    <string name="pref_header_now_playing_screen">Tela de execução</string>
    <string name="pref_title_general_theme">Tema geral</string>
    <string name="pref_header_audio">Áudio</string>
    <string name="pref_header_general">Geral</string>
@ -104,13 +111,19 @@
    <string name="pref_title_colored_album_footers">Rodapés de álbuns coloridos</string>
    <string name="pref_title_force_square_album_art">Forçar a capa do álbum quadrada</string>
    <string name="pref_title_opaque_toolbar_now_playing">Barra de ações opaca na reprodução</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Barra de Status opaca</string>
+    <string name="pref_title_larger_title_box_now_playing">Caixa de titulo maior</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Barra de progresso alternativo</string>
+    <string name="pref_title_playback_controller_card_now_playing">Mostrar cartão abaixo dos controles de reprodução</string>
    <string name="no_equalizer">Nenhum equalizador encontrado</string>
    <string name="no_audio_ID">"Sem identificação de áudio, reproduza algo e tente novamente."</string>
    <string name="navigation_drawer_open">Abrir gaveta de navegação</string>
    <string name="navigation_drawer_close">"Fechar gaveta de navegação"</string>
    <string name="delete_action">Excluir</string>
+    <string name="remove_action">Remover</string>
    <string name="rename_action">Renomear</string>
    <string name="create_action">Criar</string>
+    <string name="x_selected">%1$d selecionado</string>
    <string name="select">Selecionar</string>
    <string name="default_str">Padrão</string>
    <string name="primary_color">Cor Primária</string>
@ -120,12 +133,20 @@
    <string name="update_image">Atualizar Imagem</string>
    <string name="playlist_empty_text">Esta lista está vazia</string>
    <string name="no_playlists">Nenhuma playlist</string>
+    <string name="no_albums">Nenhum Album</string>
+    <string name="no_songs">Nenhuma Musica</string>
+    <string name="no_artists">Nenhum Artista</string>
+    <string name="empty">Vazio</string>
    <string name="playlist_name">Nome da playlist</string>
    <string name="song">Música</string>
    <string name="pref_only_lollipop">"Apenas disponível no Lollipop."</string>
    <string name="pref_summary_colored_album_footers">"Rodapés de álbum na grade são coloridos com as paletas correspondentes."</string>
    <string name="pref_summary_force_square_album_art">A arte do álbum na tela \"Em execução\" está forçada a ser quadrada.</string>
    <string name="pref_summary_opaque_toolbar_now_playing">A barra de ações está opaca e não cobre mais a capa do álbum.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">A Barra de status é opaca e não cobre a capa do álbum.</string>
+    <string name="pref_summary_larger_title_box_now_playing">A caixa embaixo da capa do álbum onde o titulo da musica e o artista são mostrados é mais largo na sua altura.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">"Usa uma barra de progresso que não cobre a capa do álbum substituindo a barra padrão. "</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Mostra um cartão abaixo dos controles de reprodução (Tocar/Pausar etc.)</string>
    <string name="failed_download_albumart">"Não foi possível fazer o download da arte para este álbum."</string>
    <string name="search_hint">Pesquisar na sua biblioteca...</string>
    <string name="rescanning_media">Verificando mídia novamente...</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -14,7 +14,7 @@
    <string name="action_search">搜索</string>
    <string name="action_play_next">下一首</string>
    <string name="action_add_to_playing_queue">加入播放队列</string>
-    <string name="action_remove_from_playing_queue">从播放列表移除</string>
+    <string name="action_remove_from_playing_queue">从播放队列移除</string>
    <string name="action_add_to_playlist">加入播放列表</string>
    <string name="action_tag_editor">音乐标签编辑器</string>
    <string name="action_delete_from_disk">从sd卡上删除</string>
@ -60,7 +60,7 @@
    <string name="action_re_download_artist_image">更新歌手图片</string>
    <string name="updating">正在更新…</string>
    <string name="added_title_to_playing_queue">"该曲目已加入播放队列"</string>
-    <string name="added_x_titles_to_playing_queue">%1$d首曲目已加入播放队列</string>
+    <string name="added_x_titles_to_playing_queue">%1$d首歌曲已加入到播放队列。</string>
    <string name="title_activity_playlist_detail">播放列表操作</string>
    <string name="action_remove_from_playlist">从播放列表移除</string>
    <string name="new_playlist_action">新建播放列表</string>
@ -116,6 +116,8 @@
    <string name="pref_title_force_square_album_art">强制使用方形专辑封面</string>
    <string name="pref_title_opaque_toolbar_now_playing">正在播放界面使用不透明工具栏</string>
    <string name="pref_title_opaque_statusbar_now_playing">不透明状态栏</string>
+    <string name="pref_title_larger_title_box_now_playing">更大的标题框</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">启用备选的进度条</string>
    <string name="pref_title_playback_controller_card_now_playing">显示播放控制按钮后的卡片背景</string>
    <string name="no_equalizer">没有找到均衡器</string>
    <string name="no_audio_ID">"没有音频ID，请播放并重试。"</string>
@ -146,6 +148,8 @@
    <string name="pref_summary_force_square_album_art">在正在播放界中强制使用方形专辑封面</string>
    <string name="pref_summary_opaque_toolbar_now_playing">使正在播放界面的工具栏不透明并且并遮盖住部分专辑封面</string>
    <string name="pref_summary_opaque_statusbar_now_playing">状态栏不透明并且不会遮挡专辑封面</string>
+    <string name="pref_summary_larger_title_box_now_playing">增加专辑封面下方用于显示歌曲名称和艺术家区域的高度</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">使用不会遮挡专辑封面的进度条替代正常的进度滑块。</string>
    <string name="pref_summary_playback_controller_card_now_playing">在播放控制按钮（播放/暂停等）下方显示卡片背景</string>
    <string name="failed_download_albumart">"专辑信息下载失败"</string>
    <string name="search_hint">正在扫描</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -24,10 +24,10 @@
    <string name="songs">Songs</string>
    <string name="playlists">Playlists</string>
    <string name="nothing_playing">Nothing is playing</string>
-    <string name="unplayable_file">Sorry - an error occurred while attempting to play this song.</string>
-    <string name="biography_unavailable">Sorry, we were not able to find a matching biography for this artist.</string>
+    <string name="unplayable_file">An error occurred while attempting to play this song.</string>
+    <string name="biography_unavailable">We were not able to find a matching biography for this artist.</string>
    <string name="biography">Biography</string>
-    <string name="audio_focus_denied">We were not able to gain audio focus.</string>
+    <string name="audio_focus_denied">No audio focus.</string>
    <string name="title_activity_tag_editor">Tag editor</string>
    <string name="tag_editor">Tag editor</string>
    <string name="album">Album</string>