diff --git a/res/values-de/translatable.xml b/res/values-de/translatable.xml
index c29a3ef9..3dcf1993 100644
--- a/res/values-de/translatable.xml
+++ b/res/values-de/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">Entfernen</string>
   <string name="play_or_enqueue">Einreihen während Wiedergabe oder wiedergeben, falls pausiert</string>
   <string name="open">Öffnen</string>
+  <string name="go_home">Benutzerverzeichnis</string>
   <plurals name="playing">
     <item quantity="one">1 Titel wird wiedergegeben.</item>
     <item quantity="other">%d Titel werden wiedergegeben.</item>
@@ -81,6 +82,8 @@
   <string name="delete_file">Datei »%s« löschen?</string>
   <string name="artists">Interpreten</string>
   <string name="albums">Alben</string>
+  <string name="albumartists">Albuminterpreten</string>
+  <string name="composers">Komponisten</string>
   <string name="songs">Titel</string>
   <string name="playlists">Wiedergabelisten</string>
   <string name="genres">Genres</string>
diff --git a/res/values-fi/translatable.xml b/res/values-fi/translatable.xml
index 017c9b9e..d013fa82 100644
--- a/res/values-fi/translatable.xml
+++ b/res/values-fi/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">Poista</string>
   <string name="play_or_enqueue">Lisää jonoon jos toistetaan; toista jos keskeytetty</string>
   <string name="open">Avaa</string>
+  <string name="go_home">Kotihakemisto</string>
   <plurals name="playing">
     <item quantity="one">Toistetaan 1 kappaletta.</item>
     <item quantity="other">Toistetaan %d kappaletta.</item>
@@ -81,6 +82,8 @@
   <string name="delete_file">Poistetaanko tiedosto \'%s\'?</string>
   <string name="artists">Esittäjät</string>
   <string name="albums">Albumit</string>
+  <string name="albumartists">Albumin esittäjät</string>
+  <string name="composers">Säveltäjät</string>
   <string name="songs">Kappaleet</string>
   <string name="playlists">Soittolistat</string>
   <string name="genres">Tyylilajit</string>
diff --git a/res/values-hu/translatable.xml b/res/values-hu/translatable.xml
index 7ba8037b..941e1c58 100644
--- a/res/values-hu/translatable.xml
+++ b/res/values-hu/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">Eltávolítás</string>
   <string name="play_or_enqueue">Sorhoz adás lejátszás közben; Lejátszás ha szüneteltett</string>
   <string name="open">Megnyitás</string>
+  <string name="go_home">Saját könyvtár</string>
   <plurals name="playing">
     <item quantity="one">1 szám lejátszása.</item>
     <item quantity="other">%d szám lejátszása.</item>
@@ -81,6 +82,8 @@
   <string name="delete_file">Törli a(z) „%s” fájlt?</string>
   <string name="artists">Előadók</string>
   <string name="albums">Albumok</string>
+  <string name="albumartists">Album előadók</string>
+  <string name="composers">Zeneszerzők</string>
   <string name="songs">Számok</string>
   <string name="playlists">Lejátszólisták</string>
   <string name="genres">Műfajok</string>
diff --git a/res/values-it/translatable.xml b/res/values-it/translatable.xml
index 3b4ad0e0..e8379c67 100644
--- a/res/values-it/translatable.xml
+++ b/res/values-it/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">Rimuovi</string>
   <string name="play_or_enqueue">Metti in coda se in riproduzione; Riproduci se in pausa.</string>
   <string name="open">Apri</string>
+  <string name="go_home">Cartella home</string>
   <plurals name="playing">
     <item quantity="one">1 brano in riproduzione.</item>
     <item quantity="other">%d brani in riproduzione.</item>
@@ -81,6 +82,8 @@
   <string name="delete_file">Eliminare il file \"%s\"?</string>
   <string name="artists">Artisti</string>
   <string name="albums">Album</string>
+  <string name="albumartists">Artisti album</string>
+  <string name="composers">Compositori</string>
   <string name="songs">Brani</string>
   <string name="playlists">Playlist</string>
   <string name="genres">Generi</string>
@@ -174,6 +177,8 @@
   <string name="use_idle_timeout_title">Attiva timeout di inattività</string>
   <string name="use_idle_timeout_summary">Quando attivo, il playback si fermerà dopo un dato periodo di inattività</string>
   <string name="idle_timeout_title">Timeout inattività</string>
