Import translations. DO NOT MERGEandroid-sdk-adt_r20android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1tools_r20ics-plus-aospics-mr1-releaseics-mr1

Change-Id: Ib4f613cc881ad148151cd29776f652f356873b6c

4 files changed, 29 insertions, 29 deletions

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 715526f..195dc00 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -149,7 +149,7 @@
     <string name="sort_by_artist" msgid="4607024967813199992">"Interpreten"</string>
     <string name="music_picker_title" msgid="1561623486324013570">"Musiktrack auswählen"</string>
     <string name="search_settings_description" msgid="6520975349259883368">"Interpreten, Alben und Tracks"</string>
-    <string name="search_hint" msgid="3766854898072633001">"Musik durchsuchen"</string>
+    <string name="search_hint" msgid="3766854898072633001">"In Musik suchen"</string>
     <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
     <string name="widget_initial_text" msgid="6334545155963910952">"Musik auswählen"</string>
     <string name="effectspanel" msgid="8804547581593509614">"Toneffekte"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 365072e..b445b6e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -34,7 +34,7 @@
     <string name="party_shuffle" msgid="8213359225506006168">"Party shuffle"</string>
     <string name="party_shuffle_off" msgid="1828744483354711679">"Party shuffle desactivado"</string>
     <string name="delete_item" msgid="3363330144534750601">"Eliminar"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Arrastrar todo"</string>
+    <string name="shuffle_all" msgid="1388193611787878773">"Aleatorio"</string>
     <string name="play_all" msgid="6309622568869321842">"Reproducir todo"</string>
     <string name="delete_artist_desc" msgid="1843750591006508005">"Todas las canciones de <xliff:g id="ARTIST">%s</xliff:g> se eliminarán definitivamente de la tarjeta SD."</string>
     <string name="delete_artist_desc_nosdcard" msgid="1565010405469696133">"Todas las canciones de <xliff:g id="ARTIST">%s</xliff:g> se eliminarán permanentemente del almacenamiento USB."</string>
@@ -88,11 +88,11 @@
     <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"Se encontró un error en tu almacenamiento USB."</string>
     <string name="unknown_artist_name" msgid="5567811106415855219">"Artista desconocido"</string>
     <string name="unknown_album_name" msgid="8525145988941244727">"Álbum desconocido"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"El shuffle está activado."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"El shuffle está desactivado."</string>
+    <string name="shuffle_on_notif" msgid="5453708337808483943">"La reproducción aleatoria está activada."</string>
+    <string name="shuffle_off_notif" msgid="4251189610017886263">"La reproducción aleatoria está desactivada."</string>
     <string name="repeat_off_notif" msgid="1149406899083479716">"Repetir está desactivado."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Repitiendo canción actual."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Repitiendo todas las canciones."</string>
+    <string name="repeat_current_notif" msgid="1227153936360904196">"Repetir una vez."</string>
+    <string name="repeat_all_notif" msgid="6443293055987316642">"Repetir todo."</string>
     <string name="ringtone_menu" msgid="2737472190159134599">"Usar como tono de timbre del teléfono"</string>
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Usar como tono de timbre"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" definidos como tono de timbre del teléfono."</string>
@@ -128,7 +128,7 @@
     <string name="weekpicker_set" msgid="7636608790418067496">"Finalizado"</string>
     <string name="weekpicker_title" msgid="699535378922101701">"Establecer hora"</string>
     <string name="save_as_playlist" msgid="5180413608901885255">"Guardar como lista de reproducción"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Borrar lista de reproducción"</string>
+    <string name="clear_playlist" msgid="4565515100924905315">"Eliminar lista de reproducción"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"Música"</string>
     <string name="musicshortcutlabel" msgid="2602980193508150226">"Lista de reproducción de música"</string>
     <string name="mediaplaybacklabel" msgid="6733604841530940397">"Música"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9452281..0d317ea 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -21,10 +21,10 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="onesong" msgid="8336826100414159413">"1 трек"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"Композиций: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="5798230388116542981">"Треков: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> из <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> песен"</item>
