Automatic translation import

Change-Id: Ie4cd944ce175d73d2f029f86d679908ff1ff6605

39 files changed, 641 insertions, 290 deletions

diff --git a/res/values-as-rIN/plurals.xml b/res/values-as-rIN/plurals.xml
index ceabe5d..b8fdd88 100644
--- a/res/values-as-rIN/plurals.xml
+++ b/res/values-as-rIN/plurals.xml
@@ -38,6 +38,10 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> ৰকম</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
+  <plurals name="Nhours">
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
+  </plurals>
   <!-- Used to show a shortened version of minutes -->
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-be-rBY/plurals.xml b/res/values-be-rBY/plurals.xml
new file mode 100644
index 0000000..410c996
--- /dev/null
+++ b/res/values-be-rBY/plurals.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Used to indicate the number of artists -->
+  <plurals name="Nartists">
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> выканавец</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> выканаўца</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> выканаўцаў</item>
+  </plurals>
+  <!-- Used to indicate the number of albums for an artist -->
+  <plurals name="Nalbums">
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> альбом</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> альбома</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> альбомаў</item>
+  </plurals>
+  <!-- Used to indicate the number of songs for an album -->
+  <plurals name="Nsongs">
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> трэк</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> трэка</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> трэкаў</item>
+  </plurals>
+  <!-- Used to indicate the number of genres -->
+  <plurals name="Ngenres">
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> жанр</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> жанру</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> жанраў</item>
+  </plurals>
+  <!-- Used to show a shortened version of hours-->
+  <plurals name="Nhours">
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g> гадзіна</item>
+    <item quantity="few"><xliff:g id="hours">%d</xliff:g> гадзіны</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g> гадзінаў</item>
+  </plurals>
+  <!-- Used to show a shortened version of minutes -->
+  <plurals name="Nminutes">
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> хвіліна</item>
+    <item quantity="few"><xliff:g id="minutes">%d</xliff:g> хвіліны</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> хвілінаў</item>
+  </plurals>
+  <!-- Toasts after adding song(s) to playlists -->
+  <plurals name="NNNtrackstoplaylist">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў плэйліст.</item>
+    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трэка дададзена ў плэйліст.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзена ў плэйліст.</item>
+  </plurals>
+  <!-- Toasts after removing song(s) from playlists -->
+  <plurals name="NNNtracksfromplaylist">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк выдалены з плэйліста.</item>
+    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трэка выдалены з плэйліста.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэка выдалены з плэйліста.</item>
+  </plurals>
+  <!-- Toasts after adding song(s) to queue -->
+  <plurals name="NNNtrackstoqueue">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў чаргу.</item>
+    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трэка дададзены ў чаргу.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзена ў чаргу.</item>
+  </plurals>
+  <!-- Toasts after adding song(s) to the favorites list -->
+  <plurals name="NNNtrackstofavorites">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў абранае.</item>
+    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трэка дададзены ў абранае.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзена ў абранае.</item>
+  </plurals>
+  <!-- Toast confirming that song(s) was/were deleted. -->
+  <plurals name="NNNtracksdeleted">
+    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> трэк выдалены.</item>
+    <item quantity="few"><xliff:g id="songs_to_delete">%d</xliff:g> трэка выдалены.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> трэкаў выдалены.</item>
+  </plurals>
+</resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
new file mode 100644
index 0000000..6ea1e41
--- /dev/null
+++ b/res/values-be-rBY/strings.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Музыка</string>
+  <!-- Page titles -->
+  <string name="page_recent">Апошнія</string>
+  <string name="page_artists">Выканаўцы</string>
+  <string name="page_albums">Альбомы</string>
+  <string name="page_songs">Трэкi</string>
+  <string name="page_playlists">Плэйлісты</string>
+  <string name="page_genres">Жанры</string>
+  <string name="page_now_playing">Зараз грае</string>
+  <string name="page_play_queue">Чарга прайгравання</string>
+  <!-- Section Headers -->
+  <string name="header_albums">Альбомы</string>
+  <string name="header_top_songs">Топ-трэкі</string>
+  <string name="header_all_songs">Усе трэкі</string>
+  <!-- Option menu items -->
+  <string name="menu_settings">Налады</string>
+  <string name="menu_search">Пошук</string>
+  <string name="menu_shuffle_item">Перамяшаць</string>
+  <string name="menu_shuffle_all">Перамяшаць усё</string>
+  <string name="menu_shuffle_playlist">Перамяшаць плэйліст</string>
+  <string name="menu_shuffle_album">Перамяшаць альбом</string>
+  <string name="menu_shuffle_artist">Перамяшаць выканаўца</string>
+  <string name="menu_shuffle_top_tracks">Перамяшаць топ-трэкі</string>
+  <string name="menu_shuffle_recent">Перамяшаць нядаўна прайграныя</string>
+  <string name="menu_shuffle_last_added">Перамяшаць апошнія дададзеныя</string>
+  <string name="menu_play_all">Граць усё</string>
+  <string name="menu_sort_by">Сартаваць паводле</string>
+  <string name="menu_clear_list">Ачысціць спіс</string>
+  <string name="menu_clear_recents">Ачысціць апошнія</string>
+  <string name="menu_clear_queue">Ачысціць чаргу</string>
+  <string name="menu_save_queue">Захаваць у плэйліст</string>
+  <string name="menu_equalizer">Эквалайзер</string>
+  <!-- Playlist items -->
+  <string name="add_to_playlist">Дадаць у плэйліст</string>
+  <string name="add_to_queue">Дадаць у чаргу</string>
+  <string name="remove_from_recent">Выдаліць з апошніх</string>
+  <string name="remove_from_queue">Выдаліць з чаргі</string>
+  <!-- Sort orders -->
+  <string name="sort_order_entry_az">Алфавіту</string>
+  <string name="sort_order_entry_za">Алфавіту ў зваротным парадку</string>
+  <string name="sort_order_entry_artist">Выканаўцу</string>
+  <string name="sort_order_entry_album">Альбому</string>
+  <string name="sort_order_entry_year">Году</string>
+  <string name="sort_order_entry_duration">Працягласці</string>
+  <string name="sort_order_entry_date_added">Даце дадання</string>
+  <string name="sort_order_entry_track_list">Трэк-лісту</string>
+  <string name="sort_order_entry_number_of_songs">Колькасці трэкаў</string>
+  <string name="sort_order_entry_number_of_albums">Колькасці альбомаў</string>
+  <string name="sort_order_entry_filename">Імя файла</string>
+  <!-- Default playlist names -->
+  <string name="playlist_last_added">Апошнія дададзеныя</string>
+  <string name="playlist_recently_played">Апошнія граныя</string>
+  <string name="playlist_top_tracks">Мае топ-трэкі</string>
+  <!-- AlertDialog items -->
+  <string name="new_playlist">Новы плэйліст</string>
+  <string name="save">Захаваць</string>
+  <string name="cancel">Скасаванне</string>
+  <string name="overwrite">Замяніць</string>
+  <string name="clear">Ачысціць</string>
+  <string name="new_playlist_name_template">Плэйліст <xliff:g id="number">%d</xliff:g></string>
+  <string name="create_playlist_prompt">Назва плэйліста</string>
+  <string name="delete_dialog_title">Выдаліць <xliff:g id="item" example="album">%s</xliff:g>?</string>
+  <string name="clear_top_tracks_title">Ачысціць спіс топ-трэкаў?</string>
+  <string name="clear_recent_title">Ачысціць нядаўна прайграныя?</string>
+  <string name="clear_last_added">Ачысціць нядаўна дададзеныя?</string>
+  <string name="cannot_be_undone">Гэта дзеянне немагчыма скасаваць</string>
+  <string name="delete_warning">Кэшаваныя выявы будуць выдалены</string>
+  <string name="new_photo">Выбраць з Галерэі</string>
+  <string name="google_search">Знайсці ў Google</string>
+  <string name="use_default">Відарыс па змаўчанні</string>
+  <string name="old_photo">Зыходная выява\"</string>
+  <!-- Context menu items -->
+  <string name="context_menu_play_selection">Прайграць</string>
+  <string name="context_menu_play_next">Уключыць наступным</string>
+  <string name="context_menu_play_album">Прайграць</string>
+  <string name="context_menu_more_by_artist">Усе трэкі выканаўца</string>
+  <string name="context_menu_rename_playlist">Пераназваць</string>
+  <string name="context_menu_delete">Выдаліць</string>
+  <string name="context_menu_fetch_album_art">Загрузіць вокладку альбома</string>
+  <string name="context_menu_fetch_artist_image">Загрузіць фота выканаўца</string>
+  <string name="context_menu_remove_from_recent">Выдаліць з апошніх</string>
+  <string name="context_menu_use_as_ringtone">Выкарыстаць як рынгтон</string>
+  <string name="context_menu_remove_from_playlist">Выдаліць з плэйліста</string>
+  <string name="context_menu_change_image">Змяніць выяву</string>
+  <!-- Content descriptions -->
+  <string name="accessibility_play">Прайграць</string>
+  <string name="accessibility_pause">Паўза</string>
+  <string name="accessibility_next">Наступны</string>
+  <string name="accessibility_prev">Папярэдні</string>
+  <string name="accessibility_shuffle">Перамяшаць</string>
+  <string name="accessibility_shuffle_all">Перамяшаць усё</string>
+  <string name="accessibility_repeat">Паўтор</string>
+  <string name="accessibility_repeat_all">Паўтор усіх</string>
+  <string name="accessibility_repeat_one">Паўтор трэка</string>
+  <string name="accessibility_queue">Адчыніць чаргу</string>
+  <string name="accessibility_browse">Агляд музыкі</string>
+  <!-- Toast messages -->
+  <string name="set_as_ringtone">Трэк <xliff:g id="name" example="Alarm Bell">%s</xliff:g> усталяваны як рынгтон</string>
+  <string name="playlist_renamed">Плэйліст пераназваны</string>
+  <!-- Settings -->
+  <string name="settings_ui_category">Інтэрфейс</string>
+  <string name="settings_storage_category">Сховішча</string>
+  <string name="settings_data_category">Дадзеныя</string>
+  <string name="settings_delete_cache_title">Ачысціць кэш</string>
+  <string name="settings_delete_cache_summary">Выдаліць усе кэшаваныя выявы</string>
+  <string name="settings_download_only_on_wifi_title">Загрузка толькі праз Wi-Fi</string>
+  <string name="settings_download_only_on_wifi_summary">Не загружаць дадзеныя праз мабільны інтэрнэт, каб пазбегнуць магчымых выдаткаў</string>
+  <string name="settings_download_missing_artwork_title">Загружаць вокладкі альбомаў</string>
+  <string name="settings_download_artist_images_title">Загружаць фота выканаўцаў</string>
+  <string name="settings_general_category">Агульнае</string>
+  <string name="settings_show_music_visualization_title">Паказваць візуалізацыю музыкі</string>
+  <string name="settings_show_lyrics_title">Паказваць тэкст песні</string>
+  <string name="settings_show_lyrics_summary">Для песень, да якіх ёсць файл srt</string>
+  <string name="settings_shake_to_play">Пераключэнне трэкаў падтрасаннем</string>
+  <string name="settings_shake_to_play_summary">Страсяніце прыладу для пераходу да наступнага трэка</string>
+  <string name="settings_lockscreen_album_art">Вокладка альбома</string>
+  <string name="settings_lockscreen_album_art_summary">Замяняць шпалеры экрана блакавання вокладкай прайграванага альбома</string>
+  <!-- App widget -->
+  <string name="app_widget_small">Музыка: 4 \u00d7 1</string>
+  <string name="app_widget_large">Музыка: 4 \u00d7 2</string>
+  <string name="app_widget_large_alt">Музыка: 4 \u00d7 2 (альтэрнатыўны)</string>
+  <string name="app_widget_recent">Музыка: нядаўна праслуханыя</string>
+  <!-- Empty list / error messages -->
+  <string name="no_effects_for_you">Эквалайзер не можа быць адчынены.</string>
+  <string name="empty_music">Каб скапіяваць музыку з ПК, выкарыстайце USB-кабель.</string>
+  <string name="empty_search">Пошук не даў вынікаў</string>
+  <string name="empty_search_check">Праверце правільнасць уводу ці паспрабуйце пошук па іншым ключавым слове.</string>
+  <string name="empty_favorite">Тут будуць трэкі, якія вы дадалі ў абранае.</string>
+  <string name="empty_recent_main">Няма нядаўніх трэкаў</string>
+  <string name="empty_recent">Трэкі, якія вы слухалі нядаўна, будуць знаходзіцца тут.</string>
+  <string name="empty_playlist_main">Няма трэкаў у плэйлісце</string>
+  <string name="empty_playlist_secondary">Каб дадаць трэкі ў плэйліст, націсніце на меню опцый трэка, альбома ці выканаўца і выберыце \"Дадаць у плэйліст\".</string>
+  <string name="empty_top_tracks_main">Няма топ-трэкаў</string>
+  <string name="empty_top_tracks_secondary">Трэкі, якія вы слухаеце найчасцей, будуць дададзены ў гэты спіс.</string>
+  <string name="empty_last_added_main">Няма апошніх дададзеных трэкаў\"</string>
+  <string name="empty_last_added">Трэкі, дададзеныя за апошні месяц, будуць паказаны тут.</string>
+  <string name="empty_generic_main">Музыка не знойдзена</string>
+  <string name="empty_generic_secondary">Каб скапіяваць музыку з ПК, выкарыстайце USB-кабель.</string>
+  <string name="empty_queue_main">Няма трэкаў у чарзе</string>
+  <string name="empty_queue_secondary">Каб дадаць трэкі ў чаргу прайгравання, націсніце на меню опцый трэка, альбома ці выканаўца і выберыце \"Дадаць у чаргу\".</string>
+  <string name="error_playing_track">Немагчыма прайграць трэк %1$s</string>
+  <!-- Section Headers -->
+  <string name="header_unknown_year">Невядомы год</string>
+  <string name="header_less_than_30s">Менш 30 секундаў</string>
+  <string name="header_30_to_60_seconds">30 - 60 секундаў</string>
+  <string name="header_1_to_2_minutes">1 - 2 хвіліны</string>
+  <string name="header_2_to_3_minutes">2 - 3 хвіліны</string>
+  <string name="header_3_to_4_minutes">3 - 4 хвіліны</string>
+  <string name="header_4_to_5_minutes">4 - 5 хвілін</string>
+  <string name="header_5_to_10_minutes">5 - 10 хвілін</string>
+  <string name="header_10_to_30_minutes">10 - 30 хвілін</string>
+  <string name="header_30_to_60_minutes">30 - 60 хвілін</string>
+  <string name="header_greater_than_60_minutes">Больш за 60 хвілін</string>
+  <string name="header_1_song">1 трэк</string>
+  <string name="header_2_to_4_songs">2 - 4 трэка</string>
+  <string name="header_5_to_9_songs">5 - 9 трэкаў</string>
+  <string name="header_10_plus_songs">Больш за 10 трэкаў</string>
+  <string name="header_5_plus_albums">Больш за 5 альбомаў</string>
+  <string name="header_other">"Іншыя"</string>
+  <string name="footer_search_artists">Паказаць усіх выканаўцаў</string>
+  <string name="footer_search_albums">Паказаць усе альбомы</string>
+  <string name="footer_search_songs">Паказаць усе трэкі</string>
+  <string name="footer_search_playlists">Паказаць усе плэйлісты</string>
+  <string name="searchHint">Пошук музыкі</string>
+  <string name="search_title_artists">Усе выканаўцы \"%s\"</string>
+  <string name="search_title_albums">Усе альбомы \"%s\"</string>
+  <string name="search_title_songs">Усе трэкі \"%s\"</string>
+  <string name="search_title_playlists">Усе плэйлісты \"%s\"</string>
+  <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+</resources>
diff --git a/res/values-bg/plurals.xml b/res/values-bg/plurals.xml
index a41ddd0..0c886bf 100644
--- a/res/values-bg/plurals.xml
+++ b/res/values-bg/plurals.xml
@@ -19,13 +19,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> изпълнител</item>
+    <item quantity="one"><xliff:g id="count">%d </xliff:g> изпълнител</item>
     <item quantity="other"><xliff:g id="count">%d </xliff:g> изпълнители</item>
   </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> албум</item>