+  <string name="enable_scroll_to_song_title">Scorri al titolo del brano</string>
+  <string name="enable_scroll_to_song_summary">Scorri nelle liste della libreria al brano/album/artista attualmente in riproduzione</string>
   <string name="coverloader_android_title">Carica copertine da Android</string>
   <string name="coverloader_android_summary">Interroga il database dei media interno di Android per le copertine album</string>
   <string name="coverloader_vanilla_title">Carica copertine da cartella</string>
@@ -181,8 +186,11 @@
   <string name="coverloader_shadow_title">Carica copertine da cartella nascosta</string>
   <string name="coverloader_shadow_summary">Prova a caricare copertine da \'/sdcard/Music/.vanilla/ARTIST/ALBUM.jpg\'</string>
   <string name="cover_on_lockscreen_title">Mostra copertina sulla schermata di blocco</string>
+  <string name="cover_on_lockscreen_summary">Mostra la copertina del brano in riproduzione nella schermata di blocco schermo</string>
   <string name="double_tap_title">Widget di doppio tocco</string>
   <string name="double_tap_summary">Doppio tap sul 1x1 widget aprirà il riproduttore. Si avrà un ritardo di 400ms prima che il widget risponda all\'azione.</string>
+  <string name="scrobble_title">Usa la API Scrobble Droid</string>
+  <string name="scrobble_summary">Effettua lo scrobbling a Last.fm tramite Scrobble Droid o Simple Last.fm Scrobbler</string>
   <string name="stock_broadcast_title">Emula broadcast preinstallato</string>
   <string name="stock_broadcast_summary">Invia brodcast simulando quelli inviati dal riproduttore musicale nativo con i controlli di 3rd parti, widgets,ecc.</string>
   <string name="about">Info</string>
@@ -238,11 +246,21 @@
   <string name="share">Condividi…</string>
   <string name="sendto">Invia a…</string>
   <string name="no_receiving_apps">Nessuna app di ricezione trovata per questo tipo di file multimediale!</string>
+  <string name="media_library">Libreria multimediale</string>
+  <string name="media_scan_header">Scansione file multimediali</string>
   <string name="media_scan_full">Scansiona l\'intero sistema (lento)</string>
+  <string name="media_scan_drop_db">Svuota il database dei file multimediali (Attenzione!)</string>
   <string name="media_scan_start">Inizia scansione</string>
+  <string name="media_scan_force_bastp">Usa sempre il lettore di tag incorporato</string>
+  <string name="media_scan_group_albums">Raggruppa gli album per cartella</string>
   <string name="media_statistics">Statistiche</string>
   <string name="media_stats_tracks">Numero di tracce</string>
   <string name="media_stats_playtime">Tempo di riproduzione (Ore)</string>
+  <string name="media_stats_progress">Progresso della scansione</string>
   <string name="media_library_scan_running">Scansione libreria multimediale...</string>
+  <string name="media_scan_preferences">Opzioni per la scansione</string>
+  <string name="media_scan_preferences_change_title">Opzioni per la scansione modificate</string>
+  <string name="media_scan_preferences_change_message">La modifica di questa opzione avvierà una scansione completa della tua libreria. Continuare?</string>
   <!--Plugin system-->
+  <string name="plugins">Plugin</string>
 </resources>
diff --git a/res/values-ja/translatable.xml b/res/values-ja/translatable.xml
index 236739fd..93ede739 100644
--- a/res/values-ja/translatable.xml
+++ b/res/values-ja/translatable.xml
@@ -25,7 +25,7 @@
   <string name="_path">パス</string>
   <string name="_format">形式</string>
   <string name="_title">タイトル</string>
-  <string name="_artist">アーチスト</string>
+  <string name="_artist">アーティスト</string>
   <string name="_album">アルバム</string>
   <string name="_year">年</string>
   <string name="_replaygain">ﾘﾌﾟﾚｲｹﾞｲﾝ</string>
@@ -55,6 +55,7 @@
   <string name="remove">除去</string>
   <string name="play_or_enqueue">再生中はキューに入れる、一時停止中は再生</string>
   <string name="open">開く</string>
+  <string name="go_home">ホームディレクトリー</string>
   <plurals name="playing">
     <item quantity="other">%d トラックを再生中。</item>
   </plurals>
@@ -74,8 +75,10 @@
   <string name="deleted_item">\'%s\' を</string>
   <string name="delete_item">\'%s\' を削除しますか?</string>
   <string name="delete_file">ファイル \'%s\' を削除しますか?</string>
-  <string name="artists">アーチスト</string>
+  <string name="artists">アーティスト</string>
   <string name="albums">アルバム</string>
