am e313559f: am 1f48f4cf: Merge "Null pointer protection in AudioPreview.java for Music app"
* commit 'e313559fbb2bcac7bc371896d40ea11a64141f32':
Null pointer protection in AudioPreview.java for Music app
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d952772..c919f6c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -144,7 +144,7 @@
<string name="working_songs" msgid="2201491972050410684">"Titel…"</string>
<string name="working_playlists" msgid="4424950806134653351">"Playlists…"</string>
<string name="loading" msgid="1991660396037155453">"Wird geladen…"</string>
- <string name="sort_by_track" msgid="7662999005554152565">"Tracks"</string>
+ <string name="sort_by_track" msgid="7662999005554152565">"Titel"</string>
<string name="sort_by_album" msgid="2912837715658975248">"Alben"</string>
<string name="sort_by_artist" msgid="4607024967813199992">"Interpreten"</string>
<string name="music_picker_title" msgid="4143865470317360605">"Musiktrack auswählen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 25912b1..1c4ca01 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -136,7 +136,7 @@
<string name="mediapickerlabel" msgid="4549836003229914299">"Música"</string>
<string name="playback_failed" msgid="3811851150820251398">"El reproductor no admite este tipo de archivo de audio."</string>
<string name="cancel" msgid="886559484711947520">"Cancelar"</string>
- <string name="remove_from_playlist" msgid="2548577514849026354">"Eliminar de la lista de reproducción"</string>
+ <string name="remove_from_playlist" msgid="2548577514849026354">"Quitar de la lista de reproducción"</string>
<string name="streamloadingtext" msgid="8842426517396356215">"Estableciendo conexión con <xliff:g id="HOST">%s</xliff:g>..."</string>
<string name="mediasearch" msgid="959222971261132292">"Buscar <xliff:g id="TERM">%s</xliff:g> con:"</string>
<string name="working_artists" msgid="8678357432732156580">"Artistas…"</string>
@@ -144,11 +144,11 @@
<string name="working_songs" msgid="2201491972050410684">"Canciones…"</string>
<string name="working_playlists" msgid="4424950806134653351">"Listas de reproducción…"</string>
<string name="loading" msgid="1991660396037155453">"Cargando..."</string>
- <string name="sort_by_track" msgid="7662999005554152565">"Pistas"</string>
+ <string name="sort_by_track" msgid="7662999005554152565">"Canciones"</string>
<string name="sort_by_album" msgid="2912837715658975248">"Álbumes"</string>
<string name="sort_by_artist" msgid="4607024967813199992">"Artistas"</string>
<string name="music_picker_title" msgid="4143865470317360605">"Seleccionar canción"</string>
- <string name="search_settings_description" msgid="6520975349259883368">"Artistas, álbumes y pistas"</string>
+ <string name="search_settings_description" msgid="6520975349259883368">"Artistas, álbumes y canciones"</string>
<string name="search_hint" msgid="3766854898072633001">"Buscar música"</string>
<string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
<string name="widget_initial_text" msgid="3166878738860903586">"Toca para seleccionar música."</string>
diff --git a/res/values-hi-keyshidden/strings.xml b/res/values-hi-keyshidden/strings.xml
index 543b984..e7e7d14 100644
--- a/res/values-hi-keyshidden/strings.xml
+++ b/res/values-hi-keyshidden/strings.xml
@@ -21,5 +21,5 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"अपनी नई प्लेलिस्ट को एक नाम देने के लिए कुंजीपटल खोलें, या इसे \"<xliff:g id="PLAYLIST">%s</xliff:g>\" नाम देने के लिए सहेजें चुनें."</string>
<string name="rename_playlist_same_prompt" msgid="7777541452078260899">"प्लेलिस्ट \"<xliff:g id="PLAYLIST">%s</xliff:g>\" को एक नया नाम देने के लिए कुंजीपटल खोलें."</string>
- <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"प्लेलिस्ट \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" को एक नया नाम देने के लिए कुंजीपटल खोलें, या इसे \"<xliff:g id="NAME">%2$s</xliff:g>\" नाम देने के लिए सहेजें का चयन करें."</string>
+ <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"प्लेलिस्ट \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" को एक नया नाम देने के लिए कुंजीपटल खोलें, या इसे \"<xliff:g id="NAME">%2$s</xliff:g>\" नाम देने के लिए सहेजें को चुनें."</string>
</resources>