+    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> из <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> треков"</item>
   </plurals>
   <plurals name="Nalbums">
     <item quantity="one" msgid="3798955510439465932">"1 альбом"</item>
@@ -36,16 +36,16 @@
     <string name="delete_item" msgid="3363330144534750601">"Удалить"</string>
     <string name="shuffle_all" msgid="1388193611787878773">"Перемешать все"</string>
     <string name="play_all" msgid="6309622568869321842">"Воспроизвести все"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Все композиции исполнителя <xliff:g id="ARTIST">%s</xliff:g> будут навсегда удалены с SD-карты."</string>
-    <string name="delete_artist_desc_nosdcard" msgid="1565010405469696133">"Все композиции исполнителя <xliff:g id="ARTIST">%s</xliff:g> будут удалены с USB-накопителя."</string>
+    <string name="delete_artist_desc" msgid="1843750591006508005">"Все треки исполнителя <xliff:g id="ARTIST">%s</xliff:g> будут навсегда удалены с SD-карты."</string>
+    <string name="delete_artist_desc_nosdcard" msgid="1565010405469696133">"Все треки исполнителя <xliff:g id="ARTIST">%s</xliff:g> будут удалены с USB-накопителя."</string>
     <string name="delete_album_desc" msgid="535515999268177079">"Весь альбом \"<xliff:g id="ALBUM">%s</xliff:g>\" будет навсегда удален с SD-карты."</string>
     <string name="delete_album_desc_nosdcard" msgid="2739690641188691896">"Весь альбом \"<xliff:g id="ALBUM">%s</xliff:g>\" будет окончательно удален с USB-накопителя."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"Композиция \"<xliff:g id="SONG">%s</xliff:g>\" будет навсегда удалена с SD-карты."</string>
-    <string name="delete_song_desc_nosdcard" msgid="2722621774200478721">"Композиция \"<xliff:g id="SONG">%s</xliff:g>\" будет окончательно удалена с USB-накопителя."</string>
+    <string name="delete_song_desc" msgid="1856800468541831408">"Трек \"<xliff:g id="SONG">%s</xliff:g>\" будет навсегда удален с SD-карты."</string>
+    <string name="delete_song_desc_nosdcard" msgid="2722621774200478721">"Трек \"<xliff:g id="SONG">%s</xliff:g>\" будет навсегда удален с USB-накопителя."</string>
     <string name="delete_confirm_button_text" msgid="7008121194944357274">"ОК"</string>
   <plurals name="NNNtracksdeleted">
     <item quantity="one" msgid="8560276109508404217">"1 трек удален"</item>
-    <item quantity="other" msgid="5156740163031225200">"Удалено композиций: <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>."</item>
+    <item quantity="other" msgid="5156740163031225200">"Удалено треков: <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>."</item>
   </plurals>
     <string name="scanning" msgid="3529383847223198502">"Сканирование SD-карты…"</string>
     <string name="scanning_nosdcard" msgid="8105284774487360148">"Сканирование USB-накопителя..."</string>
@@ -62,7 +62,7 @@
     <string name="all_title" msgid="6880186414437237653">"Все типы"</string>
     <string name="browse_menu" msgid="5248122473075843289">"Исполнители"</string>
     <string name="search_title" msgid="1016971653383739344">"Поиск"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Нет композиций"</string>
+    <string name="no_tracks_title" msgid="8805805388271238471">"Нет треков"</string>
     <string name="no_videos_title" msgid="6218814130364793104">"Видео отсутствует"</string>
     <string name="no_playlists_title" msgid="4456351945617594418">"Нет плейлистов."</string>
     <string name="delete_playlist_menu" msgid="8998637685583495247">"Удалить"</string>
@@ -92,10 +92,10 @@
     <string name="shuffle_off_notif" msgid="4251189610017886263">"Режим случайного воспроизведения отключен."</string>
     <string name="repeat_off_notif" msgid="1149406899083479716">"Режим повторного воспроизведения отключен."</string>
     <string name="repeat_current_notif" msgid="1227153936360904196">"Включен повтор текущего трека"</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Включен повтор всех композиций"</string>
