Merge "Support MediaBrowserService in AOSP Music" am: 25e17f5eb0 am: fa4067f55d
am: e152712c5f
Change-Id: I9b184b4fc5b2bc33f51cdaf810a305aaf9c89b33
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
deleted file mode 100644
index b84702d..0000000
--- a/res/values-bn/strings.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="onesong" msgid="8336826100414159413">"1 sang"</string>
- <!-- no translation found for Nsongs (6016461352893352675) -->
- <!-- no translation found for Nsongscomp (4511633526221956857) -->
- <!-- no translation found for Nalbums (7947176578850672205) -->
- <string name="goto_start" msgid="8979658707407220934">"Bibliotek"</string>
- <string name="party_shuffle" msgid="8213359225506006168">"Tilfeldig"</string>
- <string name="party_shuffle_off" msgid="1828744483354711679">"Tilfeldig av"</string>
- <string name="delete_item" msgid="3363330144534750601">"Slett"</string>
- <string name="shuffle_all" msgid="1388193611787878773">"Stokk alle"</string>
- <string name="play_all" msgid="6309622568869321842">"Spill alle"</string>
- <string name="delete_artist_desc" msgid="8665759524898379194">"Vil du slette alle sanger av <xliff:g id="ARTIST">%s</xliff:g> fra SD-kortet for godt?"</string>
- <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Vil du slette alle sanger av <xliff:g id="ARTIST">%s</xliff:g> fra USB-lagringen for godt?"</string>
- <string name="delete_album_desc" msgid="8172412873562794429">"Vil du slette hele albumet «<xliff:g id="ALBUM">%s</xliff:g>» fra SD-kortet for godt?"</string>
- <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Vil du slette hele albumet «<xliff:g id="ALBUM">%s</xliff:g>» fra USB-lagringen godt?"</string>
- <string name="delete_song_desc" msgid="1842681623848282205">"Vil du slette «<xliff:g id="SONG">%s</xliff:g>» fra SD-kortet for godt?"</string>
- <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Vil du slette «<xliff:g id="SONG">%s</xliff:g>» fra USB-lagringen for godt?"</string>
- <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
- <!-- no translation found for NNNtracksdeleted (2499334199042190643) -->
- <string name="scanning" msgid="3529383847223198502">"Søker i minnekort…"</string>
- <string name="scanning_nosdcard" msgid="8105284774487360148">"Skanner USB-lagring ..."</string>
- <string name="nowplaying_title" msgid="8342523844307751761">"Spilles nå"</string>
- <string name="partyshuffle_title" msgid="6582413231529992125">"Tilfeldig"</string>
- <string name="artists_title" msgid="8490372367259160067">"Artister"</string>
- <string name="albums_menu" msgid="5807982055590211900">"Album"</string>
- <string name="albums_title" msgid="8773880394961378035">"Album"</string>
- <string name="tracks_menu" msgid="6942246568246092330">"Sanger"</string>
- <string name="tracks_title" msgid="3229389424532295124">"Sanger"</string>
- <string name="playlists_menu" msgid="5382792649771928849">"Spillelister"</string>
- <string name="playlists_title" msgid="5094238486322957927">"Spillelister"</string>
- <string name="videos_title" msgid="2066741954354129115">"Videoer"</string>
- <string name="all_title" msgid="6880186414437237653">"Alle medier"</string>
- <string name="browse_menu" msgid="5248122473075843289">"Artister"</string>
- <string name="search_title" msgid="1016971653383739344">"Søk"</string>
- <string name="no_tracks_title" msgid="8805805388271238471">"Ingen sanger"</string>
- <string name="no_videos_title" msgid="6218814130364793104">"Ingen videoer"</string>
- <string name="no_playlists_title" msgid="4456351945617594418">"Ingen spillelister"</string>
- <string name="delete_playlist_menu" msgid="8998637685583495247">"Slett"</string>
- <string name="edit_playlist_menu" msgid="571618502105370684">"Rediger"</string>
- <string name="rename_playlist_menu" msgid="3133463747389494668">"Gi nytt navn"</string>
- <string name="playlist_deleted_message" msgid="9008053828193961455">"Spillelisten ble slettet."</string>
- <string name="playlist_renamed_message" msgid="7187580192703005990">"Spillelisten fikk nytt navn."</string>
- <string name="recentlyadded" msgid="110978416756366953">"Nylig lagt til"</string>
- <string name="recentlyadded_title" msgid="3153322287249901914">"Nylig lagt til"</string>
- <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
- <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
- <string name="sdcard_missing_title" msgid="9008284946643270850">"Mangler minnekort"</string>
- <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"Ingen USB-lagring"</string>
- <string name="sdcard_missing_message" msgid="2100061456003981823">"Telefonen har ikke SD-kort innsatt."</string>
- <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Telefonen har ikke USB-lagring."</string>
- <string name="sdcard_busy_title" msgid="1162763571147174655">"Minnekort utilgjengelig"</string>
- <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"USB-lagring utilgjengelig"</string>
- <string name="sdcard_busy_message" msgid="579981082201215537">"SD-kortet er opptatt."</string>
- <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"USB-lagringen er opptatt."</string>
- <string name="sdcard_error_title" msgid="165682155008600643">"Feil i minnekort"</string>
- <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB-lagringsfeil"</string>
- <string name="sdcard_error_message" msgid="4574563894036627855">"En feil oppsto i minnekortet."</string>
- <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"Det oppstod en feil på USB-lagringsenheten."</string>
- <string name="unknown_artist_name" msgid="5567811106415855219">"Ukjent artist"</string>
- <string name="unknown_album_name" msgid="8525145988941244727">"Ukjent album"</string>
- <string name="shuffle_on_notif" msgid="5453708337808483943">"Tilfeldig avspilling er på."</string>
- <string name="shuffle_off_notif" msgid="4251189610017886263">"Tilfeldig avspilling er av."</string>
- <string name="repeat_off_notif" msgid="1149406899083479716">"Ingen gjentagelse."</string>
- <string name="repeat_current_notif" msgid="1227153936360904196">"Gjentar denne sangen."</string>
- <string name="repeat_all_notif" msgid="6443293055987316642">"Gjentar alle sanger."</string>
- <string name="ringtone_menu" msgid="2737472190159134599">"Bruk som telefonringetone"</string>
- <string name="ringtone_menu_short" msgid="3367622038867238133">"Bruk som ringetone"</string>
- <string name="ringtone_set" msgid="5325818347613843130">"«<xliff:g id="NAME">%s</xliff:g>» valgt som telefonringetone."</string>
- <string name="play_selection" msgid="2854921021814550018">"Spill"</string>
- <string name="add_to_playlist" msgid="7110273488645072783">"Legg til spillelisten"</string>
- <string name="queue" msgid="2937629819482787704">"Gjeldende spilleliste"</string>
- <string name="new_playlist" msgid="7588112979692632867">"Ny"</string>
- <string name="new_playlist_name_template" msgid="905710296728900597">"Ny spilleliste <xliff:g id="NUMBER">%d</xliff:g>"</string>
- <!-- no translation found for NNNtrackstoplaylist (4679501954832581077) -->
- <string name="emptyplaylist" msgid="6711555673997896344">"Den valgte spillelisten er tom."</string>
- <string name="create_playlist_create_text" msgid="8149755205483279143">"Lagre"</string>
- <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Erstatt"</string>
- <string name="service_start_error_title" msgid="8649916852210198813">"Avspillingsproblem"</string>
- <string name="service_start_error_msg" msgid="7061754255330276478">"Sangen kunne ikke spilles av."</string>
- <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
- <string-array name="weeklist">
- <item msgid="7005918873419323862">"1 uke"</item>
- <item msgid="7487749116155425822">"2 uker"</item>
- <item msgid="1565338360539555185">"3 uker"</item>
- <item msgid="2142986059836933072">"4 uker"</item>
- <item msgid="4332403875260507291">"5 uker"</item>
- <item msgid="3847281907869868565">"6 uker"</item>
- <item msgid="2942654998558867799">"7 uker"</item>
- <item msgid="2115529325850052227">"8 uker"</item>
- <item msgid="1396675336665198092">"9 uker"</item>
- <item msgid="3178819129208998649">"10 uker"</item>
- <item msgid="2727959579637914171">"11 uker"</item>
- <item msgid="8708754966127584739">"12 uker"</item>
- </string-array>
- <string name="weekpicker_set" msgid="7636608790418067496">"Ferdig"</string>
- <string name="weekpicker_title" msgid="699535378922101701">"Velg tid"</string>
- <string name="save_as_playlist" msgid="5180413608901885255">"Lagre som spilleliste"</string>
- <string name="clear_playlist" msgid="4565515100924905315">"Tøm spilleliste"</string>
- <string name="musicbrowserlabel" msgid="3162022214114562892">"Musikk"</string>
- <string name="musicshortcutlabel" msgid="2602980193508150226">"Musikk-spilleliste"</string>
- <string name="mediaplaybacklabel" msgid="6733604841530940397">"Musikk"</string>
- <string name="videobrowserlabel" msgid="8522326678447494657">"Videoer"</string>
- <string name="mediapickerlabel" msgid="4549836003229914299">"Musikk"</string>
- <string name="playback_failed" msgid="3811851150820251398">"Avspilleren støtter ikke denne typen lydfil."</string>
- <string name="cancel" msgid="886559484711947520">"Avbryt"</string>
- <string name="remove_from_playlist" msgid="2548577514849026354">"Fjern fra spilleliste"</string>
- <string name="streamloadingtext" msgid="8842426517396356215">"Kobler til <xliff:g id="HOST">%s</xliff:g> …"</string>
- <string name="mediasearch" msgid="959222971261132292">"Søk etter <xliff:g id="TERM">%s</xliff:g> ved hjelp av:"</string>
- <string name="working_artists" msgid="8678357432732156580">"Artister…"</string>
- <string name="working_albums" msgid="8713273699401457426">"Album…"</string>
- <string name="working_songs" msgid="2201491972050410684">"Sanger…"</string>
- <string name="working_playlists" msgid="4424950806134653351">"Spillelister…"</string>
- <string name="loading" msgid="1991660396037155453">"Laster inn …"</string>
- <string name="sort_by_track" msgid="7662999005554152565">"Spor"</string>
- <string name="sort_by_album" msgid="2912837715658975248">"Album"</string>
- <string name="sort_by_artist" msgid="4607024967813199992">"Artister"</string>
- <string name="music_picker_title" msgid="4143865470317360605">"Velg sang"</string>
- <string name="search_settings_description" msgid="6520975349259883368">"Artister, album og spor"</string>
- <string name="search_hint" msgid="3766854898072633001">"Søk i musikk"</string>
- <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZÆØÅ"</string>
- <string name="widget_initial_text" msgid="3166878738860903586">"Trykk for å velge musikk."</string>
- <string name="effectspanel" msgid="8804547581593509614">"Lydeffekter"</string>
-</resources>
diff --git a/res/values-bn-keysexposed/strings.xml b/res/values-bs-keysexposed/strings.xml
similarity index 82%
rename from res/values-bn-keysexposed/strings.xml
rename to res/values-bs-keysexposed/strings.xml
index e26c107..385676c 100644
--- a/res/values-bn-keysexposed/strings.xml
+++ b/res/values-bs-keysexposed/strings.xml
@@ -19,7 +19,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Navn på spilleliste"</string>
- <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Endre navn på «<xliff:g id="PLAYLIST">%s</xliff:g>» til"</string>
- <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Endre navn på \"<xliff:g id="PLAYLIST">%s</xliff:g>\" til"</string>
+ <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Naziv popisa za reprodukciju"</string>
+ <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Preimenuj \"<xliff:g id="PLAYLIST">%s</xliff:g>\" u"</string>
+ <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Preimenuj \"<xliff:g id="PLAYLIST">%s</xliff:g>\" u"</string>
</resources>
diff --git a/res/values-bn-keyshidden/strings.xml b/res/values-bs-keyshidden/strings.xml
similarity index 65%
copy from res/values-bn-keyshidden/strings.xml
copy to res/values-bs-keyshidden/strings.xml
index 96f2edc..9842ce5 100644
--- a/res/values-bn-keyshidden/strings.xml
+++ b/res/values-bs-keyshidden/strings.xml
@@ -19,7 +19,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Åpne tastaturet for å gi den nye spillelisten et navn, eller velg Lagre for å gi den navnet «<xliff:g id="PLAYLIST">%s</xliff:g>»."</string>
- <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Åpne tastaturet for å gi spillelisten «<xliff:g id="PLAYLIST">%s</xliff:g>» et nytt navn."</string>
- <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Åpne tastaturet for å gi spillelisten «<xliff:g id="PLAYLIST">%1$s</xliff:g>» et nytt navn, eller velg Lagre for å gi den navnet «<xliff:g id="NAME">%2$s</xliff:g>»."</string>
+ <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Otvorite tipkovnicu da biste dali ime novom popisu za reprodukciju ili odaberite \"Spremi\" da biste mu dali ime \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+ <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Otvorite tipkovnicu da biste popisu za reprodukciju \"<xliff:g id="PLAYLIST">%s</xliff:g>\" dali novo ime."</string>
+ <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Otvorite tipkovnicu da biste popisu za reprodukciju \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" dali novo ime ili odaberite \"Spremi\" da biste mu dali ime \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
new file mode 100644
index 0000000..20be175
--- /dev/null
+++ b/res/values-bs/strings.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="onesong" msgid="8336826100414159413">"1 pjesma"</string>
+ <plurals name="Nsongs" formatted="false" msgid="6016461352893352675">
+ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> pjesma</item>
+ <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> pjesme</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pjesama</item>
+ </plurals>
+ <plurals name="Nsongscomp" formatted="false" msgid="4511633526221956857">
+ <item quantity="one"><xliff:g id="COUNT_FOR_ARTIST_2">%2$d</xliff:g> od <xliff:g id="TOTAL_COUNT_3">%1$d</xliff:g> pjesme</item>
+ <item quantity="few"><xliff:g id="COUNT_FOR_ARTIST_2">%2$d</xliff:g> od <xliff:g id="TOTAL_COUNT_3">%1$d</xliff:g> pjesme</item>
+ <item quantity="other"><xliff:g id="COUNT_FOR_ARTIST_2">%2$d</xliff:g> od <xliff:g id="TOTAL_COUNT_3">%1$d</xliff:g> pjesama</item>
+ </plurals>
+ <plurals name="Nalbums" formatted="false" msgid="7947176578850672205">
+ <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> album</item>
+ <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> albuma</item>
+ <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> albuma</item>
+ </plurals>
+ <string name="goto_start" msgid="8979658707407220934">"Knjižnica"</string>
+ <string name="party_shuffle" msgid="8213359225506006168">"Nasumična reprodukcija za zabavu"</string>
+ <string name="party_shuffle_off" msgid="1828744483354711679">"Nasumična reprodukcija za zabavu je isključena"</string>
+ <string name="delete_item" msgid="3363330144534750601">"Izbriši"</string>
+ <string name="shuffle_all" msgid="1388193611787878773">"Nasumično reproduciraj sve"</string>
+ <string name="play_all" msgid="6309622568869321842">"Reproduciraj sve"</string>
+ <string name="delete_artist_desc" msgid="8665759524898379194">"Trajno izbrisati sve pjesme izvođača <xliff:g id="ARTIST">%s</xliff:g> sa SD kartice?"</string>
+ <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Trajno izbrisati sve pjesme izvođača <xliff:g id="ARTIST">%s</xliff:g> s USB pohrane?"</string>
+ <string name="delete_album_desc" msgid="8172412873562794429">"Trajno izbrisati cijeli album \"<xliff:g id="ALBUM">%s</xliff:g>\" sa SD kartice?"</string>
+ <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Trajno izbrisati cijeli album \"<xliff:g id="ALBUM">%s</xliff:g>\" s USB pohrane?"</string>
+ <string name="delete_song_desc" msgid="1842681623848282205">"Trajno izbrisati pjesmu \"<xliff:g id="SONG">%s</xliff:g>\" sa SD kartice?"</string>
+ <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Trajno izbrisati pjesmu \"<xliff:g id="SONG">%s</xliff:g>\" s USB pohrane?"</string>
+ <string name="delete_confirm_button_text" msgid="7008121194944357274">"U redu"</string>
+ <plurals name="NNNtracksdeleted" formatted="false" msgid="2499334199042190643">
+ <item quantity="one">Izbrisana je <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> pjesma.</item>
+ <item quantity="few">Izbrisane su <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> pjesme.</item>
+ <item quantity="other">Izbrisano je <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> pjesama.</item>
+ </plurals>
+ <string name="scanning" msgid="3529383847223198502">"Skeniranje SD kartice…"</string>
+ <string name="scanning_nosdcard" msgid="8105284774487360148">"Skeniranje USB memorije…"</string>
+ <string name="nowplaying_title" msgid="8342523844307751761">"Sad se reproducira"</string>
+ <string name="partyshuffle_title" msgid="6582413231529992125">"Nasumična reprodukcija za zabavu"</string>
+ <string name="artists_title" msgid="8490372367259160067">"Izvođači"</string>
+ <string name="albums_menu" msgid="5807982055590211900">"Albumi"</string>
+ <string name="albums_title" msgid="8773880394961378035">"Albumi"</string>
+ <string name="tracks_menu" msgid="6942246568246092330">"Pjesme"</string>
+ <string name="tracks_title" msgid="3229389424532295124">"Pjesme"</string>
+ <string name="playlists_menu" msgid="5382792649771928849">"Popisi za reprodukciju"</string>
+ <string name="playlists_title" msgid="5094238486322957927">"Popisi za reprodukciju"</string>
+ <string name="videos_title" msgid="2066741954354129115">"Videozapisi"</string>
+ <string name="all_title" msgid="6880186414437237653">"Svi mediji"</string>
+ <string name="browse_menu" msgid="5248122473075843289">"Izvođači"</string>
+ <string name="search_title" msgid="1016971653383739344">"Pretraživanje"</string>
+ <string name="no_tracks_title" msgid="8805805388271238471">"Nema pjesama"</string>
+ <string name="no_videos_title" msgid="6218814130364793104">"Nema videozapisa"</string>
+ <string name="no_playlists_title" msgid="4456351945617594418">"Nema popisa za reprodukciju"</string>
+ <string name="delete_playlist_menu" msgid="8998637685583495247">"Izbriši"</string>
+ <string name="edit_playlist_menu" msgid="571618502105370684">"Uređivanje"</string>
+ <string name="rename_playlist_menu" msgid="3133463747389494668">"Preimenuj"</string>
+ <string name="playlist_deleted_message" msgid="9008053828193961455">"Popis za reprodukciju je izbrisan."</string>
+ <string name="playlist_renamed_message" msgid="7187580192703005990">"Popis pjesama preimenovan je."</string>
+ <string name="recentlyadded" msgid="110978416756366953">"Nedavno dodano"</string>
+ <string name="recentlyadded_title" msgid="3153322287249901914">"Nedavno dodano"</string>
+ <string name="podcasts_listitem" msgid="8657809279717670634">"Podcastovi"</string>
+ <string name="podcasts_title" msgid="4928414142496858304">"Podcastovi"</string>
+ <string name="sdcard_missing_title" msgid="9008284946643270850">"Nema SD kartice"</string>
+ <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"Nema USB memorije"</string>
+ <string name="sdcard_missing_message" msgid="2100061456003981823">"U telefon nije umetnuta SD kartica."</string>
+ <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Vaš telefon nema USB pohranu."</string>
+ <string name="sdcard_busy_title" msgid="1162763571147174655">"SD kartica nije dostupna"</string>
+ <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"USB memorija je nedostupna"</string>
+ <string name="sdcard_busy_message" msgid="579981082201215537">"Vaša je SD kartica zauzeta."</string>
+ <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"Vaša je USB pohrana zauzeta."</string>
+ <string name="sdcard_error_title" msgid="165682155008600643">"Pogreška na SD kartici"</string>
+ <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"Pogreška USB memorije"</string>
+ <string name="sdcard_error_message" msgid="4574563894036627855">"Došlo je do pogreške na SD kartici."</string>
+ <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"Došlo je do pogreške u USB memoriji."</string>
+ <string name="unknown_artist_name" msgid="5567811106415855219">"Nepoznati autor"</string>
+ <string name="unknown_album_name" msgid="8525145988941244727">"Nepoznati album"</string>
+ <string name="shuffle_on_notif" msgid="5453708337808483943">"Nasumična reprodukcija je uključena."</string>
+ <string name="shuffle_off_notif" msgid="4251189610017886263">"Nasumična reprodukcija je isključena."</string>
+ <string name="repeat_off_notif" msgid="1149406899083479716">"Ponavljanje je isključeno."</string>
+ <string name="repeat_current_notif" msgid="1227153936360904196">"Ponavljanje trenutne pjesme."</string>
+ <string name="repeat_all_notif" msgid="6443293055987316642">"Ponavljanje svih pjesama."</string>
+ <string name="ringtone_menu" msgid="2737472190159134599">"Koristi kao zvuk zvona telefona"</string>
+ <string name="ringtone_menu_short" msgid="3367622038867238133">"Koristi kao zvuk zvona"</string>
+ <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" postavi kao zvuk zvona telefona."</string>
+ <string name="play_selection" msgid="2854921021814550018">"Reproduciraj"</string>
+ <string name="add_to_playlist" msgid="7110273488645072783">"Dodaj na popis pjesama"</string>
+ <string name="queue" msgid="2937629819482787704">"Aktualni popis za reprodukciju"</string>
+ <string name="new_playlist" msgid="7588112979692632867">"Novo"</string>
+ <string name="new_playlist_name_template" msgid="905710296728900597">"Novi popis pjesama <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <plurals name="NNNtrackstoplaylist" formatted="false" msgid="4679501954832581077">
+ <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> pjesma dodana je na popis.</item>
+ <item quantity="few"><xliff:g id="NUMBER">%d</xliff:g> pjesme dodane su na popis.</item>
+ <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> pjesama dodano je na popis.</item>
+ </plurals>
+ <string name="emptyplaylist" msgid="6711555673997896344">"Odabrani popis pjesama je prazan."</string>
+ <string name="create_playlist_create_text" msgid="8149755205483279143">"Spremi"</string>
+ <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Presnimi"</string>
+ <string name="service_start_error_title" msgid="8649916852210198813">"Problem s reprodukcijom"</string>
+ <string name="service_start_error_msg" msgid="7061754255330276478">"Pjesma se nije mogla reproducirati."</string>
+ <string name="service_start_error_button" msgid="480888406592240723">"U redu"</string>
+ <string-array name="weeklist">
+ <item msgid="7005918873419323862">"1 tjedan"</item>
+ <item msgid="7487749116155425822">"2 tjedna"</item>
+ <item msgid="1565338360539555185">"3 tjedna"</item>
+ <item msgid="2142986059836933072">"4 tjedna"</item>
+ <item msgid="4332403875260507291">"5 tjedana"</item>
+ <item msgid="3847281907869868565">"6 tjedana"</item>
+ <item msgid="2942654998558867799">"7 tjedana"</item>
+ <item msgid="2115529325850052227">"8 tjedana"</item>
+ <item msgid="1396675336665198092">"9 tjedana"</item>
+ <item msgid="3178819129208998649">"10 tjedana"</item>
+ <item msgid="2727959579637914171">"11 tjedana"</item>
+ <item msgid="8708754966127584739">"12 tjedana"</item>
+ </string-array>
+ <string name="weekpicker_set" msgid="7636608790418067496">"Gotovo"</string>
+ <string name="weekpicker_title" msgid="699535378922101701">"Postavljanje vremena"</string>
+ <string name="save_as_playlist" msgid="5180413608901885255">"Spremi kao popis pjesama"</string>
+ <string name="clear_playlist" msgid="4565515100924905315">"Očisti popis za reprodukciju"</string>
+ <string name="musicbrowserlabel" msgid="3162022214114562892">"Glazba"</string>
+ <string name="musicshortcutlabel" msgid="2602980193508150226">"Popis za reprodukciju glazbe"</string>
+ <string name="mediaplaybacklabel" msgid="6733604841530940397">"Glazba"</string>
+ <string name="videobrowserlabel" msgid="8522326678447494657">"Videozapisi"</string>
+ <string name="mediapickerlabel" msgid="4549836003229914299">"Glazba"</string>
+ <string name="playback_failed" msgid="3811851150820251398">"Player ne podržava ovu vrstu audiodatoteka."</string>
+ <string name="cancel" msgid="886559484711947520">"Odustani"</string>
+ <string name="remove_from_playlist" msgid="2548577514849026354">"Ukloni s popisa pjesama"</string>
+ <string name="streamloadingtext" msgid="8842426517396356215">"Povezivanje s hostom <xliff:g id="HOST">%s</xliff:g>…"</string>
+ <string name="mediasearch" msgid="959222971261132292">"Traži pojam \"<xliff:g id="TERM">%s</xliff:g>\" koristeći:"</string>
+ <string name="working_artists" msgid="8678357432732156580">"Izvođači..."</string>
+ <string name="working_albums" msgid="8713273699401457426">"Albumi…"</string>
+ <string name="working_songs" msgid="2201491972050410684">"Pjesme..."</string>
+ <string name="working_playlists" msgid="4424950806134653351">"Popisi za reprodukciju…"</string>
+ <string name="loading" msgid="1991660396037155453">"Učitavanje…"</string>
+ <string name="sort_by_track" msgid="7662999005554152565">"Zapisi"</string>
+ <string name="sort_by_album" msgid="2912837715658975248">"Albumi"</string>
+ <string name="sort_by_artist" msgid="4607024967813199992">"Izvođači"</string>
+ <string name="music_picker_title" msgid="4143865470317360605">"Odaberite glazbeni zapis"</string>
+ <string name="search_settings_description" msgid="6520975349259883368">"Izvođači, albumi i zapisi"</string>
+ <string name="search_hint" msgid="3766854898072633001">"Pretraživanje glazbe"</string>
+ <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+ <string name="widget_initial_text" msgid="3166878738860903586">"Dodirnite da biste odabrali glazbu."</string>
+ <string name="effectspanel" msgid="8804547581593509614">"Zvučni efekti"</string>
+</resources>
diff --git a/res/values-bn-keysexposed/strings.xml b/res/values-bs/strings2.xml
similarity index 66%
copy from res/values-bn-keysexposed/strings.xml
copy to res/values-bs/strings2.xml
index e26c107..4393d0e 100644
--- a/res/values-bn-keysexposed/strings.xml
+++ b/res/values-bs/strings2.xml
@@ -19,7 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Navn på spilleliste"</string>
- <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Endre navn på «<xliff:g id="PLAYLIST">%s</xliff:g>» til"</string>
- <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Endre navn på \"<xliff:g id="PLAYLIST">%s</xliff:g>\" til"</string>
+ <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 967859a..fc32cce 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -38,12 +38,12 @@
<string name="delete_item" msgid="3363330144534750601">"Suprimeix"</string>
<string name="shuffle_all" msgid="1388193611787878773">"Reprodueix aleatòriament"</string>
<string name="play_all" msgid="6309622568869321842">"Reprodueix-ho tot"</string>
- <string name="delete_artist_desc" msgid="8665759524898379194">"Vols suprimir totes les cançons de <xliff:g id="ARTIST">%s</xliff:g> de la targeta SD de manera permanent?"</string>
- <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Vols suprimir totes les cançons de <xliff:g id="ARTIST">%s</xliff:g> de l\'emmagatzematge USB de manera permanent?"</string>
- <string name="delete_album_desc" msgid="8172412873562794429">"Vols suprimir l\'àlbum complet \"<xliff:g id="ALBUM">%s</xliff:g>\" de la targeta SD de manera permanent?"</string>
- <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Vols suprimir l\'àlbum complet \"<xliff:g id="ALBUM">%s</xliff:g>\" de l\'emmagatzematge USB de manera permanent?"</string>
- <string name="delete_song_desc" msgid="1842681623848282205">"Vols suprimir \"<xliff:g id="SONG">%s</xliff:g>\" de la targeta SD de manera permanent?"</string>
- <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Vols suprimir \"<xliff:g id="SONG">%s</xliff:g>\" de l\'emmagatzematge USB de manera permanent?"</string>
+ <string name="delete_artist_desc" msgid="8665759524898379194">"Vols suprimir totes les cançons de <xliff:g id="ARTIST">%s</xliff:g> de la targeta SD permanentment?"</string>
+ <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Vols suprimir totes les cançons de <xliff:g id="ARTIST">%s</xliff:g> de l\'emmagatzematge USB permanentment?"</string>
+ <string name="delete_album_desc" msgid="8172412873562794429">"Vols suprimir l\'àlbum complet \"<xliff:g id="ALBUM">%s</xliff:g>\" de la targeta SD permanentment?"</string>
+ <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Vols suprimir l\'àlbum complet \"<xliff:g id="ALBUM">%s</xliff:g>\" de l\'emmagatzematge USB permanentment?"</string>
+ <string name="delete_song_desc" msgid="1842681623848282205">"Vols suprimir \"<xliff:g id="SONG">%s</xliff:g>\" de la targeta SD permanentment?"</string>
+ <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Vols suprimir \"<xliff:g id="SONG">%s</xliff:g>\" de l\'emmagatzematge USB permanentment?"</string>
<string name="delete_confirm_button_text" msgid="7008121194944357274">"D\'acord"</string>
<plurals name="NNNtracksdeleted" formatted="false" msgid="2499334199042190643">
<item quantity="other">S\'han suprimit <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> cançons.</item>
diff --git a/res/values-bn-keysexposed/strings.xml b/res/values-en-rCA-keysexposed/strings.xml
similarity index 82%
copy from res/values-bn-keysexposed/strings.xml
copy to res/values-en-rCA-keysexposed/strings.xml
index e26c107..914b59f 100644
--- a/res/values-bn-keysexposed/strings.xml
+++ b/res/values-en-rCA-keysexposed/strings.xml
@@ -19,7 +19,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Navn på spilleliste"</string>
- <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Endre navn på «<xliff:g id="PLAYLIST">%s</xliff:g>» til"</string>
- <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Endre navn på \"<xliff:g id="PLAYLIST">%s</xliff:g>\" til"</string>
+ <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Playlist name"</string>
+ <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Rename \"<xliff:g id="PLAYLIST">%s</xliff:g>\" to"</string>
+ <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Rename \"<xliff:g id="PLAYLIST">%s</xliff:g>\" to"</string>
</resources>
diff --git a/res/values-bn-keyshidden/strings.xml b/res/values-en-rCA-keyshidden/strings.xml
similarity index 67%
rename from res/values-bn-keyshidden/strings.xml
rename to res/values-en-rCA-keyshidden/strings.xml
index 96f2edc..46a835a 100644
--- a/res/values-bn-keyshidden/strings.xml
+++ b/res/values-en-rCA-keyshidden/strings.xml
@@ -19,7 +19,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Åpne tastaturet for å gi den nye spillelisten et navn, eller velg Lagre for å gi den navnet «<xliff:g id="PLAYLIST">%s</xliff:g>»."</string>
- <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Åpne tastaturet for å gi spillelisten «<xliff:g id="PLAYLIST">%s</xliff:g>» et nytt navn."</string>
- <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Åpne tastaturet for å gi spillelisten «<xliff:g id="PLAYLIST">%1$s</xliff:g>» et nytt navn, eller velg Lagre for å gi den navnet «<xliff:g id="NAME">%2$s</xliff:g>»."</string>
+ <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Open the keyboard to give your new Playlist a name or select Save to name it \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+ <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Open the keyboard to give playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" a new name."</string>
+ <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Open the keyboard to give playlist \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" a new name or select Save to name it \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..66b7a23
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="onesong" msgid="8336826100414159413">"1 song"</string>
+ <plurals name="Nsongs" formatted="false" msgid="6016461352893352675">
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> songs</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> song</item>
+ </plurals>
+ <plurals name="Nsongscomp" formatted="false" msgid="4511633526221956857">
+ <item quantity="other"><xliff:g id="COUNT_FOR_ARTIST_2">%2$d</xliff:g> of <xliff:g id="TOTAL_COUNT_3">%1$d</xliff:g> songs</item>
+ <item quantity="one"><xliff:g id="COUNT_FOR_ARTIST_0">%2$d</xliff:g> of <xliff:g id="TOTAL_COUNT_1">%1$d</xliff:g> song</item>
+ </plurals>
+ <plurals name="Nalbums" formatted="false" msgid="7947176578850672205">
+ <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> albums</item>
+ <item quantity="one">1 album</item>
+ </plurals>
+ <string name="goto_start" msgid="8979658707407220934">"Library"</string>
+ <string name="party_shuffle" msgid="8213359225506006168">"Party shuffle"</string>
+ <string name="party_shuffle_off" msgid="1828744483354711679">"Party shuffle off"</string>
+ <string name="delete_item" msgid="3363330144534750601">"Delete"</string>
+ <string name="shuffle_all" msgid="1388193611787878773">"Shuffle all"</string>
+ <string name="play_all" msgid="6309622568869321842">"Play all"</string>
+ <string name="delete_artist_desc" msgid="8665759524898379194">"Permanently delete all songs by <xliff:g id="ARTIST">%s</xliff:g> from the SD card?"</string>
+ <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Permanently delete all songs by <xliff:g id="ARTIST">%s</xliff:g> from USB storage?"</string>
+ <string name="delete_album_desc" msgid="8172412873562794429">"Permanently delete the entire album \"<xliff:g id="ALBUM">%s</xliff:g>\" from the SD card?"</string>
+ <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Permanently delete the entire album \"<xliff:g id="ALBUM">%s</xliff:g>\" from USB storage?"</string>
+ <string name="delete_song_desc" msgid="1842681623848282205">"Permanently delete \"<xliff:g id="SONG">%s</xliff:g>\" from the SD card?"</string>
+ <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Permanently delete \"<xliff:g id="SONG">%s</xliff:g>\" from USB storage?"</string>
+ <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+ <plurals name="NNNtracksdeleted" formatted="false" msgid="2499334199042190643">
+ <item quantity="other"><xliff:g id="SONGS_TO_DELETE">%d</xliff:g> songs were deleted.</item>
+ <item quantity="one">1 song was deleted.</item>
+ </plurals>
+ <string name="scanning" msgid="3529383847223198502">"Scanning SD card…"</string>
+ <string name="scanning_nosdcard" msgid="8105284774487360148">"Scanning USB storage…"</string>
+ <string name="nowplaying_title" msgid="8342523844307751761">"Now playing"</string>
+ <string name="partyshuffle_title" msgid="6582413231529992125">"Party shuffle"</string>
+ <string name="artists_title" msgid="8490372367259160067">"Artists"</string>
+ <string name="albums_menu" msgid="5807982055590211900">"Albums"</string>
+ <string name="albums_title" msgid="8773880394961378035">"Albums"</string>
+ <string name="tracks_menu" msgid="6942246568246092330">"Songs"</string>
+ <string name="tracks_title" msgid="3229389424532295124">"Songs"</string>
+ <string name="playlists_menu" msgid="5382792649771928849">"Playlists"</string>
+ <string name="playlists_title" msgid="5094238486322957927">"Playlists"</string>
+ <string name="videos_title" msgid="2066741954354129115">"Videos"</string>
+ <string name="all_title" msgid="6880186414437237653">"All media"</string>
+ <string name="browse_menu" msgid="5248122473075843289">"Artists"</string>
+ <string name="search_title" msgid="1016971653383739344">"Search"</string>
+ <string name="no_tracks_title" msgid="8805805388271238471">"No songs"</string>
+ <string name="no_videos_title" msgid="6218814130364793104">"No videos"</string>
+ <string name="no_playlists_title" msgid="4456351945617594418">"No playlists"</string>
+ <string name="delete_playlist_menu" msgid="8998637685583495247">"Delete"</string>
+ <string name="edit_playlist_menu" msgid="571618502105370684">"Edit"</string>
+ <string name="rename_playlist_menu" msgid="3133463747389494668">"Rename"</string>
+ <string name="playlist_deleted_message" msgid="9008053828193961455">"Playlist deleted."</string>
+ <string name="playlist_renamed_message" msgid="7187580192703005990">"Playlist renamed."</string>
+ <string name="recentlyadded" msgid="110978416756366953">"Recently added"</string>
+ <string name="recentlyadded_title" msgid="3153322287249901914">"Recently added"</string>
+ <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
+ <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
+ <string name="sdcard_missing_title" msgid="9008284946643270850">"No SD card"</string>
+ <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"No USB storage"</string>
+ <string name="sdcard_missing_message" msgid="2100061456003981823">"Your phone doesn\'t have an SD card inserted."</string>
+ <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Your phone doesn\'t have USB storage."</string>
+ <string name="sdcard_busy_title" msgid="1162763571147174655">"SD card unavailable"</string>
+ <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"USB storage unavailable"</string>
+ <string name="sdcard_busy_message" msgid="579981082201215537">"Your SD card is busy."</string>
+ <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"Your USB storage is busy."</string>
+ <string name="sdcard_error_title" msgid="165682155008600643">"SD card error"</string>
+ <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB storage error"</string>
+ <string name="sdcard_error_message" msgid="4574563894036627855">"An error was encountered on your SD card."</string>
+ <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"An error was encountered on your USB storage."</string>
+ <string name="unknown_artist_name" msgid="5567811106415855219">"Unknown artist"</string>
+ <string name="unknown_album_name" msgid="8525145988941244727">"Unknown album"</string>
+ <string name="shuffle_on_notif" msgid="5453708337808483943">"Shuffle is on."</string>
+ <string name="shuffle_off_notif" msgid="4251189610017886263">"Shuffle is off."</string>
+ <string name="repeat_off_notif" msgid="1149406899083479716">"Repeat is off."</string>
+ <string name="repeat_current_notif" msgid="1227153936360904196">"Repeating current song."</string>
+ <string name="repeat_all_notif" msgid="6443293055987316642">"Repeating all songs."</string>
+ <string name="ringtone_menu" msgid="2737472190159134599">"Use as phone ringtone"</string>
+ <string name="ringtone_menu_short" msgid="3367622038867238133">"Use as ringtone"</string>
+ <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" set as phone ringtone."</string>
+ <string name="play_selection" msgid="2854921021814550018">"Play"</string>
+ <string name="add_to_playlist" msgid="7110273488645072783">"Add to playlist"</string>
+ <string name="queue" msgid="2937629819482787704">"Current playlist"</string>
+ <string name="new_playlist" msgid="7588112979692632867">"New"</string>
+ <string name="new_playlist_name_template" msgid="905710296728900597">"New playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
+ <plurals name="NNNtrackstoplaylist" formatted="false" msgid="4679501954832581077">
+ <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> songs added to playlist.</item>
+ <item quantity="one">1 song added to playlist.</item>
+ </plurals>
+ <string name="emptyplaylist" msgid="6711555673997896344">"Selected playlist is empty."</string>
+ <string name="create_playlist_create_text" msgid="8149755205483279143">"Save"</string>
+ <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Overwrite"</string>
+ <string name="service_start_error_title" msgid="8649916852210198813">"Playback problem"</string>
+ <string name="service_start_error_msg" msgid="7061754255330276478">"The song couldn\'t be played."</string>
+ <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+ <string-array name="weeklist">
+ <item msgid="7005918873419323862">"1 week"</item>
+ <item msgid="7487749116155425822">"2 weeks"</item>
+ <item msgid="1565338360539555185">"3 weeks"</item>
+ <item msgid="2142986059836933072">"4 weeks"</item>
+ <item msgid="4332403875260507291">"5 weeks"</item>
+ <item msgid="3847281907869868565">"6 weeks"</item>
+ <item msgid="2942654998558867799">"7 weeks"</item>
+ <item msgid="2115529325850052227">"8 weeks"</item>
+ <item msgid="1396675336665198092">"9 weeks"</item>
+ <item msgid="3178819129208998649">"10 weeks"</item>
+ <item msgid="2727959579637914171">"11 weeks"</item>
+ <item msgid="8708754966127584739">"12 weeks"</item>
+ </string-array>
+ <string name="weekpicker_set" msgid="7636608790418067496">"Done"</string>
+ <string name="weekpicker_title" msgid="699535378922101701">"Set time"</string>
+ <string name="save_as_playlist" msgid="5180413608901885255">"Save as playlist"</string>
+ <string name="clear_playlist" msgid="4565515100924905315">"Clear playlist"</string>
+ <string name="musicbrowserlabel" msgid="3162022214114562892">"Music"</string>
+ <string name="musicshortcutlabel" msgid="2602980193508150226">"Music playlist"</string>
+ <string name="mediaplaybacklabel" msgid="6733604841530940397">"Music"</string>
+ <string name="videobrowserlabel" msgid="8522326678447494657">"Videos"</string>
+ <string name="mediapickerlabel" msgid="4549836003229914299">"Music"</string>
+ <string name="playback_failed" msgid="3811851150820251398">"The player doesn\'t support this type of audio file."</string>
+ <string name="cancel" msgid="886559484711947520">"Cancel"</string>
+ <string name="remove_from_playlist" msgid="2548577514849026354">"Remove from playlist"</string>
+ <string name="streamloadingtext" msgid="8842426517396356215">"Connecting to <xliff:g id="HOST">%s</xliff:g>…"</string>
+ <string name="mediasearch" msgid="959222971261132292">"Search for <xliff:g id="TERM">%s</xliff:g>, using:"</string>
+ <string name="working_artists" msgid="8678357432732156580">"Artists…"</string>
+ <string name="working_albums" msgid="8713273699401457426">"Albums…"</string>
+ <string name="working_songs" msgid="2201491972050410684">"Songs…"</string>
+ <string name="working_playlists" msgid="4424950806134653351">"Playlists…"</string>
+ <string name="loading" msgid="1991660396037155453">"Loading…"</string>
+ <string name="sort_by_track" msgid="7662999005554152565">"Tracks"</string>
+ <string name="sort_by_album" msgid="2912837715658975248">"Albums"</string>
+ <string name="sort_by_artist" msgid="4607024967813199992">"Artists"</string>
+ <string name="music_picker_title" msgid="4143865470317360605">"Choose music track"</string>
+ <string name="search_settings_description" msgid="6520975349259883368">"Artists, albums and tracks"</string>
+ <string name="search_hint" msgid="3766854898072633001">"Search Music"</string>
+ <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+ <string name="widget_initial_text" msgid="3166878738860903586">"Touch to choose music."</string>
+ <string name="effectspanel" msgid="8804547581593509614">"Sound effects"</string>
+</resources>
diff --git a/res/values-bn-keysexposed/strings.xml b/res/values-en-rCA/strings2.xml
similarity index 66%
copy from res/values-bn-keysexposed/strings.xml
copy to res/values-en-rCA/strings2.xml
index e26c107..4393d0e 100644
--- a/res/values-bn-keysexposed/strings.xml
+++ b/res/values-en-rCA/strings2.xml
@@ -19,7 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Navn på spilleliste"</string>
- <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Endre navn på «<xliff:g id="PLAYLIST">%s</xliff:g>» til"</string>
- <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Endre navn på \"<xliff:g id="PLAYLIST">%s</xliff:g>\" til"</string>
+ <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 768d40a..4ce5cc7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -21,15 +21,15 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="onesong" msgid="8336826100414159413">"1 música"</string>
<plurals name="Nsongs" formatted="false" msgid="6016461352893352675">
- <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> songs</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> música</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> músicas</item>
</plurals>
<plurals name="Nsongscomp" formatted="false" msgid="4511633526221956857">
- <item quantity="one"><xliff:g id="COUNT_FOR_ARTIST_2">%2$d</xliff:g> of <xliff:g id="TOTAL_COUNT_3">%1$d</xliff:g> songs</item>
+ <item quantity="one"><xliff:g id="COUNT_FOR_ARTIST_0">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT_1">%1$d</xliff:g> música</item>
<item quantity="other"><xliff:g id="COUNT_FOR_ARTIST_2">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT_3">%1$d</xliff:g> músicas</item>
</plurals>
<plurals name="Nalbums" formatted="false" msgid="7947176578850672205">
- <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> albums</item>
+ <item quantity="one">1 álbum</item>
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> álbuns</item>
</plurals>
<string name="goto_start" msgid="8979658707407220934">"Biblioteca"</string>
@@ -46,7 +46,7 @@
<string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Eliminar permanentemente \"<xliff:g id="SONG">%s</xliff:g>\" da memória de armazenamento USB?"</string>
<string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
<plurals name="NNNtracksdeleted" formatted="false" msgid="2499334199042190643">
- <item quantity="one"><xliff:g id="SONGS_TO_DELETE">%d</xliff:g> songs were deleted.</item>
+ <item quantity="one">Foi eliminada 1 música.</item>
<item quantity="other">Foram eliminadas <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> músicas.</item>
</plurals>
<string name="scanning" msgid="3529383847223198502">"A analisar o cartão SD..."</string>
@@ -104,7 +104,7 @@
<string name="new_playlist" msgid="7588112979692632867">"Novo"</string>
<string name="new_playlist_name_template" msgid="905710296728900597">"Nova lista de reprodução <xliff:g id="NUMBER">%d</xliff:g>"</string>
<plurals name="NNNtrackstoplaylist" formatted="false" msgid="4679501954832581077">
- <item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> songs added to playlist.</item>
+ <item quantity="one">1 música adicionada à lista de reprodução.</item>
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> músicas adicionadas à lista de reprodução.</item>
</plurals>
<string name="emptyplaylist" msgid="6711555673997896344">"A lista de reprodução selecionada está vazia."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 99d0706..459d549 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -61,7 +61,7 @@
<string name="playlists_menu" msgid="5382792649771928849">"Orodha za kucheza"</string>
<string name="playlists_title" msgid="5094238486322957927">"Orodha za kucheza"</string>
<string name="videos_title" msgid="2066741954354129115">"Video"</string>
- <string name="all_title" msgid="6880186414437237653">"Midia zote"</string>
+ <string name="all_title" msgid="6880186414437237653">"Maudhui yote"</string>
<string name="browse_menu" msgid="5248122473075843289">"Wasanii"</string>
<string name="search_title" msgid="1016971653383739344">"Tafuta"</string>
<string name="no_tracks_title" msgid="8805805388271238471">"Hakuna nyimbo"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 04b25c6..c5b51da 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -49,8 +49,8 @@
<item quantity="other">已刪除 <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> 首歌曲。</item>
<item quantity="one">已刪除 1 首歌曲。</item>
</plurals>
- <string name="scanning" msgid="3529383847223198502">"正在掃瞄 SD 卡..."</string>
- <string name="scanning_nosdcard" msgid="8105284774487360148">"正在掃瞄 USB 儲存裝置..."</string>
+ <string name="scanning" msgid="3529383847223198502">"正在掃描 SD 卡..."</string>
+ <string name="scanning_nosdcard" msgid="8105284774487360148">"正在掃描 USB 儲存裝置..."</string>
<string name="nowplaying_title" msgid="8342523844307751761">"現正播放"</string>
<string name="partyshuffle_title" msgid="6582413231529992125">"派對隨機播放"</string>
<string name="artists_title" msgid="8490372367259160067">"歌手/創作人"</string>