-    <item quantity="other"><xliff:g id="count">%d </xliff:g> албума</item>
+    <item quantity="one"><xliff:g id="count">%d </xliff:g> албум</item>
+    <item quantity="other"><xliff:g id="count">%d </xliff:g> албуми</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
@@ -34,13 +34,13 @@
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> жанр</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> жанра</item>
+    <item quantity="one"><xliff:g id="count">%d </xliff:g> жанр</item>
+    <item quantity="other"><xliff:g id="count">%d </xliff:g> жанрове</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g> ч</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g> ч</item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g> ч.</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g> ч.</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
@@ -55,11 +55,11 @@
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d </xliff:g> песен е премахната от списъка за изпълнение.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d </xliff:g> песни са премахнати от списъка за изпълнение.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d </xliff:g> песени са премахнати от списъка за изпълнение.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d </xliff:g> песен е добавена към опашката.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> песен е добавена към опашката.</item>
     <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> песни са добавени към опашката.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
diff --git a/res/values-bs-rBA/plurals.xml b/res/values-bs-rBA/plurals.xml
new file mode 100644
index 0000000..9827780
--- /dev/null
+++ b/res/values-bs-rBA/plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Used to indicate the number of artists -->
+  <!-- Used to indicate the number of albums for an artist -->
+  <!-- Used to indicate the number of songs for an album -->
+  <!-- Used to indicate the number of genres -->
+  <!-- Used to show a shortened version of hours-->
+  <!-- Used to show a shortened version of minutes -->
+  <!-- Toasts after adding song(s) to playlists -->
+  <!-- Toasts after removing song(s) from playlists -->
+  <!-- Toasts after adding song(s) to queue -->
+  <!-- Toasts after adding song(s) to the favorites list -->
+  <!-- Toast confirming that song(s) was/were deleted. -->
+</resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..ac715c0
--- /dev/null
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Page titles -->
+  <!-- Section Headers -->
+  <!-- Option menu items -->
+  <!-- Playlist items -->
+  <!-- Sort orders -->
+  <!-- Default playlist names -->
+  <!-- AlertDialog items -->
+  <!-- Context menu items -->
+  <!-- Content descriptions -->
+  <!-- Toast messages -->
+  <!-- Settings -->
+  <!-- App widget -->
+  <!-- Empty list / error messages -->
+  <!-- Section Headers -->
+</resources>
diff --git a/res/values-de/plurals.xml b/res/values-de/plurals.xml
index abe4ec8..43ad243 100644
--- a/res/values-de/plurals.xml
+++ b/res/values-de/plurals.xml
@@ -44,8 +44,8 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> m</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> m</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> Min.</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> Min.</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-eo/plurals.xml b/res/values-eo/plurals.xml
index 87b90d0..6bb5535 100644
--- a/res/values-eo/plurals.xml
+++ b/res/values-eo/plurals.xml
@@ -33,43 +33,11 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> kantoj</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> ĝenro</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> ĝenroj</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> kanto aldonita al la ludlisto.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> kantoj aldonitaj al la ludlisto.</item>
-  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> kanto forigita de la ludlisto.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> kantoj forigitaj de la ludlisto.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> kanto aldonita al la vico.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> kantoj aldonitaj al la vico.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> kanto aldonita al la plej ŝatataj.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> kanto aldonita al la plej ŝatataj.</item>
-  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> kanto estis forigita.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> kantoj estis forigitaj.</item>
-  </plurals>
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index f219611..0f33c65 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -17,150 +17,31 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Muziko</string>
   <!-- Page titles -->
