Merge branch 'master' into glide

app/src/main/java/com/kabouzeid/gramophone/ui/activities/IntroActivity.java

@@ -25,6 +25,9 @@ public class IntroActivity extends AppIntro {
         int color = ContextCompat.getColor(this, R.color.blue_grey_700);
         setStatusBarColor(ColorUtil.shiftColorDown(color));
         setTaskColor(color);
+        setSkipText(getString(R.string.action_skip).toUpperCase());
+        setDoneText(getString(R.string.action_done).toUpperCase());
+        setGrantText(getString(R.string.action_grant).toUpperCase());
 
         addSlide(AppIntroFragment.newInstance(getString(R.string.app_name), getString(R.string.welcome_to_phonograph), R.drawable.icon_web, color));
         if (!hasExternalStoragePermission()) {

app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java

@@ -169,23 +169,6 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
         tabs.setTabTextColors(ColorUtil.getSecondaryTextColorForBackground(this, getThemeColorPrimary()), ColorUtil.getPrimaryTextColorForBackground(this, getThemeColorPrimary()));
         tabs.setSelectedTabIndicatorColor(getThemeColorAccent() == Color.WHITE && !ColorUtil.useDarkTextColorOnBackground(getThemeColorPrimary()) ? Color.WHITE : ThemeSingleton.get().positiveColor.getDefaultColor());
 
-        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                navigationView.getMenu().getItem(position).setChecked(true);
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
         pager.setCurrentItem(startPosition);
     }
 
@@ -201,6 +184,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
     }
 
     private void setUpNavigationView() {
+        navigationView.setCheckedItem(R.id.nav_library);
         final int colorAccent = ThemeSingleton.get().positiveColor.getDefaultColor();
         navigationView.setItemTextColor(new ColorStateList(
                 new int[][]{
@@ -231,21 +215,11 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
             public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
                 drawerLayout.closeDrawers();
                 switch (menuItem.getItemId()) {
-                    case R.id.nav_songs:
+                    case R.id.nav_library:
-                        menuItem.setChecked(true);
+                        // TODO
-                        pager.setCurrentItem(PagerAdapter.MusicFragments.SONG.ordinal(), true);
                         break;
-                    case R.id.nav_albums:
+                    case R.id.nav_folders:
-                        menuItem.setChecked(true);
+                        // TODO
-                        pager.setCurrentItem(PagerAdapter.MusicFragments.ALBUM.ordinal(), true);
-                        break;
-                    case R.id.nav_artists:
-                        menuItem.setChecked(true);
-                        pager.setCurrentItem(PagerAdapter.MusicFragments.ARTIST.ordinal(), true);
-                        break;
-                    case R.id.nav_playlists:
-                        menuItem.setChecked(true);
-                        pager.setCurrentItem(PagerAdapter.MusicFragments.PLAYLIST.ordinal(), true);
                         break;
                     case R.id.support_development:
                         new Handler().postDelayed(new Runnable() {

app/src/main/res/menu/menu_drawer.xml

@@ -5,21 +5,14 @@
         android:id="@+id/navigation_drawer_menu_category_sections"
         android:checkableBehavior="single">
         <item
-            android:id="@+id/nav_songs"
+            android:id="@+id/nav_library"
-            android:icon="@drawable/ic_audiotrack_white_24dp"
+            android:icon="@drawable/ic_my_library_music_white_24dp"
-            android:title="@string/songs" />
+            android:title="@string/library" />
         <item
-            android:id="@+id/nav_albums"
+            android:enabled="false"
-            android:icon="@drawable/ic_album_white_24dp"
+            android:id="@+id/nav_folders"
-            android:title="@string/albums" />
+            android:icon="@drawable/ic_folder_white_24dp"
-        <item
+            android:title="Folders (soon)" />
-            android:id="@+id/nav_artists"
-            android:icon="@drawable/ic_person_white_24dp"
-            android:title="@string/artists" />
-        <item
-            android:id="@+id/nav_playlists"
-            android:icon="@drawable/ic_queue_music_white_24dp"
-            android:title="@string/playlists" />
     </group>
 
     <group

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

@@ -8,6 +8,7 @@
     <string name="action_set_as_ringtone">Als Klingelton verwenden</string>
     <string name="action_share">Teilen</string>
     <string name="action_settings">"Einstellungen"</string>
+    <string name="action_grant">Gewähren</string>
     <string name="action_about">Über</string>
     <string name="action_show_intro">Zeige Einführung</string>
     <string name="action_clear_playlist">Wiedergabeliste leeren</string>
@@ -20,7 +21,7 @@
     <string name="action_add_to_playing_queue">Zur Warteschlange hinzufügen</string>
     <string name="action_remove_from_playing_queue">Von Warteschlange entfernen</string>
     <string name="action_add_to_playlist">Zu Wiedergabeliste hinzufügen…</string>
-    <string name="action_tag_editor">Tags ändern…</string>
+    <string name="action_tag_editor">Tags ändern</string>
     <string name="action_delete_from_device">Von Gerät Löschen</string>
     <string name="action_details">Details</string>
     <string name="albums">Alben</string>
@@ -39,7 +40,7 @@
     <string name="track">Titel</string>
     <string name="track_hint">"Track (2 für Track 2 oder 3004 für CD 3 Track 4)"</string>
     <string name="album_or_artist_empty">Der Titel oder der Interpret ist leer.</string>
-    <string name="writing_file_number">Datei schreiben…</string>
+    <string name="writing_file_number">Datei schreiben</string>
     <string name="saving_changes">Speichere Änderungen…</string>
     <string name="label_details">Details</string>
     <string name="label_file_name">Dateiname</string>
@@ -166,14 +167,15 @@
     <string name="action_sleep_timer">Einschlaf Timer</string>
     <string name="action_set">Setze</string>
     <string name="cancel_current_timer">Aktuellen Timer abbrechen</string>
-    <string name="sleep_timer_canceled">Der Einschlaf Timer wurde abgebrochen</string>
+    <string name="sleep_timer_canceled">Der Einschlaf Timer wurde abgebrochen.</string>
-    <string name="sleep_timer_set">Der Einschlaf Timer wurde auf %d Minuten von jetzt gesetzt</string>
+    <string name="sleep_timer_set">Der Schlaf Timer geht ab jetzt %d Minuten lang.</string>
     <string name="action_new_playlist">Neue Wiedergabeliste…</string>
     <string name="new_playlist_title">Neue Wiedergabeliste</string>
     <string name="colored_footers">Farbige Balken</string>
     <string name="special_thanks_to">Besonderes Dankeschön an</string>
     <string name="changelog">Änderungen</string>
     <string name="licenses">Lizenzen</string>
+    <string name="permissions_denied">Erlaubnis verweigert.</string>
     <string name="permission_external_storage_denied">Die Rechte um auf den externen Speicher zuzugreifen wurden verweigert.</string>
     <string name="back">zurück</string>
     <string name="support_development">Unterstütze die Entwicklung</string>
@@ -205,4 +207,11 @@
     <string name="loading_products">Produkte werden geladen...</string>
     <string name="up_next">Als nächstes</string>
     <string name="pref_title_now_playing_layout">Gestaltung der aktuellen Wiedergabe</string>
+    <string name="intro_label">Einführung</string>
+    <string name="press_back_again_to_exit_intro">Drücke nochmal zurück  um die Einführung zu überspringen.</string>
+    <string name="welcome_to_phonograph">Willkommen bei Phonograph, ein wunderschöner und leichter Musik-Spieler für Android.</string>
+    <string name="label_storage">Speicher</string>
+    <string name="open_playing_queue_instruction">Ziehe die Karte in der aktuellen Wiedergabe hoch um die komplette Warteschlange anzeigen zu lassen.</string>
+    <string name="rearrange_playing_queue_instruction">Ziehe die Titelnummer eines Titels nach oben oder unten, um die Warteschlange neu anzuordnen.</string>
+    <string name="storage_permission_explaination">Die Speicher-Erlaubnis braucht Phonograph, um deine Musikbibliothek zu lesen.</string>
 </resources>

app/src/main/res/values-es-rUS/strings.xml

@@ -8,6 +8,7 @@
     <string name="action_set_as_ringtone">Establecer como tono de llamada</string>
     <string name="action_share">Compartir</string>
     <string name="action_settings">"Ajustes"</string>
+    <string name="action_grant">Permitir</string>
     <string name="action_about">Acerca de</string>
     <string name="action_show_intro">Mostrar intro</string>
     <string name="action_clear_playlist">Limpiar lista de reproducción</string>
@@ -151,14 +152,14 @@
     <string name="pref_summary_playback_controller_card_now_playing">Muestra una tarjeta detrás de los botones reproducir/pausar, siguiente, previo, aleatorio y repetir.</string>
     <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la carátula del álbum pero a veces puede tardar en cargar. Sólo actívalo si tienes problemas con carátulas de baja resolución.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">Colorea los botones de reproducir/pausar, aleatorio y repetir as\u00ed como la barra de progreso con el color vibrante de la car\u00e1tula del \u00e1lbum.</string>
-    <string name="pref_summary_colored_navigation_bar">Colorea la barra de navegación con el color principal.</string>
+    <string name="pref_summary_colored_navigation_bar">Colorear la barra de navegación con el color principal.</string>
     <string name="could_not_download_album_cover">"No se puede descargar una car\u00e1tula de \u00e1lbum coincidente."</string>
     <string name="search_hint">Buscar en la biblioteca...</string>
     <string name="rescanning_media">Escaneando contenido...</string>
     <string name="favorites">Favoritos</string>
     <string name="last_added">Agregadas recientemente</string>
     <string name="history">Historial</string>
-    <string name="my_top_tracks">Las más reproducidas</string>
+    <string name="my_top_tracks">Más reproducidas</string>
     <string name="remove_cover">Eliminar carátula</string>
     <string name="download_from_last_fm">Descargar de Last.fm</string>
     <string name="pick_from_local_storage">Seleccionar del almacenamiento interno</string>
@@ -174,6 +175,7 @@
     <string name="special_thanks_to">Agradecimientos especiales a</string>
     <string name="changelog">Lista de cambios</string>
     <string name="licenses">Licencias</string>
+    <string name="permissions_denied">Permisos negados.</string>
     <string name="permission_external_storage_denied">Permiso para acceder al almacenamiento externo denegado.</string>
     <string name="back">regresar</string>
     <string name="support_development">Apoyar el desarrollo</string>
@@ -205,4 +207,11 @@
     <string name="loading_products">Cargando productos...</string>
     <string name="up_next">En seguida</string>
     <string name="pref_title_now_playing_layout">Diseño de la pantalla Reproduciendo</string>
+    <string name="intro_label">Introducción</string>
+    <string name="press_back_again_to_exit_intro">Presione regresar de nuevo para saltar el intro.</string>
+    <string name="welcome_to_phonograph">Bienvenido a Phonograph, un reproductor de música hermoso y ligero para Android.</string>
+    <string name="label_storage">Almacenamiento</string>
+    <string name="open_playing_queue_instruction">Desliza la tarjeta en la pantalla de Reproducción Actual para desplegar la cola de reproducción completa.</string>
+    <string name="rearrange_playing_queue_instruction">Reorganiza la cola de reproducción arrastrando una canción desde su número de pista.</string>
+    <string name="storage_permission_explaination">El permiso de almacenamiento es necesario para que Phonograph pueda identificar la música de su biblioteca.</string>
 </resources>

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

@@ -8,6 +8,7 @@
     <string name="action_set_as_ringtone">Définir comme sonnerie</string>
     <string name="action_share">Partager</string>
     <string name="action_settings">"Paramètres"</string>
+    <string name="action_grant">Accorder</string>
     <string name="action_about">À propos</string>
     <string name="action_show_intro">Afficher l\'introduction</string>
     <string name="action_clear_playlist">Effacer la liste de lecture</string>
@@ -27,8 +28,8 @@
     <string name="artists">Artistes</string>
     <string name="songs">Titres</string>
     <string name="playlists">Listes de lecture</string>
-    <string name="unplayable_file">La lecture de ce titre a \u00e9chou\u00e9e.</string>
+    <string name="unplayable_file">Impossible de lire ce titre.</string>
-    <string name="biography_unavailable">La biographie de l\'artiste est introuvable.</string>
+    <string name="biography_unavailable">Impossible de trouver la biographie de l\'artiste.</string>
     <string name="biography">Biographie</string>
     <string name="audio_focus_denied">Focus audio refusé.</string>
     <string name="album">Album</string>
@@ -144,7 +145,7 @@
     <string name="pref_summary_colored_notification">"Colore la notification en fonction de la pochette de l'album."</string>
     <string name="pref_summary_gapless_playback">"Peut causer des problèmes de lecture sur certains appareils."</string>
     <string name="pref_summary_force_square_album_art">La pochette 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 est opaque et ne recouvre pas la vignette de l\'album.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">Colore la barre d\'outil.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">Colore la barre d\'état.</string>
     <string name="pref_summary_larger_title_box_now_playing">La boîte en dessous de la pochette de l\'album où se trouvent le titre de la musique et l\'artiste est plus large dans sa hauteur.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Utilise une barre de progression qui ne recouvre pas la pochette de l\'album à la place de la barre de progression normale.</string>
@@ -174,7 +175,7 @@
     <string name="special_thanks_to">Un grand merci à</string>
     <string name="changelog">Changelog</string>
     <string name="licenses">Licences</string>
-    <string name="permissions_denied">Permission refusée.</string>
+    <string name="permissions_denied">Autorisation refusée.</string>
     <string name="permission_external_storage_denied">Accès au stockage externe refusé.</string>
     <string name="back">Retour</string>
     <string name="support_development">Faire un don</string>
@@ -203,13 +204,14 @@
     <string name="maarten_corpel_summary">Pour avoir réalisé l\'illustration du Play Store ainsi que la pochette de l\'album vide.</string>
     <string name="aleksandar_tesic_summary">Pour m\'avoir aidé à la conception.</string>
     <string name="website">Site internet</string>
-    <string name="loading_products">Chargement des produits...</string>
+    <string name="loading_products">Chargement des produits…</string>
     <string name="up_next">Suivant</string>
     <string name="pref_title_now_playing_layout">Disposition Lecture en cours</string>
-    <string name="press_back_again_to_exit_intro">Appuyez à nouveau pour passer l\'introduction.</string>
+    <string name="intro_label">Introduction</string>
-    <string name="welcome_to_phonograph">"Bienvenue chez Phonograph, un lecteur de musique beau et léger pour Android. "</string>
+    <string name="press_back_again_to_exit_intro">Appuyez à nouveau pour ignorer l\'introduction.</string>
+    <string name="welcome_to_phonograph">"Bienvenue sur Phonograph, un lecteur de musique beau et léger pour Android. "</string>
     <string name="label_storage">Stockage</string>
-    <string name="open_playing_queue_instruction">Vous pouvez glisser la carte dans l\'écran de lecture en cours pour afficher la file d\'attente de lecture complète.</string>
+    <string name="open_playing_queue_instruction">Vous pouvez glisser la carte dans l\'écran de lecture en cours pour afficher la file de lecture complète.</string>
-    <string name="rearrange_playing_queue_instruction">Vous pouvez réorganiser la file d\'attente de lecture en faisant glisser une chanson à partir de son numéro de piste.</string>
+    <string name="rearrange_playing_queue_instruction">Vous pouvez réorganiser la file de lecture en faisant glisser une chanson à partir de son numéro de piste.</string>
     <string name="storage_permission_explaination">L\'autorisation de stockage est nécessaire pour que Phonograph puisse lire votre bibliothèque musicale.</string>
 </resources>

app/src/main/res/values-hr/strings.xml

@@ -8,7 +8,9 @@
     <string name="action_set_as_ringtone">Postavi kao zvuk zvona</string>
     <string name="action_share">Podijeli</string>
     <string name="action_settings">"Postavke"</string>
+    <string name="action_grant">Dozvoli</string>
     <string name="action_about">O Phonographu</string>
+    <string name="action_show_intro">Prikaži uvod</string>
     <string name="action_clear_playlist">Isprazni popis pjesama</string>
     <string name="action_playing_queue">Red čekanja</string>
     <string name="action_add_to_favorites">Dodaj u favorite</string>
@@ -173,11 +175,12 @@
     <string name="special_thanks_to">Posebna zahvala</string>
     <string name="changelog">Promjene</string>
     <string name="licenses">Licence</string>
+    <string name="permissions_denied">Pristup odbijen.</string>
     <string name="permission_external_storage_denied">Dopuštenje za pristup vanjskoj pohrani je odbijeno.</string>
     <string name="back">natrag</string>
     <string name="support_development">Podržite razvoj</string>
     <string name="thank_you">Hvala vam!</string>
-    <string name="restored_previous_purchases">Povrati prošle kupnje.</string>
+    <string name="restored_previous_purchases">Prošle kupovine vraćene.</string>
     <string name="play_store_illustration_by">Play Store ilustraciju izradio</string>
     <string name="version">Verzija</string>
     <string name="application">Aplikacija</string>
@@ -192,7 +195,7 @@
     <string name="join_community_summary">Ako trebaš pomoć ili imaš pitanja, trebaš posjetiti Phonograph zajednicu na Google Plusu.</string>
     <string name="translate">Prevedi</string>
     <string name="translate_summary">Pomozi prevesti Phonograph na svoj izvorni jezik.</string>
-    <string name="rate_on_google_play">Ocijeni</string>
+    <string name="rate_on_google_play">Ocjeni</string>
     <string name="rate_on_google_play_summary">Ostavi pozitivnu ocjenu na Google Playu ako ti se Phonograph sviđa.</string>
     <string name="donate">Doniraj</string>
     <string name="donate_summary">Ako misliš da sam zaslužio biti plaćen za svoj rad, ostavi mi par dolara ovdje.</string>
@@ -204,4 +207,11 @@
     <string name="loading_products">Učitavanje artikala...</string>
     <string name="up_next">Sljedeće</string>
     <string name="pref_title_now_playing_layout">Raspored zaslona za reprodukciju</string>
+    <string name="intro_label">Uvod</string>
+    <string name="press_back_again_to_exit_intro">Pritisni ponovno tipku natrag za preskakanje uvoda.</string>
+    <string name="welcome_to_phonograph">"Dobrodošli u Phonograph, prekrasan i lagan glazbeni player za Android. "</string>
+    <string name="label_storage">Pohrana</string>
+    <string name="open_playing_queue_instruction">Povucite karticu na zaslonu za reprodukciju kako bi otvorili cijeli red reprodukcije.</string>
+    <string name="rearrange_playing_queue_instruction">Preuredi red reprodukcije povlačenjem pjesme za njen broj.</string>
+    <string name="storage_permission_explaination">Dozvola pohrane je potrebna kako bi Phonograph pročitao vašu glazbenu biblioteku.</string>
 </resources>

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

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="what_do_you_want_to_share">Mit szeretnél megosztani?</string>
+    <string name="currently_listening_to_x_by_x">Jelenleg a(z) %1$s-t hallgatja %2$s-tól.</string>
+    <string name="the_audio_file">A hangfájl</string>
+    <string name="do_you_want_to_set_x_as_ringtone">Be szeretnéd állítani a %1$s-t csengőhangként?</string>
+    <string name="x_has_been_set_as_ringtone">A(z) %1$s be lett állítva csengőhangnak.</string>
+    <string name="action_set_as_ringtone">Beállítva csengőhangnak</string>
+    <string name="action_share">Megoszt</string>
+    <string name="action_settings">"Beállítások"</string>
+    <string name="action_grant">Engedélyez</string>
+    <string name="action_about">Névjegy</string>
+    <string name="action_show_intro">Intró mutatása</string>
+    <string name="action_clear_playlist">Lejátszási lista törlése</string>
+    <string name="action_playing_queue">Lejátszási sorhoz</string>
+    <string name="action_add_to_favorites">Hozzáadás a kedvencekhez</string>
+    <string name="action_remove_from_favorites">Eltávolítás a kedvencekből</string>
+    <string name="action_search">Keresés</string>
+    <string name="action_play_next">Lejátszás következőnek</string>
+    <string name="action_play">Lejátszás</string>
+    <string name="action_add_to_playing_queue">Hozzáadás a lejátszási sorhoz</string>
+    <string name="action_remove_from_playing_queue">Eltávolítás a lejátszási sorból</string>
+    <string name="action_add_to_playlist">Hozzáadás a lejátszási listához...</string>
+    <string name="action_tag_editor">Címkeszerkesztő</string>
+    <string name="action_delete_from_device">Törlés az eszközről</string>
+    <string name="action_details">Részletek</string>
+    <string name="albums">Albumok</string>
+    <string name="artists">Előadók</string>
+    <string name="songs">Dalok</string>
+    <string name="playlists">Lejátszási lista</string>
+</resources>

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

@@ -8,8 +8,9 @@
     <string name="action_set_as_ringtone">Ustaw jako dzwonek</string>
     <string name="action_share">Udostępnij</string>
     <string name="action_settings">"Ustawienia"</string>
+    <string name="action_grant">Przyznaj</string>
     <string name="action_about">O aplikacji</string>
-    <string name="action_show_intro">Pokaż intro</string>
+    <string name="action_show_intro">Pokaż wstęp</string>
     <string name="action_clear_playlist">Wyczyść listę odtwarzania</string>
     <string name="action_playing_queue">Kolejka odtwarzania</string>
     <string name="action_add_to_favorites">Dodaj do ulubionych</string>
@@ -174,6 +175,7 @@
     <string name="special_thanks_to">Specjalne podziękowania dla</string>
     <string name="changelog">Lista zmian</string>
     <string name="licenses">Licencje</string>
+    <string name="permissions_denied">Odmówiono zezwolenia</string>
     <string name="permission_external_storage_denied">Pozwolenie na dostęp do pamięci zewnętrznej odrzucone</string>
     <string name="back">Wróć</string>
     <string name="support_development">Wspomóż rozwój</string>
@@ -205,4 +207,11 @@
     <string name="loading_products">Ładowanie produktów...</string>
     <string name="up_next">Za chwilę zagra</string>
     <string name="pref_title_now_playing_layout">Układ ekranu \"Obecnie Grane\"</string>
+    <string name="intro_label">Wprowadzenie</string>
+    <string name="press_back_again_to_exit_intro">Naciśnij ponownie, aby pominąć wstęp</string>
+    <string name="welcome_to_phonograph">"Witaj w Phonograph, pięknym i lekkim odtwarzaczu muzyki na Androida "</string>
+    <string name="label_storage">Magazyn danych</string>
+    <string name="open_playing_queue_instruction">Przesuń kartę na ekranie \'\'Obecnie Grane\'\' w górę, aby odsłonić pełną kolejkę odtwarzania</string>
+    <string name="rearrange_playing_queue_instruction">Zmień kolejność odtwarzania, przeciągając numer utworu w górę lub w dół kolejki</string>
+    <string name="storage_permission_explaination">Phonograph wymaga zgody na dostep do magazynu danych, aby móc odczytać Twoją bibliotekę muzyczną</string>
 </resources>

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

@@ -8,7 +8,9 @@
     <string name="action_set_as_ringtone">Definir como toque</string>
     <string name="action_share">Compartilhar</string>
     <string name="action_settings">"Configurações"</string>
+    <string name="action_grant">Permitir</string>
     <string name="action_about">Sobre</string>
+    <string name="action_show_intro">Introdução</string>
     <string name="action_clear_playlist">Limpar playlist</string>
     <string name="action_playing_queue">Fila de execução</string>
     <string name="action_add_to_favorites">Adicionar aos favoritos</string>
@@ -26,7 +28,7 @@
     <string name="artists">Artistas</string>
     <string name="songs">Músicas</string>
     <string name="playlists">Playlists</string>
-    <string name="unplayable_file">N\u00e3o foi poss\u00edvel tocar essa m\u00fasica.</string>
+    <string name="unplayable_file">N\u00e3o foi poss\u00edvel reproduzir esta m\u00fasica.</string>
     <string name="biography_unavailable">N\u00e3o foi poss\u00edvel encontrar a biografia dos artistas.</string>
     <string name="biography">Biografia</string>
     <string name="audio_focus_denied">Foco do áudio negado.</string>
@@ -38,7 +40,7 @@
     <string name="track">Faixa</string>
     <string name="track_hint">"Faixa (2 para faixa 2 ou 3004 para CD3 faixa 4)"</string>
     <string name="album_or_artist_empty">O título ou artista está vazio.</string>
-    <string name="writing_file_number">Gravando no arquivo</string>
+    <string name="writing_file_number">Gravando arquivo</string>
     <string name="saving_changes">Salvando alterações...</string>
     <string name="label_details">Detalhes</string>
     <string name="label_file_name">Nome do arquivo</string>
@@ -87,9 +89,11 @@
     <string name="action_shuffle_album">Misturar álbum</string>
     <string name="action_shuffle_artist">Misturar artista</string>
     <string name="action_shuffle_playlist">Misturar playlist</string>
+    <string name="action_clear_playing_queue">Limpar fila de reprodução</string>
     <string name="last_opened">Última aberta</string>
     <string name="light_theme_name">Claro</string>
     <string name="dark_theme_name">Escuro</string>
+    <string name="black_theme_name">Preto (AMOLED)</string>
     <string name="equalizer">Equalizador</string>
     <string name="pref_header_colors">Cores</string>
     <string name="pref_header_now_playing_screen">Tocando agora</string>
@@ -100,7 +104,8 @@
     <string name="pref_header_lockscreen">Bloqueio de tela</string>
     <string name="pref_title_navigation_bar">Barra de navegação colorida</string>
     <string name="pref_title_set_default_start_page">Página inicial</string>
-    <string name="pref_title_album_art_on_lockscreen">Capa do álbum no bloqueio de tela</string>
+    <string name="pref_title_album_art_on_lockscreen">Visualizar capa do álbum</string>
+    <string name="pref_title_blurred_album_art">Capa de álbum esmaecida</string>
     <string name="pref_title_colored_notification">Notificação colorida</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorar capas Media Store</string>
     <string name="pref_title_gapless_playback">Reprodução contínua</string>
@@ -136,6 +141,7 @@
     <string name="song">Música</string>
     <string name="pref_only_lollipop">"Apenas disponível no Lollipop."</string>
     <string name="pref_summary_album_art_on_lockscreen">A imagem do álbum está sendo mostrada no bloqueio de tela. Você deve reiniciar o Phonograph para as mudanças fazerem efeito.</string>
+    <string name="pref_summary_blurred_album_art">Esmaece a capa de álbum no bloqueio de tela. Pode causar problemas com apps de terceiros e widgets.</string>
     <string name="pref_summary_colored_notification">"A notifica\u00e7\u00e3o \u00e9 colorida com a cor mais vibrante do \u00e1lbum."</string>
     <string name="pref_summary_gapless_playback">"Pode causar problemas de reprodução em alguns dispositivos."</string>
     <string name="pref_summary_force_square_album_art">Capas de álbuns reproduzindo agora estão sempre ao quadrado.</string>
@@ -168,7 +174,9 @@
     <string name="colored_footers">Rodapés coloridos</string>
     <string name="special_thanks_to">Agradecimentos especiais para</string>
     <string name="changelog">Novidades</string>
-    <string name="permission_external_storage_denied">Permissão para acessar armazenamento externo negado.</string>
+    <string name="licenses">Licenças</string>
+    <string name="permissions_denied">Permissões negadas.</string>
+    <string name="permission_external_storage_denied">Permissão para acessar armazenamento externo negada.</string>
     <string name="back">voltar</string>
     <string name="support_development">Apoiar o desenvolvimento</string>
     <string name="thank_you">Obrigado!</string>
@@ -199,4 +207,11 @@
     <string name="loading_products">Carregando produtos...</string>
     <string name="up_next">Próximo</string>
     <string name="pref_title_now_playing_layout">Layout da tela de reprodução</string>
+    <string name="intro_label">Indrodução</string>
+    <string name="press_back_again_to_exit_intro">Pressione voltar novamente para pular a introdução.</string>
+    <string name="welcome_to_phonograph">"Seja bem-vindo ao Phonograph, um lindo e leve player de música para Android. "</string>
+    <string name="label_storage">Armazenamento</string>
+    <string name="open_playing_queue_instruction">Arraste para cima o card da tela de reprodução para mostrar a lista de reprodução completa.</string>
+    <string name="rearrange_playing_queue_instruction">Mude as músicas de lugar na fila pressionando-as e arrastando-as de seu número de faixa.</string>
+    <string name="storage_permission_explaination">A permissão de armazenamento é necessária para o Phonograph escanear suas músicas.</string>
 </resources>

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

@@ -8,7 +8,9 @@
     <string name="action_set_as_ringtone">Установить как рингтон</string>
     <string name="action_share">Поделиться</string>
     <string name="action_settings">"Настройки"</string>
+    <string name="action_grant">Разрешить</string>
     <string name="action_about">О программе</string>
+    <string name="action_show_intro">Показать вступление</string>
     <string name="action_clear_playlist">Очистить плейлист</string>
     <string name="action_playing_queue">Очередь воспроизведения</string>
     <string name="action_add_to_favorites">Добавить в избранное</string>
@@ -91,6 +93,7 @@
     <string name="last_opened">Последнее открытое</string>
     <string name="light_theme_name">Светлая</string>
     <string name="dark_theme_name">Тёмная</string>
+    <string name="black_theme_name">Чёрная (для AMOLED-экранов)</string>
     <string name="equalizer">Эквалайзер</string>
     <string name="pref_header_colors">Цвета</string>
     <string name="pref_header_now_playing_screen">Экран воспроизведения</string>
@@ -171,6 +174,8 @@
     <string name="colored_footers">Окрашенные нижние колонтитулы</string>
     <string name="special_thanks_to">Особая благодарность</string>
     <string name="changelog">Список изменений</string>
+    <string name="licenses">Лицензии</string>
+    <string name="permissions_denied">"В разрешениях отказано "</string>
     <string name="permission_external_storage_denied">В разрешении на доступ к внешнему хранилищу отказано.</string>
     <string name="back">назад</string>
     <string name="support_development">Поддержать разработку</string>
@@ -202,4 +207,11 @@
     <string name="loading_products">Загрузка продуктов...</string>
     <string name="up_next">Далее</string>
     <string name="pref_title_now_playing_layout">"Макет экрана воспроизведения "</string>
+    <string name="intro_label">Вступление</string>
+    <string name="press_back_again_to_exit_intro">Ещё раз нажмите назад, чтобы пропустить вступление</string>
+    <string name="welcome_to_phonograph">Добро пожаловать в Phonograph, красивый и лёгкий плеер для Android</string>
+    <string name="label_storage">Хранилище</string>
+    <string name="open_playing_queue_instruction">Проведите по карточке на экране воспроизведения, чтобы просмотреть очередь</string>
+    <string name="rearrange_playing_queue_instruction">Редактируйте очередь воспроизведения, перетаскивая песни за их номер</string>
+    <string name="storage_permission_explaination">Нужен доступ к хранилищу, чтобы плеер мог читать Вашу библиотеку</string>
 </resources>

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

@@ -8,6 +8,7 @@
     <string name="action_set_as_ringtone">设为铃声</string>
     <string name="action_share">分享</string>
     <string name="action_settings">"设置"</string>
+    <string name="action_grant">授予</string>
     <string name="action_about">关于</string>
     <string name="action_show_intro">显示介绍</string>
     <string name="action_clear_playlist">清除播放列表</string>
@@ -174,6 +175,7 @@
     <string name="special_thanks_to">特别感谢</string>
     <string name="changelog">更新日志</string>
     <string name="licenses">许可证</string>
+    <string name="permissions_denied">未能获取权限</string>
     <string name="permission_external_storage_denied">访问外部存储的权限被拒绝。</string>
     <string name="back">返回</string>
     <string name="support_development">支持开发者</string>
@@ -205,4 +207,11 @@
     <string name="loading_products">加载产品中…</string>
     <string name="up_next">即将播放</string>
     <string name="pref_title_now_playing_layout">播放界面样式</string>
+    <string name="intro_label">介绍</string>
+    <string name="press_back_again_to_exit_intro">再次点击后退键，跳过介绍页</string>
+    <string name="welcome_to_phonograph">欢迎使用 Phonohraph，这是一款精致而轻量的 Android 音乐播放器。</string>
+    <string name="label_storage">储存</string>
+    <string name="open_playing_queue_instruction">滑动播放界面的卡片即可展开当前播放队列</string>
+    <string name="rearrange_playing_queue_instruction">通过拖动歌曲前的序号调整播放队列</string>
+    <string name="storage_permission_explaination">Phonograph需要存储权限以读取你的音乐库</string>
 </resources>

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

@@ -9,6 +9,8 @@
     <string name="action_share">Share</string>
     <string name="action_settings">"Settings"</string>
     <string name="action_grant">Grant</string>
+    <string name="action_done">Done</string>
+    <string name="action_skip">Skip</string>
     <string name="action_about">About</string>
     <string name="action_show_intro">Show intro</string>
     <string name="action_clear_playlist">Clear playlist</string>
@@ -222,4 +224,6 @@
     <string name="open_playing_queue_instruction">Swipe the card in the now playing screen up to reveal the full playing queue.</string>
     <string name="rearrange_playing_queue_instruction">Rearrange the playing queue by dragging a song from its track number.</string>
     <string name="storage_permission_explaination">The storage permission is required for Phonograph to read your music library.</string>
+    <string name="library">Library</string>
+    <string name="folders">Folders</string>
 </resources>