+    <string name="repeat_all_notif" msgid="6443293055987316642">"Включен повтор всех треков"</string>
     <string name="ringtone_menu" msgid="2737472190159134599">"Поставить на звонок"</string>
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Поставить на звонок"</string>
-    <string name="ringtone_set" msgid="5325818347613843130">"Композиция \"<xliff:g id="NAME">%s</xliff:g>\" установлена в качестве мелодии звонка."</string>
+    <string name="ringtone_set" msgid="5325818347613843130">"Трек \"<xliff:g id="NAME">%s</xliff:g>\" поставлен на звонок."</string>
     <string name="play_selection" msgid="2854921021814550018">"Воспроизвести"</string>
     <string name="add_to_playlist" msgid="7110273488645072783">"Добавить в плейлист"</string>
     <string name="queue" msgid="2937629819482787704">"Текущий плейлист"</string>
@@ -103,7 +103,7 @@
     <string name="new_playlist_name_template" msgid="905710296728900597">"Новый плейлист <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one" msgid="422388042993582235">"1 трек добавлен в плейлист."</item>
-    <item quantity="other" msgid="7662771987109627255">"Композиций, добавленных в плейлист: <xliff:g id="NUMBER">%d</xliff:g>"</item>
+    <item quantity="other" msgid="7662771987109627255">"Треков, добавленных в плейлист: <xliff:g id="NUMBER">%d</xliff:g>"</item>
   </plurals>
     <string name="emptyplaylist" msgid="6711555673997896344">"Выбранный плейлист пуст."</string>
     <string name="create_playlist_create_text" msgid="8149755205483279143">"Сохранить"</string>
@@ -130,7 +130,7 @@
     <string name="save_as_playlist" msgid="5180413608901885255">"Сохранить как плейлист"</string>
     <string name="clear_playlist" msgid="4565515100924905315">"Очистить плейлист"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"Музыка"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Плей-лист"</string>
+    <string name="musicshortcutlabel" msgid="2602980193508150226">"Плейлист"</string>
     <string name="mediaplaybacklabel" msgid="6733604841530940397">"Музыка"</string>
     <string name="videobrowserlabel" msgid="8522326678447494657">"Видео"</string>
     <string name="mediapickerlabel" msgid="4549836003229914299">"Музыка"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 241934f..1495fd8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -27,8 +27,8 @@
     <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> trong tổng sổ <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> bài hát"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 anbom"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> anbom"</item>
+    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
+    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> album"</item>
   </plurals>
     <string name="goto_start" msgid="8979658707407220934">"Thư viện"</string>
     <string name="party_shuffle" msgid="8213359225506006168">"Danh sách nhạc ngẫu nhiên"</string>
@@ -38,8 +38,8 @@
     <string name="play_all" msgid="6309622568869321842">"Phát tất cả"</string>
     <string name="delete_artist_desc" msgid="1843750591006508005">"Tất cả bài hát của <xliff:g id="ARTIST">%s</xliff:g> sẽ bị xóa vĩnh viễn khỏi thẻ SD."</string>
     <string name="delete_artist_desc_nosdcard" msgid="1565010405469696133">"Tất cả bài hát của <xliff:g id="ARTIST">%s</xliff:g> sẽ bị xóa vĩnh viễn khỏi bộ nhớ USB."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Toàn bộ anbom \"<xliff:g id="ALBUM">%s</xliff:g>\" sẽ bị xóa vĩnh viễn khỏi thẻ SD."</string>