-  <string name="page_recent">Lasttempe</string>
   <string name="page_artists">Artistoj</string>
   <string name="page_albums">Albumoj</string>
   <string name="page_songs">Kantoj</string>
-  <string name="page_playlists">Ludlistoj</string>
-  <string name="page_genres">Ĝenroj</string>
-  <string name="page_now_playing">Ludas nun</string>
-  <string name="page_play_queue">Ludi vicon</string>
   <!-- Section Headers -->
   <string name="header_albums">Albumoj</string>
-  <string name="header_top_songs">Popularaj kantoj</string>
-  <string name="header_all_songs">Ĉiuj kantoj</string>
   <!-- Option menu items -->
   <string name="menu_settings">Agordoj</string>
-  <string name="menu_search">Serĉi</string>
-  <string name="menu_shuffle_item">Hazardigi</string>
-  <string name="menu_shuffle_all">Hazardigi ĉion</string>
-  <string name="menu_shuffle_playlist">Hazardigi ludliston</string>
-  <string name="menu_shuffle_album">Hazardigi albumon</string>
-  <string name="menu_shuffle_artist">Hazardigi artiston</string>
-  <string name="menu_shuffle_top_tracks">Hazardigi popularajn titolojn</string>
-  <string name="menu_shuffle_recent">Hazardigi lasttempe luditajn</string>
-  <string name="menu_shuffle_last_added">Hazardigi lasttempe aldonitajn</string>
-  <string name="menu_play_all">Ludi ĉion</string>
-  <string name="menu_sort_by">Ordigi laŭ</string>
-  <string name="menu_clear_list">Forviŝi liston</string>
-  <string name="menu_clear_recents">Forviŝi lasttempajn</string>
-  <string name="menu_clear_queue">Forviŝi vicon</string>
-  <string name="menu_save_queue">Konservi vicon en ludliston</string>
-  <string name="menu_equalizer">Egaligilo</string>
   <!-- Playlist items -->
-  <string name="add_to_playlist">Aldoni al ludlisto</string>
-  <string name="add_to_queue">Aldoni al vico</string>
-  <string name="remove_from_recent">Forigi de lasttempaj</string>
-  <string name="remove_from_queue">Forigi de vico</string>
   <!-- Sort orders -->
-  <string name="sort_order_entry_az">A-Z</string>
-  <string name="sort_order_entry_za">Z-A</string>
   <string name="sort_order_entry_artist">Artisto</string>
   <string name="sort_order_entry_album">Albumo</string>
   <string name="sort_order_entry_year">Jaro</string>
-  <string name="sort_order_entry_duration">Daŭro</string>
-  <string name="sort_order_entry_date_added">Dato de aldonado</string>
-  <string name="sort_order_entry_track_list">Listo de titoloj</string>
-  <string name="sort_order_entry_number_of_songs">Nombro da kantoj</string>
-  <string name="sort_order_entry_number_of_albums">Nombro da albumoj</string>
-  <string name="sort_order_entry_filename">Dosiernomo</string>
   <!-- Default playlist names -->
-  <string name="playlist_last_added">Lasttempe aldonitaj</string>
-  <string name="playlist_recently_played">Lasttempe luditaj</string>
-  <string name="playlist_top_tracks">Mia plej ŝatataj titoloj</string>
   <!-- AlertDialog items -->
-  <string name="new_playlist">Nova ludlisto</string>
   <string name="save">Konservi</string>