+  <string name="albumartists">アルバム アーティスト</string>
+  <string name="composers">作曲家</string>
   <string name="songs">トラック</string>
   <string name="playlists">プレイリスト</string>
   <string name="genres">ジャンル</string>
@@ -84,17 +87,17 @@
   <string name="play_all">すべて再生</string>
   <string name="enqueue_all">すべてキューに入れる</string>
   <string name="all_songs">すべてのトラック</string>
-  <string name="more_from_artist">アーチストからさらに</string>
+  <string name="more_from_artist">アーティストからさらに</string>
   <string name="more_from_album">アルバムからさらに</string>
   <string name="title">タイトル</string>
   <string name="number_of_tracks">トラックの名前</string>
   <string name="year">年</string>
   <string name="date_added">追加した日付</string>
-  <string name="artist_album">アーチスト、アルバム</string>
-  <string name="artist_year_album">アーチスト、年、アルバム</string>
-  <string name="artist_album_track">アーチスト、アルバム、トラック番号</string>
-  <string name="artist_album_title">アーチスト、アルバム、タイトル</string>
-  <string name="artist_year">アーチスト、年</string>
+  <string name="artist_album">アーティスト、アルバム</string>
+  <string name="artist_year_album">アーティスト、年、アルバム</string>
+  <string name="artist_album_track">アーティスト、アルバム、トラック番号</string>
+  <string name="artist_album_title">アーティスト、アルバム、タイトル</string>
+  <string name="artist_year">アーティスト、年</string>
   <string name="album_track">アルバム、トラック番号</string>
   <string name="song_playcount">再生回数</string>
   <!--Preferences-->
@@ -208,7 +211,7 @@
   <string name="cycle_repeat_mode">繰り返し再生モード</string>
   <string name="cycle_shuffle_mode">サイクル シャッフルモード</string>
   <string name="enqueue_current_album">アルバムをキューに入れる</string>
-  <string name="enqueue_current_artist">アーチストをキューに入れる</string>
+  <string name="enqueue_current_artist">アーティストをキューに入れる</string>
   <string name="enqueue_current_genre">ジャンルをキューに入れる</string>
   <string name="empty_the_queue">キューを空にする</string>
   <string name="show_queue">キューを表示</string>
@@ -220,7 +223,7 @@
   <string name="preferences_action_show_queue">キューを表示</string>
   <string name="preferences_action_clear_queue">キューをクリア</string>
   <string name="preferences_action_enqueue_current_album">アルバムをキューに入れる</string>
-  <string name="preferences_action_enqueue_current_artist">アーチストをキューに入れる</string>
+  <string name="preferences_action_enqueue_current_artist">アーティストをキューに入れる</string>
   <string name="preferences_action_enqueue_current_genre">ジャンルをキューに入れる</string>
   <string name="filebrowser_start">ファイルブラウザー ホーム</string>
   <string name="customize_filebrowser_start">ファイルブラウザーはこのディレクトリーから開始します</string>
diff --git a/res/values-lv/translatable.xml b/res/values-lv/translatable.xml
index 238b66d9..a98f8190 100644
--- a/res/values-lv/translatable.xml
+++ b/res/values-lv/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">Izņemt</string>
   <string name="play_or_enqueue">Ierindot, ja atskaņo; atskaņot, ja nopauzēts</string>
   <string name="open">Atvērt</string>
+  <string name="go_home">Mājas mape</string>
   <plurals name="playing">
     <item quantity="zero">Atskaņo %d celiņu.</item>
     <item quantity="one">Atskaņo 1 celiņu.</item>
diff --git a/res/values-pt/translatable.xml b/res/values-pt/translatable.xml
index 87ed6e46..290e5837 100644
--- a/res/values-pt/translatable.xml
+++ b/res/values-pt/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">Remover</string>
   <string name="play_or_enqueue">Colocar na fila ou reproduzir se em pausa</string>
   <string name="open">Abrir</string>
+  <string name="go_home">Diretório inicial</string>
   <plurals name="playing">
     <item quantity="one">1 faixa em reprodução.</item>
     <item quantity="other">%d faixas em reprodução.</item>
@@ -81,6 +82,8 @@
   <string name="delete_file">Apagar o ficheiro %s?</string>
   <string name="artists">Artistas</string>
   <string name="albums">Álbuns</string>
+  <string name="albumartists">Artistas do álbum</string>
+  <string name="composers">Compositores</string>
   <string name="songs">Faixas</string>
   <string name="playlists">Listas de reprodução</string>
   <string name="genres">Géneros</string>