-    <string name="delete_album_desc_nosdcard" msgid="2739690641188691896">"Toàn bộ anbom \"<xliff:g id="ALBUM">%s</xliff:g>\" sẽ bị xóa vĩnh viễn khỏi bộ nhớ USB."</string>
+    <string name="delete_album_desc" msgid="535515999268177079">"Toàn bộ album \"<xliff:g id="ALBUM">%s</xliff:g>\" sẽ bị xóa vĩnh viễn khỏi thẻ SD."</string>
+    <string name="delete_album_desc_nosdcard" msgid="2739690641188691896">"Toàn bộ album \"<xliff:g id="ALBUM">%s</xliff:g>\" sẽ bị xóa vĩnh viễn khỏi bộ nhớ USB."</string>
     <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" sẽ bị xóa vĩnh viễn khỏi thẻ SD."</string>
     <string name="delete_song_desc_nosdcard" msgid="2722621774200478721">"\"<xliff:g id="SONG">%s</xliff:g>\" sẽ bị xóa vĩnh viễn khỏi bộ nhớ USB."</string>
     <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
@@ -52,8 +52,8 @@
     <string name="nowplaying_title" msgid="8342523844307751761">"Hiện đang phát"</string>
     <string name="partyshuffle_title" msgid="6582413231529992125">"Danh sách nhạc ngẫu nhiên"</string>
     <string name="artists_title" msgid="8490372367259160067">"Nghệ sĩ"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Anbom"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Anbom"</string>
+    <string name="albums_menu" msgid="5807982055590211900">"Album"</string>
+    <string name="albums_title" msgid="8773880394961378035">"Album"</string>
     <string name="tracks_menu" msgid="6942246568246092330">"Bài hát"</string>
     <string name="tracks_title" msgid="3229389424532295124">"Bài hát"</string>
     <string name="playlists_menu" msgid="5382792649771928849">"Danh sách nhạc"</string>
@@ -87,7 +87,7 @@
     <string name="sdcard_error_message" msgid="4574563894036627855">"Đã xảy ra lỗi trên thẻ SD của bạn."</string>
     <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"Đã xảy ra lỗi trên bộ nhớ USB của bạn."</string>
     <string name="unknown_artist_name" msgid="5567811106415855219">"Nghệ sĩ không xác định"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Anbom không xác định"</string>
+    <string name="unknown_album_name" msgid="8525145988941244727">"Album không xác định"</string>
     <string name="shuffle_on_notif" msgid="5453708337808483943">"Bật tính năng phát ngẫu nhiên."</string>
     <string name="shuffle_off_notif" msgid="4251189610017886263">"Tắt tính năng phát ngẫu nhiên."</string>
     <string name="repeat_off_notif" msgid="1149406899083479716">"Tắt lặp lại."</string>
@@ -140,15 +140,15 @@
     <string name="streamloadingtext" msgid="3367150884806639224">"Đang kết nối với <xliff:g id="HOST">%s</xliff:g>"</string>
     <string name="mediasearch" msgid="959222971261132292">"Tìm kiếm <xliff:g id="TERM">%s</xliff:g> sử dụng:"</string>
     <string name="working_artists" msgid="8678357432732156580">"Nghệ sĩ..."</string>
-    <string name="working_albums" msgid="8713273699401457426">"Anbom..."</string>
+    <string name="working_albums" msgid="8713273699401457426">"Album..."</string>
     <string name="working_songs" msgid="2201491972050410684">"Bài hát…"</string>
     <string name="working_playlists" msgid="4424950806134653351">"Danh sách nhạc..."</string>
     <string name="loading" msgid="3267924133697717662">"Đang tải"</string>
     <string name="sort_by_track" msgid="7662999005554152565">"Bài hát"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Anbom"</string>
+    <string name="sort_by_album" msgid="2912837715658975248">"Album"</string>
     <string name="sort_by_artist" msgid="4607024967813199992">"Nghệ sĩ"</string>
     <string name="music_picker_title" msgid="1561623486324013570">"Chọn bản nhạc"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Nghệ sĩ, anbom và bài hát"</string>
+    <string name="search_settings_description" msgid="6520975349259883368">"Nghệ sĩ, album và bài hát"</string>
     <string name="search_hint" msgid="3766854898072633001">"Tìm kiếm trong Nhạc"</string>
     <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
     <string name="widget_initial_text" msgid="6334545155963910952">"Chạm để chọn nhạc."</string>