-  <string name="cancel">Rezigni</string>
-  <string name="overwrite">Anstataŭigi</string>
-  <string name="clear">Forviŝi</string>
-  <string name="new_playlist_name_template">Ludlisto <xliff:g id="number">%d</xliff:g></string>
-  <string name="create_playlist_prompt">Ludlista nomo</string>
-  <string name="delete_dialog_title">Ĉu forigi <xliff:g id="item" example="album">%s</xliff:g>?</string>
-  <string name="clear_top_tracks_title">Ĉu forigi popularajn titolojn?</string>
-  <string name="clear_recent_title">Ĉu forviŝi lasttempe luditajn?</string>
-  <string name="clear_last_added">Ĉu forviŝi lasttempe aldonitaj?</string>
-  <string name="cannot_be_undone">Ago ne malfareblas</string>
-  <string name="delete_warning">Tio porĉiame forigos la bildan kaŝmemoron</string>
-  <string name="new_photo">Selekti bildon el Galerio</string>
-  <string name="google_search">Google serĉado</string>
-  <string name="use_default">Uzi defaŭltan foton</string>
-  <string name="old_photo">Uzi malnovan foton</string>
+  <string name="cancel">Nuligi</string>
   <!-- Context menu items -->
-  <string name="context_menu_play_selection">Ludi</string>
-  <string name="context_menu_play_next">Ludi sekvan</string>
-  <string name="context_menu_play_album">Ludi albumon</string>
-  <string name="context_menu_more_by_artist">Pli laŭ artisto</string>
-  <string name="context_menu_rename_playlist">Alinomi</string>
-  <string name="context_menu_delete">Foriga klavo</string>
-  <string name="context_menu_fetch_album_art">Elpreni albuman koverton</string>
-  <string name="context_menu_fetch_artist_image">Elpreni artistan bildon</string>
-  <string name="context_menu_remove_from_recent">Forviŝi de lasttempaj</string>
-  <string name="context_menu_use_as_ringtone">Uzi kiel sonoron</string>
-  <string name="context_menu_remove_from_playlist">Forviŝi el ludlisto</string>
-  <string name="context_menu_change_image">Ŝanĝi bildon</string>
   <!-- Content descriptions -->
-  <string name="accessibility_play">Ludi</string>
-  <string name="accessibility_pause">Paŭzo</string>
-  <string name="accessibility_next">Sekvonta</string>
-  <string name="accessibility_prev">Antaŭa</string>
-  <string name="accessibility_shuffle">Hazardigi</string>
-  <string name="accessibility_shuffle_all">Hazardigi ĉion</string>
-  <string name="accessibility_repeat">Ripeti</string>
-  <string name="accessibility_repeat_all">Ripeti ĉion</string>
-  <string name="accessibility_repeat_one">Ripeti unu</string>
-  <string name="accessibility_queue">Malfermi vicon</string>
-  <string name="accessibility_browse">Esplori muzikon</string>
   <!-- Toast messages -->
-  <string name="set_as_ringtone">\'<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\' uzebla kiel sonoro</string>
-  <string name="playlist_renamed">Ludlisto renomita</string>
   <!-- Settings -->
-  <string name="settings_ui_category">Interfaco</string>
-  <string name="settings_storage_category">Memorilo</string>
-  <string name="settings_data_category">Datumo</string>
-  <string name="settings_delete_cache_title">Forigi kâsmemoron</string>
-  <string name="settings_delete_cache_summary">Forigi cîujn bildojn de la kaŝmemoro</string>
-  <string name="settings_download_only_on_wifi_title">Elŝuti nur per vifio</string>
-  <string name="settings_download_only_on_wifi_summary">Por malaltigi kostojn, ne elŝutu per poŝkomputila retkonekto</string>
-  <string name="settings_download_missing_artwork_title">Elsûti mankantan albuman koverton</string>
-  <string name="settings_download_artist_images_title">Elŝuti mankantajn artistajn bildojn</string>
-  <string name="settings_general_category">Ĝenerala</string>
-  <string name="settings_show_music_visualization_title">Montri muzikajn animaciojn</string>
-  <string name="settings_show_lyrics_title">Vidi parolojn</string>
-  <string name="settings_show_lyrics_summary">Por kantoj havanta srt-dosieron</string>
-  <string name="settings_shake_to_play">Skui por Ludi</string>
-  <string name="settings_shake_to_play_summary">Skui vian aparaton por ludi la sekvan kanton</string>
-  <string name="settings_lockscreen_album_art">Albumaj koverto por la ŝlosa fonekrano</string>
-  <string name="settings_lockscreen_album_art_summary">Sânĝi la ŝlosan fonekranon per albuma koverto</string>
   <!-- App widget -->
-  <string name="app_widget_small">Muziko: 4 \u00d7 1</string>
-  <string name="app_widget_large">Muziko: 4 \u00d7 2</string>
-  <string name="app_widget_large_alt">Muziko: 4 \u00d7 2 (alterna)</string>
-  <string name="app_widget_recent">Muziko: lasttempe aŭskultitaj</string>
   <!-- Empty list / error messages -->
-  <string name="no_effects_for_you">Ne eblas malfermi la egaligilon.</string>
-  <string name="empty_music">Por kopii muzikon el via komputilo al via aparato, uzu USB kablon.</string>
-  <string name="empty_search">Neniu rezulto trovita</string>
-  <string name="empty_search_check">Bonvolu kontroli ortografion aŭ provu alian ŝlosilvorton.</string>
-  <string name="empty_favorite">Viaj plej ŝatataj muzikoj aperos ĉi tie.</string>
-  <string name="empty_recent_main">Neniu lasttempa kanto</string>
-  <string name="empty_recent">Lastaj aŭskultitaj muzikoj aperos ĉi tie.</string>
-  <string name="empty_playlist_main">Neniu kanto en la ludlisto</string>
-  <string name="empty_playlist_secondary">Por aldoni kanton al la ludlisto, tuŝetu la opcian menuon sur la kanto, albumo aŭ artisto kaj elektu \"Aldoni al la ludlisto\".</string>
-  <string name="empty_top_tracks_main">Neniu populara titolo</string>
-  <string name="empty_top_tracks_secondary">Plej oftaj aŭskultitaj muzikoj aperos ĉi tie.</string>
-  <string name="empty_last_added_main">Neniu kanto lasttempe aldonita</string>
-  <string name="empty_last_added">Lastaj aldonitaj muzikoj aperos ĉi tie.</string>
-  <string name="empty_generic_main">Neniu muziko trovita</string>
-  <string name="empty_generic_secondary">Por kopii muzikon el via komputilo al via aparato, uzu USB-kablon.</string>
-  <string name="empty_queue_main">Neniu kanto en la ludvico</string>
-  <string name="empty_queue_secondary">Por aldoni kanton al la ludvico, tuŝetu la opcian menuon sur la kanto, albumo aŭ artisto kaj elektu \"Aldoni al la ludlisto\".</string>
-  <string name="error_playing_track">Ne eblas ludi la titolon %1$s</string>
   <!-- Section Headers -->
   <string name="header_unknown_year">Nekonata jaro</string>
-  <string name="header_less_than_30s">Malpli ol 30 sekundoj</string>
   <string name="header_30_to_60_seconds">30 - 60 sekundoj</string>
   <string name="header_1_to_2_minutes">1 - 2 minutoj</string>
   <string name="header_2_to_3_minutes">2 - 3 minutoj</string>
@@ -169,21 +50,9 @@
   <string name="header_5_to_10_minutes">5 - 10 minutoj</string>
   <string name="header_10_to_30_minutes">10 - 30 minutoj</string>
   <string name="header_30_to_60_minutes">30 - 60 minutoj</string>