diff --git a/res/values-ru/translatable.xml b/res/values-ru/translatable.xml
index 1373f83c..4f82015b 100644
--- a/res/values-ru/translatable.xml
+++ b/res/values-ru/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">Убрать</string>
   <string name="play_or_enqueue">В очередь при воспроизведении; Воспроизвести при паузе</string>
   <string name="open">Открыть</string>
+  <string name="go_home">Начальная папка</string>
   <plurals name="playing">
     <item quantity="one">Воспроизведение 1 дорожки.</item>
     <item quantity="few">Воспроизведение %d дорожек.</item>
@@ -91,6 +92,8 @@
   <string name="delete_file">Удалить файл \"%s\"?</string>
   <string name="artists">Исполнители</string>
   <string name="albums">Альбомы</string>
+  <string name="albumartists">Исполнители альбомов</string>
+  <string name="composers">Композиторы</string>
   <string name="songs">Дорожки</string>
   <string name="playlists">Плей-листы</string>
   <string name="genres">Жанры</string>
diff --git a/res/values-sr/translatable.xml b/res/values-sr/translatable.xml
index 7d5d4fa2..68762a27 100644
--- a/res/values-sr/translatable.xml
+++ b/res/values-sr/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">Уклони</string>
   <string name="play_or_enqueue">У ред ако је пуштено; пусти ако је паузирано</string>
   <string name="open">Отвори</string>
+  <string name="go_home">Почетна фасцикла</string>
   <plurals name="playing">
     <item quantity="one">1 нумера пуштена.</item>
     <item quantity="few">%d нумере пуштене.</item>
@@ -86,6 +87,8 @@
   <string name="delete_file">Да обришем фајл „%s“?</string>
   <string name="artists">Извођачи</string>
   <string name="albums">Албуми</string>
+  <string name="albumartists">Извођачи албума</string>
+  <string name="composers">Композитори</string>
   <string name="songs">Нумере</string>
   <string name="playlists">Листе нумера</string>
   <string name="genres">Жанрови</string>
@@ -96,6 +99,7 @@
   <string name="all_songs">Све нумере</string>
   <string name="more_from_artist">Још од извођача</string>
   <string name="more_from_album">Још са албума</string>
+  <string name="title">Наслов</string>
   <string name="number_of_tracks">броју нумера</string>
   <string name="year">години</string>
   <string name="date_added">датуму додавања</string>
@@ -255,12 +259,16 @@
   <string name="media_scan_full">Очитај читав фајлсистем (споро)</string>
   <string name="media_scan_drop_db">Очисти базу података медија (опасност!)</string>
   <string name="media_scan_start">Почни очитавање</string>
+  <string name="media_scan_force_bastp">Увек користи уграђени читач ознака</string>
   <string name="media_scan_group_albums">Групиши албуме по фасцикли</string>
   <string name="media_statistics">Статистике</string>
   <string name="media_stats_tracks">Број нумера</string>
   <string name="media_stats_playtime">Време пуштања (сати)</string>
   <string name="media_stats_progress">Напредак очитавања</string>
   <string name="media_library_scan_running">Очитавам библиотеку медија…</string>
+  <string name="media_scan_preferences">Опције скенера</string>
+  <string name="media_scan_preferences_change_title">Опције скенера измењене</string>
+  <string name="media_scan_preferences_change_message">Измена ове опције ће покренути потпуно скенирање ваше библиотеке. Желите ли да наставите?</string>
   <!--Plugin system-->
   <string name="plugins">Прикључци</string>
 </resources>
diff --git a/res/values-zh-rTW/translatable.xml b/res/values-zh-rTW/translatable.xml
index c3d20d36..d8f53321 100644
--- a/res/values-zh-rTW/translatable.xml
+++ b/res/values-zh-rTW/translatable.xml
@@ -55,6 +55,7 @@
   <string name="remove">移除</string>
   <string name="play_or_enqueue">如果播放佇列；如果暫停播放</string>
   <string name="open">開啟</string>
+  <string name="go_home">主目錄</string>
   <plurals name="playing">
     <item quantity="other">播放歌曲 %d。</item>
   </plurals>
@@ -76,6 +77,8 @@
   <string name="delete_file">刪除檔案 \'%s\'？</string>
   <string name="artists">演唱者</string>
   <string name="albums">專輯</string>
+  <string name="albumartists">專輯的演唱者</string>
+  <string name="composers">作曲</string>
   <string name="songs">曲目</string>
   <string name="playlists">撥放清單</string>
   <string name="genres">風格</string>