-  <string name="header_greater_than_60_minutes">Pli ol 60 minutoj</string>
   <string name="header_1_song">1 kanto</string>
   <string name="header_2_to_4_songs">2 - 4 kantoj</string>
   <string name="header_5_to_9_songs">5 - 9 kantoj</string>
-  <string name="header_10_plus_songs">pli ol 10 kantoj</string>
+  <string name="header_10_plus_songs">10+ kantoj</string>
   <string name="header_5_plus_albums">pli of 5 albumoj</string>
-  <string name="header_other">"Alia"</string>
-  <string name="footer_search_artists">Montri ĉiujn artistojn</string>
-  <string name="footer_search_albums">Montri ĉiujn albumojn</string>
-  <string name="footer_search_songs">Montri ĉiujn kantojn</string>
-  <string name="footer_search_playlists">Montri cîujn ludlistojn</string>
-  <string name="searchHint">Serĉi muzikon</string>
-  <string name="search_title_artists">Ĉiuj \'%s\' artistoj</string>
-  <string name="search_title_albums">Ĉiuj \'%s\' albumoj</string>
-  <string name="search_title_songs">Ĉiuj \'%s\' kantoj</string>
-  <string name="search_title_playlists">Ĉiuj \'%s\' ludlistoj</string>
-  <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-es-rCO/plurals.xml b/res/values-es-rCO/plurals.xml
new file mode 100644
index 0000000..9827780
--- /dev/null
+++ b/res/values-es-rCO/plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Used to indicate the number of artists -->
+  <!-- Used to indicate the number of albums for an artist -->
+  <!-- Used to indicate the number of songs for an album -->
+  <!-- Used to indicate the number of genres -->
+  <!-- Used to show a shortened version of hours-->
+  <!-- Used to show a shortened version of minutes -->
+  <!-- Toasts after adding song(s) to playlists -->
+  <!-- Toasts after removing song(s) from playlists -->
+  <!-- Toasts after adding song(s) to queue -->
+  <!-- Toasts after adding song(s) to the favorites list -->
+  <!-- Toast confirming that song(s) was/were deleted. -->
+</resources>
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..ac715c0
--- /dev/null
+++ b/res/values-es-rCO/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Page titles -->
+  <!-- Section Headers -->
+  <!-- Option menu items -->
+  <!-- Playlist items -->
+  <!-- Sort orders -->
+  <!-- Default playlist names -->
+  <!-- AlertDialog items -->
+  <!-- Context menu items -->
+  <!-- Content descriptions -->
+  <!-- Toast messages -->
+  <!-- Settings -->
+  <!-- App widget -->
+  <!-- Empty list / error messages -->
+  <!-- Section Headers -->
+</resources>
diff --git a/res/values-es-rUS/plurals.xml b/res/values-es-rUS/plurals.xml
index b623606..0399111 100644
--- a/res/values-es-rUS/plurals.xml
+++ b/res/values-es-rUS/plurals.xml
@@ -19,23 +19,23 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> artista</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> artistas</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g>artista</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>artistas</item>
   </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> álbum</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> álbumes</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g>álbum</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>álbumes</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> canción</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> canciones</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g>canción</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>canciones</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> género</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> géneros</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g>género</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>géneros</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
@@ -44,13 +44,13 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>min</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
     <item quantity="other"><xliff:g id="minutes">%d</xliff:g>min</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción añadida a la lista de reproducción.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> canciones añadidas a la lista de reproducción.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> canciones añadidas a la lista de reproducción.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
@@ -65,11 +65,11 @@
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción añadida a favoritos.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> canciones añadidas a favoritos.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> canciones añadidas a favoritos.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> canción fue eliminada.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> canciones fueron eliminadas.</item>
+    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g>la canción fue eliminada.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g>las canciones fueron eliminadas.</item>
   </plurals>
 </resources>
diff --git a/res/values-es/plurals.xml b/res/values-es/plurals.xml
index b623606..39bc749 100644
--- a/res/values-es/plurals.xml
+++ b/res/values-es/plurals.xml
@@ -45,7 +45,7 @@
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
     <item quantity="one"><xliff:g id="minutes">%d</xliff:g>min</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>min</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>mins</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 698b0a3..f9da9fe 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -141,7 +141,7 @@
   <string name="app_widget_recent">Musika: berriki entzundakoak</string>
   <!-- Empty list / error messages -->
   <string name="no_effects_for_you">Ezin izan da ekualizadorea ireki.</string>
-  <string name="empty_music">Musika ordenagailutik galiura kopiatzeko USB kablea erabili.</string>
+  <string name="empty_music">Musika ordenagailutik gailura kopiatzeko erabili USB kablea.</string>
   <string name="empty_search">Ez da bilaketaren emaitzarik aurkitu</string>
   <string name="empty_search_check">Egiaztatu ondo idatzi duzula edo saiatu beste hitz gako batekin.</string>
   <string name="empty_favorite">Gogoko gisa markatutako abestiak hemen agertuko dira.</string>
@@ -154,7 +154,7 @@
   <string name="empty_last_added_main">Ez da abestirik gehitu berriki</string>
   <string name="empty_last_added">Azken hilabetean gehituriko abestiak hemen agertuko dira.</string>
   <string name="empty_generic_main">Ez da musikarik aurkitu</string>
-  <string name="empty_generic_secondary">Musika ordenagailutik galiura kopiatzeko USB kablea erabili.</string>
+  <string name="empty_generic_secondary">Musika ordenagailutik gailura kopiatzeko erabili USB kablea.</string>
   <string name="empty_queue_main">Ez dago abestirik erreprodukzio-zerrendan</string>
   <string name="empty_queue_secondary">Abestiak erreprodukzio-zerrendara gehitzeko, sakatu abesti, album edo artista bat eta hautatu \"Gehitu ilarara\".</string>
   <string name="error_playing_track">Ezin izan da %1$s. pista erreproduzitu</string>
diff --git a/res/values-ga-rIE/plurals.xml b/res/values-ga-rIE/plurals.xml
new file mode 100644
index 0000000..9827780
--- /dev/null
+++ b/res/values-ga-rIE/plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Used to indicate the number of artists -->
+  <!-- Used to indicate the number of albums for an artist -->
+  <!-- Used to indicate the number of songs for an album -->
+  <!-- Used to indicate the number of genres -->
+  <!-- Used to show a shortened version of hours-->
+  <!-- Used to show a shortened version of minutes -->
+  <!-- Toasts after adding song(s) to playlists -->
+  <!-- Toasts after removing song(s) from playlists -->
+  <!-- Toasts after adding song(s) to queue -->
+  <!-- Toasts after adding song(s) to the favorites list -->
+  <!-- Toast confirming that song(s) was/were deleted. -->
+</resources>
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..ac715c0
--- /dev/null
+++ b/res/values-ga-rIE/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Page titles -->
+  <!-- Section Headers -->
+  <!-- Option menu items -->
+  <!-- Playlist items -->
+  <!-- Sort orders -->
+  <!-- Default playlist names -->
+  <!-- AlertDialog items -->
+  <!-- Context menu items -->
+  <!-- Content descriptions -->
+  <!-- Toast messages -->
+  <!-- Settings -->
+  <!-- App widget -->
+  <!-- Empty list / error messages -->
+  <!-- Section Headers -->
+</resources>
diff --git a/res/values-gl-rES/plurals.xml b/res/values-gl-rES/plurals.xml
index f272f64..b5968a2 100644
--- a/res/values-gl-rES/plurals.xml
+++ b/res/values-gl-rES/plurals.xml
@@ -18,13 +18,25 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
+  <plurals name="Nartists">
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> artista</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> artistas</item>
+  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> álbum</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> álbums</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
+  <plurals name="Nsongs">
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> canción</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> cancións</item>
+  </plurals>
   <!-- Used to indicate the number of genres -->
+  <plurals name="Ngenres">
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> xénero</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> xéneros</item>
+  </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
     <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
@@ -36,8 +48,28 @@
     <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
+  <plurals name="NNNtrackstoplaylist">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción engadida á lista.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> cancións engadidas á lista.</item>
+  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
+  <plurals name="NNNtracksfromplaylist">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción retirada da lista.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> cancións retiradas da lista.</item>
+  </plurals>
   <!-- Toasts after adding song(s) to queue -->
+  <plurals name="NNNtrackstoqueue">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción engadida á cola.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> cancións engadidas á cola.</item>
+  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
+  <plurals name="NNNtrackstofavorites">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción engadida a favoritos.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> cancións engadidas a favoritos.</item>
+  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
+  <plurals name="NNNtracksdeleted">
+    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> canción eliminada.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> cancións eliminadas.</item>
+  </plurals>
 </resources>
diff --git a/res/values-gu-rIN/plurals.xml b/res/values-gu-rIN/plurals.xml
index ef257e4..2179a4a 100644
--- a/res/values-gu-rIN/plurals.xml
+++ b/res/values-gu-rIN/plurals.xml
@@ -38,10 +38,6 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> ઝાનરો</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g> કલાક</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g> કલાક</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
     <item quantity="one"><xliff:g id="hours">%d</xliff:g>મિનીટ</item>
diff --git a/res/values-hr/plurals.xml b/res/values-hr/plurals.xml
index 70b74b0..039fc65 100644
--- a/res/values-hr/plurals.xml
+++ b/res/values-hr/plurals.xml
@@ -43,21 +43,21 @@
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="few"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g> h</item>
+    <item quantity="few"><xliff:g id="hours">%d </xliff:g> h</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g> h</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
-    <item quantity="few"><xliff:g id="minutes">%d</xliff:g>m</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> m</item>
+    <item quantity="few"><xliff:g id="minutes">%d </xliff:g> m</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> m</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> pjesma dodana na popis za reproduciranje.</item>
     <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> pjesme dodane na popis za reproduciranje.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> pjesama dodano na popis za reproduciranje.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d </xliff:g> pjesme dodao na popis za reproduciranje.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
@@ -80,7 +80,7 @@
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
     <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> pjesma je izbrisana.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete" example="2">%d</xliff:g> pjesme su izbrisane.</item>
+    <item quantity="few"><xliff:g id="songs_to_delete">%d</xliff:g> pjesme su izbrisane.</item>
     <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> pjesama je izbrisano.</item>
   </plurals>
 </resources>
diff --git a/res/values-in/plurals.xml b/res/values-in/plurals.xml
index 94e3c53..b36de92 100644
--- a/res/values-in/plurals.xml
+++ b/res/values-in/plurals.xml
@@ -31,7 +31,7 @@
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> genre</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> aliran</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 68face0..9408446 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -24,7 +24,7 @@
   <string name="page_albums">Album</string>
   <string name="page_songs">Lagu</string>
   <string name="page_playlists">Daftar Putar</string>
-  <string name="page_genres">Genre</string>
+  <string name="page_genres">Aliran</string>
   <string name="page_now_playing">Sedang diputar</string>
   <string name="page_play_queue">Putar daftar antrean</string>
   <!-- Section Headers -->
@@ -33,15 +33,15 @@
   <string name="header_all_songs">Semua Lagu</string>
   <!-- Option menu items -->
   <string name="menu_settings">Pengaturan</string>
-  <string name="menu_search">Telusuri</string>
-  <string name="menu_shuffle_item">Putar acak</string>
-  <string name="menu_shuffle_all">Putar acak semua</string>
+  <string name="menu_search">Cari</string>
+  <string name="menu_shuffle_item">Acak</string>
+  <string name="menu_shuffle_all">Acak semua</string>
   <string name="menu_shuffle_playlist">Putar acak daftar putar</string>
   <string name="menu_shuffle_album">Putar acak album</string>
   <string name="menu_shuffle_artist">Putar acak artis</string>
   <string name="menu_shuffle_top_tracks">Putar acak lagu teratas</string>
   <string name="menu_shuffle_recent">Putar acak yang terakhir diputar</string>
-  <string name="menu_shuffle_last_added">Putar acak yang terakhir ditambahkan</string>
+  <string name="menu_shuffle_last_added">Putar acak terakhir ditambahkan</string>
   <string name="menu_play_all">Putar semua</string>
   <string name="menu_sort_by">Urut berdasarkan</string>
   <string name="menu_clear_list">Hapus daftar</string>
@@ -85,22 +85,22 @@
   <string name="cannot_be_undone">Ini tidak dapat diurungkan</string>
   <string name="delete_warning">Ini akan menghapus cache gambar secara permanen</string>
   <string name="new_photo">Pilih foto dari Galeri</string>
-  <string name="google_search">Penelusuran Google</string>
-  <string name="use_default">Gunakan foto baku</string>
+  <string name="google_search">Pencarian Google</string>
+  <string name="use_default">Gunakan foto bawaan</string>
   <string name="old_photo">Gunakan foto lama</string>
   <!-- Context menu items -->
   <string name="context_menu_play_selection">Putar</string>
   <string name="context_menu_play_next">Putar selanjutnya</string>
   <string name="context_menu_play_album">Putar album</string>
   <string name="context_menu_more_by_artist">Lebih banyak oleh artis</string>
-  <string name="context_menu_rename_playlist">Ubah Nama</string>
+  <string name="context_menu_rename_playlist">Ubah nama</string>
   <string name="context_menu_delete">Hapus</string>
   <string name="context_menu_fetch_album_art">Mengambil seni album</string>
   <string name="context_menu_fetch_artist_image">Mengambil gambar artis</string>
   <string name="context_menu_remove_from_recent">Hapus dari terakhir</string>
   <string name="context_menu_use_as_ringtone">Gunakan sebagai nada dering</string>
   <string name="context_menu_remove_from_playlist">Hapus dari daftar putar</string>
-  <string name="context_menu_change_image">Ubah Gambar</string>
+  <string name="context_menu_change_image">Ganti Gambar</string>
   <!-- Content descriptions -->
   <string name="accessibility_play">Putar</string>
   <string name="accessibility_pause">Jeda</string>
@@ -130,8 +130,8 @@
   <string name="settings_show_music_visualization_title">Tampilkan visualisasi musik</string>
   <string name="settings_show_lyrics_title">Tampilkan lirik lagu</string>
   <string name="settings_show_lyrics_summary">Untuk lagu-lagu yang memiliki berkas srt</string>
-  <string name="settings_shake_to_play">Kocok untuk memutar</string>
-  <string name="settings_shake_to_play_summary">Kocok perangkat Anda untuk memutar lagu berikutnya</string>
+  <string name="settings_shake_to_play">Goyang untuk memutar</string>
+  <string name="settings_shake_to_play_summary">Goyang perangkat Anda untuk memutar lagu berikutnya</string>
   <string name="settings_lockscreen_album_art">Seni album pada layar kunci</string>
   <string name="settings_lockscreen_album_art_summary">Ganti latar belakang layar kunci dengan seni album</string>
   <!-- App widget -->
@@ -144,7 +144,7 @@
   <string name="empty_music">Untuk menyalin musik dari komputer ke perangkat Anda, gunakan kabel USB.</string>
   <string name="empty_search">Hasil penelusuran tidak ditemukan</string>
   <string name="empty_search_check">Periksa bahwa Anda memiliki ejaan yang benar atau coba kata kunci yang berbeda.</string>
-  <string name="empty_favorite">Lagu-lagu yang Anda Tandai sebagai favorit akan ditampilkan di sini.</string>
+  <string name="empty_favorite">Lagu-lagu yang anda tandai sebagai favorit akan ditampilkan di sini.</string>
   <string name="empty_recent_main">Tidak ada lagu terbaru</string>
   <string name="empty_recent">Lagu yang Anda dengarkan baru-baru ini akan muncul di sini.</string>
   <string name="empty_playlist_main">Tidak ada lagu dalam daftar putar</string>
@@ -180,7 +180,7 @@
   <string name="footer_search_albums">Tampilkan semua album</string>
   <string name="footer_search_songs">Tampilkan semua lagu</string>
   <string name="footer_search_playlists">Tampilkan semua daftar putar</string>
-  <string name="searchHint">Telusuri musik</string>
+  <string name="searchHint">Cari musik</string>
   <string name="search_title_artists">Semua \"%s\" artis</string>
   <string name="search_title_albums">Semua \"%s\" album</string>
   <string name="search_title_songs">Semua \"%s\" lagu</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7e9aaad..20b8aee 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -90,7 +90,7 @@
   <string name="old_photo">Usa foto vecchia</string>
   <!-- Context menu items -->
   <string name="context_menu_play_selection">Riproduci</string>
-  <string name="context_menu_play_next">Riproduci successivo</string>
+  <string name="context_menu_play_next">Riproduci dopo</string>
   <string name="context_menu_play_album">Riproduci album</string>
   <string name="context_menu_more_by_artist">Altri dell\'artista</string>
   <string name="context_menu_rename_playlist">Rinomina</string>
@@ -133,7 +133,7 @@
   <string name="settings_shake_to_play">Scuoti per riprodurre</string>
   <string name="settings_shake_to_play_summary">Scuoti il dispositivo per riprodurre la prossima canzone</string>
   <string name="settings_lockscreen_album_art">Cover schermata sblocco</string>
-  <string name="settings_lockscreen_album_art_summary">Sostituisci lo sfondo della schermata di blocco con la copertina dell\'album</string>
+  <string name="settings_lockscreen_album_art_summary">Sostituisci lo sfondo del blocco schermo con la copertina dell\'album</string>
   <!-- App widget -->
   <string name="app_widget_small">Musica: 4 \u00d7 1</string>
   <string name="app_widget_large">Musica: 4 \u00d7 2</string>
diff --git a/res/values-iw/plurals.xml b/res/values-iw/plurals.xml
index bad0c2e..1c6b4b9 100644
--- a/res/values-iw/plurals.xml
+++ b/res/values-iw/plurals.xml
@@ -19,7 +19,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one">אמן <xliff:g id="count">%d</xliff:g></item>
+    <item quantity="one">אמן אחד</item>
     <item quantity="two"><xliff:g id="count">%d</xliff:g> אמנים</item>
     <item quantity="many"><xliff:g id="count">%d</xliff:g> אמנים</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> אמנים</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a4f8676..91bc19d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -83,7 +83,7 @@
   <string name="clear_recent_title">最近再生した曲を消去しますか？</string>
   <string name="clear_last_added">最近追加した曲を消去しますか？</string>
   <string name="cannot_be_undone">この操作は元に戻せません</string>
-  <string name="delete_warning">キャッシュされた画像エントリーを恒久的に削除します</string>
+  <string name="delete_warning">キャッシュされた画像エントリーを完全に削除します</string>
   <string name="new_photo">ギャラリーから写真を選択</string>
   <string name="google_search">Google検索</string>
   <string name="use_default">デフォルトの写真を使用</string>
diff --git a/res/values-ml-rIN/plurals.xml b/res/values-ml-rIN/plurals.xml
index a267785..ece042d 100644
--- a/res/values-ml-rIN/plurals.xml
+++ b/res/values-ml-rIN/plurals.xml
@@ -19,57 +19,57 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> കലാകാരന്</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> കലാകാരന്മാർ</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> ആര്‍ട്ടിസ്റ്റ്</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> ആർട്ടിസ്റ്റുകൾ</item>
   </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> ആൽബം</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> ആൽബങ്ങളും</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> ആൽബങ്ങൾ</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> പാട്ട്</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> പാട്ടുകൾ</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> ഗാനം</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> ഗാനങ്ങള്‍</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g>സംഗീത തരം</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g>സംഗീത തരങ്ങൾ</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> വിഭാഗം</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> തരങ്ങൾ</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g></item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g></item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g>മണിക്കൂര്‍</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>മണികൂറുകള്‍</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g></item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g></item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>മിനിറ്റ്</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>മിനിറ്റുകള്‍</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം പ്ലേലിസ്റ്റിലേക്ക് ചേർത്തു.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> പാട്ടുകൾ പ്ലേലിസ്റ്റിലേക്ക് ചേർത്തു.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> ഗാനങ്ങൾ പ്ലേലിസ്റ്റിലേക്ക് ചേർത്തു.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം പ്ലേലിസ്റ്റിൽ നിന്നും നീക്കം.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം പ്ലേലിസ്റ്റിൽ നിന്നും നീക്കം.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം പ്ലേലിസ്റ്റിൽ നിന്നും നീക്കി.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> ഗാനങ്ങൾ പ്ലേലിസ്റ്റിൽ നിന്നും നീക്കി.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം ക്യൂ ചേർത്തു.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> പാട്ടുകൾ ക്യൂ ചേർത്തു.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം ക്യൂവിലേക്ക് ചേർത്തു.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> ഗാനങ്ങൾ ക്യൂവിലേക്ക് ചേർത്തു.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> പാട്ട് പ്രിയപ്പെട്ടവലേക്ക് ചേർത്തു.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> പാട്ടുകൾ പ്രിയപ്പെട്ടവലേക്ക് ചേർത്തു.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം ഇഷ്ടങ്ങളിലേയ്ക്ക് ചേർത്തു.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> ഗാനങ്ങൾ പ്രിയപ്പെട്ടവയിലേക്ക് ചേർത്തു.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> പാട്ട് ഡിലീറ്റ് ചെയ്തു.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> പാട്ടുകൾ ഇല്ലാതാക്കി.</item>
+    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> ഗാനം ഇല്ലാതാക്കി.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> ഗാനങ്ങൾ ഇല്ലാതാക്കി.</item>
   </plurals>
 </resources>
diff --git a/res/values-mr-rIN/plurals.xml b/res/values-mr-rIN/plurals.xml
index 12257b7..43a5b74 100644
--- a/res/values-mr-rIN/plurals.xml
+++ b/res/values-mr-rIN/plurals.xml
@@ -39,8 +39,8 @@
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>ता</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>ता</item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
diff --git a/res/values-nb/plurals.xml b/res/values-nb/plurals.xml
index dd4e5bd..b32a23f 100644
--- a/res/values-nb/plurals.xml
+++ b/res/values-nb/plurals.xml
@@ -35,7 +35,7 @@
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> sjanger</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> sjangre</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> sjangere</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 72cc25a..7031110 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -146,13 +146,13 @@
   <string name="empty_search_check">Controleer of u de juiste spelling gebruikt of probeer een ander trefwoord.</string>
   <string name="empty_favorite">Uw favoriete nummers worden hier getoond.</string>
   <string name="empty_recent_main">Geen recente nummers</string>
-  <string name="empty_recent">Nummers waar u recent naar heeft geluisterd worden hier getoond.</string>
+  <string name="empty_recent">Nummers waar u recent naar hebt geluisterd worden hier getoond.</string>
   <string name="empty_playlist_main">Geen nummers in afspeellijst</string>
   <string name="empty_playlist_secondary">Om nummers toe te voegen aan deze afspeellijst, tik op het menu van een nummer, album of artiest en selecteer \'Toevoegen aan afspeellijst\'.</string>
   <string name="empty_top_tracks_main">Geen beste nummers</string>
   <string name="empty_top_tracks_secondary">Nummers waar u het meest naar luistert worden toegevoegd aan deze lijst.</string>
   <string name="empty_last_added_main">Geen nummers recent toegevoegd</string>
-  <string name="empty_last_added">Nummers die u in de afgelopen maand heeft toegevoegd worden hier getoond.</string>
+  <string name="empty_last_added">Nummers die u in de afgelopen maand hebt toegevoegd worden hier getoond.</string>
   <string name="empty_generic_main">Geen muziek gevonden</string>
   <string name="empty_generic_secondary">Om muziek van uw computer te kopiëren naar uw apparaat, kunt u een USB-kabel gebruiken.</string>
   <string name="empty_queue_main">Geen nummers in wachtrij</string>
diff --git a/res/values-or-rIN/plurals.xml b/res/values-or-rIN/plurals.xml
index 2cbf7c8..ce228c1 100644
--- a/res/values-or-rIN/plurals.xml
+++ b/res/values-or-rIN/plurals.xml
@@ -38,15 +38,7 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> ଜେନେରେ</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>ଘଣ୍ଟା</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>ମିନିଟ୍</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ଗୀତ ଚାଳନତାଲିକାରେ ଯୋଗ କରାଯାଇଛି।</item>
diff --git a/res/values-pt-rBR/plurals.xml b/res/values-pt-rBR/plurals.xml
index 58d335d..4cba155 100644
--- a/res/values-pt-rBR/plurals.xml
+++ b/res/values-pt-rBR/plurals.xml
@@ -44,8 +44,8 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>min</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>min</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-pt-rPT/plurals.xml b/res/values-pt-rPT/plurals.xml
index 2ab9fc7..9b13964 100644
--- a/res/values-pt-rPT/plurals.xml
+++ b/res/values-pt-rPT/plurals.xml
@@ -44,8 +44,8 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> min</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> mins</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6110534..8d3dc02 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -100,7 +100,7 @@
   <string name="context_menu_remove_from_recent">Remover das recentes</string>
   <string name="context_menu_use_as_ringtone">Usar como toque</string>
   <string name="context_menu_remove_from_playlist">Remover da lista de reprodução</string>
-  <string name="context_menu_change_image">Alterar Imagem</string>
+  <string name="context_menu_change_image">Alterar imagem</string>
   <!-- Content descriptions -->
   <string name="accessibility_play">Reproduzir</string>
   <string name="accessibility_pause">Pausa</string>
diff --git a/res/values-ro/plurals.xml b/res/values-ro/plurals.xml
index 2d2378b..2b72134 100644
--- a/res/values-ro/plurals.xml
+++ b/res/values-ro/plurals.xml
@@ -36,11 +36,6 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> melodii</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> gen</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> genuri</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> genuri</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
     <item quantity="one"><xliff:g id="hours">%d</xliff:g>o</item>
diff --git a/res/values-ru/plurals.xml b/res/values-ru/plurals.xml
index 6d271c8..3a56955 100644
--- a/res/values-ru/plurals.xml
+++ b/res/values-ru/plurals.xml
@@ -56,8 +56,8 @@
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в плейлист.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в плейлист.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в плейлист.</item>
+    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> трека добавлены в плейлист.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> треков добавлены в плейлист.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
@@ -68,19 +68,19 @@
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в очередь.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в очередь.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в очередь.</item>
+    <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> трека добавлены в очередь.</item>
+    <item quantity="other"><xliff:g id="number" example="5">%d</xliff:g> треков добавлены в очередь.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в избранное.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в избранное.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в избранное.</item>
+    <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> трека добавлены в избранное.</item>
+    <item quantity="other"><xliff:g id="number" example="5">%d</xliff:g> треков добавлены в избранное.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
     <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> трек удален.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete">%d</xliff:g> трека удалены.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> треков удалены.</item>
+    <item quantity="few"><xliff:g id="songs_to_delete" example="2">%d</xliff:g> трека удалены.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete" example="5">%d</xliff:g> треков удалены.</item>
   </plurals>
 </resources>
diff --git a/res/values-sv/plurals.xml b/res/values-sv/plurals.xml
index fc0a686..2bf8b64 100644
--- a/res/values-sv/plurals.xml
+++ b/res/values-sv/plurals.xml
@@ -55,7 +55,7 @@
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> låt borttagen från spellistan.</item>
-    <item quantity="other"><xliff:g id="number" example="27"> %d </xliff:g> låtar borttagna från spellistan.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> låtar borttagna från spellistan.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
diff --git a/res/values-te-rIN/plurals.xml b/res/values-te-rIN/plurals.xml
index 9a78c90..ee5f6d1 100644
--- a/res/values-te-rIN/plurals.xml
+++ b/res/values-te-rIN/plurals.xml
@@ -38,15 +38,7 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> శైలులు</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>గ</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>ని</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> పాట  ప్లేజాబితాకు జోడించబడింది.</item>
diff --git a/res/values-th/plurals.xml b/res/values-th/plurals.xml
index f2eabe5..0ba5f3a 100644
--- a/res/values-th/plurals.xml
+++ b/res/values-th/plurals.xml
@@ -35,11 +35,11 @@
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>ชม.</item>
+    <item quantity="other"><xliff:g id="hours"> %d</xliff:g>ชม.</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>นาที</item>
+    <item quantity="other"><xliff:g id="minutes"> %d</xliff:g>นาที</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
@@ -51,11 +51,11 @@
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> เพลงถูกเพิ่มเข้าในคิว</item>
+    <item quantity="other">มี <xliff:g id="number" example="27">%d</xliff:g> เพลงถูกเพิ่มอยู่ในคิว</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> เพลงถูกเพิ่มในรายการโปรด</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> เพลงถูกเพิ่มไปยังรายการโปรด</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
diff --git a/res/values-vi/plurals.xml b/res/values-vi/plurals.xml
index 9827780..e463be3 100644
--- a/res/values-vi/plurals.xml
+++ b/res/values-vi/plurals.xml
@@ -18,14 +18,47 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
+  <plurals name="Nartists">
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> nghệ sĩ</item>
+  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
+  <plurals name="Nalbums">
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> album</item>
+  </plurals>
   <!-- Used to indicate the number of songs for an album -->
+  <plurals name="Nsongs">
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> bài hát</item>
+  </plurals>
   <!-- Used to indicate the number of genres -->
+  <plurals name="Ngenres">
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> thể loại</item>
+  </plurals>
   <!-- Used to show a shortened version of hours-->
+  <plurals name="Nhours">
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>giờ</item>
+  </plurals>
   <!-- Used to show a shortened version of minutes -->
+  <plurals name="Nminutes">
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>phút</item>
+  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
+  <plurals name="NNNtrackstoplaylist">
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> bài hát đã được thêm vào danh sách phát.</item>
+  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
+  <plurals name="NNNtracksfromplaylist">
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> bài hát đã được xoá khỏi danh sách phát.</item>
+  </plurals>
   <!-- Toasts after adding song(s) to queue -->
+  <plurals name="NNNtrackstoqueue">
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> bài hát được thêm vào danh sách chờ.</item>
+  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
+  <plurals name="NNNtrackstofavorites">
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> bài hát đã được thêm vào yêu thích.</item>
+  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
+  <plurals name="NNNtracksdeleted">
+    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> bài hát đã bị xoá.</item>
+  </plurals>
 </resources>
diff --git a/res/values-zh-rTW/plurals.xml b/res/values-zh-rTW/plurals.xml
index 123d6e9..469a101 100644
--- a/res/values-zh-rTW/plurals.xml
+++ b/res/values-zh-rTW/plurals.xml
@@ -39,7 +39,7 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> 分鐘</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>分鐘</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
@@ -47,15 +47,15 @@
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
-    <item quantity="other">已從播放清單中移除 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲。</item>
+    <item quantity="other">已從播放清單中刪除 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲。</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="other">已新增 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲至佇列。</item>
+    <item quantity="other">已加入 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲至隊列。</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
-    <item quantity="other">已新增 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲至最愛。</item>
+    <item quantity="other">已加入 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲至最愛。</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">